rbxii3/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-12-21 02:02:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into dev-wifi

Browse Source
This commit is contained in:
Jm Casler
2020-09-18 18:02:56 -07:00
committed by GitHub
parent 8d4672964c b203c95dd1
commit 362d8cb831
7 changed files with 72 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/meshwifi/meshwifi.cpp
View File

@@ -4,10 +4,13 @@
#include "main.h"
#include "meshwifi/meshhttp.h"
#include <WiFi.h>
#include <DNSServer.h>
static void WiFiEvent(WiFiEvent_t event);
bool isWifiAvailable()
DNSServer dnsServer;
bool isWifiAvailable()
{
const char *wifiName = radioConfig.preferences.wifi_ssid;
const char *wifiPsw = radioConfig.preferences.wifi_password;
@@ -45,15 +48,34 @@ void initWifi()
return;
}
// strcpy(radioConfig.preferences.wifi_ssid, WiFi_SSID_NAME);
// strcpy(radioConfig.preferences.wifi_password, WiFi_SSID_PASSWORD);
if (radioConfig.has_preferences) {
const char *wifiName = radioConfig.preferences.wifi_ssid;
const char *wifiPsw = radioConfig.preferences.wifi_password;
if (*wifiName) {
const char *wifiPsw = radioConfig.preferences.wifi_password;
if (1) {
radioConfig.preferences.wifi_ap_mode = 1;
strcpy(radioConfig.preferences.wifi_ssid, "MeshTest2");
strcpy(radioConfig.preferences.wifi_password, "12345678");
} else {
radioConfig.preferences.wifi_ap_mode = 0;
strcpy(radioConfig.preferences.wifi_ssid, "meshtastic");
strcpy(radioConfig.preferences.wifi_password, "meshtastic!");
}
if (*wifiName && *wifiPsw) {
if (radioConfig.preferences.wifi_ap_mode) {
IPAddress apIP(192, 168, 42, 1);
WiFi.onEvent(WiFiEvent);
WiFi.softAPConfig(apIP, apIP, IPAddress(255, 255, 255, 0));
DEBUG_MSG("STARTING WIFI AP: ssid=%s, ok=%d\n", wifiName, WiFi.softAP(wifiName, wifiPsw));
DEBUG_MSG("MY IP ADDRESS: %s\n", WiFi.softAPIP().toString().c_str());
dnsServer.start(53, "*", apIP);
} else {
WiFi.mode(WIFI_MODE_STA);
WiFi.onEvent(WiFiEvent);
@@ -125,6 +147,11 @@ static void WiFiEvent(WiFiEvent_t event)
break;
case SYSTEM_EVENT_AP_START:
DEBUG_MSG("WiFi access point started\n");
Serial.println(WiFi.softAPIP());
// Start web server
initWebServer();
break;
case SYSTEM_EVENT_AP_STOP:
DEBUG_MSG("WiFi access point stopped\n");
@@ -161,5 +188,12 @@ static void WiFiEvent(WiFiEvent_t event)
break;
default:
break;
}
}
void handleDNSResponse() {
if (radioConfig.preferences.wifi_ap_mode) {
dnsServer.processNextRequest();
}
}