Skip to content

Commit 3636761

Browse files
brentrubrentru
committed
checkin 615ef8c..fbc883c
1 parent 0663d1d commit 3636761

File tree

21 files changed

+100
-51
lines changed

21 files changed

+100
-51
lines changed

‎platformio.ini‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ lib_deps =
101101
https://github.com/Starmbi/hp_BH1750.git
102102
https://github.com/adafruit/Adafruit_TinyUSB_Arduino.git
103103
Adafruit EPD
104-
104+
Adafruit ST7735 and ST7789 Library
105105

106106

107107
; Common build environment for ESP32 platform

‎src/wippersnapper/description/v1/description.pb.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* Automatically generated nanopb constant definitions */
2-
/* Generated by nanopb-0.4.5-dev at Wed Aug 20 17:46:06 2025. */
2+
/* Generated by nanopb-0.4.5-dev at Mon Aug 25 14:48:29 2025. */
33

44
#include "wippersnapper/description/v1/description.pb.h"
55
#if PB_PROTO_HEADER_VERSION != 40

‎src/wippersnapper/description/v1/description.pb.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* Automatically generated nanopb header */
2-
/* Generated by nanopb-0.4.5-dev at Wed Aug 20 17:46:06 2025. */
2+
/* Generated by nanopb-0.4.5-dev at Mon Aug 25 14:48:29 2025. */
33

44
#ifndef PB_WIPPERSNAPPER_DESCRIPTION_V1_WIPPERSNAPPER_DESCRIPTION_V1_DESCRIPTION_PB_H_INCLUDED
55
#define PB_WIPPERSNAPPER_DESCRIPTION_V1_WIPPERSNAPPER_DESCRIPTION_V1_DESCRIPTION_PB_H_INCLUDED

‎src/wippersnapper/display/v1/display.pb.c‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* Automatically generated nanopb constant definitions */
2-
/* Generated by nanopb-0.4.5-dev at Wed Aug 20 17:46:06 2025. */
2+
/* Generated by nanopb-0.4.5-dev at Mon Aug 25 14:48:29 2025. */
33

44
#include "wippersnapper/display/v1/display.pb.h"
55
#if PB_PROTO_HEADER_VERSION != 40
@@ -15,6 +15,12 @@ PB_BIND(wippersnapper_display_v1_EPDConfig, wippersnapper_display_v1_EPDConfig,
1515
PB_BIND(wippersnapper_display_v1_EPDWriteOptions, wippersnapper_display_v1_EPDWriteOptions, AUTO)
1616

1717

18+
PB_BIND(wippersnapper_display_v1_TftSpiConfig, wippersnapper_display_v1_TftSpiConfig, AUTO)
19+
20+
21+
PB_BIND(wippersnapper_display_v1_TftConfig, wippersnapper_display_v1_TftConfig, AUTO)
22+
23+
1824
PB_BIND(wippersnapper_display_v1_DisplayAddOrReplace, wippersnapper_display_v1_DisplayAddOrReplace, AUTO)
1925

2026

@@ -33,4 +39,3 @@ PB_BIND(wippersnapper_display_v1_DisplayRemoved, wippersnapper_display_v1_Displa
3339

3440

3541

36-

‎src/wippersnapper/display/v1/display.pb.h‎

Lines changed: 73 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* Automatically generated nanopb header */
2-
/* Generated by nanopb-0.4.5-dev at Wed Aug 20 17:46:06 2025. */
2+
/* Generated by nanopb-0.4.5-dev at Mon Aug 25 14:48:29 2025. */
33

44
#ifndef PB_WIPPERSNAPPER_DISPLAY_V1_WIPPERSNAPPER_DISPLAY_V1_DISPLAY_PB_H_INCLUDED
55
#define PB_WIPPERSNAPPER_DISPLAY_V1_WIPPERSNAPPER_DISPLAY_V1_DISPLAY_PB_H_INCLUDED
@@ -24,17 +24,6 @@ typedef enum _wippersnapper_display_v1_EPDMode {
2424
wippersnapper_display_v1_EPDMode_EPD_MODE_MONO = 2
2525
} wippersnapper_display_v1_EPDMode;
2626

27-
typedef enum _wippersnapper_display_v1_EPDColors {
28-
wippersnapper_display_v1_EPDColors_EPD_COLORS_UNSPECIFIED = 0,
29-
wippersnapper_display_v1_EPDColors_EPD_COLORS_WHITE = 1,
30-
wippersnapper_display_v1_EPDColors_EPD_COLORS_BLACK = 2,
31-
wippersnapper_display_v1_EPDColors_EPD_COLORS_RED = 3,
32-
wippersnapper_display_v1_EPDColors_EPD_COLORS_GRAY = 4,
33-
wippersnapper_display_v1_EPDColors_EPD_COLORS_DARK = 5,
34-
wippersnapper_display_v1_EPDColors_EPD_COLORS_LIGHT = 6,
35-
wippersnapper_display_v1_EPDColors_EPD_COLORS_YELLOW = 7
36-
} wippersnapper_display_v1_EPDColors;
37-
3827
/* Struct definitions */
3928
typedef struct _wippersnapper_display_v1_DisplayAddedorReplaced {
4029
char name[64];
@@ -56,7 +45,6 @@ typedef struct _wippersnapper_display_v1_EPDConfig {
5645

5746
typedef struct _wippersnapper_display_v1_EPDWriteOptions {
5847
int32_t text_size;
59-
wippersnapper_display_v1_EPDColors color;
6048
} wippersnapper_display_v1_EPDWriteOptions;
6149

6250
typedef struct _wippersnapper_display_v1_EpdSpiConfig {
@@ -68,16 +56,34 @@ typedef struct _wippersnapper_display_v1_EpdSpiConfig {
6856
char pin_busy[6];
6957
} wippersnapper_display_v1_EpdSpiConfig;
7058

59+
typedef struct _wippersnapper_display_v1_TftConfig {
60+
int32_t width;
61+
int32_t height;
62+
int32_t rotation;
63+
} wippersnapper_display_v1_TftConfig;
64+
65+
typedef struct _wippersnapper_display_v1_TftSpiConfig {
66+
int32_t bus;
67+
char pin_cs[6];
68+
char pin_dc[6];
69+
char pin_mosi[6];
70+
char pin_sck[6];
71+
char pin_rst[6];
72+
char pin_miso[6];
73+
} wippersnapper_display_v1_TftSpiConfig;
74+
7175
typedef struct _wippersnapper_display_v1_DisplayAddOrReplace {
7276
wippersnapper_display_v1_DisplayType type;
7377
char name[64];
7478
pb_size_t which_interface_type;
7579
union {
7680
wippersnapper_display_v1_EpdSpiConfig spi_epd;
81+
wippersnapper_display_v1_TftSpiConfig spi_tft;
7782
} interface_type;
7883
pb_size_t which_config;
7984
union {
80-
wippersnapper_display_v1_EPDConfig epd_config;
85+
wippersnapper_display_v1_EPDConfig config_epd;
86+
wippersnapper_display_v1_TftConfig config_tft;
8187
} config;
8288
} wippersnapper_display_v1_DisplayAddOrReplace;
8389

@@ -100,10 +106,6 @@ typedef struct _wippersnapper_display_v1_DisplayWrite {
100106
#define _wippersnapper_display_v1_EPDMode_MAX wippersnapper_display_v1_EPDMode_EPD_MODE_MONO
101107
#define _wippersnapper_display_v1_EPDMode_ARRAYSIZE ((wippersnapper_display_v1_EPDMode)(wippersnapper_display_v1_EPDMode_EPD_MODE_MONO+1))
102108

103-
#define _wippersnapper_display_v1_EPDColors_MIN wippersnapper_display_v1_EPDColors_EPD_COLORS_UNSPECIFIED
104-
#define _wippersnapper_display_v1_EPDColors_MAX wippersnapper_display_v1_EPDColors_EPD_COLORS_YELLOW
105-
#define _wippersnapper_display_v1_EPDColors_ARRAYSIZE ((wippersnapper_display_v1_EPDColors)(wippersnapper_display_v1_EPDColors_EPD_COLORS_YELLOW+1))
106-
107109

108110
#ifdef __cplusplus
109111
extern "C" {
@@ -112,15 +114,19 @@ extern "C" {
112114
/* Initializer values for message structs */
113115
#define wippersnapper_display_v1_EpdSpiConfig_init_default {0, "", "", "", "", ""}
114116
#define wippersnapper_display_v1_EPDConfig_init_default {_wippersnapper_display_v1_EPDMode_MIN}
115-
#define wippersnapper_display_v1_EPDWriteOptions_init_default {0, _wippersnapper_display_v1_EPDColors_MIN}
117+
#define wippersnapper_display_v1_EPDWriteOptions_init_default {0}
118+
#define wippersnapper_display_v1_TftSpiConfig_init_default {0, "", "", "", "", "", ""}
119+
#define wippersnapper_display_v1_TftConfig_init_default {0, 0, 0}
116120
#define wippersnapper_display_v1_DisplayAddOrReplace_init_default {_wippersnapper_display_v1_DisplayType_MIN, "", 0, {wippersnapper_display_v1_EpdSpiConfig_init_default}, 0, {wippersnapper_display_v1_EPDConfig_init_default}}
117121
#define wippersnapper_display_v1_DisplayRemove_init_default {""}
118122
#define wippersnapper_display_v1_DisplayWrite_init_default {"", "", 0, {wippersnapper_display_v1_EPDWriteOptions_init_default}}
119123
#define wippersnapper_display_v1_DisplayAddedorReplaced_init_default {"", 0}
120124
#define wippersnapper_display_v1_DisplayRemoved_init_default {"", 0}
121125
#define wippersnapper_display_v1_EpdSpiConfig_init_zero {0, "", "", "", "", ""}
122126
#define wippersnapper_display_v1_EPDConfig_init_zero {_wippersnapper_display_v1_EPDMode_MIN}
123-
#define wippersnapper_display_v1_EPDWriteOptions_init_zero {0, _wippersnapper_display_v1_EPDColors_MIN}
127+
#define wippersnapper_display_v1_EPDWriteOptions_init_zero {0}
128+
#define wippersnapper_display_v1_TftSpiConfig_init_zero {0, "", "", "", "", "", ""}
129+
#define wippersnapper_display_v1_TftConfig_init_zero {0, 0, 0}
124130
#define wippersnapper_display_v1_DisplayAddOrReplace_init_zero {_wippersnapper_display_v1_DisplayType_MIN, "", 0, {wippersnapper_display_v1_EpdSpiConfig_init_zero}, 0, {wippersnapper_display_v1_EPDConfig_init_zero}}
125131
#define wippersnapper_display_v1_DisplayRemove_init_zero {""}
126132
#define wippersnapper_display_v1_DisplayWrite_init_zero {"", "", 0, {wippersnapper_display_v1_EPDWriteOptions_init_zero}}
@@ -135,17 +141,28 @@ extern "C" {
135141
#define wippersnapper_display_v1_DisplayRemoved_did_remove_tag 2
136142
#define wippersnapper_display_v1_EPDConfig_mode_tag 1
137143
#define wippersnapper_display_v1_EPDWriteOptions_text_size_tag 1
138-
#define wippersnapper_display_v1_EPDWriteOptions_color_tag 2
139144
#define wippersnapper_display_v1_EpdSpiConfig_bus_tag 1
140145
#define wippersnapper_display_v1_EpdSpiConfig_pin_dc_tag 2
141146
#define wippersnapper_display_v1_EpdSpiConfig_pin_rst_tag 3
142147
#define wippersnapper_display_v1_EpdSpiConfig_pin_cs_tag 4
143148
#define wippersnapper_display_v1_EpdSpiConfig_pin_sram_cs_tag 5
144149
#define wippersnapper_display_v1_EpdSpiConfig_pin_busy_tag 6
150+
#define wippersnapper_display_v1_TftConfig_width_tag 1
151+
#define wippersnapper_display_v1_TftConfig_height_tag 2
152+
#define wippersnapper_display_v1_TftConfig_rotation_tag 3
153+
#define wippersnapper_display_v1_TftSpiConfig_bus_tag 1
154+
#define wippersnapper_display_v1_TftSpiConfig_pin_cs_tag 2
155+
#define wippersnapper_display_v1_TftSpiConfig_pin_dc_tag 3
156+
#define wippersnapper_display_v1_TftSpiConfig_pin_mosi_tag 4
157+
#define wippersnapper_display_v1_TftSpiConfig_pin_sck_tag 5
158+
#define wippersnapper_display_v1_TftSpiConfig_pin_rst_tag 6
159+
#define wippersnapper_display_v1_TftSpiConfig_pin_miso_tag 7
145160
#define wippersnapper_display_v1_DisplayAddOrReplace_type_tag 1
146161
#define wippersnapper_display_v1_DisplayAddOrReplace_name_tag 2
147162
#define wippersnapper_display_v1_DisplayAddOrReplace_spi_epd_tag 3
148-
#define wippersnapper_display_v1_DisplayAddOrReplace_epd_config_tag 4
163+
#define wippersnapper_display_v1_DisplayAddOrReplace_spi_tft_tag 4
164+
#define wippersnapper_display_v1_DisplayAddOrReplace_config_epd_tag 5
165+
#define wippersnapper_display_v1_DisplayAddOrReplace_config_tft_tag 6
149166
#define wippersnapper_display_v1_DisplayWrite_name_tag 1
150167
#define wippersnapper_display_v1_DisplayWrite_message_tag 2
151168
#define wippersnapper_display_v1_DisplayWrite_epd_options_tag 3
@@ -167,20 +184,41 @@ X(a, STATIC, SINGULAR, UENUM, mode, 1)
167184
#define wippersnapper_display_v1_EPDConfig_DEFAULT NULL
168185

169186
#define wippersnapper_display_v1_EPDWriteOptions_FIELDLIST(X, a) \
170-
X(a, STATIC, SINGULAR, INT32, text_size, 1) \
171-
X(a, STATIC, SINGULAR, UENUM, color, 2)
187+
X(a, STATIC, SINGULAR, INT32, text_size, 1)
172188
#define wippersnapper_display_v1_EPDWriteOptions_CALLBACK NULL
173189
#define wippersnapper_display_v1_EPDWriteOptions_DEFAULT NULL
174190

191+
#define wippersnapper_display_v1_TftSpiConfig_FIELDLIST(X, a) \
192+
X(a, STATIC, SINGULAR, INT32, bus, 1) \
193+
X(a, STATIC, SINGULAR, STRING, pin_cs, 2) \
194+
X(a, STATIC, SINGULAR, STRING, pin_dc, 3) \
195+
X(a, STATIC, SINGULAR, STRING, pin_mosi, 4) \
196+
X(a, STATIC, SINGULAR, STRING, pin_sck, 5) \
197+
X(a, STATIC, SINGULAR, STRING, pin_rst, 6) \
198+
X(a, STATIC, SINGULAR, STRING, pin_miso, 7)
199+
#define wippersnapper_display_v1_TftSpiConfig_CALLBACK NULL
200+
#define wippersnapper_display_v1_TftSpiConfig_DEFAULT NULL
201+
202+
#define wippersnapper_display_v1_TftConfig_FIELDLIST(X, a) \
203+
X(a, STATIC, SINGULAR, INT32, width, 1) \
204+
X(a, STATIC, SINGULAR, INT32, height, 2) \
205+
X(a, STATIC, SINGULAR, INT32, rotation, 3)
206+
#define wippersnapper_display_v1_TftConfig_CALLBACK NULL
207+
#define wippersnapper_display_v1_TftConfig_DEFAULT NULL
208+
175209
#define wippersnapper_display_v1_DisplayAddOrReplace_FIELDLIST(X, a) \
176210
X(a, STATIC, SINGULAR, UENUM, type, 1) \
177211
X(a, STATIC, SINGULAR, STRING, name, 2) \
178212
X(a, STATIC, ONEOF, MESSAGE, (interface_type,spi_epd,interface_type.spi_epd), 3) \
179-
X(a, STATIC, ONEOF, MESSAGE, (config,epd_config,config.epd_config), 4)
213+
X(a, STATIC, ONEOF, MESSAGE, (interface_type,spi_tft,interface_type.spi_tft), 4) \
214+
X(a, STATIC, ONEOF, MESSAGE, (config,config_epd,config.config_epd), 5) \
215+
X(a, STATIC, ONEOF, MESSAGE, (config,config_tft,config.config_tft), 6)
180216
#define wippersnapper_display_v1_DisplayAddOrReplace_CALLBACK NULL
181217
#define wippersnapper_display_v1_DisplayAddOrReplace_DEFAULT NULL
182218
#define wippersnapper_display_v1_DisplayAddOrReplace_interface_type_spi_epd_MSGTYPE wippersnapper_display_v1_EpdSpiConfig
183-
#define wippersnapper_display_v1_DisplayAddOrReplace_config_epd_config_MSGTYPE wippersnapper_display_v1_EPDConfig
219+
#define wippersnapper_display_v1_DisplayAddOrReplace_interface_type_spi_tft_MSGTYPE wippersnapper_display_v1_TftSpiConfig
220+
#define wippersnapper_display_v1_DisplayAddOrReplace_config_config_epd_MSGTYPE wippersnapper_display_v1_EPDConfig
221+
#define wippersnapper_display_v1_DisplayAddOrReplace_config_config_tft_MSGTYPE wippersnapper_display_v1_TftConfig
184222

185223
#define wippersnapper_display_v1_DisplayRemove_FIELDLIST(X, a) \
186224
X(a, STATIC, SINGULAR, STRING, name, 1)
@@ -210,6 +248,8 @@ X(a, STATIC, SINGULAR, BOOL, did_remove, 2)
210248
extern const pb_msgdesc_t wippersnapper_display_v1_EpdSpiConfig_msg;
211249
extern const pb_msgdesc_t wippersnapper_display_v1_EPDConfig_msg;
212250
extern const pb_msgdesc_t wippersnapper_display_v1_EPDWriteOptions_msg;
251+
extern const pb_msgdesc_t wippersnapper_display_v1_TftSpiConfig_msg;
252+
extern const pb_msgdesc_t wippersnapper_display_v1_TftConfig_msg;
213253
extern const pb_msgdesc_t wippersnapper_display_v1_DisplayAddOrReplace_msg;
214254
extern const pb_msgdesc_t wippersnapper_display_v1_DisplayRemove_msg;
215255
extern const pb_msgdesc_t wippersnapper_display_v1_DisplayWrite_msg;
@@ -220,6 +260,8 @@ extern const pb_msgdesc_t wippersnapper_display_v1_DisplayRemoved_msg;
220260
#define wippersnapper_display_v1_EpdSpiConfig_fields &wippersnapper_display_v1_EpdSpiConfig_msg
221261
#define wippersnapper_display_v1_EPDConfig_fields &wippersnapper_display_v1_EPDConfig_msg
222262
#define wippersnapper_display_v1_EPDWriteOptions_fields &wippersnapper_display_v1_EPDWriteOptions_msg
263+
#define wippersnapper_display_v1_TftSpiConfig_fields &wippersnapper_display_v1_TftSpiConfig_msg
264+
#define wippersnapper_display_v1_TftConfig_fields &wippersnapper_display_v1_TftConfig_msg
223265
#define wippersnapper_display_v1_DisplayAddOrReplace_fields &wippersnapper_display_v1_DisplayAddOrReplace_msg
224266
#define wippersnapper_display_v1_DisplayRemove_fields &wippersnapper_display_v1_DisplayRemove_msg
225267
#define wippersnapper_display_v1_DisplayWrite_fields &wippersnapper_display_v1_DisplayWrite_msg
@@ -229,10 +271,12 @@ extern const pb_msgdesc_t wippersnapper_display_v1_DisplayRemoved_msg;
229271
/* Maximum encoded size of messages (where known) */
230272
#define wippersnapper_display_v1_EpdSpiConfig_size 46
231273
#define wippersnapper_display_v1_EPDConfig_size 2
232-
#define wippersnapper_display_v1_EPDWriteOptions_size 13
233-
#define wippersnapper_display_v1_DisplayAddOrReplace_size 119
274+
#define wippersnapper_display_v1_EPDWriteOptions_size 11
275+
#define wippersnapper_display_v1_TftSpiConfig_size 53
276+
#define wippersnapper_display_v1_TftConfig_size 33
277+
#define wippersnapper_display_v1_DisplayAddOrReplace_size 157
234278
#define wippersnapper_display_v1_DisplayRemove_size 65
235-
#define wippersnapper_display_v1_DisplayWrite_size 1106
279+
#define wippersnapper_display_v1_DisplayWrite_size 1104
236280
#define wippersnapper_display_v1_DisplayAddedorReplaced_size 67
237281
#define wippersnapper_display_v1_DisplayRemoved_size 67
238282

‎src/wippersnapper/ds18x20/v1/ds18x20.pb.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* Automatically generated nanopb constant definitions */
2-
/* Generated by nanopb-0.4.5-dev at Wed Aug 20 17:46:06 2025. */
2+
/* Generated by nanopb-0.4.5-dev at Mon Aug 25 14:48:29 2025. */
33

44
#include "wippersnapper/ds18x20/v1/ds18x20.pb.h"
55
#if PB_PROTO_HEADER_VERSION != 40

‎src/wippersnapper/ds18x20/v1/ds18x20.pb.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* Automatically generated nanopb header */
2-
/* Generated by nanopb-0.4.5-dev at Wed Aug 20 17:46:06 2025. */
2+
/* Generated by nanopb-0.4.5-dev at Mon Aug 25 14:48:29 2025. */
33

44
#ifndef PB_WIPPERSNAPPER_DS18X20_V1_WIPPERSNAPPER_DS18X20_V1_DS18X20_PB_H_INCLUDED
55
#define PB_WIPPERSNAPPER_DS18X20_V1_WIPPERSNAPPER_DS18X20_V1_DS18X20_PB_H_INCLUDED

‎src/wippersnapper/i2c/v1/i2c.pb.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* Automatically generated nanopb constant definitions */
2-
/* Generated by nanopb-0.4.5-dev at Wed Aug 20 17:46:06 2025. */
2+
/* Generated by nanopb-0.4.5-dev at Mon Aug 25 14:48:29 2025. */
33

44
#include "wippersnapper/i2c/v1/i2c.pb.h"
55
#if PB_PROTO_HEADER_VERSION != 40

‎src/wippersnapper/i2c/v1/i2c.pb.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* Automatically generated nanopb header */
2-
/* Generated by nanopb-0.4.5-dev at Wed Aug 20 17:46:06 2025. */
2+
/* Generated by nanopb-0.4.5-dev at Mon Aug 25 14:48:29 2025. */
33

44
#ifndef PB_WIPPERSNAPPER_I2C_V1_WIPPERSNAPPER_I2C_V1_I2C_PB_H_INCLUDED
55
#define PB_WIPPERSNAPPER_I2C_V1_WIPPERSNAPPER_I2C_V1_I2C_PB_H_INCLUDED

‎src/wippersnapper/pin/v1/pin.pb.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* Automatically generated nanopb constant definitions */
2-
/* Generated by nanopb-0.4.5-dev at Wed Aug 20 17:46:06 2025. */
2+
/* Generated by nanopb-0.4.5-dev at Mon Aug 25 14:48:29 2025. */
33

44
#include "wippersnapper/pin/v1/pin.pb.h"
55
#if PB_PROTO_HEADER_VERSION != 40

0 commit comments

Comments
 (0)