da_funk 3.31.0 → 3.32.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5492c7a7c61fc8559c3d0267a010c62fc6b85f47ff9c40b6164d6afef3536cfd
-  data.tar.gz: 06cccc06f994055eb85e68163412af8b076b2342a59661f92e2ab2907514be32
+  metadata.gz: b33827fb8e6019dae3a230de689a73d62065b71fe5d87cde66a5d034e10c8958
+  data.tar.gz: b88cd578be7d53abc94f00ffe3ff35fe21ecc028b75296c5d7b46391a35a6520
 SHA512:
-  metadata.gz: 158eb51a52a2895383bfb2864c5717659aa3d601a3780c0abcc42029b3ad86e7606aa5b1c02c55bb95e6c90dbe187f55e5fdc0ab3a1af659a4320598ef192703
-  data.tar.gz: cdff69f582095c79cbe9a5e1e063e495aec2a21fd74e29cc132b12653942b770da6d56d8fa309a07c433ea4e2d0a3ac8b9680c47692c109897d68020d615fa56
+  metadata.gz: 2f06599b79a0a3a2f098b2d544ef440231289d554737acf02cb7c1fae1a54509f503f6e66c7e90c2936eac9de0cab6aa3d9cdce8e9ebff2960adaf468c973dcb
+  data.tar.gz: 0d22fb804323266724e6efdf3eb79f075a69674cda33ee6321e3117a91983b9bed246bc2ae3c9408649c2ad20755c7e672b55a7c62502fdf77ff6d9562c9df20

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    da_funk (3.31.0)
+    da_funk (3.32.0)
       archive-zip (~> 0.5)
       bundler
       cloudwalk_handshake

data/RELEASE_NOTES.md

@@ -1,5 +1,17 @@
 # DaFunk
 
+### 3.32.0 - 2021-01-04
+
+- Remapped virtual keyboard to add support to new layout;
+- Make timeout of virtual keyboard parametrized;
+- Limit size of string to 20 on virtual keyboard;
+- Refactoring status bar:
+  - Check if thread is paused which means communication it's being configured. In this case 'sem sinal' message should be displayed;
+  - Do not show media type an media icon if thread is paused;
+- Removed thread pause from attach and scan calls, let the application that is doing the configuration take care of that;
+- Move reload of metadata to communication thread;
+- Added support to check network conn status from time to time, default is each 5 minutes.
+
 ### 3.31.0 - 2020-11-27
 
 - Added support to new battery view (Exact percentage);

data/lib/da_funk/connection_management.rb

@@ -1,21 +1,23 @@
 module DaFunk
   class ConnectionManagement
     class << self
-      attr_accessor :drops, :primary_timeout
+      attr_accessor :drops, :primary_timeout, :last_time_check
     end
     self.drops = 0
     DEFAULT_DROP_LIMIT = 2
 
     def self.check
-      if Device::Network.connected?
-        if primary_try?
-          :primary_communication
-        end
-      else
-        if fallback?
-          :fallback_communication
+      if must_check?
+        if Device::Network.connected?
+          if primary_try?
+            :primary_communication
+          end
         else
-          :attach_registration_fail
+          if fallback?
+            :fallback_communication
+          else
+            :attach_registration_fail
+          end
         end
       end
     end
@@ -125,6 +127,19 @@ module DaFunk
     def self.schedule_primary_timeout
       self.primary_timeout = (Time.now + self.conn_fallback_timer)
     end
+
+    def self.must_check?
+      if self.last_time_check
+        if self.last_time_check < Time.now
+          self.last_time_check = Time.now + @value
+          true
+        end
+      else
+        @value = DaFunk::ParamsDat.file['conn_check_timer']
+        @value = @value.nil? ? 300 : @value * 60
+        self.last_time_check = Time.now + @value
+        true
+      end
+    end
   end
 end
-

data/lib/da_funk/helper/status_bar.rb

@@ -18,21 +18,6 @@ module DaFunk
       SLOT_BATTERY_PERCENTUAL = 6
       SLOT_BATTERY_LEVEL = 7
 
-      SLOT_MESSAGE_CONNECTION = {
-        true  => {
-          :slot1 => 2,
-          :slot2 => 3,
-          :message1 => './shared/conectado_01.png',
-          :message2 => './shared/conectado_02.png'
-        },
-        false => {
-          :slot1 => 2,
-          :slot2 => 3,
-          :message1 => './shared/buscando_01.png',
-          :message2 => './shared/buscando_02.png'
-        }
-      }
-
       # TODO: review the 'print_status_bar' API to reduce the number of files
       # to eleven?
       BATTERY_PERCENTAGE_IMAGES = [
@@ -72,6 +57,11 @@ module DaFunk
         './shared/99%.png', './shared/100%.png'
       ].freeze
 
+      MEDIA_PATH = {
+        :gprs => './shared/3G.png',
+        :wifi => './shared/WIFI.png'
+      }
+
       BATTERY_CHARGING = [
         "./shared/battery_charging.png",
         "./shared/battery_charged.png"
@@ -109,7 +99,8 @@ module DaFunk
       }
 
       class << self
-        attr_accessor :signal, :battery, :power, :managment, :connected
+        attr_accessor :current_signal, :current_message, :battery, :power, :managment
+        attr_accessor :current_media
       end
 
       def self.check
@@ -124,51 +115,56 @@ module DaFunk
         if File.exists?('./shared/system_update')
           PAX::Display.print_status_bar(SLOT_UPDATE, "./shared/system_update_download.png")
           PAX::Display.print_status_bar(3, nil)
-          self.connected = false
         else
           self.change_message
         end
       end
 
       def self.change_message
-        unless File.exists?('./shared/system_update')
-          connected = Device::Network.connected?
-
-          if connected != self.connected
-            self.connected = connected
-
-            slot_message_1 = SLOT_MESSAGE_CONNECTION[self.connected][:slot1]
-            slot_message_2 = SLOT_MESSAGE_CONNECTION[self.connected][:slot2]
-
-            message_1 = SLOT_MESSAGE_CONNECTION[self.connected][:message1]
-            message_2 = SLOT_MESSAGE_CONNECTION[self.connected][:message2]
-
-            Device::Display.print_status_bar(slot_message_1, message_1)
-            Device::Display.print_status_bar(slot_message_2, message_2)
+        if ThreadScheduler.pause?(ThreadScheduler::THREAD_EXTERNAL_COMMUNICATION, 200)
+          if self.current_message != :pause
+            self.current_message = :pause
+            Device::Display.print_status_bar(2, './shared/semsinal_01.png')
+            Device::Display.print_status_bar(3, './shared/semsinal_02.png')
+          end
+        elsif Device::Network.connected?
+          if self.current_message != :connected
+            self.current_message = :connected
+            Device::Display.print_status_bar(2, './shared/conectado_01.png')
+            Device::Display.print_status_bar(3, './shared/conectado_02.png')
+          end
+        else
+          if self.current_message != :searching
+            self.current_message = :searching
+            Device::Display.print_status_bar(2, './shared/buscando_01.png')
+            Device::Display.print_status_bar(3, './shared/buscando_02.png')
           end
         end
       end
 
       def self.change_connection
-        if Device::Network.connected?
-          sig = Device::Network.signal
-
-          if self.signal != sig
-            self.signal = sig
-
-            if Device::Network.gprs?
-              Device::Display.print_status_bar(SLOT_MEDIA, "./shared/3G.png")
-              Device::Display.print_status_bar(SLOT_SIGNAL_LEVEL,
-                                               get_image_path(:gprs, self.signal))
-            elsif Device::Network.wifi?
-              Device::Display.print_status_bar(SLOT_MEDIA, "./shared/WIFI.png")
-              Device::Display.print_status_bar(SLOT_SIGNAL_LEVEL, 
-                                               self.get_image_path(:wifi, self.signal))
-            end
+        if ThreadScheduler.pause?(ThreadScheduler::THREAD_EXTERNAL_COMMUNICATION, 200)
+          Device::Display.print_status_bar(SLOT_MEDIA, nil)
+          Device::Display.print_status_bar(SLOT_SIGNAL_LEVEL, nil)
+          self.current_media = nil
+          self.current_signal = nil
+        elsif Device::Network.connected?
+          media  = Device::Network.gprs? ? :gprs : :wifi
+          signal = Device::Network.signal
+          if media != self.current_media
+            self.current_media = media
+            Device::Display.print_status_bar(SLOT_MEDIA, MEDIA_PATH[self.current_media])
+          end
+          if signal != self.current_signal
+            self.current_signal = signal
+            Device::Display.print_status_bar(SLOT_SIGNAL_LEVEL,
+                                              self.get_image_path(self.current_media, self.current_signal))
           end
         else
           Device::Display.print_status_bar(SLOT_MEDIA, nil)
           Device::Display.print_status_bar(SLOT_SIGNAL_LEVEL, "./shared/searching.png")
+          self.current_media = nil
+          self.current_signal = nil
         end
       end
 

data/lib/da_funk/version.rb

@@ -1,4 +1,4 @@
 module DaFunk
-  VERSION="3.31.0"
+  VERSION="3.32.0"
 end
 

data/lib/device/network.rb

@@ -159,9 +159,7 @@ class Device
     #   Device::Setting.mode           = selected[:mode]
     def self.scan
       if wifi?
-        ThreadScheduler.pausing_communication do
-          adapter.scan if Device::Network.init(*self.config)
-        end
+        adapter.scan if Device::Network.init(*self.config)
       end
     end
 
@@ -192,39 +190,28 @@ class Device
     def self.attach(options = nil)
       Device::Network.connected?
       if self.code != SUCCESS
-        ThreadScheduler.pausing_communication do
-          self.code = Device::Network.init(*self.config)
-          self.code = Device::Network.connect
-          Device::Network.connected? if self.code != SUCCESS
-
-          hash = try_user(self.attach_timeout, options) do |process|
-            Device::Network.connected?
-            process[:ret] = self.code
-            # TODO develop an interface to keep waiting communication module dial
-            # based on platform returns
-            process[:ret] == PROCESSING || process[:ret] == 2 || process[:ret] == -3307 # if true keep trying
-          end
-          self.code = hash[:ret]
-
-          if self.code == SUCCESS
-            self.load_metadata
-            self.code = Device::Network.dhcp_client(20000) if (wifi? || ethernet?)
-          else
-            self.code = ERR_USER_CANCEL if hash[:key] == Device::IO::CANCEL
-            Device::Network.shutdown
-          end
+        self.code = Device::Network.init(*self.config)
+        self.code = Device::Network.connect
+        Device::Network.connected? if self.code != SUCCESS
+
+        hash = try_user(self.attach_timeout, options) do |process|
+          Device::Network.connected?
+          process[:ret] = self.code
+          # TODO develop an interface to keep waiting communication module dial
+          # based on platform returns
+          process[:ret] == PROCESSING || process[:ret] == 2 || process[:ret] == -3307 # if true keep trying
         end
-      end
-      Context::ThreadPubSub.publish('communication_update')
-      self.code
-    end
+        self.code = hash[:ret]
 
-    def self.load_metadata
-      if Object.const_defined?(:CwMetadata)
-        CwMetadata.load_variable if CwMetadata.respond_to?(:load_variable)
+        if self.code == SUCCESS
+          self.code = Device::Network.dhcp_client(20000) if (wifi? || ethernet?)
+        else
+          self.code = ERR_USER_CANCEL if hash[:key] == Device::IO::CANCEL
+          Device::Network.shutdown
+        end
       end
+      self.code
     end
-
     def self.shutdown
       if self.adapter.started?
         Device::Network.disconnect
@@ -276,4 +263,3 @@ class Device
     end
   end
 end
-

data/lib/device/virtual_keyboard.rb

@@ -82,34 +82,76 @@ class Device
       ],
 
       keyboard_symbol_number: [
-        { x: 0..35,  y: 190..210, char: '(' },
-        { x: 0..68,  y: 190..210, char: ')' },
-        { x: 0..104, y: 190..210, char: '1' },
-        { x: 0..138, y: 190..210, char: '2' },
-        { x: 0..169, y: 190..210, char: '3' },
-        { x: 0..203, y: 190..210, char: '+' },
-        { x: 0..239, y: 190..210, char: '-' },
-        { x: 0..35,  y: 220..245, char: '?' },
-        { x: 0..68,  y: 220..245, char: '$' },
-        { x: 0..104, y: 220..245, char: '4' },
-        { x: 0..138, y: 220..245, char: '5' },
-        { x: 0..169, y: 220..245, char: '6' },
-        { x: 0..203, y: 220..245, char: '*' },
-        { x: 0..239, y: 220..245, char: '/' },
-        { x: 0..35,  y: 255..275, char: '!' },
-        { x: 0..68,  y: 255..275, char: ';' },
-        { x: 0..104, y: 255..275, char: '7' },
-        { x: 0..138, y: 255..275, char: '8' },
-        { x: 0..169, y: 255..275, char: '9' },
-        { x: 0..203, y: 255..275, char: '=' },
-        { x: 0..239, y: 255..275, char: :erase },
-        { x: 0..35,  y: 290..315, char: :keyboard_capital },
-        { x: 0..68,  y: 290..315, char: '@' },
-        { x: 0..104, y: 290..315, char: '%' },
-        { x: 0..138, y: 290..315, char: '0' },
-        { x: 0..169, y: 290..315, char: '#' },
-        { x: 0..203, y: 290..315, char: '_' },
-        { x: 0..239, y: 290..315, char: :enter }
+        { x: 0..34,  y: 191..209, char: '1' },
+        { x: 0..46,  y: 191..209, char: '2' },
+        { x: 0..65,  y: 191..209, char: '3' },
+        { x: 0..96,  y: 191..209, char: '4' },
+        { x: 0..115, y: 191..209, char: '5' },
+        { x: 0..145, y: 191..209, char: '6' },
+        { x: 0..161, y: 191..209, char: '7' },
+        { x: 0..191, y: 191..209, char: '8' },
+        { x: 0..216, y: 191..209, char: '9' },
+        { x: 0..255, y: 191..209, char: '0' },
+        { x: 0..31,  y: 223..241, char: '%' },
+        { x: 0..52,  y: 223..241, char: '#' },
+        { x: 0..77,  y: 223..241, char: '$' },
+        { x: 0..97,  y: 223..241, char: '_' },
+        { x: 0..121, y: 223..241, char: '&' },
+        { x: 0..143, y: 223..241, char: '-' },
+        { x: 0..168, y: 223..241, char: '+' },
+        { x: 0..186, y: 223..241, char: '(' },
+        { x: 0..215, y: 223..241, char: ')' },
+        { x: 0..236, y: 223..241, char: '/' },
+        { x: 0..42,  y: 223..274, char: :keyboard_symbol_number_2 },
+        { x: 0..60,  y: 223..274, char: '*' },
+        { x: 0..84,  y: 223..274, char: '"' },
+        { x: 0..107, y: 223..274, char: "'" },
+        { x: 0..130, y: 223..274, char: ':' },
+        { x: 0..152, y: 223..274, char: ';' },
+        { x: 0..171, y: 223..274, char: '!' },
+        { x: 0..197, y: 223..274, char: '?' },
+        { x: 0..255, y: 223..274, char: :erase },
+        { x: 0..36,  y: 223..315, char: :keyboard_capital },
+        { x: 0..63,  y: 223..315, char: '@' },
+        { x: 0..88,  y: 223..315, char: ',' },
+        { x: 0..152, y: 223..315, char: :space },
+        { x: 0..168, y: 223..315, char: '.' },
+        { x: 0..255, y: 223..315, char: :enter }
+      ],
+
+      keyboard_symbol_number_2: [
+        { x: 0..34,  y: 191..209, char: '1' },
+        { x: 0..46,  y: 191..209, char: '2' },
+        { x: 0..69,  y: 191..209, char: '3' },
+        { x: 0..96,  y: 191..209, char: '4' },
+        { x: 0..115, y: 191..209, char: '5' },
+        { x: 0..145, y: 191..209, char: '6' },
+        { x: 0..161, y: 191..209, char: '7' },
+        { x: 0..191, y: 191..209, char: '8' },
+        { x: 0..216, y: 191..209, char: '9' },
+        { x: 0..255, y: 191..209, char: '0' },
+        { x: 0..35,  y: 223..241, char: '^' },
+        { x: 0..63,  y: 223..241, char: '[' },
+        { x: 0..97,  y: 223..241, char: ']' },
+        { x: 0..128, y: 223..241, char: '{' },
+        { x: 0..158, y: 223..241, char: '}' },
+        { x: 0..193, y: 223..241, char: '<' },
+        { x: 0..255, y: 223..241, char: '>' },
+        { x: 0..39,  y: 223..274, char: :keyboard_symbol_number },
+        { x: 0..63,  y: 223..274, char: '\\' },
+        { x: 0..86,  y: 223..274, char: '-' },
+        { x: 0..106, y: 223..274, char: '+' },
+        { x: 0..130, y: 223..274, char: '=' },
+        { x: 0..149, y: 223..274, char: '_' },
+        { x: 0..175, y: 223..274, char: '˜' },
+        { x: 0..195, y: 223..274, char: '|' },
+        { x: 0..255, y: 223..274, char: :erase },
+        { x: 0..34,  y: 223..310, char: :keyboard_capital },
+        { x: 0..61,  y: 223..310, char: '@' },
+        { x: 0..87,  y: 223..310, char: ',' },
+        { x: 0..146, y: 223..313, char: :space },
+        { x: 0..168, y: 223..311, char: '.' },
+        { x: 0..194, y: 223..319, char: :enter }
       ]
     }
 
@@ -117,9 +159,11 @@ class Device
       phisical_keys = ['0', '1', '2', '3', '4', '5', '6', '7', '8', '9', "\017"]
       change_keyboard
       Device::Display.print_line("#{self.text}", params[:line], params[:column])
-      time = Time.now + (params[:timeout] || Device::IO.timeout) / 1000
-      key = nil
+      if params[:timeout_enabled]
+        time = Time.now + (params[:timeout] || Device::IO.timeout) / 1000
+      end
 
+      key = nil
       while text_not_ready?(key)
         line_x, line_y = getxy_stream(100)
 
@@ -127,8 +171,9 @@ class Device
           touch_clear
           key = parse(line_x, line_y, params)
         else
-          break(Device::IO::KEY_TIMEOUT) if Time.now > time
-
+          if params[:timeout_enabled]
+            break(Device::IO::KEY_TIMEOUT) if Time.now > time
+          end
           key = getc(100)
           if phisical_keys.include?(key)
             if key == Device::IO::BACK
@@ -161,7 +206,7 @@ class Device
 
     def self.show_text(key, params)
       case key[:char]
-      when :keyboard_uppercase, :keyboard_symbol_number, :keyboard_capital
+      when :keyboard_uppercase, :keyboard_symbol_number, :keyboard_symbol_number_2, :keyboard_capital
         self.type = key[:char]
         change_keyboard
       when :erase
@@ -170,7 +215,9 @@ class Device
       when :space
         self.text += ' '
       else
-        self.text << key[:char] unless key[:char] == :enter
+        if self.text && self.text.size < 20
+          self.text << key[:char] unless key[:char] == :enter
+        end
       end
       Device::Display.print_line("#{self.text}", params[:line], params[:column])
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: da_funk
 version: !ruby/object:Gem::Version
-  version: 3.31.0
+  version: 3.32.0
 platform: ruby
 authors:
 - Thiago Scalone
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-27 00:00:00.000000000 Z
+date: 2021-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -259,7 +259,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: MRuby Embedded System Framework