Browse Source

update

master
zhaohe 1 year ago
parent
commit
9fb2c77bd5
  1. 2
      app/app.uvprojx
  2. 2
      app/config/sdk_config.h
  3. 7747
      bin2/app.hex
  4. BIN
      bin2/app.zip
  5. 3444
      bin2/app1.hex
  6. BIN
      bin2/app2.zip
  7. 18
      bin2/bl_temp.hex
  8. 2
      bin2/bootloader.hex
  9. 2986
      bin2/bootloader.hex.2
  10. 1
      bin2/build.bat
  11. 3
      bin2/build_zip.bat
  12. 16
      bin2/settings.hex
  13. 7765
      bin2/whole.hex
  14. 2
      libznordic
  15. 2
      sdk

2
app/app.uvprojx

@ -49,7 +49,7 @@
<InvalidFlash>1</InvalidFlash> <InvalidFlash>1</InvalidFlash>
</TargetStatus> </TargetStatus>
<OutputDirectory>.\_build\</OutputDirectory> <OutputDirectory>.\_build\</OutputDirectory>
<OutputName>nrf52833_xxaa</OutputName>
<OutputName>app</OutputName>
<CreateExecutable>1</CreateExecutable> <CreateExecutable>1</CreateExecutable>
<CreateLib>0</CreateLib> <CreateLib>0</CreateLib>
<CreateHexFile>1</CreateHexFile> <CreateHexFile>1</CreateHexFile>

2
app/config/sdk_config.h

@ -1368,7 +1368,7 @@
#ifndef BLE_DFU_ENABLED #ifndef BLE_DFU_ENABLED
#define BLE_DFU_ENABLED 0
#define BLE_DFU_ENABLED 1
#endif #endif
// <q> NRF_DFU_BLE_BUTTONLESS_SUPPORTS_BONDS - Buttonless DFU supports bonds. // <q> NRF_DFU_BLE_BUTTONLESS_SUPPORTS_BONDS - Buttonless DFU supports bonds.

7747
bin2/app.hex
File diff suppressed because it is too large
View File

BIN
bin2/app.zip

3444
bin2/app1.hex
File diff suppressed because it is too large
View File

BIN
bin2/app2.zip

18
bin2/bl_temp.hex

@ -2667,7 +2667,7 @@
:10C69000718707006F8707006987070000000000A7 :10C69000718707006F8707006987070000000000A7
:10C6A0000338FDD870470000405200207F00000092 :10C6A0000338FDD870470000405200207F00000092
:10C6B000C0520020D8D80700E0D8070000000000D2 :10C6B000C0520020D8D80700E0D8070000000000D2
:10C6C0000000000001000007B4C60700C4C6070050
:10C6C0000000000000100201B4C60700C4C6070045
:10C6D00008000000ECC60700FCC6070008000000C8 :10C6D00008000000ECC60700FCC6070008000000C8
:10C6E000FCC607000CC7070008000000F8D80700C8 :10C6E000FCC607000CC7070008000000F8D80700C8
:10C6F00000D907000000000000000000E8D8070093 :10C6F00000D907000000000000000000E8D8070093
@ -2978,8 +2978,8 @@
:10DA000010D4070018D4070020D4070028D407003A :10DA000010D4070018D4070020D4070028D407003A
:10DA1000000000000090D0030000000000000000A3 :10DA1000000000000090D0030000000000000000A3
:0CDA2000754F0700001000000000080017 :0CDA2000754F0700001000000000080017
:10E000001CB9BBF00200000001000000010000008C
:10E010000000000000000000F4D60000567492CB0F
:10E00000FEB55706020000000100000001000000FC
:10E010000000000000000000300F01001EFE7B81A8
:10E0200001000000000000000000000000000000EF :10E0200001000000000000000000000000000000EF
:10E0300000000000000000000000000000000000E0 :10E0300000000000000000000000000000000000E0
:10E0400000000000000000000000000000000000D0 :10E0400000000000000000000000000000000000D0
@ -3015,12 +3015,12 @@
:10E2200000000000000000000000000000000000EE :10E2200000000000000000000000000000000000EE
:10E2300000000000000000000000000000000000DE :10E2300000000000000000000000000000000000DE
:10E2400000000000000000000000000000000000CE :10E2400000000000000000000000000000000000CE
:10E25000000000000000000000000000785DD51103
:10E250000000000000000000000000009A8268A199
:10E2600000000000000000000000000000000000AE :10E2600000000000000000000000000000000000AE
:10E27000000000000000000000000000000000009E :10E27000000000000000000000000000000000009E
:10E28000000000000000000000000000000000008E :10E28000000000000000000000000000000000008E
:10E29000000000000000000000000000000000007E :10E29000000000000000000000000000000000007E
:10E2A0000001567492CB0000000000000000000046
:10E2A00000011EFE7B810000000000000000000055
:10E2B000000000000000000000000000000000005E :10E2B000000000000000000000000000000000005E
:10E2C000000000000000000000000000000000004E :10E2C000000000000000000000000000000000004E
:10E2D000000000000000000000000000000000003E :10E2D000000000000000000000000000000000003E
@ -3029,8 +3029,8 @@
:10E30000000000000000000000000000000000000D :10E30000000000000000000000000000000000000D
:10E3100000000000000000000000000000000000FD :10E3100000000000000000000000000000000000FD
:04E32000000000FFFA :04E32000000000FFFA
:10F000001CB9BBF00200000001000000010000007C
:10F010000000000000000000F4D60000567492CBFF
:10F00000FEB55706020000000100000001000000EC
:10F010000000000000000000300F01001EFE7B8198
:10F0200001000000000000000000000000000000DF :10F0200001000000000000000000000000000000DF
:10F0300000000000000000000000000000000000D0 :10F0300000000000000000000000000000000000D0
:10F0400000000000000000000000000000000000C0 :10F0400000000000000000000000000000000000C0
@ -3066,12 +3066,12 @@
:10F2200000000000000000000000000000000000DE :10F2200000000000000000000000000000000000DE
:10F2300000000000000000000000000000000000CE :10F2300000000000000000000000000000000000CE
:10F2400000000000000000000000000000000000BE :10F2400000000000000000000000000000000000BE
:10F25000000000000000000000000000785DD511F3
:10F250000000000000000000000000009A8268A189
:10F26000000000000000000000000000000000009E :10F26000000000000000000000000000000000009E
:10F27000000000000000000000000000000000008E :10F27000000000000000000000000000000000008E
:10F28000000000000000000000000000000000007E :10F28000000000000000000000000000000000007E
:10F29000000000000000000000000000000000006E :10F29000000000000000000000000000000000006E
:10F2A0000001567492CB0000000000000000000036
:10F2A00000011EFE7B810000000000000000000045
:10F2B000000000000000000000000000000000004E :10F2B000000000000000000000000000000000004E
:10F2C000000000000000000000000000000000003E :10F2C000000000000000000000000000000000003E
:10F2D000000000000000000000000000000000002E :10F2D000000000000000000000000000000000002E

2
bin2/bootloader.hex

@ -2667,7 +2667,7 @@
:10C69000718707006F8707006987070000000000A7 :10C69000718707006F8707006987070000000000A7
:10C6A0000338FDD870470000405200207F00000092 :10C6A0000338FDD870470000405200207F00000092
:10C6B000C0520020D8D80700E0D8070000000000D2 :10C6B000C0520020D8D80700E0D8070000000000D2
:10C6C0000000000001000007B4C60700C4C6070050
:10C6C0000000000000100201B4C60700C4C6070045
:10C6D00008000000ECC60700FCC6070008000000C8 :10C6D00008000000ECC60700FCC6070008000000C8
:10C6E000FCC607000CC7070008000000F8D80700C8 :10C6E000FCC607000CC7070008000000F8D80700C8
:10C6F00000D907000000000000000000E8D8070093 :10C6F00000D907000000000000000000E8D8070093

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

1
bin2/build.bat

@ -1,3 +1,4 @@
copy ..\app\_build\app.hex .
nrfutil settings generate --family NRF52 --application app.hex --application-version 1 --bootloader-version 1 --bl-settings-version 2 settings.hex nrfutil settings generate --family NRF52 --application app.hex --application-version 1 --bootloader-version 1 --bl-settings-version 2 settings.hex
mergehex --merge bootloader.hex settings.hex --output bl_temp.hex mergehex --merge bootloader.hex settings.hex --output bl_temp.hex
mergehex --merge bl_temp.hex app.hex s140_nrf52_7.2.0_softdevice.hex --output whole.hex mergehex --merge bl_temp.hex app.hex s140_nrf52_7.2.0_softdevice.hex --output whole.hex

3
bin2/build_zip.bat

@ -1 +1,2 @@
nrfutil pkg generate --application app.hex --application-version 2 --hw-version 52 --sd-req 0x0100 --key-file priv.pem app2.zip
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

16
bin2/settings.hex

@ -1,6 +1,6 @@
:020000040007F3 :020000040007F3
:10E000001CB9BBF00200000001000000010000008C
:10E010000000000000000000F4D60000567492CB0F
:10E00000FEB55706020000000100000001000000FC
:10E010000000000000000000300F01001EFE7B81A8
:10E0200001000000000000000000000000000000EF :10E0200001000000000000000000000000000000EF
:10E0300000000000000000000000000000000000E0 :10E0300000000000000000000000000000000000E0
:10E0400000000000000000000000000000000000D0 :10E0400000000000000000000000000000000000D0
@ -36,12 +36,12 @@
:10E2200000000000000000000000000000000000EE :10E2200000000000000000000000000000000000EE
:10E2300000000000000000000000000000000000DE :10E2300000000000000000000000000000000000DE
:10E2400000000000000000000000000000000000CE :10E2400000000000000000000000000000000000CE
:10E25000000000000000000000000000785DD51103
:10E250000000000000000000000000009A8268A199
:10E2600000000000000000000000000000000000AE :10E2600000000000000000000000000000000000AE
:10E27000000000000000000000000000000000009E :10E27000000000000000000000000000000000009E
:10E28000000000000000000000000000000000008E :10E28000000000000000000000000000000000008E
:10E29000000000000000000000000000000000007E :10E29000000000000000000000000000000000007E
:10E2A0000001567492CB0000000000000000000046
:10E2A00000011EFE7B810000000000000000000055
:10E2B000000000000000000000000000000000005E :10E2B000000000000000000000000000000000005E
:10E2C000000000000000000000000000000000004E :10E2C000000000000000000000000000000000004E
:10E2D000000000000000000000000000000000003E :10E2D000000000000000000000000000000000003E
@ -50,8 +50,8 @@
:10E30000000000000000000000000000000000000D :10E30000000000000000000000000000000000000D
:10E3100000000000000000000000000000000000FD :10E3100000000000000000000000000000000000FD
:04E32000000000FFFA :04E32000000000FFFA
:10F000001CB9BBF00200000001000000010000007C
:10F010000000000000000000F4D60000567492CBFF
:10F00000FEB55706020000000100000001000000EC
:10F010000000000000000000300F01001EFE7B8198
:10F0200001000000000000000000000000000000DF :10F0200001000000000000000000000000000000DF
:10F0300000000000000000000000000000000000D0 :10F0300000000000000000000000000000000000D0
:10F0400000000000000000000000000000000000C0 :10F0400000000000000000000000000000000000C0
@ -87,12 +87,12 @@
:10F2200000000000000000000000000000000000DE :10F2200000000000000000000000000000000000DE
:10F2300000000000000000000000000000000000CE :10F2300000000000000000000000000000000000CE
:10F2400000000000000000000000000000000000BE :10F2400000000000000000000000000000000000BE
:10F25000000000000000000000000000785DD511F3
:10F250000000000000000000000000009A8268A189
:10F26000000000000000000000000000000000009E :10F26000000000000000000000000000000000009E
:10F27000000000000000000000000000000000008E :10F27000000000000000000000000000000000008E
:10F28000000000000000000000000000000000007E :10F28000000000000000000000000000000000007E
:10F29000000000000000000000000000000000006E :10F29000000000000000000000000000000000006E
:10F2A0000001567492CB0000000000000000000036
:10F2A00000011EFE7B810000000000000000000045
:10F2B000000000000000000000000000000000004E :10F2B000000000000000000000000000000000004E
:10F2C000000000000000000000000000000000003E :10F2C000000000000000000000000000000000003E
:10F2D000000000000000000000000000000000002E :10F2D000000000000000000000000000000000002E

7765
bin2/whole.hex
File diff suppressed because it is too large
View File

2
libznordic

@ -1 +1 @@
Subproject commit 8951d9a63e7f9c3311c276aef94be5ae610cc66a
Subproject commit 3dcb69f89fa5c22a6e2353c82cae222d6d64e8cc

2
sdk

@ -1 +1 @@
Subproject commit 3f932bccb3fb344dedd439afcdffd0a74e56c673
Subproject commit 80adec4d07ebd578ef632efb8a4145dce0eb4adb
Loading…
Cancel
Save