Skip to content

Commit 8c2017d

Browse files
authored
Merge pull request #183 from SolderedElectronics/dev
Dev to master merge
2 parents 2d44c59 + aeae3f4 commit 8c2017d

File tree

2,648 files changed

+228860
-172172
lines changed

Some content is hidden

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

2,648 files changed

+228860
-172172
lines changed

.github/workflows/compile.yml

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,26 +11,30 @@ jobs:
1111
fqbn: Inkplate_Boards:esp32:Inkplate6
1212
additional-sketch-paths: |
1313
- examples/Inkplate6
14+
- board:
15+
fqbn: Inkplate_Boards:esp32:Inkplate6V2
16+
additional-sketch-paths: |
17+
- examples/Inkplate6
1418
- board:
1519
fqbn: Inkplate_Boards:esp32:Inkplate10
1620
additional-sketch-paths: |
1721
- examples/Inkplate10
1822
- board:
19-
fqbn: Inkplate_Boards:esp32:Inkplate5
23+
fqbn: Inkplate_Boards:esp32:Inkplate10V2
2024
additional-sketch-paths: |
21-
- examples/Inkplate5
25+
- examples/Inkplate10
2226
- board:
2327
fqbn: Inkplate_Boards:esp32:Inkplate6plus
2428
additional-sketch-paths: |
2529
- examples/Inkplate6PLUS
2630
- board:
27-
fqbn: Inkplate_Boards:esp32:Inkplate6COLOR
31+
fqbn: Inkplate_Boards:esp32:Inkplate6plusV2
2832
additional-sketch-paths: |
29-
- examples/Inkplate6COLOR
33+
- examples/Inkplate6PLUS
3034
- board:
31-
fqbn: Inkplate_Boards:esp32:Inkplate2
35+
fqbn: Inkplate_Boards:esp32:Inkplate6COLOR
3236
additional-sketch-paths: |
33-
- examples/Inkplate2
37+
- examples/Inkplate6COLOR
3438
steps:
3539
- name: Checkout
3640
uses: actions/checkout@v2
@@ -50,5 +54,9 @@ jobs:
5054
- name: "Adafruit BME680 Library"
5155
- name: ArduinoJson
5256
- name: Time
57+
- source-url: https://github.com/SolderedElectronics/Soldered-MFRC522-RFID-Reader-Arduino-Library.git
58+
- source-url: https://github.com/SolderedElectronics/Soldered-BME280-BME680-Gas-Sensor-Arduino-Library.git
5359
sketch-paths: |
54-
${{ matrix.additional-sketch-paths }}
60+
${{ matrix.additional-sketch-paths }}
61+
cli-compile-flags: |
62+
- --warnings="default"

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Inkplate Arduino library
22

3-
[![Compile Sketches](https://github.com/e-radionicacom/Inkplate-Arduino-library/actions/workflows/compile.yml/badge.svg?branch=dev)](https://github.com/e-radionicacom/Inkplate-Arduino-library/actions/workflows/compile.yml)
3+
[![Compile Sketches](https://github.com/e-radionicacom/Inkplate-Arduino-library/actions/workflows/compile.yml/badge.svg?branch=master)](https://github.com/e-radionicacom/Inkplate-Arduino-library/actions/workflows/compile.yml)
44

55
![](https://www.crowdsupply.com/img/cf95/compare-peripheral_jpg_project-body.jpg)
66

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
/*
2+
Inkplate10_Bluetooth_Peripheral_Mode example for Soldered Inkplate 10
3+
For this example you will need USB cable and an Inkplate 10
4+
Select "e-radionica Inkplate10" or "Soldered Inkplate10" from Tools -> Board menu.
5+
Don't have "e-radionica Inkplate10" or "Soldered Inkplate10" option? Follow our tutorial and add it:
6+
https://soldered.com/learn/add-inkplate-6-board-definition-to-arduino-ide/
7+
8+
This example shows how to use Inkplate as a peripheral device over Bluetooth.
9+
Note: for this to work you need to use ESP32 Wroover Board definition, as ours currently has a bug :(
10+
11+
Want to learn more about Inkplate? Visit www.inkplate.io
12+
Looking to get support? Write on our forums: https://forum.soldered.com/
13+
15 July 2020 by Soldered
14+
*/
15+
16+
// Next 3 lines are a precaution, you can ignore those, and the example would also work without them
17+
#if !defined(ARDUINO_INKPLATE10) && !defined(ARDUINO_INKPLATE10V2)
18+
#error "Wrong board selection for this example, please select e-radionica Inkplate10 or Soldered Inkplate10 in the boards menu."
19+
#endif
20+
21+
#include "Inkplate.h"
22+
23+
#include "BluetoothSerial.h"
24+
25+
#define BUFFER_SIZE 1000
26+
27+
#include "Peripheral.h"
28+
29+
// Declare Inkplate and SerialBluetooth objects
30+
Inkplate display(INKPLATE_1BIT);
31+
BluetoothSerial SerialBT;
32+
33+
// Temporary buffer to send to Peripheral mode code
34+
char commandBuffer[BUFFER_SIZE + 1];
35+
36+
void setup() // Initialize everything
37+
{
38+
Serial.begin(115200);
39+
40+
if (!SerialBT.begin("ESP32"))
41+
{
42+
Serial.println("An error occurred initializing Bluetooth");
43+
}
44+
45+
display.begin();
46+
}
47+
48+
void loop()
49+
{
50+
while (SerialBT.available()) // When Bluetooth available save it and pass to Peripheral.h code
51+
{
52+
for (int i = 0; i < (BUFFER_SIZE - 1); i++)
53+
{
54+
commandBuffer[i] = commandBuffer[i + 1];
55+
}
56+
commandBuffer[BUFFER_SIZE - 1] = SerialBT.read();
57+
Serial.print(commandBuffer[BUFFER_SIZE - 1]);
58+
}
59+
60+
// Function in peripheral.h
61+
run(commandBuffer, BUFFER_SIZE);
62+
63+
delay(50);
64+
}

0 commit comments

Comments
 (0)