Mercurial > brewboard / changeset

--- a/main/config.c	Wed May 19 14:35:48 2021 +0200
+++ b/main/config.c	Wed May 19 14:47:17 2021 +0200
@@ -43,11 +43,11 @@
 	config.IodineTime = 30;
 	config.EquipmentRec = 1;
 	sprintf(config.hostname, "brewboard-%02x%02x%02x", mac_addr[3], mac_addr[4], mac_addr[5]);
-	sprintf(config.ap_ssid, "brewboardAP-%02x%02x%02x", mac_addr[3], mac_addr[4], mac_addr[5]);
-	sprintf(config.ap_pwd, "%s", "triplehop");
-	config.ap_channel = 5;
-	config.ap_ssid_hidden = 0;
-	config.ap_bandwidth = WIFI_BW_HT20;
+	config.xap_ssid[0] = '\0';
+	config.xap_pwd[0] = '\0';
+	config.xap_channel = 0;
+	config.xap_ssid_hidden = 0;
+	config.xap_bandwidth = 0;
 	config.ts_xleft = 0;
 	config.ts_xright = 3600;
 	config.ts_ytop = 3600;

--- a/main/config.h	Wed May 19 14:35:48 2021 +0200
+++ b/main/config.h	Wed May 19 14:47:17 2021 +0200
@@ -167,11 +167,11 @@
     int			EquipmentRec;			///< Equipment record number.
     char		ntp_server[32];			///< Preffered NTP server.
     char		hostname[32];			///< Our hostname.
-    char		ap_ssid[32];			///< AP SSID.
-    char		ap_pwd[64];			///< AP password.
-    uint8_t		ap_channel;			///< AP channel.
-    uint8_t		ap_ssid_hidden;			///< AP SSID hidden.
-    wifi_bandwidth_t	ap_bandwidth;			///< AP channel bandwidth.
+    char		xap_ssid[32];			///< AP SSID.
+    char		xap_pwd[64];			///< AP password.
+    uint8_t		xap_channel;			///< AP channel.
+    uint8_t		xap_ssid_hidden;		///< AP SSID hidden.
+    wifi_bandwidth_t	xap_bandwidth;			///< AP channel bandwidth.
     uint16_t		ts_xleft;			///< TS calibration X left.
     uint16_t		ts_xright;			///< TS calibration X right.
     uint16_t		ts_ytop;			///< TS calibration Y top.

--- a/main/setup.c	Wed May 19 14:35:48 2021 +0200
+++ b/main/setup.c	Wed May 19 14:47:17 2021 +0200
@@ -51,11 +51,7 @@
 			ShowBool(2, 76, (char *)"Vraag Jodium proef", config.AskIodine);
 			ShowInteger(2, 92, (char *)"Jodiumtest wachttijd", (char *)" min.", config.IodineTime);
 			ShowText(2, 108, (char *)"Hostnaam", config.hostname);
-			ShowText(2, 124, (char *)"AP SSID", config.ap_ssid);
-			ShowText(2, 140, (char *)"AP pwd", config.ap_pwd);
-			ShowInteger(2, 156, (char *)"AP kanaal", NULL, config.ap_channel);
-			ShowBool(2, 172, (char *)"AP SSID verborgen", config.ap_ssid_hidden);
-			ShowText(2, 188, (char *)"NTP server", config.ntp_server);
+			ShowText(2, 124, (char *)"NTP server", config.ntp_server);
 			Buttons_Clear();
 			Buttons_Add(  0, 210, 45, 30, (char *)"Ok"  , 0);
 			Buttons_Add(276, 210, 45, 30, (char *)"Ed"  , 1);
@@ -149,12 +145,6 @@
 			EditBool((char *)"Vraag Jodium proef", &config.AskIodine);
 			EditUint8((char *)"Jodium test wachttijd", &config.IodineTime, 0, 120);
 			EditText((char *)"DHCP hostnaam", config.hostname, 31);
-			EditText((char *)"AP SSID", config.ap_ssid, 31);
-			EditTextMin((char *)"AP password", config.ap_pwd, 40, 8);
-			EditUint8((char *)"AP kanaal", &config.ap_channel, 1, 14);
-			bool hidden = config.ap_ssid_hidden;
-			EditBool((char *)"AP SSID verborgen", &hidden);
-			config.ap_ssid_hidden = (uint8_t)hidden;
 			EditText((char *)"Voorkeur NTP server", config.ntp_server, 31);
 
 			crc2 = crc32_le(0, dst, sizeof(config));