accumulator/btclock_v3
1
0
Fork 0
forked from btclock/btclock_v3
Code Pull requests Activity

Added WiFi signal status and settings

Browse source
This commit is contained in:
Djuri 2023-11-21 16:12:44 +01:00
parent e29d53574e
commit d6e9610721
5 changed files with 68 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

56
src/lib/webserver.cpp
View file

@ -21,6 +21,8 @@ void setupWebserver()
server.on("/api/status", HTTP_GET, onApiStatus);
server.on("/api/system_status", HTTP_GET, onApiSystemStatus);
server.on("/api/wifi_set_tx_power", HTTP_GET, onApiSetWifiTxPower);
server.on("/api/full_refresh", HTTP_GET, onApiFullRefresh);
server.on("/api/action/pause", HTTP_GET, onApiActionPause);
@ -104,6 +106,8 @@ StaticJsonDocument<768> getStatusObject()
conStatus["price"] = isPriceNotifyConnected();
conStatus["blocks"] = isBlockNotifyConnected();
root["rssi"] = WiFi.RSSI();
return root;
}
@ -344,6 +348,27 @@ void onApiSettingsPatch(AsyncWebServerRequest *request, JsonVariant &json)
}
}
if (settings.containsKey("txPower")) {
int txPower = settings["txPower"].as<int>();
if (txPower == 80) {
preferences.remove("txPower");
if (WiFi.getTxPower() != 80) {
ESP.restart();
}
} else if (static_cast<int>(wifi_power_t::WIFI_POWER_MINUS_1dBm) <= txPower &&
txPower <= static_cast<int>(wifi_power_t::WIFI_POWER_19_5dBm)) {
// is valid value
if(WiFi.setTxPower(static_cast<wifi_power_t>(txPower))) {
Serial.printf("Set WiFi Tx power to: %d\n", txPower);
preferences.putInt("txPower", txPower);
settingsChanged = true;
}
}
}
request->send(200);
if (settingsChanged)
{
@ -393,6 +418,7 @@ void onApiSettingsGet(AsyncWebServerRequest *request)
root["hostnamePrefix"] = preferences.getString("hostnamePrefix", "btclock");
root["hostname"] = getMyHostname();
root["ip"] = WiFi.localIP();
root["txPower"] = WiFi.getTxPower();
#ifdef GIT_REV
root["gitRev"] = String(GIT_REV);
@ -672,12 +698,42 @@ void onApiSystemStatus(AsyncWebServerRequest *request)
root["espHeapSize"] = ESP.getHeapSize();
root["espFreePsram"] = ESP.getFreePsram();
root["espPsramSize"] = ESP.getPsramSize();
root["rssi"] = WiFi.RSSI();
root["txPower"] = WiFi.getTxPower();
serializeJson(root, *response);
request->send(response);
}
#define STRINGIFY(x) #x
#define ENUM_TO_STRING(x) STRINGIFY(x)
void onApiSetWifiTxPower(AsyncWebServerRequest *request)
{
if (request->hasParam("txPower")) {
AsyncWebParameter *txPowerParam = request->getParam("txPower");
int txPower = txPowerParam->value().toInt();
if (static_cast<int>(wifi_power_t::WIFI_POWER_MINUS_1dBm) <= txPower &&
txPower <= static_cast<int>(wifi_power_t::WIFI_POWER_19_5dBm)) {
// is valid value
String txPowerName = std::to_string(static_cast<std::underlying_type_t<wifi_power_t>>(txPower)).c_str();
Serial.printf("Set WiFi Tx power to: %s\n", txPowerName);
if(WiFi.setTxPower(static_cast<wifi_power_t>(txPower))) {
preferences.putInt("txPower", txPower);
request->send(200, "application/json", "{\"setTxPower\": \"ok\"}");
return;
}
}
}
return request->send(400);
}
void onApiLightsStatus(AsyncWebServerRequest *request)
{
AsyncResponseStream *response = request->beginResponseStream("application/json");