pohui_pohui/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-06-18 02:52:05 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

pushing my chances to personal branch so i can get the changes from the laptop

Browse Source
This commit is contained in:
Jm Casler 2020-09-19 12:50:43 -07:00
parent 6e3b22c624
commit 7c44daf8f4
2 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/meshwifi/meshhttp.cpp
View File

@ -8,6 +8,17 @@
WebServer webserver(80); WebServer webserver(80);
struct message {
char sender[10];
char message[250];
int32_t gpsLat;
int32_t gpsLong;
uint32_t time;
bool fromMe;
};
struct message arrayMessages[50];
String something = ""; String something = "";
String sender = ""; String sender = "";

13
src/meshwifi/meshwifi.cpp
View File

@ -16,6 +16,11 @@ bool isWifiAvailable()
const char *wifiPsw = radioConfig.preferences.wifi_password; const char *wifiPsw = radioConfig.preferences.wifi_password;
if (*wifiName && *wifiPsw) { if (*wifiName && *wifiPsw) {
//
return 1; return 1;
} else { } else {
return 0; return 0;
@ -26,7 +31,7 @@ bool isWifiAvailable()
void deinitWifi() void deinitWifi()
{ {
/* /*
Note from Jm (Sept 16, 2020): Note from Jm (jm@casler.org - Sept 16, 2020):
A bug in the ESP32 SDK was introduced in Oct 2019 that keeps the WiFi radio from A bug in the ESP32 SDK was introduced in Oct 2019 that keeps the WiFi radio from
turning back on after it's shut off. See: turning back on after it's shut off. See:
@ -52,16 +57,16 @@ void initWifi()
const char *wifiName = radioConfig.preferences.wifi_ssid; const char *wifiName = radioConfig.preferences.wifi_ssid;
const char *wifiPsw = radioConfig.preferences.wifi_password; const char *wifiPsw = radioConfig.preferences.wifi_password;
/* if (0) {
if (1) {
radioConfig.preferences.wifi_ap_mode = 1; radioConfig.preferences.wifi_ap_mode = 1;
strcpy(radioConfig.preferences.wifi_ssid, "MeshTest2"); strcpy(radioConfig.preferences.wifi_ssid, "MeshTest2");
strcpy(radioConfig.preferences.wifi_password, "12345678"); strcpy(radioConfig.preferences.wifi_password, "12345678");
} else { } else {
radioConfig.preferences.wifi_ap_mode = 0; radioConfig.preferences.wifi_ap_mode = 0;
strcpy(radioConfig.preferences.wifi_ssid, "meshtastic"); strcpy(radioConfig.preferences.wifi_ssid, "meshtastic1");
strcpy(radioConfig.preferences.wifi_password, "meshtastic!"); strcpy(radioConfig.preferences.wifi_password, "meshtastic!");
} }
/*
*/ */
if (*wifiName && *wifiPsw) { if (*wifiName && *wifiPsw) {