increase sd attribute table size from 0x800 to 0xC00, increase linker memory for SD 840 from 3400 to 6000

Author: hathach

boards.txt

@@ -81,7 +81,7 @@ feather52840.upload.protocol=nrfutil
 feather52840.upload.use_1200bps_touch=true
 feather52840.upload.wait_for_upload_port=true
 feather52840.upload.maximum_size=815104
-feather52840.upload.maximum_data_size=248832
+feather52840.upload.maximum_data_size=237568
 
 # Build
 feather52840.build.mcu=cortex-m4
@@ -135,7 +135,7 @@ itsybitsy52840.upload.protocol=nrfutil
 itsybitsy52840.upload.use_1200bps_touch=true
 itsybitsy52840.upload.wait_for_upload_port=true
 itsybitsy52840.upload.maximum_size=815104
-itsybitsy52840.upload.maximum_data_size=248832
+itsybitsy52840.upload.maximum_data_size=237568
 
 # Build
 itsybitsy52840.build.mcu=cortex-m4
@@ -188,7 +188,7 @@ cplaynrf52840.upload.protocol=nrfutil
 cplaynrf52840.upload.use_1200bps_touch=true
 cplaynrf52840.upload.wait_for_upload_port=true
 cplaynrf52840.upload.maximum_size=815104
-cplaynrf52840.upload.maximum_data_size=248832
+cplaynrf52840.upload.maximum_data_size=237568
 
 # Build
 cplaynrf52840.build.mcu=cortex-m4
@@ -241,7 +241,7 @@ metro52840.upload.protocol=nrfutil
 metro52840.upload.use_1200bps_touch=true
 metro52840.upload.wait_for_upload_port=true
 metro52840.upload.maximum_size=815104
-metro52840.upload.maximum_data_size=248832
+metro52840.upload.maximum_data_size=237568
 
 # Build
 metro52840.build.mcu=cortex-m4
@@ -284,7 +284,7 @@ pca10056.upload.protocol=nrfutil
 pca10056.upload.use_1200bps_touch=true
 pca10056.upload.wait_for_upload_port=true
 pca10056.upload.maximum_size=815104
-pca10056.upload.maximum_data_size=248832
+pca10056.upload.maximum_data_size=237568
 
 # Build
 pca10056.build.mcu=cortex-m4

cores/nRF5/linker/nrf52840_s140_v6.ld

@@ -8,13 +8,13 @@ MEMORY
   FLASH (rx)     : ORIGIN = 0x26000, LENGTH = 0xED000 - 0x26000
 
   /* SRAM required by S132 depend on
-   * - Attribute Table Size
+   * - Attribute Table Size (Number of Services and Characteristics)
    * - Vendor UUID count
    * - Max ATT MTU
    * - Concurrent connection peripheral + central + secure links
    * - Event Len, HVN queue, Write CMD queue
    */ 
-  RAM (rwx) :  ORIGIN = 0x20003400, LENGTH = 0x20040000 - 0x20003400
+  RAM (rwx) :  ORIGIN = 0x20006000, LENGTH = 0x20040000 - 0x20006000
 }
 
 SECTIONS

libraries/Bluefruit52Lib/src/bluefruit.cpp

@@ -144,7 +144,7 @@ AdafruitBluefruit::AdafruitBluefruit(void)
   /*------------------------------------------------------------------*/
   varclr(&_sd_cfg);
 
-  _sd_cfg.attr_table_size = 0x800;
+  _sd_cfg.attr_table_size = CFG_SD_ATTR_TABLE_SIZE;
   _sd_cfg.uuid128_max     = BLE_UUID_VS_COUNT_DEFAULT;
   _sd_cfg.service_changed = 1;
 
@@ -329,7 +329,7 @@ bool AdafruitBluefruit::begin(uint8_t prph_count, uint8_t central_count)
    * prph and central connections for optimal SRAM usage.
    *
    * - If Peripheral mode is enabled
-   *   - ATTR Table Size          = 0x800.
+   *   - ATTR Table Size          = CFG_SD_ATTR_TABLE_SIZE.
    *   - HVN TX Queue Size        = 3
    *
    * - If Central mode is enabled

libraries/Bluefruit52Lib/src/bluefruit.h

@@ -36,6 +36,8 @@
 #define BLE_GATT_ATT_MTU_MAX      247
 #define BLE_MAX_CONNECTION        20 // SD support up to 20 connections
 
+#define CFG_SD_ATTR_TABLE_SIZE    0xC00
+
 #include "BLEUuid.h"
 #include "BLEAdvertising.h"
 #include "BLECharacteristic.h"