Index: c51/global_variable.c =================================================================== --- /YJX_KB_Project/1026_KB/YJX_JY-K63-W-FN/c51/global_variable.c (revision 503) +++ /YJX_KB_Project/1026_KB/YJX_JY-K63-W-FN/c51/global_variable.c (working copy) @@ -262,7 +262,7 @@ //c16 HID_MULTIKEY_MAIL, //R0 -HID_KEY_FN, //R1 +HID_KEY_LEFT_GUI, //R1 HID_MULTIKEY_AC_FORWARD, //R2 HID_MULTIKEY_AC_STOP, //R3 HID_MULTIKEY_AC_BACK, //R4 Index: c51/kb_process.h =================================================================== --- /YJX_KB_Project/1026_KB/YJX_JY-K63-W-FN/c51/kb_process.h (revision 503) +++ /YJX_KB_Project/1026_KB/YJX_JY-K63-W-FN/c51/kb_process.h (working copy) @@ -31,14 +31,14 @@ //gipo -#define NUM_LOCK_LED_GPIO 29 -#define CAPS_LED_GPIO 0x1f -#define SCROLL_LED_GPIO 16 +#define NUM_LOCK_LED_GPIO 0xff +#define CAPS_LED_GPIO 0xff +#define SCROLL_LED_GPIO 0xff #define EEPROM_WP_GPIO 0xff #define BT_LED_GPIO 0xff -#define LOWPOWER_LED_GPIO 30 -#define G24_LED_GPIO 30 +#define LOWPOWER_LED_GPIO 0xff +#define G24_LED_GPIO 29 Index: c51/output/FW =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: c51/output/FW.COD =================================================================== --- /YJX_KB_Project/1026_KB/YJX_JY-K63-W-FN/c51/output/FW.COD (revision 503) +++ /YJX_KB_Project/1026_KB/YJX_JY-K63-W-FN/c51/output/FW.COD (working copy) @@ -1,4 +1,4 @@ -LX51 LINKER/LOCATER V4.41 08/05/2022 15:45:09 PAGE 1 +LX51 LINKER/LOCATER V4.41 08/11/2022 14:24:29 PAGE 1 @@ -95,7 +95,7 @@ 00070E F0 MOVX @DPTR,A 41: GPIO_Setout(LOWPOWER_LED_GPIO, LED_OFF); 00070F C201 CLR ?_GPIO_Setout?BIT -000711 7F1E MOV R7,#01EH +000711 7FFF MOV R7,#0FFH 000713 F19D ACALL _GPIO_Setout 42: } 43: } @@ -124,7 +124,7 @@ 51: { 52: GPIO_Setout(NUM_LOCK_LED_GPIO, LED_ON); 000730 D201 SETB ?_GPIO_Setout?BIT -000732 7F1D MOV R7,#01DH +000732 7FFF MOV R7,#0FFH 000734 F19D ACALL _GPIO_Setout 53: } 000736 8006 SJMP ?C0014?LED @@ -133,7 +133,7 @@ 55: { 56: GPIO_Setout(NUM_LOCK_LED_GPIO, LED_OFF); 000738 C201 CLR ?_GPIO_Setout?BIT -00073A 7F1D MOV R7,#01DH +00073A 7FFF MOV R7,#0FFH 00073C F19D ACALL _GPIO_Setout 57: } 00073E ?C0014?LED: @@ -145,7 +145,7 @@ 60: { 61: GPIO_Setout(CAPS_LED_GPIO, LED_ON); 000745 D201 SETB ?_GPIO_Setout?BIT -000747 7F1F MOV R7,#01FH +000747 7FFF MOV R7,#0FFH 000749 F19D ACALL _GPIO_Setout 62: } 00074B 8006 SJMP ?C0016?LED @@ -154,7 +154,7 @@ 64: { 65: GPIO_Setout(CAPS_LED_GPIO, LED_OFF); 00074D C201 CLR ?_GPIO_Setout?BIT -00074F 7F1F MOV R7,#01FH +00074F 7FFF MOV R7,#0FFH 000751 F19D ACALL _GPIO_Setout 66: } 000753 ?C0016?LED: @@ -166,7 +166,7 @@ 69: { 70: GPIO_Setout(SCROLL_LED_GPIO, LED_ON); 00075A D201 SETB ?_GPIO_Setout?BIT -00075C 7F10 MOV R7,#010H +00075C 7FFF MOV R7,#0FFH 00075E 803D SJMP _GPIO_Setout 71: } 000760 ?C0017?LED: @@ -174,7 +174,7 @@ 73: { 74: GPIO_Setout(SCROLL_LED_GPIO, LED_OFF); 000760 C201 CLR ?_GPIO_Setout?BIT -000762 7F10 MOV R7,#010H +000762 7FFF MOV R7,#0FFH 000764 8037 SJMP _GPIO_Setout 75: } 76: } @@ -183,15 +183,15 @@ 78: { 79: GPIO_Setout(NUM_LOCK_LED_GPIO, LED_OFF); 000766 C201 CLR ?_GPIO_Setout?BIT -000768 7F1D MOV R7,#01DH +000768 7FFF MOV R7,#0FFH 00076A F19D ACALL _GPIO_Setout 80: GPIO_Setout(CAPS_LED_GPIO, LED_OFF); 00076C C201 CLR ?_GPIO_Setout?BIT -00076E 7F1F MOV R7,#01FH +00076E 7FFF MOV R7,#0FFH 000770 F19D ACALL _GPIO_Setout 81: GPIO_Setout(SCROLL_LED_GPIO, LED_OFF); 000772 C201 CLR ?_GPIO_Setout?BIT -000774 7F10 MOV R7,#010H +000774 7FFF MOV R7,#0FFH 000776 8025 SJMP _GPIO_Setout 82: } 83: } @@ -200,15 +200,15 @@ 85: { 86: GPIO_Setout(NUM_LOCK_LED_GPIO, LED_OFF); 000778 C201 CLR ?_GPIO_Setout?BIT -00077A 7F1D MOV R7,#01DH +00077A 7FFF MOV R7,#0FFH 00077C F19D ACALL _GPIO_Setout 87: GPIO_Setout(CAPS_LED_GPIO, LED_OFF); 00077E C201 CLR ?_GPIO_Setout?BIT -000780 7F1F MOV R7,#01FH +000780 7FFF MOV R7,#0FFH 000782 F19D ACALL _GPIO_Setout 88: GPIO_Setout(SCROLL_LED_GPIO, LED_OFF); 000784 C201 CLR ?_GPIO_Setout?BIT -000786 7F10 MOV R7,#010H +000786 7FFF MOV R7,#0FFH 000788 8013 SJMP _GPIO_Setout 89: } 90: } @@ -217,15 +217,15 @@ 92: { 93: GPIO_Setout(NUM_LOCK_LED_GPIO, LED_OFF); 00078A C201 CLR ?_GPIO_Setout?BIT -00078C 7F1D MOV R7,#01DH +00078C 7FFF MOV R7,#0FFH 00078E F19D ACALL _GPIO_Setout 94: GPIO_Setout(CAPS_LED_GPIO, LED_OFF); 000790 C201 CLR ?_GPIO_Setout?BIT -000792 7F1F MOV R7,#01FH +000792 7FFF MOV R7,#0FFH 000794 F19D ACALL _GPIO_Setout 95: GPIO_Setout(SCROLL_LED_GPIO, LED_OFF); 000796 C201 CLR ?_GPIO_Setout?BIT -000798 7F10 MOV R7,#010H +000798 7FFF MOV R7,#0FFH 00079A F19D ACALL _GPIO_Setout 96: } 97: @@ -281,23 +281,23 @@ 6: GPIO_SetOutput(NUM_LOCK_LED_GPIO,LED_OFF); 7: GPIO_SetOutput(CAPS_LED_GPIO,LED_OFF); 0007CC C206 CLR ?_GPIO_SetOutput?BIT -0007CE 7F1D MOV R7,#01DH +0007CE 7FFF MOV R7,#0FFH 0007D0 F1AF ACALL _GPIO_SetOutput 8: GPIO_SetOutput(SCROLL_LED_GPIO,LED_OFF); 0007D2 C206 CLR ?_GPIO_SetOutput?BIT -0007D4 7F1F MOV R7,#01FH +0007D4 7FFF MOV R7,#0FFH 0007D6 F1AF ACALL _GPIO_SetOutput 9: GPIO_SetOutput(LOWPOWER_LED_GPIO,LED_OFF); 0007D8 C206 CLR ?_GPIO_SetOutput?BIT -0007DA 7F10 MOV R7,#010H +0007DA 7FFF MOV R7,#0FFH 0007DC F1AF ACALL _GPIO_SetOutput 10: GPIO_SetOutput(G24_LED_GPIO,LED_OFF); 0007DE C206 CLR ?_GPIO_SetOutput?BIT -0007E0 7F1E MOV R7,#01EH +0007E0 7FFF MOV R7,#0FFH 0007E2 F1AF ACALL _GPIO_SetOutput 11: } 0007E4 C206 CLR ?_GPIO_SetOutput?BIT -0007E6 7F1E MOV R7,#01EH +0007E6 7F1D MOV R7,#01DH 0007E8 80C5 SJMP _GPIO_SetOutput ----- FUNCTION LED_all_shutdown (END) ------- @@ -2916,32 +2916,31 @@ 001386 120F38 LCALL kb_need_keyscan 420: LED_handle(); 001389 5190 ACALL YC_update_eeprom_data - 421: + 421: switch (current_task) { 00138B 1206CF LCALL LED_handle - 422: switch (current_task) { + 422: case FIX_ENTER_HIBERNATE: 00138E 900B7E MOV DPTR,#current_task 001391 E0 MOVX A,@DPTR 001392 14 DEC A 001393 600D JZ ?C0088?SYS 001395 24FE ADD A,#0FEH 001397 70EB JNZ ?C0082?SYS - 423: case FIX_ENTER_HIBERNATE: + 423: KS_Unistall(); 001399 ?C0085?SYS: - 424: KS_Unistall(); + 424: //GPIO_SetWakeupByCurrentState(BT_BUTTON_GPIO); 001399 71CD ACALL KS_Unistall - 425: //GPIO_SetWakeupByCurrentState(BT_BUTTON_GPIO); - 426: LED_all_shutdown(); + 425: LED_all_shutdown(); 00139B 1207CC LCALL LED_all_shutdown - 427: IPC_WaitLpm(); /*> e_key_press_wait_release_timer 0013A2 904CEA MOV DPTR,#g_variable+02BH 0013A5 E0 MOVX A,@DPTR @@ -2959,25 +2958,25 @@ 0013BD E0 MOVX A,@DPTR 0013BE 6004 JZ ?C0089?SYS 0013C0 ?C0090?SYS: - 433: ) - 434: { - 435: IPC_AbandonLpm(); + 432: ) + 433: { + 434: IPC_AbandonLpm(); 0013C0 D1E0 ACALL IPC_AbandonLpm - 436: break; + 435: break; 0013C2 80C0 SJMP ?C0082?SYS - 437: } + 436: } 0013C4 ?C0089?SYS: - 438: else - 439: { - 440: KS_Unistall(); + 437: else + 438: { + 439: KS_Unistall(); 0013C4 71CD ACALL KS_Unistall - 441: IPC_WaitLpm(); /* Created from: LX51 LINKER/LOCATER V4.41
-Creation time: 08/05/2022 15:45:09

+Creation time: 08/11/2022 14:24:29

Index: c51/output/FW.MAP =================================================================== --- /YJX_KB_Project/1026_KB/YJX_JY-K63-W-FN/c51/output/FW.MAP (revision 503) +++ /YJX_KB_Project/1026_KB/YJX_JY-K63-W-FN/c51/output/FW.MAP (working copy) @@ -1,4 +1,4 @@ -LX51 LINKER/LOCATER V4.41 08/05/2022 15:45:09 PAGE 1 +LX51 LINKER/LOCATER V4.41 08/11/2022 14:24:28 PAGE 1 LX51 LINKER/LOCATER V4.41, INVOKED BY: @@ -1896,26 +1896,26 @@ 01001386H LINE --- --- #418 01001389H LINE --- --- #419 0100138BH LINE --- --- #420 - 0100138EH LINE --- --- #422 + 0100138EH LINE --- --- #421 + 01001399H LINE --- --- #422 01001399H LINE --- --- #423 - 01001399H LINE --- --- #424 - 0100139BH LINE --- --- #426 - 0100139EH LINE --- --- #427 - 010013A0H LINE --- --- #428 - 010013A2H LINE --- --- #429 + 0100139BH LINE --- --- #425 + 0100139EH LINE --- --- #426 + 010013A0H LINE --- --- #427 + 010013A2H LINE --- --- #428 + 010013A2H LINE --- --- #430 010013A2H LINE --- --- #431 - 010013A2H LINE --- --- #432 + 010013C0H LINE --- --- #433 010013C0H LINE --- --- #434 - 010013C0H LINE --- --- #435 - 010013C2H LINE --- --- #436 - 010013C4H LINE --- --- #437 + 010013C2H LINE --- --- #435 + 010013C4H LINE --- --- #436 + 010013C4H LINE --- --- #438 010013C4H LINE --- --- #439 - 010013C4H LINE --- --- #440 - 010013C6H LINE --- --- #441 - 010013C8H LINE --- --- #442 + 010013C6H LINE --- --- #440 + 010013C8H LINE --- --- #441 + 010013CAH LINE --- --- #442 010013CAH LINE --- --- #443 010013CAH LINE --- --- #444 - 010013CAH LINE --- --- #445 --- BLOCKEND --- --- LVL=0 --- MODULE --- --- ADC Index: c51/output/FW.SBR =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: c51/output/eeprom.dat =================================================================== --- /YJX_KB_Project/1026_KB/YJX_JY-K63-W-FN/c51/output/eeprom.dat (revision 503) +++ /YJX_KB_Project/1026_KB/YJX_JY-K63-W-FN/c51/output/eeprom.dat (working copy) @@ -5640,7 +5640,7 @@ f4 f1 fa -af +e3 d1 d3 d2 @@ -5752,7 +5752,7 @@ c2 01 7f -1e +ff f1 9d d1 @@ -5785,7 +5785,7 @@ d2 01 7f -1d +ff f1 9d 80 @@ -5793,7 +5793,7 @@ c2 01 7f -1d +ff f1 9d 90 @@ -5806,7 +5806,7 @@ d2 01 7f -1f +ff f1 9d 80 @@ -5814,7 +5814,7 @@ c2 01 7f -1f +ff f1 9d 90 @@ -5827,67 +5827,67 @@ d2 01 7f -10 +ff 80 3d c2 01 7f -10 +ff 80 37 c2 01 7f -1d +ff f1 9d c2 01 7f -1f +ff f1 9d c2 01 7f -10 +ff 80 25 c2 01 7f -1d +ff f1 9d c2 01 7f -1f +ff f1 9d c2 01 7f -10 +ff 80 13 c2 01 7f -1d +ff f1 9d c2 01 7f -1f +ff f1 9d c2 01 7f -10 +ff f1 9d 22 @@ -5941,31 +5941,31 @@ c2 06 7f -1d +ff f1 af c2 06 7f -1f +ff f1 af c2 06 7f -10 +ff f1 af c2 06 7f -1e +ff f1 af c2 06 7f -1e +1d 80 c5 f1 @@ -12247,7 +12247,7 @@ d2 01 7f -1e +1d 12 07 9d @@ -12260,7 +12260,7 @@ c2 01 7f -1e +1d 12 07 9d @@ -12283,7 +12283,7 @@ e1 42 7f -1e +1d 12 17 c6 @@ -12317,7 +12317,7 @@ d2 01 7f -1e +ff 12 07 9d @@ -12326,7 +12326,7 @@ c2 01 7f -1e +ff 12 07 9d @@ -12335,7 +12335,7 @@ c2 01 7f -1e +ff 12 07 9d @@ -13326,8 +13326,8 @@ 04 cf 22 -07 -63 +bf +46 aa 55 40 Index: c51/output/fw.hex =================================================================== --- /YJX_KB_Project/1026_KB/YJX_JY-K63-W-FN/c51/output/fw.hex (revision 503) +++ /YJX_KB_Project/1026_KB/YJX_JY-K63-W-FN/c51/output/fw.hex (working copy) @@ -104,27 +104,27 @@ :1006700046892A3144284542435F5C592C53514CEA :1006800000605D5A62544F4900615E5B6355564B92 :100690004E57855852F2504A4D00E1E5F6F7F5F411 -:1006A000F1FAAFD1D3D2D4F8D591D0E7F9F3FBD694 +:1006A000F1FAE3D1D3D2D4F8D591D0E7F9F3FBD660 :1006B00090000000000000000000000000000001A9 :1006C0000100904CC5E0B403037F01227F0022901B :1006D0004DE3E064026002E19C904CE9E06002E1DD :1006E0008A904CD5E0FF6402602BEFB40114904C6B :1006F000F7E07021904CE27414F0904CF77401F024 :100700008013904CF7E0B4010CE4F0904CE2F0C29E -:10071000017F1EF19DD1C2EF605EC3904CE4E09476 +:10071000017FFFF19DD1C2EF605EC3904CE4E09495 :100720000C904CE3E09400503D904CB7E030E00872 -:10073000D2017F1DF19D8006C2017F1DF19D904C6D -:10074000B7E030E108D2017F1FF19D8006C2017F32 -:100750001FF19D904CB7E030E206D2017F10803D42 -:10076000C2017F108037C2017F1DF19DC2017F1F32 -:10077000F19DC2017F108025C2017F1DF19DC20144 -:100780007F1FF19DC2017F108013C2017F1DF19D6B -:10079000C2017F1FF19DC2017F10F19D22EFF46025 +:10073000D2017FFFF19D8006C2017FFFF19D904CA9 +:10074000B7E030E108D2017FFFF19D8006C2017F52 +:10075000FFF19D904CB7E030E206D2017FFF803D73 +:10076000C2017FFF8037C2017FFFF19DC2017FFF81 +:10077000F19DC2017FFF8025C2017FFFF19DC20173 +:100780007FFFF19DC2017FFF8013C2017FFFF19DBA +:10079000C2017FFFF19DC2017FFFF19D22EFF46056 :1007A0000D7B017A807974A201920012086922AC53 :1007B00007ECF46016AF04D204120858AF04A20686 -:1007C0009201F19DAF04C20212083622C2067F1DBB -:1007D000F1AFC2067F1FF1AFC2067F10F1AFC206B4 -:1007E0007F1EF1AFC2067F1E80C5F1EE80DE9080D5 +:1007C0009201F19DAF04C20212083622C2067FFFD9 +:1007D000F1AFC2067FFFF1AFC2067FFFF1AFC206E5 +:1007E0007FFFF1AFC2067F1D80C5F1EE80DE9080F5 :1007F00080E4F0A3F0A3F01208CAE4904E9BF0F05E :10080000904E9BE090060C93FF600CC2051118906F :100810004E9BE004F080E922AC07ECF46017AF04D3 @@ -517,12 +517,12 @@ :10204000E0600214F0904CF8E0600B14F0E07006D1 :10205000904CF47406F0904CE5E06028904CEEE073 :102060006006E4904CE5F022904CE5E014F0D201DB -:102070007F1E12079D904CE5E0705BC2017F1E122F +:102070007F1D12079D904CE5E0705BC2017F1D1231 :10208000079D8052904CEEE06011904CE8E004F027 -:10209000E030E1427F1E1217C6803B904CEEE070AC +:10209000E030E1427F1D1217C6803B904CEEE070AD :1020A00035904CE2E0602F14F0E0FFC39408501626 -:1020B000EF30E109D2017F1E12079D8010C2017F1F -:1020C0001E12079D8007C2017F1E12079D904CE2E1 +:1020B000EF30E109D2017FFF12079D8010C2017F3E +:1020C000FF12079D8007C2017FFF12079D904CE21F :1020D000E070037414F0904DD5E07036904DD6E06A :1020E0006401702E904CE3F0A3F0904DD6F0904D2B :1020F000E7E0600D7B017A4D79E77D03120A82806B Index: c51/output/fwram.rom =================================================================== --- /YJX_KB_Project/1026_KB/YJX_JY-K63-W-FN/c51/output/fwram.rom (revision 503) +++ /YJX_KB_Project/1026_KB/YJX_JY-K63-W-FN/c51/output/fwram.rom (working copy) @@ -1696,7 +1696,7 @@ f4 f1 fa -af +e3 d1 d3 d2 @@ -1808,7 +1808,7 @@ c2 01 7f -1e +ff f1 9d d1 @@ -1841,7 +1841,7 @@ d2 01 7f -1d +ff f1 9d 80 @@ -1849,7 +1849,7 @@ c2 01 7f -1d +ff f1 9d 90 @@ -1862,7 +1862,7 @@ d2 01 7f -1f +ff f1 9d 80 @@ -1870,7 +1870,7 @@ c2 01 7f -1f +ff f1 9d 90 @@ -1883,67 +1883,67 @@ d2 01 7f -10 +ff 80 3d c2 01 7f -10 +ff 80 37 c2 01 7f -1d +ff f1 9d c2 01 7f -1f +ff f1 9d c2 01 7f -10 +ff 80 25 c2 01 7f -1d +ff f1 9d c2 01 7f -1f +ff f1 9d c2 01 7f -10 +ff 80 13 c2 01 7f -1d +ff f1 9d c2 01 7f -1f +ff f1 9d c2 01 7f -10 +ff f1 9d 22 @@ -1997,31 +1997,31 @@ c2 06 7f -1d +ff f1 af c2 06 7f -1f +ff f1 af c2 06 7f -10 +ff f1 af c2 06 7f -1e +ff f1 af c2 06 7f -1e +1d 80 c5 f1 @@ -8303,7 +8303,7 @@ d2 01 7f -1e +1d 12 07 9d @@ -8316,7 +8316,7 @@ c2 01 7f -1e +1d 12 07 9d @@ -8339,7 +8339,7 @@ e1 42 7f -1e +1d 12 17 c6 @@ -8373,7 +8373,7 @@ d2 01 7f -1e +ff 12 07 9d @@ -8382,7 +8382,7 @@ c2 01 7f -1e +ff 12 07 9d @@ -8391,7 +8391,7 @@ c2 01 7f -1e +ff 12 07 9d 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 Index: c51/sys.c =================================================================== --- /YJX_KB_Project/1026_KB/YJX_JY-K63-W-FN/c51/sys.c (revision 503) +++ /YJX_KB_Project/1026_KB/YJX_JY-K63-W-FN/c51/sys.c (working copy) @@ -418,7 +418,6 @@ kb_need_keyscan(); YC_update_eeprom_data(); LED_handle(); - switch (current_task) { case FIX_ENTER_HIBERNATE: KS_Unistall();