mirror
/
esp32-ogn-tracker
kopia lustrzana https://github.com/pjalocha/esp32-ogn-tracker
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Improve display pages

pull/5/head
Pawel Jalocha 2019-05-07 10:05:38 +01:00
rodzic a726052b0d
commit fa7738c3c6
1 zmienionych plików z 44 dodań i 17 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

61
main/ctrl.cpp
Wyświetl plik

@ -166,17 +166,13 @@ void OLED_DrawGPS(u8g2_t *OLED, GPS_Position *GPS=0) // GPS time, position, alt
u8g2_SetFont(OLED, u8g2_font_7x13_tf); // 5 lines, 12 pixels/line u8g2_SetFont(OLED, u8g2_font_7x13_tf); // 5 lines, 12 pixels/line
uint8_t Len=0; uint8_t Len=0;
Len+=Format_String(Line+Len, "GPS "); Len+=Format_String(Line+Len, "GPS ");
#ifdef WITH_GPS_UBX if(GPS && GPS->isValid())
Len+=Format_String(Line+Len, "UBX "); { Line[Len++]='0'+GPS->FixMode; Line[Len++]='D'; Line[Len++]='/';
#endif Len+=Format_UnsDec(Line+Len, GPS->Satellites, 1);
#ifdef WITH_GPS_MTK Len+=Format_String(Line+Len, "sat DOP");
Len+=Format_String(Line+Len, "MTK "); Len+=Format_UnsDec(Line+Len, (uint16_t)GPS->HDOP, 2, 1); }
#endif else
#ifdef WITH_GPS_SRF { Len+=Format_String(Line+Len, " wait for lock"); }
Len+=Format_String(Line+Len, "SRF ");
#endif
Len+=Format_UnsDec(Line+Len, GPS_getBaudRate(), 1);
Len+=Format_String(Line+Len, "bps");
Line[Len]=0; Line[Len]=0;
u8g2_DrawStr(OLED, 0, 12, Line); u8g2_DrawStr(OLED, 0, 12, Line);
if(GPS && GPS->isDateValid()) if(GPS && GPS->isDateValid())
@ -295,12 +291,43 @@ void OLED_DrawBaro(u8g2_t *OLED, GPS_Position *GPS=0)
Len+=Format_SignDec(Line+Len, GPS->Humidity, 2, 1); Len+=Format_SignDec(Line+Len, GPS->Humidity, 2, 1);
Line[Len++]='%'; Line[Len++]='%';
Line[Len]=0; Line[Len]=0;
u8g2_DrawStr(OLED, 0, 32, Line); u8g2_DrawStr(OLED, 0, 36, Line);
} }
void OLED_DrawSystem(u8g2_t *OLED) void OLED_DrawSystem(u8g2_t *OLED)
{ u8g2_SetFont(OLED, u8g2_font_ncenB14_tr); {
u8g2_DrawStr(OLED, 0, 16, "System"); u8g2_SetFont(OLED, u8g2_font_7x13_tf); // 5 lines, 12 pixels/line
uint8_t Len=0;
Len+=Format_String(Line+Len, "GPS ");
#ifdef WITH_GPS_UBX
Len+=Format_String(Line+Len, "UBX ");
#endif
#ifdef WITH_GPS_MTK
Len+=Format_String(Line+Len, "MTK ");
#endif
#ifdef WITH_GPS_SRF
Len+=Format_String(Line+Len, "SRF ");
#endif
Len+=Format_UnsDec(Line+Len, GPS_getBaudRate(), 1);
Len+=Format_String(Line+Len, "bps");
Line[Len]=0;
u8g2_DrawStr(OLED, 0, 12, Line);
#ifdef WITH_SD
Len=0;
Len += Format_String(Line+Len, "SD ");
if(SD_isMounted())
{ Len+=Format_UnsDec(Line+Len, (uint32_t)SD_getSectors());
Line[Len++]='x';
Len+=Format_UnsDec(Line+Len, (uint32_t)SD_getSectorSize()*5/512, 2, 1);
Len+=Format_String(Line+Len, "KB"); }
else
{ Len+=Format_String(Line+Len, "none"); }
Line[Len]=0;
u8g2_DrawStr(OLED, 0, 60, Line);
#endif
} }
void OLED_DrawConfig(u8g2_t *OLED) void OLED_DrawConfig(u8g2_t *OLED)
@ -555,9 +582,9 @@ void vTaskCTRL(void* pvParameters)
else if(TimeChange || PageChange) else if(TimeChange || PageChange)
{ u8g2_ClearBuffer(&U8G2_OLED); { u8g2_ClearBuffer(&U8G2_OLED);
switch(OLED_Page) switch(OLED_Page)
{ case 1: OLED_DrawGPS(&U8G2_OLED, GPS); break; { case 1: OLED_DrawGPS (&U8G2_OLED, GPS); break;
case 2: OLED_DrawRF(&U8G2_OLED); break; case 2: OLED_DrawRF (&U8G2_OLED); break;
case 3: OLED_DrawBaro(&U8G2_OLED, GPS); break; case 3: OLED_DrawBaro (&U8G2_OLED, GPS); break;
case 4: OLED_DrawConfig(&U8G2_OLED); break; case 4: OLED_DrawConfig(&U8G2_OLED); break;
case 5: OLED_DrawSystem(&U8G2_OLED); break; case 5: OLED_DrawSystem(&U8G2_OLED); break;
default: default: