Merge pull request #5 from hpsaturn/fix_esp32_compile_issue

fix the issue #4
shabaz123 · Jun 21, 2024 · 1648003 · 1648003
2 parents 77e255f + 028ec2b
commit 1648003
Show file tree

Hide file tree

Showing 2 changed files with 52 additions and 5 deletions.
diff --git a/src/arrays.cpp b/src/arrays.cpp
@@ -104,9 +104,9 @@ const char font5_7[96][5] = {
     {0x00, 0x00, 0x00, 0x00, 0x00}  // DEL
 };
 
-// pluto specific
-struct periodicTerms pt[43] = {
 
+#ifndef ARDUINO_ARCH_ESP32
+struct periodicTerms pt[43] = {
 /*1*/ {0, 0, 1, -19798886, 19848454, -5453098, -14974876, 66867334, 68955876},
 /*2*/ {0, 0, 2, 897499, -4955707, 3527363, 1672673, -11826086, -333765},
 /*3*/ {0, 0, 3, 610820, 1210521, -1050939, 327763, 1593657, -1439953},
@@ -152,6 +152,56 @@ struct periodicTerms pt[43] = {
 /*43*/ {3, 0, 0, -1, -2, 0, 1, 13, 3}
 };
 
+#else
+// pluto specific
+struct periodicTerms pt[43] = {
+
+/*1*/ {0, 0, 1, -19798886, 19848454, -5453098, -14974876, 66867334, 68955876},
+/*2*/ {0, 0, 2, 897499, -4955707, 3527363, 1672673, -11826086, -333765},
+/*3*/ {0, 0, 3, 610820, 1210521, -1050939, 327763, 1593657, -1439953},
+/*4*/ {0, 0, 4, -341639, -189719, 178691, -291925, -18948, 482443},
+/*5*/ {0, 0, 5, 129027, -34863, 18763, 100448, -66634, -85576},
+/*6*/ {0, 0, 6, -38215, 31061, -30594, -25838, 30841, -5765},
+/*7*/ {0, 1, (char)-1, 20349, -9886, 4965, 11263, -6140, 22254},
+/*8*/ {0, 1, 0, -4045, -4904, 310, -132, 4434, 4443},
+/*9*/ {0, 1, 1, -5885, -3238, 2036, -947, -1518, 641},
+/*10*/ {0, 1, 2, -3812, 3011, -2, -674, -5, 792},
+/*11*/ {0, 1, 3, -601, 3468, -329, -563, 518, 518},
+/*12*/ {0, 2, (char)-2, 1237, 463, -64, 39, -13, -221},
+/*13*/ {0, 2, (char)-1, 1086, -911, -94, 210, 837, -494},
+/*14*/ {0, 2, 0, 595, -1229, -8, -160, -281, 616},
+/*15*/ {1, (char)-1, 0, 2484, -485, -177, 259, 260, -395},
+/*16*/ {1, (char)-1, 1, 839, -1414, 17, 234, -191, -396},
+/*17*/ {1, 0, (char)-3, -964, 1059, 582, -285, -3218, 370},
+/*18*/ {1, 0, (char)-2, -2303, -1038, -298, 692, 8019, -7869},
+/*19*/ {1, 0, (char)-1, 7049, 747, 157, 201, 105, 45637},
+/*20*/ {1, 0, 0, 1179, -358, 304, 825, 8623, 8444},
+/*21*/ {1, 0, 1, 393, -63, -124, -29, -896, -801},
+/*22*/ {1, 0, 2, 111, -268, 15, 8, 208, -122},
+/*23*/ {1, 0, 3, -52, -154, 7, 15, -133, 65},
+/*24*/ {1, 0, 4, -78, -30, 2, 2, -16},
+/*25*/ {1, 1, (char)-3, -34, -26, 4, 2, -22, 7},
+/*26*/ {1, 1, (char)-2, -43, 1, 3, 0, -8, 16},
+/*27*/ {1, 1, (char)-1, -15, 21, 1, -1, 2, 9},
+/*28*/ {1, 1, 0, -1, 15, 0, -2, 12, 5},
+/*29*/ {1, 1, 1, 4, 7, 1, 0, 1, -3},
+/*30*/ {1, 1, 3, 1, 5, 1, -1, 1, 0},
+/*31*/ {2, 0, (char)-6, 8, 3, -2, -3, 9, 5},
+/*32*/ {2, 0, (char)-5, -3, 6, 1, 2, 2, -1},
+/*33*/ {2, 0, (char)-4, 6, -13, -8, 2, 14, 10},
+/*34*/ {2, 0, (char)-3, 10, 22, 10, -7, -65, 12},
+/*35*/ {2, 0, (char)-2, -57, -32, 0, 21, 126, -233},
+/*36*/ {2, 0, (char)-1, 157, -46, 8, 5, 270, 1068},
+/*37*/ {2, 0, 0, 12, -18, 13, 16, 254, 155},
+/*38*/ {2, 0, 1, -4, 8, -2, -3, -26, -2},
+/*39*/ {2, 0, 2, -5, 0, 0, 0, 7, 0},
+/*40*/ {2, 0, 3, 3, 4, 0, 1, -11, 4},
+/*41*/ {3, 0, (char)-2, -1, -1, 0, 1, 4, -14},
+/*42*/ {3, 0, (char)-1, 6, -3, 0, 0, 18, 35},
+/*43*/ {3, 0, 0, -1, -2, 0, 1, 13, 3}
+};
+#endif
+
 // icons
 // moon
 const char moonbright[7] = {0x08, 0x1c, 0x3e, 0x7f, 0x3e, 0x1c, 0x08};

diff --git a/tests/basic/basic.cpp b/tests/basic/basic.cpp
@@ -7,9 +7,6 @@
 #include <SPI.h>
 #include <Wire.h>
 
-#include <HardwareSerial.h>
-
-
 // ******** defines ********
 // defines
 #define FOREVER 1