Skip to content

Commit 6d5f951

Browse files
brentrubrentru
committed
Update to match fbc883c..b7e6d06
1 parent bf68aed commit 6d5f951

23 files changed

Lines changed: 42 additions & 24 deletions

File tree

‎src/components/display/controller.cpp‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,8 @@ bool DisplayController::Handle_Display_AddOrReplace(
5252
wippersnapper_display_v1_DisplayAddOrReplace_config_epd_tag) {
5353
did_begin = display->beginEPD(&msgAdd->config.config_epd,
5454
&msgAdd->interface_type.spi_epd);
55+
} else if (msgAdd->which_config == wippersnapper_display_v1_DisplayAddOrReplace_config_tft_tag) {
56+
did_begin = display->beginTft(&msgAdd->config.config_tft, &msgAdd->interface_type.spi_tft);
5557
} else {
5658
WS_DEBUG_PRINTLN("[display] Unsupported display configuration type!");
5759
return false;

‎src/components/display/hardware.cpp‎

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,20 @@ bool DisplayHardware::beginEPD(
199199
return false;
200200
}
201201

202-
return true; // Configuration successful
202+
return true;
203+
}
204+
205+
/*!
206+
@brief Attempts to configure and initialize a TFT display
207+
@param config
208+
Pointer to the TFT configuration structure.
209+
@param spi_config
210+
Pointer to the SPI configuration structure for TFT.
211+
@return True if configuration was successful, False otherwise.
212+
*/
213+
bool beginTft(wippersnapper_display_v1_TftConfig *config, wippersnapper_display_v1_TftSpiConfig *spi_config) {
214+
// TODO
215+
return false;
203216
}
204217

205218
/*!

‎src/components/display/hardware.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,8 @@ class DisplayHardware {
4040
wippersnapper_display_v1_DisplayType getType();
4141
bool beginEPD(wippersnapper_display_v1_EPDConfig *config,
4242
wippersnapper_display_v1_EpdSpiConfig *spi_config);
43+
bool beginTft(wippersnapper_display_v1_TftConfig *config,
44+
wippersnapper_display_v1_TftSpiConfig *spi_config);
4345

4446
//
4547
// API for Adafruit_GFX that abstracts hardware functionality

‎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 Mon Aug 25 14:48:29 2025. */
2+
/* Generated by nanopb-0.4.5-dev at Mon Aug 25 15:39:12 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 Mon Aug 25 14:48:29 2025. */
2+
/* Generated by nanopb-0.4.5-dev at Mon Aug 25 15:39:12 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 & 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 Mon Aug 25 14:48:29 2025. */
2+
/* Generated by nanopb-0.4.5-dev at Mon Aug 25 15:39:12 2025. */
33

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

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

Lines changed: 5 additions & 4 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 Mon Aug 25 14:48:29 2025. */
2+
/* Generated by nanopb-0.4.5-dev at Mon Aug 25 15:39:12 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
@@ -15,7 +15,8 @@
1515
typedef enum _wippersnapper_display_v1_DisplayType {
1616
wippersnapper_display_v1_DisplayType_DISPLAY_TYPE_UNSPECIFIED = 0,
1717
wippersnapper_display_v1_DisplayType_DISPLAY_TYPE_OLED = 1,
18-
wippersnapper_display_v1_DisplayType_DISPLAY_TYPE_EPD = 2
18+
wippersnapper_display_v1_DisplayType_DISPLAY_TYPE_EPD = 2,
19+
wippersnapper_display_v1_DisplayType_DISPLAY_TYPE_TFT = 3
1920
} wippersnapper_display_v1_DisplayType;
2021

2122
typedef enum _wippersnapper_display_v1_EPDMode {
@@ -99,8 +100,8 @@ typedef struct _wippersnapper_display_v1_DisplayWrite {
99100

100101
/* Helper constants for enums */
101102
#define _wippersnapper_display_v1_DisplayType_MIN wippersnapper_display_v1_DisplayType_DISPLAY_TYPE_UNSPECIFIED
102-
#define _wippersnapper_display_v1_DisplayType_MAX wippersnapper_display_v1_DisplayType_DISPLAY_TYPE_EPD
103-
#define _wippersnapper_display_v1_DisplayType_ARRAYSIZE ((wippersnapper_display_v1_DisplayType)(wippersnapper_display_v1_DisplayType_DISPLAY_TYPE_EPD+1))
103+
#define _wippersnapper_display_v1_DisplayType_MAX wippersnapper_display_v1_DisplayType_DISPLAY_TYPE_TFT
104+
#define _wippersnapper_display_v1_DisplayType_ARRAYSIZE ((wippersnapper_display_v1_DisplayType)(wippersnapper_display_v1_DisplayType_DISPLAY_TYPE_TFT+1))
104105

105106
#define _wippersnapper_display_v1_EPDMode_MIN wippersnapper_display_v1_EPDMode_EPD_MODE_UNSPECIFIED
106107
#define _wippersnapper_display_v1_EPDMode_MAX wippersnapper_display_v1_EPDMode_EPD_MODE_MONO

‎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 Mon Aug 25 14:48:29 2025. */
2+
/* Generated by nanopb-0.4.5-dev at Mon Aug 25 15:39:12 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 Mon Aug 25 14:48:29 2025. */
2+
/* Generated by nanopb-0.4.5-dev at Mon Aug 25 15:39:12 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 Mon Aug 25 14:48:29 2025. */
2+
/* Generated by nanopb-0.4.5-dev at Mon Aug 25 15:39:12 2025. */
33

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

0 commit comments

Comments
 (0)