clean up things

Author: hathach

boards.txt

@@ -110,8 +110,8 @@ feather52840.menu.softdevice.s140v6.build.sd_name=s140
 feather52840.menu.softdevice.s140v6.build.sd_version=6.1.0
 feather52840.menu.softdevice.s140v6.build.sd_fwid=0x00AE
 feather52840.menu.softdevice.s140v6.build.ldscript=nrf52840_s140_v6.ld
-feather52840.menu.softdevice.s140v6.upload.maximum_size=303104
-feather52840.menu.softdevice.s140v6.upload.maximum_data_size=51072
+feather52840.menu.softdevice.s140v6.upload.maximum_size=552960
+feather52840.menu.softdevice.s140v6.upload.maximum_data_size=248832
 
 # Debug Menu
 feather52840.menu.debug.l0=Level 0 (Release)
@@ -125,7 +125,7 @@ feather52840.menu.debug.l3.build.debug_flags=-DCFG_DEBUG=3 -Os
 
 
 #**********************************************
-# PCA10056 ( to be remove  )
+# Nordic PCA10056
 #**********************************************
 pca10056.name=Bluefruit on PCA10056
 
@@ -155,8 +155,8 @@ pca10056.menu.softdevice.s140v6.build.sd_name=s140
 pca10056.menu.softdevice.s140v6.build.sd_version=6.1.0
 pca10056.menu.softdevice.s140v6.build.sd_fwid=0x00AE
 pca10056.menu.softdevice.s140v6.build.ldscript=nrf52840_s140_v6.ld
-pca10056.menu.softdevice.s140v6.upload.maximum_size=303104
-pca10056.menu.softdevice.s140v6.upload.maximum_data_size=51072
+pca10056.menu.softdevice.s140v6.upload.maximum_size=552960
+pca10056.menu.softdevice.s140v6.upload.maximum_data_size=248832
 
 # Debug Menu
 pca10056.menu.debug.l0=Level 0 (Release)

cores/nRF5/Print.h

@@ -45,11 +45,12 @@ class Print
     void clearWriteError() { setWriteError(0); }
 
     virtual size_t write(uint8_t) = 0;
+    virtual size_t write(const uint8_t *buffer, size_t size);
+
     size_t write(const char *str) {
       if (str == NULL) return 0;
       return write((const uint8_t *)str, strlen(str));
     }
-    virtual size_t write(const uint8_t *buffer, size_t size);
     size_t write(const char *buffer, size_t size) {
       return write((const uint8_t *)buffer, size);
     }

cores/nRF5/usb/USBSerial.h

@@ -57,7 +57,9 @@ class USBSerial : public Stream
 	virtual void flush(void);
 	virtual size_t write(uint8_t);
 	virtual size_t write(const uint8_t *buffer, size_t size);
-	using Print::write; // pull in write(str) from Print
+	size_t write(const char *buffer, size_t size) {
+	  return write((const uint8_t *)buffer, size);
+	}
 	operator bool();
 
 	size_t readBytes(char *buffer, size_t length);

cores/nRF5/utility/debug.cpp

@@ -282,7 +282,7 @@ void dbgDumpMemoryCFormat(const char* str, void const *buf, uint16_t count)
 #include "ble_hci.h"
 
 /*------------------------------------------------------------------*/
-/* Event String
+/* BLE Event String
  *------------------------------------------------------------------*/
 static lookup_entry_t const _strevt_lookup[] =
 {

libraries/Bluefruit52Lib/src/bluefruit.cpp

@@ -801,6 +801,7 @@ void adafruit_soc_task(void* arg)
             // Flash
             case NRF_EVT_FLASH_OPERATION_SUCCESS:
             case NRF_EVT_FLASH_OPERATION_ERROR:
+              LOG_LV1("SOC", "NRF_EVT_FLASH_OPERATION_%s", soc_evt == NRF_EVT_FLASH_OPERATION_SUCCESS ? "SUCCESS" : "ERROR");
               if ( flash_nrf5x_event_cb ) flash_nrf5x_event_cb(soc_evt);
             break;
 

libraries/FileSystem/src/FileIO.h

@@ -58,6 +58,13 @@ class File: public Stream
 
     virtual size_t write (uint8_t ch);
     virtual size_t write (uint8_t const *buf, size_t size);
+    size_t write(const char *str) {
+      if (str == NULL) return 0;
+      return write((const uint8_t *)str, strlen(str));
+    }
+    size_t write(const char *buffer, size_t size) {
+      return write((const uint8_t *)buffer, size);
+    }
 
     virtual int read (void);
     int read (void *buf, uint16_t nbyte);
@@ -79,8 +86,6 @@ class File: public Stream
     File openNextFile (uint8_t mode = FILE_READ);
     void rewindDirectory (void);
 
-    using Print::write;
-
   private:
     FileSystemClass* _fs;
     void* _hdl;