Revert "Merge pull request #31 from Freezer-SD/2sec-stats"

This reverts commit 8ec8cc0, reversing
changes made to c063a70.

.gitignore

@@ -6,16 +6,3 @@ README.md
     doc
 
 .idea/
-Rtos5.83sd3B74.bin
-Rtos5.83sd3BN.bin
-Rtos5.83sd3BN266.bin
-Bin_files_BN266/Rtos5.83sd2BN266.bin
-Bin_files_B74/Rtos5.83sd4B74.bin
-Bin_files_B74/Rtos5.83sd5B74.bin
-Bin_files_B74/Rtos5.83sd6B74.bin
-Bin_files_B74/Rtos5.83sd7B74.bin
-Bin_files_BN213/Rtos5.83sd4BN.bin
-GxDEPG0266BN/Rtos5.83sd4BN266.bin
-Rtos5.83sd8B74.bin
-Rtos5.84BN266.bin
-Bin_files_BN266/Rtos5.83sd7BN266.bin

ESP_functions.h

@@ -1,7 +1,8 @@
 #ifndef ESP_FUNCTIONS
 #define ESP_FUNCTIONS
 String IP_adress="0.0.0.0";
-const char SW_version[16]="Ver 5.84_sd";//Hier staat de software versie !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+const char SW_version[16]="Ver 5.85";//Hier staat de software versie !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
 #if defined(_GxGDEH0213B73_H_) 
 const char E_paper_version[16]="E-paper 213B73";
 #endif

E_paper.h

@@ -27,24 +27,13 @@ Flip: horizontally
 #include "Fonts/FreeMonoBold8pt7b.h"//gebruikt
 #include "Fonts/FreeMonoBold9pt7b.h"//gebruikt
 #include "Fonts/FreeMonoBold12pt7b.h"//gebruikt
-#include "Fonts/FreeMonoBold15pt7b.h"//gebruikt
 #include "Fonts/FreeSansBold6pt7b.h"//gebruikt
 #include "Fonts/FreeSansBold9pt7b.h"//gebruikt
-#include "Fonts/FreeSansBold11pt7b.h"//gebruikt
 #include "Fonts/FreeSansBold12pt7b.h"//gebruikt
-#include "Fonts/FreeSansBold14pt7b.h"//gebruikt
-#include "Fonts/FreeSansBold15pt7b.h"//gebruikt
 #include "Fonts/FreeSansBold18pt7b.h"//gebruikt
 #include "Fonts/FreeSansBold24pt7b.h"//
 #include "Fonts/FreeSansBold30pt7b.h"//gebruikt
-#include "Fonts/FreeSansBold40pt7b.h"//gebruikt
-#include "Fonts/FreeSansBold50pt7b.h"//gebruikt
 #include "Fonts/FreeSansBold75pt7b.h"//gebruikt
-#include "Fonts/FreeSansBold100pt7b.h"//gebruikt
-#include "Fonts/impact40pt7b.h"//gebruikt
-#include "Fonts/impact50pt7b.h"//gebruikt
-#include "Fonts/impact60pt7b.h"//gebruikt
-#include "Fonts/impact80pt7b.h"//gebruikt
 #include "Fonts/SansSerif_bold_46_nr.h"//bijgevoegd in lib
 #include "Fonts/SansSerif_bold_84_nr.h"//bijgevoegd in lib
 #include "Fonts/SansSerif_bold_96_nr.h"//bijgevoegd in lib
@@ -74,17 +63,15 @@ Flip: horizontally
 #define STATS5 5
 #define STATS6 6    //simon stat screen
 #define STATS7 7    //bar graph screen 10s run
-#define STATS8 8    //simon stat screen for 2nd speed target
-#define STATS9 9    //simon stat screen for 3rd speed target
-#define STATS10 10  //Motion BEST stat screen
-#define AVG_10S 11
-#define SPEED 12
-#define WIFI_ON 13
-#define WIFI_STATION 14
-#define WIFI_SOFT_AP 15
-#define SPEED2 16
-#define TROUBLE 17
-#define GPS_INIT_SCREEN 18
+#define STATS8 8
+#define AVG_10S 9
+#define SPEED 10
+#define WIFI_ON 11
+#define WIFI_STATION 12
+#define WIFI_SOFT_AP 13
+#define SPEED2 14
+#define TROUBLE 15
+#define GPS_INIT_SCREEN 16
 
 
 extern GxEPD_Class display;

OTA_html.h

@@ -419,13 +419,14 @@ void html_config(String& webpage){
   webpage += "<tr>\n<td>archive_days</td><td>\n";
   webpage += "<input size='8' type='number' required name='archive_days' min='0' max='1000' value="+String(config.archive_days)+" step='1'>\n";
   webpage += "</select>\n</td><td>If the files on the sd are older then archive_days, they can be moved to the Archive directory with \"Archive Files\"</td>\n</tr>\n";
-//  #ifdef T5_E_PAPER
+  #ifdef T5_E_PAPER
   //speed_field
   webpage += "<tr>\n<td>speed_field</td><td>\n";
   webpage += "<input size='8' type='number' required name='speed_field' min='1' max='99999' value="+String(config.field)+" step='1'>\n"; 
   webpage += "</select>\n</td><td>speed_field: The preferred value in the first line of the speed screen : 1=Auto switching between Run, Alfa & NM, 2=Run & NM, 3=Alfa, 4=NM, 5= Total distance, 6= 2s/10s, 7= Auto switching between Alfa & 0.5h, 8= Auto switching between Alfa & 1h, 9= Alfa, 1h, and good run. If more then 1 digit, toggle between separat digits : 841 toggle between 1,4 and 8 !</td>\n</tr>\n";
   //speed_large_font
   webpage += "<tr><td>speed_large_font</td><td>\n<select id='speed_large_font' name='speed_large_font'>\n";
+  Drop_down_menu(config.speed_large_font,3,"Giant_Font ON",webpage);
   Drop_down_menu(config.speed_large_font,2,"Simon_Font ON",webpage);
   Drop_down_menu(config.speed_large_font,1,"Large_Font ON",webpage);
   Drop_down_menu(config.speed_large_font,0,"Large_Font OFF",webpage);
@@ -454,20 +455,6 @@ void html_config(String& webpage){
   webpage += "<tr>\n<td>GPIO12_screens</td><td>\n";
   webpage += "<input size='8' type='number' required name='GPIO12_screens' min='0' max='1000' value="+String(config.GPIO12_screens_persist)+" step='1'>\n";
   webpage += "</select>\n</td><td>GPIO12_screens choice : Every digit shows the according GPIO_screen after each push. Screen 4 = s10 runs, screen 5 = alfa's.</td>\n</tr>\n";
-  //Stat_speed_target2
-  webpage += "<tr><td>Stat_speed_target2</td><td>\n<select id='Stat_speed_target2' name='Stat_speed_target2'>\n";
-  Drop_down_menu(config.Stat_speed_target2,1,"2sec",webpage);
-  Drop_down_menu(config.Stat_speed_target2,2,"500m",webpage);
-  Drop_down_menu(config.Stat_speed_target2,3,"1852m",webpage);
-  Drop_down_menu(config.Stat_speed_target2,4,"alpha",webpage);
-  webpage += "</select>\n</td><td>Stat_speed_target2: To choose the speed info in the first column of the stat screen. Choice 1 = 2sec, 2 = 500m, 3 = 1852m, 4 = alpha.</td>\n</tr>\n";  
-  //Stat_speed_target3
-  webpage += "<tr><td>Stat_speed_target3</td><td>\n<select id='Stat_speed_target3' name='Stat_speed_target3'>\n";
-  Drop_down_menu(config.Stat_speed_target3,1,"2sec",webpage);
-  Drop_down_menu(config.Stat_speed_target3,2,"500m",webpage);
-  Drop_down_menu(config.Stat_speed_target3,3,"1852m",webpage);
-  Drop_down_menu(config.Stat_speed_target3,4,"alpha",webpage);
-  webpage += "</select>\n</td><td>Stat_speed_target3: To choose the speed info in the first column of the stat screen. Choice 1 = 2sec, 2 = 500m, 3 = 1852m, 4 = alpha.</td>\n</tr>\n";  
   //Board_Logo
   webpage += "<tr>\n<td>Board_Logo</td><td>\n<select id='Board_Logo' name='Board_Logo'>";
   Drop_down_menu(config.Board_Logo,0,"No logo",webpage);
@@ -515,10 +502,13 @@ void html_config(String& webpage){
   webpage += "<input size='8' type='number' required name='sleep_off_screen' min='0' max='1000' value="+String(config.sleep_off_screen)+" step='1'>\n";
   webpage += "</select>\n</td><td>Choice for switch_off (first digit 0 or 1) and sleep_screen (second digit 0 or 1): </td>\n</tr>\n";
   //bat value in % or volt
+  #if defined(_GxDEPG0266BN_H_) 
   webpage += "<tr><td>bat_choice</td><td>\n<select id='bat_choice' name='bat_choice'>\n";
   Drop_down_menu(config.bat_choice,0,"Batery value in voltage",webpage);
   Drop_down_menu(config.bat_choice,1,"Batery value in percentage",webpage);
   webpage += "</select>\n</td><td>bat_choice: Screen info on battery will be presented in either percentage of voltage.</td>\n</tr>\n"; 
+  #endif     //266BN
+  #endif    //T5_EPAPER
   //logTXT
   webpage += "<tr><td>logTXT</td><td>\n<select id='logTXT' name='logTXT'>\n";
   if(config.logTXT == 1) webpage += "<option value='1' selected>LOG TXT ON</option>\n"; else webpage += "<option value='1'>LOG TXT ON</option>\n";

OTA_server.h

@@ -445,12 +445,12 @@ void handleConfigUpload() {
     doc["start_logging_speed"] = server.arg("start_logging_speed").toInt();
     doc["archive_days"] = server.arg("archive_days").toInt();
     doc["GPIO12_screens"] = server.arg("GPIO12_screens").toInt();
-    doc["Stat_speed_target2"] = server.arg("Stat_speed_target2").toInt();
-    doc["Stat_speed_target3"] = server.arg("Stat_speed_target3").toInt();
     doc["Board_Logo"] = server.arg("Board_Logo").toInt();
     doc["Sail_Logo"] = server.arg("Sail_Logo").toInt();
     doc["sleep_off_screen"] = server.arg("sleep_off_screen").toInt();
+    #if defined(_GxDEPG0266BN_H_)
     doc["bat_choice"] = server.arg("bat_choice").toInt();
+    #endif
     doc["logTXT"] = server.arg("logTXT").toInt();
     doc["logSBP"] = server.arg("logSBP").toInt();
     doc["logUBX"] = server.arg("logUBX").toInt();

Rtos5.ino

@@ -17,6 +17,7 @@
 #include "soc/timer_group_reg.h"
 #include "Arduino.h"
 #include "Ublox.h"
+//#include "E_paper_266.h"//changing the E_paper : delete the build directory (can be found in the compile output)
 #include "E_paper.h"
 #include "SD_card.h"
 #include "GPS_data.h"

SD_card.cpp

@@ -249,8 +249,6 @@ void loadConfiguration(const char *filename, const char *filename_backup, Config
   config.Stat_screens_persist = config.Stat_screens;
   config.GPIO12_screens = doc["GPIO12_screens"] | 12;
   config.GPIO12_screens_persist = config.GPIO12_screens;
-  config.Stat_speed_target2 = doc["Stat_speed_target2"] | 1;
-  config.Stat_speed_target3 = doc["Stat_speed_target3"] | 2;
   config.Board_Logo = doc["Board_Logo"] | 1;
   config.Sail_Logo = doc["Sail_Logo"] | 1;
   config.sleep_off_screen = doc["sleep_off_screen"] | 11;

SD_card.h

@@ -59,17 +59,15 @@ struct Config {
   int dynamic_model=0;//choice for dynamic model "Sea",if 0 model "portable" is used !!
   float timezone=1;//choice for timedifference in hours with UTC, for Belgium 1 or 2 (summertime)
   bool timezone_DST=1;//auto switch to summertime (daylightsaving)
-  int Stat_screens=678;//choice for stats field when no speed, here stat_screen 1, 2 and 3 will be active
+  int Stat_screens=123;//choice for stats field when no speed, here stat_screen 1, 2 and 3 will be active
   int Stat_screens_time=4;//time between switching stat_screens
   int GPIO12_screens=54;//choice for stats field when gpio12 is activated (pull-up high, low = active)
-  int Stat_screens_persist=678;//choice for stats field when no speed, here stat_screen 1, 2 and 3 will be active / for resave the config
+  int Stat_screens_persist=123;//choice for stats field when no speed, here stat_screen 1, 2 and 3 will be active / for resave the config
   int GPIO12_screens_persist=54;//choice for stats field when gpio12 is activated (pull-up high, low = active) / for resave the config
   int Board_Logo=1;
   int Sail_Logo=1;
   int stat_screen[10];//which stat_screen you want to see ?
   int gpio12_screen[10];//which stat_screen when gpio 12 toggles ?
-  int Stat_speed_target2=1;//which speed info in the first column of the stat screen
-  int Stat_speed_target3=2;//which speed info in the first column of the stat screen
   int speed_screen[10];//which speed fields are selected ?
   //char Speed_Screen[10];//which speed fields are selected ?
   int screen_count=0;