Skip to content

Commit ca75bf0

Browse files
brentrubrentru
committed
Match 711bf14..000802e
1 parent 2743edc commit ca75bf0

File tree

23 files changed

+39
-93
lines changed

23 files changed

+39
-93
lines changed

‎src/Wippersnapper_demo.ino.cpp‎

Lines changed: 0 additions & 26 deletions
This file was deleted.

‎src/components/display/hardware.cpp‎

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -176,24 +176,6 @@ bool DisplayHardware::beginEPD(
176176
return true; // Configuration successful
177177
}
178178

179-
/*!
180-
@brief Initializes the display hardware.
181-
@param reset
182-
Whether to reset the display hardware.
183-
@return True if initialization was successful, false otherwise.
184-
*/
185-
bool DisplayHardware::begin(bool reset) {
186-
return true; // Placeholder for actual initialization logic
187-
}
188-
189-
/*!
190-
@brief Sets the text size for the display.
191-
@param sz
192-
The size of the text to set.
193-
*/
194-
void DisplayHardware::setTextSize(uint8_t sz) {
195-
// Placeholder for setting text size on the display TODO
196-
}
197179

198180
/*!
199181
@brief Gets the name of the display hardware instance.

‎src/components/display/hardware.h‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,21 +32,25 @@ class DisplayHardware {
3232
public:
3333
DisplayHardware(const char *name);
3434
~DisplayHardware();
35-
// High-level API functions
35+
36+
//
37+
// API for configuring the display hardware //
38+
//
3639
const char *getName();
3740
void setType(wippersnapper_display_v1_DisplayType type);
3841
wippersnapper_display_v1_DisplayType getType();
3942
bool beginEPD(wippersnapper_display_v1_EPDConfig *config,
4043
wippersnapper_display_v1_EpdSpiConfig *spi_config);
41-
bool begin(bool reset = true);
42-
// API functions to abstract Adafruit_GFX
43-
void setTextSize(uint8_t sz);
44+
45+
//
46+
// API for Adafruit_GFX that abstracts hardware functionality
47+
// NOTE: These methods are meant to be implemented within dispDrvBase and exposed within dispDrv driver instances
48+
//
49+
// TODO
4450

4551
private:
4652
const char *_name; ///< Identifies the hardware instance
4753
wippersnapper_display_v1_DisplayType _type; ///< Display type
48-
wippersnapper_display_v1_EPDThinkInkPanel
49-
_thinkink_driver; ///< ThinkInk driver type
5054
dispDrvBase *_disp_drv_base = nullptr; ///< Base display driver
5155
};
5256
#endif // WS_DISPLAY_HARDWARE_H

‎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 Fri Aug 15 17:34:50 2025. */
2+
/* Generated by nanopb-0.4.5-dev at Mon Aug 18 18:41:06 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 Fri Aug 15 17:34:50 2025. */
2+
/* Generated by nanopb-0.4.5-dev at Mon Aug 18 18:41:06 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: 1 addition & 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 Fri Aug 15 17:34:50 2025. */
2+
/* Generated by nanopb-0.4.5-dev at Mon Aug 18 18:41:06 2025. */
33

44
#include "wippersnapper/display/v1/display.pb.h"
55
#if PB_PROTO_HEADER_VERSION != 40
@@ -34,4 +34,3 @@ PB_BIND(wippersnapper_display_v1_DisplayRemoved, wippersnapper_display_v1_Displa
3434

3535

3636

37-

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

Lines changed: 9 additions & 22 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 Fri Aug 15 17:34:50 2025. */
2+
/* Generated by nanopb-0.4.5-dev at Mon Aug 18 18:41:06 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
@@ -35,12 +35,6 @@ typedef enum _wippersnapper_display_v1_EPDColors {
3535
wippersnapper_display_v1_EPDColors_EPD_COLORS_YELLOW = 7
3636
} wippersnapper_display_v1_EPDColors;
3737

38-
typedef enum _wippersnapper_display_v1_EPDThinkInkPanel {
39-
wippersnapper_display_v1_EPDThinkInkPanel_EPD_THINK_INK_PANEL_UNSPECIFIED = 0,
40-
wippersnapper_display_v1_EPDThinkInkPanel_EPD_THINK_INK_PANEL_290_GRAYSCALE4_MFGN = 1,
41-
wippersnapper_display_v1_EPDThinkInkPanel_EPD_THINK_INK_PANEL_290_GRAYSCALE4_T5 = 2
42-
} wippersnapper_display_v1_EPDThinkInkPanel;
43-
4438
/* Struct definitions */
4539
typedef struct _wippersnapper_display_v1_DisplayAddedorReplaced {
4640
bool did_add;
@@ -56,7 +50,6 @@ typedef struct _wippersnapper_display_v1_DisplayRemoved {
5650

5751
typedef struct _wippersnapper_display_v1_EPDConfig {
5852
wippersnapper_display_v1_EPDMode mode;
59-
wippersnapper_display_v1_EPDThinkInkPanel panel;
6053
int32_t width;
6154
int32_t height;
6255
} wippersnapper_display_v1_EPDConfig;
@@ -111,26 +104,22 @@ typedef struct _wippersnapper_display_v1_DisplayWrite {
111104
#define _wippersnapper_display_v1_EPDColors_MAX wippersnapper_display_v1_EPDColors_EPD_COLORS_YELLOW
112105
#define _wippersnapper_display_v1_EPDColors_ARRAYSIZE ((wippersnapper_display_v1_EPDColors)(wippersnapper_display_v1_EPDColors_EPD_COLORS_YELLOW+1))
113106

114-
#define _wippersnapper_display_v1_EPDThinkInkPanel_MIN wippersnapper_display_v1_EPDThinkInkPanel_EPD_THINK_INK_PANEL_UNSPECIFIED
115-
#define _wippersnapper_display_v1_EPDThinkInkPanel_MAX wippersnapper_display_v1_EPDThinkInkPanel_EPD_THINK_INK_PANEL_290_GRAYSCALE4_T5
116-
#define _wippersnapper_display_v1_EPDThinkInkPanel_ARRAYSIZE ((wippersnapper_display_v1_EPDThinkInkPanel)(wippersnapper_display_v1_EPDThinkInkPanel_EPD_THINK_INK_PANEL_290_GRAYSCALE4_T5+1))
117-
118107

119108
#ifdef __cplusplus
120109
extern "C" {
121110
#endif
122111

123112
/* Initializer values for message structs */
124113
#define wippersnapper_display_v1_EpdSpiConfig_init_default {0, "", "", "", "", ""}
125-
#define wippersnapper_display_v1_EPDConfig_init_default {_wippersnapper_display_v1_EPDMode_MIN, _wippersnapper_display_v1_EPDThinkInkPanel_MIN, 0, 0}
114+
#define wippersnapper_display_v1_EPDConfig_init_default {_wippersnapper_display_v1_EPDMode_MIN, 0, 0}
126115
#define wippersnapper_display_v1_EPDWriteOptions_init_default {0, _wippersnapper_display_v1_EPDColors_MIN}
127116
#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}}
128117
#define wippersnapper_display_v1_DisplayRemove_init_default {""}
129118
#define wippersnapper_display_v1_DisplayWrite_init_default {"", "", 0, {wippersnapper_display_v1_EPDWriteOptions_init_default}}
130119
#define wippersnapper_display_v1_DisplayAddedorReplaced_init_default {0}
131120
#define wippersnapper_display_v1_DisplayRemoved_init_default {0}
132121
#define wippersnapper_display_v1_EpdSpiConfig_init_zero {0, "", "", "", "", ""}
133-
#define wippersnapper_display_v1_EPDConfig_init_zero {_wippersnapper_display_v1_EPDMode_MIN, _wippersnapper_display_v1_EPDThinkInkPanel_MIN, 0, 0}
122+
#define wippersnapper_display_v1_EPDConfig_init_zero {_wippersnapper_display_v1_EPDMode_MIN, 0, 0}
134123
#define wippersnapper_display_v1_EPDWriteOptions_init_zero {0, _wippersnapper_display_v1_EPDColors_MIN}
135124
#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}}
136125
#define wippersnapper_display_v1_DisplayRemove_init_zero {""}
@@ -143,9 +132,8 @@ extern "C" {
143132
#define wippersnapper_display_v1_DisplayRemove_name_tag 1
144133
#define wippersnapper_display_v1_DisplayRemoved_did_remove_tag 1
145134
#define wippersnapper_display_v1_EPDConfig_mode_tag 1
146-
#define wippersnapper_display_v1_EPDConfig_panel_tag 2
147-
#define wippersnapper_display_v1_EPDConfig_width_tag 3
148-
#define wippersnapper_display_v1_EPDConfig_height_tag 4
135+
#define wippersnapper_display_v1_EPDConfig_width_tag 2
136+
#define wippersnapper_display_v1_EPDConfig_height_tag 3
149137
#define wippersnapper_display_v1_EPDWriteOptions_text_size_tag 1
150138
#define wippersnapper_display_v1_EPDWriteOptions_color_tag 2
151139
#define wippersnapper_display_v1_EpdSpiConfig_bus_tag 1
@@ -175,9 +163,8 @@ X(a, STATIC, SINGULAR, STRING, pin_busy, 6)
175163

176164
#define wippersnapper_display_v1_EPDConfig_FIELDLIST(X, a) \
177165
X(a, STATIC, SINGULAR, UENUM, mode, 1) \
178-
X(a, STATIC, SINGULAR, UENUM, panel, 2) \
179-
X(a, STATIC, SINGULAR, INT32, width, 3) \
180-
X(a, STATIC, SINGULAR, INT32, height, 4)
166+
X(a, STATIC, SINGULAR, INT32, width, 2) \
167+
X(a, STATIC, SINGULAR, INT32, height, 3)
181168
#define wippersnapper_display_v1_EPDConfig_CALLBACK NULL
182169
#define wippersnapper_display_v1_EPDConfig_DEFAULT NULL
183170

@@ -241,9 +228,9 @@ extern const pb_msgdesc_t wippersnapper_display_v1_DisplayRemoved_msg;
241228

242229
/* Maximum encoded size of messages (where known) */
243230
#define wippersnapper_display_v1_EpdSpiConfig_size 46
244-
#define wippersnapper_display_v1_EPDConfig_size 26
231+
#define wippersnapper_display_v1_EPDConfig_size 24
245232
#define wippersnapper_display_v1_EPDWriteOptions_size 13
246-
#define wippersnapper_display_v1_DisplayAddOrReplace_size 143
233+
#define wippersnapper_display_v1_DisplayAddOrReplace_size 141
247234
#define wippersnapper_display_v1_DisplayRemove_size 7
248235
#define wippersnapper_display_v1_DisplayWrite_size 29
249236
#define wippersnapper_display_v1_DisplayAddedorReplaced_size 2

‎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 Fri Aug 15 17:34:50 2025. */
2+
/* Generated by nanopb-0.4.5-dev at Mon Aug 18 18:41:06 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 Fri Aug 15 17:34:50 2025. */
2+
/* Generated by nanopb-0.4.5-dev at Mon Aug 18 18:41:06 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 Fri Aug 15 17:34:50 2025. */
2+
/* Generated by nanopb-0.4.5-dev at Mon Aug 18 18:41:06 2025. */
33

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

0 commit comments

Comments
 (0)