Index: btkb/output/eeprom.dat
===================================================================
--- /ZXS_KB_Project/ZXS_SK650_2bt3ch_1026 _MOCHA/btkb/output/eeprom.dat (revision 674)
+++ /ZXS_KB_Project/ZXS_SK650_2bt3ch_1026 _MOCHA/btkb/output/eeprom.dat (working copy)
@@ -8341,11 +8341,11 @@
02
47
09
-4c
+4d
+4f
+43
+48
41
-54
-54
-45
20
33
2e
@@ -9200,11 +9200,11 @@
00
2a
09
-4c
+4d
+4f
+43
+48
41
-54
-54
-45
20
35
2e
@@ -9741,11 +9741,11 @@
19
44
09
-4c
+4d
+4f
+43
+48
41
-54
-54
-45
20
35
2e
@@ -9804,11 +9804,11 @@
1f
0a
09
-4c
+4d
+4f
+43
+48
41
-54
-54
-45
20
35
2e
@@ -10246,7 +10246,7 @@
aa
aa
55
-40
-a8
-28
-35
+f8
+a7
+6f
+d2
Index: btkb/output/sched.rom
===================================================================
--- /ZXS_KB_Project/ZXS_SK650_2bt3ch_1026 _MOCHA/btkb/output/sched.rom (revision 674)
+++ /ZXS_KB_Project/ZXS_SK650_2bt3ch_1026 _MOCHA/btkb/output/sched.rom (working copy)
@@ -79,7 +79,7 @@
mem_lap:36 28 c2 08 66 22
mem_local_name_length:
-'LATTE 3.0
+'MOCHA 3.0
mem_sniff_param_interval:0e 00
mem_sniff_param_attempt:01
mem_sniff_param_timeout:01
@@ -337,7 +337,7 @@
#Characteristic: Device Name
06 00 03 28 01 02
07 00 00 2a
-'LATTE 5.0
+'MOCHA 5.0
#Characteristic: Appearance
08 00 03 28 01 02
@@ -532,7 +532,7 @@
2c 01 #timeout
mem_le_name_len:
-'LATTE 5.0
+'MOCHA 5.0
mem_le_adv_channel_map:07
mem_le_adv_direct_addr_type:01
@@ -547,7 +547,7 @@
mem_le_scan_data_len:1f
mem_le_scan_data:
-'\09LATTE 5.0
+'\09MOCHA 5.0
mem_version_yy_mm_dd:20 21 12 24 #version data 20211224
Index: btkb/sched/kb.dat
===================================================================
--- /ZXS_KB_Project/ZXS_SK650_2bt3ch_1026 _MOCHA/btkb/sched/kb.dat (revision 674)
+++ /ZXS_KB_Project/ZXS_SK650_2bt3ch_1026 _MOCHA/btkb/sched/kb.dat (working copy)
@@ -79,7 +79,7 @@
mem_lap:36 28 c2 08 66 22
mem_local_name_length:
-'LATTE 3.0
+'MOCHA 3.0
mem_sniff_param_interval:0e 00
mem_sniff_param_attempt:01
mem_sniff_param_timeout:01
@@ -337,7 +337,7 @@
#Characteristic: Device Name
06 00 03 28 01 02
07 00 00 2a
-'LATTE 5.0
+'MOCHA 5.0
#Characteristic: Appearance
08 00 03 28 01 02
@@ -532,7 +532,7 @@
2c 01 #timeout
mem_le_name_len:
-'LATTE 5.0
+'MOCHA 5.0
mem_le_adv_channel_map:07
mem_le_adv_direct_addr_type:01
@@ -547,7 +547,7 @@
mem_le_scan_data_len:1f
mem_le_scan_data:
-'\09LATTE 5.0
+'\09MOCHA 5.0
mem_version_yy_mm_dd:20 21 12 24 #version data 20211224
Index: c51/kb_process.c
===================================================================
--- /ZXS_KB_Project/ZXS_SK650_2bt3ch_1026 _MOCHA/c51/kb_process.c (revision 674)
+++ /ZXS_KB_Project/ZXS_SK650_2bt3ch_1026 _MOCHA/c51/kb_process.c (working copy)
@@ -186,7 +186,7 @@
void kb_set_multikey(word multikey_value)
{
- if(mult_key_status != KEY_RELEASE)
+ if(mult_key_status != KEY_WAIT_RELEASE)
{
mult_key_status = KEY_MULIT_PRESS;
multikey[0] = HID_REPORTID_2;
@@ -197,7 +197,7 @@
void kb_set_systemkey(byte systemkey_value)
{
- if(mult_key_status != KEY_RELEASE)
+ if(mult_key_status != KEY_WAIT_RELEASE)
{
mult_key_status = KEY_SYSTEM_PRESS;
system_key_press = 1;
Index: c51/output/FW.COD
===================================================================
--- /ZXS_KB_Project/ZXS_SK650_2bt3ch_1026 _MOCHA/c51/output/FW.COD (revision 674)
+++ /ZXS_KB_Project/ZXS_SK650_2bt3ch_1026 _MOCHA/c51/output/FW.COD (working copy)
@@ -1,4 +1,4 @@
-LX51 LINKER/LOCATER V4.41 05/17/2023 11:52:47 PAGE 1
+LX51 LINKER/LOCATER V4.41 05/24/2023 18:11:13 PAGE 1
@@ -7006,11 +7006,11 @@
;---- Variable 'multikey_value' assigned to Register 'R4/R5' ----
0025CF AD07 MOV R5,AR7
0025D1 AC06 MOV R4,AR6
- 189: if(mult_key_status != KEY_RELEASE)
+ 189: if(mult_key_status != KEY_WAIT_RELEASE)
190: {
0025D3 904E4B MOV DPTR,#mult_key_status
0025D6 E0 MOVX A,@DPTR
-0025D7 6403 XRL A,#03H
+0025D7 6402 XRL A,#02H
0025D9 600E JZ ?C0049?KB_PROCESS
191: mult_key_status = KEY_MULIT_PRESS;
192: multikey[0] = HID_REPORTID_2;
@@ -7707,11 +7707,11 @@
198: void kb_set_systemkey(byte systemkey_value)
199: {
;---- Variable 'systemkey_value' assigned to Register 'R7' ----
- 200: if(mult_key_status != KEY_RELEASE)
+ 200: if(mult_key_status != KEY_WAIT_RELEASE)
201: {
002904 904E4B MOV DPTR,#mult_key_status
002907 E0 MOVX A,@DPTR
-002908 6403 XRL A,#03H
+002908 6402 XRL A,#02H
00290A 6012 JZ ?C0051?KB_PROCESS
202: mult_key_status = KEY_SYSTEM_PRESS;
203: system_key_press = 1;
Index: c51/output/FW.HTM
===================================================================
--- /ZXS_KB_Project/ZXS_SK650_2bt3ch_1026 _MOCHA/c51/output/FW.HTM (revision 674)
+++ /ZXS_KB_Project/ZXS_SK650_2bt3ch_1026 _MOCHA/c51/output/FW.HTM (working copy)
@@ -25,7 +25,7 @@
Created from: LX51 LINKER/LOCATER V4.41
-Creation time: 05/17/2023 11:52:47
+Creation time: 05/24/2023 18:11:13
Index: c51/output/FW.MAP
===================================================================
--- /ZXS_KB_Project/ZXS_SK650_2bt3ch_1026 _MOCHA/c51/output/FW.MAP (revision 674)
+++ /ZXS_KB_Project/ZXS_SK650_2bt3ch_1026 _MOCHA/c51/output/FW.MAP (working copy)
@@ -1,4 +1,4 @@
-LX51 LINKER/LOCATER V4.41 05/17/2023 11:52:46 PAGE 1
+LX51 LINKER/LOCATER V4.41 05/24/2023 18:11:13 PAGE 1
LX51 LINKER/LOCATER V4.41, INVOKED BY:
Index: c51/output/eeprom.dat
===================================================================
--- /ZXS_KB_Project/ZXS_SK650_2bt3ch_1026 _MOCHA/c51/output/eeprom.dat (revision 674)
+++ /ZXS_KB_Project/ZXS_SK650_2bt3ch_1026 _MOCHA/c51/output/eeprom.dat (working copy)
@@ -17882,7 +17882,7 @@
4b
e0
64
-03
+02
60
0e
74
@@ -18699,7 +18699,7 @@
4b
e0
64
-03
+02
60
12
74
@@ -24158,8 +24158,8 @@
5c
f0
22
-52
-05
+53
+b6
aa
55
40
@@ -24311,11 +24311,11 @@
02
47
09
-4c
+4d
+4f
+43
+48
41
-54
-54
-45
20
33
2e
@@ -25170,11 +25170,11 @@
00
2a
09
-4c
+4d
+4f
+43
+48
41
-54
-54
-45
20
35
2e
@@ -25711,11 +25711,11 @@
19
44
09
-4c
+4d
+4f
+43
+48
41
-54
-54
-45
20
35
2e
@@ -25774,11 +25774,11 @@
1f
0a
09
-4c
+4d
+4f
+43
+48
41
-54
-54
-45
20
35
2e
@@ -26212,8 +26212,8 @@
6c
59
50
-e0
-b9
+e4
+ac
ff
ff
ff
Index: c51/output/fw.hex
===================================================================
--- /ZXS_KB_Project/ZXS_SK650_2bt3ch_1026 _MOCHA/c51/output/fw.hex (revision 674)
+++ /ZXS_KB_Project/ZXS_SK650_2bt3ch_1026 _MOCHA/c51/output/fw.hex (working copy)
@@ -603,7 +603,7 @@
:1025A0007448F0A37412F0E4A3F0801AE4904CD5C0
:1025B000F0904D02E0700F904D40F0A37448F0A3EE
:1025C000745DF0E4A3F0904CD5E0904D01F022ADA5
-:1025D00007AC06904E4BE06403600E7401F0904E21
+:1025D00007AC06904E4BE06402600E7401F0904E22
:1025E0004C04F0EFA3F0EEA3F022904ED9EBF0A351
:1025F000EAF0A3E9F0E4A3F0F0904EDCE0FFC3942E
:10260000064003022903904ED9E0FBA3E0FAA3E0C1
@@ -654,7 +654,7 @@
:1028D0004E4BE0B40224904ED9E0FBA3E0FAA3E013
:1028E0002401F9E43AFAA3E07E0029F9EE3AFA125B
:1028F00003B6904DEDF0E41203FC904EDCE004F0E2
-:102900000225F922904E4BE0640360127404F090AB
+:102900000225F922904E4BE0640260127404F090AC
:102910004DE97401F0904E4C7406F0A3EFF0229054
:102920004EE5E4F0A3F0A3F0121A44904EE5EBF06C
:10293000A3EAF0A3E9F04A70026190904EE5E0FB53
Index: c51/output/fwram.rom
===================================================================
--- /ZXS_KB_Project/ZXS_SK650_2bt3ch_1026 _MOCHA/c51/output/fwram.rom (revision 674)
+++ /ZXS_KB_Project/ZXS_SK650_2bt3ch_1026 _MOCHA/c51/output/fwram.rom (working copy)
@@ -9686,7 +9686,7 @@
4b
e0
64
-03
+02
60
0e
74
@@ -10503,7 +10503,7 @@
4b
e0
64
-03
+02
60
12
74
Index: c51/output/sched.rom
===================================================================
--- /ZXS_KB_Project/ZXS_SK650_2bt3ch_1026 _MOCHA/c51/output/sched.rom (revision 674)
+++ /ZXS_KB_Project/ZXS_SK650_2bt3ch_1026 _MOCHA/c51/output/sched.rom (working copy)
@@ -79,7 +79,7 @@
4140:36 28 c2 08 66 22
4702:
-'LATTE 3.0
+'MOCHA 3.0
4280:0e 00
4282:01
4284:01
@@ -337,7 +337,7 @@
#Characteristic: Device Name
06 00 03 28 01 02
07 00 00 2a
-'LATTE 5.0
+'MOCHA 5.0
#Characteristic: Appearance
08 00 03 28 01 02
@@ -532,7 +532,7 @@
2c 01 #timeout
4419:
-'LATTE 5.0
+'MOCHA 5.0
44e4:07
44dd:01
@@ -547,7 +547,7 @@
43f9:1f
43fa:
-'\09LATTE 5.0
+'\09MOCHA 5.0
4d53:20 21 12 24 #version data 20211224
Index: c51/patch/kb.dat
===================================================================
--- /ZXS_KB_Project/ZXS_SK650_2bt3ch_1026 _MOCHA/c51/patch/kb.dat (revision 674)
+++ /ZXS_KB_Project/ZXS_SK650_2bt3ch_1026 _MOCHA/c51/patch/kb.dat (working copy)
@@ -79,7 +79,7 @@
mem_lap:36 28 c2 08 66 22
mem_local_name_length:
-'LATTE 3.0
+'MOCHA 3.0
mem_sniff_param_interval:0e 00
mem_sniff_param_attempt:01
mem_sniff_param_timeout:01
@@ -337,7 +337,7 @@
#Characteristic: Device Name
06 00 03 28 01 02
07 00 00 2a
-'LATTE 5.0
+'MOCHA 5.0
#Characteristic: Appearance
08 00 03 28 01 02
@@ -532,7 +532,7 @@
2c 01 #timeout
mem_le_name_len:
-'LATTE 5.0
+'MOCHA 5.0
mem_le_adv_channel_map:07
mem_le_adv_direct_addr_type:01
@@ -547,7 +547,7 @@
mem_le_scan_data_len:1f
mem_le_scan_data:
-'\09LATTE 5.0
+'\09MOCHA 5.0
mem_version_yy_mm_dd:20 21 12 24 #version data 20211224
Index: c51/patch/sch.rom
===================================================================
--- /ZXS_KB_Project/ZXS_SK650_2bt3ch_1026 _MOCHA/c51/patch/sch.rom (revision 674)
+++ /ZXS_KB_Project/ZXS_SK650_2bt3ch_1026 _MOCHA/c51/patch/sch.rom (working copy)
@@ -79,7 +79,7 @@
mem_lap:36 28 c2 08 66 22
mem_local_name_length:
-'LATTE 3.0
+'MOCHA 3.0
mem_sniff_param_interval:0e 00
mem_sniff_param_attempt:01
mem_sniff_param_timeout:01
@@ -337,7 +337,7 @@
#Characteristic: Device Name
06 00 03 28 01 02
07 00 00 2a
-'LATTE 5.0
+'MOCHA 5.0
#Characteristic: Appearance
08 00 03 28 01 02
@@ -532,7 +532,7 @@
2c 01 #timeout
mem_le_name_len:
-'LATTE 5.0
+'MOCHA 5.0
mem_le_adv_channel_map:07
mem_le_adv_direct_addr_type:01
@@ -547,7 +547,7 @@
mem_le_scan_data_len:1f
mem_le_scan_data:
-'\09LATTE 5.0
+'\09MOCHA 5.0
mem_version_yy_mm_dd:20 21 12 24 #version data 20211224
Index: c51/patch/sched.rom
===================================================================
--- /ZXS_KB_Project/ZXS_SK650_2bt3ch_1026 _MOCHA/c51/patch/sched.rom (revision 674)
+++ /ZXS_KB_Project/ZXS_SK650_2bt3ch_1026 _MOCHA/c51/patch/sched.rom (working copy)
@@ -79,7 +79,7 @@
mem_lap:36 28 c2 08 66 22
mem_local_name_length:
-'LATTE 3.0
+'MOCHA 3.0
mem_sniff_param_interval:0e 00
mem_sniff_param_attempt:01
mem_sniff_param_timeout:01
@@ -337,7 +337,7 @@
#Characteristic: Device Name
06 00 03 28 01 02
07 00 00 2a
-'LATTE 5.0
+'MOCHA 5.0
#Characteristic: Appearance
08 00 03 28 01 02
@@ -532,7 +532,7 @@
2c 01 #timeout
mem_le_name_len:
-'LATTE 5.0
+'MOCHA 5.0
mem_le_adv_channel_map:07
mem_le_adv_direct_addr_type:01
@@ -547,7 +547,7 @@
mem_le_scan_data_len:1f
mem_le_scan_data:
-'\09LATTE 5.0
+'\09MOCHA 5.0
mem_version_yy_mm_dd:20 21 12 24 #version data 20211224
Index: c51/output/FW
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: c51/output/FW.SBR
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: c51/patch/adc.obj
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: c51/patch/bluetooth.obj
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: c51/patch/global_variable.obj
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: c51/patch/kb_process.obj
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: c51/patch/keyscan.obj
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: c51/patch/led.obj
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: c51/patch/ram.obj
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: c51/patch/sys.obj
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream