mirror of
https://github.com/MrUnknownDE/OpenIris-ESPIDF.git
synced 2026-04-19 06:23:44 +02:00
Fix getLEDCurrentCommand after rebase, cleanup todos, add current monitoring to setup script
This commit is contained in:
@@ -212,12 +212,7 @@ CommandResult getLEDCurrentCommand(std::shared_ptr<DependencyRegistry> registry)
|
|||||||
return CommandResult::getErrorResult("MonitoringManager unavailable");
|
return CommandResult::getErrorResult("MonitoringManager unavailable");
|
||||||
}
|
}
|
||||||
float ma = mon->getCurrentMilliAmps();
|
float ma = mon->getCurrentMilliAmps();
|
||||||
const auto json = nlohmann::json
|
const auto json = nlohmann::json{{"led_current_ma", std::format("{:.3f}", static_cast<double>(ma))}};
|
||||||
{
|
|
||||||
{
|
|
||||||
"led_current_ma", std::format("{:.3f}", static_cast<double>(ma))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return CommandResult::getSuccessResult(json);
|
return CommandResult::getSuccessResult(json);
|
||||||
#else
|
#else
|
||||||
return CommandResult::getErrorResult("Monitoring disabled");
|
return CommandResult::getErrorResult("Monitoring disabled");
|
||||||
|
|||||||
@@ -264,11 +264,8 @@ extern "C" void app_main(void)
|
|||||||
dependencyRegistry->registerService<MonitoringManager>(DependencyType::monitoring_manager, monitoringManager);
|
dependencyRegistry->registerService<MonitoringManager>(DependencyType::monitoring_manager, monitoringManager);
|
||||||
|
|
||||||
// add endpoint to check firmware version
|
// add endpoint to check firmware version
|
||||||
// add firmware version somewhere
|
|
||||||
// setup CI and building for other boards
|
// setup CI and building for other boards
|
||||||
// finish todos, overhaul stuff a bit
|
|
||||||
|
|
||||||
// todo - do we need logs over CDC? Or just commands and their results?
|
|
||||||
// esp_log_set_vprintf(&websocket_logger);
|
// esp_log_set_vprintf(&websocket_logger);
|
||||||
Logo::printASCII();
|
Logo::printASCII();
|
||||||
initNVSStorage();
|
initNVSStorage();
|
||||||
|
|||||||
@@ -328,6 +328,15 @@ def get_wifi_status(device: OpenIrisDevice) -> dict:
|
|||||||
return {"wifi_status": response["results"][0]["result"]["data"]}
|
return {"wifi_status": response["results"][0]["result"]["data"]}
|
||||||
|
|
||||||
|
|
||||||
|
def get_led_current(device: OpenIrisDevice) -> dict:
|
||||||
|
response = device.send_command("get_led_current")
|
||||||
|
if has_command_failed(response):
|
||||||
|
print(f"❌ Failed to get LED current: {response}")
|
||||||
|
return {"led_current_ma": "unknown"}
|
||||||
|
|
||||||
|
return {"led_current_ma": response["results"][0]["result"]["data"]["led_current_ma"]}
|
||||||
|
|
||||||
|
|
||||||
def configure_device_name(device: OpenIrisDevice, *args, **kwargs):
|
def configure_device_name(device: OpenIrisDevice, *args, **kwargs):
|
||||||
current_name = get_mdns_name(device)
|
current_name = get_mdns_name(device)
|
||||||
print(f"\n📍 Current device name: {current_name['name']} \n")
|
print(f"\n📍 Current device name: {current_name['name']} \n")
|
||||||
@@ -432,8 +441,10 @@ def get_settings_summary(device: OpenIrisDevice, *args, **kwargs):
|
|||||||
|
|
||||||
probes = [
|
probes = [
|
||||||
("Identity", get_serial_info),
|
("Identity", get_serial_info),
|
||||||
|
("AdvertisedName", get_mdns_name),
|
||||||
("Info", get_device_info),
|
("Info", get_device_info),
|
||||||
("LED", get_led_duty_cycle),
|
("LED", get_led_duty_cycle),
|
||||||
|
("Current", get_led_current),
|
||||||
("Mode", get_device_mode),
|
("Mode", get_device_mode),
|
||||||
("WiFi", get_wifi_status),
|
("WiFi", get_wifi_status),
|
||||||
]
|
]
|
||||||
@@ -445,8 +456,16 @@ def get_settings_summary(device: OpenIrisDevice, *args, **kwargs):
|
|||||||
|
|
||||||
print(f"🔑 Serial: {summary['Identity']}")
|
print(f"🔑 Serial: {summary['Identity']}")
|
||||||
print(f"💡 LED PWM Duty: {summary['LED']['duty_cycle']}%")
|
print(f"💡 LED PWM Duty: {summary['LED']['duty_cycle']}%")
|
||||||
print(f"🎚️ Mode: {summary['Mode']['mode']}")
|
print(f"🎚️ Mode: {summary['Mode']['mode']}")
|
||||||
|
|
||||||
|
current_section = summary.get("Current", {})
|
||||||
|
led_current_ma = current_section.get("led_current_ma")
|
||||||
|
print(f"🔌 LED Current: {led_current_ma} mA")
|
||||||
|
|
||||||
|
advertised_name_data = summary.get("AdvertisedName", {})
|
||||||
|
advertised_name = advertised_name_data.get("name")
|
||||||
|
print(f"📛 Name: {advertised_name}")
|
||||||
|
|
||||||
info = summary.get("Info", {})
|
info = summary.get("Info", {})
|
||||||
who = info.get("who_am_i")
|
who = info.get("who_am_i")
|
||||||
ver = info.get("version")
|
ver = info.get("version")
|
||||||
@@ -457,10 +476,11 @@ def get_settings_summary(device: OpenIrisDevice, *args, **kwargs):
|
|||||||
|
|
||||||
|
|
||||||
wifi = summary.get("WiFi", {}).get("wifi_status", {})
|
wifi = summary.get("WiFi", {}).get("wifi_status", {})
|
||||||
status = wifi.get("status", "unknown")
|
if wifi:
|
||||||
ip = wifi.get("ip_address") or "-"
|
status = wifi.get("status", "unknown")
|
||||||
configured = wifi.get("networks_configured", 0)
|
ip = wifi.get("ip_address") or "-"
|
||||||
print(f"📶 WiFi: {status} | IP: {ip} | Networks configured: {configured}")
|
configured = wifi.get("networks_configured", 0)
|
||||||
|
print(f"📶 WiFi: {status} | IP: {ip} | Networks configured: {configured}")
|
||||||
|
|
||||||
|
|
||||||
def scan_networks(wifi_scanner: WiFiScanner, *args, **kwargs):
|
def scan_networks(wifi_scanner: WiFiScanner, *args, **kwargs):
|
||||||
|
|||||||
Reference in New Issue
Block a user