Skip to content

Commit 2ff1516

Browse files
AlexLyndAlexLynd
committed
fix arduino config
1 parent e2cd8ea commit 2ff1516

File tree

12 files changed

+111
-22
lines changed

12 files changed

+111
-22
lines changed

‎.gitmodules‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@
44
branch = international-keyboard-support
55
[submodule "src/third_party/arduino_base64"]
66
path = src/third_party/arduino_base64
7-
url = https://github.com/dojyorin/arduino_base64.git
7+
url = https://github.com/dojyorin/arduino_base64.git

‎src/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ RUN tar -xf arduino-cli_${ARDUINO_CLI_VERSION}_Linux_64bit.tar.gz
1818
# TODO: version-lock these
1919
COPY arduino-cli.yaml .
2020
RUN ./arduino-cli core update-index --config-file arduino-cli.yaml
21-
RUN ./arduino-cli core install esp32:[email protected].4
21+
RUN ./arduino-cli core install esp32:[email protected].3
2222
RUN ./arduino-cli lib install \
2323
"ESP8266 and ESP32 OLED driver for SSD1306 displays" \
2424
"Adafruit NeoPixel"

‎src/ScriptKitty/ScriptKitty.ino‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -70,15 +70,15 @@ void webget() {
7070
server.send(200, "text/plain", payload);
7171
}
7272

73-
DevKittyInterface* DevKittyInterface;
73+
DevKittyInterface* devKittyInterface;
7474

7575
// run payload with get request path
7676
void webrun() {
7777
fileOp op = readFile(server.arg("path"));
7878
if (op.ok) {
7979
server.send(200, "text/html", "Running payload...");
8080
DevKittyScreen* runner = new ScriptRunnerScreen(op.result);
81-
bool ok = DevKittyInterface->injectScreen(runner);
81+
bool ok = devKittyInterface->injectScreen(runner);
8282
return;
8383
}
8484
server.send(500, "text/html", "couldn't run payload: " + op.result);
@@ -90,7 +90,7 @@ void webrunlive() {
9090
if (op.ok) {
9191
server.send(200, "text/plain", "running live payload");
9292
DevKittyScreen* runner = new ScriptRunnerScreen(op.result);
93-
bool ok = DevKittyInterface->injectScreen(runner);
93+
bool ok = devKittyInterface->injectScreen(runner);
9494
// TODO: send 503 when device is busy
9595
return;
9696
}
@@ -120,12 +120,12 @@ void setup() {
120120
server.begin();
121121

122122
xTaskCreate(webserverInit, "webapptask", 12 * 1024, NULL, 5, &webapp); // create task priority 1
123-
DevKittyInterface = new DevKittyInterface;
123+
devKittyInterface = new DevKittyInterface;
124124
DevKittyScreen* dirScreen = new DirScreen("/");
125125
DevKittyScreen* splashScreen = new SplashScreen(1500);
126-
DevKittyInterface->pushScreen(dirScreen);
127-
DevKittyInterface->pushScreen(splashScreen);
128-
DevKittyInterface->start();
126+
devKittyInterface->pushScreen(dirScreen);
127+
devKittyInterface->pushScreen(splashScreen);
128+
devKittyInterface->start();
129129

130130
}
131131

‎src/ScriptKitty/src/interface/graphics.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@
1010
#include "graphics/cat_with_one_exclamation_point_image.h"
1111
#include "graphics/network_monitor_dash.h"
1212
#include "graphics/cat_with_reload_spinner_image.h"
13-
#include "graphics/splash_img.h"
13+
#include "graphics/ScriptKitty-Splash.h"

‎src/ScriptKitty/src/interface/graphics/ScriptKitty-Splash.h‎

Lines changed: 89 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,89 @@
1+
#define ScriptKitty_Splash_width 128
2+
#define ScriptKitty_Splash_height 64
3+
static unsigned char ScriptKitty_Splash_bits[] = {
4+
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x00,
5+
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0,
6+
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
7+
0x00, 0x00, 0x00, 0xf0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
8+
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x00,
9+
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x47,
10+
0x1c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
11+
0x00, 0x00, 0x00, 0x47, 0x1c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
12+
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x47, 0x1c, 0x00, 0x00, 0x00,
13+
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42,
14+
0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
15+
0x00, 0x00, 0x00, 0x42, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
16+
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x4c, 0x06, 0x00, 0x00, 0x00,
17+
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0,
18+
0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
19+
0x00, 0xc0, 0x00, 0x40, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
20+
0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x01, 0x40, 0x00, 0xf0, 0x00, 0x00,
21+
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x03, 0x40,
22+
0x00, 0xd8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
23+
0x00, 0x20, 0x06, 0xe0, 0x00, 0x8c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
24+
0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0x0e, 0xf0, 0x01, 0x8e, 0x01, 0x00,
25+
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0x1c, 0xe0,
26+
0x00, 0x87, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
27+
0x00, 0x30, 0x1c, 0x00, 0x00, 0x87, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00,
28+
0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x38, 0x00, 0x80, 0x03, 0x01, 0x00,
29+
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x78, 0xfe,
30+
0xcf, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
31+
0x00, 0x10, 0xfc, 0xff, 0xff, 0x07, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00,
32+
0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0xff, 0xff, 0xff, 0x1f, 0x03, 0x00,
33+
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x98, 0xff, 0xff,
34+
0xff, 0x3f, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
35+
0x00, 0xf8, 0xff, 0xff, 0xff, 0xff, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00,
36+
0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0xff, 0xff, 0xff, 0xff, 0x03, 0x00,
37+
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0xff, 0xff,
38+
0xff, 0xff, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
39+
0x00, 0xf8, 0xff, 0xff, 0xff, 0xff, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00,
40+
0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0xff, 0xff, 0xff, 0xff, 0x03, 0x00,
41+
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0xff, 0xff,
42+
0xff, 0xff, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
43+
0x00, 0xfc, 0xfb, 0xff, 0xff, 0xfb, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00,
44+
0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0xe3, 0xff, 0xff, 0xf8, 0x07, 0x00,
45+
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0x83, 0xff,
46+
0x3f, 0xf8, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
47+
0x00, 0xfc, 0x03, 0xfe, 0x0f, 0xf8, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00,
48+
0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x03, 0xfe, 0x0f, 0xf8, 0x00, 0x00,
49+
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x03, 0xff,
50+
0x1f, 0xf8, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
51+
0x00, 0xfc, 0x07, 0xff, 0x1f, 0xfc, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00,
52+
0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0x8f, 0xff, 0x3f, 0xfe, 0x07, 0x00,
53+
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0xff, 0xbb,
54+
0xfb, 0xff, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
55+
0x00, 0xf0, 0xff, 0x13, 0xf9, 0xff, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00,
56+
0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0xff, 0x07, 0xfc, 0xff, 0x01, 0x00,
57+
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0xff, 0xcf,
58+
0xfc, 0xff, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
59+
0x00, 0xfc, 0xff, 0xff, 0xff, 0xff, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00,
60+
0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0xff, 0xff, 0xff, 0xff, 0x07, 0x00,
61+
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0xff, 0xff,
62+
0xff, 0xff, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
63+
0x00, 0xe0, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
64+
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0x1f, 0x00, 0x00,
65+
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, 0xfa,
66+
0xab, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
67+
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
68+
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
69+
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
70+
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3e,
71+
0x00, 0x00, 0x00, 0xc0, 0x30, 0x0e, 0x30, 0x06, 0x00, 0x00, 0x00, 0x00,
72+
0x00, 0x00, 0x00, 0x7f, 0x00, 0x00, 0x03, 0xc0, 0x30, 0xc7, 0x30, 0x06,
73+
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x63, 0x78, 0x6c, 0xb3, 0xf3,
74+
0xb3, 0xc3, 0xfc, 0x9f, 0x31, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03,
75+
0xfc, 0x6c, 0xf0, 0xf7, 0xb3, 0x01, 0xfc, 0x9f, 0x31, 0x00, 0x00, 0x00,
76+
0x00, 0x00, 0x00, 0x1f, 0xce, 0x3c, 0x73, 0xc6, 0xf0, 0xc0, 0x30, 0x86,
77+
0x31, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0x06, 0x0c, 0x33, 0xcc,
78+
0xf0, 0xc0, 0x30, 0x86, 0x31, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60,
79+
0x06, 0x0c, 0x33, 0xcc, 0xb0, 0xc1, 0x30, 0x86, 0x31, 0x00, 0x00, 0x00,
80+
0x00, 0x00, 0x00, 0x63, 0xce, 0x0c, 0x73, 0xce, 0xb0, 0xc3, 0x30, 0x86,
81+
0x31, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7f, 0xfc, 0x0c, 0xf3, 0xc7,
82+
0x31, 0xc7, 0x70, 0x0e, 0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3e,
83+
0x78, 0x0c, 0xb3, 0x83, 0x33, 0xce, 0xe0, 0x1c, 0x3e, 0x00, 0x00, 0x00,
84+
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00,
85+
0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0x00,
86+
0x00, 0x00, 0x00, 0x00, 0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
87+
0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0x00, 0x00, 0x00,
88+
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
89+
0x00, 0x00, 0x00, 0x00 };

‎src/ScriptKitty/src/interface/lib/DevKittyInterface.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,10 +61,10 @@ void DevKittyScreen::setStrip(Adafruit_NeoPixel* strip){
6161
this->strip = strip;
6262
}
6363
void DevKittyScreen::setDevKittyInterface(DevKittyInterface* nI){
64-
this->DevKittyInterface = nI;
64+
this->devKittyInterface = nI;
6565
}
6666
void DevKittyScreen::pushScreen(DevKittyScreen* screen){
67-
this->DevKittyInterface->pushScreen(screen);
67+
this->devKittyInterface->pushScreen(screen);
6868
}
6969
void DevKittyScreen::alwaysUpdates(bool set){
7070
this->alwaysUpdate = set;

‎src/ScriptKitty/src/interface/lib/DevKittyInterface.h‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ class DevKittyScreen {
6161
void pushScreen(DevKittyScreen*);
6262
void alwaysUpdates(bool);
6363
private:
64-
DevKittyInterface* DevKittyInterface;
64+
DevKittyInterface* devKittyInterface;
6565
bool alwaysUpdate;
6666
};
6767

@@ -96,5 +96,4 @@ class DevKittyInterface {
9696
};
9797

9898

99-
#endif
100-
99+
#endif

‎src/ScriptKitty/src/interface/screens/splash.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ int SplashScreen::update(int button) {
1919
}
2020

2121
bool SplashScreen::draw() {
22-
display->drawXbm(0, 0, 128, 64, splash_bits);
23-
display->drawString(94,0,"1.2.1");
24-
display->drawRect(92,0,36,12);
22+
display->drawXbm(0, 0, 128, 64, ScriptKitty_Splash_bits);
23+
// display->drawString(104,0,"1.0");
24+
// display->drawRect(102,0,24,12);
2525
return true;
2626
}

‎src/arduino-cli.yaml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
board_manager:
2-
additional_urls: ["https://raw.githubusercontent.com/espressif/arduino-esp32/gh-pages/package_esp32_dev_index.json"]
2+
# additional_urls: ["https://raw.githubusercontent.com/espressif/arduino-esp32/gh-pages/package_esp32_dev_index.json"]
3+
additional_urls: ["https://raw.githubusercontent.com/espressif/arduino-esp32/gh-pages/package_esp32_index.json"]
34
daemon:
45
port: "50051"
56
directories:

‎src/makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ ARDUINO_CLI_VERSION = 0.22.0
66

77
submodules:
88
git submodule init
9-
git submodule update
9+
# git submodule update
1010

1111
build: submodules
1212
docker build . --file Dockerfile --build-arg ARDUINO_CLI_VERSION=$(ARDUINO_CLI_VERSION) --tag scriptkitty-fw

0 commit comments

Comments
 (0)