Skip to content

Commit 66b7cd1

Browse files
authored
Merge pull request #181 from SolderedElectronics/PCAL-Support
PCAL-Support merge into dev.
2 parents 93efc99 + 8dae771 commit 66b7cd1

File tree

2,657 files changed

+228874
-172495
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,657 files changed

+228874
-172495
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: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
# Inkplate Arduino library
22

3-
[![Compile Sketches](https://github.com/SolderedElectronics/Inkplate-Arduino-library/actions/workflows/compile.yml/badge.svg?branch=dev)](https://github.com/SolderedElectronics/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

7-
Arduino library for all-in-one e-paper display family named Inkplate can be found in this repo. Inkplate is a series of powerful, Wi-Fi enabled ESP32-based e-paper display products. Its main feature is simplicity. Just plug in a USB cable, open Arduino IDE, and change the contents of the screen with few lines of code. Inkplate family currently includes Inkplate 10, Inkplate 6 and Inkplate 6PLUS - learn more about Inkplates on [official website](https://inkplate.io/).
7+
Arduino library for all-in-one e-paper display family named Inkplate can be found in this repo. Inkplate is a series of powerful, Wi-Fi enabled ESP32-based e-paper display products. Its main feature is simplicity. Just plug in a USB cable, open Arduino IDE, and change the contents of the screen with few lines of code. Inkplate family currently includes Inkplate 10, Inkplate 6 and Inkplate 6PLUS - learn more about Inkplates on [official website](https://inkplate.io/).
88
Inkplate 6 was crowdfunded on [Crowd Supply](https://www.crowdsupply.com/e-radionica/inkplate-6), as well as [Inkplate 10]([https://www.crowdsupply.com/e-radionica/inkplate-10). [Inkplate 6PLUS](https://www.crowdsupply.com/e-radionica/inkplate-6plus) is funding now.
99

1010
### Setting up Inkplate in Arduino IDE
1111

1212
In order to get a head start with Inkplate (any), follow these steps:
1313

14-
1. [Install Inkplate board definition](https://github.com/SolderedElectronics/Croduino-Board-Definitions-for-Arduino-IDE/blob/master/README.md) - add Inkplate 6/10/6PLUS as a board into your Arduino IDE. Follow the instructions on the [link](https://e-radionica.com/en/blog/add-inkplate-6-to-arduino-ide/).
14+
1. [Install Inkplate board definition](https://github.com/e-radionicacom/Croduino-Board-Definitions-for-Arduino-IDE/blob/master/README.md) - add Inkplate 6/10/6PLUS as a board into your Arduino IDE. Follow the instructions on the [link](https://e-radionica.com/en/blog/add-inkplate-6-to-arduino-ide/).
1515
2. Install CH340 drivers (if you don't have them yet) - instructions [here](https://e-radionica.com/en/blog/ch340-driver-installation-croduino-basic3-nova2/)
1616
3. Install Inkplate Arduino library - install the library from this repo into your Arduino IDE. If you don't know how, check our [tutorial](https://e-radionica.com/en/blog/arduino-library/#Kako%20instaliraty%20library?).
1717
4. You are ready to get started! Select Tools -> Board -> Inkplate (pick correct one), as well as correct COM port and upload!
@@ -22,7 +22,8 @@ There are many examples in the library that you demonstrate how to use any of th
2222

2323
### Documentation
2424

25-
Find Inkplate documentation [here](https://inkplate.readthedocs.io/en/latest/arduino.html).
25+
Find Inkplate documentation [here](https://inkplate.readthedocs.io/en/latest/arduino.html).
26+
2627

2728
### Using Inkplate 6 with another microcontroller - Peripheral mode
2829

@@ -46,7 +47,7 @@ apt install python-is-python3
4647

4748
### Micropython
4849

49-
If you are looking for micropython support, please find all details [here](https://github.com/SolderedElectronics/Inkplate-micropython).
50+
If you are looking for micropython support, please find all details [here](https://github.com/e-radionicacom/Inkplate-micropython).
5051

5152
### License
5253

@@ -56,9 +57,9 @@ This repo uses the source code from another repositories. All their license file
5657

5758
All of Inkplate-related development is open-sourced:
5859

59-
- [Arduino library](https://github.com/SolderedElectronics/Inkplate-6-Arduino-library)
60-
- Hardware design: [Inkplate 6](https://github.com/SolderedElectronics/Inkplate-6-hardware), [Inkplate 10](https://github.com/SolderedElectronics/Inkplate-10-hardware)
61-
- [micropython Inkplate](https://github.com/SolderedElectronics/Inkplate-6-micropython)
60+
- [Arduino library](https://github.com/e-radionicacom/Inkplate-6-Arduino-library)
61+
- Hardware design: [Inkplate 6](https://github.com/e-radionicacom/Inkplate-6-hardware), [Inkplate 10](https://github.com/e-radionicacom/Inkplate-10-hardware)
62+
- [micropython Inkplate](https://github.com/e-radionicacom/Inkplate-6-micropython)
6263
- OSHWA cerfiticate: [Inkplate 6](https://certification.oshwa.org/hr000003.html), [Inkplate 10](https://certification.oshwa.org/hr000006.html)
6364

6465
### Where to buy & other
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)