MirrorSave
/
ESPresense
mirror of https://github.com/ESPresense/ESPresense.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add options to Wifi to scan all APs (Fixes #551) (#588)

This commit is contained in:
Darrell 2022-08-13 14:43:48 -04:00 committed by GitHub
parent c9d15f957c
commit 83d0250eb0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
espotabatch.py
View File

@ -6,15 +6,14 @@ import time
# and each client contains mDNS name and the path to .bin file # and each client contains mDNS name and the path to .bin file
esps = [ esps = [
#mDNS name of ESP #path to ".bin" file #mDNS name of ESP #path to ".bin" file
['192.168.128.112', 'macchina-a0'], ['192.168.128.113', 'macchina-a0'],
['192.168.128.124', 'm5stickc'], ['192.168.128.64', 'm5atom'],
['192.168.128.64', 'm5atom-matrix'], ['192.168.128.84', 'm5atom']
['192.168.128.84', 'm5atom-matrix']
] ]
esp_respond_sender_port = '3232' esp_respond_sender_port = '3232'
sender_to_esp_port = '3232' sender_to_esp_port = '3232'
cmd = 'pio run -e m5atom-matrix -e macchina-a0 -e m5stickc' cmd = 'pio run -e m5atom -e macchina-a0'
p = subprocess.call(cmd, shell=True) p = subprocess.call(cmd, shell=True)
for esp in esps: for esp in esps:

6
src/main.cpp
View File

@ -165,6 +165,9 @@ void setupNetwork()
#endif #endif
room = AsyncWiFiSettings.string("room", ESPMAC, "Room"); room = AsyncWiFiSettings.string("room", ESPMAC, "Room");
std::vector<String> ethernetTypes = {"None", "WT32-ETH01", "ESP32-POE", "WESP32", "QuinLED-ESP32", "TwilightLord-ESP32", "ESP32Deux", "KIT-VE", "LilyGO-T-ETH-POE"}; std::vector<String> ethernetTypes = {"None", "WT32-ETH01", "ESP32-POE", "WESP32", "QuinLED-ESP32", "TwilightLord-ESP32", "ESP32Deux", "KIT-VE", "LilyGO-T-ETH-POE"};
auto allChannelScan = AsyncWiFiSettings.checkbox("all_channel_scan", false, "WiFi: Scan for all APs on all channels");
if (allChannelScan) WiFi.setScanMethod(WIFI_ALL_CHANNEL_SCAN);
else WiFi.setScanMethod(WIFI_FAST_SCAN);
ethernetType = AsyncWiFiSettings.dropdown("eth", ethernetTypes, 0, "Ethernet Type"); ethernetType = AsyncWiFiSettings.dropdown("eth", ethernetTypes, 0, "Ethernet Type");
AsyncWiFiSettings.heading("MQTT <a href='https://espresense.com/configuration/settings#mqtt' target='_blank'>ℹ️</a>", false); AsyncWiFiSettings.heading("MQTT <a href='https://espresense.com/configuration/settings#mqtt' target='_blank'>ℹ️</a>", false);
@ -239,6 +242,7 @@ void setupNetwork()
#ifdef VERSION #ifdef VERSION
Serial.println("Version: " + String(VERSION)); Serial.println("Version: " + String(VERSION));
#endif #endif
Serial.printf("WiFi Scan: %s (picked channel=%d bss=%s rssi=%d)\n", (allChannelScan ? "All" : "Fast"), WiFi.channel(), WiFi.BSSIDstr().c_str(), WiFi.RSSI());
Serial.print("IP address: "); Serial.print("IP address: ");
Serial.println(Network.localIP()); Serial.println(Network.localIP());
Serial.print("DNS address: "); Serial.print("DNS address: ");
@ -250,6 +254,7 @@ void setupNetwork()
Serial.printf("MQTT server: %s:%d\n", mqttHost.c_str(), mqttPort); Serial.printf("MQTT server: %s:%d\n", mqttHost.c_str(), mqttPort);
Serial.printf("Max Distance: %.2f\n", BleFingerprintCollection::maxDistance); Serial.printf("Max Distance: %.2f\n", BleFingerprintCollection::maxDistance);
Motion::SerialReport(); Motion::SerialReport();
I2C::SerialReport();
#ifdef SENSORS #ifdef SENSORS
DHT::SerialReport(); DHT::SerialReport();
BH1750::SerialReport(); BH1750::SerialReport();
@ -267,6 +272,7 @@ void setupNetwork()
Serial.println(BleFingerprintCollection::knownMacs); Serial.println(BleFingerprintCollection::knownMacs);
Serial.print("Count Ids: "); Serial.print("Count Ids: ");
Serial.println(BleFingerprintCollection::countIds); Serial.println(BleFingerprintCollection::countIds);
Serial.println();
localIp = Network.localIP().toString(); localIp = Network.localIP().toString();
id = slugify(room); id = slugify(room);