Merge commit '27bb76693b5184336af4f99ce9cbc6667452f7f0'

kezorm · kezorm · commit 72d14c492ba2 · 2019-10-27T15:55:16.000-05:00
diff --git a/README.md b/README.md
@@ -8,9 +8,10 @@ Including this repo in your existing Arduino core will allow the language to gro
 For backwards compatibility, every revision of this repo will increase `ARDUINO_API_VERSION` define.
 
 Some cores have been ported to the new structure, for example:
-* megaAVR (http://github.com/arduino/ArduinoCore-megaAVR) 
-* classic AVR (http://github.com/arduino/ArduinoCore-avr/tree/api) 
-* SAMD (http://github.com/arduino/ArduinoCore-samd/tree/api)
+* megaAVR (https://github.com/arduino/ArduinoCore-megaAVR) 
+* nRF52-mbedos (https://github.com/arduino/ArduinoCore-nRF528x-mbedos)
+* classic AVR (https://github.com/arduino/ArduinoCore-avr/tree/api) 
+* SAMD (https://github.com/arduino/ArduinoCore-samd/tree/api)
 
 These repositories **don't** contain the needed `api` subfolder; to "complete" the core you need to copy or symlink the `api` folder from this repo to the target's `cores/arduino` folder.
 
diff --git a/api/deprecated-include/Interrupts.h b/api/deprecated-include/Interrupts.h
@@ -15,7 +15,7 @@ template<typename T> struct __container__ {
 };
 
 // C++ only overloaded version of attachInterrupt function
-template<typename T> void attachInterrupt(pin_size_t interruptNum, voidTemplateFuncPtrParam<T> userFunc, int mode, T& param) {
+template<typename T> void attachInterrupt(pin_size_t interruptNum, voidTemplateFuncPtrParam<T> userFunc, PinStatus mode, T& param) {
 
   struct __container__<T> *cont = new __container__<T>();
   cont->param = &param;
@@ -32,7 +32,7 @@ template<typename T> void attachInterrupt(pin_size_t interruptNum, voidTemplateF
   attachInterruptParam(interruptNum, f, mode, cont);
 }
 
-template<typename T> void attachInterrupt(uint8_t interruptNum, voidTemplateFuncPtrParam<T*> userFunc, int mode, T* param) {
+template<typename T> void attachInterrupt(pin_size_t interruptNum, voidTemplateFuncPtrParam<T*> userFunc, PinStatus mode, T* param) {
   attachInterruptParam(interruptNum, (voidFuncPtrParam)userFunc, mode, (void*)param);
 }
 
diff --git a/api/src/A_String.cpp b/api/src/A_String.cpp
@@ -126,7 +126,7 @@ String::String(double value, unsigned char decimalPlaces)
 
 String::~String()
 {
-	free(buffer);
+	if (buffer) free(buffer);
 }
 
 /*********************************************/

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ template<typename T> struct __container__ {`
`15`	`15`	`};`
`16`	`16`
`17`	`17`	`// C++ only overloaded version of attachInterrupt function`
`18`		`-template<typename T> void attachInterrupt(pin_size_t interruptNum, voidTemplateFuncPtrParam<T> userFunc, int mode, T& param) {`
	`18`	`+template<typename T> void attachInterrupt(pin_size_t interruptNum, voidTemplateFuncPtrParam<T> userFunc, PinStatus mode, T& param) {`
`19`	`19`
`20`	`20`	`struct __container__<T> *cont = new __container__<T>();`
`21`	`21`	`cont->param = &param;`
`@@ -32,7 +32,7 @@ template<typename T> void attachInterrupt(pin_size_t interruptNum, voidTemplateF`
`32`	`32`	`attachInterruptParam(interruptNum, f, mode, cont);`
`33`	`33`	`}`
`34`	`34`
`35`		`-template<typename T> void attachInterrupt(uint8_t interruptNum, voidTemplateFuncPtrParam<T> userFunc, int mode, T param) {`
	`35`	`+template<typename T> void attachInterrupt(pin_size_t interruptNum, voidTemplateFuncPtrParam<T> userFunc, PinStatus mode, T param) {`
`36`	`36`	`attachInterruptParam(interruptNum, (voidFuncPtrParam)userFunc, mode, (void*)param);`
`37`	`37`	`}`
`38`	`38`
Original file line number	Diff line number	Diff line change
`@@ -126,7 +126,7 @@ String::String(double value, unsigned char decimalPlaces)`
`126`	`126`
`127`	`127`	`String::~String()`
`128`	`128`	`{`
`129`		`- free(buffer);`
	`129`	`+ if (buffer) free(buffer);`
`130`	`130`	`}`
`131`	`131`
`132`	`132`	`/*********************************************/`