Index: btkb/output/eeprom.dat
===================================================================
--- /branch/mouse_project/LeXiang/Keyboard/KD8015_2mode_3ch_LI/btkb/output/eeprom.dat (revision 5153)
+++ /branch/mouse_project/LeXiang/Keyboard/KD8015_2mode_3ch_LI/btkb/output/eeprom.dat (working copy)
@@ -6740,22 +6740,17 @@
22
aa
55
-0f
+0a
00
02
47
-0e
+09
54
72
75
73
74
20
-4c
-59
-52
-41
-20
4b
42
31
@@ -6862,7 +6857,7 @@
01
aa
55
-ee
+e9
01
04
45
@@ -6909,18 +6904,13 @@
00
00
2a
-0e
+09
54
72
75
73
74
20
-4c
-59
-52
-41
-20
4b
42
31
@@ -7451,22 +7441,17 @@
01
aa
55
-0f
+0a
00
19
44
-0e
+09
54
72
75
73
74
20
-4c
-59
-52
-41
-20
4b
42
31
@@ -7517,12 +7502,12 @@
80
aa
55
-11
+0c
00
f9
43
1f
-0f
+0a
09
54
72
@@ -7530,11 +7515,6 @@
73
74
20
-4c
-59
-52
-41
-20
4b
42
31
@@ -7971,7 +7951,7 @@
aa
aa
55
-c3
-34
-b3
-f0
+3b
+2f
+7b
+c6
Index: btkb/output/sched.rom
===================================================================
--- /branch/mouse_project/LeXiang/Keyboard/KD8015_2mode_3ch_LI/btkb/output/sched.rom (revision 5153)
+++ /branch/mouse_project/LeXiang/Keyboard/KD8015_2mode_3ch_LI/btkb/output/sched.rom (working copy)
@@ -79,7 +79,7 @@
mem_lap:36 08 c2 08 66 22
mem_local_name_length:
-'Trust LYRA KB1
+'Trust KB1
mem_sniff_param_interval:24 00
mem_sniff_param_attempt:01
mem_sniff_param_timeout:01
@@ -120,7 +120,7 @@
#Characteristic: Device Name
06 00 03 28 01 02
07 00 00 2a
-'Trust LYRA KB1
+'Trust KB1
#Characteristic: Appearance
08 00 03 28 01 02
@@ -315,7 +315,7 @@
2c 01 #timeout
mem_le_name_len:
-'Trust LYRA KB1
+'Trust KB1
mem_le_adv_channel_map:07
mem_le_adv_direct_addr_type:01
@@ -330,7 +330,7 @@
mem_le_scan_data_len:1f
mem_le_scan_data:
-'\09Trust LYRA KB1
+'\09Trust KB1
mem_version_yy_mm_dd:20 21 12 24 #version data 20211224
Index: btkb/sched/kb.dat
===================================================================
--- /branch/mouse_project/LeXiang/Keyboard/KD8015_2mode_3ch_LI/btkb/sched/kb.dat (revision 5153)
+++ /branch/mouse_project/LeXiang/Keyboard/KD8015_2mode_3ch_LI/btkb/sched/kb.dat (working copy)
@@ -79,7 +79,7 @@
mem_lap:36 08 c2 08 66 22
mem_local_name_length:
-'Trust LYRA KB1
+'Trust KB1
mem_sniff_param_interval:24 00
mem_sniff_param_attempt:01
mem_sniff_param_timeout:01
@@ -120,7 +120,7 @@
#Characteristic: Device Name
06 00 03 28 01 02
07 00 00 2a
-'Trust LYRA KB1
+'Trust KB1
#Characteristic: Appearance
08 00 03 28 01 02
@@ -315,7 +315,7 @@
2c 01 #timeout
mem_le_name_len:
-'Trust LYRA KB1
+'Trust KB1
mem_le_adv_channel_map:07
mem_le_adv_direct_addr_type:01
@@ -330,7 +330,7 @@
mem_le_scan_data_len:1f
mem_le_scan_data:
-'\09Trust LYRA KB1
+'\09Trust KB1
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.COD
===================================================================
--- /branch/mouse_project/LeXiang/Keyboard/KD8015_2mode_3ch_LI/c51/output/FW.COD (revision 5153)
+++ /branch/mouse_project/LeXiang/Keyboard/KD8015_2mode_3ch_LI/c51/output/FW.COD (working copy)
@@ -1,4 +1,4 @@
-LX51 LINKER/LOCATER V4.41 10/26/2022 10:50:18 PAGE 1
+LX51 LINKER/LOCATER V4.41 10/26/2022 15:28:51 PAGE 1
@@ -6182,14 +6182,14 @@
0022BD B4020F CJNE A,#02H,?C0001?SYS
21: m_le_roll_name_len=0x32;
22: m_le_roll_name_scan=0x32;
-0022C0 904427 MOV DPTR,#m_le_roll_name_len
+0022C0 904422 MOV DPTR,#m_le_roll_name_len
0022C3 7432 MOV A,#032H
0022C5 F0 MOVX @DPTR,A
23: m_le_roll_name_gatt=0x32;
-0022C6 904409 MOV DPTR,#m_le_roll_name_scan
+0022C6 904404 MOV DPTR,#m_le_roll_name_scan
0022C9 F0 MOVX @DPTR,A
24: }
-0022CA 90453D MOV DPTR,#m_le_roll_name_gatt
+0022CA 904538 MOV DPTR,#m_le_roll_name_gatt
0022CD F0 MOVX @DPTR,A
25: else if(g_variable.current_device_num ==1)
0022CE 22 RET
@@ -6199,14 +6199,14 @@
0022D0 B4010E CJNE A,#01H,?C0004?SYS
27: m_le_roll_name_len=0x31;
28: m_le_roll_name_scan=0x31;
-0022D3 904427 MOV DPTR,#m_le_roll_name_len
+0022D3 904422 MOV DPTR,#m_le_roll_name_len
0022D6 7431 MOV A,#031H
0022D8 F0 MOVX @DPTR,A
29: m_le_roll_name_gatt=0x31;
-0022D9 904409 MOV DPTR,#m_le_roll_name_scan
+0022D9 904404 MOV DPTR,#m_le_roll_name_scan
0022DC F0 MOVX @DPTR,A
30: }
-0022DD 90453D MOV DPTR,#m_le_roll_name_gatt
+0022DD 904538 MOV DPTR,#m_le_roll_name_gatt
0022E0 F0 MOVX @DPTR,A
31: }
32:
Index: c51/output/FW.HTM
===================================================================
--- /branch/mouse_project/LeXiang/Keyboard/KD8015_2mode_3ch_LI/c51/output/FW.HTM (revision 5153)
+++ /branch/mouse_project/LeXiang/Keyboard/KD8015_2mode_3ch_LI/c51/output/FW.HTM (working copy)
@@ -25,7 +25,7 @@
Created from: LX51 LINKER/LOCATER V4.41
-Creation time: 10/26/2022 10:50:18
+Creation time: 10/26/2022 15:28:51
Index: c51/output/FW.MAP
===================================================================
--- /branch/mouse_project/LeXiang/Keyboard/KD8015_2mode_3ch_LI/c51/output/FW.MAP (revision 5153)
+++ /branch/mouse_project/LeXiang/Keyboard/KD8015_2mode_3ch_LI/c51/output/FW.MAP (working copy)
@@ -1,4 +1,4 @@
-LX51 LINKER/LOCATER V4.41 10/26/2022 10:50:18 PAGE 1
+LX51 LINKER/LOCATER V4.41 10/26/2022 15:28:51 PAGE 1
LX51 LINKER/LOCATER V4.41, INVOKED BY:
@@ -260,18 +260,18 @@
004262H 004271H 000010H BYTE OFFS.. XDATA ?XD?GLOBAL_VARIABLE?24
004272H 004273H 000002H --- --- **GAP**
004274H 004279H 000006H BYTE OFFS.. XDATA ?XD?GLOBAL_VARIABLE?28
-00427AH 004408H 00018FH --- --- **GAP**
-004409H 004409H 000001H BYTE OFFS.. XDATA ?XD?SYS?0
-00440AH 004426H 00001DH --- --- **GAP**
-004427H 004427H 000001H BYTE OFFS.. XDATA ?XD?SYS?2
-004428H 00447AH 000053H --- --- **GAP**
+00427AH 004403H 00018AH --- --- **GAP**
+004404H 004404H 000001H BYTE OFFS.. XDATA ?XD?SYS?0
+004405H 004421H 00001DH --- --- **GAP**
+004422H 004422H 000001H BYTE OFFS.. XDATA ?XD?SYS?2
+004423H 00447AH 000058H --- --- **GAP**
00447BH 00448AH 000010H BYTE OFFS.. XDATA ?XD?GLOBAL_VARIABLE?25
00448BH 00448BH 000001H BYTE OFFS.. XDATA ?XD?GLOBAL_VARIABLE?9
00448CH 0044F8H 00006DH --- --- **GAP**
0044F9H 0044FEH 000006H BYTE OFFS.. XDATA ?XD?GLOBAL_VARIABLE?21
-0044FFH 00453CH 00003EH --- --- **GAP**
-00453DH 00453DH 000001H BYTE OFFS.. XDATA ?XD?SYS?1
-00453EH 0047F3H 0002B6H --- --- **GAP**
+0044FFH 004537H 000039H --- --- **GAP**
+004538H 004538H 000001H BYTE OFFS.. XDATA ?XD?SYS?1
+004539H 0047F3H 0002BBH --- --- **GAP**
0047F4H 0047F5H 000002H BYTE OFFS.. XDATA ?XD?GLOBAL_VARIABLE?27
0047F6H 0047FFH 00000AH --- --- **GAP**
004800H 004809H 00000AH BYTE OFFS.. XDATA ?XD?GLOBAL_VARIABLE?20
@@ -527,9 +527,9 @@
02004D51H XDATA BYTE m_customize_timer
020044F9H XDATA --- m_le_lap
0200447BH XDATA --- m_le_ltk
- 0200453DH XDATA BYTE m_le_roll_name_gatt
- 02004427H XDATA BYTE m_le_roll_name_len
- 02004409H XDATA BYTE m_le_roll_name_scan
+ 02004538H XDATA BYTE m_le_roll_name_gatt
+ 02004422H XDATA BYTE m_le_roll_name_len
+ 02004404H XDATA BYTE m_le_roll_name_scan
02004D3DH XDATA BYTE m_le_send_security_request_flag
0200425EH XDATA BYTE m_link_key_exists
02004262H XDATA --- m_linkkey
@@ -2094,9 +2094,9 @@
--- BLOCKEND --- --- LVL=0
--- MODULE --- --- SYS
- 02004427H PUBLIC XDATA BYTE m_le_roll_name_len
- 0200453DH PUBLIC XDATA BYTE m_le_roll_name_gatt
- 02004409H PUBLIC XDATA BYTE m_le_roll_name_scan
+ 02004422H PUBLIC XDATA BYTE m_le_roll_name_len
+ 02004538H PUBLIC XDATA BYTE m_le_roll_name_gatt
+ 02004404H PUBLIC XDATA BYTE m_le_roll_name_scan
010011A3H PUBLIC CODE --- YC_System_Main
01001622H PUBLIC CODE --- kb_button_press_timer500ms
010021B8H PUBLIC CODE --- YC_pairing_timerout_500ms
Index: c51/output/FW.SBR
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: c51/output/eeprom.dat
===================================================================
--- /branch/mouse_project/LeXiang/Keyboard/KD8015_2mode_3ch_LI/c51/output/eeprom.dat (revision 5153)
+++ /branch/mouse_project/LeXiang/Keyboard/KD8015_2mode_3ch_LI/c51/output/eeprom.dat (working copy)
@@ -15496,17 +15496,17 @@
0f
90
44
-27
+22
74
32
f0
90
44
-09
+04
f0
90
45
-3d
+38
f0
22
ef
@@ -15515,17 +15515,17 @@
0e
90
44
-27
+22
74
31
f0
90
44
-09
+04
f0
90
45
-3d
+38
f0
22
90
@@ -20804,8 +20804,8 @@
04
cf
22
-0f
-39
+1e
+88
aa
55
40
@@ -20952,22 +20952,17 @@
22
aa
55
-0f
+0a
00
02
47
-0e
+09
54
72
75
73
74
20
-4c
-59
-52
-41
-20
4b
42
31
@@ -21074,7 +21069,7 @@
01
aa
55
-ee
+e9
01
04
45
@@ -21121,18 +21116,13 @@
00
00
2a
-0e
+09
54
72
75
73
74
20
-4c
-59
-52
-41
-20
4b
42
31
@@ -21663,22 +21653,17 @@
01
aa
55
-0f
+0a
00
19
44
-0e
+09
54
72
75
73
74
20
-4c
-59
-52
-41
-20
4b
42
31
@@ -21729,12 +21714,12 @@
80
aa
55
-11
+0c
00
f9
43
1f
-0f
+0a
09
54
72
@@ -21742,11 +21727,6 @@
73
74
20
-4c
-59
-52
-41
-20
4b
42
31
@@ -22179,8 +22159,8 @@
6c
59
50
-35
-8b
+e3
+ec
ff
ff
ff
@@ -32764,5 +32744,25 @@
ff
ff
ff
-5f
-28
+ff
+ff
+ff
+ff
+ff
+ff
+ff
+ff
+ff
+ff
+ff
+ff
+ff
+ff
+ff
+ff
+ff
+ff
+ff
+ff
+a0
+48
Index: c51/output/fw.hex
===================================================================
--- /branch/mouse_project/LeXiang/Keyboard/KD8015_2mode_3ch_LI/c51/output/fw.hex (revision 5153)
+++ /branch/mouse_project/LeXiang/Keyboard/KD8015_2mode_3ch_LI/c51/output/fw.hex (working copy)
@@ -554,8 +554,8 @@
:102290004CF2E09044FAF0904CF3E09044FBF09064
:1022A0004DD0E09044FCF0904DD1E09044FDF09092
:1022B0004DD2E09044FEF022904CC3E0FFB4020FF8
-:1022C0009044277432F0904409F090453DF022EF9D
-:1022D000B4010E9044277431F0904409F090453DCC
+:1022C0009044227432F0904404F0904538F022EFAC
+:1022D000B4010E9044227431F0904404F0904538DB
:1022E000F022904ED012058200000000904C95E044
:1022F0007002A3E07002819F904C95E0FEA3E0FF86
:10230000904CD4E0FD04F0ED25E024D6F582E434D1
Index: c51/output/fwram.rom
===================================================================
--- /branch/mouse_project/LeXiang/Keyboard/KD8015_2mode_3ch_LI/c51/output/fwram.rom (revision 5153)
+++ /branch/mouse_project/LeXiang/Keyboard/KD8015_2mode_3ch_LI/c51/output/fwram.rom (working copy)
@@ -8896,17 +8896,17 @@
0f
90
44
-27
+22
74
32
f0
90
44
-09
+04
f0
90
45
-3d
+38
f0
22
ef
@@ -8915,17 +8915,17 @@
0e
90
44
-27
+22
74
31
f0
90
44
-09
+04
f0
90
45
-3d
+38
f0
22
90
Index: c51/output/sched.rom
===================================================================
--- /branch/mouse_project/LeXiang/Keyboard/KD8015_2mode_3ch_LI/c51/output/sched.rom (revision 5153)
+++ /branch/mouse_project/LeXiang/Keyboard/KD8015_2mode_3ch_LI/c51/output/sched.rom (working copy)
@@ -79,7 +79,7 @@
4140:36 08 c2 08 66 22
4702:
-'Trust LYRA KB1
+'Trust KB1
4280:24 00
4282:01
4284:01
@@ -120,7 +120,7 @@
#Characteristic: Device Name
06 00 03 28 01 02
07 00 00 2a
-'Trust LYRA KB1
+'Trust KB1
#Characteristic: Appearance
08 00 03 28 01 02
@@ -315,7 +315,7 @@
2c 01 #timeout
4419:
-'Trust LYRA KB1
+'Trust KB1
44e4:07
44dd:01
@@ -330,7 +330,7 @@
43f9:1f
43fa:
-'\09Trust LYRA KB1
+'\09Trust KB1
4d53:20 21 12 24 #version data 20211224
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.dat
===================================================================
--- /branch/mouse_project/LeXiang/Keyboard/KD8015_2mode_3ch_LI/c51/patch/kb.dat (revision 5153)
+++ /branch/mouse_project/LeXiang/Keyboard/KD8015_2mode_3ch_LI/c51/patch/kb.dat (working copy)
@@ -79,7 +79,7 @@
mem_lap:36 08 c2 08 66 22
mem_local_name_length:
-'Trust LYRA KB1
+'Trust KB1
mem_sniff_param_interval:24 00
mem_sniff_param_attempt:01
mem_sniff_param_timeout:01
@@ -120,7 +120,7 @@
#Characteristic: Device Name
06 00 03 28 01 02
07 00 00 2a
-'Trust LYRA KB1
+'Trust KB1
#Characteristic: Appearance
08 00 03 28 01 02
@@ -315,7 +315,7 @@
2c 01 #timeout
mem_le_name_len:
-'Trust LYRA KB1
+'Trust KB1
mem_le_adv_channel_map:07
mem_le_adv_direct_addr_type:01
@@ -330,7 +330,7 @@
mem_le_scan_data_len:1f
mem_le_scan_data:
-'\09Trust LYRA KB1
+'\09Trust KB1
mem_version_yy_mm_dd:20 21 12 24 #version data 20211224
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/sch.rom
===================================================================
--- /branch/mouse_project/LeXiang/Keyboard/KD8015_2mode_3ch_LI/c51/patch/sch.rom (revision 5153)
+++ /branch/mouse_project/LeXiang/Keyboard/KD8015_2mode_3ch_LI/c51/patch/sch.rom (working copy)
@@ -79,7 +79,7 @@
mem_lap:36 08 c2 08 66 22
mem_local_name_length:
-'Trust LYRA KB1
+'Trust KB1
mem_sniff_param_interval:24 00
mem_sniff_param_attempt:01
mem_sniff_param_timeout:01
@@ -120,7 +120,7 @@
#Characteristic: Device Name
06 00 03 28 01 02
07 00 00 2a
-'Trust LYRA KB1
+'Trust KB1
#Characteristic: Appearance
08 00 03 28 01 02
@@ -315,7 +315,7 @@
2c 01 #timeout
mem_le_name_len:
-'Trust LYRA KB1
+'Trust KB1
mem_le_adv_channel_map:07
mem_le_adv_direct_addr_type:01
@@ -330,7 +330,7 @@
mem_le_scan_data_len:1f
mem_le_scan_data:
-'\09Trust LYRA KB1
+'\09Trust KB1
mem_version_yy_mm_dd:20 21 12 24 #version data 20211224
Index: c51/patch/sched.rom
===================================================================
--- /branch/mouse_project/LeXiang/Keyboard/KD8015_2mode_3ch_LI/c51/patch/sched.rom (revision 5153)
+++ /branch/mouse_project/LeXiang/Keyboard/KD8015_2mode_3ch_LI/c51/patch/sched.rom (working copy)
@@ -79,7 +79,7 @@
mem_lap:36 08 c2 08 66 22
mem_local_name_length:
-'Trust LYRA KB1
+'Trust KB1
mem_sniff_param_interval:24 00
mem_sniff_param_attempt:01
mem_sniff_param_timeout:01
@@ -120,7 +120,7 @@
#Characteristic: Device Name
06 00 03 28 01 02
07 00 00 2a
-'Trust LYRA KB1
+'Trust KB1
#Characteristic: Appearance
08 00 03 28 01 02
@@ -315,7 +315,7 @@
2c 01 #timeout
mem_le_name_len:
-'Trust LYRA KB1
+'Trust KB1
mem_le_adv_channel_map:07
mem_le_adv_direct_addr_type:01
@@ -330,7 +330,7 @@
mem_le_scan_data_len:1f
mem_le_scan_data:
-'\09Trust LYRA KB1
+'\09Trust KB1
mem_version_yy_mm_dd:20 21 12 24 #version data 20211224
Index: c51/patch/sys.obj
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: c51/sys.c
===================================================================
--- /branch/mouse_project/LeXiang/Keyboard/KD8015_2mode_3ch_LI/c51/sys.c (revision 5153)
+++ /branch/mouse_project/LeXiang/Keyboard/KD8015_2mode_3ch_LI/c51/sys.c (working copy)
@@ -8,10 +8,10 @@
#include "kb_process.h"
/////////////////////////////////////////////////////////////////
-volatile xbyte m_le_roll_name_gatt _at_ 0x453d;
-volatile xbyte m_le_roll_name_len _at_ 0x4427;
+volatile xbyte m_le_roll_name_gatt _at_ 0x4538;
+volatile xbyte m_le_roll_name_len _at_ 0x4422;
//volatile xbyte m_le_roll_name_swift _at_ 0x4d7e;
-volatile xbyte m_le_roll_name_scan _at_ 0x4409;
+volatile xbyte m_le_roll_name_scan _at_ 0x4404;
void kb_ble_name_roll()