pohui_pohui/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-06-08 22:22:05 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Cleanup and labeling borth variants to tft

Browse Source
This commit is contained in:
HarukiToreda 2025-04-06 14:28:45 -04:00
parent 33cfe14d4a
commit 74325ba439
3 changed files with 5 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/graphics/Screen.cpp
View File

@ -1132,7 +1132,7 @@ void drawCommonHeader(OLEDDisplay *display, int16_t x, int16_t y)
display->setColor(WHITE); display->setColor(WHITE);
} }
// **************************** // ****************************
// * Tex Message Screen * // * Text Message Screen *
// **************************** // ****************************
void drawTextMessageFrame(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, int16_t y) void drawTextMessageFrame(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, int16_t y)
{ {
@ -1581,11 +1581,6 @@ static int8_t prevFrame = -1;
// Draw the arrow pointing to a node's location // Draw the arrow pointing to a node's location
void Screen::drawNodeHeading(OLEDDisplay *display, int16_t compassX, int16_t compassY, uint16_t compassDiam, float headingRadian) void Screen::drawNodeHeading(OLEDDisplay *display, int16_t compassX, int16_t compassY, uint16_t compassDiam, float headingRadian)
{ {
Serial.print("🔄 [Node Heading] Raw Bearing (rad): ");
Serial.print(headingRadian);
Serial.print(" | (deg): ");
Serial.println(headingRadian * RAD_TO_DEG);
Point tip(0.0f, 0.5f), tail(0.0f, -0.35f); // pointing up initially Point tip(0.0f, 0.5f), tail(0.0f, -0.35f); // pointing up initially
float arrowOffsetX = 0.14f, arrowOffsetY = 1.0f; float arrowOffsetX = 0.14f, arrowOffsetY = 1.0f;
Point leftArrow(tip.x - arrowOffsetX, tip.y - arrowOffsetY), rightArrow(tip.x + arrowOffsetX, tip.y - arrowOffsetY); Point leftArrow(tip.x - arrowOffsetX, tip.y - arrowOffsetY), rightArrow(tip.x + arrowOffsetX, tip.y - arrowOffsetY);
@ -1604,14 +1599,6 @@ void Screen::drawNodeHeading(OLEDDisplay *display, int16_t compassX, int16_t com
display->drawLine(leftArrow.x, leftArrow.y, tail.x, tail.y); display->drawLine(leftArrow.x, leftArrow.y, tail.x, tail.y);
display->drawLine(rightArrow.x, rightArrow.y, tail.x, tail.y); display->drawLine(rightArrow.x, rightArrow.y, tail.x, tail.y);
*/ */
Serial.print("🔥 Arrow Tail X: ");
Serial.print(tail.x);
Serial.print(" | Y: ");
Serial.print(tail.y);
Serial.print(" | Tip X: ");
Serial.print(tip.x);
Serial.print(" | Tip Y: ");
Serial.println(tip.y);
#ifdef USE_EINK #ifdef USE_EINK
display->drawTriangle(tip.x, tip.y, rightArrow.x, rightArrow.y, tail.x, tail.y); display->drawTriangle(tip.x, tip.y, rightArrow.x, rightArrow.y, tail.x, tail.y);
#else #else
@ -1672,11 +1659,6 @@ void Screen::drawCompassNorth(OLEDDisplay *display, int16_t compassX, int16_t co
rosePoints[i]->scale(compassDiam); rosePoints[i]->scale(compassDiam);
rosePoints[i]->translate(compassX, compassY); rosePoints[i]->translate(compassX, compassY);
} }
display->drawCircle(NC1.x, NC1.y, 4); // North sign circle, 4px radius is sufficient for all displays.
Serial.print("🔥 North Marker X: ");
Serial.print(NC1.x);
Serial.print(" | Y: ");
Serial.println(NC1.y);
} }
uint16_t Screen::getCompassDiam(uint32_t displayWidth, uint32_t displayHeight) uint16_t Screen::getCompassDiam(uint32_t displayWidth, uint32_t displayHeight)

1
variants/heltec_mesh_node_t114/variant.h
View File

@ -56,6 +56,7 @@ extern "C" {
#define TFT_WIDTH 240 #define TFT_WIDTH 240
#define TFT_OFFSET_X 0 #define TFT_OFFSET_X 0
#define TFT_OFFSET_Y 0 #define TFT_OFFSET_Y 0
#ifndef HAS_TFT
// #define TFT_OFFSET_ROTATION 0 // #define TFT_OFFSET_ROTATION 0
// #define SCREEN_ROTATE // #define SCREEN_ROTATE
// #define SCREEN_TRANSITION_FRAMERATE 5 // #define SCREEN_TRANSITION_FRAMERATE 5

4
variants/heltec_vision_master_t190/variant.h
View File

@ -1,3 +1,4 @@
#ifndef HAS_TFT
#define BUTTON_PIN 0 #define BUTTON_PIN 0
#define BUTTON_PIN_SECONDARY 21 // Second built-in button #define BUTTON_PIN_SECONDARY 21 // Second built-in button
#define BUTTON_SECONDARY_CANNEDMESSAGES // By default, use the secondary button as canned message input #define BUTTON_SECONDARY_CANNEDMESSAGES // By default, use the secondary button as canned message input
@ -69,4 +70,5 @@
#define SX126X_RESET LORA_RESET #define SX126X_RESET LORA_RESET
#define SX126X_DIO2_AS_RF_SWITCH #define SX126X_DIO2_AS_RF_SWITCH
#define SX126X_DIO3_TCXO_VOLTAGE 1.8 #define SX126X_DIO3_TCXO_VOLTAGE 1.8
#endif // HAS_TFT