fix: fix compilation on esp32

.github/workflows/pull-request.yml

@@ -25,6 +25,7 @@ jobs:
           |
           # Install arduino AVR
           arduino-cli core install arduino:avr
+          arduino-cli core install arduino:esp32
           # Install dependencies
           libs=$(cat library.properties | grep depends | sed 's/depends=//g')
           IFS=',' read -ra lib <<< "$libs"
@@ -37,3 +38,4 @@ jobs:
           |
           # Perform test compile
           arduino-cli compile tests --fqbn arduino:avr:uno --log --library . --clean
+          arduino-cli compile tests --fqbn arduino:esp32:nano_nora --log --library . --clean

library.properties

@@ -1,5 +1,5 @@
 name=Leaphy Extensions
-version=1.0.1
+version=1.0.2
 author=Leaphy Robotics
 maintainer=Leaphy Robotics <[email protected]>
 sentence=Provides functionality to program all Leaphy robots
@@ -9,5 +9,5 @@ url=https://github.com/leaphy-robotics/leaphy-extensions
 architectures=avr
 # Only include actually used library code in the resulting executable
 dot_a_linkage=true
-depends=Adafruit SSD1306,Adafruit GFX Library,Adafruit LSM303 Accel,Adafruit LIS2MDL,Adafruit BusIO,Adafruit_VL53L0X,Adafruit NeoPixel
+depends=Adafruit SSD1306,Adafruit GFX Library,Adafruit LSM303 Accel,Adafruit LIS2MDL,Adafruit BusIO,Adafruit_VL53L0X,Adafruit NeoPixel,EspSoftwareSerial
 

src/LSM303AGR.cpp

@@ -1,3 +1,4 @@
+#ifdef AVR
 #include "LSM303AGR.h"
 
 #define _ADDRESS_MAG 0x1E   //!< Default address
@@ -46,3 +47,5 @@ void CompassSensor::reset() {
 void CompassSensor::update() {
   CompassSensor::mag.getEvent(data);
 }
+
+#endif //#ifdef AVR

src/LSM303AGR.h

@@ -1,3 +1,5 @@
+#ifdef AVR
+
 #ifndef LSM303AGR_H
 #define LSM303AGR_H
 #include <Wire.h>
@@ -24,3 +26,5 @@ class CompassSensor {
 };
 
 #endif
+
+#endif //#ifdef AVR

src/Leaphyoriginal1.cpp

@@ -2,6 +2,7 @@
 // suitable for Fundumoto Shield
 // Copyright Science4Kids& Stichting Leaphy 2018
 // version 1.0.0    25 JULI 2018
+#ifdef AVR
 
 #include "Leaphyoriginal1.h"
 
@@ -100,3 +101,5 @@ void setLed(int fpRed, int fpGreen, int fpBlue)
     analogWrite(LED1_GREEN, fpGreen);
     analogWrite(LED1_BLUE, fpBlue);
 }
+
+#endif // #ifdef AVR

src/Leaphyoriginal1.h

@@ -2,6 +2,7 @@
 // suitable for Fundumoto Shield
 // Copyright Science4Kids 2017
 // version 1.0.0    1 February 2017
+#ifdef AVR
 #ifndef LEAPHYORIGINAL1_H_
 #define LEAPHYORIGINAL1_H_
 
@@ -53,3 +54,4 @@ void moveMotors(int fpDirection, int fpSpeed);
 void setLed(int fpRed, int fpGreen, int fpBlue);
 
 #endif
+#endif // #ifdef AVR

src/RedMP3.cpp

@@ -24,10 +24,18 @@
 #include <SoftwareSerial.h>
 #include "RedMP3.h"
 
+#ifdef AVR
 MP3::MP3(uint8_t rxd, uint8_t txd):myMP3(txd, rxd)
 {
   myMP3.begin(9600);//baud rate is 9600bps
 }
+#else
+MP3::MP3(uint8_t rxd, uint8_t txd)
+{
+  myMP3.begin(9600, SWSERIAL_8N1, txd, rxd, false);//baud rate is 9600bps
+}
+#endif
+
 void MP3::begin()
 {
   sendCommand(CMD_SEL_DEV, DEV_TF);//select the TF card  

src/RedMP3.h

@@ -74,7 +74,11 @@ class MP3
 	void playCombine(int16_t folderAndIndex[], int8_t number);
 
 private:
+	#ifdef AVR
 	SoftwareSerial myMP3;
+	#else
+	EspSoftwareSerial::UART myMP3;
+	#endif
 	void sendCommand(int8_t command, int16_t dat = 0);
 	void mp3Basic(int8_t command);
 	void mp3_5bytes(int8_t command, uint8_t dat);