update tools

Author: danielkoek

cores/nRF5/HardwarePWM.cpp

@@ -205,6 +205,15 @@ bool HardwarePWM::removePin(uint8_t pin)
   return true;
 }
 
+bool HardwarePWM::removeAllPins(void)
+{
+  for(int ch=0; ch<MAX_CHANNELS; ch++)
+  {
+    _set_psel(ch, 0xFFFFFFFFUL);
+  }
+  return true;
+}
+
 bool HardwarePWM::writeChannel(uint8_t ch, uint16_t value, bool inverted)
 {
   VERIFY( ch < MAX_CHANNELS );

cores/nRF5/HardwarePWM.h

@@ -41,10 +41,10 @@
 #include <atomic>
 #include <cstdint>
 
-#ifdef NRF52840_XXAA
-#define HWPWM_MODULE_NUM    4
+#ifdef NRF_PWM3
+  #define HWPWM_MODULE_NUM    4
 #else
-#define HWPWM_MODULE_NUM    3
+  #define HWPWM_MODULE_NUM    3
 #endif
 
 class HardwarePWM
@@ -88,6 +88,9 @@ class HardwarePWM
     // Remove a pin from PWM module
     bool removePin  (uint8_t pin);
 
+    // Remove all pins from PWM module
+    bool removeAllPins (void);
+
     // Get the mapped channel of a pin
     int  pin2channel(uint8_t pin) const
     {

cores/nRF5/HardwareSerial.h

@@ -49,7 +49,7 @@
 #ifdef NRF52832_XXAA
   #define SERIAL_8N1	(UARTE_CONFIG_PARITY_Excluded << UARTE_CONFIG_PARITY_Pos)
   #define SERIAL_8E1	(UARTE_CONFIG_PARITY_Included << UARTE_CONFIG_PARITY_Pos)
-#elif defined(NRF52840_XXAA)
+#elif defined(NRF52840_XXAA) || defined(NRF52833_XXAA)
   #define SERIAL_8N1	((UARTE_CONFIG_STOP_One << UARTE_CONFIG_STOP_Pos) | (UARTE_CONFIG_PARITY_Excluded << UARTE_CONFIG_PARITY_Pos))
   #define SERIAL_8N2	((UARTE_CONFIG_STOP_Two << UARTE_CONFIG_STOP_Pos) | (UARTE_CONFIG_PARITY_Excluded << UARTE_CONFIG_PARITY_Pos))
   #define SERIAL_8E1	((UARTE_CONFIG_STOP_One << UARTE_CONFIG_STOP_Pos) | (UARTE_CONFIG_PARITY_Included << UARTE_CONFIG_PARITY_Pos))
@@ -70,6 +70,7 @@ class HardwareSerial : public Stream
     virtual void flush(void) = 0;
     virtual size_t write(uint8_t) = 0;
     virtual size_t write(const uint8_t *buffer, size_t size) = 0;
+    virtual int availableForWrite(void);
     using Print::write; // pull in write(str) from Print
     virtual operator bool() = 0;
 };

cores/nRF5/Print.h

@@ -98,6 +98,8 @@ class Print
     {
       return printBufferReverse((uint8_t const*) buffer, size, delim, byteline);
     }
+
+    virtual void flush() { /* Empty implementation for backward compatibility */ }
 };
 
 #endif

cores/nRF5/RingBuffer.cpp

@@ -67,6 +67,14 @@ int RingBuffer::available()
 		return delta;
 }
 
+int RingBuffer::availableForStore() {
+  if (_iHead >= _iTail) {
+    return SERIAL_BUFFER_SIZE - 1 - _iHead + _iTail;
+  } else {
+    return _iTail - _iHead - 1;
+  }
+}
+
 int RingBuffer::peek()
 {
 	if(_iTail == _iHead)

cores/nRF5/RingBuffer.h

@@ -39,14 +39,15 @@ class RingBuffer
   public:
     RingBuffer( void ) ;
     void store_char( uint8_t c ) ;
-	void clear();
-	int read_char();
-	int available();
-	int peek();
-	bool isFull();
+    void clear();
+    int read_char();
+    int available();
+    int availableForStore();
+    int peek();
+    bool isFull();
 
   private:
-	int nextIndex(int index);
+    int nextIndex(int index);
 } ;
 
 #endif /* _RING_BUFFER_ */

cores/nRF5/Uart.cpp

@@ -253,6 +253,12 @@ size_t Uart::write(const uint8_t *buffer, size_t size)
   return sent;
 }
 
+int Uart::availableForWrite(void) {
+  // UART does not use ring buffer for TX, therefore it is either busy or not
+  UBaseType_t available = uxSemaphoreGetCount(_end_tx_sem);
+  return available ? SERIAL_BUFFER_SIZE : 0;
+}
+
 //------------- Serial1 (or Serial in case of nRF52832) -------------//
 #ifdef NRF52832_XXAA
   Uart Serial( NRF_UARTE0, UARTE0_UART0_IRQn, PIN_SERIAL_RX, PIN_SERIAL_TX );

cores/nRF5/Uart.h

@@ -39,6 +39,7 @@ class Uart : public HardwareSerial
     void begin(unsigned long baudrate, uint16_t config);
     void end();
     int available();
+    int availableForWrite(void);
     int peek();
     int read();
     void flush();

cores/nRF5/common_func.h

@@ -179,13 +179,13 @@ const char* dbg_err_str(int32_t err_id); // TODO move to other place
 #define PRINT_LOCATION()      PRINTF("%s: %d:\r\n", __PRETTY_FUNCTION__, __LINE__)
 #define PRINT_MESS(x)         PRINTF("%s: %d: %s \r\n"   , __FUNCTION__, __LINE__, (char*)(x))
 #define PRINT_HEAP()          if (CFG_DEBUG >= 3) PRINTF("\n%s: %d: Heap free: %d\r\n", __FUNCTION__, __LINE__, util_heap_get_free_size())
-#define PRINT_STR(x)          PRINTF("%s: %d: " #x " = %s\r\n"   , __FUNCTION__, __LINE__, (char*)(x) )
-#define PRINT_INT(x)          PRINTF("%s: %d: " #x " = %ld\r\n"  , __FUNCTION__, __LINE__, (uint32_t) (x) )
-#define PRINT_FLOAT(x)        PRINTF("%s: %d: " #x " = %f\r\n"  , __FUNCTION__, __LINE__, (float) (x) )
+#define PRINT_STR(x)          PRINTF(#x " = %s\r\n" , (char*)(x) )
+#define PRINT_INT(x)          PRINTF(#x " = %ld\r\n", (uint32_t) (x) )
+#define PRINT_FLOAT(x)        PRINTF(#x " = %f\r\n" , (float) (x) )
 
 #define PRINT_HEX(x) \
   do {\
-    PRINTF("%s: %d: " #x " = 0x", __PRETTY_FUNCTION__, __LINE__);\
+    PRINTF(#x " = 0x");\
     char fmt[] = "%00X\r\n";\
     fmt[2] += 2*sizeof(x); /* Hex with correct size */\
     PRINTF(fmt, (x) );\

cores/nRF5/freertos/Source/include/portable.h

@@ -128,6 +128,8 @@ void vPortDefineHeapRegions( const HeapRegion_t * const pxHeapRegions ) PRIVILEG
  */
 void *pvPortMalloc( size_t xSize ) PRIVILEGED_FUNCTION;
 void vPortFree( void *pv ) PRIVILEGED_FUNCTION;
+void *pvPortRealloc( void *ptr, size_t xWantedSize ) PRIVILEGED_FUNCTION;
+void *pvPortCalloc( size_t nmemb, size_t xWantedSize ) PRIVILEGED_FUNCTION;
 void vPortInitialiseBlocks( void ) PRIVILEGED_FUNCTION;
 size_t xPortGetFreeHeapSize( void ) PRIVILEGED_FUNCTION;
 size_t xPortGetMinimumEverFreeHeapSize( void ) PRIVILEGED_FUNCTION;