Merge branch 'fix-debug-arancino' into 'master'

Fix debug arancino See merge request smartme.io/arancino/arancino-library!34
smartmeio · May 26, 2022 · 1a03b7f · 1a03b7f
2 parents 4cefb0f + 31ac6a0
commit 1a03b7f
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Changelog
 
+#### v 2.0.1 - 2022.05.27
+* Fix: bug debug for arancino mignon board. [#2g4fxvx] (https://app.clickup.com/t/2g4fxvx)
+
 #### v 2.0.0 - 2022.01.20
 * Upd: updated unit test examples. [#1uqbjbp] (https://app.clickup.com/t/1uqbjbp)
 * Add: added useFreeRtos parameter in `start` command. [#1vht0nc] (https://app.clickup.com/t/1vht0nc)

diff --git a/library.properties b/library.properties
@@ -1,5 +1,5 @@
 name=Arancino
-version=2.0.0
+version=2.0.1
 author=smartme.IO
 maintainer=smartme.IO <[email protected]>
 sentence=Enables communication between microcontroller and Arancino Module running mainly in Arancino boards.

diff --git a/src/Arancino.cpp b/src/Arancino.cpp
@@ -84,7 +84,7 @@ void ArancinoClass::begin(ArancinoMetadata _amdata, ArancinoConfig _acfg) {
 	char* values[] = {LIB_VERSION, _metadata.fwname,_metadata.fwversion,str_build_time,(char*)ARANCINO_CORE_VERSION,(char*)MCU_FAMILY,(char*)useFreeRtos};
 
 	//DEBUG
-	#if defined(__SAMD21G18A__)
+	#if defined(ARDUINO_ARANCINO)
 	pinMode(DBG_PIN,INPUT);
 	if(!digitalRead(DBG_PIN))
 		Serial.begin(115200);
@@ -1012,7 +1012,7 @@ ArancinoPacket ArancinoClass::executeCommand(char* command, char* param1, char**
 	}
 	strcat(str, endTXStr);
 
-	#if defined(__SAMD21G18A__)
+	#if defined(ARDUINO_ARANCINO)
 		if(!digitalRead(DBG_PIN)){
 			Serial.print(SENT_STRING);
 		}
@@ -1061,7 +1061,7 @@ ArancinoPacket ArancinoClass::executeCommand(char* command, char* param1, char*
 	char* str = (char *)calloc(strLength, sizeof(char));
 
 
-	#if defined(__SAMD21G18A__)
+	#if defined(ARDUINO_ARANCINO)
 	if(!digitalRead(DBG_PIN)){
 		Serial.print(SENT_STRING);
 	}
@@ -1149,7 +1149,7 @@ void ArancinoClass::_sendArancinoCommand(char* command) {
 	}
 	//command must terminate with '\0'!
 	SERIAL_PORT.write(command, strlen(command)); //excluded '\0'
-	#if defined(__SAMD21G18A__)
+	#if defined(ARDUINO_ARANCINO)
 		if(!digitalRead(DBG_PIN)){
 			if(command[strlen(command) - 1] == END_TX_CHAR)
 			{
@@ -1322,7 +1322,7 @@ char* ArancinoClass::_parse(char* message) {
 	}
 
 	//DEBUG
-	#if defined(__SAMD21G18A__)
+	#if defined(ARDUINO_ARANCINO)
 	if(!digitalRead(DBG_PIN)){
 		Serial.print(RCV_STRING);
 		Serial.print(status);

diff --git a/src/ArancinoDefinitions.h b/src/ArancinoDefinitions.h
@@ -93,7 +93,7 @@ under the License
 #define MODLOGLVL_KEY			(char*)"___MODLOGLVL___"
 #define MODENV_KEY              (char*)"___MODENV___"
 #define BLINK_ID_KEY			(char*)"___BLINK_ID___"
-#define LIB_VERSION				(char*)"2.0.0"	//library version
+#define LIB_VERSION				(char*)"2.0.1"	//library version
 
 //RESPONSE CODE
 #define INVALID_VALUE_ERROR     -4