Skip to content

Commit 8e341dc

Browse files
authored
Merge pull request #250 from SolderedElectronics/dev
Dev to master
2 parents ae05087 + 4fcc082 commit 8e341dc

File tree

391 files changed

+117557
-112
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

391 files changed

+117557
-112
lines changed

.github/workflows/compile.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,14 @@ jobs:
77
strategy:
88
matrix:
99
include:
10+
- board:
11+
fqbn: Inkplate_Boards:esp32:Inkplate5
12+
additional-sketch-paths: |
13+
- examples/Inkplate5
14+
- board:
15+
fqbn: Inkplate_Boards:esp32:Inkplate5V2
16+
additional-sketch-paths: |
17+
- examples/Inkplate5V2
1018
- board:
1119
fqbn: Inkplate_Boards:esp32:Inkplate6
1220
additional-sketch-paths: |

examples/Inkplate10/Advanced/WEB_WiFi/Inkplate10_Show_JPG_With_HTTPClient/Inkplate10_Show_JPG_With_HTTPClient.ino

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ char *ssid = ""; // Your WiFi SSID
3333
char *pass = ""; // Your WiFi password
3434

3535
// Add the URL of the image you want to show on Inkplate
36-
String url = "https://raw.githubusercontent.com/SolderedElectronics/Inkplate-Arduino-library/dev/examples/Inkplate10/Advanced/WEB_WiFi/Inkplate10_Show_JPG_With_HTTPClient/image.jpg";
36+
String url = "https://raw.githubusercontent.com/SolderedElectronics/Inkplate-Arduino-library/master/examples/Inkplate10/Advanced/WEB_WiFi/Inkplate10_Show_JPG_With_HTTPClient/image.jpg";
3737

3838
/***********************************************/
3939

examples/Inkplate2/Advanced/WEB_WiFi/Inkplate2_Show_JPG_With_HTTPClient/Inkplate2_Show_JPG_With_HTTPClient.ino

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ char *ssid = ""; // Your WiFi SSID
3232
char *pass = ""; // Your WiFi password
3333

3434
// Add the URL of the image you want to show on Inkplate
35-
String url = "https://raw.githubusercontent.com/SolderedElectronics/Inkplate-Arduino-library/dev/examples/Inkplate2/Advanced/WEB_WiFi/Inkplate2_Show_JPG_With_HTTPClient/image.jpg";
35+
String url = "https://raw.githubusercontent.com/SolderedElectronics/Inkplate-Arduino-library/master/examples/Inkplate2/Advanced/WEB_WiFi/Inkplate2_Show_JPG_With_HTTPClient/image.jpg";
3636

3737
/***********************************************/
3838

examples/Inkplate2/Advanced/WEB_WiFi/Inkplate2_Show_Pictures_From_Web/Inkplate2_Show_Pictures_From_Web.ino

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ void setup()
6868
display.clearDisplay();
6969

7070
if (!display.drawImage("https://raw.githubusercontent.com/SolderedElectronics/Inkplate-Arduino-library/"
71-
"Inkplate2-DrawImage3Color-And-Examples/examples/Inkplate2/Advanced/WEB_WiFi/"
71+
"master/examples/Inkplate2/Advanced/WEB_WiFi/"
7272
"Inkplate2_Show_Pictures_From_Web/cat_dithered.jpg",
7373
0, 0, false, false))
7474
{
@@ -87,7 +87,7 @@ void setup()
8787
http.getStream().setTimeout(1);
8888

8989
http.begin("https://raw.githubusercontent.com/SolderedElectronics/Inkplate-Arduino-library/"
90-
"Inkplate2-DrawImage3Color-And-Examples/examples/Inkplate2/Advanced/WEB_WiFi/"
90+
"master/examples/Inkplate2/Advanced/WEB_WiFi/"
9191
"Inkplate2_Show_Pictures_From_Web/car.bmp");
9292

9393
// Check response code.
@@ -129,7 +129,7 @@ void setup()
129129
// true will flip all colors on the image, making black white and white black. fourth parameter will dither the
130130
// image.
131131
if (!display.drawImage("https://raw.githubusercontent.com/SolderedElectronics/Inkplate-Arduino-library/"
132-
"Inkplate2-DrawImage3Color-And-Examples/examples/Inkplate2/Advanced/WEB_WiFi/"
132+
"master/examples/Inkplate2/Advanced/WEB_WiFi/"
133133
"Inkplate2_Show_Pictures_From_Web/mountain.png",
134134
0, 0, true, false))
135135
{

examples/Inkplate4TEMPERA/Advanced/Sensors/Inkplate4TEMPERA_Buzzer/Inkplate4TEMPERA_Buzzer.ino

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -38,30 +38,30 @@ void setup()
3838
display.display(); // Put clear image on display
3939

4040
// Init the buzzer, this must be called if using it
41-
display.buzzer.begin();
41+
display.initBuzzer();
4242

4343
// The most basic example
4444
// This will produce three short beeps
4545
// The beeps are each 80ms long
46-
display.buzzer.beep(80);
46+
display.beep(80);
4747
delay(80);
48-
display.buzzer.beep(80);
48+
display.beep(80);
4949
delay(80);
50-
display.buzzer.beep(80);
50+
display.beep(80);
5151
delay(80);
5252

5353
delay(5000); // Wait 5 seconds before the next example
5454

5555
// The buzzer may also be controlled by manually turning it on or off
5656
// beepOn will turn on the buzzer indefinitely until beepOff is called
5757
// This will produce two 200 ms beeps
58-
display.buzzer.beepOn();
58+
display.beepOn();
5959
delay(200);
60-
display.buzzer.beepOff();
60+
display.beepOff();
6161
delay(200);
62-
display.buzzer.beepOn();
62+
display.beepOn();
6363
delay(200);
64-
display.buzzer.beepOff();
64+
display.beepOff();
6565
delay(200);
6666

6767
delay(5000); // Wait 5 seconds before the next example
@@ -70,13 +70,13 @@ void setup()
7070
// Note that pitch is approximated as the digital potentiometer does not affect the pitch in a linear way
7171
// Frequencies from 572 to 2933 Hz are supported
7272
// Here are two low pitched (~750Hz) followed by two high pitched (~2400Hz) beeps
73-
display.buzzer.beep(300, 750);
73+
display.beep(300, 750);
7474
delay(50);
75-
display.buzzer.beep(300, 750);
75+
display.beep(300, 750);
7676
delay(50);
77-
display.buzzer.beep(300, 2400);
77+
display.beep(300, 2400);
7878
delay(50);
79-
display.buzzer.beep(300, 2400);
79+
display.beep(300, 2400);
8080
delay(50);
8181

8282
delay(5000); // Wait 5 seconds before the next example
@@ -89,16 +89,16 @@ void loop()
8989
if (repeatCounter < 2)
9090
{
9191
// Play the note set to be played for 100 ms
92-
display.buzzer.beep(100, chord[currentNoteIndex]);
92+
display.beep(100, chord[currentNoteIndex]);
9393
delay(600); // Wait 600 ms so there's room between the notes
9494
}
9595
// The second four times play the notes twice
9696
else
9797
{
9898
// Play the note set to be played for 100 ms
99-
display.buzzer.beep(100, chord[currentNoteIndex]);
99+
display.beep(100, chord[currentNoteIndex]);
100100
delay(250); // Wait 300 ms and play it again for 50 ms
101-
display.buzzer.beep(50, chord[currentNoteIndex]);
101+
display.beep(50, chord[currentNoteIndex]);
102102
delay(300); // Wait for 300 ms, this totals to 700 so it's in rhythm
103103
}
104104

examples/Inkplate4TEMPERA/Advanced/WEB_WiFi/Inkplate4TEMPERA_Show_JPG_With_HTTPClient/Inkplate4TEMPERA_Show_JPG_With_HTTPClient.ino

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ char *ssid = ""; // Your WiFi SSID
3232
char *pass = ""; // Your WiFi password
3333

3434
// Add the URL of the image you want to show on Inkplate
35-
String url = "https://raw.githubusercontent.com/SolderedElectronics/Inkplate-Arduino-library/dev/examples/"
35+
String url = "https://raw.githubusercontent.com/SolderedElectronics/Inkplate-Arduino-library/master/examples/"
3636
"Inkplate4TEMPERA/Advanced/WEB_WiFi/Inkplate4TEMPERA_Show_JPG_With_HTTPClient/image.jpg";
3737

3838
/***********************************************/

examples/Inkplate4TEMPERA/Diagnostics/Inkplate4TEMPERA_Factory_Programming_VCOM/Inkplate4TEMPERA_Factory_Programming_VCOM.ino

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ void setup()
8282
if (result == 5)
8383
{
8484
Serial.println("I2C Bus Error!");
85-
failHandler();
85+
failHandler(true);
8686
}
8787
}
8888

0 commit comments

Comments
 (0)