From c002c37d3733c2a278e701c3aa1e3ca532b4d487 Mon Sep 17 00:00:00 2001
From: Vadim <vadim.olonin@gmail.com>
Date: Wed, 6 May 2026 09:20:20 +0300
Subject: [PATCH] wip

---
 src/main.cpp | 51 ++++++++-------------------------------------------
 1 file changed, 8 insertions(+), 43 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index f91d211..bb90967 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -186,11 +186,16 @@ void taskTFT(void *pvParameters)
   // drawButtons();
 
   TFT_eSprite spr = TFT_eSprite(&tft);
-  spr.createSprite(tft.width(), tft.height()/2);
+  spr.createSprite(tft.width(), tft.height() / 2);
 
   GpsData data;
   bool hasNewData = false;
-  char latBuffer[20], lngBuffer[20], altBuffer[20], timeBuffer[20], dateBuffer[20];
+  char latBuffer[20];
+  char lngBuffer[20];
+  char altBuffer[20];
+  char speedBuffer[20];
+  char timeBuffer[20];
+  char dateBuffer[20];
   char satelitesBuffer[20];
 
   while (true)
@@ -214,48 +219,18 @@ void taskTFT(void *pvParameters)
 
         snprintf(latBuffer, sizeof(latBuffer), "LAT: %.6f", data.lat);
         snprintf(lngBuffer, sizeof(lngBuffer), "LNG: %.6f", data.lng);
-
         snprintf(altBuffer, sizeof(altBuffer), "ALTITUDE: %.1f m", data.altitude);
         snprintf(satelitesBuffer, sizeof(satelitesBuffer), "Satellites: %d", data.satellites);
-
         snprintf(timeBuffer, sizeof(timeBuffer), "TIME: %02d:%02d:%02d", data.hour, data.minute, data.second);
         snprintf(dateBuffer, sizeof(dateBuffer), "DATE: %04d-%02d-%02d", data.year, data.month, data.day);
 
-        // tft.fillScreen(TFT_BLACK);
-        // tft.setCursor(0, 20);
-        // tft.printf("Date: %04d-%02d-%02d", data.year, data.month, data.day);
-
-        // tft.setCursor(0, 40);
-        // tft.printf("Time: %02d:%02d:%02d", data.hour, data.minute, data.second);
-
-        // tft.setCursor(0, 60);
-        // tft.setTextPadding(240);
-        // tft.print(latBuffer);
-
-        // tft.setCursor(0, 80);
-        // tft.printf("Lon: %.6f", data.lng);
-
-        // tft.setCursor(0, 100);
-        // tft.printf("Speed: %.1f km/h", data.speed);
-
-        // tft.setCursor(0, 120);
-        // tft.printf("Satellites: %d", data.satellites);
-
-        // spr.printf("Alt: %.1f m", data.altitude);
-
-        // drawString("ABCDEFGHIJKLMNOPQRST", 0,0);
-        // drawString(timeBuffer, 0, 100);
-        // drawString(altBuffer, 0, 150);
-
         spr.fillSprite(TFT_BLUE);
         spr.setTextDatum(TL_DATUM);
 
         spr.drawString(dateBuffer, 0, 0, FONT4);
         spr.drawString(timeBuffer, 0, 20, FONT4);
-
         spr.drawString(latBuffer, 0, 40, FONT4);
         spr.drawString(lngBuffer, 0, 60, FONT4);
-
         spr.drawString(satelitesBuffer, 0, 80, FONT4);
 
         spr.pushSprite(0, 0);
@@ -332,17 +307,7 @@ void drawButtons()
   tft.setFreeFont(FF1);
   for (int i = 0; i < NUM_KEYS; i++)
   {
-    key[i].initButtonUL(&tft,
-                        KEY_X,
-                        KEY_Y + i * (KEY_H + KEY_SPACING_Y),
-                        KEY_W,
-                        KEY_H,
-                        TFT_WHITE,
-                        TFT_BLACK,
-                        TFT_WHITE,
-                        label,
-                        KEY_TEXTSIZE);
-
+    key[i].initButtonUL(&tft, KEY_X, KEY_Y + i * (KEY_H + KEY_SPACING_Y), KEY_W, KEY_H, TFT_WHITE, TFT_BLACK, TFT_WHITE, label, KEY_TEXTSIZE);
     key[i].setLabelDatum(0, 2, MC_DATUM);
     key[i].drawButton(false, btnLabel[i]);
   }