Browse Source

update

master
zhaohe 1 year ago
parent
commit
42f52ecac5
  1. 4
      app/src/board/board.h
  2. 21
      bin2/app.hex
  3. BIN
      bin2/app3.zip
  4. BIN
      bin2/app4.zip
  5. 16
      bin2/bl_temp.hex
  6. 2986
      bin2/bootloader.hex.2
  7. 2
      bin2/build_zip.bat
  8. 16
      bin2/settings.hex
  9. 35
      bin2/whole.hex
  10. 2
      libznordic

4
app/src/board/board.h

@ -40,12 +40,12 @@
/******************************************************************************* /*******************************************************************************
* °´¼ü * * °´¼ü *
*******************************************************************************/ *******************************************************************************/
#define BUTTON_PIN 18
#define BUTTON_PIN 0
/******************************************************************************* /*******************************************************************************
* ·äÃùÆ÷ * * ·äÃùÆ÷ *
*******************************************************************************/ *******************************************************************************/
#define BEEP_PIN 0
#define BEEP_PIN 18
/******************************************************************************* /*******************************************************************************
* µç³ØµçÁ¿ * * µç³ØµçÁ¿ *

21
bin2/app.hex

@ -1530,7 +1530,7 @@
:10CF800020BF704701207047012070470120704783 :10CF800020BF704701207047012070470120704783
:10CF90000120704770B5044603A50E22294620469D :10CF90000120704770B5044603A50E22294620469D
:10CFA000FAF7A4FA70BD00004D3130303130303026 :10CFA000FAF7A4FA70BD00004D3130303130303026
:10CFB000303030303032000010B50248FFF7EAFF61
:10CFB000303030303034000010B50248FFF7EAFF5F
:10CFC000004810BDA49500202DE9F04104460E460E :10CFC000004810BDA49500202DE9F04104460E460E
:10CFD000D4F800800021204600F000F90546EDB9A4 :10CFD000D4F800800021204600F000F90546EDB9A4
:10CFE000002700BF4046A16902F00EFA054605B1D0 :10CFE000002700BF4046A16902F00EFA054605B1D0
@ -2079,7 +2079,7 @@
:10F1D00015A101F08FFBFDF7EFFE174908601748F6 :10F1D00015A101F08FFBFDF7EFFE174908601748F6
:10F1E0004860084606F0C8FFF8F78AFEF9F722FCE7 :10F1E0004860084606F0C8FFF8F78AFEF9F722FCE7
:10F1F00007F0FEFB002070BD64310020847D030019 :10F1F00007F0FEFB002070BD64310020847D030019
:10F20000EC7C030031363A31363A323200000000ED
:10F20000EC7C030031373A32323A333900000000E7
:10F21000636F6D70696C652074696D65203A257344 :10F21000636F6D70696C652074696D65203A257344
:10F220000000000080100010435553544F4D4552CC :10F220000000000080100010435553544F4D4552CC
:10F23000203A256400000000B82B0020098002005D :10F23000203A256400000000B82B0020098002005D
@ -4027,7 +4027,7 @@
:106B800000000000882D0020010006000100060022 :106B800000000000882D0020010006000100060022
:106B9000000000000200000100000000C82D0020DD :106B9000000000000200000100000000C82D0020DD
:106BA000F02D0020040000000000000000000000A4 :106BA000F02D0020040000000000000000000000A4
:106BB00080FFFFFF070700002E000200182E0020B4
:106BB00092FFFFFF070700002E000200182E0020A2
:106BC000D86E03006C7303006873030060730300E6 :106BC000D86E03006C7303006873030060730300E6
:106BD00000020000110B0405E06B00200000000023 :106BD00000020000110B0405E06B00200000000023
:106BE0000338FDD870470000770A0000000000005D :106BE0000338FDD870470000770A0000000000005D
@ -4300,7 +4300,7 @@
:107C90006261636B656E6400617070006E72665F36 :107C90006261636B656E6400617070006E72665F36
:107CA000736468006E72665F7364685F626C65001F :107CA000736468006E72665F7364685F626C65001F
:107CB0006E72665F7364685F736F63002C7E03008F :107CB0006E72665F7364685F736F63002C7E03008F
:107CC000B82B0020AC030000A87E0200547F030004
:107CC000B82B0020AC030000A87E0200507F030008
:107CD000642F0020C4760000B69C0200606F030091 :107CD000642F0020C4760000B69C0200606F030091
:107CE00000000000887C0300D82E0020EC7B0300FD :107CE00000000000887C0300D82E0020EC7B0300FD
:107CF00000000404FC7B030000000000047C03007F :107CF00000000404FC7B030000000000047C03007F
@ -4335,12 +4335,11 @@
:107EC000198213780D120E120F398208081D07133C :107EC000198213780D120E120F398208081D07133C
:107ED0003B14241504820A364082012E1AFF0153F6 :107ED0003B14241504820A364082012E1AFF0153F6
:107EE00006FFEA40182901091A38091E5809132407 :107EE00006FFEA40182901091A38091E5809132407
:107EF000BBC00168C1141201030C2C09C602502931
:107F000053636B03024B011510014011024504A994
:107F1000B55AFFAB1113790314A078031AF8041AA9
:107F2000A8041AB8041AB0041AC0041AC8041AD053
:107F3000041AD8041AE0041AE8041AF00401101212
:107F4000801492650112020422FFFF14040090D0F5
:047F5000030000002A
:107EF000BBC00168D11301030C2C09C602502953E1
:107F00005B6B0340014B1510014011024504A9B5FC
:107F10005AFFAB1113790314A078031AF8041AA8B6
:107F2000041AB8041AB0041AC0041AC8041AD004F7
:107F30001AD8041AE0041AE8041AF0040110128096
:107F40001492650112020422FFFF14040090D00372
:040000050002720182 :040000050002720182
:00000001FF :00000001FF

BIN
bin2/app.zip → bin2/app3.zip

BIN
bin2/app2.zip → bin2/app4.zip

16
bin2/bl_temp.hex

@ -2978,8 +2978,8 @@
:10DA000010D4070018D4070020D4070028D407003A :10DA000010D4070018D4070020D4070028D407003A
:10DA1000000000000090D0030000000000000000A3 :10DA1000000000000090D0030000000000000000A3
:0CDA2000754F0700001000000000080017 :0CDA2000754F0700001000000000080017
:10E00000FA6628C2020000000100000001000000C2
:10E010000000000000000000540F01000B10945895
:10E0000091A47ACF0200000001000000010000008E
:10E010000000000000000000500F0100D3DF77C4B3
:10E0200001000000000000000000000000000000EF :10E0200001000000000000000000000000000000EF
:10E0300000000000000000000000000000000000E0 :10E0300000000000000000000000000000000000E0
:10E0400000000000000000000000000000000000D0 :10E0400000000000000000000000000000000000D0
@ -3015,12 +3015,12 @@
:10E2200000000000000000000000000000000000EE :10E2200000000000000000000000000000000000EE
:10E2300000000000000000000000000000000000DE :10E2300000000000000000000000000000000000DE
:10E2400000000000000000000000000000000000CE :10E2400000000000000000000000000000000000CE
:10E2500000000000000000000000000065464A12B7
:10E250000000000000000000000000004A37F9BC88
:10E2600000000000000000000000000000000000AE :10E2600000000000000000000000000000000000AE
:10E27000000000000000000000000000000000009E :10E27000000000000000000000000000000000009E
:10E28000000000000000000000000000000000008E :10E28000000000000000000000000000000000008E
:10E29000000000000000000000000000000000007E :10E29000000000000000000000000000000000007E
:10E2A00000010B1094580000000000000000000066
:10E2A0000001D3DF77C40000000000000000000080
:10E2B000000000000000000000000000000000005E :10E2B000000000000000000000000000000000005E
:10E2C000000000000000000000000000000000004E :10E2C000000000000000000000000000000000004E
:10E2D000000000000000000000000000000000003E :10E2D000000000000000000000000000000000003E
@ -3029,8 +3029,8 @@
:10E30000000000000000000000000000000000000D :10E30000000000000000000000000000000000000D
:10E3100000000000000000000000000000000000FD :10E3100000000000000000000000000000000000FD
:04E32000000000FFFA :04E32000000000FFFA
:10F00000FA6628C2020000000100000001000000B2
:10F010000000000000000000540F01000B10945885
:10F0000091A47ACF0200000001000000010000007E
:10F010000000000000000000500F0100D3DF77C4A3
:10F0200001000000000000000000000000000000DF :10F0200001000000000000000000000000000000DF
:10F0300000000000000000000000000000000000D0 :10F0300000000000000000000000000000000000D0
:10F0400000000000000000000000000000000000C0 :10F0400000000000000000000000000000000000C0
@ -3066,12 +3066,12 @@
:10F2200000000000000000000000000000000000DE :10F2200000000000000000000000000000000000DE
:10F2300000000000000000000000000000000000CE :10F2300000000000000000000000000000000000CE
:10F2400000000000000000000000000000000000BE :10F2400000000000000000000000000000000000BE
:10F2500000000000000000000000000065464A12A7
:10F250000000000000000000000000004A37F9BC78
:10F26000000000000000000000000000000000009E :10F26000000000000000000000000000000000009E
:10F27000000000000000000000000000000000008E :10F27000000000000000000000000000000000008E
:10F28000000000000000000000000000000000007E :10F28000000000000000000000000000000000007E
:10F29000000000000000000000000000000000006E :10F29000000000000000000000000000000000006E
:10F2A00000010B1094580000000000000000000056
:10F2A0000001D3DF77C40000000000000000000070
:10F2B000000000000000000000000000000000004E :10F2B000000000000000000000000000000000004E
:10F2C000000000000000000000000000000000003E :10F2C000000000000000000000000000000000003E
:10F2D000000000000000000000000000000000002E :10F2D000000000000000000000000000000000002E

2986
bin2/bootloader.hex.2
File diff suppressed because it is too large
View File

2
bin2/build_zip.bat

@ -1,2 +1,2 @@
copy ..\app\_build\app.hex . copy ..\app\_build\app.hex .
nrfutil pkg generate --application app.hex --application-version 1 --hw-version 52 --sd-req 0x0100 --key-file priv.pem app.zip
nrfutil pkg generate --application app.hex --application-version 1 --hw-version 52 --sd-req 0x0100 --key-file priv.pem app4.zip

16
bin2/settings.hex

@ -1,6 +1,6 @@
:020000040007F3 :020000040007F3
:10E00000FA6628C2020000000100000001000000C2
:10E010000000000000000000540F01000B10945895
:10E0000091A47ACF0200000001000000010000008E
:10E010000000000000000000500F0100D3DF77C4B3
:10E0200001000000000000000000000000000000EF :10E0200001000000000000000000000000000000EF
:10E0300000000000000000000000000000000000E0 :10E0300000000000000000000000000000000000E0
:10E0400000000000000000000000000000000000D0 :10E0400000000000000000000000000000000000D0
@ -36,12 +36,12 @@
:10E2200000000000000000000000000000000000EE :10E2200000000000000000000000000000000000EE
:10E2300000000000000000000000000000000000DE :10E2300000000000000000000000000000000000DE
:10E2400000000000000000000000000000000000CE :10E2400000000000000000000000000000000000CE
:10E2500000000000000000000000000065464A12B7
:10E250000000000000000000000000004A37F9BC88
:10E2600000000000000000000000000000000000AE :10E2600000000000000000000000000000000000AE
:10E27000000000000000000000000000000000009E :10E27000000000000000000000000000000000009E
:10E28000000000000000000000000000000000008E :10E28000000000000000000000000000000000008E
:10E29000000000000000000000000000000000007E :10E29000000000000000000000000000000000007E
:10E2A00000010B1094580000000000000000000066
:10E2A0000001D3DF77C40000000000000000000080
:10E2B000000000000000000000000000000000005E :10E2B000000000000000000000000000000000005E
:10E2C000000000000000000000000000000000004E :10E2C000000000000000000000000000000000004E
:10E2D000000000000000000000000000000000003E :10E2D000000000000000000000000000000000003E
@ -50,8 +50,8 @@
:10E30000000000000000000000000000000000000D :10E30000000000000000000000000000000000000D
:10E3100000000000000000000000000000000000FD :10E3100000000000000000000000000000000000FD
:04E32000000000FFFA :04E32000000000FFFA
:10F00000FA6628C2020000000100000001000000B2
:10F010000000000000000000540F01000B10945885
:10F0000091A47ACF0200000001000000010000007E
:10F010000000000000000000500F0100D3DF77C4A3
:10F0200001000000000000000000000000000000DF :10F0200001000000000000000000000000000000DF
:10F0300000000000000000000000000000000000D0 :10F0300000000000000000000000000000000000D0
:10F0400000000000000000000000000000000000C0 :10F0400000000000000000000000000000000000C0
@ -87,12 +87,12 @@
:10F2200000000000000000000000000000000000DE :10F2200000000000000000000000000000000000DE
:10F2300000000000000000000000000000000000CE :10F2300000000000000000000000000000000000CE
:10F2400000000000000000000000000000000000BE :10F2400000000000000000000000000000000000BE
:10F2500000000000000000000000000065464A12A7
:10F250000000000000000000000000004A37F9BC78
:10F26000000000000000000000000000000000009E :10F26000000000000000000000000000000000009E
:10F27000000000000000000000000000000000008E :10F27000000000000000000000000000000000008E
:10F28000000000000000000000000000000000007E :10F28000000000000000000000000000000000007E
:10F29000000000000000000000000000000000006E :10F29000000000000000000000000000000000006E
:10F2A00000010B1094580000000000000000000056
:10F2A0000001D3DF77C40000000000000000000070
:10F2B000000000000000000000000000000000004E :10F2B000000000000000000000000000000000004E
:10F2C000000000000000000000000000000000003E :10F2C000000000000000000000000000000000003E
:10F2D000000000000000000000000000000000002E :10F2D000000000000000000000000000000000002E

35
bin2/whole.hex

@ -11829,7 +11829,7 @@
:10F1D00015A101F08FFBFDF7EFFE174908601748F6 :10F1D00015A101F08FFBFDF7EFFE174908601748F6
:10F1E0004860084606F0C8FFF8F78AFEF9F722FCE7 :10F1E0004860084606F0C8FFF8F78AFEF9F722FCE7
:10F1F00007F0FEFB002070BD64310020847D030019 :10F1F00007F0FEFB002070BD64310020847D030019
:10F20000EC7C030031363A31363A323200000000ED
:10F20000EC7C030031373A32323A333900000000E7
:10F21000636F6D70696C652074696D65203A257344 :10F21000636F6D70696C652074696D65203A257344
:10F220000000000080100010435553544F4D4552CC :10F220000000000080100010435553544F4D4552CC
:10F23000203A256400000000B82B0020098002005D :10F23000203A256400000000B82B0020098002005D
@ -13777,7 +13777,7 @@
:106B800000000000882D0020010006000100060022 :106B800000000000882D0020010006000100060022
:106B9000000000000200000100000000C82D0020DD :106B9000000000000200000100000000C82D0020DD
:106BA000F02D0020040000000000000000000000A4 :106BA000F02D0020040000000000000000000000A4
:106BB00080FFFFFF070700002E000200182E0020B4
:106BB00092FFFFFF070700002E000200182E0020A2
:106BC000D86E03006C7303006873030060730300E6 :106BC000D86E03006C7303006873030060730300E6
:106BD00000020000110B0405E06B00200000000023 :106BD00000020000110B0405E06B00200000000023
:106BE0000338FDD870470000770A0000000000005D :106BE0000338FDD870470000770A0000000000005D
@ -14050,7 +14050,7 @@
:107C90006261636B656E6400617070006E72665F36 :107C90006261636B656E6400617070006E72665F36
:107CA000736468006E72665F7364685F626C65001F :107CA000736468006E72665F7364685F626C65001F
:107CB0006E72665F7364685F736F63002C7E03008F :107CB0006E72665F7364685F736F63002C7E03008F
:107CC000B82B0020AC030000A87E0200547F030004
:107CC000B82B0020AC030000A87E0200507F030008
:107CD000642F0020C4760000B69C0200606F030091 :107CD000642F0020C4760000B69C0200606F030091
:107CE00000000000887C0300D82E0020EC7B0300FD :107CE00000000000887C0300D82E0020EC7B0300FD
:107CF00000000404FC7B030000000000047C03007F :107CF00000000404FC7B030000000000047C03007F
@ -14085,13 +14085,12 @@
:107EC000198213780D120E120F398208081D07133C :107EC000198213780D120E120F398208081D07133C
:107ED0003B14241504820A364082012E1AFF0153F6 :107ED0003B14241504820A364082012E1AFF0153F6
:107EE00006FFEA40182901091A38091E5809132407 :107EE00006FFEA40182901091A38091E5809132407
:107EF000BBC00168C1141201030C2C09C602502931
:107F000053636B03024B011510014011024504A994
:107F1000B55AFFAB1113790314A078031AF8041AA9
:107F2000A8041AB8041AB0041AC0041AC8041AD053
:107F3000041AD8041AE0041AE8041AF00401101212
:107F4000801492650112020422FFFF14040090D0F5
:047F5000030000002A
:107EF000BBC00168D11301030C2C09C602502953E1
:107F00005B6B0340014B1510014011024504A9B5FC
:107F10005AFFAB1113790314A078031AF8041AA8B6
:107F2000041AB8041AB0041AC0041AC8041AD004F7
:107F30001AD8041AE0041AE8041AF0040110128096
:107F40001492650112020422FFFF14040090D00372
:020000040007F3 :020000040007F3
:1020000080930020D9230700E1230700E323070082 :1020000080930020D9230700E1230700E323070082
:10201000E5230700E7230700E9230700000000008D :10201000E5230700E7230700E9230700000000008D
@ -17072,8 +17071,8 @@
:10DA000010D4070018D4070020D4070028D407003A :10DA000010D4070018D4070020D4070028D407003A
:10DA1000000000000090D0030000000000000000A3 :10DA1000000000000090D0030000000000000000A3
:0CDA2000754F0700001000000000080017 :0CDA2000754F0700001000000000080017
:10E00000FA6628C2020000000100000001000000C2
:10E010000000000000000000540F01000B10945895
:10E0000091A47ACF0200000001000000010000008E
:10E010000000000000000000500F0100D3DF77C4B3
:10E0200001000000000000000000000000000000EF :10E0200001000000000000000000000000000000EF
:10E0300000000000000000000000000000000000E0 :10E0300000000000000000000000000000000000E0
:10E0400000000000000000000000000000000000D0 :10E0400000000000000000000000000000000000D0
@ -17109,12 +17108,12 @@
:10E2200000000000000000000000000000000000EE :10E2200000000000000000000000000000000000EE
:10E2300000000000000000000000000000000000DE :10E2300000000000000000000000000000000000DE
:10E2400000000000000000000000000000000000CE :10E2400000000000000000000000000000000000CE
:10E2500000000000000000000000000065464A12B7
:10E250000000000000000000000000004A37F9BC88
:10E2600000000000000000000000000000000000AE :10E2600000000000000000000000000000000000AE
:10E27000000000000000000000000000000000009E :10E27000000000000000000000000000000000009E
:10E28000000000000000000000000000000000008E :10E28000000000000000000000000000000000008E
:10E29000000000000000000000000000000000007E :10E29000000000000000000000000000000000007E
:10E2A00000010B1094580000000000000000000066
:10E2A0000001D3DF77C40000000000000000000080
:10E2B000000000000000000000000000000000005E :10E2B000000000000000000000000000000000005E
:10E2C000000000000000000000000000000000004E :10E2C000000000000000000000000000000000004E
:10E2D000000000000000000000000000000000003E :10E2D000000000000000000000000000000000003E
@ -17123,8 +17122,8 @@
:10E30000000000000000000000000000000000000D :10E30000000000000000000000000000000000000D
:10E3100000000000000000000000000000000000FD :10E3100000000000000000000000000000000000FD
:04E32000000000FFFA :04E32000000000FFFA
:10F00000FA6628C2020000000100000001000000B2
:10F010000000000000000000540F01000B10945885
:10F0000091A47ACF0200000001000000010000007E
:10F010000000000000000000500F0100D3DF77C4A3
:10F0200001000000000000000000000000000000DF :10F0200001000000000000000000000000000000DF
:10F0300000000000000000000000000000000000D0 :10F0300000000000000000000000000000000000D0
:10F0400000000000000000000000000000000000C0 :10F0400000000000000000000000000000000000C0
@ -17160,12 +17159,12 @@
:10F2200000000000000000000000000000000000DE :10F2200000000000000000000000000000000000DE
:10F2300000000000000000000000000000000000CE :10F2300000000000000000000000000000000000CE
:10F2400000000000000000000000000000000000BE :10F2400000000000000000000000000000000000BE
:10F2500000000000000000000000000065464A12A7
:10F250000000000000000000000000004A37F9BC78
:10F26000000000000000000000000000000000009E :10F26000000000000000000000000000000000009E
:10F27000000000000000000000000000000000008E :10F27000000000000000000000000000000000008E
:10F28000000000000000000000000000000000007E :10F28000000000000000000000000000000000007E
:10F29000000000000000000000000000000000006E :10F29000000000000000000000000000000000006E
:10F2A00000010B1094580000000000000000000056
:10F2A0000001D3DF77C40000000000000000000070
:10F2B000000000000000000000000000000000004E :10F2B000000000000000000000000000000000004E
:10F2C000000000000000000000000000000000003E :10F2C000000000000000000000000000000000003E
:10F2D000000000000000000000000000000000002E :10F2D000000000000000000000000000000000002E

2
libznordic

@ -1 +1 @@
Subproject commit 3dcb69f89fa5c22a6e2353c82cae222d6d64e8cc
Subproject commit 336e39bf85c5eeb9e3662581ecc585dfcfe9bb26
Loading…
Cancel
Save