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

InitialPage parameter, which page to show after startup

pull/40/head
Farkas Szilárd 2021-06-06 17:02:27 +02:00
rodzic bbe864d605
commit ce5f2ded03
3 zmienionych plików z 15 dodań i 0 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

1
main/disp.cpp
Wyświetl plik

@ -42,6 +42,7 @@ void vTaskDISP(void* pvParameters)
OLED_DrawLogo(&U8G2_OLED); // draw logo OLED_DrawLogo(&U8G2_OLED); // draw logo
u8g2_SendBuffer(&U8G2_OLED); u8g2_SendBuffer(&U8G2_OLED);
vTaskDelay(2000); // allow 2sec for the user to see the logo vTaskDelay(2000); // allow 2sec for the user to see the logo
DISP_Page = Parameters.InitialPage;
#endif #endif
#if defined(WITH_ST7789) || defined(WITH_ILI9341) #if defined(WITH_ST7789) || defined(WITH_ILI9341)
// LCD_Start(); // LCD_Start();

7
main/http.cpp
Wyświetl plik

@ -237,6 +237,13 @@ static void ParmForm_Other(httpd_req_t *Req) // produce HTML form for aircraft
httpd_resp_sendstr_chunk(Req, "\">"); httpd_resp_sendstr_chunk(Req, "\">");
End_Control_Row(Req); End_Control_Row(Req);
Begin_Control_Row(Req, "Initial Page");
httpd_resp_sendstr_chunk(Req, "<input type=\"text\" name=\"InitialPage\" size=\"10\" value=\"");
Len=Format_UnsDec(Line, (uint8_t)Parameters.InitialPage);
httpd_resp_send_chunk(Req, Line, Len);
httpd_resp_sendstr_chunk(Req, "\">");
End_Control_Row(Req);
httpd_resp_sendstr_chunk(Req, "<div class=\"submit-row\"><input type=\"submit\" value=\"Apply\"></div>\n"); httpd_resp_sendstr_chunk(Req, "<div class=\"submit-row\"><input type=\"submit\" value=\"Apply\"></div>\n");
httpd_resp_sendstr_chunk(Req, "</form>\n"); } httpd_resp_sendstr_chunk(Req, "</form>\n"); }

7
main/parameters.h
Wyświetl plik

@ -125,6 +125,7 @@ class FlashParameters
// char Category[16] // char Category[16]
uint32_t PageMask; // enable/disable individual pages on the LCD or OLED screen uint32_t PageMask; // enable/disable individual pages on the LCD or OLED screen
uint8_t InitialPage; // the first page to show after boot
#if defined(WITH_BT_SPP) || defined(WITH_BLE_SPP) #if defined(WITH_BT_SPP) || defined(WITH_BLE_SPP)
char BTname[16]; char BTname[16];
@ -261,6 +262,7 @@ uint16_t StratuxPort;
FreqPlan = DEFAULT_FreqPlan; // [0..5] FreqPlan = DEFAULT_FreqPlan; // [0..5]
PPSdelay = DEFAULT_PPSdelay; // [ms] PPSdelay = DEFAULT_PPSdelay; // [ms]
PageMask = 0xFF; PageMask = 0xFF;
InitialPage = 0;
for(uint8_t Idx=0; Idx<InfoParmNum; Idx++) for(uint8_t Idx=0; Idx<InfoParmNum; Idx++)
InfoParmValue(Idx)[0] = 0; InfoParmValue(Idx)[0] = 0;
#ifdef WITH_LORAWAN #ifdef WITH_LORAWAN
@ -667,6 +669,9 @@ uint16_t StratuxPort;
if(strcmp(Name, "PageMask")==0) if(strcmp(Name, "PageMask")==0)
{ int32_t Mode=0; if(Read_Int(Mode, Value)<=0) return 0; { int32_t Mode=0; if(Read_Int(Mode, Value)<=0) return 0;
PageMask=Mode; return 1; } PageMask=Mode; return 1; }
if(strcmp(Name, "InitialPage")==0)
{ int32_t Mode=0; if(Read_Int(Mode, Value)<=0) return 0;
InitialPage=Mode; return 1; }
if(strcmp(Name, "Verbose")==0) if(strcmp(Name, "Verbose")==0)
{ int32_t Mode=0; if(Read_Int(Mode, Value)<=0) return 0; { int32_t Mode=0; if(Read_Int(Mode, Value)<=0) return 0;
Verbose=Mode; return 1; } Verbose=Mode; return 1; }
@ -850,6 +855,7 @@ uint16_t StratuxPort;
Write_Hex (Line, "Verbose" , (uint32_t)Verbose, 2); strcat(Line, " # [ 0..3]\n"); if(fputs(Line, File)==EOF) return EOF; Write_Hex (Line, "Verbose" , (uint32_t)Verbose, 2); strcat(Line, " # [ 0..3]\n"); if(fputs(Line, File)==EOF) return EOF;
Write_Hex (Line, "GNSS" , (uint32_t)GNSS, 2); strcat(Line, " # [ mask]\n"); if(fputs(Line, File)==EOF) return EOF; Write_Hex (Line, "GNSS" , (uint32_t)GNSS, 2); strcat(Line, " # [ mask]\n"); if(fputs(Line, File)==EOF) return EOF;
Write_Hex (Line, "PageMask" , (uint32_t)PageMask, 4); strcat(Line, " # [ mask]\n"); if(fputs(Line, File)==EOF) return EOF; Write_Hex (Line, "PageMask" , (uint32_t)PageMask, 4); strcat(Line, " # [ mask]\n"); if(fputs(Line, File)==EOF) return EOF;
Write_UnsDec (Line, "InitialPage" , (uint32_t)InitialPage ); strcat(Line, " # [ ]\n"); if(fputs(Line, File)==EOF) return EOF;
Write_UnsDec (Line, "PPSdelay" , (uint32_t)PPSdelay ); strcat(Line, " # [ ms]\n"); if(fputs(Line, File)==EOF) return EOF; Write_UnsDec (Line, "PPSdelay" , (uint32_t)PPSdelay ); strcat(Line, " # [ ms]\n"); if(fputs(Line, File)==EOF) return EOF;
#ifdef WITH_BT_PWR #ifdef WITH_BT_PWR
Write_UnsDec (Line, "Bluetooth" , BT_ON ); strcat(Line, " # [ 1|0]\n"); if(fputs(Line, File)==EOF) return EOF; Write_UnsDec (Line, "Bluetooth" , BT_ON ); strcat(Line, " # [ 1|0]\n"); if(fputs(Line, File)==EOF) return EOF;
@ -916,6 +922,7 @@ uint16_t StratuxPort;
Write_Hex (Line, "Verbose" , (uint32_t)Verbose, 2); strcat(Line, " # [ 0..3]\n"); Format_String(Output, Line); Write_Hex (Line, "Verbose" , (uint32_t)Verbose, 2); strcat(Line, " # [ 0..3]\n"); Format_String(Output, Line);
Write_Hex (Line, "GNSS" , (uint32_t)GNSS , 2); strcat(Line, " # [ mask]\n"); Format_String(Output, Line); Write_Hex (Line, "GNSS" , (uint32_t)GNSS , 2); strcat(Line, " # [ mask]\n"); Format_String(Output, Line);
Write_Hex (Line, "PageMask" , (uint32_t)PageMask, 4); strcat(Line, " # [ mask]\n"); Format_String(Output, Line); Write_Hex (Line, "PageMask" , (uint32_t)PageMask, 4); strcat(Line, " # [ mask]\n"); Format_String(Output, Line);
Write_UnsDec (Line, "InitialPage" , (uint32_t)InitialPage ); strcat(Line, " # [ ]\n"); Format_String(Output, Line);
Write_UnsDec (Line, "PPSdelay" , (uint32_t)PPSdelay ); strcat(Line, " # [ ms]\n"); Format_String(Output, Line); Write_UnsDec (Line, "PPSdelay" , (uint32_t)PPSdelay ); strcat(Line, " # [ ms]\n"); Format_String(Output, Line);
#ifdef WITH_BT_PWR #ifdef WITH_BT_PWR
Write_UnsDec (Line, "Bluetooth" , BT_ON ); strcat(Line, " # [ 1|0]\n"); Format_String(Output, Line); Write_UnsDec (Line, "Bluetooth" , BT_ON ); strcat(Line, " # [ 1|0]\n"); Format_String(Output, Line);