Browse Source

update

master
zhaohe 1 year ago
parent
commit
b380ba541c
  1. 1
      .vscode/c_cpp_properties.json
  2. 62
      app/app.uvoptx
  3. 56
      app/app.uvprojx
  4. 6
      app/config/sdk_config.h
  5. 1477
      bootloader/bootloader.hex
  6. 38
      bootloader/pca10100_s140_ble/arm5_no_packs/secure_bootloader_ble_s140_pca10100.uvguix.h_zha
  7. 2
      libznordic
  8. 2
      sdk

1
.vscode/c_cpp_properties.json

@ -150,6 +150,7 @@
"sdk\\components\\toolchain\\cmsis\\include\\"
],
"defines": [
"DFU_SUPPORT",
"APP_TIMER_V2",
"APP_TIMER_V2_RTC1_ENABLED",
"BOARD_PCA10100",

62
app/app.uvoptx

@ -73,7 +73,7 @@
<LExpSel>0</LExpSel>
</OPTXL>
<OPTFL>
<tvExp>0</tvExp>
<tvExp>1</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<IsCurrentTarget>1</IsCurrentTarget>
</OPTFL>
@ -379,7 +379,7 @@
<Group>
<GroupName>Application</GroupName>
<tvExp>1</tvExp>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<cbSel>0</cbSel>
<RteFlg>0</RteFlg>
@ -1499,7 +1499,7 @@
<Group>
<GroupName>libznordic</GroupName>
<tvExp>1</tvExp>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<cbSel>0</cbSel>
<RteFlg>0</RteFlg>
@ -1586,6 +1586,62 @@
</Group>
<Group>
<GroupName>dfu</GroupName>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<cbSel>0</cbSel>
<RteFlg>0</RteFlg>
<File>
<GroupNumber>14</GroupNumber>
<FileNumber>93</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2>
<PathWithFileName>..\sdk\components\ble\ble_services\ble_dfu\ble_dfu.c</PathWithFileName>
<FilenameWithoutPath>ble_dfu.c</FilenameWithoutPath>
<RteFlg>0</RteFlg>
<bShared>0</bShared>
</File>
<File>
<GroupNumber>14</GroupNumber>
<FileNumber>94</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2>
<PathWithFileName>..\sdk\components\ble\ble_services\ble_dfu\ble_dfu_bonded.c</PathWithFileName>
<FilenameWithoutPath>ble_dfu_bonded.c</FilenameWithoutPath>
<RteFlg>0</RteFlg>
<bShared>0</bShared>
</File>
<File>
<GroupNumber>14</GroupNumber>
<FileNumber>95</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2>
<PathWithFileName>..\sdk\components\ble\ble_services\ble_dfu\ble_dfu_unbonded.c</PathWithFileName>
<FilenameWithoutPath>ble_dfu_unbonded.c</FilenameWithoutPath>
<RteFlg>0</RteFlg>
<bShared>0</bShared>
</File>
<File>
<GroupNumber>14</GroupNumber>
<FileNumber>96</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2>
<PathWithFileName>..\sdk\components\libraries\bootloader\dfu\nrf_dfu_svci.c</PathWithFileName>
<FilenameWithoutPath>nrf_dfu_svci.c</FilenameWithoutPath>
<RteFlg>0</RteFlg>
<bShared>0</bShared>
</File>
</Group>
<Group>
<GroupName>::CMSIS</GroupName>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>

56
app/app.uvprojx
File diff suppressed because it is too large
View File

6
app/config/sdk_config.h

@ -1368,7 +1368,7 @@
#ifndef BLE_DFU_ENABLED
#define BLE_DFU_ENABLED 0
#define BLE_DFU_ENABLED 1
#endif
// <q> NRF_DFU_BLE_BUTTONLESS_SUPPORTS_BONDS - Buttonless DFU supports bonds.
@ -11512,12 +11512,12 @@
// <o> NRF_SDH_BLE_GATTS_ATTR_TAB_SIZE - Attribute Table size in bytes. The size must be a multiple of 4.
#ifndef NRF_SDH_BLE_GATTS_ATTR_TAB_SIZE
#define NRF_SDH_BLE_GATTS_ATTR_TAB_SIZE 1408
#define NRF_SDH_BLE_GATTS_ATTR_TAB_SIZE 1600
#endif
// <o> NRF_SDH_BLE_VS_UUID_COUNT - The number of vendor-specific UUIDs.
#ifndef NRF_SDH_BLE_VS_UUID_COUNT
#define NRF_SDH_BLE_VS_UUID_COUNT 1
#define NRF_SDH_BLE_VS_UUID_COUNT 2
#endif
// <q> NRF_SDH_BLE_SERVICE_CHANGED - Include the Service Changed characteristic in the Attribute Table.

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

38
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

2
libznordic

@ -1 +1 @@
Subproject commit 92bb967ed49ed23654ab2778f2e3aba02157e746
Subproject commit 8951d9a63e7f9c3311c276aef94be5ae610cc66a

2
sdk

@ -1 +1 @@
Subproject commit 4f5e973ddbe1d68ac130618c5db82f075821e976
Subproject commit 8e2219f13fb9d85a048050bd344a66b90013bbe1
Loading…
Cancel
Save