Merge branch 'master' of https://github.com/HelTecAutomation/CubeCell…

…-Arduino
HelTecAutomation · Mar 2, 2022 · 6beda4c · 6beda4c
2 parents cce07f1 + 34bbf82
commit 6beda4c
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 7 deletions.
diff --git a/cores/asr650x/Arduino.h b/cores/asr650x/Arduino.h
@@ -55,7 +55,6 @@
 #define bitClear(value, bit) ((value) &= ~(1UL << (bit)))
 #define bit(b) (1 << (b))
 #define _BV(b) (1UL << (b))
-#define nullptr NULL
 #define yield()
 
 //#ifdef __cplusplus

diff --git a/cores/asr6601/base/Arduino.h b/cores/asr6601/base/Arduino.h
@@ -58,7 +58,6 @@
 #define bitClear(value, bit) ((value) &= ~(1UL << (bit)))
 #define bit(b) (1 << (b))
 #define _BV(b) (1UL << (b))
-#define nullptr NULL
 
 #define min(a, b) ((a)<(b)?(a):(b))
 #define max(a, b) ((a)>(b)?(a):(b))

diff --git a/libraries/Basics/examples/LowPower/LowPower_WakeUpByTimer/LowPower_WakeUpByTimer.ino b/libraries/Basics/examples/LowPower/LowPower_WakeUpByTimer/LowPower_WakeUpByTimer.ino
@@ -1,5 +1,5 @@
 #include "Arduino.h"
-
+#include "LoRa_APP.h"
 
 #define timetillsleep 5000
 #define timetillwakeup 5000

diff --git a/libraries/Basics/src/softSerial.cpp b/libraries/Basics/src/softSerial.cpp
@@ -95,6 +95,12 @@ void softSerial::begin(uint16_t Baudrate)
  digitalWrite(TX_GPIO,HIGH);
 }
 
+void softSerial::end()
+{
+ digitalWrite(TX_GPIO, LOW);
+ detachInterrupt(RX_GPIO);
+}
+
 int softSerial::available(void)
 {
  if(IRREC_RX_CNT){

diff --git a/libraries/Basics/src/softSerial.h b/libraries/Basics/src/softSerial.h
@@ -14,6 +14,7 @@ uint8_t pbuffer;
  ~softSerial() {}
 
  void begin(uint16_t Baudrate);
+ void end();
 
  void sendByte(uint8_t value);
  void sendStr(uint8_t *st, uint16_t len);

diff --git a/libraries/EEPROM/EEPROM.cpp b/libraries/EEPROM/EEPROM.cpp
@@ -41,12 +41,13 @@
 #define DEBUGV(...) do { (void)0; } while (0)
 #endif
 #ifdef __asr650x__
-#define _EEPROM_SIZE (CY_FLASH_SIZEOF_ROW * 3)
+#define _EEPROM_SIZE  (CY_FLASH_SIZEOF_ROW * 3)
 #define _EEPROM_BASE CY_SFLASH_USERBASE
 #else
-#define #define _EEPROM_SIZE 0xC00
+#define _EEPROM_SIZE  0xC00
 #define _EEPROM_BASE FLASH_BASE+0x7400
 #endif
+
 EEPROMClass::EEPROMClass(uint32_t baddr)
 : _baddr(baddr)
 , _data(0)

diff --git a/platform.json b/platform.json
@@ -22,7 +22,7 @@
  "type": "git",
  "url": "https://github.com/HelTecAutomation/platform-asrmicro650x.git"
  },
- "version": "1.2.0",
+ "version": "1.4.0",
  "frameworks": {
  "arduino": {
  "package": "framework-arduinoasrmicro650x",
@@ -38,7 +38,7 @@
  "framework-arduinoasrmicro650x": {
  "type": "framework",
  "owner": "heltecautomation",
- "version": "~1.2.0",
+ "version": "~1.4.0",
  "optional": true
  },
  "tool-cubecellelftool": {