da_funk 3.25.0 → 3.28.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/Gemfile.lock +7 -7
- data/RELEASE_NOTES.md +24 -0
- data/lib/da_funk/engine.rb +7 -2
- data/lib/da_funk/helper/status_bar.rb +12 -9
- data/lib/da_funk/i18n.rb +5 -1
- data/lib/da_funk/params_dat.rb +8 -4
- data/lib/da_funk/payment_channel.rb +1 -2
- data/lib/da_funk/version.rb +1 -1
- data/lib/device/setting.rb +2 -1
- data/lib/device/virtual_keyboard.rb +2 -2
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 311e4bb5dbb5ecdb3a478dd44abf39209723de9dc7fd5e5fa9d0cc862d164392
|
4
|
+
data.tar.gz: 708e6b4ad318d18bc9f5b5e46a5fd3a6132f82f36550aa77f715f901d13cbf33
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 67ddb6cbebcbe026dddc91bd4eb4eadbdb0a5e8a3f1d24f83677afbcc2249ab78ff2847618770492e0fa8223d771df9d3f8aa00708be1431f8255fd3d677ee4a
|
7
|
+
data.tar.gz: ded4f9f7947ca0423b946426bc7a1a440b88ecfa499acfd0f3f9e05c61c369c690f25511d6c1b3bb1b6008679722d88aaef8ee7378aea62abaef2a744f177c56
|
data/Gemfile.lock
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
PATH
|
2
2
|
remote: .
|
3
3
|
specs:
|
4
|
-
da_funk (3.
|
4
|
+
da_funk (3.28.1)
|
5
5
|
archive-zip (~> 0.5)
|
6
6
|
bundler
|
7
7
|
cloudwalk_handshake
|
@@ -18,7 +18,7 @@ GEM
|
|
18
18
|
cloudwalk (1.15.0)
|
19
19
|
bundler
|
20
20
|
rake
|
21
|
-
cloudwalk_handshake (1.
|
21
|
+
cloudwalk_handshake (1.20.0)
|
22
22
|
funky-simplehttp (~> 0.6)
|
23
23
|
funky-emv (1.4.1)
|
24
24
|
funky-tlv (~> 0.2)
|
@@ -35,17 +35,17 @@ GEM
|
|
35
35
|
rake (13.0.1)
|
36
36
|
regexp_parser (1.7.1)
|
37
37
|
rexml (3.2.4)
|
38
|
-
rubocop (0.
|
38
|
+
rubocop (0.90.0)
|
39
39
|
parallel (~> 1.10)
|
40
|
-
parser (>= 2.7.
|
40
|
+
parser (>= 2.7.1.1)
|
41
41
|
rainbow (>= 2.2.2, < 4.0)
|
42
42
|
regexp_parser (>= 1.7)
|
43
43
|
rexml
|
44
|
-
rubocop-ast (>= 0.0
|
44
|
+
rubocop-ast (>= 0.3.0, < 1.0)
|
45
45
|
ruby-progressbar (~> 1.7)
|
46
46
|
unicode-display_width (>= 1.4.0, < 2.0)
|
47
|
-
rubocop-ast (0.0
|
48
|
-
parser (>= 2.7.
|
47
|
+
rubocop-ast (0.4.0)
|
48
|
+
parser (>= 2.7.1.4)
|
49
49
|
ruby-progressbar (1.10.1)
|
50
50
|
unicode-display_width (1.7.0)
|
51
51
|
yard (0.9.25)
|
data/RELEASE_NOTES.md
CHANGED
@@ -1,5 +1,29 @@
|
|
1
1
|
# DaFunk
|
2
2
|
|
3
|
+
### 3.28.1 - 2020-09-26
|
4
|
+
|
5
|
+
- Close socket in case of ssl exceptions;
|
6
|
+
- Do not assign nil to PaymentChannel#current and client on error because this is already being done on PaymentChannel#close.
|
7
|
+
|
8
|
+
### 3.28.0 - 2020-09-25
|
9
|
+
|
10
|
+
- Check if system update file is present after device restart in order to continue with system update process;
|
11
|
+
- Implemented block to write and break line if message has '\n'.
|
12
|
+
|
13
|
+
### 3.27.0 - 2020-09-25
|
14
|
+
|
15
|
+
- Print bitmap if exists on DaFunk::ParamsDat#restart;
|
16
|
+
- Add main application version on config.dat file.
|
17
|
+
|
18
|
+
### 3.26.0 - 2020-09-14
|
19
|
+
|
20
|
+
- Fixed error on virtual keyboard, chars y and Y were duplicated;
|
21
|
+
- Update cloudwalk_handshake (1.20.0).
|
22
|
+
|
23
|
+
### 3.25.1 - 2020-08-28
|
24
|
+
|
25
|
+
- Set DaFunk::Helper::StatusBar#connected as false on system update process so it will cache again.
|
26
|
+
|
3
27
|
### 3.25.0 - 2020-08-18
|
4
28
|
|
5
29
|
- Added switch_http_enabled setting;
|
data/lib/da_funk/engine.rb
CHANGED
@@ -1,8 +1,13 @@
|
|
1
1
|
module DaFunk
|
2
2
|
class Engine
|
3
3
|
def self.check
|
4
|
-
|
5
|
-
|
4
|
+
if Device::Setting.boot == '1'
|
5
|
+
DaFunk::EventListener.check(:file_exists) #to check if system update is in progress
|
6
|
+
Device::Setting.boot = '0'
|
7
|
+
else
|
8
|
+
DaFunk::EventListener.check
|
9
|
+
ThreadScheduler.keep_alive
|
10
|
+
end
|
6
11
|
end
|
7
12
|
|
8
13
|
def self.app_loop(&block)
|
@@ -90,25 +90,28 @@ module DaFunk
|
|
90
90
|
if File.exists?('./shared/system_update')
|
91
91
|
PAX::Display.print_status_bar(SLOT_UPDATE, "./shared/system_update_download.png")
|
92
92
|
PAX::Display.print_status_bar(3, nil)
|
93
|
+
self.connected = false
|
93
94
|
else
|
94
95
|
change_message
|
95
96
|
end
|
96
97
|
end
|
97
98
|
|
98
99
|
def self.change_message
|
99
|
-
|
100
|
+
unless File.exists?('./shared/system_update')
|
101
|
+
connected = Device::Network.connected?
|
100
102
|
|
101
|
-
|
102
|
-
|
103
|
+
if connected != self.connected
|
104
|
+
self.connected = connected
|
103
105
|
|
104
|
-
|
105
|
-
|
106
|
+
slot_message_1 = SLOT_MESSAGE_CONNECTION[self.connected][:slot1]
|
107
|
+
slot_message_2 = SLOT_MESSAGE_CONNECTION[self.connected][:slot2]
|
106
108
|
|
107
|
-
|
108
|
-
|
109
|
+
message_1 = SLOT_MESSAGE_CONNECTION[self.connected][:message1]
|
110
|
+
message_2 = SLOT_MESSAGE_CONNECTION[self.connected][:message2]
|
109
111
|
|
110
|
-
|
111
|
-
|
112
|
+
Device::Display.print_status_bar(slot_message_1, message_1)
|
113
|
+
Device::Display.print_status_bar(slot_message_2, message_2)
|
114
|
+
end
|
112
115
|
end
|
113
116
|
end
|
114
117
|
|
data/lib/da_funk/i18n.rb
CHANGED
@@ -73,7 +73,11 @@ class I18n
|
|
73
73
|
|
74
74
|
def self.pt(symbol, options = {})
|
75
75
|
if options[:line] || options[:column]
|
76
|
-
|
76
|
+
line = options[:line] || 0
|
77
|
+
t(symbol, options).split("\n").each do |message|
|
78
|
+
Device::Display.print_line(message, line, options[:column] || 0)
|
79
|
+
line+=1
|
80
|
+
end
|
77
81
|
else
|
78
82
|
puts(t(symbol, options))
|
79
83
|
end
|
data/lib/da_funk/params_dat.rb
CHANGED
@@ -151,10 +151,14 @@ module DaFunk
|
|
151
151
|
|
152
152
|
def self.restart
|
153
153
|
Device::Display.clear
|
154
|
-
|
155
|
-
|
156
|
-
|
157
|
-
|
154
|
+
if File.exists?('./shared/init_reboot.bmp')
|
155
|
+
Device::Display.print_bitmap('./shared/init_reboot.bmp')
|
156
|
+
else
|
157
|
+
I18n.pt(:admin_main_update_message)
|
158
|
+
3.times do |i|
|
159
|
+
Device::Display.print("REBOOTING IN #{3 - i}",3,3)
|
160
|
+
sleep(1)
|
161
|
+
end
|
158
162
|
end
|
159
163
|
Device::System.restart
|
160
164
|
end
|
data/lib/da_funk/version.rb
CHANGED
data/lib/device/setting.rb
CHANGED
@@ -28,7 +28,7 @@ class Device
|
|
28
28
|
{ x: 0..201, y: 223..241, char: 'k' },
|
29
29
|
{ x: 0..230, y: 223..241, char: 'l' },
|
30
30
|
{ x: 0..30, y: 223..273, char: :keyboard_uppercase },
|
31
|
-
{ x: 0..56, y: 223..273, char: '
|
31
|
+
{ x: 0..56, y: 223..273, char: 'z' },
|
32
32
|
{ x: 0..82, y: 223..273, char: 'x' },
|
33
33
|
{ x: 0..109, y: 223..273, char: 'c' },
|
34
34
|
{ x: 0..130, y: 223..273, char: 'v' },
|
@@ -65,7 +65,7 @@ class Device
|
|
65
65
|
{ x: 0..201, y: 223..241, char: 'K' },
|
66
66
|
{ x: 0..230, y: 223..241, char: 'L' },
|
67
67
|
{ x: 0..30, y: 223..273, char: :keyboard_capital },
|
68
|
-
{ x: 0..56, y: 223..273, char: '
|
68
|
+
{ x: 0..56, y: 223..273, char: 'Z' },
|
69
69
|
{ x: 0..82, y: 223..273, char: 'X' },
|
70
70
|
{ x: 0..109, y: 223..273, char: 'C' },
|
71
71
|
{ x: 0..130, y: 223..273, char: 'V' },
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: da_funk
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 3.
|
4
|
+
version: 3.28.1
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Thiago Scalone
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2020-
|
11
|
+
date: 2020-09-26 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: rake
|