Skip to content

Commit 0242373

Browse files
committed
Speed up writeMessage
1 parent cfb893d commit 0242373

File tree

4 files changed

+9
-30
lines changed

4 files changed

+9
-30
lines changed

src/Wippersnapper.cpp

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -2942,26 +2942,6 @@ void Wippersnapper::connect() {
29422942
haltError("Unable to allocate space for MQTT error topics");
29432943
}
29442944

2945-
// TODO: We are debugging the "Failed to subscribe" issue here prior to
2946-
// runNetFSM Print out all topics generated by generateWSTopics()
2947-
WS_DEBUG_PRINTLN("MQTT Topics:");
2948-
WS_DEBUG_PRINT(" Device UID: ");
2949-
WS_DEBUG_PRINTLN(_device_uid);
2950-
// Broker topics only
2951-
WS_DEBUG_PRINT(" Broker-to-Device DS18x20 Topic: ");
2952-
WS_DEBUG_PRINTLN(WS._topic_signal_ds18_device);
2953-
WS_DEBUG_PRINT(" Broker-to-Device Servo Topic: ");
2954-
WS_DEBUG_PRINTLN(WS._topic_signal_servo_device);
2955-
WS_DEBUG_PRINT(" Broker-to-Device PWM Topic: ");
2956-
WS_DEBUG_PRINTLN(WS._topic_signal_pwm_device);
2957-
WS_DEBUG_PRINT(" Broker-to-Device Pixels Topic: ");
2958-
WS_DEBUG_PRINTLN(WS._topic_signal_pixels_device);
2959-
WS_DEBUG_PRINT(" Broker-to-Device UART Topic: ");
2960-
WS_DEBUG_PRINTLN(WS._topic_signal_uart_device);
2961-
WS_DEBUG_PRINT(" Broker-to-Device Display Topic: ");
2962-
WS_DEBUG_PRINTLN(WS._topic_signal_display_device);
2963-
delay(500);
2964-
29652945
// Connect to Network
29662946
WS_DEBUG_PRINTLN("Running Network FSM...");
29672947
// Run the network fsm

src/Wippersnapper_demo.ino.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# 1 "/var/folders/ff/dmzflvf52tq9kzvt6g8jglxw0000gn/T/tmpbebqve76"
1+
# 1 "/var/folders/ff/dmzflvf52tq9kzvt6g8jglxw0000gn/T/tmpnv6_o84f"
22
#include <Arduino.h>
33
# 1 "/Users/brentrubell/Documents/Arduino/libraries/Adafruit_Wippersnapper_Arduino/src/Wippersnapper_demo.ino"
44
# 16 "/Users/brentrubell/Documents/Arduino/libraries/Adafruit_Wippersnapper_Arduino/src/Wippersnapper_demo.ino"

src/components/display/controller.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -99,9 +99,6 @@ bool DisplayController::Handle_Display_Write(
9999
// Get the driver instance for the display
100100
DisplayHardware *display = nullptr;
101101
for (auto &hw_instance : _hw_instances) {
102-
// print hte _hw_instances name
103-
WS_DEBUG_PRINT("[display] Checking hardware instance: ");
104-
WS_DEBUG_PRINTLN(hw_instance->getName());
105102
if (strcmp(hw_instance->getName(), msgWrite->name) == 0) {
106103
display = hw_instance;
107104
break;
@@ -115,6 +112,8 @@ bool DisplayController::Handle_Display_Write(
115112
}
116113

117114
// Write the message to the display
115+
WS_DEBUG_PRINT("[display] Writing message to display: ");
116+
WS_DEBUG_PRINTLN(msgWrite->message);
118117
display->writeMessage(msgWrite->message);
119118
return true;
120119
}

src/components/display/drivers/dispDrvThinkInkGrayscale4Eaamfgn.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,14 @@ class drvDispThinkInkGrayscale4Eaamfgn : public dispDrvBase {
3939

4040
// Initialize the display
4141
_display->begin(mode);
42+
// Configure display settings
43+
_text_sz = 3;
44+
_display->setTextSize(_text_sz);
45+
_display->setTextColor(EPD_BLACK);
46+
_display->setTextWrap(false);
4247
// Clear the display buffer
4348
_display->clearBuffer();
4449
_display->display();
45-
_text_sz = 3; // Configure default magTag text size
4650

4751
return true;
4852
}
@@ -52,12 +56,8 @@ class drvDispThinkInkGrayscale4Eaamfgn : public dispDrvBase {
5256
return;
5357

5458
// Start with a fresh display buffer
55-
// and settings
59+
_display->clearBuffer();
5660
int16_t y_idx = 0;
57-
_display->clearDisplay();
58-
_display->setTextSize(_text_sz);
59-
_display->setTextColor(EPD_BLACK);
60-
_display->setTextWrap(true);
6161
_display->setCursor(0, y_idx);
6262

6363
// Calculate the line height based on the text size (NOTE: base height is

0 commit comments

Comments
 (0)