Update core

Author: sabas1080

bootloaders/EDGE_CONTROL/bootloader.bin

@@ -23,34 +23,20 @@
 #if !defined(Arduino_h) && !defined(ARDUINO_LIB_DISCOVERY_PHASE)
 #define Arduino_h
 
-#if defined(__cplusplus)
-#if !defined(ARDUINO_AS_MBED_LIBRARY)
-
 #include "pinmode_arduino.h"
-
-#ifdef F
-#define Arduino_F F
-#undef F
-#endif // F (mbed included after arduino.h)
-#define F Mbed_F
-#endif // !ARDUINO_AS_MBED_LIBRARY
-#include "mbed_config.h"
-#include "mbed/drivers/InterruptIn.h"
-#include "mbed/drivers/PwmOut.h"
-#include "mbed/drivers/AnalogIn.h"
-#include "mbed/drivers/DigitalInOut.h"
-#include "mbed.h"
-#undef F
-#endif //__cplusplus
-
-#if defined(ARDUINO_AS_MBED_LIBRARY)
-#define PinMode ArduinoPinMode
-#define Arduino_F F
-#endif
-
 #include "api/ArduinoAPI.h"
 
 #if defined(__cplusplus)
+
+#undef F
+// C++11 F replacement declaration
+template <typename T1>
+auto F(T1&& A)
+  -> const arduino::__FlashStringHelper*
+{
+  return (const arduino::__FlashStringHelper*)A;
+}
+
 #if !defined(ARDUINO_AS_MBED_LIBRARY)
 using namespace arduino;
 #endif
@@ -91,28 +77,15 @@ void analogWriteResolution(int bits);
 
 #ifdef __cplusplus
 // Types used for the table below
-typedef struct _PinDescription
-{
-  PinName name;
-  mbed::InterruptIn* irq;
-  mbed::PwmOut* pwm;
-  mbed::DigitalInOut* gpio;
-} PinDescription ;
-
-typedef struct _AnalogPinDescription
-{
-  PinName name;
-  mbed::AnalogIn* adc;
-} AnalogPinDescription ;
-
-int PinNameToIndex(PinName P);
+typedef struct _PinDescription PinDescription;
+typedef struct _AnalogPinDescription AnalogPinDescription;
 
 // Pins table to be instantiated into variant.cpp
 extern PinDescription g_APinDescription[];
 extern AnalogPinDescription g_AAnalogPinDescription[];
 
 #ifdef ANALOG_CONFIG
-
+#include "hal/analogin_api.h"
 typedef enum _AnalogReferenceMode AnalogReferenceMode;
 void analogReference(uint8_t mode);
 /* nRF specific function to change analog acquisition time */
@@ -127,18 +100,27 @@ extern analogin_config_t adcCurrentConfig;
 #endif
 
 #include "Serial.h"
+#include "timer.h"
 #if defined(SERIAL_CDC)
-#include "USB/PluggableUSBSerial.h"
-#define Serial SerialUSB
+#define Serial _UART_USB_
+#define SerialUSB _UART_USB_
+#else
+#define Serial _UART1_
+#endif
 #define Serial1 _UART1_
 #define Serial2 _UART2_
 #define Serial3 _UART3_
 #define Serial4 _UART4_
+
+#if defined(RPC_SERIAL)
+#undef Serial
+#if __has_include("RPC.h")
+#include "SerialRPC.h"
+#define Serial SerialRPC
 #else
-#define Serial  _UART1_
-#define Serial1 _UART2_
-#define Serial2 _UART3_
-#define Serial3 _UART4_
+extern ErrorSerialClass ErrorSerial;
+#define Serial ErrorSerial
+#endif
 #endif
 
 #include "overloads.h"

bootloaders/EDGE_CONTROL/bootloader.elf

@@ -17,6 +17,7 @@
 */
 
 #include "Arduino.h"
+#include "pinDefinitions.h"
 
 void detachInterrupt(PinName interruptNum) {
   pin_size_t idx = PinNameToIndex(interruptNum);
@@ -28,6 +29,7 @@ void detachInterrupt(PinName interruptNum) {
 void detachInterrupt(pin_size_t interruptNum) {
   if ((interruptNum < PINS_COUNT) && (digitalPinToInterruptObj(interruptNum) != NULL)) {
     delete digitalPinToInterruptObj(interruptNum);
+    digitalPinToInterruptObj(interruptNum) = nullptr;
   }
 }
 
@@ -56,7 +58,9 @@ void attachInterruptParam(pin_size_t interruptNum, voidFuncPtrParam func, PinSta
   if (interruptNum >= PINS_COUNT) {
     return;
   }
-  detachInterrupt(interruptNum);
+  if (digitalPinToInterruptObj(interruptNum) != nullptr) {
+    detachInterrupt(interruptNum);
+  }
   mbed::InterruptIn* irq = new mbed::InterruptIn(digitalPinToPinName(interruptNum));
   if (mode == CHANGE) {
     irq->rise(mbed::callback(func, param));