da_funk 3.29.1 → 3.33.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 451f1a04625db6dbf5b6e90813c47a8419fbe68cfff6ba8c7ccbc233423e5253
-  data.tar.gz: 0d4347d21f0bb1eaff18a4dab1d70d2b573ecb82ffd7da0a0b87bf0dd94bcf6c
+  metadata.gz: 8eeac1f3c7449183cfd65b190bd2ca9515f586eb55af7e70fa6ac38762a8ae80
+  data.tar.gz: be5906723b2ef951f592bf8434626f7cac9b20a01f699432132692e0a2df8428
 SHA512:
-  metadata.gz: 103db5599eafffef2a1d29ebe0f82ed0bbccf358af999ec769f81153769d099e6f62e25acc9c49e5dde401b501f886e40b128a9634f1438f8d2d5bbc42ebbfba
-  data.tar.gz: cf0561ec14063622c8a694eb2d5cc9b4eb37188c2edea91ce2eea6830c357dfa8646c8792fe956ad430356614da9006a155b77505301aca9fc191a813356227a
+  metadata.gz: 9667b789d09b2d1ccc41734b1112a243eec58e91504c85618f9177c4e007ab9ec59e857c99f867295794b5bba3d2c33c25e66e2061fa09b47ee2c3c7b2f929b5
+  data.tar.gz: 693e92596f8be1c74e338e2d3b6bebe20d9b4c9f190f4bee820e76046350039cd8317379a3e9b59101183a9525881110a6e8a94c4527d5601de36bb7c00fde77

data/Gemfile.lock

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

data/RELEASE_NOTES.md

@@ -1,5 +1,39 @@
 # DaFunk
 
+### 3.33.1 - 2021-02-19
+
+- Fixed argument being passed to hours2seconds method which was nil;
+
+### 3.33.0 - 2021-02-08
+
+- Added method Device::IO#get_format_or_touchscreen_action;
+- Added support to images on ParamsDat#download, ParamsDat#update_app and ParamsDat#update_file;
+- Return result of ParamsDat#update_apps call to the caller.
+
+### 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);
+- Added support to new main screen when there's a pending sale.
+
+### 3.30.0 - 2020-11-16
+
+- Replace GPRS icon to 3G;
+- Added new method main_image_format on Device::Display;
+- Use main_image_format method to get the image name instead adapter;
+- Added new class DaFunk::Transaction::Reversal.
+
 ### 3.29.1 - 2020-11-04
 
 - Fix battery charging status. When power supply is connected the SDK always returns 50% of battery, in this case it won't show the percentage until the SDK returns 100%.

data/Rakefile

@@ -53,6 +53,7 @@ FILES = FileList[
   "lib/da_funk/application.rb",
   "lib/da_funk/transaction/iso.rb",
   "lib/da_funk/transaction/download.rb",
+  "lib/da_funk/transaction/reversal.rb",
   "lib/da_funk/notification_event.rb",
   "lib/da_funk/notification_callback.rb",
   "lib/da_funk/notification.rb",

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/event_handler.rb

@@ -52,7 +52,7 @@ module DaFunk
       end
 
       unless config["timestamp"]
-        config["timestamp"] = hours2seconds(option["interval"])
+        config["timestamp"] = hours2seconds(option[:hours])
       else
         if config["interval"]["hours"].to_s != option[:hours].to_s
           config["timestamp"] = hours2seconds(option[:hours])

data/lib/da_funk/helper.rb

@@ -61,38 +61,77 @@ module DaFunk
       end
     end
 
-    def check_download_error(ret, enable_txt_ui = true)
-      value = true
+    def check_download_error(download_ret, enable_txt_ui = true)
+      value = false
+
+      if download_ret == DaFunk::Transaction::Download::FILE_NOT_CHANGE
+        if enable_txt_ui
+          I18n.pt(:download_file_is_the_same, :args => [download_ret])
+          getc(1000)
+        end
+        value = true
+      elsif download_ret == DaFunk::Transaction::Download::SUCCESS
+        if enable_txt_ui
+          I18n.pt(:download_success, :args => [download_ret])
+          getc(1000)
+        end
+        value = true
+      end
+      value
+    end
+
+    def show_download_error(download_ret, enable_txt_ui = true)
       ui = {}
 
-      case ret
+      case download_ret
       when DaFunk::Transaction::Download::SERIAL_NUMBER_NOT_FOUND
+        unless enable_txt_ui
+          Device::Display.print_bitmap('./shared/config_fail.bmp')
+          getc(5000)
+        end
         ui[:i18n] = :download_serial_number_not_found
-        value =  false
+        ContextLog.info "[I] Download error, serial number not registered"
       when DaFunk::Transaction::Download::FILE_NOT_FOUND
+        unless enable_txt_ui
+          Device::Display.print_bitmap('./shared/config_fail.bmp')
+          getc(5000)
+        end
         ui[:i18n] = :download_file_not_found
-        value = false
-      when DaFunk::Transaction::Download::FILE_NOT_CHANGE
-        ui[:i18n] = :download_file_is_the_same
-      when DaFunk::Transaction::Download::SUCCESS
-        ui[:i18n] = :download_success
+        ContextLog.info "[I] Download error, file not found"
       when DaFunk::Transaction::Download::COMMUNICATION_ERROR
+        unless enable_txt_ui
+          Device::Display.print_bitmap('./shared/network_system_error.bmp')
+          getc(5000)
+        end
         ui[:i18n] = :download_communication_failure
-        value = false
+        ContextLog.info "[I] Download error, connection problem"
       when DaFunk::Transaction::Download::MAPREDUCE_RESPONSE_ERROR
+        unless enable_txt_ui
+          Device::Display.print_bitmap('./shared/config_fail.bmp')
+          getc(5000)
+        end
         ui[:i18n] = :download_encoding_error
-        value = false
+        ContextLog.info "[I] Download error, encoding problem"
       when DaFunk::Transaction::Download::IO_ERROR
+        unless enable_txt_ui
+          Device::Display.print_bitmap('./shared/config_fail.bmp')
+          getc(5000)
+        end
         ui[:i18n] = :download_io_error
-        value = false
+        ContextLog.info "[I] Download error, IO error"
       else
+        unless enable_txt_ui
+          Device::Display.print_bitmap('./shared/network_system_error.bmp')
+          getc(5000)
+        end
         ui[:i18n] = :download_communication_failure
-        value = false
+        ContextLog.info "[I] Download error, connection problem"
       end
 
-      I18n.pt(ui[:i18n], :args => [ret]) if enable_txt_ui
-
-      value
+      if enable_txt_ui
+        I18n.pt(ui[:i18n], :args => [download_ret])
+        getc(5000)
+      end
     end
 
     def try(tries, &block)

data/lib/da_funk/helper/status_bar.rb

@@ -1,31 +1,75 @@
+#
+# @file status_bar.rb
+# @brief DaFunk status bar helper script.
+# @platform N/A
+#
+# @copyright Copyright (c) 2016 CloudWalk, Inc.
+#
+
 module DaFunk
   module Helper
+    # Status bar class definition.
     class StatusBar
-      STATUS_TIMEOUT          = 60
-      SLOT_MEDIA              = 0
-      SLOT_SIGNAL_LEVEL       = 1
-      SLOT_UPDATE             = 2
+      # Class macros and constants
+      STATUS_TIMEOUT = 60
+      SLOT_MEDIA = 0
+      SLOT_SIGNAL_LEVEL = 1
+      SLOT_UPDATE = 2
       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'
-        }
+      SLOT_BATTERY_LEVEL = 7
+
+      # TODO: review the 'print_status_bar' API to reduce the number of files
+      # to eleven?
+      BATTERY_PERCENTAGE_IMAGES = [
+         './shared/1%.png',  './shared/1%.png',  './shared/2%.png',
+         './shared/3%.png',  './shared/4%.png',  './shared/5%.png',
+         './shared/6%.png',  './shared/7%.png',  './shared/8%.png',
+         './shared/9%.png', './shared/10%.png', './shared/11%.png',
+        './shared/12%.png', './shared/13%.png', './shared/14%.png',
+        './shared/15%.png', './shared/16%.png', './shared/17%.png',
+        './shared/18%.png', './shared/19%.png', './shared/20%.png',
+        './shared/21%.png', './shared/22%.png', './shared/23%.png',
+        './shared/24%.png', './shared/25%.png', './shared/26%.png',
+        './shared/27%.png', './shared/28%.png', './shared/29%.png',
+        './shared/30%.png', './shared/31%.png', './shared/32%.png',
+        './shared/33%.png', './shared/34%.png', './shared/35%.png',
+        './shared/36%.png', './shared/37%.png', './shared/38%.png',
+        './shared/39%.png', './shared/40%.png', './shared/41%.png',
+        './shared/42%.png', './shared/43%.png', './shared/44%.png',
+        './shared/45%.png', './shared/46%.png', './shared/47%.png',
+        './shared/48%.png', './shared/49%.png', './shared/50%.png',
+        './shared/51%.png', './shared/52%.png', './shared/53%.png',
+        './shared/54%.png', './shared/55%.png', './shared/56%.png',
+        './shared/57%.png', './shared/58%.png', './shared/59%.png',
+        './shared/60%.png', './shared/61%.png', './shared/62%.png',
+        './shared/63%.png', './shared/64%.png', './shared/65%.png',
+        './shared/66%.png', './shared/67%.png', './shared/68%.png',
+        './shared/69%.png', './shared/70%.png', './shared/71%.png',
+        './shared/72%.png', './shared/73%.png', './shared/74%.png',
+        './shared/75%.png', './shared/76%.png', './shared/77%.png',
+        './shared/78%.png', './shared/79%.png', './shared/80%.png',
+        './shared/81%.png', './shared/82%.png', './shared/83%.png',
+        './shared/84%.png', './shared/85%.png', './shared/86%.png',
+        './shared/87%.png', './shared/88%.png', './shared/89%.png',
+        './shared/90%.png', './shared/91%.png', './shared/92%.png',
+        './shared/93%.png', './shared/94%.png', './shared/95%.png',
+        './shared/96%.png', './shared/97%.png', './shared/98%.png',
+        './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"
+      ].freeze
+
       BATTERY_IMAGES = {
         0..4     => "./shared/battery0.png",
-        5..9     => "./shared/baterry5.png",
-        10..19   => "./shared/battery10.png",
+        5..19    => "./shared/battery10.png",
         20..29   => "./shared/battery20.png",
         30..39   => "./shared/battery30.png",
         40..49   => "./shared/battery40.png",
@@ -34,48 +78,29 @@ module DaFunk
         70..79   => "./shared/battery70.png",
         80..89   => "./shared/battery80.png",
         90..99   => "./shared/battery90.png",
-        100..100 => "./shared/battery100.png",
-      }
-
-      BATTERY_CHARGE_IMAGES = {
-        50  => "./shared/battery0c.png",
-        100 => "./shared/battery100c.png"
-      }
-
-      BATTERY_PERCENTAGE_IMAGES = {
-        0..4     => "./shared/battery1_percent.png",
-        5..9     => "./shared/battery5_percent.png",
-        10..19   => "./shared/battery10_percent.png",
-        20..29   => "./shared/battery20_percent.png",
-        30..39   => "./shared/battery30_percent.png",
-        40..49   => "./shared/battery40_percent.png",
-        50..59   => "./shared/battery50_percent.png",
-        60..69   => "./shared/battery60_percent.png",
-        70..79   => "./shared/battery70_percent.png",
-        80..89   => "./shared/battery80_percent.png",
-        90..99   => "./shared/battery90_percent.png",
-        100..100 => "./shared/battery100_percent.png",
+        100..100 => "./shared/battery100.png"
       }
 
       WIFI_IMAGES = {
-        0..0    => "./shared/wifi0.png",
-        1..25   => "./shared/wifi25.png",
-        26..50  => "./shared/wifi50.png",
-        59..75  => "./shared/wifi75.png",
-        76..200 => "./shared/wifi100.png"
+        0..0     => "./shared/wifi0.png",
+        1..25    => "./shared/wifi25.png",
+        26..50   => "./shared/wifi50.png",
+        59..75   => "./shared/wifi75.png",
+        76..200  => "./shared/wifi100.png"
       }
 
       MOBILE_IMAGES = {
-        0..0    => "./shared/mobile0.png",
-        1..20   => "./shared/mobile20.png",
-        21..40  => "./shared/mobile40.png",
-        41..60  => "./shared/mobile60.png",
-        61..80  => "./shared/mobile80.png",
-        81..200 => "./shared/mobile100.png"
+        0..0     => "./shared/mobile0.png",
+        1..20    => "./shared/mobile20.png",
+        21..40   => "./shared/mobile40.png",
+        41..60   => "./shared/mobile60.png",
+        61..80   => "./shared/mobile80.png",
+        81..200  => "./shared/mobile100.png"
       }
 
       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
@@ -90,98 +115,127 @@ 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
-          change_message
+          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/GPRS.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,
-                                               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
 
+      # Updates the battery slot whenever a capacity or power supply change is
+      # detected.
       def self.change_battery
-        bat  = Device::System.battery
-        dock = Device::System.power_supply
+        capacity_type = Device::System.battery_capacity_type
+
+        capacity = Device::System.battery
+        charging = Device::System.power_supply
 
-        if self.battery != bat || self.power != dock
-          self.battery = bat
-          self.power   = dock
+        if self.battery != capacity || self.power != charging
 
-          if self.power && self.battery == 50
-            Device::Display.print_status_bar(SLOT_BATTERY_PERCENTUAL, nil)
+          if self.battery.nil? # basic integrity check
+            self.battery = capacity
+          elsif charging
+            capacity >= self.battery && self.battery = capacity
           else
-            percentual = get_image_path(:battery_percentual, self.battery)
-            Device::Display.print_status_bar(SLOT_BATTERY_PERCENTUAL, percentual)
+            capacity <= self.battery && self.battery = capacity
+          end
+
+          if self.power == charging && capacity != self.battery
+            return nil
           end
 
-          if self.power
-            Device::Display.print_status_bar(
-              SLOT_BATTERY_LEVEL, get_image_path(:battery_charge, self.battery))
+          self.power = charging
+
+          rsc = self.get_image_path(self.power ? :battery_charge : :battery, self.battery)
+
+          Device::Display.print_status_bar(SLOT_BATTERY_LEVEL, rsc)
+
+          if capacity_type == 'percentage' || !self.power
+            rsc = self.get_image_path(:battery_percentual, self.battery)
           else
-            Device::Display.print_status_bar(SLOT_BATTERY_LEVEL,
-                                             get_image_path(:battery, self.battery))
+            rsc = nil
           end
+
+          Device::Display.print_status_bar(SLOT_BATTERY_PERCENTUAL, rsc)
         end
       end
 
+      # Searches for the correspondent image to 'type' and 'signal strength'.
       def self.get_image_path(type, sig)
         return if sig.nil?
         case type
         when :gprs
-          MOBILE_IMAGES.each {|k,v| return v if k.include? sig }
+          MOBILE_IMAGES.each do |k, v|
+            return v if k.include? sig
+          end
         when :wifi
-          WIFI_IMAGES.each {|k,v| return v if k.include? sig }
+          WIFI_IMAGES.each do |k, v|
+            return v if k.include? sig
+          end
         when :battery
-          BATTERY_IMAGES.each {|k,v| return v if k.include? sig }
+          BATTERY_IMAGES.each do |k, v|
+            return v if k.include? sig
+          end
         when :battery_charge
-          BATTERY_CHARGE_IMAGES[sig]
+          if sig < 100
+            BATTERY_CHARGING[0]
+          else
+            BATTERY_CHARGING[1]
+          end
         when :battery_percentual
-          BATTERY_PERCENTAGE_IMAGES.each {|k,v| return v if k.include? sig }
+          BATTERY_PERCENTAGE_IMAGES[sig]
         else
           nil
         end
       end
 
-      self.managment      ||= true
+      self.managment ||= true
       def self.valid?
         if self.managment
           true
@@ -190,4 +244,3 @@ module DaFunk
     end
   end
 end
-

data/lib/da_funk/params_dat.rb

@@ -1,6 +1,10 @@
 module DaFunk
   class ParamsDat
-    FILE_NAME = "./main/params.dat"
+    FILE_NAME                   = "./main/params.dat"
+    SEARCHING_IMAGE_PATH        = './shared/searching_updates_app.bmp'
+    UPDATING_IMAGE_PATH         = './shared/updating.bmp'
+    ATTACH_IMAGE_PATH           = './shared/network_conectar_init.bmp'
+    CONNECTION_ERROR_IMAGE_PATH = './shared/network_system_error.bmp'
 
     include DaFunk::Helper
 
@@ -117,31 +121,40 @@ module DaFunk
     end
 
     def self.download(enable_txt_ui = true)
+      ret          = false
+      download_ret = false
+      Device::Display.print_bitmap(ATTACH_IMAGE_PATH) unless enable_txt_ui
       if attach(attach_options(enable_txt_ui))
         parse
-        ret = try(3) do |attempt|
+        try(3) do |attempt|
           if enable_txt_ui
             Device::Display.clear
             I18n.pt(:downloading_content, :args => ["PARAMS", 1, 1])
+            getc(100)
           end
-          getc(100)
-          ret = DaFunk::Transaction::Download.request_param_file(FILE_NAME)
-          unless check_download_error(ret, enable_txt_ui)
-            getc(2000)
-            false
-          else
-            true
-          end
+          Device::Display.print_bitmap(SEARCHING_IMAGE_PATH) unless enable_txt_ui
+          download_ret = DaFunk::Transaction::Download.request_param_file(FILE_NAME)
+          ret = check_download_error(download_ret, enable_txt_ui)
         end
+        show_download_error(download_ret, enable_txt_ui) unless ret
         parse if ret
-        ret
+      else
+        unless enable_txt_ui
+          Device::Display.print_bitmap(CONNECTION_ERROR_IMAGE_PATH)
+          getc(5000)
+        end
       end
+      ret
     end
 
     def self.update_apps(force_params = false, force_crc = false, force = false, enable_txt_ui = true)
-      self.download(enable_txt_ui) if force_params || ! self.valid
+      ret = true
+      if force_params || ! self.valid
+        ret = self.download(enable_txt_ui)
+      end
+
       main_updated = nil
-      if self.valid
+      if self.valid && ret
         apps_to_update = self.outdated_apps(force_crc, force)
         size_apps = apps_to_update.size
         apps_to_update.each_with_index do |app, index|
@@ -149,12 +162,15 @@ module DaFunk
           main_updated ||= (ret && app.main_application?)
         end
 
-        files_to_update = self.outdated_files(force_crc, force)
-        size_files = files_to_update.size
-        files_to_update.each_with_index do |file_, index|
-          self.update_file(file_, index+1, size_files, force_crc || force, enable_txt_ui)
+        if ret
+          files_to_update = self.outdated_files(force_crc, force)
+          size_files = files_to_update.size
+          files_to_update.each_with_index do |file_, index|
+            ret = self.update_file(file_, index+1, size_files, force_crc || force, enable_txt_ui)
+          end
         end
       end
+      ret
     ensure
       self.restart if main_updated
     end
@@ -199,34 +215,58 @@ module DaFunk
     end
 
     def self.update_app(application, index = 1, all = 1, force = false, enable_txt_ui = true)
+      ret          = false
+      download_ret = false
+      Device::Display.print_bitmap(ATTACH_IMAGE_PATH) unless enable_txt_ui
       if attach(attach_options(enable_txt_ui)) && application
         try(3) do |attempt|
           if enable_txt_ui
             Device::Display.clear
             I18n.pt(:downloading_content, :args => [I18n.t(:apps), index, all])
+            getc(100)
           end
-          getc(100)
-          ret = check_download_error(application.download(force), enable_txt_ui)
-          getc(1000)
-          ret
+          Device::Display.print_bitmap(UPDATING_IMAGE_PATH) unless enable_txt_ui
+          download_ret = application.download(force)
+          ret = check_download_error(download_ret, enable_txt_ui)
+        end
+        show_download_error(download_ret, enable_txt_ui) unless ret
+      else
+        unless enable_txt_ui
+          Device::Display.print_bitmap(CONNECTION_ERROR_IMAGE_PATH)
+          getc(5000)
         end
       end
+      ret
     end
 
     def self.update_file(file_parameter, index = 1, all = 1, force = false, enable_txt_ui = true)
+      ret          = false
+      download_ret = false
+      Device::Display.print_bitmap(ATTACH_IMAGE_PATH) unless enable_txt_ui
       if attach(attach_options(enable_txt_ui)) && file_parameter
         try(3) do |attempt|
           if enable_txt_ui
             Device::Display.clear
             I18n.pt(:downloading_content, :args => [I18n.t(:files), index, all])
+            getc(100)
+          end
+          Device::Display.print_bitmap(UPDATING_IMAGE_PATH) unless enable_txt_ui
+          download_ret = file_parameter.download(force)
+          ret = check_download_error(download_ret, enable_txt_ui)
+          if ret
+            file_parameter.unzip
+            getc(1000)
           end
-          getc(100)
-          ret = check_download_error(file_parameter.download(force), enable_txt_ui)
-          file_parameter.unzip if ret
-          getc(1000)
           ret
         end
+        show_download_error(download_ret, enable_txt_ui) unless ret
+      else
+        unless enable_txt_ui
+          Device::Display.print_bitmap(CONNECTION_ERROR_IMAGE_PATH)
+          getc(5000)
+        end
       end
+      ret
     end
 
     def self.apps

data/lib/da_funk/rake_task.rb

@@ -31,7 +31,7 @@ module DaFunk
       @resources_out     ||= @resources.pathmap("%{resources,#{File.join(root_path, "out")}}p")
       @tests_res_out     ||= @tests_resources.pathmap("%{test/resources,out}p")
       @mruby             ||= "cloudwalk run -b"
-      @mrbc              = get_mrbc_bin(@mrbc)
+      @mrbc                = get_mrbc_bin(@mrbc)
 
       define
     end
@@ -44,14 +44,21 @@ module DaFunk
       end
     end
 
+    # Searches for a mrbc binary.
     def get_mrbc_bin(from_user)
-      if (! system("type mrbc > /dev/null 2>&1 ")) && from_user
+      device = "/dev/null"
+
+      if %w[i386-mingw32 x64-mingw32].include?(RUBY_PLATFORM) && !ENV['SHELL']
+        device = "NUL" # Windows Command Prompt
+      end
+
+      if !system("type mrbc > #{device} 2>&1") && from_user
         from_user
-      elsif system("type mrbc > /dev/null 2>&1 ")
+      elsif system("type mrbc > #{device} 2>&1")
         "env mrbc"
       elsif ENV["MRBC"]
         ENV["MRBC"]
-      elsif system("type cloudwalk > /dev/null 2>&1 ")
+      elsif system("type cloudwalk > #{device} 2>&1")
         "env cloudwalk compile"
       else
         puts "$MRBC isn't set or mrbc/cloudwalk isn't on $PATH"
@@ -64,7 +71,7 @@ module DaFunk
       command_line     = File.join(File.dirname(__FILE__), "..", "..", "utils", "command_line_platform.rb")
       command_line_obj = File.join(root_path, "out", "main", "command_line_platform.mrb")
       all_files        = FileList["test/test_helper.rb"] + libs + files + [command_line] + [File.join(File.dirname(__FILE__), "..", "..", "utils", "test_run.rb")]
-      if platform_call("#{mrbc} -g -o #{command_line_obj} #{command_line}") && platform_call("#{mrbc} -g -o #{test_out} #{all_files.uniq}")
+      if platform_call("#{@mrbc} -g -o #{command_line_obj} #{command_line}") && platform_call("#{@mrbc} -g -o #{test_out} #{all_files.uniq}")
         puts "cd #{File.dirname(out_path)}"
         FileUtils.cd File.dirname(out_path)
         platform_call("#{mruby} #{File.join(name, "test.mrb")}")
@@ -108,7 +115,7 @@ module DaFunk
 
       desc "Compile app to mrb and process resources"
       task :build => :resources do
-        platform_call "#{mrbc} #{debug_flag} -o #{main_out} #{libs} "
+        platform_call "#{@mrbc} #{debug_flag} -o #{main_out} #{libs} "
       end
 
       desc "Compile, build and pack app and resources"

data/lib/da_funk/transaction/reversal.rb

@@ -0,0 +1,13 @@
+module DaFunk
+  class Transaction
+    class Reversal
+      def self.filename
+        DaFunk::ParamsDat.file['reversal_file_name'] || 'cw_reversal_transact.dat'
+      end
+
+      def self.exists?
+        File.exists? "./shared/#{filename}"
+      end
+    end
+  end
+end

data/lib/da_funk/version.rb

@@ -1,4 +1,4 @@
 module DaFunk
-  VERSION="3.29.1"
+  VERSION="3.33.1"
 end
 

data/lib/device/display.rb

@@ -71,13 +71,23 @@ class Device
     end
 
     def self.main_image
-      if adapter.respond_to?(:main_image) &&
-        File.exists?("./shared/#{adapter.main_image}")
-        adapter.main_image
+      file = main_image_format
+      if File.exists?("./shared/#{file}")
+        file
       else
         MAIN_BMP
       end
     end
+
+    private
+    def self.main_image_format
+      major, min, patch = Device.version.to_s.split('.').map { |v| v.to_i }
+      if DaFunk::Transaction::Reversal.exists? && major >= 8
+        "main_#{Device::System.model}_reversal.bmp"
+      else
+        "main_#{Device::System.model}.bmp"
+      end
+    end
   end
 end
 

data/lib/device/io.rb

@@ -161,6 +161,59 @@ class Device
       end
     end
 
+    def self.get_format_or_touchscreen_action(max, touch_map, options = {})
+      set_default_format_option(options)
+      key = text = options[:value] || ""
+      time = Time.now + (options[:timeout] || 30000) / 1000
+      ret = {}
+      touch_clear
+      Device::Display.clear options[:line]
+      Device::Display.print_line format(text, options), options[:line], options[:column]
+      loop do
+        line_x, line_y = getxy_stream(100)
+        if line_x && line_y
+          ret = parse_touchscreen(touch_map, line_x, line_y)
+          break(ret) if ret.include?(:touch_action)
+        else
+          key = getc(100)
+          if key == BACK
+            text = text[0..-2]
+            Device::Display.clear options[:line]
+            Device::Display.print_line format(text, options), options[:line], options[:column]
+          elsif options[:timeout_enabled] && time < Time.now
+            ret[:timeout] = Device::IO::KEY_TIMEOUT
+            break(ret)
+          elsif key == ENTER
+            ret[:text] = text
+            break(ret)
+          elsif key == CANCEL
+            ret[:cancel] = Device::IO::CANCEL
+            break(ret)
+          elsif key == F1 || key == DOWN || key == UP || key == ALPHA
+            change_next(text, check_mask_type(text, options))
+            next
+          elsif text.size >= max
+            next
+          elsif insert_key?(key, options)
+            text << key
+            Device::Display.clear options[:line]
+            Device::Display.print_line format(text, options), options[:line], options[:column]
+          end
+        end
+      end
+    end
+
+    def self.parse_touchscreen(touch_map, line_x, line_y)
+      ret = {}
+      touch_map.each do |key, value|
+        if value[:x].include?(line_x) && value[:y].include?(line_y)
+          Device::Audio.beep(7, 60)
+          ret[:touch_action] = key
+        end
+      end
+      ret
+    end
+
     def self.set_default_format_option(options)
       options[:mode]   ||= IO_INPUT_LETTERS
       options[:line]   ||= 2

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/system.rb

@@ -45,6 +45,15 @@ class Device
       adapter.battery
     end
 
+    # Checks the type of the battery capacity return (percentage or scale).
+    def self.battery_capacity_type
+      begin
+        adapter.battery_capacity_type
+      rescue StandardError => exception
+        'scale'
+      end
+    end
+
     def self.beep
       adapter.beep
     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.29.1
+  version: 3.33.1
 platform: ruby
 authors:
 - Thiago Scalone
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-04 00:00:00.000000000 Z
+date: 2021-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -179,6 +179,7 @@ files:
 - lib/da_funk/test.rb
 - lib/da_funk/transaction/download.rb
 - lib/da_funk/transaction/iso.rb
+- lib/da_funk/transaction/reversal.rb
 - lib/da_funk/version.rb
 - lib/device.rb
 - lib/device/audio.rb
@@ -258,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