fix: fix compilation on esp32 (#4)

* chore: #ifdef AVR * chore: #ifdef AVR - V2 * chore: add last option * chore: maybe also check if another arch actually compiles? * fix: also install ESP32 cli core * chore: maybe actually install the package we intend to use * Update RedMP3.h * Update RedMP3.cpp * chore: some more avr only shi * fix: remove some more avr shi * chore: remove some more broken shi bc why check your code on all arches * chore: look above * chore: ifdev -> ifdef * chore: bump version * chore: maybe don't comment everything out * chore: no * chore: remove LSM303AGR.* * chore: remove #ifdef AVR * chore: remove #ifdef AVR
leaphy-robotics · Feb 17, 2025 · 3a9f374 · 3a9f374
1 parent 01c1e26
commit 3a9f374
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 78 deletions.
diff --git a/.github/workflows/pull-request.yml b/.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
diff --git a/library.properties b/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
 
diff --git a/src/LSM303AGR.cpp b/src/LSM303AGR.cpp
diff --git a/src/LSM303AGR.h b/src/LSM303AGR.h
diff --git a/src/Leaphyoriginal1.cpp b/src/Leaphyoriginal1.cpp
@@ -2,7 +2,6 @@
 // suitable for Fundumoto Shield
 // Copyright Science4Kids& Stichting Leaphy 2018
 // version 1.0.0    25 JULI 2018
-
 #include "Leaphyoriginal1.h"
 
 
@@ -100,3 +99,4 @@ void setLed(int fpRed, int fpGreen, int fpBlue)
     analogWrite(LED1_GREEN, fpGreen);
     analogWrite(LED1_BLUE, fpBlue);
 }
+
diff --git a/src/Leaphyoriginal1.h b/src/Leaphyoriginal1.h
@@ -10,7 +10,6 @@
 #ifndef F_CPU
 #define  F_CPU 16000000UL
 #endif
-#include <util/delay.h>
 #include <stdint.h>
 #include <stdlib.h>
 

diff --git a/src/RedMP3.cpp b/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  

diff --git a/src/RedMP3.h b/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);