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

Clean up nimble files

Browse Source
This commit is contained in:
geeksville
2020-07-23 08:10:36 -07:00
parent 4eb27b637d
commit 0415a3c369
4 changed files with 168 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/main.cpp
View File

@@ -43,7 +43,6 @@
// #include <driver/rtc_io.h>
#ifndef NO_ESP32
#include "WiFi.h"
#include "nimble/BluetoothUtil.h"
#endif
@@ -149,35 +148,6 @@ void userButtonPressedLong()
screen.adjustBrightness();
}
#ifndef NO_ESP32
void initWifi()
{
#if 0
// strcpy(radioConfig.preferences.wifi_ssid, "xxx");
// strcpy(radioConfig.preferences.wifi_password, "xxx");
if (radioConfig.has_preferences) {
const char *wifiName = radioConfig.preferences.wifi_ssid;
if (*wifiName) {
const char *wifiPsw = radioConfig.preferences.wifi_password;
if (radioConfig.preferences.wifi_ap_mode) {
DEBUG_MSG("STARTING WIFI AP: ssid=%s, ok=%d\n", wifiName, WiFi.softAP(wifiName, wifiPsw));
} else {
WiFi.mode(WIFI_MODE_STA);
DEBUG_MSG("JOINING WIFI: ssid=%s\n", wifiName);
if (WiFi.begin(wifiName, wifiPsw) == WL_CONNECTED) {
DEBUG_MSG("MY IP ADDRESS: %s\n", WiFi.localIP().toString().c_str());
} else {
DEBUG_MSG("FAILED JOINING WIFI\n");
}
}
}
} else
DEBUG_MSG("Not using WIFI\n");
#endif
}
#endif
void setup()
{
#ifdef USE_SEGGER
@@ -286,10 +256,6 @@ void setup()
nodeStatus->observe(&nodeDB.newStatus);
service.init();
#ifndef NO_ESP32
// Must be after we init the service, because the wifi settings are loaded by NodeDB (oops)
initWifi();
#endif
#ifdef SX1262_ANT_SW
// make analog PA vs not PA switch on SX1262 eval board work properly