Skip to content

Commit

Permalink
Development
Browse files Browse the repository at this point in the history
  • Loading branch information
@mathieucarbou
mathieucarbou committed May 30, 2024
1 parent cc13351 commit 8c076fc
Show file tree
Hide file tree
Showing 8 changed files with 77 additions and 62 deletions.
7 changes: 5 additions & 2 deletions include/YaSolRDefines.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,13 +106,16 @@

#define YASOLR_ADMIN_USERNAME "admin"
#define YASOLR_DIMMER_MAX_LEVEL MYCILA_DIMMER_MAX_LEVEL
#define YASOLR_DISPLAY_LINE_SIZE 21
#define YASOLR_DISPLAY_LINES 5
#define YASOLR_MQTT_KEEPALIVE 60
#define YASOLR_MQTT_WILL_TOPIC "/status"
#define YASOLR_PZEM_ADDRESS_OUTPUT1 0x01
#define YASOLR_PZEM_ADDRESS_OUTPUT2 0x02
#define YASOLR_RELAY_TYPE_NC "NC"
#define YASOLR_RELAY_TYPE_NO "NO"
#define YASOLR_SERIAL_BAUDRATE 115200
#define YASOLR_DISPLAY_LINES 5
#define YASOLR_DISPLAY_LINE_SIZE 21
#define YASOLR_WEEK_DAYS "sun,mon,tue,wed,thu,fri,sat"

// pinout

Expand Down
36 changes: 18 additions & 18 deletions include/YaSolRWebsite.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,10 +72,10 @@ namespace YaSolR {
#endif

// home
Card _routerEnergy = Card(&dashboard, ENERGY_CARD, "Total Routed Energy", "kWh");
Card _routerPower = Card(&dashboard, ENERGY_CARD, "Total Routed Power", "W");
Card _routerPowerFactor = Card(&dashboard, ENERGY_CARD, "Router Power Factor");
Card _routerTHDi = Card(&dashboard, ENERGY_CARD, "Router THDi", "%");
Card _routerEnergy = Card(&dashboard, ENERGY_CARD, "Total Routed Energy", "kWh");
Card _gridPower = Card(&dashboard, ENERGY_CARD, "Grid Power", "W");
Card _ds18Sys = Card(&dashboard, TEMPERATURE_CARD, "System Temperature", "°C");

Expand All @@ -87,8 +87,8 @@ namespace YaSolR {
Tab _output1Tab = Tab(&dashboard, "\u2600 Output 1");
Card _output1State = Card(&dashboard, STATUS_CARD, "Status", DASH_STATUS_IDLE);
Card _output1DS18 = Card(&dashboard, TEMPERATURE_CARD, "Temperature", "°C");
Card _output1DimmerSlider = Card(&dashboard, SLIDER_CARD, "Dimmer", "", 0, YASOLR_DIMMER_MAX_LEVEL, 1);
Card _output1Bypass = Card(&dashboard, BUTTON_CARD, "Bypass");
Card _output1DimmerSlider = Card(&dashboard, SLIDER_CARD, "Dimmer Manual Control", "", 0, YASOLR_DIMMER_MAX_LEVEL, 1);
Card _output1Bypass = Card(&dashboard, BUTTON_CARD, "Bypass Manual Control");
Card _output1Power = Card(&dashboard, ENERGY_CARD, "Power", "W");
Card _output1ApparentPower = Card(&dashboard, ENERGY_CARD, "Apparent Power", "VA");
Card _output1PowerFactor = Card(&dashboard, ENERGY_CARD, "Power Factor");
Expand All @@ -97,9 +97,9 @@ namespace YaSolR {
Card _output1Current = Card(&dashboard, ENERGY_CARD, "Current", "A");
Card _output1Resistance = Card(&dashboard, ENERGY_CARD, "Resistance", "Ω");
Card _output1Energy = Card(&dashboard, ENERGY_CARD, "Energy", "kWh");
Card _output1DimmerAuto = Card(&dashboard, BUTTON_CARD, "Automatic Routing");
Card _output1DimmerAuto = Card(&dashboard, BUTTON_CARD, "Dimmer Automatic Control");
Card _output1DimmerLimiter = Card(&dashboard, SLIDER_CARD, "Dimmer Limiter", "", 0, YASOLR_DIMMER_MAX_LEVEL, 1);
Card _output1AutoBypass = Card(&dashboard, BUTTON_CARD, "Automatic Bypass");
Card _output1AutoBypass = Card(&dashboard, BUTTON_CARD, "Bypass Automatic Control");
Card _output1AutoStartWDays = Card(&dashboard, WEEK_SELECTOR_CARD, "Bypass Week Days");
Card _output1AutoStartTime = Card(&dashboard, TEXT_INPUT_CARD, "Bypass Start Time");
Card _output1AutoStoptTime = Card(&dashboard, TEXT_INPUT_CARD, "Bypass Stop Time");
Expand All @@ -109,8 +109,8 @@ namespace YaSolR {
Tab _output2Tab = Tab(&dashboard, "\u2600 Output 2");
Card _output2State = Card(&dashboard, STATUS_CARD, "Status", DASH_STATUS_IDLE);
Card _output2DS18 = Card(&dashboard, TEMPERATURE_CARD, "Temperature", "°C");
Card _output2DimmerSlider = Card(&dashboard, SLIDER_CARD, "Dimmer", "", 0, YASOLR_DIMMER_MAX_LEVEL, 1);
Card _output2Bypass = Card(&dashboard, BUTTON_CARD, "Bypass");
Card _output2DimmerSlider = Card(&dashboard, SLIDER_CARD, "Dimmer Manual Control", "", 0, YASOLR_DIMMER_MAX_LEVEL, 1);
Card _output2Bypass = Card(&dashboard, BUTTON_CARD, "Bypass Manual Control");
Card _output2Power = Card(&dashboard, ENERGY_CARD, "Power", "W");
Card _output2ApparentPower = Card(&dashboard, ENERGY_CARD, "Apparent Power", "VA");
Card _output2PowerFactor = Card(&dashboard, ENERGY_CARD, "Power Factor");
Expand All @@ -119,20 +119,20 @@ namespace YaSolR {
Card _output2Current = Card(&dashboard, ENERGY_CARD, "Current", "A");
Card _output2Resistance = Card(&dashboard, ENERGY_CARD, "Resistance", "Ω");
Card _output2Energy = Card(&dashboard, ENERGY_CARD, "Energy", "kWh");
Card _output2DimmerAuto = Card(&dashboard, BUTTON_CARD, "Automatic Routing");
Card _output2DimmerAuto = Card(&dashboard, BUTTON_CARD, "Dimmer Automatic Control");
Card _output2DimmerLimiter = Card(&dashboard, SLIDER_CARD, "Dimmer Limiter", "", 0, YASOLR_DIMMER_MAX_LEVEL, 1);
Card _output2AutoBypass = Card(&dashboard, BUTTON_CARD, "Automatic Bypass");
Card _output2AutoBypass = Card(&dashboard, BUTTON_CARD, "Bypass Automatic Control");
Card _output2AutoStartWDays = Card(&dashboard, WEEK_SELECTOR_CARD, "Bypass Week Days");
Card _output2AutoStartTime = Card(&dashboard, TEXT_INPUT_CARD, "Bypass Start Time");
Card _output2AutoStoptTime = Card(&dashboard, TEXT_INPUT_CARD, "Bypass Stop Time");
Card _output2AutoStartTemp = Card(&dashboard, TEXT_INPUT_CARD, "Bypass Start Temperature");
Card _output2AutoStoptTemp = Card(&dashboard, TEXT_INPUT_CARD, "Bypass Stop Temperature");

Tab _relaysTab = Tab(&dashboard, "\u2600 Relays");
Card _relay1Switch = Card(&dashboard, BUTTON_CARD, "Relay 1");
Card _relay1Load = Card(&dashboard, TEXT_INPUT_CARD, "Relay 1 Connected Load (Watts)");
Card _relay2Switch = Card(&dashboard, BUTTON_CARD, "Relay 2");
Card _relay2Load = Card(&dashboard, TEXT_INPUT_CARD, "Relay 1 Connected Load (Watts)");
Card _relay1Switch = Card(&dashboard, BUTTON_CARD, "Relay 1 Manual Control");
Card _relay1Load = Card(&dashboard, TEXT_INPUT_CARD, "Relay 1 Automatic Control: Connected Load (Watts)");
Card _relay2Switch = Card(&dashboard, BUTTON_CARD, "Relay 2 Manual Control");
Card _relay2Load = Card(&dashboard, TEXT_INPUT_CARD, "Relay 1 Automatic Control: Connected Load (Watts)");

Tab _managementTab = Tab(&dashboard, "\u2764 Management");
Card _configBackup = Card(&dashboard, LINK_CARD, "Configuration Backup");
Expand Down Expand Up @@ -267,17 +267,17 @@ namespace YaSolR {
Card _mqttTopic = Card(&dashboard, TEXT_INPUT_CARD, "Base Topic");
Card _haDiscovery = Card(&dashboard, BUTTON_CARD, "Home Assistant Discovery");
Card _haDiscoveryTopic = Card(&dashboard, TEXT_INPUT_CARD, "Discovery Topic");
Card _mqttGridVoltage = Card(&dashboard, TEXT_INPUT_CARD, "Grid Voltage Topic");
Card _mqttGridPower = Card(&dashboard, TEXT_INPUT_CARD, "Grid Power Topic");
Card _mqttGridVoltage = Card(&dashboard, TEXT_INPUT_CARD, "Grid Voltage from MQTT Topic");
Card _mqttGridPower = Card(&dashboard, TEXT_INPUT_CARD, "Grid Power from MQTT Topic");

Tab _networkConfigTab = Tab(&dashboard, "\u2728 Network");
Card _adminPwd = Card(&dashboard, PASSWORD_CARD, "Admin Password");
Card _apMode = Card(&dashboard, BUTTON_CARD, "AP Mode");
Card _wifiSSID = Card(&dashboard, TEXT_INPUT_CARD, "WiFi SSID");
Card _wifiPwd = Card(&dashboard, PASSWORD_CARD, "WiFi Password");
Card _ntpServer = Card(&dashboard, TEXT_INPUT_CARD, "NTP Server");
Card _ntpTimezone = Card(&dashboard, ASYNC_DROPDOWN_CARD, "Timezone");
Card _ntpSync = Card(&dashboard, TIME_SYNC_CARD, "Sync time with browser");
Card _wifiSSID = Card(&dashboard, TEXT_INPUT_CARD, "WiFi SSID");
Card _wifiPwd = Card(&dashboard, PASSWORD_CARD, "WiFi Password");
Card _apMode = Card(&dashboard, BUTTON_CARD, "Stay in AP Mode");
#endif

private:
Expand Down
2 changes: 1 addition & 1 deletion src/MycilaConfig.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,5 +70,5 @@ String Mycila::RouterOutputConfigClass::getWeekDays(const char* name) const {
return config.get(KEY_OUTPUT1_DAYS);
if (strcmp(name, "output2") == 0)
return config.get(KEY_OUTPUT2_DAYS);
return "sun,mon,tue,wed,thu,fri,sat";
return YASOLR_WEEK_DAYS;
}
12 changes: 6 additions & 6 deletions src/Website.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -604,16 +604,16 @@ void YaSolR::WebsiteClass::updateCards() {

// Hardware (status)
const bool gridOnline = Mycila::Grid.isConnected();
_status(_stateJSY, KEY_ENABLE_JSY, jsy.isEnabled(), jsy.isConnected(), "No grid electricity");
_status(_stateJSY, KEY_ENABLE_JSY, jsy.isEnabled(), jsy.isConnected(), "No electricity");
_status(_stateMQTT, KEY_ENABLE_MQTT, mqtt.isEnabled(), mqtt.isConnected(), mqtt.getLastError() ? mqtt.getLastError() : "Disconnected");
_status(_stateOutput1Dimmer, KEY_ENABLE_OUTPUT1, dimmerO1.isEnabled(), gridOnline, "No grid electricity");
_status(_stateOutput1PZEM, KEY_ENABLE_OUTPUT1_PZEM, pzemO1.isEnabled(), pzemO1.isConnected(), "Disconnected");
_status(_stateOutput1Dimmer, KEY_ENABLE_OUTPUT1, dimmerO1.isEnabled(), gridOnline, "No electricity");
_status(_stateOutput1PZEM, KEY_ENABLE_OUTPUT1_PZEM, pzemO1.isEnabled(), pzemO1.isConnected(), "No electricity");
_status(_stateOutput1Ds18, KEY_ENABLE_OUTPUT1_DS18, ds18O1.isEnabled(), ds18O1.getLastTime() > 0, "Read error");
_status(_stateOutput2Dimmer, KEY_ENABLE_OUTPUT2, dimmerO2.isEnabled(), gridOnline, "No grid electricity");
_status(_stateOutput2PZEM, KEY_ENABLE_OUTPUT2_PZEM, pzemO2.isEnabled(), pzemO2.isConnected(), "Disconnected");
_status(_stateOutput2Dimmer, KEY_ENABLE_OUTPUT2, dimmerO2.isEnabled(), gridOnline, "No electricity");
_status(_stateOutput2PZEM, KEY_ENABLE_OUTPUT2_PZEM, pzemO2.isEnabled(), pzemO2.isConnected(), "No electricity");
_status(_stateOutput2Ds18, KEY_ENABLE_OUTPUT2_DS18, ds18O2.isEnabled(), ds18O2.getLastTime() > 0, "Read error");
_status(_stateRouterTemp, KEY_ENABLE_DS18_SYSTEM, ds18Sys.isEnabled(), ds18Sys.getLastTime() > 0, "Read error");
_status(_stateZCD, KEY_ENABLE_ZCD, Mycila::ZCD.isEnabled(), Mycila::ZCD.isConnected(), "No grid electricity");
_status(_stateZCD, KEY_ENABLE_ZCD, Mycila::ZCD.isEnabled(), Mycila::ZCD.isConnected(), "No electricity");
#endif
}

Expand Down
60 changes: 30 additions & 30 deletions src/init/Boot.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,29 +40,29 @@ Mycila::Task bootTask("Boot", [](void* params) {
config.configure(KEY_ADMIN_PASSWORD);
config.configure(KEY_DISPLAY_ROTATION, "0");
config.configure(KEY_DISPLAY_TYPE, "SH1106");
config.configure(KEY_ENABLE_AP_MODE, "false");
config.configure(KEY_ENABLE_DEBUG, "false");
config.configure(KEY_ENABLE_DISPLAY, "false");
config.configure(KEY_ENABLE_DS18_SYSTEM, "false");
config.configure(KEY_ENABLE_HA_DISCOVERY, "false");
config.configure(KEY_ENABLE_JSY, "false");
config.configure(KEY_ENABLE_LIGHTS, "false");
config.configure(KEY_ENABLE_MQTT, "false");
config.configure(KEY_ENABLE_OUTPUT1_AUTO_BYPASS, "false");
config.configure(KEY_ENABLE_OUTPUT1_AUTO_DIMMER, "true");
config.configure(KEY_ENABLE_OUTPUT1_DS18, "false");
config.configure(KEY_ENABLE_OUTPUT1_PZEM, "false");
config.configure(KEY_ENABLE_OUTPUT1_RELAY, "false");
config.configure(KEY_ENABLE_OUTPUT1, "false");
config.configure(KEY_ENABLE_OUTPUT2_AUTO_BYPASS, "false");
config.configure(KEY_ENABLE_OUTPUT2_AUTO_DIMMER, "true");
config.configure(KEY_ENABLE_OUTPUT2_DS18, "false");
config.configure(KEY_ENABLE_OUTPUT2_PZEM, "false");
config.configure(KEY_ENABLE_OUTPUT2_RELAY, "false");
config.configure(KEY_ENABLE_OUTPUT2, "false");
config.configure(KEY_ENABLE_RELAY1, "false");
config.configure(KEY_ENABLE_RELAY2, "false");
config.configure(KEY_ENABLE_ZCD, "false");
config.configure(KEY_ENABLE_AP_MODE, YASOLR_FALSE);
config.configure(KEY_ENABLE_DEBUG, YASOLR_FALSE);
config.configure(KEY_ENABLE_DISPLAY, YASOLR_FALSE);
config.configure(KEY_ENABLE_DS18_SYSTEM, YASOLR_FALSE);
config.configure(KEY_ENABLE_HA_DISCOVERY, YASOLR_FALSE);
config.configure(KEY_ENABLE_JSY, YASOLR_FALSE);
config.configure(KEY_ENABLE_LIGHTS, YASOLR_FALSE);
config.configure(KEY_ENABLE_MQTT, YASOLR_FALSE);
config.configure(KEY_ENABLE_OUTPUT1_AUTO_BYPASS, YASOLR_TRUE);
config.configure(KEY_ENABLE_OUTPUT1_AUTO_DIMMER, YASOLR_TRUE);
config.configure(KEY_ENABLE_OUTPUT1_DS18, YASOLR_FALSE);
config.configure(KEY_ENABLE_OUTPUT1_PZEM, YASOLR_FALSE);
config.configure(KEY_ENABLE_OUTPUT1_RELAY, YASOLR_FALSE);
config.configure(KEY_ENABLE_OUTPUT1, YASOLR_FALSE);
config.configure(KEY_ENABLE_OUTPUT2_AUTO_BYPASS, YASOLR_TRUE);
config.configure(KEY_ENABLE_OUTPUT2_AUTO_DIMMER, YASOLR_TRUE);
config.configure(KEY_ENABLE_OUTPUT2_DS18, YASOLR_FALSE);
config.configure(KEY_ENABLE_OUTPUT2_PZEM, YASOLR_FALSE);
config.configure(KEY_ENABLE_OUTPUT2_RELAY, YASOLR_FALSE);
config.configure(KEY_ENABLE_OUTPUT2, YASOLR_FALSE);
config.configure(KEY_ENABLE_RELAY1, YASOLR_FALSE);
config.configure(KEY_ENABLE_RELAY2, YASOLR_FALSE);
config.configure(KEY_ENABLE_ZCD, YASOLR_FALSE);
config.configure(KEY_GRID_FREQUENCY, "50");
config.configure(KEY_GRID_POWER_MQTT_TOPIC);
config.configure(KEY_GRID_VOLTAGE_MQTT_TOPIC);
Expand All @@ -71,22 +71,22 @@ Mycila::Task bootTask("Boot", [](void* params) {
config.configure(KEY_MQTT_PASSWORD);
config.configure(KEY_MQTT_PORT, "1883");
config.configure(KEY_MQTT_PUBLISH_INTERVAL, "5");
config.configure(KEY_MQTT_SECURED, "false");
config.configure(KEY_MQTT_SECURED, YASOLR_FALSE);
config.configure(KEY_MQTT_SERVER);
config.configure(KEY_MQTT_TOPIC, Mycila::AppInfo.defaultMqttClientId);
config.configure(KEY_MQTT_USERNAME, "homeassistant");
config.configure(KEY_NTP_SERVER, "pool.ntp.org");
config.configure(KEY_NTP_TIMEZONE, "Europe/Paris");
config.configure(KEY_OUTPUT1_DAYS, "sun,mon,tue,wed,thu,fri,sat");
config.configure(KEY_OUTPUT1_DAYS, YASOLR_WEEK_DAYS);
config.configure(KEY_OUTPUT1_DIMMER_LIMITER, String(YASOLR_DIMMER_MAX_LEVEL));
config.configure(KEY_OUTPUT1_RELAY_TYPE, "NO");
config.configure(KEY_OUTPUT1_RELAY_TYPE, YASOLR_RELAY_TYPE_NO);
config.configure(KEY_OUTPUT1_TEMPERATURE_START, String(YASOLR_OUTPUT_AUTO_START_TEMPERATURE));
config.configure(KEY_OUTPUT1_TEMPERATURE_STOP, String(YASOLR_OUTPUT_AUTO_STOP_TEMPERATURE));
config.configure(KEY_OUTPUT1_TIME_START, "22:00");
config.configure(KEY_OUTPUT1_TIME_STOP, "06:00");
config.configure(KEY_OUTPUT2_DAYS, "sun,mon,tue,wed,thu,fri,sat");
config.configure(KEY_OUTPUT2_DAYS, YASOLR_WEEK_DAYS);
config.configure(KEY_OUTPUT2_DIMMER_LIMITER, String(YASOLR_DIMMER_MAX_LEVEL));
config.configure(KEY_OUTPUT2_RELAY_TYPE, "NO");
config.configure(KEY_OUTPUT2_RELAY_TYPE, YASOLR_RELAY_TYPE_NO);
config.configure(KEY_OUTPUT2_TEMPERATURE_START, String(YASOLR_OUTPUT_AUTO_START_TEMPERATURE));
config.configure(KEY_OUTPUT2_TEMPERATURE_STOP, String(YASOLR_OUTPUT_AUTO_STOP_TEMPERATURE));
config.configure(KEY_OUTPUT2_TIME_START, "22:00");
Expand All @@ -111,9 +111,9 @@ Mycila::Task bootTask("Boot", [](void* params) {
config.configure(KEY_PIN_ROUTER_DS18, String(YASOLR_SYSTEM_TEMP_PIN));
config.configure(KEY_PIN_ZCD, String(YASOLR_ZCD_PIN));
config.configure(KEY_RELAY1_LOAD, "0");
config.configure(KEY_RELAY1_TYPE, "NO");
config.configure(KEY_RELAY1_TYPE, YASOLR_RELAY_TYPE_NO);
config.configure(KEY_RELAY2_LOAD, "0");
config.configure(KEY_RELAY2_TYPE, "NO");
config.configure(KEY_RELAY2_TYPE, YASOLR_RELAY_TYPE_NO);
config.configure(KEY_WIFI_PASSWORD);
config.configure(KEY_WIFI_SSID);

Expand Down
8 changes: 4 additions & 4 deletions src/init/Config.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,13 +80,13 @@ Mycila::Task initConfigTask("Init Config", [](void* params) {

// Electricity: Relays
if (config.getBool(KEY_ENABLE_OUTPUT1_RELAY))
bypassRelayO1.begin(config.get(KEY_PIN_OUTPUT1_RELAY).toInt(), config.get(KEY_OUTPUT1_RELAY_TYPE) == "NC" ? Mycila::RelayType::NC : Mycila::RelayType::NO);
bypassRelayO1.begin(config.get(KEY_PIN_OUTPUT1_RELAY).toInt(), config.get(KEY_OUTPUT1_RELAY_TYPE) == YASOLR_RELAY_TYPE_NC ? Mycila::RelayType::NC : Mycila::RelayType::NO);
if (config.getBool(KEY_ENABLE_OUTPUT2_RELAY))
bypassRelayO2.begin(config.get(KEY_PIN_OUTPUT2_RELAY).toInt(), config.get(KEY_OUTPUT2_RELAY_TYPE) == "NC" ? Mycila::RelayType::NC : Mycila::RelayType::NO);
bypassRelayO2.begin(config.get(KEY_PIN_OUTPUT2_RELAY).toInt(), config.get(KEY_OUTPUT2_RELAY_TYPE) == YASOLR_RELAY_TYPE_NC ? Mycila::RelayType::NC : Mycila::RelayType::NO);
if (config.getBool(KEY_ENABLE_RELAY1))
relay1.begin(config.get(KEY_PIN_RELAY1).toInt(), config.get(KEY_RELAY1_TYPE) == "NC" ? Mycila::RelayType::NC : Mycila::RelayType::NO);
relay1.begin(config.get(KEY_PIN_RELAY1).toInt(), config.get(KEY_RELAY1_TYPE) == YASOLR_RELAY_TYPE_NC ? Mycila::RelayType::NC : Mycila::RelayType::NO);
if (config.getBool(KEY_ENABLE_RELAY2))
relay2.begin(config.get(KEY_PIN_RELAY2).toInt(), config.get(KEY_RELAY2_TYPE) == "NC" ? Mycila::RelayType::NC : Mycila::RelayType::NO);
relay2.begin(config.get(KEY_PIN_RELAY2).toInt(), config.get(KEY_RELAY2_TYPE) == YASOLR_RELAY_TYPE_NC ? Mycila::RelayType::NC : Mycila::RelayType::NO);

// Electricity: JSY
if (config.getBool(KEY_ENABLE_JSY)) {
Expand Down
13 changes: 13 additions & 0 deletions src/init/Events.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -177,4 +177,17 @@ Mycila::Task initEventsTask("Init Events", [](void* params) {
logger.debug(TAG, "Output 2 Temperature changed to %.02f °C", temperature);
// mqttPublishTask.requestEarlyRun();
});

jsy.setCallback([](const Mycila::JSYEventType eventType) {
// TODO: update routing
// Serial.println("JSY event");
});
pzemO1.setCallback([](const Mycila::PZEMEventType eventType) {
// TODO: update routing
// Serial.println("PZEM 1 event");
});
pzemO2.setCallback([](const Mycila::PZEMEventType eventType) {
// TODO: update routing
// Serial.println("PZEM 2 event");
});
});
1 change: 0 additions & 1 deletion src/tasks/HADiscovery.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ Mycila::Task haDiscoveryTask("HADiscovery", Mycila::TaskType::ONCE, [](void* par
haDiscovery.publish(Mycila::HACounter("device_boots", "Device: Boot Count", "/system/device/boots", nullptr, nullptr, nullptr, Mycila::HACategory::DIAGNOSTIC));
haDiscovery.publish(Mycila::HACounter("device_uptime", "Device: Uptime", "/system/device/uptime", "duration", nullptr, "s", Mycila::HACategory::DIAGNOSTIC));
haDiscovery.publish(Mycila::HAGauge("device_heap_usage", "Device: Heap Usage", "/system/device/heap/usage", nullptr, "mdi:memory", "%", Mycila::HACategory::DIAGNOSTIC));
haDiscovery.publish(Mycila::HAGauge("device_heap_used", "Device: Heap Used", "/system/device/heap/used", "data_size", "mdi:memory", "B", Mycila::HACategory::DIAGNOSTIC));
haDiscovery.publish(Mycila::HAGauge("network_wifi_quality", "Net: WiFi Signal", "/system/network/wifi/quality", nullptr, "mdi:signal", "%", Mycila::HACategory::DIAGNOSTIC));
haDiscovery.publish(Mycila::HAGauge("network_wifi_rssi", "Net: WiFi RSSI", "/system/network/wifi/rssi", "signal_strength", "mdi:signal", "dBm", Mycila::HACategory::DIAGNOSTIC));
haDiscovery.publish(Mycila::HAText("device_id", "Device: ID", "/system/device/id", nullptr, "mdi:identifier", Mycila::HACategory::DIAGNOSTIC));
Expand Down

0 comments on commit 8c076fc

Please sign in to comment.