da_funk 3.24.4 → 3.28.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6d190ea42757a9e1a847740dc4321adcc7bf2bf356f90185fdd8c8b7de3c2398
-  data.tar.gz: b116514238c4c9b2d0458b08231619cbeaa8533ba264491716d5685fd64bbf13
+  metadata.gz: 489f56230d69c2a02818b0e7ca0b33e9a5c425281c79def3a8c5c2361f213c95
+  data.tar.gz: e135956873a9b50834d1672409fa9a3366647348b1da50859285a5c2289eff6a
 SHA512:
-  metadata.gz: 0bedf7264f973b4f96e7de1f8e70a599e47e026cc5c00a1b2418674ab6ed32a32a178b41fa6d4d8ecb5ed5a23ec46bfd894a5b087e71d26997b8326c10d26f56
-  data.tar.gz: c3d53db9952a1e942ba42308491726700809ad5435c1d66d7b8c9dd67099b737063b540e9f0a64f8aede8aed718c1aefcca456ba3658c12f575b4c18d8956305
+  metadata.gz: 26fa00576ee5e90f59da9391bd13eaaf46cad4aa513d2d679f8e1de23d4190ba269c734a40b443ee954360436932f66d1a6ac691e5de72d2c58c838a50108f72
+  data.tar.gz: 1c5de9a5fd5da14b6ee2c2d92a5af01f8227ff5e17bd4129fe4d6fecebbded54a9553502a17115e75c1237f8574f147f3d0aad7653ee7b8718e85e4d95a98c02

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    da_funk (3.24.4)
+    da_funk (3.28.0)
       archive-zip (~> 0.5)
       bundler
       cloudwalk_handshake
@@ -18,7 +18,7 @@ GEM
     cloudwalk (1.15.0)
       bundler
       rake
-    cloudwalk_handshake (1.14.0)
+    cloudwalk_handshake (1.20.0)
       funky-simplehttp (~> 0.6)
     funky-emv (1.4.1)
       funky-tlv (~> 0.2)
@@ -35,17 +35,17 @@ GEM
     rake (13.0.1)
     regexp_parser (1.7.1)
     rexml (3.2.4)
-    rubocop (0.86.0)
+    rubocop (0.90.0)
       parallel (~> 1.10)
-      parser (>= 2.7.0.1)
+      parser (>= 2.7.1.1)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.7)
       rexml
-      rubocop-ast (>= 0.0.3, < 1.0)
+      rubocop-ast (>= 0.3.0, < 1.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 2.0)
-    rubocop-ast (0.0.3)
-      parser (>= 2.7.0.1)
+    rubocop-ast (0.4.0)
+      parser (>= 2.7.1.4)
     ruby-progressbar (1.10.1)
     unicode-display_width (1.7.0)
     yard (0.9.25)

data/RELEASE_NOTES.md

@@ -1,5 +1,29 @@
 # DaFunk
 
+### 3.28.0 - 2020-09-25
+
+- Check if system update file is present after device restart in order to continue with system update process;
+- Implemented block to write and break line if message has '\n'.
+
+### 3.27.0 - 2020-09-25
+
+- Print bitmap if exists on DaFunk::ParamsDat#restart;
+- Add main application version on config.dat file.
+
+### 3.26.0 - 2020-09-14
+
+- Fixed error on virtual keyboard, chars y and Y were duplicated;
+- Update cloudwalk_handshake (1.20.0).
+
+### 3.25.1 - 2020-08-28
+
+- Set DaFunk::Helper::StatusBar#connected as false on system update process so it will cache again.
+
+### 3.25.0 - 2020-08-18
+
+- Added switch_http_enabled setting;
+- Removed infinitepay_authorizer and infinitepay_api settings.
+
 ### 3.24.4 - 2020-08-07
 
 - Add defensive code to gsub calls.

data/lib/da_funk/engine.rb

@@ -1,8 +1,13 @@
 module DaFunk
   class Engine
     def self.check
-      DaFunk::EventListener.check
-      ThreadScheduler.keep_alive
+      if Device::Setting.boot == '1'
+        DaFunk::EventListener.check(:file_exists) #to check if system update is in progress
+        Device::Setting.boot = '0'
+      else
+        DaFunk::EventListener.check
+        ThreadScheduler.keep_alive
+      end
     end
 
     def self.app_loop(&block)

data/lib/da_funk/helper/status_bar.rb

@@ -90,25 +90,28 @@ 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
         end
       end
 
       def self.change_message
-        connected = Device::Network.connected?
+        unless File.exists?('./shared/system_update')
+          connected = Device::Network.connected?
 
-        if connected != self.connected
-          self.connected = 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]
+            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]
+            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)
+            Device::Display.print_status_bar(slot_message_1, message_1)
+            Device::Display.print_status_bar(slot_message_2, message_2)
+          end
         end
       end
 

data/lib/da_funk/i18n.rb

@@ -73,7 +73,11 @@ class I18n
 
   def self.pt(symbol, options = {})
     if options[:line] || options[:column]
-      Device::Display.print_line(t(symbol, options), options[:line] || 0, options[:column] || 0)
+      line = options[:line] || 0
+      t(symbol, options).split("\n").each do |message|
+        Device::Display.print_line(message, line, options[:column] || 0)
+        line+=1
+      end
     else
       puts(t(symbol, options))
     end

data/lib/da_funk/params_dat.rb

@@ -151,10 +151,14 @@ module DaFunk
 
     def self.restart
       Device::Display.clear
-      I18n.pt(:admin_main_update_message)
-      3.times do |i|
-        Device::Display.print("REBOOTING IN #{3 - i}",3,3)
-        sleep(1)
+      if File.exists?('./shared/init_reboot.bmp')
+        Device::Display.print_bitmap('./shared/init_reboot.bmp')
+      else
+        I18n.pt(:admin_main_update_message)
+        3.times do |i|
+          Device::Display.print("REBOOTING IN #{3 - i}",3,3)
+          sleep(1)
+        end
       end
       Device::System.restart
     end

data/lib/da_funk/version.rb

@@ -1,4 +1,4 @@
 module DaFunk
-  VERSION="3.24.4"
+  VERSION="3.28.0"
 end
 

data/lib/device/setting.rb

@@ -60,15 +60,15 @@ class Device
       "metadata_timestamp"          => "",
       "payment_channel_attempts"    => "0",
       "payment_channel_date"        => "",
-      "infinitepay_authorizer"      => "1",
-      "infinitepay_api"             => "0",
       "infinitepay_cw_endpoint"     => "1",
       "infinitepay_google_endpoint" => "0",
+      "switch_http_enabled"         => "0",
       "transaction_http_enabled"    => "1",
       "transaction_http_host"       => HTTP_HOST_PRODUCTION,
       "transaction_http_port"       => HTTP_PORT,
       "emv_contactless_amount"      => "0",
-      "network_init"                => ""
+      "network_init"                => "",
+      "main_app_version"            => ""
     }
 
     class << self

data/lib/device/virtual_keyboard.rb

@@ -28,7 +28,7 @@ class Device
         { x: 0..201, y: 223..241, char: 'k' },
         { x: 0..230, y: 223..241, char: 'l' },
         { x: 0..30,  y: 223..273, char: :keyboard_uppercase },
-        { x: 0..56,  y: 223..273, char: 'y' },
+        { x: 0..56,  y: 223..273, char: 'z' },
         { x: 0..82,  y: 223..273, char: 'x' },
         { x: 0..109, y: 223..273, char: 'c' },
         { x: 0..130, y: 223..273, char: 'v' },
@@ -65,7 +65,7 @@ class Device
         { x: 0..201, y: 223..241, char: 'K' },
         { x: 0..230, y: 223..241, char: 'L' },
         { x: 0..30,  y: 223..273, char: :keyboard_capital },
-        { x: 0..56,  y: 223..273, char: 'Y' },
+        { x: 0..56,  y: 223..273, char: 'Z' },
         { x: 0..82,  y: 223..273, char: 'X' },
         { x: 0..109, y: 223..273, char: 'C' },
         { x: 0..130, y: 223..273, char: 'V' },

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: da_funk
 version: !ruby/object:Gem::Version
-  version: 3.24.4
+  version: 3.28.0
 platform: ruby
 authors:
 - Thiago Scalone
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-07 00:00:00.000000000 Z
+date: 2020-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake