p_dynamic_electrocardiograph
/
three_lead_ecg
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

update

master
zhaohe 1 year ago
parent
fd2d30aae5
commit
43bcbe5ed0
29 changed files with 35988 additions and 33161 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      README.md
  2. 2
      app/app.uvprojx
  3. 2
      app/config/sdk_config.h
  4. 2
      app/src/device_ctrl_service.c
  5. 4343
      bin/app.hex
  6. 1576
      bin/bl_temp.hex
  7. 1477
      bin/bootloader.hex
  8. 3444
      bin2/app.hex
  9. BIN
      bin2/app.zip
  10. 3133
      bin2/bl_temp.hex
  11. 3034
      bin2/bootloader.hex
  12. 0
      bin2/build.bat
  13. 1
      bin2/build_zip.bat
  14. 0
      bin2/nrfutil.exe
  15. 5
      bin2/priv.pem
  16. 0
      bin2/s140_nrf52_7.2.0_softdevice.hex
  17. 16
      bin2/settings.hex
  18. 12262
      bin2/whole.hex
  19. 16
      bootloader/main.c
  20. 86
      bootloader/pca10100_s140_ble/arm5_no_packs/secure_bootloader_ble_s140_pca10100.uvguix.h_zha
  21. 150
      bootloader/pca10100_s140_ble/arm5_no_packs/secure_bootloader_ble_s140_pca10100.uvoptx
  22. 120
      bootloader/pca10100_s140_ble/arm5_no_packs/secure_bootloader_ble_s140_pca10100.uvprojx
  23. 32
      bootloader/pca10100_s140_ble/config/sdk_config.h
  24. 2
      sdk

8
README.md
View File

@ -38,3 +38,11 @@ TODO:
```
```
1. 打包整体无线升级镜像
2. 通过nrfutil生成新固件对应的zip包
```

2
app/app.uvprojx
View File

@ -4176,7 +4176,7 @@
<v6Rtti>0</v6Rtti>
<VariousControls>
<MiscControls>--reduce_paths</MiscControls>
<Define> __HEAP_SIZE=2048 __STACK_SIZE=2048</Define>
<Define>__HEAP_SIZE=2048 __STACK_SIZE=2048</Define>
<Undefine></Undefine>
<IncludePath>..\sdk\config;.\config\</IncludePath>
</VariousControls>

2
app/config/sdk_config.h
View File

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

2
app/src/device_ctrl_service.c
View File

@ -116,7 +116,7 @@ static void prvf_change_to_standby_state() {
static void prvf_change_to_ready_state() {
poweron();
DeviceCtrl_change_to_state(kdevice_state_ready);
BoardBeepCtrl_setEffect(kBoardBeepEffect_oneShortBeep);
BoardBeepCtrl_setEffect(kBoardBeepEffect_threeShortBeep);
}
#if 0
static const char* dropstate(uint8_t drop0, uint8_t drop1) {

4343
bin/app.hex
File diff suppressed because it is too large
View File

1576
bin/bl_temp.hex
File diff suppressed because it is too large
View File

1477
bin/bootloader.hex
File diff suppressed because it is too large
View File

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

BIN
bin2/app.zip
View File

3133
bin2/bl_temp.hex
File diff suppressed because it is too large
View File

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

0
bin/build.bat → bin2/build.bat
View File

1
bin2/build_zip.bat
View File

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

0
bin/nrfutil.exe → bin2/nrfutil.exe
View File

5
bin2/priv.pem
View File

@ -0,0 +1,5 @@
-----BEGIN EC PRIVATE KEY-----
MHcCAQEEIDte4CCgbOzdpfLs0vct4MY64Er/HEeCLRs9gmwh1p28oAoGCCqGSM49
AwEHoUQDQgAELO4SAROwIJwBPB6URrwc5mO8kIxppvuGe1PBckuYN/sr8gk+uIa3
sB9iUpX9ZsWjHCHXRdQNy8U1l9y7vRlvQg==
-----END EC PRIVATE KEY-----

0
bin/s140_nrf52_7.2.0_softdevice.hex → bin2/s140_nrf52_7.2.0_softdevice.hex
View File

16
bin/settings.hex → bin2/settings.hex
View File

@ -1,6 +1,6 @@
:020000040007F3
:10E00000D6C2C4D9020000000100000001000000D7
:10E010000000000000000000300F0100C44E6AB98B
:10E000001CB9BBF00200000001000000010000008C
:10E010000000000000000000F4D60000567492CB0F
:10E0200001000000000000000000000000000000EF
:10E0300000000000000000000000000000000000E0
:10E0400000000000000000000000000000000000D0
@ -36,12 +36,12 @@
:10E2200000000000000000000000000000000000EE
:10E2300000000000000000000000000000000000DE
:10E2400000000000000000000000000000000000CE
:10E250000000000000000000000000008FD41084C7
:10E25000000000000000000000000000785DD51103
:10E2600000000000000000000000000000000000AE
:10E27000000000000000000000000000000000009E
:10E28000000000000000000000000000000000008E
:10E29000000000000000000000000000000000007E
:10E2A0000001C44E6AB90000000000000000000038
:10E2A0000001567492CB0000000000000000000046
:10E2B000000000000000000000000000000000005E
:10E2C000000000000000000000000000000000004E
:10E2D000000000000000000000000000000000003E
@ -50,8 +50,8 @@
:10E30000000000000000000000000000000000000D
:10E3100000000000000000000000000000000000FD
:04E32000000000FFFA
:10F00000D6C2C4D9020000000100000001000000C7
:10F010000000000000000000300F0100C44E6AB97B
:10F000001CB9BBF00200000001000000010000007C
:10F010000000000000000000F4D60000567492CBFF
:10F0200001000000000000000000000000000000DF
:10F0300000000000000000000000000000000000D0
:10F0400000000000000000000000000000000000C0
@ -87,12 +87,12 @@
:10F2200000000000000000000000000000000000DE
:10F2300000000000000000000000000000000000CE
:10F2400000000000000000000000000000000000BE
:10F250000000000000000000000000008FD41084B7
:10F25000000000000000000000000000785DD511F3
:10F26000000000000000000000000000000000009E
:10F27000000000000000000000000000000000008E
:10F28000000000000000000000000000000000007E
:10F29000000000000000000000000000000000006E
:10F2A0000001C44E6AB90000000000000000000028
:10F2A0000001567492CB0000000000000000000036
:10F2B000000000000000000000000000000000004E
:10F2C000000000000000000000000000000000003E
:10F2D000000000000000000000000000000000002E

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

16
bootloader/main.c
View File

@ -47,7 +47,7 @@
*/
#include <stdint.h>
#include "boards.h"
// #include "boards.h"
#include "nrf_mbr.h"
#include "nrf_bootloader.h"
#include "nrf_bootloader_app_start.h"
@ -106,14 +106,16 @@ static void dfu_observer(nrf_dfu_evt_type_t evt_type)
case NRF_DFU_EVT_DFU_FAILED:
case NRF_DFU_EVT_DFU_ABORTED:
case NRF_DFU_EVT_DFU_INITIALIZED:
bsp_board_init(BSP_INIT_LEDS);
bsp_board_led_on(BSP_BOARD_LED_0);
bsp_board_led_on(BSP_BOARD_LED_1);
bsp_board_led_off(BSP_BOARD_LED_2);
NRF_LOG_INFO("DFU Initialized");
// bsp_board_init(BSP_INIT_LEDS);
// bsp_board_led_on(BSP_BOARD_LED_0);
// bsp_board_led_on(BSP_BOARD_LED_1);
// bsp_board_led_off(BSP_BOARD_LED_2);
break;
case NRF_DFU_EVT_TRANSPORT_ACTIVATED:
bsp_board_led_off(BSP_BOARD_LED_1);
bsp_board_led_on(BSP_BOARD_LED_2);
NRF_LOG_INFO("DFU Transport Activated");
// bsp_board_led_off(BSP_BOARD_LED_1);
// bsp_board_led_on(BSP_BOARD_LED_2);
break;
case NRF_DFU_EVT_DFU_STARTED:
break;

86
bootloader/pca10100_s140_ble/arm5_no_packs/secure_bootloader_ble_s140_pca10100.uvguix.h_zha
File diff suppressed because it is too large
View File

150
bootloader/pca10100_s140_ble/arm5_no_packs/secure_bootloader_ble_s140_pca10100.uvoptx
View File

@ -380,33 +380,21 @@
<Group>
<GroupName>Board Definition</GroupName>
<tvExp>0</tvExp>
<tvExp>1</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<cbSel>0</cbSel>
<RteFlg>0</RteFlg>
<File>
<GroupNumber>2</GroupNumber>
<FileNumber>4</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2>
<PathWithFileName>..\..\..\sdk\components\boards\boards.c</PathWithFileName>
<FilenameWithoutPath>boards.c</FilenameWithoutPath>
<RteFlg>0</RteFlg>
<bShared>0</bShared>
</File>
</Group>
<Group>
<GroupName>nRF_BLE</GroupName>
<tvExp>0</tvExp>
<tvExp>1</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<cbSel>0</cbSel>
<RteFlg>0</RteFlg>
<File>
<GroupNumber>3</GroupNumber>
<FileNumber>5</FileNumber>
<FileNumber>4</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@ -426,7 +414,7 @@
<RteFlg>0</RteFlg>
<File>
<GroupNumber>4</GroupNumber>
<FileNumber>6</FileNumber>
<FileNumber>5</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@ -438,7 +426,7 @@
</File>
<File>
<GroupNumber>4</GroupNumber>
<FileNumber>7</FileNumber>
<FileNumber>6</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@ -450,7 +438,7 @@
</File>
<File>
<GroupNumber>4</GroupNumber>
<FileNumber>8</FileNumber>
<FileNumber>7</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@ -462,7 +450,7 @@
</File>
<File>
<GroupNumber>4</GroupNumber>
<FileNumber>9</FileNumber>
<FileNumber>8</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@ -474,7 +462,7 @@
</File>
<File>
<GroupNumber>4</GroupNumber>
<FileNumber>10</FileNumber>
<FileNumber>9</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@ -486,7 +474,7 @@
</File>
<File>
<GroupNumber>4</GroupNumber>
<FileNumber>11</FileNumber>
<FileNumber>10</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@ -498,7 +486,7 @@
</File>
<File>
<GroupNumber>4</GroupNumber>
<FileNumber>12</FileNumber>
<FileNumber>11</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@ -518,7 +506,7 @@
<RteFlg>0</RteFlg>
<File>
<GroupNumber>5</GroupNumber>
<FileNumber>13</FileNumber>
<FileNumber>12</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@ -530,7 +518,7 @@
</File>
<File>
<GroupNumber>5</GroupNumber>
<FileNumber>14</FileNumber>
<FileNumber>13</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@ -542,7 +530,7 @@
</File>
<File>
<GroupNumber>5</GroupNumber>
<FileNumber>15</FileNumber>
<FileNumber>14</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@ -554,7 +542,7 @@
</File>
<File>
<GroupNumber>5</GroupNumber>
<FileNumber>16</FileNumber>
<FileNumber>15</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@ -566,7 +554,7 @@
</File>
<File>
<GroupNumber>5</GroupNumber>
<FileNumber>17</FileNumber>
<FileNumber>16</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@ -586,7 +574,7 @@
<RteFlg>0</RteFlg>
<File>
<GroupNumber>6</GroupNumber>
<FileNumber>18</FileNumber>
<FileNumber>17</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@ -598,7 +586,7 @@
</File>
<File>
<GroupNumber>6</GroupNumber>
<FileNumber>19</FileNumber>
<FileNumber>18</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@ -610,7 +598,7 @@
</File>
<File>
<GroupNumber>6</GroupNumber>
<FileNumber>20</FileNumber>
<FileNumber>19</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@ -622,7 +610,7 @@
</File>
<File>
<GroupNumber>6</GroupNumber>
<FileNumber>21</FileNumber>
<FileNumber>20</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@ -634,7 +622,7 @@
</File>
<File>
<GroupNumber>6</GroupNumber>
<FileNumber>22</FileNumber>
<FileNumber>21</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@ -646,7 +634,7 @@
</File>
<File>
<GroupNumber>6</GroupNumber>
<FileNumber>23</FileNumber>
<FileNumber>22</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@ -658,7 +646,7 @@
</File>
<File>
<GroupNumber>6</GroupNumber>
<FileNumber>24</FileNumber>
<FileNumber>23</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@ -678,7 +666,7 @@
<RteFlg>0</RteFlg>
<File>
<GroupNumber>7</GroupNumber>
<FileNumber>25</FileNumber>
<FileNumber>24</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@ -698,7 +686,7 @@
<RteFlg>0</RteFlg>
<File>
<GroupNumber>8</GroupNumber>
<FileNumber>26</FileNumber>
<FileNumber>25</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@ -710,7 +698,7 @@
</File>
<File>
<GroupNumber>8</GroupNumber>
<FileNumber>27</FileNumber>
<FileNumber>26</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@ -722,7 +710,7 @@
</File>
<File>
<GroupNumber>8</GroupNumber>
<FileNumber>28</FileNumber>
<FileNumber>27</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@ -736,13 +724,13 @@
<Group>
<GroupName>nRF_DFU</GroupName>
<tvExp>0</tvExp>
<tvExp>1</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<cbSel>0</cbSel>
<RteFlg>0</RteFlg>
<File>
<GroupNumber>9</GroupNumber>
<FileNumber>29</FileNumber>
<FileNumber>28</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@ -754,7 +742,7 @@
</File>
<File>
<GroupNumber>9</GroupNumber>
<FileNumber>30</FileNumber>
<FileNumber>29</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@ -766,7 +754,7 @@
</File>
<File>
<GroupNumber>9</GroupNumber>
<FileNumber>31</FileNumber>
<FileNumber>30</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@ -778,7 +766,7 @@
</File>
<File>
<GroupNumber>9</GroupNumber>
<FileNumber>32</FileNumber>
<FileNumber>31</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@ -790,7 +778,7 @@
</File>
<File>
<GroupNumber>9</GroupNumber>
<FileNumber>33</FileNumber>
<FileNumber>32</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@ -802,7 +790,7 @@
</File>
<File>
<GroupNumber>9</GroupNumber>
<FileNumber>34</FileNumber>
<FileNumber>33</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@ -814,7 +802,7 @@
</File>
<File>
<GroupNumber>9</GroupNumber>
<FileNumber>35</FileNumber>
<FileNumber>34</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@ -826,7 +814,7 @@
</File>
<File>
<GroupNumber>9</GroupNumber>
<FileNumber>36</FileNumber>
<FileNumber>35</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@ -838,7 +826,7 @@
</File>
<File>
<GroupNumber>9</GroupNumber>
<FileNumber>37</FileNumber>
<FileNumber>36</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@ -850,7 +838,7 @@
</File>
<File>
<GroupNumber>9</GroupNumber>
<FileNumber>38</FileNumber>
<FileNumber>37</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@ -862,7 +850,7 @@
</File>
<File>
<GroupNumber>9</GroupNumber>
<FileNumber>39</FileNumber>
<FileNumber>38</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@ -874,7 +862,7 @@
</File>
<File>
<GroupNumber>9</GroupNumber>
<FileNumber>40</FileNumber>
<FileNumber>39</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@ -886,7 +874,7 @@
</File>
<File>
<GroupNumber>9</GroupNumber>
<FileNumber>41</FileNumber>
<FileNumber>40</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@ -906,7 +894,7 @@
<RteFlg>0</RteFlg>
<File>
<GroupNumber>10</GroupNumber>
<FileNumber>42</FileNumber>
<FileNumber>41</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@ -918,7 +906,7 @@
</File>
<File>
<GroupNumber>10</GroupNumber>
<FileNumber>43</FileNumber>
<FileNumber>42</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@ -938,7 +926,7 @@
<RteFlg>0</RteFlg>
<File>
<GroupNumber>11</GroupNumber>
<FileNumber>44</FileNumber>
<FileNumber>43</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@ -950,7 +938,7 @@
</File>
<File>
<GroupNumber>11</GroupNumber>
<FileNumber>45</FileNumber>
<FileNumber>44</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@ -962,7 +950,7 @@
</File>
<File>
<GroupNumber>11</GroupNumber>
<FileNumber>46</FileNumber>
<FileNumber>45</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@ -974,7 +962,7 @@
</File>
<File>
<GroupNumber>11</GroupNumber>
<FileNumber>47</FileNumber>
<FileNumber>46</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@ -986,7 +974,7 @@
</File>
<File>
<GroupNumber>11</GroupNumber>
<FileNumber>48</FileNumber>
<FileNumber>47</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@ -998,7 +986,7 @@
</File>
<File>
<GroupNumber>11</GroupNumber>
<FileNumber>49</FileNumber>
<FileNumber>48</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@ -1010,7 +998,7 @@
</File>
<File>
<GroupNumber>11</GroupNumber>
<FileNumber>50</FileNumber>
<FileNumber>49</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@ -1022,7 +1010,7 @@
</File>
<File>
<GroupNumber>11</GroupNumber>
<FileNumber>51</FileNumber>
<FileNumber>50</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@ -1034,7 +1022,7 @@
</File>
<File>
<GroupNumber>11</GroupNumber>
<FileNumber>52</FileNumber>
<FileNumber>51</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@ -1046,7 +1034,7 @@
</File>
<File>
<GroupNumber>11</GroupNumber>
<FileNumber>53</FileNumber>
<FileNumber>52</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@ -1058,7 +1046,7 @@
</File>
<File>
<GroupNumber>11</GroupNumber>
<FileNumber>54</FileNumber>
<FileNumber>53</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@ -1070,7 +1058,7 @@
</File>
<File>
<GroupNumber>11</GroupNumber>
<FileNumber>55</FileNumber>
<FileNumber>54</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@ -1082,7 +1070,7 @@
</File>
<File>
<GroupNumber>11</GroupNumber>
<FileNumber>56</FileNumber>
<FileNumber>55</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@ -1094,7 +1082,7 @@
</File>
<File>
<GroupNumber>11</GroupNumber>
<FileNumber>57</FileNumber>
<FileNumber>56</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@ -1106,7 +1094,7 @@
</File>
<File>
<GroupNumber>11</GroupNumber>
<FileNumber>58</FileNumber>
<FileNumber>57</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@ -1118,7 +1106,7 @@
</File>
<File>
<GroupNumber>11</GroupNumber>
<FileNumber>59</FileNumber>
<FileNumber>58</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@ -1130,7 +1118,7 @@
</File>
<File>
<GroupNumber>11</GroupNumber>
<FileNumber>60</FileNumber>
<FileNumber>59</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@ -1150,7 +1138,7 @@
<RteFlg>0</RteFlg>
<File>
<GroupNumber>12</GroupNumber>
<FileNumber>61</FileNumber>
<FileNumber>60</FileNumber>
<FileType>4</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@ -1170,7 +1158,7 @@
<RteFlg>0</RteFlg>
<File>
<GroupNumber>13</GroupNumber>
<FileNumber>62</FileNumber>
<FileNumber>61</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@ -1182,7 +1170,7 @@
</File>
<File>
<GroupNumber>13</GroupNumber>
<FileNumber>63</FileNumber>
<FileNumber>62</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@ -1194,7 +1182,7 @@
</File>
<File>
<GroupNumber>13</GroupNumber>
<FileNumber>64</FileNumber>
<FileNumber>63</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@ -1214,7 +1202,7 @@
<RteFlg>0</RteFlg>
<File>
<GroupNumber>14</GroupNumber>
<FileNumber>65</FileNumber>
<FileNumber>64</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@ -1226,7 +1214,7 @@
</File>
<File>
<GroupNumber>14</GroupNumber>
<FileNumber>66</FileNumber>
<FileNumber>65</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@ -1238,7 +1226,7 @@
</File>
<File>
<GroupNumber>14</GroupNumber>
<FileNumber>67</FileNumber>
<FileNumber>66</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@ -1258,7 +1246,7 @@
<RteFlg>0</RteFlg>
<File>
<GroupNumber>15</GroupNumber>
<FileNumber>68</FileNumber>
<FileNumber>67</FileNumber>
<FileType>4</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@ -1278,7 +1266,7 @@
<RteFlg>0</RteFlg>
<File>
<GroupNumber>16</GroupNumber>
<FileNumber>69</FileNumber>
<FileNumber>68</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@ -1290,7 +1278,7 @@
</File>
<File>
<GroupNumber>16</GroupNumber>
<FileNumber>70</FileNumber>
<FileNumber>69</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>

120
bootloader/pca10100_s140_ble/arm5_no_packs/secure_bootloader_ble_s140_pca10100.uvprojx
View File

@ -337,7 +337,7 @@
<v6Rtti>0</v6Rtti>
<VariousControls>
<MiscControls>--reduce_paths</MiscControls>
<Define> BLE_STACK_SUPPORT_REQD BOARD_PCA10100 CONFIG_GPIO_AS_PINRESET FLOAT_ABI_HARD NRF52833_XXAA NRF_DFU_SETTINGS_VERSION=2 NRF_DFU_SVCI_ENABLED NRF_SD_BLE_API_VERSION=7 S140 SOFTDEVICE_PRESENT SVC_INTERFACE_CALL_AS_NORMAL_FUNCTION __HEAP_SIZE=0 __STACK_SIZE=2048 uECC_ENABLE_VLI_API=0 uECC_OPTIMIZATION_LEVEL=3 uECC_SQUARE_FUNC=0 uECC_SUPPORT_COMPRESSED_POINT=0 uECC_VLI_NATIVE_LITTLE_ENDIAN=1</Define>
<Define>DEBUG BLE_STACK_SUPPORT_REQD CONFIG_NFCT_PINS_AS_GPIOS FLOAT_ABI_HARD NRF52833_XXAA NRF_DFU_SETTINGS_VERSION=2 NRF_DFU_SVCI_ENABLED NRF_SD_BLE_API_VERSION=7 S140 SOFTDEVICE_PRESENT SVC_INTERFACE_CALL_AS_NORMAL_FUNCTION __HEAP_SIZE=0 __STACK_SIZE=2048 uECC_ENABLE_VLI_API=0 uECC_OPTIMIZATION_LEVEL=3 uECC_SQUARE_FUNC=0 uECC_SUPPORT_COMPRESSED_POINT=0 uECC_VLI_NATIVE_LITTLE_ENDIAN=1</Define>
<Undefine></Undefine>
<IncludePath>..\..\config;..\..\..\sdk\components\ble\common;..\..\..\sdk\components\boards;..\..\..\sdk\components\libraries\atomic;..\..\..\sdk\components\libraries\atomic_fifo;..\..\..\sdk\components\libraries\balloc;..\..\..\sdk\components\libraries\bootloader;..\..\..\sdk\components\libraries\bootloader\ble_dfu;..\..\..\sdk\components\libraries\bootloader\dfu;..\..\..\sdk\components\libraries\crc32;..\..\..\sdk\components\libraries\crypto;..\..\..\sdk\components\libraries\crypto\backend\cc310;..\..\..\sdk\components\libraries\crypto\backend\cc310_bl;..\..\..\sdk\components\libraries\crypto\backend\cifra;..\..\..\sdk\components\libraries\crypto\backend\mbedtls;..\..\..\sdk\components\libraries\crypto\backend\micro_ecc;..\..\..\sdk\components\libraries\crypto\backend\nrf_hw;..\..\..\sdk\components\libraries\crypto\backend\nrf_sw;..\..\..\sdk\components\libraries\crypto\backend\oberon;..\..\..\sdk\components\libraries\crypto\backend\optiga;..\..\..\sdk\components\libraries\delay;..\..\..\sdk\components\libraries\experimental_section_vars;..\..\..\sdk\components\libraries\fstorage;..\..\..\sdk\components\libraries\log;..\..\..\sdk\components\libraries\log\src;..\..\..\sdk\components\libraries\mem_manager;..\..\..\sdk\components\libraries\memobj;..\..\..\sdk\components\libraries\queue;..\..\..\sdk\components\libraries\ringbuf;..\..\..\sdk\components\libraries\scheduler;..\..\..\sdk\components\libraries\sha256;..\..\..\sdk\components\libraries\stack_info;..\..\..\sdk\components\libraries\strerror;..\..\..\sdk\components\libraries\svc;..\..\..\sdk\components\libraries\util;..\..\..\sdk\components\softdevice\common;..\..\..\sdk\components\softdevice\s140\headers;..\..\..\sdk\components\softdevice\s140\headers\nrf52;..\..;..\..\..\sdk\external\micro-ecc\micro-ecc;..\..\..\sdk\external\nano-pb;..\..\..\sdk\external\nrf_oberon;..\..\..\sdk\external\nrf_oberon\include;..\..\..\sdk\integration\nrfx;..\..\..\sdk\modules\nrfx;..\..\..\sdk\modules\nrfx\hal;..\config</IncludePath>
</VariousControls>
@ -355,7 +355,7 @@
<ClangAsOpt>1</ClangAsOpt>
<VariousControls>
<MiscControls> --cpreproc_opts=-DBLE_STACK_SUPPORT_REQD,-DBOARD_PCA10100,-DCONFIG_GPIO_AS_PINRESET,-DFLOAT_ABI_HARD,-DNRF52833_XXAA,-DNRF_DFU_SETTINGS_VERSION=2,-DNRF_DFU_SVCI_ENABLED,-DNRF_SD_BLE_API_VERSION=7,-DS140,-DSOFTDEVICE_PRESENT,-DSVC_INTERFACE_CALL_AS_NORMAL_FUNCTION,-D__HEAP_SIZE=0,-D__STACK_SIZE=2048,-DuECC_ENABLE_VLI_API=0,-DuECC_OPTIMIZATION_LEVEL=3,-DuECC_SQUARE_FUNC=0,-DuECC_SUPPORT_COMPRESSED_POINT=0,-DuECC_VLI_NATIVE_LITTLE_ENDIAN=1</MiscControls>
<Define> BLE_STACK_SUPPORT_REQD BOARD_PCA10100 CONFIG_GPIO_AS_PINRESET FLOAT_ABI_HARD NRF52833_XXAA NRF_DFU_SETTINGS_VERSION=2 NRF_DFU_SVCI_ENABLED NRF_SD_BLE_API_VERSION=7 S140 SOFTDEVICE_PRESENT SVC_INTERFACE_CALL_AS_NORMAL_FUNCTION __HEAP_SIZE=0 __STACK_SIZE=2048 uECC_ENABLE_VLI_API=0 uECC_OPTIMIZATION_LEVEL=3 uECC_SQUARE_FUNC=0 uECC_SUPPORT_COMPRESSED_POINT=0 uECC_VLI_NATIVE_LITTLE_ENDIAN=1</Define>
<Define>DEBUG BLE_STACK_SUPPORT_REQD CONFIG_NFCT_PINS_AS_GPIOS FLOAT_ABI_HARD NRF52833_XXAA NRF_DFU_SETTINGS_VERSION=2 NRF_DFU_SVCI_ENABLED NRF_SD_BLE_API_VERSION=7 S140 SOFTDEVICE_PRESENT SVC_INTERFACE_CALL_AS_NORMAL_FUNCTION __HEAP_SIZE=0 __STACK_SIZE=2048 uECC_ENABLE_VLI_API=0 uECC_OPTIMIZATION_LEVEL=3 uECC_SQUARE_FUNC=0 uECC_SUPPORT_COMPRESSED_POINT=0 uECC_VLI_NATIVE_LITTLE_ENDIAN=1</Define>
<Undefine></Undefine>
<IncludePath>..\..\config;..\..\..\sdk\components\ble\common;..\..\..\sdk\components\boards;..\..\..\sdk\components\libraries\atomic;..\..\..\sdk\components\libraries\atomic_fifo;..\..\..\sdk\components\libraries\balloc;..\..\..\sdk\components\libraries\bootloader;..\..\..\sdk\components\libraries\bootloader\ble_dfu;..\..\..\sdk\components\libraries\bootloader\dfu;..\..\..\sdk\components\libraries\crc32;..\..\..\sdk\components\libraries\crypto;..\..\..\sdk\components\libraries\crypto\backend\cc310;..\..\..\sdk\components\libraries\crypto\backend\cc310_bl;..\..\..\sdk\components\libraries\crypto\backend\cifra;..\..\..\sdk\components\libraries\crypto\backend\mbedtls;..\..\..\sdk\components\libraries\crypto\backend\micro_ecc;..\..\..\sdk\components\libraries\crypto\backend\nrf_hw;..\..\..\sdk\components\libraries\crypto\backend\nrf_sw;..\..\..\sdk\components\libraries\crypto\backend\oberon;..\..\..\sdk\components\libraries\crypto\backend\optiga;..\..\..\sdk\components\libraries\delay;..\..\..\sdk\components\libraries\experimental_section_vars;..\..\..\sdk\components\libraries\fstorage;..\..\..\sdk\components\libraries\log;..\..\..\sdk\components\libraries\log\src;..\..\..\sdk\components\libraries\mem_manager;..\..\..\sdk\components\libraries\memobj;..\..\..\sdk\components\libraries\queue;..\..\..\sdk\components\libraries\ringbuf;..\..\..\sdk\components\libraries\scheduler;..\..\..\sdk\components\libraries\sha256;..\..\..\sdk\components\libraries\stack_info;..\..\..\sdk\components\libraries\strerror;..\..\..\sdk\components\libraries\svc;..\..\..\sdk\components\libraries\util;..\..\..\sdk\components\softdevice\common;..\..\..\sdk\components\softdevice\s140\headers;..\..\..\sdk\components\softdevice\s140\headers\nrf52;..\..;..\..\..\sdk\external\micro-ecc\micro-ecc;..\..\..\sdk\external\nano-pb;..\..\..\sdk\external\nrf_oberon;..\..\..\sdk\external\nrf_oberon\include;..\..\..\sdk\integration\nrfx;..\..\..\sdk\modules\nrfx;..\..\..\sdk\modules\nrfx\hal;..\config</IncludePath>
</VariousControls>
@ -402,64 +402,6 @@
</Group>
<Group>
<GroupName>Board Definition</GroupName>
<Files>
<File>
<FileName>boards.c</FileName>
<FileType>1</FileType>
<FilePath>..\..\..\sdk\components\boards\boards.c</FilePath>
<FileOption>
<CommonProperty>
<UseCPPCompiler>0</UseCPPCompiler>
<RVCTCodeConst>0</RVCTCodeConst>
<RVCTZI>0</RVCTZI>
<RVCTOtherData>0</RVCTOtherData>
<ModuleSelection>0</ModuleSelection>
<IncludeInBuild>1</IncludeInBuild>
<AlwaysBuild>2</AlwaysBuild>
<GenerateAssemblyFile>2</GenerateAssemblyFile>
<AssembleAssemblyFile>2</AssembleAssemblyFile>
<PublicsOnly>2</PublicsOnly>
<StopOnExitCode>11</StopOnExitCode>
<CustomArgument></CustomArgument>
<IncludeLibraryModules></IncludeLibraryModules>
<ComprImg>1</ComprImg>
</CommonProperty>
<FileArmAds>
<Cads>
<interw>2</interw>
<Optim>0</Optim>
<oTime>2</oTime>
<SplitLS>2</SplitLS>
<OneElfS>2</OneElfS>
<Strict>2</Strict>
<EnumInt>2</EnumInt>
<PlainCh>2</PlainCh>
<Ropi>2</Ropi>
<Rwpi>2</Rwpi>
<wLevel>0</wLevel>
<uThumb>2</uThumb>
<uSurpInc>2</uSurpInc>
<uC99>2</uC99>
<uGnu>2</uGnu>
<useXO>2</useXO>
<v6Lang>0</v6Lang>
<v6LangP>0</v6LangP>
<vShortEn>2</vShortEn>
<vShortWch>2</vShortWch>
<v6Lto>2</v6Lto>
<v6WtE>2</v6WtE>
<v6Rtti>2</v6Rtti>
<VariousControls>
<MiscControls></MiscControls>
<Define></Define>
<Undefine></Undefine>
<IncludePath></IncludePath>
</VariousControls>
</Cads>
</FileArmAds>
</FileOption>
</File>
</Files>
</Group>
<Group>
<GroupName>nRF_BLE</GroupName>
@ -4566,64 +4508,6 @@
</Group>
<Group>
<GroupName>Board Definition</GroupName>
<Files>
<File>
<FileName>boards.c</FileName>
<FileType>1</FileType>
<FilePath>..\..\..\sdk\components\boards\boards.c</FilePath>
<FileOption>
<CommonProperty>
<UseCPPCompiler>0</UseCPPCompiler>
<RVCTCodeConst>0</RVCTCodeConst>
<RVCTZI>0</RVCTZI>
<RVCTOtherData>0</RVCTOtherData>
<ModuleSelection>0</ModuleSelection>
<IncludeInBuild>0</IncludeInBuild>
<AlwaysBuild>2</AlwaysBuild>
<GenerateAssemblyFile>2</GenerateAssemblyFile>
<AssembleAssemblyFile>2</AssembleAssemblyFile>
<PublicsOnly>2</PublicsOnly>
<StopOnExitCode>11</StopOnExitCode>
<CustomArgument></CustomArgument>
<IncludeLibraryModules></IncludeLibraryModules>
<ComprImg>1</ComprImg>
</CommonProperty>
<FileArmAds>
<Cads>
<interw>2</interw>
<Optim>0</Optim>
<oTime>2</oTime>
<SplitLS>2</SplitLS>
<OneElfS>2</OneElfS>
<Strict>2</Strict>
<EnumInt>2</EnumInt>
<PlainCh>2</PlainCh>
<Ropi>2</Ropi>
<Rwpi>2</Rwpi>
<wLevel>0</wLevel>
<uThumb>2</uThumb>
<uSurpInc>2</uSurpInc>
<uC99>2</uC99>
<uGnu>2</uGnu>
<useXO>2</useXO>
<v6Lang>0</v6Lang>
<v6LangP>0</v6LangP>
<vShortEn>2</vShortEn>
<vShortWch>2</vShortWch>
<v6Lto>2</v6Lto>
<v6WtE>2</v6WtE>
<v6Rtti>2</v6Rtti>
<VariousControls>
<MiscControls></MiscControls>
<Define></Define>
<Undefine></Undefine>
<IncludePath></IncludePath>
</VariousControls>
</Cads>
</FileArmAds>
</FileOption>
</File>
</Files>
</Group>
<Group>
<GroupName>nRF_BLE</GroupName>

32
bootloader/pca10100_s140_ble/config/sdk_config.h
View File

@ -1701,7 +1701,7 @@
// <e> NRF_LOG_ENABLED - nrf_log - Logger
//==========================================================
#ifndef NRF_LOG_ENABLED
#define NRF_LOG_ENABLED 0
#define NRF_LOG_ENABLED 1
#endif
// <h> Log message pool - Configuration of log message pool
@ -1726,6 +1726,36 @@
#define NRF_LOG_MSGPOOL_ELEMENT_COUNT 8
#endif
#ifndef NRF_LOG_BACKEND_RTT_ENABLED
#define NRF_LOG_BACKEND_RTT_ENABLED 1
#endif
// <o> NRF_LOG_BACKEND_RTT_TEMP_BUFFER_SIZE - Size of buffer for partially processed strings.
// <i> Size of the buffer is a trade-off between RAM usage and processing.
// <i> if buffer is smaller then strings will often be fragmented.
// <i> It is recommended to use size which will fit typical log and only the
// <i> longer one will be fragmented.
#ifndef NRF_LOG_BACKEND_RTT_TEMP_BUFFER_SIZE
#define NRF_LOG_BACKEND_RTT_TEMP_BUFFER_SIZE 1024
#endif
// <o> NRF_LOG_BACKEND_RTT_TX_RETRY_DELAY_MS - Period before retrying writing to RTT
#ifndef NRF_LOG_BACKEND_RTT_TX_RETRY_DELAY_MS
#define NRF_LOG_BACKEND_RTT_TX_RETRY_DELAY_MS 1
#endif
// <o> NRF_LOG_BACKEND_RTT_TX_RETRY_CNT - Writing to RTT retries.
// <i> If RTT fails to accept any new data after retries
// <i> module assumes that host is not active and on next
// <i> request it will perform only one write attempt.
// <i> On successful writing, module assumes that host is active
// <i> and scheme with retry is applied again.
#ifndef NRF_LOG_BACKEND_RTT_TX_RETRY_CNT
#define NRF_LOG_BACKEND_RTT_TX_RETRY_CNT 10
#endif
// </h>
//==========================================================

2
sdk

@ -1 +1 @@
Subproject commit 8e2219f13fb9d85a048050bd344a66b90013bbe1
Subproject commit 467acc455ee19a40a211c4447ae2856c9fd7af71
Write Preview
Loading…
Cancel
Save