Merge pull request #250 from SolderedElectronics/dev

Dev to master
SolderedElectronics · May 6, 2024 · 8e341dc · 8e341dc
2 parents ae05087 + 4fcc082
commit 8e341dc
Show file tree

Hide file tree

Showing 391 changed files with 117,557 additions and 112 deletions.
diff --git a/.github/workflows/compile.yml b/.github/workflows/compile.yml
@@ -7,6 +7,14 @@ jobs:
     strategy:
       matrix:
         include:
+          - board:
+              fqbn: Inkplate_Boards:esp32:Inkplate5
+            additional-sketch-paths: |
+              - examples/Inkplate5
+          - board:
+              fqbn: Inkplate_Boards:esp32:Inkplate5V2
+            additional-sketch-paths: |
+              - examples/Inkplate5V2
           - board:
               fqbn: Inkplate_Boards:esp32:Inkplate6
             additional-sketch-paths: |

diff --git a/...nced/WEB_WiFi/Inkplate10_Show_JPG_With_HTTPClient/Inkplate10_Show_JPG_With_HTTPClient.ino b/...nced/WEB_WiFi/Inkplate10_Show_JPG_With_HTTPClient/Inkplate10_Show_JPG_With_HTTPClient.ino
@@ -33,7 +33,7 @@ char *ssid = ""; // Your WiFi SSID
 char *pass = ""; // Your WiFi password
 
 // Add the URL of the image you want to show on Inkplate
-String url = "https://raw.githubusercontent.com/SolderedElectronics/Inkplate-Arduino-library/dev/examples/Inkplate10/Advanced/WEB_WiFi/Inkplate10_Show_JPG_With_HTTPClient/image.jpg";
+String url = "https://raw.githubusercontent.com/SolderedElectronics/Inkplate-Arduino-library/master/examples/Inkplate10/Advanced/WEB_WiFi/Inkplate10_Show_JPG_With_HTTPClient/image.jpg";
 
 /***********************************************/
 

diff --git a/...vanced/WEB_WiFi/Inkplate2_Show_JPG_With_HTTPClient/Inkplate2_Show_JPG_With_HTTPClient.ino b/...vanced/WEB_WiFi/Inkplate2_Show_JPG_With_HTTPClient/Inkplate2_Show_JPG_With_HTTPClient.ino
@@ -32,7 +32,7 @@ char *ssid = ""; // Your WiFi SSID
 char *pass = ""; // Your WiFi password
 
 // Add the URL of the image you want to show on Inkplate
-String url = "https://raw.githubusercontent.com/SolderedElectronics/Inkplate-Arduino-library/dev/examples/Inkplate2/Advanced/WEB_WiFi/Inkplate2_Show_JPG_With_HTTPClient/image.jpg";
+String url = "https://raw.githubusercontent.com/SolderedElectronics/Inkplate-Arduino-library/master/examples/Inkplate2/Advanced/WEB_WiFi/Inkplate2_Show_JPG_With_HTTPClient/image.jpg";
 
 /***********************************************/
 

diff --git a/...2/Advanced/WEB_WiFi/Inkplate2_Show_Pictures_From_Web/Inkplate2_Show_Pictures_From_Web.ino b/...2/Advanced/WEB_WiFi/Inkplate2_Show_Pictures_From_Web/Inkplate2_Show_Pictures_From_Web.ino
@@ -68,7 +68,7 @@ void setup()
     display.clearDisplay();
 
     if (!display.drawImage("https://raw.githubusercontent.com/SolderedElectronics/Inkplate-Arduino-library/"
-                           "Inkplate2-DrawImage3Color-And-Examples/examples/Inkplate2/Advanced/WEB_WiFi/"
+                           "master/examples/Inkplate2/Advanced/WEB_WiFi/"
                            "Inkplate2_Show_Pictures_From_Web/cat_dithered.jpg",
                            0, 0, false, false))
     {
@@ -87,7 +87,7 @@ void setup()
     http.getStream().setTimeout(1);
 
     http.begin("https://raw.githubusercontent.com/SolderedElectronics/Inkplate-Arduino-library/"
-               "Inkplate2-DrawImage3Color-And-Examples/examples/Inkplate2/Advanced/WEB_WiFi/"
+               "master/examples/Inkplate2/Advanced/WEB_WiFi/"
                "Inkplate2_Show_Pictures_From_Web/car.bmp");
 
     // Check response code.
@@ -129,7 +129,7 @@ void setup()
     // true will flip all colors on the image, making black white and white black. fourth parameter will dither the
     // image.
     if (!display.drawImage("https://raw.githubusercontent.com/SolderedElectronics/Inkplate-Arduino-library/"
-                           "Inkplate2-DrawImage3Color-And-Examples/examples/Inkplate2/Advanced/WEB_WiFi/"
+                           "master/examples/Inkplate2/Advanced/WEB_WiFi/"
                            "Inkplate2_Show_Pictures_From_Web/mountain.png",
                            0, 0, true, false))
     {

diff --git a/...les/Inkplate4TEMPERA/Advanced/Sensors/Inkplate4TEMPERA_Buzzer/Inkplate4TEMPERA_Buzzer.ino b/...les/Inkplate4TEMPERA/Advanced/Sensors/Inkplate4TEMPERA_Buzzer/Inkplate4TEMPERA_Buzzer.ino
@@ -38,30 +38,30 @@ void setup()
     display.display(); // Put clear image on display
 
     // Init the buzzer, this must be called if using it
-    display.buzzer.begin();
+    display.initBuzzer();
 
     // The most basic example
     // This will produce three short beeps
     // The beeps are each 80ms long
-    display.buzzer.beep(80);
+    display.beep(80);
     delay(80);
-    display.buzzer.beep(80);
+    display.beep(80);
     delay(80);
-    display.buzzer.beep(80);
+    display.beep(80);
     delay(80);
 
     delay(5000); // Wait 5 seconds before the next example
 
     // The buzzer may also be controlled by manually turning it on or off
     // beepOn will turn on the buzzer indefinitely until beepOff is called
     // This will produce two 200 ms beeps
-    display.buzzer.beepOn();
+    display.beepOn();
     delay(200);
-    display.buzzer.beepOff();
+    display.beepOff();
     delay(200);
-    display.buzzer.beepOn();
+    display.beepOn();
     delay(200);
-    display.buzzer.beepOff();
+    display.beepOff();
     delay(200);
 
     delay(5000); // Wait 5 seconds before the next example
@@ -70,13 +70,13 @@ void setup()
     // Note that pitch is approximated as the digital potentiometer does not affect the pitch in a linear way
     // Frequencies from 572 to 2933 Hz are supported
     // Here are two low pitched (~750Hz) followed by two high pitched (~2400Hz) beeps
-    display.buzzer.beep(300, 750);
+    display.beep(300, 750);
     delay(50);
-    display.buzzer.beep(300, 750);
+    display.beep(300, 750);
     delay(50);
-    display.buzzer.beep(300, 2400);
+    display.beep(300, 2400);
     delay(50);
-    display.buzzer.beep(300, 2400);
+    display.beep(300, 2400);
     delay(50);
 
     delay(5000); // Wait 5 seconds before the next example
@@ -89,16 +89,16 @@ void loop()
     if (repeatCounter < 2)
     {
         // Play the note set to be played for 100 ms
-        display.buzzer.beep(100, chord[currentNoteIndex]);
+        display.beep(100, chord[currentNoteIndex]);
         delay(600); // Wait 600 ms so there's room between the notes
     }
     // The second four times play the notes twice
     else
     {
         // Play the note set to be played for 100 ms
-        display.buzzer.beep(100, chord[currentNoteIndex]);
+        display.beep(100, chord[currentNoteIndex]);
         delay(250); // Wait 300 ms and play it again for 50 ms
-        display.buzzer.beep(50, chord[currentNoteIndex]);
+        display.beep(50, chord[currentNoteIndex]);
         delay(300); // Wait for 300 ms, this totals to 700 so it's in rhythm
     }
 

diff --git a/...i/Inkplate4TEMPERA_Show_JPG_With_HTTPClient/Inkplate4TEMPERA_Show_JPG_With_HTTPClient.ino b/...i/Inkplate4TEMPERA_Show_JPG_With_HTTPClient/Inkplate4TEMPERA_Show_JPG_With_HTTPClient.ino
@@ -32,7 +32,7 @@ char *ssid = ""; // Your WiFi SSID
 char *pass = ""; // Your WiFi password
 
 // Add the URL of the image you want to show on Inkplate
-String url = "https://raw.githubusercontent.com/SolderedElectronics/Inkplate-Arduino-library/dev/examples/"
+String url = "https://raw.githubusercontent.com/SolderedElectronics/Inkplate-Arduino-library/master/examples/"
              "Inkplate4TEMPERA/Advanced/WEB_WiFi/Inkplate4TEMPERA_Show_JPG_With_HTTPClient/image.jpg";
 
 /***********************************************/

diff --git a/...s/Inkplate4TEMPERA_Factory_Programming_VCOM/Inkplate4TEMPERA_Factory_Programming_VCOM.ino b/...s/Inkplate4TEMPERA_Factory_Programming_VCOM/Inkplate4TEMPERA_Factory_Programming_VCOM.ino
@@ -82,7 +82,7 @@ void setup()
         if (result == 5)
         {
             Serial.println("I2C Bus Error!");
-            failHandler();
+            failHandler(true);
         }
     }