Compare commits
No commits in common. "master" and "v24.10.6" have entirely different histories.
@ -1,3 +1,3 @@
|
|||||||
# Upgrade Partition
|
# Upgrade Partition
|
||||||
|
|
||||||
This documentation has been moved and can be found here: <https://tbnobody.github.io/OpenDTU-docs/firmware/howto/upgrade_partition/>
|
This documentation will has been moved and can be found here: <https://tbnobody.github.io/OpenDTU-docs/firmware/howto/upgrade_partition/>
|
||||||
|
|||||||
@ -3,12 +3,9 @@
|
|||||||
|
|
||||||
#include "PinMapping.h"
|
#include "PinMapping.h"
|
||||||
#include <cstdint>
|
#include <cstdint>
|
||||||
#include <TaskSchedulerDeclarations.h>
|
|
||||||
#include <mutex>
|
|
||||||
#include <condition_variable>
|
|
||||||
|
|
||||||
#define CONFIG_FILENAME "/config.json"
|
#define CONFIG_FILENAME "/config.json"
|
||||||
#define CONFIG_VERSION 0x00011d00 // 0.1.29 // make sure to clean all after change
|
#define CONFIG_VERSION 0x00011c00 // 0.1.28 // make sure to clean all after change
|
||||||
|
|
||||||
#define WIFI_MAX_SSID_STRLEN 32
|
#define WIFI_MAX_SSID_STRLEN 32
|
||||||
#define WIFI_MAX_PASSWORD_STRLEN 64
|
#define WIFI_MAX_PASSWORD_STRLEN 64
|
||||||
@ -33,7 +30,6 @@
|
|||||||
#define CHAN_MAX_NAME_STRLEN 31
|
#define CHAN_MAX_NAME_STRLEN 31
|
||||||
|
|
||||||
#define DEV_MAX_MAPPING_NAME_STRLEN 63
|
#define DEV_MAX_MAPPING_NAME_STRLEN 63
|
||||||
#define LOCALE_STRLEN 2
|
|
||||||
|
|
||||||
struct CHANNEL_CONFIG_T {
|
struct CHANNEL_CONFIG_T {
|
||||||
uint16_t MaxChannelPower;
|
uint16_t MaxChannelPower;
|
||||||
@ -148,7 +144,7 @@ struct CONFIG_T {
|
|||||||
bool ScreenSaver;
|
bool ScreenSaver;
|
||||||
uint8_t Rotation;
|
uint8_t Rotation;
|
||||||
uint8_t Contrast;
|
uint8_t Contrast;
|
||||||
char Locale[LOCALE_STRLEN + 1];
|
uint8_t Language;
|
||||||
struct {
|
struct {
|
||||||
uint32_t Duration;
|
uint32_t Duration;
|
||||||
uint8_t Mode;
|
uint8_t Mode;
|
||||||
@ -165,32 +161,15 @@ struct CONFIG_T {
|
|||||||
|
|
||||||
class ConfigurationClass {
|
class ConfigurationClass {
|
||||||
public:
|
public:
|
||||||
void init(Scheduler& scheduler);
|
void init();
|
||||||
bool read();
|
bool read();
|
||||||
bool write();
|
bool write();
|
||||||
void migrate();
|
void migrate();
|
||||||
CONFIG_T const& get();
|
CONFIG_T& get();
|
||||||
|
|
||||||
class WriteGuard {
|
|
||||||
public:
|
|
||||||
WriteGuard();
|
|
||||||
CONFIG_T& getConfig();
|
|
||||||
~WriteGuard();
|
|
||||||
|
|
||||||
private:
|
|
||||||
std::unique_lock<std::mutex> _lock;
|
|
||||||
};
|
|
||||||
|
|
||||||
WriteGuard getWriteGuard();
|
|
||||||
|
|
||||||
INVERTER_CONFIG_T* getFreeInverterSlot();
|
INVERTER_CONFIG_T* getFreeInverterSlot();
|
||||||
INVERTER_CONFIG_T* getInverterConfig(const uint64_t serial);
|
INVERTER_CONFIG_T* getInverterConfig(const uint64_t serial);
|
||||||
void deleteInverterById(const uint8_t id);
|
void deleteInverterById(const uint8_t id);
|
||||||
|
|
||||||
private:
|
|
||||||
void loop();
|
|
||||||
|
|
||||||
Task _loopTask;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
extern ConfigurationClass Configuration;
|
extern ConfigurationClass Configuration;
|
||||||
|
|||||||
@ -40,7 +40,7 @@ public:
|
|||||||
void setContrast(const uint8_t contrast);
|
void setContrast(const uint8_t contrast);
|
||||||
void setStatus(const bool turnOn);
|
void setStatus(const bool turnOn);
|
||||||
void setOrientation(const uint8_t rotation = DISPLAY_ROTATION);
|
void setOrientation(const uint8_t rotation = DISPLAY_ROTATION);
|
||||||
void setLocale(const String& locale);
|
void setLanguage(const uint8_t language);
|
||||||
void setDiagramMode(DiagramMode_t mode);
|
void setDiagramMode(DiagramMode_t mode);
|
||||||
void setStartupDisplay();
|
void setStartupDisplay();
|
||||||
|
|
||||||
@ -65,7 +65,7 @@ private:
|
|||||||
|
|
||||||
DisplayType_t _display_type = DisplayType_t::None;
|
DisplayType_t _display_type = DisplayType_t::None;
|
||||||
DiagramMode_t _diagram_mode = DiagramMode_t::Off;
|
DiagramMode_t _diagram_mode = DiagramMode_t::Off;
|
||||||
String _display_language = DISPLAY_LOCALE;
|
uint8_t _display_language = DISPLAY_LANGUAGE;
|
||||||
uint8_t _mExtra;
|
uint8_t _mExtra;
|
||||||
const uint16_t _period = 1000;
|
const uint16_t _period = 1000;
|
||||||
const uint16_t _interval = 60000; // interval at which to power save (milliseconds)
|
const uint16_t _interval = 60000; // interval at which to power save (milliseconds)
|
||||||
@ -73,15 +73,6 @@ private:
|
|||||||
char _fmtText[32];
|
char _fmtText[32];
|
||||||
bool _isLarge = false;
|
bool _isLarge = false;
|
||||||
uint8_t _lineOffsets[5];
|
uint8_t _lineOffsets[5];
|
||||||
|
|
||||||
String _i18n_offline;
|
|
||||||
String _i18n_yield_today_kwh;
|
|
||||||
String _i18n_yield_today_wh;
|
|
||||||
String _i18n_date_format;
|
|
||||||
String _i18n_current_power_kw;
|
|
||||||
String _i18n_current_power_w;
|
|
||||||
String _i18n_yield_total_mwh;
|
|
||||||
String _i18n_yield_total_kwh;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
extern DisplayGraphicClass Display;
|
extern DisplayGraphicClass Display;
|
||||||
|
|||||||
@ -1,35 +0,0 @@
|
|||||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
|
||||||
#pragma once
|
|
||||||
|
|
||||||
#include <TaskSchedulerDeclarations.h>
|
|
||||||
#include <WString.h>
|
|
||||||
#include <list>
|
|
||||||
|
|
||||||
struct LanguageInfo_t {
|
|
||||||
String code;
|
|
||||||
String name;
|
|
||||||
String filename;
|
|
||||||
};
|
|
||||||
|
|
||||||
class I18nClass {
|
|
||||||
public:
|
|
||||||
I18nClass();
|
|
||||||
void init(Scheduler& scheduler);
|
|
||||||
std::list<LanguageInfo_t> getAvailableLanguages();
|
|
||||||
String getFilenameByLocale(const String& locale) const;
|
|
||||||
void readDisplayStrings(
|
|
||||||
const String& locale,
|
|
||||||
String& date_format,
|
|
||||||
String& offline,
|
|
||||||
String& power_w, String& power_kw,
|
|
||||||
String& yield_today_wh, String& yield_today_kwh,
|
|
||||||
String& yield_total_kwh, String& yield_total_mwh);
|
|
||||||
|
|
||||||
private:
|
|
||||||
void readLangPacks();
|
|
||||||
void readConfig(String file);
|
|
||||||
|
|
||||||
std::list<LanguageInfo_t> _availLanguages;
|
|
||||||
};
|
|
||||||
|
|
||||||
extern I18nClass I18n;
|
|
||||||
@ -20,7 +20,7 @@ public:
|
|||||||
void unsubscribe(const String& topic);
|
void unsubscribe(const String& topic);
|
||||||
|
|
||||||
String getPrefix() const;
|
String getPrefix() const;
|
||||||
String getClientId() const;
|
String getClientId();
|
||||||
|
|
||||||
private:
|
private:
|
||||||
void NetworkEvent(network_event event);
|
void NetworkEvent(network_event event);
|
||||||
|
|||||||
@ -59,8 +59,6 @@ public:
|
|||||||
bool init(const String& deviceMapping);
|
bool init(const String& deviceMapping);
|
||||||
PinMapping_t& get();
|
PinMapping_t& get();
|
||||||
|
|
||||||
bool isMappingSelected() const { return _mappingSelected; }
|
|
||||||
|
|
||||||
bool isValidNrf24Config() const;
|
bool isValidNrf24Config() const;
|
||||||
bool isValidCmt2300Config() const;
|
bool isValidCmt2300Config() const;
|
||||||
bool isValidW5500Config() const;
|
bool isValidW5500Config() const;
|
||||||
@ -70,8 +68,6 @@ public:
|
|||||||
|
|
||||||
private:
|
private:
|
||||||
PinMapping_t _pinMapping;
|
PinMapping_t _pinMapping;
|
||||||
|
|
||||||
bool _mappingSelected = false;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
extern PinMappingClass PinMapping;
|
extern PinMappingClass PinMapping;
|
||||||
|
|||||||
@ -2,7 +2,6 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include <ArduinoJson.h>
|
#include <ArduinoJson.h>
|
||||||
#include <LittleFS.h>
|
|
||||||
#include <cstdint>
|
#include <cstdint>
|
||||||
|
|
||||||
class Utils {
|
class Utils {
|
||||||
@ -12,6 +11,4 @@ public:
|
|||||||
static int getTimezoneOffset();
|
static int getTimezoneOffset();
|
||||||
static bool checkJsonAlloc(const JsonDocument& doc, const char* function, const uint16_t line);
|
static bool checkJsonAlloc(const JsonDocument& doc, const char* function, const uint16_t line);
|
||||||
static void removeAllFiles();
|
static void removeAllFiles();
|
||||||
static String generateMd5FromFile(String file);
|
|
||||||
static void skipBom(File& f);
|
|
||||||
};
|
};
|
||||||
|
|||||||
@ -1,15 +1,14 @@
|
|||||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
|
#include "WebApi_config.h"
|
||||||
#include "WebApi_device.h"
|
#include "WebApi_device.h"
|
||||||
#include "WebApi_devinfo.h"
|
#include "WebApi_devinfo.h"
|
||||||
#include "WebApi_dtu.h"
|
#include "WebApi_dtu.h"
|
||||||
#include "WebApi_errors.h"
|
#include "WebApi_errors.h"
|
||||||
#include "WebApi_eventlog.h"
|
#include "WebApi_eventlog.h"
|
||||||
#include "WebApi_file.h"
|
|
||||||
#include "WebApi_firmware.h"
|
#include "WebApi_firmware.h"
|
||||||
#include "WebApi_gridprofile.h"
|
#include "WebApi_gridprofile.h"
|
||||||
#include "WebApi_i18n.h"
|
|
||||||
#include "WebApi_inverter.h"
|
#include "WebApi_inverter.h"
|
||||||
#include "WebApi_limit.h"
|
#include "WebApi_limit.h"
|
||||||
#include "WebApi_maintenance.h"
|
#include "WebApi_maintenance.h"
|
||||||
@ -47,14 +46,13 @@ public:
|
|||||||
private:
|
private:
|
||||||
AsyncWebServer _server;
|
AsyncWebServer _server;
|
||||||
|
|
||||||
|
WebApiConfigClass _webApiConfig;
|
||||||
WebApiDeviceClass _webApiDevice;
|
WebApiDeviceClass _webApiDevice;
|
||||||
WebApiDevInfoClass _webApiDevInfo;
|
WebApiDevInfoClass _webApiDevInfo;
|
||||||
WebApiDtuClass _webApiDtu;
|
WebApiDtuClass _webApiDtu;
|
||||||
WebApiEventlogClass _webApiEventlog;
|
WebApiEventlogClass _webApiEventlog;
|
||||||
WebApiFileClass _webApiFile;
|
|
||||||
WebApiFirmwareClass _webApiFirmware;
|
WebApiFirmwareClass _webApiFirmware;
|
||||||
WebApiGridProfileClass _webApiGridprofile;
|
WebApiGridProfileClass _webApiGridprofile;
|
||||||
WebApiI18nClass _webApiI18n;
|
|
||||||
WebApiInverterClass _webApiInverter;
|
WebApiInverterClass _webApiInverter;
|
||||||
WebApiLimitClass _webApiLimit;
|
WebApiLimitClass _webApiLimit;
|
||||||
WebApiMaintenanceClass _webApiMaintenance;
|
WebApiMaintenanceClass _webApiMaintenance;
|
||||||
|
|||||||
17
include/WebApi_config.h
Normal file
17
include/WebApi_config.h
Normal file
@ -0,0 +1,17 @@
|
|||||||
|
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include <ESPAsyncWebServer.h>
|
||||||
|
#include <TaskSchedulerDeclarations.h>
|
||||||
|
|
||||||
|
class WebApiConfigClass {
|
||||||
|
public:
|
||||||
|
void init(AsyncWebServer& server, Scheduler& scheduler);
|
||||||
|
|
||||||
|
private:
|
||||||
|
void onConfigGet(AsyncWebServerRequest* request);
|
||||||
|
void onConfigDelete(AsyncWebServerRequest* request);
|
||||||
|
void onConfigListGet(AsyncWebServerRequest* request);
|
||||||
|
void onConfigUploadFinish(AsyncWebServerRequest* request);
|
||||||
|
void onConfigUpload(AsyncWebServerRequest* request, String filename, size_t index, uint8_t* data, size_t len, bool final);
|
||||||
|
};
|
||||||
@ -18,10 +18,9 @@ enum WebApiError {
|
|||||||
DtuInvalidCmtFrequency,
|
DtuInvalidCmtFrequency,
|
||||||
DtuInvalidCmtCountry,
|
DtuInvalidCmtCountry,
|
||||||
|
|
||||||
FileBase = 3000,
|
ConfigBase = 3000,
|
||||||
FileNotDeleted,
|
ConfigNotDeleted,
|
||||||
FileSuccess,
|
ConfigSuccess,
|
||||||
FileDeleteSuccess,
|
|
||||||
|
|
||||||
InverterBase = 4000,
|
InverterBase = 4000,
|
||||||
InverterSerialZero,
|
InverterSerialZero,
|
||||||
|
|||||||
@ -1,18 +0,0 @@
|
|||||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
|
||||||
#pragma once
|
|
||||||
|
|
||||||
#include <ESPAsyncWebServer.h>
|
|
||||||
#include <TaskSchedulerDeclarations.h>
|
|
||||||
|
|
||||||
class WebApiFileClass {
|
|
||||||
public:
|
|
||||||
void init(AsyncWebServer& server, Scheduler& scheduler);
|
|
||||||
|
|
||||||
private:
|
|
||||||
void onFileGet(AsyncWebServerRequest* request);
|
|
||||||
void onFileDelete(AsyncWebServerRequest* request);
|
|
||||||
void onFileDeleteAll(AsyncWebServerRequest* request);
|
|
||||||
void onFileListGet(AsyncWebServerRequest* request);
|
|
||||||
void onFileUploadFinish(AsyncWebServerRequest* request);
|
|
||||||
void onFileUpload(AsyncWebServerRequest* request, String filename, size_t index, uint8_t* data, size_t len, bool final);
|
|
||||||
};
|
|
||||||
@ -1,14 +0,0 @@
|
|||||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
|
||||||
#pragma once
|
|
||||||
|
|
||||||
#include <ESPAsyncWebServer.h>
|
|
||||||
#include <TaskSchedulerDeclarations.h>
|
|
||||||
|
|
||||||
class WebApiI18nClass {
|
|
||||||
public:
|
|
||||||
void init(AsyncWebServer& server, Scheduler& scheduler);
|
|
||||||
|
|
||||||
private:
|
|
||||||
void onI18nLanguages(AsyncWebServerRequest* request);
|
|
||||||
void onI18nLanguage(AsyncWebServerRequest* request);
|
|
||||||
};
|
|
||||||
@ -12,7 +12,7 @@ public:
|
|||||||
|
|
||||||
private:
|
private:
|
||||||
AsyncWebSocket _ws;
|
AsyncWebSocket _ws;
|
||||||
AsyncAuthenticationMiddleware _simpleDigestAuth;
|
AuthenticationMiddleware _simpleDigestAuth;
|
||||||
|
|
||||||
Task _wsCleanupTask;
|
Task _wsCleanupTask;
|
||||||
void wsCleanupTaskCb();
|
void wsCleanupTaskCb();
|
||||||
|
|||||||
@ -25,7 +25,7 @@ private:
|
|||||||
void onWebsocketEvent(AsyncWebSocket* server, AsyncWebSocketClient* client, AwsEventType type, void* arg, uint8_t* data, size_t len);
|
void onWebsocketEvent(AsyncWebSocket* server, AsyncWebSocketClient* client, AwsEventType type, void* arg, uint8_t* data, size_t len);
|
||||||
|
|
||||||
AsyncWebSocket _ws;
|
AsyncWebSocket _ws;
|
||||||
AsyncAuthenticationMiddleware _simpleDigestAuth;
|
AuthenticationMiddleware _simpleDigestAuth;
|
||||||
|
|
||||||
uint32_t _lastPublishStats[INV_MAX_COUNT] = { 0 };
|
uint32_t _lastPublishStats[INV_MAX_COUNT] = { 0 };
|
||||||
|
|
||||||
|
|||||||
@ -99,7 +99,7 @@
|
|||||||
#define DISPLAY_SCREENSAVER true
|
#define DISPLAY_SCREENSAVER true
|
||||||
#define DISPLAY_ROTATION 2U
|
#define DISPLAY_ROTATION 2U
|
||||||
#define DISPLAY_CONTRAST 60U
|
#define DISPLAY_CONTRAST 60U
|
||||||
#define DISPLAY_LOCALE "en"
|
#define DISPLAY_LANGUAGE 0U
|
||||||
#define DISPLAY_DIAGRAM_DURATION (10UL * 60UL * 60UL)
|
#define DISPLAY_DIAGRAM_DURATION (10UL * 60UL * 60UL)
|
||||||
#define DISPLAY_DIAGRAM_MODE 1U
|
#define DISPLAY_DIAGRAM_MODE 1U
|
||||||
|
|
||||||
@ -108,5 +108,3 @@
|
|||||||
#define LED_BRIGHTNESS 100U
|
#define LED_BRIGHTNESS 100U
|
||||||
|
|
||||||
#define MAX_INVERTER_LIMIT 2250
|
#define MAX_INVERTER_LIMIT 2250
|
||||||
|
|
||||||
#define LANG_PACK_SUFFIX ".lang.json"
|
|
||||||
|
|||||||
@ -1,9 +0,0 @@
|
|||||||
# Language Packs
|
|
||||||
|
|
||||||
This folder contains language packs for OpenDTU which can be uploaded to the
|
|
||||||
device using the "Config Management" function.
|
|
||||||
Select "Language Pack" in the restore section, select a `.json` file containing
|
|
||||||
your language and press "Restore". Afterwards all language selection drop down
|
|
||||||
menues contain the new language.
|
|
||||||
|
|
||||||
Create a pull to request to share your own language pack (or corrections) with the community.
|
|
||||||
@ -1,696 +0,0 @@
|
|||||||
{
|
|
||||||
"meta": {
|
|
||||||
"name": "Español",
|
|
||||||
"code": "es"
|
|
||||||
},
|
|
||||||
"display": {
|
|
||||||
"date_format": "%d/%m/%Y %H:%M",
|
|
||||||
"offline": "Apagado",
|
|
||||||
"power_w": "%.0f W",
|
|
||||||
"power_kw": "%.1f kW",
|
|
||||||
"yield_today_wh": "Hoy: %4.0f Wh",
|
|
||||||
"yield_today_kwh": "Hoy: %.1f kWh",
|
|
||||||
"yield_total_kwh": "Total: %.1f kWh",
|
|
||||||
"yield_total_mwh": "Total: %.0f kWh"
|
|
||||||
},
|
|
||||||
"webapp": {
|
|
||||||
"menu": {
|
|
||||||
"LiveView": "Vista en directo",
|
|
||||||
"Settings": "Ajustes",
|
|
||||||
"NetworkSettings": "Ajustes de Red",
|
|
||||||
"NTPSettings": "Ajustes NTP",
|
|
||||||
"MQTTSettings": "Ajustes MQTT",
|
|
||||||
"InverterSettings": "Ajustes Inversor",
|
|
||||||
"SecuritySettings": "Ajustes Seguridad",
|
|
||||||
"DTUSettings": "Ajustes DTU",
|
|
||||||
"DeviceManager": "Administrador Dispositivos",
|
|
||||||
"ConfigManagement": "Gestión configuración",
|
|
||||||
"FirmwareUpgrade": "Actualización Firmware",
|
|
||||||
"DeviceReboot": "Reinicio Dispositivo",
|
|
||||||
"Info": "Info",
|
|
||||||
"System": "Sistema",
|
|
||||||
"Network": "Red",
|
|
||||||
"NTP": "NTP",
|
|
||||||
"MQTT": "MQTT",
|
|
||||||
"Console": "Consola",
|
|
||||||
"About": "Acerca",
|
|
||||||
"Logout": "Logout",
|
|
||||||
"Login": "Login"
|
|
||||||
},
|
|
||||||
"base": {
|
|
||||||
"Loading": "Cargando...",
|
|
||||||
"Reload": "Recargar",
|
|
||||||
"Cancel": "Cancelar",
|
|
||||||
"Save": "Guardar",
|
|
||||||
"Refreshing": "Refrescando",
|
|
||||||
"Pull": "Tira hacia abajo para refrescar",
|
|
||||||
"Release": "Soltar para refrescar",
|
|
||||||
"Close": "Cerrar",
|
|
||||||
"Yes": "Yes",
|
|
||||||
"No": "No"
|
|
||||||
},
|
|
||||||
"wait": {
|
|
||||||
"NotReady": "OpenDTU is not yet ready",
|
|
||||||
"PleaseWait": "Please wait. You will be automatically redirected to the home page."
|
|
||||||
},
|
|
||||||
"Error": {
|
|
||||||
"Oops": "Oops!"
|
|
||||||
},
|
|
||||||
"localeswitcher": {
|
|
||||||
"Dark": "Oscuro",
|
|
||||||
"Light": "Claro",
|
|
||||||
"Auto": "Automático"
|
|
||||||
},
|
|
||||||
"apiresponse": {
|
|
||||||
"1001": "¡Opciones guardadas!",
|
|
||||||
"1002": "No se encontraron valores",
|
|
||||||
"1003": "Datos demasiado grandes",
|
|
||||||
"1004": "Fallo al procesar los datos",
|
|
||||||
"1005": "Faltan valores",
|
|
||||||
"1006": "Fallo en la escritura",
|
|
||||||
"2001": "¡El número de serie no puede ser cero!",
|
|
||||||
"2002": "Intervalo de Poll interval debe ser mayor que cero!",
|
|
||||||
"2003": "Configuración de potencia incorrecta!",
|
|
||||||
"2004": "La frecuencia debe estar entre {min} y {max} kHz y debe ser un múltiplo de 250 kHz!",
|
|
||||||
"2005": "Modelo desconocido! Por favor, informe el \"Modelo de pieza de hardware\" y el modelo (por ejemplo, HM-350) como un problema en <a href=\"https://github.com/tbnobody/OpenDTU/issues\" target=\"_blank\">aquí</a>.",
|
|
||||||
"3001": "No se eliminó nada",
|
|
||||||
"3002": "Configuración borrada. Reinicio en curso...",
|
|
||||||
"4001": "@:apiresponse.2001",
|
|
||||||
"4002": "El nombre debe tener entre 1 y {max} caracteres de longitud!",
|
|
||||||
"4003": "Solo se admiten {max} inversores!",
|
|
||||||
"4004": "Inversor creado!",
|
|
||||||
"4005": "ID no válido especificado",
|
|
||||||
"4006": "Cantidad de canales máxima incorrecta dada!",
|
|
||||||
"4007": "Inversor modificado!",
|
|
||||||
"4008": "Inversor eliminado!",
|
|
||||||
"4009": "Orden de inversores guardado!",
|
|
||||||
"5001": "@:apiresponse.2001",
|
|
||||||
"5002": "Límite debe estar entre 1 y {max}!",
|
|
||||||
"5003": "Tipo incorrecto especificado!",
|
|
||||||
"5004": "Inversor incorrecto especificado!",
|
|
||||||
"6001": "Reinicio desencadenado!",
|
|
||||||
"6002": "Reinicio cancelado!",
|
|
||||||
"7001": "¡El servidor MQTT debe tener entre 1 y {max} caracteres de longitud!",
|
|
||||||
"7002": "¡El nombre de usuario debe no tener más de {max} caracteres!",
|
|
||||||
"7003": "¡La contraseña debe no tener más de {max} caracteres!",
|
|
||||||
"7004": "¡El tema debe tener entre 1 y {max} caracteres de longitud!",
|
|
||||||
"7005": "¡El tema no debe contener caracteres de espacio!",
|
|
||||||
"7006": "¡El tema debe terminar con barra inclinada (/)!",
|
|
||||||
"7007": "¡El puerto debe ser un número entre 1 y 65535!",
|
|
||||||
"7008": "¡El certificado debe tener entre 1 y {max} caracteres de longitud!",
|
|
||||||
"7009": "¡El tema LWT debe tener entre 1 y {max} caracteres de longitud!",
|
|
||||||
"7010": "¡El tema LWT no debe contener caracteres de espacio!",
|
|
||||||
"7011": "¡El valor LWT en línea debe tener entre 1 y {max} caracteres de longitud!",
|
|
||||||
"7012": "¡El valor LWT fuera de línea debe tener entre 1 y {max} caracteres de longitud!",
|
|
||||||
"7013": "¡El intervalo de publicación debe ser un número entre {min} y {max}!",
|
|
||||||
"7014": "¡El tema Hass debe tener entre 1 y {max} caracteres de longitud!",
|
|
||||||
"7015": "¡El tema Hass no debe contener caracteres de espacio!",
|
|
||||||
"7016": "¡La QoS LWT no debe ser mayor que {max}!",
|
|
||||||
"7017": "Client ID must not longer then {max} characters!",
|
|
||||||
"8001": "¡La dirección IP no es válida!",
|
|
||||||
"8002": "¡La máscara de red no es válida!",
|
|
||||||
"8003": "¡El gateway no es válido!",
|
|
||||||
"8004": "¡La dirección IP del servidor DNS 1 no es válida!",
|
|
||||||
"8005": "¡La dirección IP del servidor DNS 2 no es válida!",
|
|
||||||
"8006": "¡El valor de tiempo de espera del punto de acceso administrativo es inválido!",
|
|
||||||
"9001": "¡El servidor NTP debe tener entre 1 y {max} caracteres de longitud!",
|
|
||||||
"9002": "¡La zona horaria debe tener entre 1 y {max} caracteres de longitud!",
|
|
||||||
"9003": "¡La descripción de la zona horaria debe tener entre 1 y {max} caracteres de longitud!",
|
|
||||||
"9004": "¡El año debe ser un número entre {min} y {max}!",
|
|
||||||
"9005": "¡El mes debe ser un número entre {min} y {max}!",
|
|
||||||
"9006": "¡El día debe ser un número entre {min} y {max}!",
|
|
||||||
"9007": "¡La hora debe ser un número entre {min} y {max}!",
|
|
||||||
"9008": "¡Los minutos deben ser un número entre {min} y {max}!",
|
|
||||||
"9009": "¡Los segundos deben ser un número entre {min} y {max}!",
|
|
||||||
"9010": "¡Hora actualizada!",
|
|
||||||
"10001": "¡La contraseña debe tener entre 8 y {max} caracteres de longitud!",
|
|
||||||
"10002": "¡Autenticación exitosa!",
|
|
||||||
"11001": "¡@:apiresponse.2001",
|
|
||||||
"11002": "¡@:apiresponse:5004",
|
|
||||||
"12001": "¡El perfil debe tener entre 1 y {max} caracteres de longitud!"
|
|
||||||
},
|
|
||||||
"home": {
|
|
||||||
"LiveData": "Datos en Vivo",
|
|
||||||
"SerialNumber": "Número de Serie: ",
|
|
||||||
"CurrentLimit": "Límite de Corriente: ",
|
|
||||||
"DataAge": "Edad de los Datos: ",
|
|
||||||
"Seconds": "{val} segundos",
|
|
||||||
"ShowSetInverterLimit": "Ver / Establecer Límite del Inversor",
|
|
||||||
"TurnOnOff": "Encender/Apagar el Inversor",
|
|
||||||
"ShowInverterInfo": "Ver Información del Inversor",
|
|
||||||
"ShowEventlog": "Ver Registro de Eventos",
|
|
||||||
"UnreadMessages": "mensajes sin leer",
|
|
||||||
"Loading": "@:base.Cargando",
|
|
||||||
"EventLog": "Registro de Eventos",
|
|
||||||
"InverterInfo": "Información del Inversor",
|
|
||||||
"LimitSettings": "Configuración de Límites",
|
|
||||||
"LastLimitSetStatus": "Último Estado de Configuración del Límite:",
|
|
||||||
"SetLimit": "Establecer Límite:",
|
|
||||||
"Relative": "Relativo (%)",
|
|
||||||
"Absolute": "Absoluto (W)",
|
|
||||||
"LimitHint": "<b>Consejo:</b> Si establece el límite como un valor absoluto, la visualización del valor actual solo se actualizará después de ~4 minutos.",
|
|
||||||
"SetPersistent": "Establecer Límite Permanente",
|
|
||||||
"SetNonPersistent": "Establecer Límite No Permanente",
|
|
||||||
"PowerSettings": "Configuración de Energía",
|
|
||||||
"LastPowerSetStatus": "Último Estado de Configuración de Energía:",
|
|
||||||
"TurnOn": "Encender",
|
|
||||||
"TurnOff": "Apagar",
|
|
||||||
"Restart": "Reiniciar",
|
|
||||||
"Failure": "Fallo",
|
|
||||||
"Pending": "Pendiente",
|
|
||||||
"Ok": "Aceptar",
|
|
||||||
"Unknown": "Desconocido",
|
|
||||||
"ShowGridProfile": "Ver Perfil de la Red",
|
|
||||||
"GridProfile": "Perfil de la Red",
|
|
||||||
"LoadingInverter": "Waiting for data... (can take up to 10 seconds)",
|
|
||||||
"RadioStats": "Radio Statistics",
|
|
||||||
"TxRequest": "TX Request Count",
|
|
||||||
"RxSuccess": "RX Success",
|
|
||||||
"RxFailNothing": "RX Fail: Receive Nothing",
|
|
||||||
"RxFailPartial": "RX Fail: Receive Partial",
|
|
||||||
"RxFailCorrupt": "RX Fail: Receive Corrupt",
|
|
||||||
"TxReRequest": "TX Re-Request Fragment",
|
|
||||||
"StatsReset": "Reset Statistics",
|
|
||||||
"StatsResetting": "Resetting...",
|
|
||||||
"Rssi": "RSSI of last received packet",
|
|
||||||
"RssiHint": "HM inverters only support RSSI values < -64 dBm and > -64 dBm. In this case, -80 dbm and -30 dbm is shown.",
|
|
||||||
"dBm": "{dbm} dBm"
|
|
||||||
},
|
|
||||||
"eventlog": {
|
|
||||||
"Start": "Iniciar",
|
|
||||||
"Stop": "Parar",
|
|
||||||
"Id": "ID",
|
|
||||||
"Message": "Mensaje"
|
|
||||||
},
|
|
||||||
"devinfo": {
|
|
||||||
"NoInfo": "Sin información disponible",
|
|
||||||
"NoInfoLong": "No se ha recibido ningún dato válido del inversor hasta ahora. Todavía estamos intentando...",
|
|
||||||
"UnknownModel": "¡Modelo desconocido! Por favor, informe el \"Número de parte de hardware\" y el modelo (por ejemplo, HM-350) como un problema <a href=\"https://github.com/tbnobody/OpenDTU/issues\" target=\"_blank\">aquí</a>.",
|
|
||||||
"Serial": "Número de serie",
|
|
||||||
"ProdYear": "Año de producción",
|
|
||||||
"ProdWeek": "Semana de producción",
|
|
||||||
"Model": "Modelo",
|
|
||||||
"DetectedMaxPower": "Potencia máxima detectada",
|
|
||||||
"BootloaderVersion": "Versión del cargador de arranque",
|
|
||||||
"FirmwareVersion": "Versión del firmware",
|
|
||||||
"FirmwareBuildDate": "Fecha de construcción del firmware",
|
|
||||||
"HardwarePartNumber": "Número de parte de hardware",
|
|
||||||
"HardwareVersion": "Versión de hardware",
|
|
||||||
"SupportsPowerDistributionLogic": "'Power Distribution Logic' supported",
|
|
||||||
"Yes": "@:base.Yes",
|
|
||||||
"No": "@:base.No"
|
|
||||||
},
|
|
||||||
"gridprofile": {
|
|
||||||
"NoInfo": "@:devinfo.NoInfo",
|
|
||||||
"NoInfoLong": "@:devinfo.NoInfoLong",
|
|
||||||
"Name": "Nombre",
|
|
||||||
"Version": "Versión",
|
|
||||||
"Enabled": "@:wifistationinfo.Enabled",
|
|
||||||
"Disabled": "@:wifistationinfo.Disabled",
|
|
||||||
"GridprofileSupport": "Apoyar el desarrollo",
|
|
||||||
"GridprofileSupportLong": "Por favor, consulte <a href=\"https://github.com/tbnobody/OpenDTU/wiki/Grid-Profile-Parser\" target=\"_blank\">aquí</a> para obtener más información."
|
|
||||||
},
|
|
||||||
"systeminfo": {
|
|
||||||
"SystemInfo": "Información del sistema",
|
|
||||||
"VersionError": "Error al obtener información de la versión",
|
|
||||||
"VersionNew": "¡Nueva versión disponible! ¡Mostrar cambios!",
|
|
||||||
"VersionOk": "¡Actualizado!"
|
|
||||||
},
|
|
||||||
"firmwareinfo": {
|
|
||||||
"FirmwareInformation": "Información del firmware",
|
|
||||||
"Hostname": "Hostname",
|
|
||||||
"SdkVersion": "Versión del SDK",
|
|
||||||
"ConfigVersion": "Versión de la configuración",
|
|
||||||
"FirmwareVersion": "Versión del firmware / Hash de Git",
|
|
||||||
"PioEnv": "Entorno PIO",
|
|
||||||
"FirmwareVersionHint": "Haga clic aquí para mostrar información sobre su versión actual",
|
|
||||||
"FirmwareUpdate": "Actualización de firmware",
|
|
||||||
"FirmwareUpdateHint": "Haga clic aquí para ver las diferencias entre su versión y la última versión",
|
|
||||||
"FrmwareUpdateAllow": "Al activar la comprobación de actualización, se envía una solicitud a GitHub.com cada vez que se llama a la página para recuperar la versión actualmente disponible. Si no está de acuerdo con esto, deje esta función desactivada.",
|
|
||||||
"ResetReason0": "Razón de reinicio CPU 0",
|
|
||||||
"ResetReason1": "Razón de reinicio CPU 1",
|
|
||||||
"ConfigSaveCount": "Contador de guardado de configuración",
|
|
||||||
"Uptime": "Tiempo de actividad",
|
|
||||||
"UptimeValue": "0 días {time} | 1 día {time} | {count} días {time}"
|
|
||||||
},
|
|
||||||
"hardwareinfo": {
|
|
||||||
"HardwareInformation": "Información del hardware",
|
|
||||||
"ChipModel": "Modelo de chip",
|
|
||||||
"ChipRevision": "Revisión de chip",
|
|
||||||
"ChipCores": "Núcleos del chip",
|
|
||||||
"CpuFrequency": "Frecuencia de la CPU",
|
|
||||||
"Mhz": "MHz",
|
|
||||||
"CpuTemperature": "CPU Temperature",
|
|
||||||
"FlashSize": "Flash Memory Size"
|
|
||||||
},
|
|
||||||
"memoryinfo": {
|
|
||||||
"MemoryInformation": "Información de la memoria",
|
|
||||||
"Type": "Tipo",
|
|
||||||
"Usage": "Uso",
|
|
||||||
"Free": "Libre",
|
|
||||||
"Used": "Usado",
|
|
||||||
"Size": "Tamaño",
|
|
||||||
"Heap": "Montón",
|
|
||||||
"PsRam": "PSRAM",
|
|
||||||
"LittleFs": "LittleFs",
|
|
||||||
"Sketch": "Boceto"
|
|
||||||
},
|
|
||||||
"heapdetails": {
|
|
||||||
"HeapDetails": "Detalles del montón",
|
|
||||||
"TotalFree": "Total libre",
|
|
||||||
"LargestFreeBlock": "Bloque libre contiguo más grande",
|
|
||||||
"MaxUsage": "Uso máximo desde el inicio",
|
|
||||||
"Fragmentation": "Nivel de fragmentación"
|
|
||||||
},
|
|
||||||
"taskdetails": {
|
|
||||||
"TaskDetails": "Task Details",
|
|
||||||
"Name": "Name",
|
|
||||||
"StackFree": "Stack Free",
|
|
||||||
"Priority": "Priority",
|
|
||||||
"Task_idle0": "Idle (CPU Core 0)",
|
|
||||||
"Task_idle1": "Idle (CPU Core 1)",
|
|
||||||
"Task_wifi": "Wi-Fi",
|
|
||||||
"Task_tit": "TCP/IP",
|
|
||||||
"Task_looptask": "Arduino Main Loop",
|
|
||||||
"Task_asynctcp": "Async TCP",
|
|
||||||
"Task_mqttclient": "MQTT Client",
|
|
||||||
"Task_huaweican0": "AC Charger CAN",
|
|
||||||
"Task_pmsdm": "PowerMeter (SDM)",
|
|
||||||
"Task_pmhttpjson": "PowerMeter (HTTP+JSON)",
|
|
||||||
"Task_pmsml": "PowerMeter (Serial SML)",
|
|
||||||
"Task_pmhttpsml": "PowerMeter (HTTP+SML)"
|
|
||||||
},
|
|
||||||
"radioinfo": {
|
|
||||||
"RadioInformation": "Información de la radio",
|
|
||||||
"Status": "Estado de {module}",
|
|
||||||
"ChipStatus": "Estado del chip de {module}",
|
|
||||||
"ChipType": "Tipo de chip de {module}",
|
|
||||||
"Connected": "conectado",
|
|
||||||
"NotConnected": "no conectado",
|
|
||||||
"Configured": "configurado",
|
|
||||||
"NotConfigured": "no configurado",
|
|
||||||
"Unknown": "Desconocido"
|
|
||||||
},
|
|
||||||
"networkinfo": {
|
|
||||||
"NetworkInformation": "Información de la red"
|
|
||||||
},
|
|
||||||
"wifistationinfo": {
|
|
||||||
"WifiStationInfo": "Información de WiFi (Estación)",
|
|
||||||
"Status": "Estado",
|
|
||||||
"Enabled": "habilitado",
|
|
||||||
"Disabled": "deshabilitado",
|
|
||||||
"Ssid": "SSID",
|
|
||||||
"Bssid": "BSSID",
|
|
||||||
"Quality": "Calidad",
|
|
||||||
"Rssi": "RSSI"
|
|
||||||
},
|
|
||||||
"wifiapinfo": {
|
|
||||||
"WifiApInfo": "Información de WiFi (Punto de acceso)",
|
|
||||||
"Status": "@:wifistationinfo.Status",
|
|
||||||
"Enabled": "@:wifistationinfo.Enabled",
|
|
||||||
"Disabled": "@:wifistationinfo.Disabled",
|
|
||||||
"Ssid": "@:wifistationinfo.Ssid",
|
|
||||||
"Stations": "# Estaciones"
|
|
||||||
},
|
|
||||||
"interfacenetworkinfo": {
|
|
||||||
"NetworkInterface": "Interfaz de red ({iface})",
|
|
||||||
"Hostname": "@:firmwareinfo.Hostname",
|
|
||||||
"IpAddress": "Dirección IP",
|
|
||||||
"Netmask": "Máscara de red",
|
|
||||||
"DefaultGateway": "Puerta de enlace predeterminada",
|
|
||||||
"Dns": "DNS {num}",
|
|
||||||
"MacAddress": "Dirección MAC"
|
|
||||||
},
|
|
||||||
"interfaceapinfo": {
|
|
||||||
"NetworkInterface": "Interfaz de red (Punto de acceso)",
|
|
||||||
"IpAddress": "@:interfacenetworkinfo.IpAddress",
|
|
||||||
"MacAddress": "@:interfacenetworkinfo.MacAddress"
|
|
||||||
},
|
|
||||||
"ntpinfo": {
|
|
||||||
"NtpInformation": "Información de NTP",
|
|
||||||
"ConfigurationSummary": "Resumen de configuración",
|
|
||||||
"Server": "Servidor",
|
|
||||||
"Timezone": "Zona horaria",
|
|
||||||
"TimezoneDescription": "Descripción de la zona horaria",
|
|
||||||
"CurrentTime": "Hora actual",
|
|
||||||
"Status": "Estado",
|
|
||||||
"Synced": "sincronizado",
|
|
||||||
"NotSynced": "no sincronizado",
|
|
||||||
"LocalTime": "Hora local",
|
|
||||||
"Sunrise": "Amanecer",
|
|
||||||
"Sunset": "Atardecer",
|
|
||||||
"NotAvailable": "No disponible",
|
|
||||||
"Mode": "Modo",
|
|
||||||
"Day": "Día",
|
|
||||||
"Night": "Noche"
|
|
||||||
},
|
|
||||||
"mqttinfo": {
|
|
||||||
"MqttInformation": "Información de MQTT",
|
|
||||||
"ConfigurationSummary": "@:ntpinfo.ConfigurationSummary",
|
|
||||||
"Status": "@:ntpinfo.Status",
|
|
||||||
"Enabled": "Habilitado",
|
|
||||||
"Disabled": "Deshabilitado",
|
|
||||||
"Server": "@:ntpinfo.Server",
|
|
||||||
"Port": "Puerto",
|
|
||||||
"ClientId": "Client ID",
|
|
||||||
"Username": "Nombre de usuario",
|
|
||||||
"BaseTopic": "Tema base",
|
|
||||||
"PublishInterval": "Intervalo de publicación",
|
|
||||||
"Seconds": "{sec} segundos",
|
|
||||||
"CleanSession": "Bandera CleanSession",
|
|
||||||
"Retain": "Retener",
|
|
||||||
"Tls": "TLS",
|
|
||||||
"RootCertifcateInfo": "Información del certificado raíz de CA",
|
|
||||||
"TlsCertLogin": "Iniciar sesión con certificado TLS",
|
|
||||||
"ClientCertifcateInfo": "Información del Certificado del Cliente",
|
|
||||||
"HassSummary": "Resumen de la Configuración de Descubrimiento Automático MQTT de Home Assistant",
|
|
||||||
"Expire": "Expirar",
|
|
||||||
"IndividualPanels": "Paneles Individuales",
|
|
||||||
"RuntimeSummary": "Resumen de Tiempo de Ejecución",
|
|
||||||
"ConnectionStatus": "Estado de Conexión",
|
|
||||||
"Connected": "conectado",
|
|
||||||
"Disconnected": "desconectado"
|
|
||||||
},
|
|
||||||
"console": {
|
|
||||||
"Console": "Consola",
|
|
||||||
"VirtualDebugConsole": "Consola de Depuración Virtual",
|
|
||||||
"EnableAutoScroll": "Habilitar Desplazamiento Automático",
|
|
||||||
"ClearConsole": "Limpiar Consola",
|
|
||||||
"CopyToClipboard": "Copiar al Portapapeles"
|
|
||||||
},
|
|
||||||
"inverterchannelinfo": {
|
|
||||||
"String": "Cadena {num}",
|
|
||||||
"Phase": "Fase {num}",
|
|
||||||
"General": "General"
|
|
||||||
},
|
|
||||||
"invertertotalinfo": {
|
|
||||||
"TotalYieldTotal": "Total de Rendimiento Acumulado",
|
|
||||||
"TotalYieldDay": "Total de Rendimiento del Día",
|
|
||||||
"TotalPower": "Potencia Total"
|
|
||||||
},
|
|
||||||
"inverterchannelproperty": {
|
|
||||||
"Power": "Potencia",
|
|
||||||
"Voltage": "Voltaje",
|
|
||||||
"Current": "Corriente",
|
|
||||||
"Power DC": "Potencia DC",
|
|
||||||
"YieldDay": "Rendimiento del Día",
|
|
||||||
"YieldTotal": "Rendimiento Total",
|
|
||||||
"Frequency": "Frecuencia",
|
|
||||||
"Temperature": "Temperatura",
|
|
||||||
"PowerFactor": "Factor de Potencia",
|
|
||||||
"ReactivePower": "Potencia Reactiva",
|
|
||||||
"Efficiency": "Eficiencia",
|
|
||||||
"Irradiation": "Irradiación"
|
|
||||||
},
|
|
||||||
"maintenancereboot": {
|
|
||||||
"DeviceReboot": "Reinicio del Dispositivo",
|
|
||||||
"PerformReboot": "Realizar Reinicio",
|
|
||||||
"Reboot": "¡Reiniciar!",
|
|
||||||
"Cancel": "@:base.Cancel",
|
|
||||||
"RebootOpenDTU": "Reiniciar OpenDTU",
|
|
||||||
"RebootQuestion": "¿Realmente desea reiniciar el dispositivo?",
|
|
||||||
"RebootHint": "<b>Nota:</b> Normalmente no es necesario realizar un reinicio manual. OpenDTU realiza cualquier reinicio necesario (por ejemplo, después de una actualización de firmware) automáticamente. También se adoptan configuraciones sin reiniciar. Si necesita reiniciar debido a un error, considere informarlo en <a href=\"https://github.com/tbnobody/OpenDTU/issues\" class=\"alert-link\" target=\"_blank\">https://github.com/tbnobody/OpenDTU/issues</a>."
|
|
||||||
},
|
|
||||||
"dtuadmin": {
|
|
||||||
"DtuSettings": "Configuración de DTU",
|
|
||||||
"DtuConfiguration": "Configuración de DTU",
|
|
||||||
"Serial": "Serial",
|
|
||||||
"SerialHint": "Tanto el inversor como el DTU tienen un número de serie. El número de serie del DTU se genera aleatoriamente en el primer inicio y generalmente no es necesario cambiarlo.",
|
|
||||||
"PollInterval": "Intervalo de Sondeo",
|
|
||||||
"Seconds": "Segundos",
|
|
||||||
"NrfPaLevel": "Potencia de Transmisión NRF24",
|
|
||||||
"CmtPaLevel": "Potencia de Transmisión CMT2300A",
|
|
||||||
"NrfPaLevelHint": "Utilizado para inversores HM. Asegúrese de que su fuente de alimentación sea lo suficientemente estable antes de aumentar la potencia de transmisión.",
|
|
||||||
"CmtPaLevelHint": "Utilizado para inversores HMS/HMT. Asegúrese de que su fuente de alimentación sea lo suficientemente estable antes de aumentar la potencia de transmisión.",
|
|
||||||
"CmtCountry": "Región/País CMT2300A",
|
|
||||||
"CmtCountryHint": "Cada país tiene asignaciones de frecuencia diferentes.",
|
|
||||||
"country_0": "Europa ({min}MHz - {max}MHz)",
|
|
||||||
"country_1": "América del Norte ({min}MHz - {max}MHz)",
|
|
||||||
"country_2": "Brasil ({min}MHz - {max}MHz)",
|
|
||||||
"CmtFrequency": "Frecuencia CMT2300A",
|
|
||||||
"CmtFrequencyHint": "¡Asegúrese de utilizar solo frecuencias permitidas en el país respectivo! Después de un cambio de frecuencia, puede tardar hasta 15 minutos en establecer una conexión.",
|
|
||||||
"CmtFrequencyWarning": "La frecuencia seleccionada está fuera del rango permitido en su región/país seleccionado. Asegúrese de que esta selección no infrinja ninguna regulación local.",
|
|
||||||
"MHz": "{mhz} MHz",
|
|
||||||
"dBm": "{dbm} dBm",
|
|
||||||
"Min": "Mínimo ({db} dBm)",
|
|
||||||
"Low": "Bajo ({db} dBm)",
|
|
||||||
"High": "Alto ({db} dBm)",
|
|
||||||
"Max": "Máximo ({db} dBm)"
|
|
||||||
},
|
|
||||||
"securityadmin": {
|
|
||||||
"SecuritySettings": "Configuración de Seguridad",
|
|
||||||
"AdminPassword": "Contraseña de Administrador",
|
|
||||||
"Password": "Contraseña",
|
|
||||||
"RepeatPassword": "Repetir Contraseña",
|
|
||||||
"PasswordHint": "<b>Consejo:</b> La contraseña de administrador se utiliza para acceder a esta interfaz web (usuario 'admin'), pero también para conectarse al dispositivo cuando está en modo AP. Debe tener 8 a 64 caracteres.",
|
|
||||||
"Permissions": "Permisos",
|
|
||||||
"ReadOnly": "Permitir acceso de solo lectura a la interfaz web sin contraseña"
|
|
||||||
},
|
|
||||||
"ntpadmin": {
|
|
||||||
"NtpSettings": "Configuración de NTP",
|
|
||||||
"NtpConfiguration": "Configuración de NTP",
|
|
||||||
"TimeServer": "Servidor de Tiempo",
|
|
||||||
"TimeServerHint": "El valor predeterminado es adecuado siempre que OpenDTU tenga acceso directo a Internet.",
|
|
||||||
"Timezone": "Zona Horaria",
|
|
||||||
"TimezoneConfig": "Configuración de Zona Horaria",
|
|
||||||
"LocationConfiguration": "Configuración de Ubicación",
|
|
||||||
"Longitude": "Longitud",
|
|
||||||
"Latitude": "Latitud",
|
|
||||||
"SunSetType": "Tipo de Atardecer",
|
|
||||||
"SunSetTypeHint": "Afecta al cálculo día/noche. Puede tardar hasta un minuto en aplicarse el nuevo tipo.",
|
|
||||||
"OFFICIAL": "Amanecer estándar (90.8°)",
|
|
||||||
"NAUTICAL": "Amanecer náutico (102°)",
|
|
||||||
"CIVIL": "Amanecer civil (96°)",
|
|
||||||
"ASTONOMICAL": "Amanecer astronómico (108°)",
|
|
||||||
"ManualTimeSynchronization": "Sincronización Manual del Tiempo",
|
|
||||||
"CurrentOpenDtuTime": "Hora Actual de OpenDTU",
|
|
||||||
"CurrentLocalTime": "Hora Local Actual",
|
|
||||||
"SynchronizeTime": "Sincronizar Tiempo",
|
|
||||||
"SynchronizeTimeHint": "<b>Consejo:</b> Puede utilizar la sincronización manual del tiempo para establecer la hora actual de OpenDTU si no hay un servidor NTP disponible. Pero tenga en cuenta que en caso de un ciclo de energía, se perderá la hora. Además, tenga en cuenta que la precisión del tiempo se verá gravemente afectada, ya que no se puede resincronizar regularmente y el microcontrolador ESP32 no tiene un reloj en tiempo real."
|
|
||||||
},
|
|
||||||
"networkadmin": {
|
|
||||||
"NetworkSettings": "Configuración de Red",
|
|
||||||
"WifiConfiguration": "Configuración de WiFi",
|
|
||||||
"WifiSsid": "SSID de WiFi",
|
|
||||||
"WifiPassword": "Contraseña de WiFi",
|
|
||||||
"Hostname": "Nombre de Host",
|
|
||||||
"HostnameHint": "<b>Consejo:</b> El texto <span class=\"font-monospace\">%06X</span> se remplazará con los últimos 6 dígitos del ChipID de ESP en formato hexadecimal.",
|
|
||||||
"EnableDhcp": "Habilitar DHCP",
|
|
||||||
"StaticIpConfiguration": "Configuración de IP Estática",
|
|
||||||
"IpAddress": "Dirección IP",
|
|
||||||
"Netmask": "Máscara de Red",
|
|
||||||
"DefaultGateway": "Puerta de Enlace Predeterminada",
|
|
||||||
"Dns": "Servidor DNS {num}",
|
|
||||||
"AdminAp": "Configuración de WiFi (Punto de Acceso de Administrador)",
|
|
||||||
"ApTimeout": "Tiempo de espera del Punto de Acceso",
|
|
||||||
"ApTimeoutHint": "Tiempo que se mantiene abierto el Punto de Acceso. Un valor de 0 significa infinito.",
|
|
||||||
"Minutes": "minutos",
|
|
||||||
"EnableMdns": "Habilitar mDNS",
|
|
||||||
"MdnsSettings": "Configuración de mDNS"
|
|
||||||
},
|
|
||||||
"mqttadmin": {
|
|
||||||
"MqttSettings": "Configuración de MQTT",
|
|
||||||
"MqttConfiguration": "Configuración de MQTT",
|
|
||||||
"EnableMqtt": "Habilitar MQTT",
|
|
||||||
"EnableHass": "Habilitar Descubrimiento Automático MQTT de Home Assistant",
|
|
||||||
"MqttBrokerParameter": "Parámetros del Broker MQTT",
|
|
||||||
"Hostname": "Nombre de Host",
|
|
||||||
"HostnameHint": "Nombre de host o dirección IP",
|
|
||||||
"Port": "Puerto",
|
|
||||||
"ClientId": "Client ID",
|
|
||||||
"Username": "Nombre de Usuario",
|
|
||||||
"UsernameHint": "Nombre de usuario, dejar vacío para conexión anónima",
|
|
||||||
"Password": "Contraseña",
|
|
||||||
"PasswordHint": "Contraseña, dejar vacío para conexión anónima",
|
|
||||||
"BaseTopic": "Tema Base",
|
|
||||||
"BaseTopicHint": "Tema base, se antepondrá a todos los temas publicados (por ejemplo, inverter/)",
|
|
||||||
"PublishInterval": "Intervalo de Publicación",
|
|
||||||
"Seconds": "segundos",
|
|
||||||
"CleanSession": "Habilitar Bandera CleanSession",
|
|
||||||
"EnableRetain": "Habilitar Bandera Retain",
|
|
||||||
"EnableTls": "Habilitar TLS",
|
|
||||||
"RootCa": "Certificado Raíz CA (predeterminado Letsencrypt)",
|
|
||||||
"TlsCertLoginEnable": "Habilitar Inicio de Sesión con Certificado TLS",
|
|
||||||
"ClientCert": "Certificado del Cliente TLS",
|
|
||||||
"ClientKey": "Clave del Cliente TLS",
|
|
||||||
"LwtParameters": "Parámetros de LWT",
|
|
||||||
"LwtTopic": "Tema de LWT",
|
|
||||||
"LwtTopicHint": "Tema de LWT, se añadirá al tema base",
|
|
||||||
"LwtOnline": "Mensaje de LWT en línea",
|
|
||||||
"LwtOnlineHint": "Mensaje que se publicará en el tema de LWT cuando esté en línea",
|
|
||||||
"LwtOffline": "Mensaje de LWT fuera de línea",
|
|
||||||
"LwtOfflineHint": "Mensaje que se publicará en el tema de LWT cuando esté fuera de línea",
|
|
||||||
"LwtQos": "QoS (Calidad de Servicio)",
|
|
||||||
"QOS0": "0 (Como máximo una vez)",
|
|
||||||
"QOS1": "1 (Al menos una vez)",
|
|
||||||
"QOS2": "2 (Exactamente una vez)",
|
|
||||||
"HassParameters": "Parámetros de Descubrimiento Automático MQTT de Home Assistant",
|
|
||||||
"HassPrefixTopic": "Tema de Prefijo",
|
|
||||||
"HassPrefixTopicHint": "El prefijo para el tema de descubrimiento",
|
|
||||||
"HassRetain": "Habilitar Bandera Retain",
|
|
||||||
"HassExpire": "Habilitar Expiración",
|
|
||||||
"HassIndividual": "Paneles Individuales"
|
|
||||||
},
|
|
||||||
"inverteradmin": {
|
|
||||||
"InverterSettings": "Configuración del Inversor",
|
|
||||||
"AddInverter": "Agregar un nuevo Inversor",
|
|
||||||
"Serial": "Serial",
|
|
||||||
"Name": "Nombre",
|
|
||||||
"Add": "Agregar",
|
|
||||||
"AddHint": "<b>Consejo:</b> Puede configurar parámetros adicionales después de haber creado el inversor. Use el ícono de lápiz en la lista de inversores.",
|
|
||||||
"InverterList": "Lista de Inversores",
|
|
||||||
"Status": "Estado",
|
|
||||||
"Send": "Enviar",
|
|
||||||
"Receive": "Recibir",
|
|
||||||
"StatusHint": "<b>Consejo:</b> El inversor se alimenta con su entrada de CC. Si no hay sol, el inversor está apagado. Aún se pueden enviar solicitudes.",
|
|
||||||
"Type": "Tipo",
|
|
||||||
"Action": "Acción",
|
|
||||||
"SaveOrder": "Guardar orden",
|
|
||||||
"DeleteInverter": "Eliminar inversor",
|
|
||||||
"EditInverter": "Editar inversor",
|
|
||||||
"General": "General",
|
|
||||||
"String": "Cadena",
|
|
||||||
"Advanced": "Avanzado",
|
|
||||||
"InverterSerial": "Serial del Inversor:",
|
|
||||||
"InverterName": "Nombre del Inversor:",
|
|
||||||
"InverterNameHint": "Aquí puede especificar un nombre personalizado para su inversor.",
|
|
||||||
"InverterStatus": "Recibir / Enviar",
|
|
||||||
"PollEnable": "Sondear datos del inversor",
|
|
||||||
"PollEnableNight": "Sondear datos del inversor por la noche",
|
|
||||||
"CommandEnable": "Enviar comandos",
|
|
||||||
"CommandEnableNight": "Enviar comandos por la noche",
|
|
||||||
"StringName": "Nombre de cadena {num}:",
|
|
||||||
"StringNameHint": "Aquí puede especificar un nombre personalizado para el puerto respectivo de su inversor.",
|
|
||||||
"StringMaxPower": "Potencia máxima de cadena {num}:",
|
|
||||||
"StringMaxPowerHint": "Ingrese la potencia máxima de los paneles solares conectados.",
|
|
||||||
"StringYtOffset": "Compensación total de rendimiento de cadena {num}:",
|
|
||||||
"StringYtOffsetHint": "Esta compensación se aplica al valor total de rendimiento leído del inversor. Esto se puede usar para ajustar el rendimiento total del inversor a cero si se utiliza un inversor usado. Pero aún puede intentar sondear datos.",
|
|
||||||
"InverterHint": "*) Ingrese W<sub>p</sub> del canal para calcular la irradiación.",
|
|
||||||
"ReachableThreshold": "Umbral de Alcanzabilidad",
|
|
||||||
"ReachableThresholdHint": "Define cuántas solicitudes se permiten fallar hasta que el inversor se considere no alcanzable.",
|
|
||||||
"ZeroRuntime": "Datos de tiempo cero",
|
|
||||||
"ZeroRuntimeHint": "Datos de tiempo cero (sin datos de rendimiento) si el inversor se vuelve inalcanzable.",
|
|
||||||
"ZeroDay": "Rendimiento diario cero a medianoche",
|
|
||||||
"ZeroDayHint": "Esto solo funciona si el inversor es inalcanzable. Si se leen datos del inversor, se usarán sus valores. (El reinicio solo ocurre en el ciclo de energía)",
|
|
||||||
"ClearEventlog": "Clear Eventlog at midnight",
|
|
||||||
"Cancel": "@:base.Cancel",
|
|
||||||
"Save": "@:base.Save",
|
|
||||||
"DeleteMsg": "¿Está seguro de que desea eliminar el inversor \"{name}\" con número de serie {serial}?",
|
|
||||||
"Delete": "Eliminar",
|
|
||||||
"YieldDayCorrection": "Corrección de Rendimiento Diario",
|
|
||||||
"YieldDayCorrectionHint": "Sumar el rendimiento diario incluso si el inversor se reinicia. El valor se restablecerá a medianoche"
|
|
||||||
},
|
|
||||||
"fileadmin": {
|
|
||||||
"ConfigManagement": "Gestión de Configuración",
|
|
||||||
"BackupHeader": "Copia de seguridad: Copia de Seguridad del Archivo de Configuración",
|
|
||||||
"BackupConfig": "Copia de seguridad del archivo de configuración",
|
|
||||||
"Backup": "Copia de seguridad",
|
|
||||||
"Restore": "Restaurar",
|
|
||||||
"NoFileSelected": "Ningún archivo seleccionado",
|
|
||||||
"RestoreHeader": "Restaurar: Restaurar el Archivo de Configuración",
|
|
||||||
"Back": "Atrás",
|
|
||||||
"UploadSuccess": "Carga Exitosa",
|
|
||||||
"RestoreHint": "<b>Nota:</b> Esta operación reemplaza el archivo de configuración con la configuración restaurada y reinicia OpenDTU para aplicar todas las configuraciones.",
|
|
||||||
"ResetHeader": "Inicializar: Realizar Restablecimiento de Fábrica",
|
|
||||||
"FactoryResetButton": "Restaurar Configuraciones Predeterminadas de Fábrica",
|
|
||||||
"ResetHint": "<b>Nota:</b> Haga clic en Restaurar Configuraciones Predeterminadas de Fábrica para restaurar e inicializar las configuraciones predeterminadas de fábrica y reiniciar.",
|
|
||||||
"FactoryReset": "Restablecimiento de Fábrica",
|
|
||||||
"ResetMsg": "¿Está seguro de que desea eliminar la configuración actual y restablecer todas las configuraciones a sus valores predeterminados de fábrica?",
|
|
||||||
"ResetConfirm": "Restablecimiento de Fábrica",
|
|
||||||
"Cancel": "@:base.Cancel",
|
|
||||||
"InvalidJson": "JSON file is formatted incorrectly.",
|
|
||||||
"InvalidJsonContent": "JSON file has the wrong content."
|
|
||||||
},
|
|
||||||
"login": {
|
|
||||||
"Login": "Iniciar Sesión",
|
|
||||||
"SystemLogin": "Inicio de Sesión en el Sistema",
|
|
||||||
"Username": "Nombre de Usuario",
|
|
||||||
"UsernameRequired": "Se requiere el nombre de usuario",
|
|
||||||
"Password": "Contraseña",
|
|
||||||
"PasswordRequired": "Se requiere la contraseña",
|
|
||||||
"LoginButton": "Iniciar Sesión"
|
|
||||||
},
|
|
||||||
"firmwareupgrade": {
|
|
||||||
"FirmwareUpgrade": "Actualización de Firmware",
|
|
||||||
"Loading": "@:base.Loading",
|
|
||||||
"OtaError": "Error OTA",
|
|
||||||
"Back": "Atrás",
|
|
||||||
"Retry": "Reintentar",
|
|
||||||
"OtaStatus": "Estado OTA",
|
|
||||||
"OtaSuccess": "La carga de firmware fue exitosa. El dispositivo se reinició automáticamente. Cuando el dispositivo vuelva a ser accesible, la interfaz se recargará automáticamente.",
|
|
||||||
"FirmwareUpload": "Carga de Firmware",
|
|
||||||
"UploadProgress": "Progreso de Carga"
|
|
||||||
},
|
|
||||||
"about": {
|
|
||||||
"AboutOpendtu": "Acerca de OpenDTU",
|
|
||||||
"Documentation": "Documentation",
|
|
||||||
"DocumentationBody": "The firmware and hardware documentation can be found here: <a href=\"https://www.opendtu.solar\" target=\"_blank\">https://www.opendtu.solar</a>",
|
|
||||||
"ProjectOrigin": "Origen del Proyecto",
|
|
||||||
"ProjectOriginBody1": "Este proyecto se inició a partir de <a href=\"https://www.mikrocontroller.net/topic/525778\" target=\"_blank\">esta discusión. (Mikrocontroller.net)</a>",
|
|
||||||
"ProjectOriginBody2": "El protocolo de Hoymiles fue descifrado mediante los esfuerzos voluntarios de muchos participantes. OpenDTU, entre otros, se desarrolló basado en este trabajo. El proyecto está bajo una Licencia de Código Abierto (<a href=\"https://www.gnu.de/documents/gpl-2.0.de.html\" target=\"_blank\">Licencia Pública General de GNU versión 2</a>).",
|
|
||||||
"ProjectOriginBody3": "El software se desarrolló según nuestro mejor conocimiento y creencia. Sin embargo, no se acepta ninguna responsabilidad por un mal funcionamiento o pérdida de garantía del inversor.",
|
|
||||||
"ProjectOriginBody4": "OpenDTU está disponible de forma gratuita. Si pagaste dinero por el software, probablemente te estafaron.",
|
|
||||||
"NewsUpdates": "Noticias y Actualizaciones",
|
|
||||||
"NewsUpdatesBody": "Las nuevas actualizaciones se pueden encontrar en Github: <a href=\"https://github.com/tbnobody/OpenDTU\" target=\"_blank\">https://github.com/tbnobody/OpenDTU</a>",
|
|
||||||
"ErrorReporting": "Reporte de Errores",
|
|
||||||
"ErrorReportingBody": "Por favor, informa problemas utilizando la función proporcionada por <a href=\"https://github.com/tbnobody/OpenDTU/issues\" target=\"_blank\">Github</a>",
|
|
||||||
"Discussion": "Discusión",
|
|
||||||
"DiscussionBody": "Discute con nosotros en <a href=\"https://discord.gg/WzhxEY62mB\" target=\"_blank\">Discord</a> o <a href=\"https://github.com/tbnobody/OpenDTU/discussions\" target=\"_blank\">Github</a>"
|
|
||||||
},
|
|
||||||
"hints": {
|
|
||||||
"RadioProblem": "No se pudo conectar a un módulo de radio configurado. Por favor, verifica la conexión.",
|
|
||||||
"TimeSync": "El reloj aún no ha sido sincronizado. Sin un reloj correctamente ajustado, no se realizan solicitudes al inversor. Esto es normal poco después del inicio. Sin embargo, después de un tiempo de ejecución más largo (>1 minuto), indica que el servidor NTP no es accesible.",
|
|
||||||
"TimeSyncLink": "Por favor, verifica la configuración de tu hora.",
|
|
||||||
"DefaultPassword": "Estás utilizando la contraseña predeterminada para la interfaz web y el punto de acceso de emergencia. Esto potencialmente es inseguro.",
|
|
||||||
"DefaultPasswordLink": "Por favor, cambia la contraseña.",
|
|
||||||
"PinMappingIssue": "You are using a generic firmware image, but have not yet uploaded a file with device profiles (<code>pin_mapping.json</code>) or have not selected a profile defined there. Please refer to the <a href=\"https://opendtu.solar/firmware/device_profiles/\" target=\"_blank\" class=\"alert-link\">documentation</a> for details."
|
|
||||||
},
|
|
||||||
"deviceadmin": {
|
|
||||||
"DeviceManager": "Administrador de Dispositivos",
|
|
||||||
"ParseError": "Error de análisis en 'pin_mapping.json': {error}",
|
|
||||||
"PinAssignment": "Configuración de Conexión",
|
|
||||||
"SelectedProfile": "Perfil Seleccionado",
|
|
||||||
"DefaultProfile": "(Configuraciones predeterminadas)",
|
|
||||||
"ProfileHint": "Tu dispositivo puede dejar de responder si seleccionas un perfil incompatible. En este caso, debes realizar una eliminación a través de la interfaz serial.",
|
|
||||||
"Display": "Pantalla",
|
|
||||||
"PowerSafe": "Habilitar Ahorro de Energía",
|
|
||||||
"PowerSafeHint": "Apaga la pantalla si no hay un inversor produciendo.",
|
|
||||||
"Screensaver": "Habilitar Protector de Pantalla",
|
|
||||||
"ScreensaverHint": "Mueve la pantalla un poco en cada actualización para evitar el quemado. (Útil especialmente para pantallas OLED)",
|
|
||||||
"DiagramMode": "Modo de Diagrama",
|
|
||||||
"off": "Apagar",
|
|
||||||
"small": "Pequeño",
|
|
||||||
"fullscreen": "Pantalla Completa",
|
|
||||||
"DiagramDuration": "Duración del Diagrama",
|
|
||||||
"DiagramDurationHint": "El período de tiempo que se muestra en el diagrama.",
|
|
||||||
"Seconds": "Segundos",
|
|
||||||
"Contrast": "Contraste ({contrast})",
|
|
||||||
"Rotation": "Rotación",
|
|
||||||
"rot0": "Sin rotación",
|
|
||||||
"rot90": "Rotación de 90 grados",
|
|
||||||
"rot180": "Rotación de 180 grados",
|
|
||||||
"rot270": "Rotación de 270 grados",
|
|
||||||
"DisplayLanguage": "Idioma de la Pantalla",
|
|
||||||
"en": "Inglés",
|
|
||||||
"de": "Alemán",
|
|
||||||
"fr": "Francés",
|
|
||||||
"Leds": "LEDs",
|
|
||||||
"EqualBrightness": "Brillo Equitativo",
|
|
||||||
"LedBrightness": "Brillo del LED {led} ({brightness})"
|
|
||||||
},
|
|
||||||
"pininfo": {
|
|
||||||
"Category": "Categoría",
|
|
||||||
"Name": "Nombre",
|
|
||||||
"Number": "Número",
|
|
||||||
"ValueSelected": "Seleccionado",
|
|
||||||
"ValueActive": "Activo"
|
|
||||||
},
|
|
||||||
"inputserial": {
|
|
||||||
"format_hoymiles": "Hoymiles serial number format",
|
|
||||||
"format_converted": "Already converted serial number",
|
|
||||||
"format_herf_valid": "E-Star HERF format (will be saved converted): {serial}",
|
|
||||||
"format_herf_invalid": "E-Star HERF format: Invalid checksum",
|
|
||||||
"format_unknown": "Unknown format"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,696 +0,0 @@
|
|||||||
{
|
|
||||||
"meta": {
|
|
||||||
"name": "Italiano",
|
|
||||||
"code": "it"
|
|
||||||
},
|
|
||||||
"display": {
|
|
||||||
"date_format": "%d/%m/%Y %H:%M",
|
|
||||||
"offline": "Offline",
|
|
||||||
"power_w": "%.0f W",
|
|
||||||
"power_kw": "%.1f kW",
|
|
||||||
"yield_today_wh": "oggi: %4.0f Wh",
|
|
||||||
"yield_today_kwh": "oggi: %.1f kWh",
|
|
||||||
"yield_total_kwh": "totale: %.1f kWh",
|
|
||||||
"yield_total_mwh": "totale: %.0f kWh"
|
|
||||||
},
|
|
||||||
"webapp": {
|
|
||||||
"menu": {
|
|
||||||
"LiveView": "Dati in tempo reale",
|
|
||||||
"Settings": "Impostazioni",
|
|
||||||
"NetworkSettings": "Impostazioni di rete",
|
|
||||||
"NTPSettings": "Impostazioni NTP",
|
|
||||||
"MQTTSettings": "Impostazioni MQTT",
|
|
||||||
"InverterSettings": "Impostazioni Inverter",
|
|
||||||
"SecuritySettings": "Impostazioni di Sicurezza",
|
|
||||||
"DTUSettings": "Impostazioni DTU",
|
|
||||||
"DeviceManager": "Gestione Dispositivi",
|
|
||||||
"ConfigManagement": "Gestione Configurazione",
|
|
||||||
"FirmwareUpgrade": "Aggiornamento Firmware",
|
|
||||||
"DeviceReboot": "Riavvio DTU",
|
|
||||||
"Info": "Info",
|
|
||||||
"System": "Sistema",
|
|
||||||
"Network": "Rete",
|
|
||||||
"NTP": "NTP",
|
|
||||||
"MQTT": "MQTT",
|
|
||||||
"Console": "Console",
|
|
||||||
"About": "Informazioni DTU",
|
|
||||||
"Logout": "Esci",
|
|
||||||
"Login": "Login"
|
|
||||||
},
|
|
||||||
"base": {
|
|
||||||
"Loading": "Caricamento...",
|
|
||||||
"Reload": "Ricarica",
|
|
||||||
"Cancel": "Cancella",
|
|
||||||
"Save": "Salva",
|
|
||||||
"Refreshing": "Aggiorna",
|
|
||||||
"Pull": "Trascina in basso per aggiornare",
|
|
||||||
"Release": "Rilascia per aggiornare",
|
|
||||||
"Close": "Chiudi",
|
|
||||||
"Yes": "Yes",
|
|
||||||
"No": "No"
|
|
||||||
},
|
|
||||||
"wait": {
|
|
||||||
"NotReady": "OpenDTU is not yet ready",
|
|
||||||
"PleaseWait": "Please wait. You will be automatically redirected to the home page."
|
|
||||||
},
|
|
||||||
"Error": {
|
|
||||||
"Oops": "Oops!"
|
|
||||||
},
|
|
||||||
"localeswitcher": {
|
|
||||||
"Dark": "Scuro",
|
|
||||||
"Light": "Chiaro",
|
|
||||||
"Auto": "Automatico"
|
|
||||||
},
|
|
||||||
"apiresponse": {
|
|
||||||
"1001": "Settings saved!",
|
|
||||||
"1002": "No values found!",
|
|
||||||
"1003": "Data too large!",
|
|
||||||
"1004": "Failed to parse data!",
|
|
||||||
"1005": "Values are missing!",
|
|
||||||
"1006": "Write failed!",
|
|
||||||
"2001": "Serial cannot be zero!",
|
|
||||||
"2002": "Poll interval must be greater zero!",
|
|
||||||
"2003": "Invalid power level setting!",
|
|
||||||
"2004": "The frequency must be set between {min} and {max} kHz and must be a multiple of 250kHz!",
|
|
||||||
"2005": "Invalid country selection!",
|
|
||||||
"3001": "Not deleted anything!",
|
|
||||||
"3002": "Configuration resettet. Rebooting now...",
|
|
||||||
"4001": "@:apiresponse.2001",
|
|
||||||
"4002": "Name must between 1 and {max} characters long!",
|
|
||||||
"4003": "Only {max} inverters are supported!",
|
|
||||||
"4004": "Inverter created!",
|
|
||||||
"4005": "Invalid ID specified!",
|
|
||||||
"4006": "Invalid amount of max channel setting given!",
|
|
||||||
"4007": "Inverter changed!",
|
|
||||||
"4008": "Inverter deleted!",
|
|
||||||
"4009": "Inverter order saved!",
|
|
||||||
"5001": "@:apiresponse.2001",
|
|
||||||
"5002": "Limit must between 1 and {max}!",
|
|
||||||
"5003": "Invalid type specified!",
|
|
||||||
"5004": "Invalid inverter specified!",
|
|
||||||
"6001": "Reboot triggered!",
|
|
||||||
"6002": "Reboot cancled!",
|
|
||||||
"7001": "MQTT Server must between 1 and {max} characters long!",
|
|
||||||
"7002": "Username must not longer then {max} characters!",
|
|
||||||
"7003": "Password must not longer then {max} characters!",
|
|
||||||
"7004": "Topic must not longer then {max} characters!",
|
|
||||||
"7005": "Topic must not contain space characters!",
|
|
||||||
"7006": "Topic must end with slash (/)!",
|
|
||||||
"7007": "Port must be a number between 1 and 65535!",
|
|
||||||
"7008": "Certificate must not longer then {max} characters!",
|
|
||||||
"7009": "LWT topic must not longer then {max} characters!",
|
|
||||||
"7010": "LWT topic must not contain space characters!",
|
|
||||||
"7011": "LWT online value must not longer then {max} characters!",
|
|
||||||
"7012": "LWT offline value must not longer then {max} characters!",
|
|
||||||
"7013": "Publish interval must be a number between {min} and {max}!",
|
|
||||||
"7014": "Hass topic must not longer then {max} characters!",
|
|
||||||
"7015": "Hass topic must not contain space characters!",
|
|
||||||
"7016": "LWT QOS must not greater then {max}!",
|
|
||||||
"7017": "Client ID must not longer then {max} characters!",
|
|
||||||
"8001": "IP address is invalid!",
|
|
||||||
"8002": "Netmask is invalid!",
|
|
||||||
"8003": "Gateway is invalid!",
|
|
||||||
"8004": "DNS Server IP 1 is invalid!",
|
|
||||||
"8005": "DNS Server IP 2 is invalid!",
|
|
||||||
"8006": "Administrative AccessPoint Timeout value is invalid",
|
|
||||||
"9001": "NTP Server must between 1 and {max} characters long!",
|
|
||||||
"9002": "Timezone must between 1 and {max} characters long!",
|
|
||||||
"9003": "Timezone description must between 1 and {max} characters long!",
|
|
||||||
"9004": "Year must be a number between {min} and {max}!",
|
|
||||||
"9005": "Month must be a number between {min} and {max}!",
|
|
||||||
"9006": "Day must be a number between {min} and {max}!",
|
|
||||||
"9007": "Hour must be a number between {min} and {max}!",
|
|
||||||
"9008": "Minute must be a number between {min} and {max}!",
|
|
||||||
"9009": "Second must be a number between {min} and {max}!",
|
|
||||||
"9010": "Time updated!",
|
|
||||||
"10001": "Password must between 8 and {max} characters long!",
|
|
||||||
"10002": "Authentication successful!",
|
|
||||||
"11001": "@:apiresponse.2001",
|
|
||||||
"11002": "@:apiresponse:5004",
|
|
||||||
"12001": "Profil must between 1 and {max} characters long!"
|
|
||||||
},
|
|
||||||
"home": {
|
|
||||||
"LiveData": "Dati in tempo reale",
|
|
||||||
"SerialNumber": "Numero seriale: ",
|
|
||||||
"CurrentLimit": "Limite attuale: ",
|
|
||||||
"DataAge": "Aggiornamento Dati: ",
|
|
||||||
"Seconds": "{val} secondi",
|
|
||||||
"ShowSetInverterLimit": "Mostra / Imposta Limite di Potenza",
|
|
||||||
"TurnOnOff": "Accendi/Spegni Inverter",
|
|
||||||
"ShowInverterInfo": "Mostra info Inverter",
|
|
||||||
"ShowEventlog": "Mostra Log Eventi",
|
|
||||||
"UnreadMessages": "msg non letti",
|
|
||||||
"Loading": "@:base.Loading",
|
|
||||||
"EventLog": "Log Eventi",
|
|
||||||
"InverterInfo": "Info Inverter",
|
|
||||||
"LimitSettings": "Impostazioni Limite Potenza",
|
|
||||||
"LastLimitSetStatus": "Stato ultimo limite impostato:",
|
|
||||||
"SetLimit": "Imposta Limite a:",
|
|
||||||
"Relative": "Percentuale (%)",
|
|
||||||
"Absolute": "Assoluto (W)",
|
|
||||||
"LimitHint": "<b>Nota:</b> Se imposti il limite assoluto, il valore sul display sarà aggiornato dopo circa 4 minuti.",
|
|
||||||
"SetPersistent": "Imposta Limite in Modo Persistente",
|
|
||||||
"SetNonPersistent": "Imposta Limite Temporaneamente",
|
|
||||||
"PowerSettings": "Impostazioni Potenza",
|
|
||||||
"LastPowerSetStatus": "Ultimo Stato dell'Inverter:",
|
|
||||||
"TurnOn": "Accendi Inverter",
|
|
||||||
"TurnOff": "Spegni Inverter",
|
|
||||||
"Restart": "Riavvia Inverter",
|
|
||||||
"Failure": "Fallito",
|
|
||||||
"Pending": "In Attesa",
|
|
||||||
"Ok": "Ok",
|
|
||||||
"Unknown": "Sconosciuto",
|
|
||||||
"ShowGridProfile": "Mostra Settaggi Inverter",
|
|
||||||
"GridProfile": "Settaggi Inverter",
|
|
||||||
"LoadingInverter": "In attesa dei dati... (puo' richiedere fino a 10 secondi)",
|
|
||||||
"RadioStats": "Radio Statistics",
|
|
||||||
"TxRequest": "TX Request Count",
|
|
||||||
"RxSuccess": "RX Success",
|
|
||||||
"RxFailNothing": "RX Fail: Receive Nothing",
|
|
||||||
"RxFailPartial": "RX Fail: Receive Partial",
|
|
||||||
"RxFailCorrupt": "RX Fail: Receive Corrupt",
|
|
||||||
"TxReRequest": "TX Re-Request Fragment",
|
|
||||||
"StatsReset": "Reset Statistics",
|
|
||||||
"StatsResetting": "Resetting...",
|
|
||||||
"Rssi": "RSSI of last received packet",
|
|
||||||
"RssiHint": "HM inverters only support RSSI values < -64 dBm and > -64 dBm. In this case, -80 dbm and -30 dbm is shown.",
|
|
||||||
"dBm": "{dbm} dBm"
|
|
||||||
},
|
|
||||||
"eventlog": {
|
|
||||||
"Start": "Inizio",
|
|
||||||
"Stop": "Fine",
|
|
||||||
"Id": "ID",
|
|
||||||
"Message": "Messaggio"
|
|
||||||
},
|
|
||||||
"devinfo": {
|
|
||||||
"NoInfo": "Informazioni non disponibili",
|
|
||||||
"NoInfoLong": "Ancora nessuna informazione dall'inverter. Sto riprovando...",
|
|
||||||
"UnknownModel": "Modello sconosciuto! Per favore fornisci \"Hardware Part Number\" ed il modello (esempio HM-350) in una Issue su <a href=\"https://github.com/tbnobody/OpenDTU/issues\" target=\"_blank\">GitHub</a>.",
|
|
||||||
"Serial": "Seriale",
|
|
||||||
"ProdYear": "Produzione Annua",
|
|
||||||
"ProdWeek": "Produzione Settimanale",
|
|
||||||
"Model": "Modello",
|
|
||||||
"DetectedMaxPower": "Rilevata potenza massima",
|
|
||||||
"BootloaderVersion": "Versione Bootloader",
|
|
||||||
"FirmwareVersion": "Versione Firmware",
|
|
||||||
"FirmwareBuildDate": "Data Firmware",
|
|
||||||
"HardwarePartNumber": "Hardware Part Number",
|
|
||||||
"HardwareVersion": "Hardware Version",
|
|
||||||
"SupportsPowerDistributionLogic": "'Power Distribution Logic' supported",
|
|
||||||
"Yes": "@:base.Yes",
|
|
||||||
"No": "@:base.No"
|
|
||||||
},
|
|
||||||
"gridprofile": {
|
|
||||||
"NoInfo": "@:devinfo.NoInfo",
|
|
||||||
"NoInfoLong": "@:devinfo.NoInfoLong",
|
|
||||||
"Name": "Nome",
|
|
||||||
"Version": "Versione",
|
|
||||||
"Enabled": "@:wifistationinfo.Enabled",
|
|
||||||
"Disabled": "@:wifistationinfo.Disabled",
|
|
||||||
"GridprofileSupport": "Supporto sviluppatori",
|
|
||||||
"GridprofileSupportLong": "Clicca <a href=\"https://github.com/tbnobody/OpenDTU/wiki/Grid-Profile-Parser\" target=\"_blank\">qui</a> per ulteriori informazioni."
|
|
||||||
},
|
|
||||||
"systeminfo": {
|
|
||||||
"SystemInfo": "Info Sistema",
|
|
||||||
"VersionError": "Errore ricezione della versione",
|
|
||||||
"VersionNew": "Nuova versione disponibile! Mostra aggiornamenti!",
|
|
||||||
"VersionOk": "Già aggiornato!"
|
|
||||||
},
|
|
||||||
"firmwareinfo": {
|
|
||||||
"FirmwareInformation": "Info Firmware",
|
|
||||||
"Hostname": "Hostname",
|
|
||||||
"SdkVersion": "SDK Version",
|
|
||||||
"ConfigVersion": "Config Version",
|
|
||||||
"FirmwareVersion": "Firmware Version / Git Hash",
|
|
||||||
"PioEnv": "PIO Environment",
|
|
||||||
"FirmwareVersionHint": "Click here to show information about your current version",
|
|
||||||
"FirmwareUpdate": "Firmware Update",
|
|
||||||
"FirmwareUpdateHint": "Click here to view the changes between your version and the latest version",
|
|
||||||
"FrmwareUpdateAllow": "By activating the update check, a request is sent to GitHub.com each time the page is called up to retrieve the currently available version. If you do not agree with this, leave this function deactivated.",
|
|
||||||
"ResetReason0": "Reset Reason CPU 0",
|
|
||||||
"ResetReason1": "Reset Reason CPU 1",
|
|
||||||
"ConfigSaveCount": "Config save count",
|
|
||||||
"Uptime": "Uptime",
|
|
||||||
"UptimeValue": "0 days {time} | 1 day {time} | {count} days {time}"
|
|
||||||
},
|
|
||||||
"hardwareinfo": {
|
|
||||||
"HardwareInformation": "Info Hardware",
|
|
||||||
"ChipModel": "Chip Model",
|
|
||||||
"ChipRevision": "Chip Revision",
|
|
||||||
"ChipCores": "Chip Cores",
|
|
||||||
"CpuFrequency": "CPU Frequency",
|
|
||||||
"Mhz": "MHz",
|
|
||||||
"CpuTemperature": "CPU Temperature",
|
|
||||||
"FlashSize": "Flash Memory Size"
|
|
||||||
},
|
|
||||||
"memoryinfo": {
|
|
||||||
"MemoryInformation": "Info Memoria",
|
|
||||||
"Type": "Tipo",
|
|
||||||
"Usage": "Uso",
|
|
||||||
"Free": "Libera",
|
|
||||||
"Used": "Usata",
|
|
||||||
"Size": "Dimensione",
|
|
||||||
"Heap": "Heap",
|
|
||||||
"PsRam": "PSRAM",
|
|
||||||
"LittleFs": "LittleFs",
|
|
||||||
"Sketch": "Sketch"
|
|
||||||
},
|
|
||||||
"heapdetails": {
|
|
||||||
"HeapDetails": "Dettagli memoria Heap",
|
|
||||||
"TotalFree": "Libera totale",
|
|
||||||
"LargestFreeBlock": "Blocco contiguo libero più grande",
|
|
||||||
"MaxUsage": "Massima utilizzata dall'avvio",
|
|
||||||
"Fragmentation": "Livello frammentazione"
|
|
||||||
},
|
|
||||||
"taskdetails": {
|
|
||||||
"TaskDetails": "Task Details",
|
|
||||||
"Name": "Name",
|
|
||||||
"StackFree": "Stack Free",
|
|
||||||
"Priority": "Priority",
|
|
||||||
"Task_idle0": "Idle (CPU Core 0)",
|
|
||||||
"Task_idle1": "Idle (CPU Core 1)",
|
|
||||||
"Task_wifi": "Wi-Fi",
|
|
||||||
"Task_tit": "TCP/IP",
|
|
||||||
"Task_looptask": "Arduino Main Loop",
|
|
||||||
"Task_asynctcp": "Async TCP",
|
|
||||||
"Task_mqttclient": "MQTT Client",
|
|
||||||
"Task_huaweican0": "AC Charger CAN",
|
|
||||||
"Task_pmsdm": "PowerMeter (SDM)",
|
|
||||||
"Task_pmhttpjson": "PowerMeter (HTTP+JSON)",
|
|
||||||
"Task_pmsml": "PowerMeter (Serial SML)",
|
|
||||||
"Task_pmhttpsml": "PowerMeter (HTTP+SML)"
|
|
||||||
},
|
|
||||||
"radioinfo": {
|
|
||||||
"RadioInformation": "Info Transceiver Radio",
|
|
||||||
"Status": "{module} Stato",
|
|
||||||
"ChipStatus": "{module} Chip Stato",
|
|
||||||
"ChipType": "{module} Chip Tipo",
|
|
||||||
"Connected": "connesso",
|
|
||||||
"NotConnected": "non connesso",
|
|
||||||
"Configured": "configurato",
|
|
||||||
"NotConfigured": "no configurato",
|
|
||||||
"Unknown": "Sconosciuto"
|
|
||||||
},
|
|
||||||
"networkinfo": {
|
|
||||||
"NetworkInformation": "Informazioni Rete"
|
|
||||||
},
|
|
||||||
"wifistationinfo": {
|
|
||||||
"WifiStationInfo": "Info WiFi (Station)",
|
|
||||||
"Status": "Stato",
|
|
||||||
"Enabled": "abilitato",
|
|
||||||
"Disabled": "disabilitato",
|
|
||||||
"Ssid": "SSID",
|
|
||||||
"Bssid": "BSSID",
|
|
||||||
"Quality": "Qualità",
|
|
||||||
"Rssi": "RSSI"
|
|
||||||
},
|
|
||||||
"wifiapinfo": {
|
|
||||||
"WifiApInfo": "Info WiFi (Access Point)",
|
|
||||||
"Status": "@:wifistationinfo.Status",
|
|
||||||
"Enabled": "@:wifistationinfo.Enabled",
|
|
||||||
"Disabled": "@:wifistationinfo.Disabled",
|
|
||||||
"Ssid": "@:wifistationinfo.Ssid",
|
|
||||||
"Stations": "Numero Stazioni"
|
|
||||||
},
|
|
||||||
"interfacenetworkinfo": {
|
|
||||||
"NetworkInterface": "Interfaccia di Rete ({iface})",
|
|
||||||
"Hostname": "@:firmwareinfo.Hostname",
|
|
||||||
"IpAddress": "Indirizzo IP",
|
|
||||||
"Netmask": "Netmask",
|
|
||||||
"DefaultGateway": "Gateway",
|
|
||||||
"Dns": "DNS {num}",
|
|
||||||
"MacAddress": "Indirizzo MAC"
|
|
||||||
},
|
|
||||||
"interfaceapinfo": {
|
|
||||||
"NetworkInterface": "Interfaccia di Rete (Access Point)",
|
|
||||||
"IpAddress": "@:interfacenetworkinfo.IpAddress",
|
|
||||||
"MacAddress": "@:interfacenetworkinfo.MacAddress"
|
|
||||||
},
|
|
||||||
"ntpinfo": {
|
|
||||||
"NtpInformation": "Informazioni NTP",
|
|
||||||
"ConfigurationSummary": "Riepilogo Configurazione",
|
|
||||||
"Server": "Server",
|
|
||||||
"Timezone": "Timezone",
|
|
||||||
"TimezoneDescription": "Descrizione Timezone",
|
|
||||||
"CurrentTime": "Data/Ora attuale",
|
|
||||||
"Status": "Stato",
|
|
||||||
"Synced": "sincronizzata",
|
|
||||||
"NotSynced": "non sincronizzata",
|
|
||||||
"LocalTime": "Ora Locale",
|
|
||||||
"Sunrise": "Alba",
|
|
||||||
"Sunset": "Tramonto",
|
|
||||||
"NotAvailable": "Non Disponibile",
|
|
||||||
"Mode": "Modalità",
|
|
||||||
"Day": "Giorno",
|
|
||||||
"Night": "Notte"
|
|
||||||
},
|
|
||||||
"mqttinfo": {
|
|
||||||
"MqttInformation": "Informazioni MQTT",
|
|
||||||
"ConfigurationSummary": "@:ntpinfo.ConfigurationSummary",
|
|
||||||
"Status": "@:ntpinfo.Status",
|
|
||||||
"Enabled": "Abilitato",
|
|
||||||
"Disabled": "Disabilitato",
|
|
||||||
"Server": "@:ntpinfo.Server",
|
|
||||||
"Port": "Porta",
|
|
||||||
"ClientId": "Client ID",
|
|
||||||
"Username": "Username",
|
|
||||||
"BaseTopic": "Topic Base",
|
|
||||||
"PublishInterval": "Intervallo Publish",
|
|
||||||
"Seconds": "{sec} secondi",
|
|
||||||
"CleanSession": "CleanSession",
|
|
||||||
"Retain": "Retain",
|
|
||||||
"Tls": "TLS",
|
|
||||||
"RootCertifcateInfo": "Info Certificato Root CA",
|
|
||||||
"TlsCertLogin": "Entra con Certificato TLS",
|
|
||||||
"ClientCertifcateInfo": "Info Certificato Client",
|
|
||||||
"HassSummary": "Riepilogo Configurazione Home Assistant MQTT Auto Discovery",
|
|
||||||
"Expire": "Scade",
|
|
||||||
"IndividualPanels": "Pannello Individuale",
|
|
||||||
"RuntimeSummary": "Riepilogo Runtime",
|
|
||||||
"ConnectionStatus": "Stato Connessione",
|
|
||||||
"Connected": "connesso",
|
|
||||||
"Disconnected": "disconnesso"
|
|
||||||
},
|
|
||||||
"console": {
|
|
||||||
"Console": "Console",
|
|
||||||
"VirtualDebugConsole": "Virtual Debug Console",
|
|
||||||
"EnableAutoScroll": "Abilita AutoScroll",
|
|
||||||
"ClearConsole": "Pulisci Console",
|
|
||||||
"CopyToClipboard": "Copia nella clipboard"
|
|
||||||
},
|
|
||||||
"inverterchannelinfo": {
|
|
||||||
"String": "Stringa {num}",
|
|
||||||
"Phase": "Fase {num}",
|
|
||||||
"General": "Generale"
|
|
||||||
},
|
|
||||||
"invertertotalinfo": {
|
|
||||||
"TotalYieldTotal": "Totale Energia",
|
|
||||||
"TotalYieldDay": "Energia Giornaliera",
|
|
||||||
"TotalPower": "Potenza Totale"
|
|
||||||
},
|
|
||||||
"inverterchannelproperty": {
|
|
||||||
"Power": "Potenza",
|
|
||||||
"Voltage": "Tensione",
|
|
||||||
"Current": "Corrente",
|
|
||||||
"Power DC": "PotenzaDC",
|
|
||||||
"YieldDay": "EnergiaOggi",
|
|
||||||
"YieldTotal": "EnergiaTotale",
|
|
||||||
"Frequency": "Frequenza",
|
|
||||||
"Temperature": "Temperatura",
|
|
||||||
"PowerFactor": "FattorePotenza",
|
|
||||||
"ReactivePower": "PotenzaReattiva",
|
|
||||||
"Efficiency": "Efficienza",
|
|
||||||
"Irradiation": "Irragiamento"
|
|
||||||
},
|
|
||||||
"maintenancereboot": {
|
|
||||||
"DeviceReboot": "Riavvio DTU",
|
|
||||||
"PerformReboot": "Fai il riavvio",
|
|
||||||
"Reboot": "Riavvio!",
|
|
||||||
"Cancel": "@:base.Cancel",
|
|
||||||
"RebootOpenDTU": "Riavvio OpenDTU",
|
|
||||||
"RebootQuestion": "Vuoi veramente riavvia il DTU?",
|
|
||||||
"RebootHint": "<b>Nota:</b> Normalmente non serve riavviare OpenDTU, in quanto esegue automaticamente il ravvio quando necessario (ad esempio dopo aggiornamento firmware). Modifiche alla configurazione vengono apprese subito, senza richiedere riavvio. Se devi riavviare a causa di un errore, ti preghiamo di segnalarcelo cliccando su <a href=\"https://github.com/tbnobody/OpenDTU/issues\" class=\"alert-link\" target=\"_blank\">https://github.com/tbnobody/OpenDTU/issues</a>."
|
|
||||||
},
|
|
||||||
"dtuadmin": {
|
|
||||||
"DtuSettings": "Impostazioni DTU",
|
|
||||||
"DtuConfiguration": "Configurazione DTU",
|
|
||||||
"Serial": "Seriale",
|
|
||||||
"SerialHint": "Sia il DTU che l'inverter hanno un numero seriale. Il numero seriale del DTU è generato casualmente al primo avvio e normalmente non serve modificarlo.",
|
|
||||||
"PollInterval": "Intervallo Interrogazione",
|
|
||||||
"Seconds": "Secondi",
|
|
||||||
"NrfPaLevel": "Potenza Trasmettitore NRF24",
|
|
||||||
"CmtPaLevel": "Potenza Trasmettitore CMT2300A",
|
|
||||||
"NrfPaLevelHint": "Usato per inverter HM. Considera che aumentando la potenza aumentano il consumo di corrente.",
|
|
||||||
"CmtPaLevelHint": "Usato per inverter HMS/HMT. Considera che aumentando la potenza aumentano il consumo di corrente.",
|
|
||||||
"CmtCountry": "CMT2300A Zona/Paese",
|
|
||||||
"CmtCountryHint": "Ogni zona ha una differente allocazione di frequenze utilizzabili.",
|
|
||||||
"country_0": "Europa ({min}MHz - {max}MHz)",
|
|
||||||
"country_1": "Nord America ({min}MHz - {max}MHz)",
|
|
||||||
"country_2": "Brasile ({min}MHz - {max}MHz)",
|
|
||||||
"CmtFrequency": "Frequenza CMT2300A",
|
|
||||||
"CmtFrequencyHint": "Fai attenzione ad usare solo frequenze ammesse nel tuo Paese! Dopo la modifica frequenza, servono fino a 15 minuti affinché la connessione si ristabilisca.",
|
|
||||||
"CmtFrequencyWarning": "La frequenza selezionata è fuori dal range selezionato dal tuo Paese. Verifica che la frequenza selezionata non violi le normative del tuo Paese.",
|
|
||||||
"MHz": "{mhz} MHz",
|
|
||||||
"dBm": "{dbm} dBm",
|
|
||||||
"Min": "Minima ({db} dBm)",
|
|
||||||
"Low": "Bassa ({db} dBm)",
|
|
||||||
"High": "Alta ({db} dBm)",
|
|
||||||
"Max": "Massima ({db} dBm)"
|
|
||||||
},
|
|
||||||
"securityadmin": {
|
|
||||||
"SecuritySettings": "Impostazioni di Sicurezza",
|
|
||||||
"AdminPassword": "Password Admin",
|
|
||||||
"Password": "Password",
|
|
||||||
"RepeatPassword": "Ripeti Password",
|
|
||||||
"PasswordHint": "<b>Nota:</b> La password di amministrazione viene utilizzata non solo per accedere a questa interfaccia web (con user 'admin'), ma anche per connettersi al dispositivo in modalità AP. Deve avere da 8 a 64 caratteri.",
|
|
||||||
"Permissions": "Permessi",
|
|
||||||
"ReadOnly": "Permetti accessi web in sola lettura senza richiedere la password"
|
|
||||||
},
|
|
||||||
"ntpadmin": {
|
|
||||||
"NtpSettings": "Impostazioni NTP (Data / Ora)",
|
|
||||||
"NtpConfiguration": "Configurazione NTP",
|
|
||||||
"TimeServer": "Server NTP",
|
|
||||||
"TimeServerHint": "Puoi lasciare il valore di default, nel caso in cui OpenDTU abbia accesso ad internet.",
|
|
||||||
"Timezone": "Timezone",
|
|
||||||
"TimezoneConfig": "Timezone Config",
|
|
||||||
"LocationConfiguration": "Configurazione Posizione",
|
|
||||||
"Longitude": "Longitudine",
|
|
||||||
"Latitude": "Latitudine",
|
|
||||||
"SunSetType": "Tipo di Alba",
|
|
||||||
"SunSetTypeHint": "Influenza il calcolo dell'ora di Alba/Tramonto. Dopo la conferma, è richiesto fino ad un minuto perché la modifica venga applicata.",
|
|
||||||
"OFFICIAL": "Standard dawn (90.8°)",
|
|
||||||
"NAUTICAL": "Nautical dawn (102°)",
|
|
||||||
"CIVIL": "Civil dawn (96°)",
|
|
||||||
"ASTONOMICAL": "Astronomical dawn (108°)",
|
|
||||||
"ManualTimeSynchronization": "Sincronizzazione Manuale Data/Ora",
|
|
||||||
"CurrentOpenDtuTime": "Ora OpenDTU attuale",
|
|
||||||
"CurrentLocalTime": "Ora Locale attuale",
|
|
||||||
"SynchronizeTime": "Sincronizza Data/Ora",
|
|
||||||
"SynchronizeTimeHint": "<b>Nota:</b> Puoi usare la sincronizzazione manuale per impostare Data/Ora nel caso che non sia disponibile un server NTP. In questo caso la data/ora viene persa in caso di mancata alimentazione. Inoltre, con la sincronizzazione manuale ci sarà una progressiva deriva della Data/Ora in quanto l'ESP32 non ha un Real Time Clock interno."
|
|
||||||
},
|
|
||||||
"networkadmin": {
|
|
||||||
"NetworkSettings": "Impostazioni di Rete",
|
|
||||||
"WifiConfiguration": "Configurazione WiFi",
|
|
||||||
"WifiSsid": "WiFi SSID",
|
|
||||||
"WifiPassword": "WiFi Password",
|
|
||||||
"Hostname": "Hostname",
|
|
||||||
"HostnameHint": "<b>Nota:</b> Il testo <span class=\"font-monospace\">%06X</span> sarà rimpiazzato con le ultime 6 cifre del ChipID dell'ESP32 in formato esadecimale.",
|
|
||||||
"EnableDhcp": "Abilita DHCP",
|
|
||||||
"StaticIpConfiguration": "Configurazione IP Statico",
|
|
||||||
"IpAddress": "Indirizzo IP",
|
|
||||||
"Netmask": "Netmask",
|
|
||||||
"DefaultGateway": "Default Gateway",
|
|
||||||
"Dns": "DNS Server {num}",
|
|
||||||
"AdminAp": "Configurazione WiFi (Admin AccessPoint)",
|
|
||||||
"ApTimeout": "Timeout AccessPoint",
|
|
||||||
"ApTimeoutHint": "Tempo in cui la modalità AccessPoint rimarrà attiva. 0=per sempre.",
|
|
||||||
"Minutes": "minuti",
|
|
||||||
"EnableMdns": "Abilita mDNS",
|
|
||||||
"MdnsSettings": "Configurazione mDNS"
|
|
||||||
},
|
|
||||||
"mqttadmin": {
|
|
||||||
"MqttSettings": "Impostazioni MQTT",
|
|
||||||
"MqttConfiguration": "Configurazione MQTT",
|
|
||||||
"EnableMqtt": "Abilita MQTT",
|
|
||||||
"EnableHass": "Abilita Home Assistant MQTT Auto Discovery",
|
|
||||||
"MqttBrokerParameter": "Parametri Broker MQTT",
|
|
||||||
"Hostname": "Hostname",
|
|
||||||
"HostnameHint": "Hostname o Indirizzo IP",
|
|
||||||
"Port": "Porta",
|
|
||||||
"ClientId": "Client ID",
|
|
||||||
"Username": "Username",
|
|
||||||
"UsernameHint": "Username, lascia vuoto per connessione anonima",
|
|
||||||
"Password": "Password",
|
|
||||||
"PasswordHint": "Password, lascia vuota per connessione anonima",
|
|
||||||
"BaseTopic": "Topic Base",
|
|
||||||
"BaseTopicHint": "Topic Base, prefisso da aggiungere (ad esempio inverter/)",
|
|
||||||
"PublishInterval": "Intervallo pubblicazione",
|
|
||||||
"Seconds": "secondi",
|
|
||||||
"CleanSession": "Abilita CleanSession",
|
|
||||||
"EnableRetain": "Abilita Retain",
|
|
||||||
"EnableTls": "Abilita TLS",
|
|
||||||
"RootCa": "CA-Root-Certificate (default Letsencrypt)",
|
|
||||||
"TlsCertLoginEnable": "Abilita Login con certificato TLS",
|
|
||||||
"ClientCert": "TLS Client-Certificate",
|
|
||||||
"ClientKey": "TLS Client-Key",
|
|
||||||
"LwtParameters": "Parametri LWT",
|
|
||||||
"LwtTopic": "Topic LWT",
|
|
||||||
"LwtTopicHint": "Topic LWT, da aggiungere al Topic Base",
|
|
||||||
"LwtOnline": "Messaggio 'Online0 LWT",
|
|
||||||
"LwtOnlineHint": "Messaggio pubblicato quando online",
|
|
||||||
"LwtOffline": "Messaggio 'Offline' LWT",
|
|
||||||
"LwtOfflineHint": "Messaggio che sarà pubblicato quando offline",
|
|
||||||
"LwtQos": "QoS (Quality of Service)",
|
|
||||||
"QOS0": "0 (Al massimo una volta)",
|
|
||||||
"QOS1": "1 (Almeno una volta)",
|
|
||||||
"QOS2": "2 (Esattamente una volta)",
|
|
||||||
"HassParameters": "Parametri Home Assistant MQTT Auto Discovery",
|
|
||||||
"HassPrefixTopic": "Prefisso Topic",
|
|
||||||
"HassPrefixTopicHint": "Prefisso per Topic autodiscovery",
|
|
||||||
"HassRetain": "Abilita Retain",
|
|
||||||
"HassExpire": "Abilita Scadenza",
|
|
||||||
"HassIndividual": "Pannelli Individuale"
|
|
||||||
},
|
|
||||||
"inverteradmin": {
|
|
||||||
"InverterSettings": "Impostazioni Inverter",
|
|
||||||
"AddInverter": "Aggiungi nuovo Inverter",
|
|
||||||
"Serial": "Seriale",
|
|
||||||
"Name": "Nome",
|
|
||||||
"Add": "Aggiungi",
|
|
||||||
"AddHint": "<b>Nota:</b> Potrai aggiungere ulteriori parametri dopo aver creato l'inverter, cliccando sull'icona 'Matita' nella lista inverter.",
|
|
||||||
"InverterList": "Lista Inverter",
|
|
||||||
"Status": "Stato",
|
|
||||||
"Send": "Invia",
|
|
||||||
"Receive": "Riceve",
|
|
||||||
"StatusHint": "<b>Nota:</b> L'inverter viene alimentato dal fotovoltaico. Durante la notte, l'inverter risulterà spento. Le richieste potranno comunque essere trasmesse.",
|
|
||||||
"Type": "Tipo",
|
|
||||||
"Action": "Azione",
|
|
||||||
"SaveOrder": "Salva ordine",
|
|
||||||
"DeleteInverter": "Rimuovi inverter",
|
|
||||||
"EditInverter": "Modifica inverter",
|
|
||||||
"General": "Generale",
|
|
||||||
"String": "Stringa",
|
|
||||||
"Advanced": "Avanzate",
|
|
||||||
"InverterSerial": "Seriale Inverter:",
|
|
||||||
"InverterName": "Nome Inverter:",
|
|
||||||
"InverterNameHint": "Puoi specificare un nome qualsiasi da assegnare all'inverter.",
|
|
||||||
"InverterStatus": "Riceve / Invia",
|
|
||||||
"PollEnable": "Interroga inverter",
|
|
||||||
"PollEnableNight": "Interroga inverter di notte",
|
|
||||||
"CommandEnable": "Invia comandi",
|
|
||||||
"CommandEnableNight": "Invia comandi di notte",
|
|
||||||
"StringName": "Nome stringa {num}:",
|
|
||||||
"StringNameHint": "Qui puoi specificare un nome qualsiasi per la porta dell'inverter o per il pannello fotovoltaico collegato.",
|
|
||||||
"StringMaxPower": "Massima potenza stringa {num}:",
|
|
||||||
"StringMaxPowerHint": "Inserisci la potenza massima associata ai panelli fotovoltaici collegati a questa stringa.",
|
|
||||||
"StringYtOffset": "Offset Energia totale per la stringa {num}:",
|
|
||||||
"StringYtOffsetHint": "Questo offset viene utilizzato per azzerare il contatore qualora venga usato un inverter usato.",
|
|
||||||
"InverterHint": "*) Inserisci la potenza W<sub>p</sub> dei pannelli fotovoltaici collegati alla stringa: servirà per calcolare l'irragiamento.",
|
|
||||||
"ReachableThreshold": "Reachable Threshold",
|
|
||||||
"ReachableThresholdHint": "Definisce il numero di richieste fallite prima che l'inverter sia considerato irraggiungibile.",
|
|
||||||
"ZeroRuntime": "Azzera dati in tempo reale",
|
|
||||||
"ZeroRuntimeHint": "Azzera i dati in tempo reale (tranne l'Energia) se l'inverter diventa irraggiunbile.",
|
|
||||||
"ZeroDay": "Azzera dati energia alla mezzanotte",
|
|
||||||
"ZeroDayHint": "Questo vale se l'inverter risulta irraggiungibile. Se l'inverter risponde anche di notte, verranno mostrati i suoi valori. (Il Reset si verifica al riavvio)",
|
|
||||||
"ClearEventlog": "Clear Eventlog at midnight",
|
|
||||||
"Cancel": "@:base.Cancel",
|
|
||||||
"Save": "@:base.Save",
|
|
||||||
"DeleteMsg": "Sicuro di voler rimuovere l'inverter \"{name}\" con numero seriale {serial}?",
|
|
||||||
"Delete": "Rimuovi",
|
|
||||||
"YieldDayCorrection": "Correzione energia giornaliera",
|
|
||||||
"YieldDayCorrectionHint": "Aggiungi questo valore all'energia giornaliera se l'inverter è stato riavviato. Questo valore sarò resettato a mezzanotte"
|
|
||||||
},
|
|
||||||
"fileadmin": {
|
|
||||||
"ConfigManagement": "Configurazione Gestione",
|
|
||||||
"BackupHeader": "Backup: Configurazione File Backup",
|
|
||||||
"BackupConfig": "Esegui il backup del file",
|
|
||||||
"Backup": "Backup",
|
|
||||||
"Restore": "Ripristina",
|
|
||||||
"NoFileSelected": "Nessun file selezionato",
|
|
||||||
"RestoreHeader": "Ripristina: Ripristina File Configurazione",
|
|
||||||
"Back": "Indietro",
|
|
||||||
"UploadSuccess": "Invio File con successo",
|
|
||||||
"RestoreHint": "<b>Nota:</b> questa operazione rimpiazza la configurazione con quella contenuta nel file, e poi riavvia automaticamente OpenDTU per applicare la nuova configurazione.",
|
|
||||||
"ResetHeader": "Inizializza: Esegui il Factory Reset",
|
|
||||||
"FactoryResetButton": "Ripristina Configurazione Factory-Default",
|
|
||||||
"ResetHint": "<b>Nota:</b> Clicca 'Ripristina Configurazione Factory-Default' per stabilire le impostazioni di fabbrica e riavviare automaticamente OpenDTU.",
|
|
||||||
"FactoryReset": "Factory Reset",
|
|
||||||
"ResetMsg": "Sei sicuro di voler cancellare la configurazione attuale e applicare la configurazione di fabbrica?",
|
|
||||||
"ResetConfirm": "Factory Reset!",
|
|
||||||
"Cancel": "@:base.Cancel",
|
|
||||||
"InvalidJson": "JSON file is formatted incorrectly.",
|
|
||||||
"InvalidJsonContent": "JSON file has the wrong content."
|
|
||||||
},
|
|
||||||
"login": {
|
|
||||||
"Login": "Login",
|
|
||||||
"SystemLogin": "System Login",
|
|
||||||
"Username": "Username",
|
|
||||||
"UsernameRequired": "Inserisci Username",
|
|
||||||
"Password": "Password",
|
|
||||||
"PasswordRequired": "Inserisci Password",
|
|
||||||
"LoginButton": "Login"
|
|
||||||
},
|
|
||||||
"firmwareupgrade": {
|
|
||||||
"FirmwareUpgrade": "Aggiornamento Firmware",
|
|
||||||
"Loading": "@:base.Loading",
|
|
||||||
"OtaError": "Errore aggiornamento OTA",
|
|
||||||
"Back": "Indietro",
|
|
||||||
"Retry": "Riprova",
|
|
||||||
"OtaStatus": "Stato OTA",
|
|
||||||
"OtaSuccess": "Aggiornamento firmware eseguito con successo. Il dispositivo si riavvierà automaticamente. Quando sarà nuovamente disponibile, l'interfacca sarà ricaricata automaticamente.",
|
|
||||||
"FirmwareUpload": "Invia Firmware",
|
|
||||||
"UploadProgress": "Upload in corso"
|
|
||||||
},
|
|
||||||
"about": {
|
|
||||||
"AboutOpendtu": "About OpenDTU",
|
|
||||||
"Documentation": "Documentazione",
|
|
||||||
"DocumentationBody": "La documentazione firmware e hardware sono disponibili qui: <a href=\"https://www.opendtu.solar\" target=\"_blank\">https://www.opendtu.solar</a>",
|
|
||||||
"ProjectOrigin": "Origine Progetto",
|
|
||||||
"ProjectOriginBody1": "Questo progetto è partito da <a href=\"https://www.mikrocontroller.net/topic/525778\" target=\"_blank\">questa discussione. (Mikrocontroller.net)</a>",
|
|
||||||
"ProjectOriginBody2": "Il protocollo Hoymiles è stato decriptato grazie al contributo volontario di molti programmatori. OpenDTU, fra gli altri, è stato sviluppato grazie a questo lavoro. Il progetto è distribuito con Licenza Open Source (<a href=\"https://www.gnu.de/documents/gpl-2.0.de.html\" target=\"_blank\">GNU General Public License version 2</a>).",
|
|
||||||
"ProjectOriginBody3": "Il software è stato sviluppato con le nostre migliori conoscenze e convinzioni. Tuttavia, non si assume alcuna responsabilità per malfunzionamenti o perdita di garanzia dell'inverter.",
|
|
||||||
"ProjectOriginBody4": "OpenDTU è disponibile gratuitamente. Se hai pagato per questo software, probabilmente sei stato truffato.",
|
|
||||||
"NewsUpdates": "Novità e Aggiornamenti",
|
|
||||||
"NewsUpdatesBody": "Nuovi aggiornamenti sono disponibili su Github: <a href=\"https://github.com/tbnobody/OpenDTU\" target=\"_blank\">https://github.com/tbnobody/OpenDTU</a>",
|
|
||||||
"ErrorReporting": "Segnalazione Errori",
|
|
||||||
"ErrorReportingBody": "Per favore segnala eventuali problemi utilizzando le funzionalità della piattaforma <a href=\"https://github.com/tbnobody/OpenDTU/issues\" target=\"_blank\">Github</a>",
|
|
||||||
"Discussion": "Discussioni",
|
|
||||||
"DiscussionBody": "Puoi avviare una discussione con noi su <a href=\"https://discord.gg/WzhxEY62mB\" target=\"_blank\">Discord</a> o <a href=\"https://github.com/tbnobody/OpenDTU/discussions\" target=\"_blank\">Github</a>"
|
|
||||||
},
|
|
||||||
"hints": {
|
|
||||||
"RadioProblem": "Non è possibile dialogare con il modulo radio selezionato. Controlla i collegamenti alla radio.",
|
|
||||||
"TimeSync": "La Data/Ora non sono state sincronizzate, ed in tal caso non è possibile eseguire richieste all'inverter. Questa condizione è normale appena avviato, tuttavia dopo un po' (>1 minuto), questa situazione potrebbe indicare un problema di accesso al server NTP.",
|
|
||||||
"TimeSyncLink": "Controlla le impostazioni Data/Ora.",
|
|
||||||
"DefaultPassword": "Stai usando la password di default per accedere all'interfaccia web e per la modalità Access Point di emergenza. Questo può portare ad un rischio di sicurezza.",
|
|
||||||
"DefaultPasswordLink": "Per favore cambia la password.",
|
|
||||||
"PinMappingIssue": "You are using a generic firmware image, but have not yet uploaded a file with device profiles (<code>pin_mapping.json</code>) or have not selected a profile defined there. Please refer to the <a href=\"https://opendtu.solar/firmware/device_profiles/\" target=\"_blank\" class=\"alert-link\">documentation</a> for details."
|
|
||||||
},
|
|
||||||
"deviceadmin": {
|
|
||||||
"DeviceManager": "Device-Manager",
|
|
||||||
"ParseError": "Parse error in 'pin_mapping.json': {error}",
|
|
||||||
"PinAssignment": "Impostazioni Connessione",
|
|
||||||
"SelectedProfile": "Profilo selezionato",
|
|
||||||
"DefaultProfile": "(Impostazioni di Default)",
|
|
||||||
"ProfileHint": "Il tuo dispositivo potrebbe smettere di rispondere selezionando un profilo incompatibile. In questo caso, dovrai eseguire una cancellazione collegandoti all'interfaccia seriale.",
|
|
||||||
"Display": "Display",
|
|
||||||
"PowerSafe": "Abilita Risparmio Energetico",
|
|
||||||
"PowerSafeHint": "Spegni il display se l'inverter non produce.",
|
|
||||||
"Screensaver": "Abilita Screensaver",
|
|
||||||
"ScreensaverHint": "Muove il testo nel display per prevenire danneggiamento pixel. (Utile in caso di display OLED)",
|
|
||||||
"DiagramMode": "Modalità grafica",
|
|
||||||
"off": "Off",
|
|
||||||
"small": "Small",
|
|
||||||
"fullscreen": "Fullscreen",
|
|
||||||
"DiagramDuration": "Durata grafico",
|
|
||||||
"DiagramDurationHint": "Periodo che viene mostrato nel grafico.",
|
|
||||||
"Seconds": "Secondi",
|
|
||||||
"Contrast": "Contrasto ({contrast})",
|
|
||||||
"Rotation": "Rotazione",
|
|
||||||
"rot0": "Nessuna rotazione",
|
|
||||||
"rot90": "Rotazione 90 gradi",
|
|
||||||
"rot180": "Rotazione 180 gradi",
|
|
||||||
"rot270": "Rotazione 270 gradi",
|
|
||||||
"DisplayLanguage": "Linuga Display",
|
|
||||||
"en": "English",
|
|
||||||
"de": "German",
|
|
||||||
"fr": "French",
|
|
||||||
"Leds": "LEDs",
|
|
||||||
"EqualBrightness": "Equalizza luminosità",
|
|
||||||
"LedBrightness": "LED {led}, Luminosità ({brightness})"
|
|
||||||
},
|
|
||||||
"pininfo": {
|
|
||||||
"Category": "Categoria",
|
|
||||||
"Name": "Nome",
|
|
||||||
"Number": "Numero",
|
|
||||||
"ValueSelected": "Selezionato",
|
|
||||||
"ValueActive": "Attivo"
|
|
||||||
},
|
|
||||||
"inputserial": {
|
|
||||||
"format_hoymiles": "Hoymiles serial number format",
|
|
||||||
"format_converted": "Already converted serial number",
|
|
||||||
"format_herf_valid": "E-Star HERF format (will be saved converted): {serial}",
|
|
||||||
"format_herf_invalid": "E-Star HERF format: Invalid checksum",
|
|
||||||
"format_unknown": "Unknown format"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -19,12 +19,6 @@ CpuTemperatureClass CpuTemperature;
|
|||||||
|
|
||||||
float CpuTemperatureClass::read()
|
float CpuTemperatureClass::read()
|
||||||
{
|
{
|
||||||
#ifdef CONFIG_IDF_TARGET_ESP32S2
|
|
||||||
// Disabling temperature reading for ESP32-S2 models as it might lead to WDT resets.
|
|
||||||
// See: https://github.com/espressif/esp-idf/issues/8088
|
|
||||||
return NAN;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
std::lock_guard<std::mutex> lock(_mutex);
|
std::lock_guard<std::mutex> lock(_mutex);
|
||||||
|
|
||||||
float temperature = NAN;
|
float temperature = NAN;
|
||||||
|
|||||||
@ -57,7 +57,7 @@ void HoymilesClass::loop()
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (iv != nullptr && iv->getRadio()->isInitialized()) {
|
if (iv != nullptr && iv->getRadio()->isInitialized() && iv->getRadio()->isQueueEmpty()) {
|
||||||
|
|
||||||
if (iv->getZeroValuesIfUnreachable() && !iv->isReachable()) {
|
if (iv->getZeroValuesIfUnreachable() && !iv->isReachable()) {
|
||||||
iv->Statistics()->zeroRuntimeData();
|
iv->Statistics()->zeroRuntimeData();
|
||||||
@ -119,7 +119,6 @@ void HoymilesClass::loop()
|
|||||||
iv->sendGridOnProFileParaRequest();
|
iv->sendGridOnProFileParaRequest();
|
||||||
}
|
}
|
||||||
|
|
||||||
_messageOutput->printf("Queue size - NRF: %" PRId32 " CMT: %" PRId32 "\r\n", _radioNrf->getQueueSize(), _radioCmt->getQueueSize());
|
|
||||||
_lastPoll = millis();
|
_lastPoll = millis();
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -230,7 +229,6 @@ void HoymilesClass::removeInverterBySerial(const uint64_t serial)
|
|||||||
for (uint8_t i = 0; i < _inverters.size(); i++) {
|
for (uint8_t i = 0; i < _inverters.size(); i++) {
|
||||||
if (_inverters[i]->serial() == serial) {
|
if (_inverters[i]->serial() == serial) {
|
||||||
std::lock_guard<std::mutex> lock(_mutex);
|
std::lock_guard<std::mutex> lock(_mutex);
|
||||||
_inverters[i]->getRadio()->removeCommands(_inverters[i].get());
|
|
||||||
_inverters.erase(_inverters.begin() + i);
|
_inverters.erase(_inverters.begin() + i);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -156,16 +156,6 @@ bool HoymilesRadio::isInitialized() const
|
|||||||
return _isInitialized;
|
return _isInitialized;
|
||||||
}
|
}
|
||||||
|
|
||||||
void HoymilesRadio::removeCommands(InverterAbstract* inv)
|
|
||||||
{
|
|
||||||
_commandQueue.removeAllEntriesForInverter(inv);
|
|
||||||
}
|
|
||||||
|
|
||||||
uint8_t HoymilesRadio::countSimilarCommands(std::shared_ptr<CommandAbstract> cmd)
|
|
||||||
{
|
|
||||||
return _commandQueue.countSimilarCommands(cmd);
|
|
||||||
}
|
|
||||||
|
|
||||||
bool HoymilesRadio::isIdle() const
|
bool HoymilesRadio::isIdle() const
|
||||||
{
|
{
|
||||||
return !_busyFlag;
|
return !_busyFlag;
|
||||||
@ -175,8 +165,3 @@ bool HoymilesRadio::isQueueEmpty() const
|
|||||||
{
|
{
|
||||||
return _commandQueue.size() == 0;
|
return _commandQueue.size() == 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
uint32_t HoymilesRadio::getQueueSize() const
|
|
||||||
{
|
|
||||||
return _commandQueue.size();
|
|
||||||
}
|
|
||||||
|
|||||||
@ -1,17 +1,11 @@
|
|||||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include "Arduino.h"
|
|
||||||
#include "commands/CommandAbstract.h"
|
#include "commands/CommandAbstract.h"
|
||||||
#include "queue/CommandQueue.h"
|
|
||||||
#include "types.h"
|
#include "types.h"
|
||||||
|
#include <ThreadSafeQueue.h>
|
||||||
#include <TimeoutHelper.h>
|
#include <TimeoutHelper.h>
|
||||||
|
#include <memory>
|
||||||
#ifdef HOY_DEBUG_QUEUE
|
|
||||||
#define DEBUG_PRINT(fmt, args...) Serial.printf(fmt, ##args)
|
|
||||||
#else
|
|
||||||
#define DEBUG_PRINT(fmt, args...) /* Don't do anything in release builds */
|
|
||||||
#endif
|
|
||||||
|
|
||||||
class HoymilesRadio {
|
class HoymilesRadio {
|
||||||
public:
|
public:
|
||||||
@ -20,48 +14,11 @@ public:
|
|||||||
|
|
||||||
bool isIdle() const;
|
bool isIdle() const;
|
||||||
bool isQueueEmpty() const;
|
bool isQueueEmpty() const;
|
||||||
uint32_t getQueueSize() const;
|
|
||||||
bool isInitialized() const;
|
bool isInitialized() const;
|
||||||
|
|
||||||
void removeCommands(InverterAbstract* inv);
|
|
||||||
uint8_t countSimilarCommands(std::shared_ptr<CommandAbstract> cmd);
|
|
||||||
|
|
||||||
void enqueCommand(std::shared_ptr<CommandAbstract> cmd)
|
void enqueCommand(std::shared_ptr<CommandAbstract> cmd)
|
||||||
{
|
{
|
||||||
DEBUG_PRINT("Queue size before: %ld\r\n", _commandQueue.size());
|
|
||||||
DEBUG_PRINT("Handling command %s with type %d\r\n", cmd.get()->getCommandName().c_str(), static_cast<uint8_t>(cmd.get()->getQueueInsertType()));
|
|
||||||
switch (cmd.get()->getQueueInsertType()) {
|
|
||||||
case QueueInsertType::RemoveOldest:
|
|
||||||
_commandQueue.removeDuplicatedEntries(cmd);
|
|
||||||
break;
|
|
||||||
case QueueInsertType::ReplaceExistent:
|
|
||||||
// Checks if the queue already contains a command like the new one
|
|
||||||
// and replaces the existing one with the new one.
|
|
||||||
// (The new one will not be pushed at the end of the queue)
|
|
||||||
if (_commandQueue.countSimilarCommands(cmd) > 0) {
|
|
||||||
DEBUG_PRINT(" ... existing entry will be replaced\r\n");
|
|
||||||
_commandQueue.replaceEntries(cmd);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
case QueueInsertType::RemoveNewest:
|
|
||||||
// Checks if the queue already contains a command like the new one
|
|
||||||
// and drops the new one. The new one will not be inserted.
|
|
||||||
if (_commandQueue.countSimilarCommands(cmd) > 0) {
|
|
||||||
DEBUG_PRINT(" ... new entry will be dropped\r\n");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
case QueueInsertType::AllowMultiple:
|
|
||||||
// Dont do anything, just fall through and insert the command.
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Push the command into the queue if we reach this position of the code
|
|
||||||
DEBUG_PRINT(" ... new entry will be appended\r\n");
|
|
||||||
_commandQueue.push(cmd);
|
_commandQueue.push(cmd);
|
||||||
|
|
||||||
DEBUG_PRINT("Queue size after: %ld\r\n", _commandQueue.size());
|
|
||||||
}
|
}
|
||||||
|
|
||||||
template <typename T>
|
template <typename T>
|
||||||
@ -81,7 +38,7 @@ protected:
|
|||||||
void handleReceivedPackage();
|
void handleReceivedPackage();
|
||||||
|
|
||||||
serial_u _dtuSerial;
|
serial_u _dtuSerial;
|
||||||
CommandQueue _commandQueue;
|
ThreadSafeQueue<std::shared_ptr<CommandAbstract>> _commandQueue;
|
||||||
bool _isInitialized = false;
|
bool _isInitialized = false;
|
||||||
bool _busyFlag = false;
|
bool _busyFlag = false;
|
||||||
|
|
||||||
|
|||||||
@ -44,15 +44,7 @@ ActivePowerControlCommand::ActivePowerControlCommand(InverterAbstract* inv, cons
|
|||||||
|
|
||||||
String ActivePowerControlCommand::getCommandName() const
|
String ActivePowerControlCommand::getCommandName() const
|
||||||
{
|
{
|
||||||
char buffer[30];
|
return "ActivePowerControl";
|
||||||
snprintf(buffer, sizeof(buffer), "ActivePowerControl (%02X)", getType());
|
|
||||||
return buffer;
|
|
||||||
}
|
|
||||||
|
|
||||||
bool ActivePowerControlCommand::areSameParameter(CommandAbstract* other)
|
|
||||||
{
|
|
||||||
return CommandAbstract::areSameParameter(other)
|
|
||||||
&& this->getType() == static_cast<ActivePowerControlCommand*>(other)->getType();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void ActivePowerControlCommand::setActivePowerLimit(const float limit, const PowerLimitControlType type)
|
void ActivePowerControlCommand::setActivePowerLimit(const float limit, const PowerLimitControlType type)
|
||||||
@ -87,22 +79,19 @@ bool ActivePowerControlCommand::handleResponse(const fragment_t fragment[], cons
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
_inv->SystemConfigPara()->setLastUpdateCommand(millis());
|
_inv->SystemConfigPara()->setLastUpdateCommand(millis());
|
||||||
std::shared_ptr<ActivePowerControlCommand> cmd(std::shared_ptr<ActivePowerControlCommand>(), this);
|
_inv->SystemConfigPara()->setLastLimitCommandSuccess(CMD_OK);
|
||||||
if (_inv->getRadio()->countSimilarCommands(cmd) == 1) {
|
|
||||||
_inv->SystemConfigPara()->setLastLimitCommandSuccess(CMD_OK);
|
|
||||||
}
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
float ActivePowerControlCommand::getLimit() const
|
float ActivePowerControlCommand::getLimit() const
|
||||||
{
|
{
|
||||||
const float l = (static_cast<uint16_t>(_payload[12]) << 8) | _payload[13];
|
const float l = (((uint16_t)_payload[12] << 8) | _payload[13]);
|
||||||
return l / 10;
|
return l / 10;
|
||||||
}
|
}
|
||||||
|
|
||||||
PowerLimitControlType ActivePowerControlCommand::getType() const
|
PowerLimitControlType ActivePowerControlCommand::getType()
|
||||||
{
|
{
|
||||||
return (PowerLimitControlType)((static_cast<uint16_t>(_payload[14]) << 8) | _payload[15]);
|
return (PowerLimitControlType)(((uint16_t)_payload[14] << 8) | _payload[15]);
|
||||||
}
|
}
|
||||||
|
|
||||||
void ActivePowerControlCommand::gotTimeout()
|
void ActivePowerControlCommand::gotTimeout()
|
||||||
|
|||||||
@ -15,13 +15,11 @@ public:
|
|||||||
explicit ActivePowerControlCommand(InverterAbstract* inv, const uint64_t router_address = 0);
|
explicit ActivePowerControlCommand(InverterAbstract* inv, const uint64_t router_address = 0);
|
||||||
|
|
||||||
virtual String getCommandName() const;
|
virtual String getCommandName() const;
|
||||||
virtual QueueInsertType getQueueInsertType() const { return QueueInsertType::RemoveOldest; }
|
|
||||||
virtual bool areSameParameter(CommandAbstract* other);
|
|
||||||
|
|
||||||
virtual bool handleResponse(const fragment_t fragment[], const uint8_t max_fragment_id);
|
virtual bool handleResponse(const fragment_t fragment[], const uint8_t max_fragment_id);
|
||||||
virtual void gotTimeout();
|
virtual void gotTimeout();
|
||||||
|
|
||||||
void setActivePowerLimit(const float limit, const PowerLimitControlType type = RelativNonPersistent);
|
void setActivePowerLimit(const float limit, const PowerLimitControlType type = RelativNonPersistent);
|
||||||
float getLimit() const;
|
float getLimit() const;
|
||||||
PowerLimitControlType getType() const;
|
PowerLimitControlType getType();
|
||||||
};
|
};
|
||||||
|
|||||||
@ -138,9 +138,3 @@ uint8_t CommandAbstract::getMaxRetransmitCount() const
|
|||||||
{
|
{
|
||||||
return MAX_RETRANSMIT_COUNT;
|
return MAX_RETRANSMIT_COUNT;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool CommandAbstract::areSameParameter(CommandAbstract* other)
|
|
||||||
{
|
|
||||||
return this->getCommandName() == other->getCommandName()
|
|
||||||
&& this->_targetAddress == other->getTargetAddress();
|
|
||||||
}
|
|
||||||
|
|||||||
@ -11,18 +11,6 @@
|
|||||||
|
|
||||||
class InverterAbstract;
|
class InverterAbstract;
|
||||||
|
|
||||||
enum class QueueInsertType {
|
|
||||||
AllowMultiple,
|
|
||||||
// Remove from beginning of the queue
|
|
||||||
RemoveOldest,
|
|
||||||
|
|
||||||
// Don't insert command if it already exist
|
|
||||||
RemoveNewest,
|
|
||||||
|
|
||||||
// Replace the existing entry in the queue by the one to be added
|
|
||||||
ReplaceExistent,
|
|
||||||
};
|
|
||||||
|
|
||||||
class CommandAbstract {
|
class CommandAbstract {
|
||||||
public:
|
public:
|
||||||
explicit CommandAbstract(InverterAbstract* inv, const uint64_t router_address = 0);
|
explicit CommandAbstract(InverterAbstract* inv, const uint64_t router_address = 0);
|
||||||
@ -58,10 +46,6 @@ public:
|
|||||||
// Sets the amount how often a missing fragment is re-requested if it was not available
|
// Sets the amount how often a missing fragment is re-requested if it was not available
|
||||||
virtual uint8_t getMaxRetransmitCount() const;
|
virtual uint8_t getMaxRetransmitCount() const;
|
||||||
|
|
||||||
// Returns whether multiple instances of this command are allowed in the command queue.
|
|
||||||
virtual QueueInsertType getQueueInsertType() const { return QueueInsertType::RemoveNewest; }
|
|
||||||
virtual bool areSameParameter(CommandAbstract* other);
|
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
uint8_t _payload[RF_LEN];
|
uint8_t _payload[RF_LEN];
|
||||||
uint8_t _payload_size;
|
uint8_t _payload_size;
|
||||||
|
|||||||
@ -35,8 +35,8 @@ DevControlCommand::DevControlCommand(InverterAbstract* inv, const uint64_t route
|
|||||||
void DevControlCommand::udpateCRC(const uint8_t len)
|
void DevControlCommand::udpateCRC(const uint8_t len)
|
||||||
{
|
{
|
||||||
const uint16_t crc = crc16(&_payload[10], len);
|
const uint16_t crc = crc16(&_payload[10], len);
|
||||||
_payload[10 + len] = static_cast<uint8_t>(crc >> 8);
|
_payload[10 + len] = (uint8_t)(crc >> 8);
|
||||||
_payload[10 + len + 1] = static_cast<uint8_t>(crc);
|
_payload[10 + len + 1] = (uint8_t)(crc);
|
||||||
}
|
}
|
||||||
|
|
||||||
bool DevControlCommand::handleResponse(const fragment_t fragment[], const uint8_t max_fragment_id)
|
bool DevControlCommand::handleResponse(const fragment_t fragment[], const uint8_t max_fragment_id)
|
||||||
|
|||||||
@ -63,10 +63,10 @@ uint8_t MultiDataCommand::getDataType() const
|
|||||||
|
|
||||||
void MultiDataCommand::setTime(const time_t time)
|
void MultiDataCommand::setTime(const time_t time)
|
||||||
{
|
{
|
||||||
_payload[12] = static_cast<uint8_t>(time >> 24);
|
_payload[12] = (uint8_t)(time >> 24);
|
||||||
_payload[13] = static_cast<uint8_t>(time >> 16);
|
_payload[13] = (uint8_t)(time >> 16);
|
||||||
_payload[14] = static_cast<uint8_t>(time >> 8);
|
_payload[14] = (uint8_t)(time >> 8);
|
||||||
_payload[15] = static_cast<uint8_t>(time);
|
_payload[15] = (uint8_t)(time);
|
||||||
udpateCRC();
|
udpateCRC();
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -112,8 +112,8 @@ bool MultiDataCommand::handleResponse(const fragment_t fragment[], const uint8_t
|
|||||||
void MultiDataCommand::udpateCRC()
|
void MultiDataCommand::udpateCRC()
|
||||||
{
|
{
|
||||||
const uint16_t crc = crc16(&_payload[10], 14); // From data_type till password
|
const uint16_t crc = crc16(&_payload[10], 14); // From data_type till password
|
||||||
_payload[24] = static_cast<uint8_t>(crc >> 8);
|
_payload[24] = (uint8_t)(crc >> 8);
|
||||||
_payload[25] = static_cast<uint8_t>(crc);
|
_payload[25] = (uint8_t)(crc);
|
||||||
}
|
}
|
||||||
|
|
||||||
uint8_t MultiDataCommand::getTotalFragmentSize(const fragment_t fragment[], const uint8_t max_fragment_id)
|
uint8_t MultiDataCommand::getTotalFragmentSize(const fragment_t fragment[], const uint8_t max_fragment_id)
|
||||||
|
|||||||
@ -8,7 +8,6 @@ public:
|
|||||||
explicit PowerControlCommand(InverterAbstract* inv, const uint64_t router_address = 0);
|
explicit PowerControlCommand(InverterAbstract* inv, const uint64_t router_address = 0);
|
||||||
|
|
||||||
virtual String getCommandName() const;
|
virtual String getCommandName() const;
|
||||||
virtual QueueInsertType getQueueInsertType() const { return QueueInsertType::AllowMultiple; }
|
|
||||||
|
|
||||||
virtual bool handleResponse(const fragment_t fragment[], const uint8_t max_fragment_id);
|
virtual bool handleResponse(const fragment_t fragment[], const uint8_t max_fragment_id);
|
||||||
virtual void gotTimeout();
|
virtual void gotTimeout();
|
||||||
|
|||||||
@ -30,9 +30,7 @@ static const byteAssign_t byteAssignment[] = {
|
|||||||
};
|
};
|
||||||
|
|
||||||
HERF_1CH::HERF_1CH(HoymilesRadio* radio, const uint64_t serial)
|
HERF_1CH::HERF_1CH(HoymilesRadio* radio, const uint64_t serial)
|
||||||
: HM_Abstract(radio, serial)
|
: HM_Abstract(radio, serial) {};
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
bool HERF_1CH::isValidSerial(const uint64_t serial)
|
bool HERF_1CH::isValidSerial(const uint64_t serial)
|
||||||
{
|
{
|
||||||
|
|||||||
@ -37,9 +37,7 @@ static const byteAssign_t byteAssignment[] = {
|
|||||||
};
|
};
|
||||||
|
|
||||||
HERF_2CH::HERF_2CH(HoymilesRadio* radio, const uint64_t serial)
|
HERF_2CH::HERF_2CH(HoymilesRadio* radio, const uint64_t serial)
|
||||||
: HM_Abstract(radio, serial)
|
: HM_Abstract(radio, serial) {};
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
bool HERF_2CH::isValidSerial(const uint64_t serial)
|
bool HERF_2CH::isValidSerial(const uint64_t serial)
|
||||||
{
|
{
|
||||||
@ -50,7 +48,7 @@ bool HERF_2CH::isValidSerial(const uint64_t serial)
|
|||||||
|
|
||||||
String HERF_2CH::typeName() const
|
String HERF_2CH::typeName() const
|
||||||
{
|
{
|
||||||
return "HERF-600/800-2T";
|
return "HERF-800-2T";
|
||||||
}
|
}
|
||||||
|
|
||||||
const byteAssign_t* HERF_2CH::getByteAssignment() const
|
const byteAssign_t* HERF_2CH::getByteAssignment() const
|
||||||
|
|||||||
@ -5,9 +5,7 @@
|
|||||||
#include "HERF_4CH.h"
|
#include "HERF_4CH.h"
|
||||||
|
|
||||||
HERF_4CH::HERF_4CH(HoymilesRadio* radio, const uint64_t serial)
|
HERF_4CH::HERF_4CH(HoymilesRadio* radio, const uint64_t serial)
|
||||||
: HM_4CH(radio, serial)
|
: HM_4CH(radio, serial) {};
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
bool HERF_4CH::isValidSerial(const uint64_t serial)
|
bool HERF_4CH::isValidSerial(const uint64_t serial)
|
||||||
{
|
{
|
||||||
|
|||||||
@ -29,9 +29,7 @@ static const byteAssign_t byteAssignment[] = {
|
|||||||
};
|
};
|
||||||
|
|
||||||
HMS_1CH::HMS_1CH(HoymilesRadio* radio, const uint64_t serial)
|
HMS_1CH::HMS_1CH(HoymilesRadio* radio, const uint64_t serial)
|
||||||
: HMS_Abstract(radio, serial)
|
: HMS_Abstract(radio, serial) {};
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
bool HMS_1CH::isValidSerial(const uint64_t serial)
|
bool HMS_1CH::isValidSerial(const uint64_t serial)
|
||||||
{
|
{
|
||||||
|
|||||||
@ -29,20 +29,18 @@ static const byteAssign_t byteAssignment[] = {
|
|||||||
};
|
};
|
||||||
|
|
||||||
HMS_1CHv2::HMS_1CHv2(HoymilesRadio* radio, const uint64_t serial)
|
HMS_1CHv2::HMS_1CHv2(HoymilesRadio* radio, const uint64_t serial)
|
||||||
: HMS_Abstract(radio, serial)
|
: HMS_Abstract(radio, serial) {};
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
bool HMS_1CHv2::isValidSerial(const uint64_t serial)
|
bool HMS_1CHv2::isValidSerial(const uint64_t serial)
|
||||||
{
|
{
|
||||||
// serial >= 0x112500000000 && serial <= 0x1125ffffffff
|
// serial >= 0x112500000000 && serial <= 0x1125ffffffff
|
||||||
uint16_t preSerial = (serial >> 32) & 0xffff;
|
uint16_t preSerial = (serial >> 32) & 0xffff;
|
||||||
return preSerial == 0x1125 || preSerial == 0x1400;
|
return preSerial == 0x1125;
|
||||||
}
|
}
|
||||||
|
|
||||||
String HMS_1CHv2::typeName() const
|
String HMS_1CHv2::typeName() const
|
||||||
{
|
{
|
||||||
return "HMS-450/500-1T v2";
|
return "HMS-500-1T v2";
|
||||||
}
|
}
|
||||||
|
|
||||||
const byteAssign_t* HMS_1CHv2::getByteAssignment() const
|
const byteAssign_t* HMS_1CHv2::getByteAssignment() const
|
||||||
|
|||||||
@ -36,9 +36,7 @@ static const byteAssign_t byteAssignment[] = {
|
|||||||
};
|
};
|
||||||
|
|
||||||
HMS_2CH::HMS_2CH(HoymilesRadio* radio, const uint64_t serial)
|
HMS_2CH::HMS_2CH(HoymilesRadio* radio, const uint64_t serial)
|
||||||
: HMS_Abstract(radio, serial)
|
: HMS_Abstract(radio, serial) {};
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
bool HMS_2CH::isValidSerial(const uint64_t serial)
|
bool HMS_2CH::isValidSerial(const uint64_t serial)
|
||||||
{
|
{
|
||||||
|
|||||||
@ -50,9 +50,7 @@ static const byteAssign_t byteAssignment[] = {
|
|||||||
};
|
};
|
||||||
|
|
||||||
HMS_4CH::HMS_4CH(HoymilesRadio* radio, const uint64_t serial)
|
HMS_4CH::HMS_4CH(HoymilesRadio* radio, const uint64_t serial)
|
||||||
: HMS_Abstract(radio, serial)
|
: HMS_Abstract(radio, serial) {};
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
bool HMS_4CH::isValidSerial(const uint64_t serial)
|
bool HMS_4CH::isValidSerial(const uint64_t serial)
|
||||||
{
|
{
|
||||||
@ -75,10 +73,3 @@ uint8_t HMS_4CH::getByteAssignmentSize() const
|
|||||||
{
|
{
|
||||||
return sizeof(byteAssignment) / sizeof(byteAssignment[0]);
|
return sizeof(byteAssignment) / sizeof(byteAssignment[0]);
|
||||||
}
|
}
|
||||||
|
|
||||||
bool HMS_4CH::supportsPowerDistributionLogic()
|
|
||||||
{
|
|
||||||
// This feature was added in inverter firmware version 01.01.12 and
|
|
||||||
// will limit the AC output instead of limiting the DC inputs.
|
|
||||||
return DevInfo()->getFwBuildVersion() >= 10112U;
|
|
||||||
}
|
|
||||||
|
|||||||
@ -10,5 +10,4 @@ public:
|
|||||||
String typeName() const;
|
String typeName() const;
|
||||||
const byteAssign_t* getByteAssignment() const;
|
const byteAssign_t* getByteAssignment() const;
|
||||||
uint8_t getByteAssignmentSize() const;
|
uint8_t getByteAssignmentSize() const;
|
||||||
bool supportsPowerDistributionLogic() final;
|
};
|
||||||
};
|
|
||||||
@ -59,9 +59,7 @@ static const byteAssign_t byteAssignment[] = {
|
|||||||
};
|
};
|
||||||
|
|
||||||
HMT_4CH::HMT_4CH(HoymilesRadio* radio, const uint64_t serial)
|
HMT_4CH::HMT_4CH(HoymilesRadio* radio, const uint64_t serial)
|
||||||
: HMT_Abstract(radio, serial)
|
: HMT_Abstract(radio, serial) {};
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
bool HMT_4CH::isValidSerial(const uint64_t serial)
|
bool HMT_4CH::isValidSerial(const uint64_t serial)
|
||||||
{
|
{
|
||||||
|
|||||||
@ -73,9 +73,7 @@ static const byteAssign_t byteAssignment[] = {
|
|||||||
};
|
};
|
||||||
|
|
||||||
HMT_6CH::HMT_6CH(HoymilesRadio* radio, const uint64_t serial)
|
HMT_6CH::HMT_6CH(HoymilesRadio* radio, const uint64_t serial)
|
||||||
: HMT_Abstract(radio, serial)
|
: HMT_Abstract(radio, serial) {};
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
bool HMT_6CH::isValidSerial(const uint64_t serial)
|
bool HMT_6CH::isValidSerial(const uint64_t serial)
|
||||||
{
|
{
|
||||||
|
|||||||
@ -12,7 +12,7 @@ HMT_Abstract::HMT_Abstract(HoymilesRadio* radio, const uint64_t serial)
|
|||||||
: HM_Abstract(radio, serial)
|
: HM_Abstract(radio, serial)
|
||||||
{
|
{
|
||||||
EventLog()->setMessageType(AlarmMessageType_t::HMT);
|
EventLog()->setMessageType(AlarmMessageType_t::HMT);
|
||||||
}
|
};
|
||||||
|
|
||||||
bool HMT_Abstract::sendChangeChannelRequest()
|
bool HMT_Abstract::sendChangeChannelRequest()
|
||||||
{
|
{
|
||||||
@ -26,4 +26,4 @@ bool HMT_Abstract::sendChangeChannelRequest()
|
|||||||
_radio->enqueCommand(cmdChannel);
|
_radio->enqueCommand(cmdChannel);
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
};
|
||||||
|
|||||||
@ -29,19 +29,17 @@ static const byteAssign_t byteAssignment[] = {
|
|||||||
};
|
};
|
||||||
|
|
||||||
HM_1CH::HM_1CH(HoymilesRadio* radio, const uint64_t serial)
|
HM_1CH::HM_1CH(HoymilesRadio* radio, const uint64_t serial)
|
||||||
: HM_Abstract(radio, serial)
|
: HM_Abstract(radio, serial) {};
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
bool HM_1CH::isValidSerial(const uint64_t serial)
|
bool HM_1CH::isValidSerial(const uint64_t serial)
|
||||||
{
|
{
|
||||||
// serial >= 0x112100000000 && serial <= 0x1121ffffffff
|
// serial >= 0x112100000000 && serial <= 0x1121ffffffff
|
||||||
|
|
||||||
uint8_t preId[2];
|
uint8_t preId[2];
|
||||||
preId[0] = static_cast<uint8_t>(serial >> 40);
|
preId[0] = (uint8_t)(serial >> 40);
|
||||||
preId[1] = static_cast<uint8_t>(serial >> 32);
|
preId[1] = (uint8_t)(serial >> 32);
|
||||||
|
|
||||||
if (static_cast<uint8_t>((((static_cast<uint16_t>(preId[0]) << 8) | preId[1]) >> 4) & 0xff) == 0x12) {
|
if ((uint8_t)(((((uint16_t)preId[0] << 8) | preId[1]) >> 4) & 0xff) == 0x12) {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -37,19 +37,17 @@ static const byteAssign_t byteAssignment[] = {
|
|||||||
};
|
};
|
||||||
|
|
||||||
HM_2CH::HM_2CH(HoymilesRadio* radio, const uint64_t serial)
|
HM_2CH::HM_2CH(HoymilesRadio* radio, const uint64_t serial)
|
||||||
: HM_Abstract(radio, serial)
|
: HM_Abstract(radio, serial) {};
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
bool HM_2CH::isValidSerial(const uint64_t serial)
|
bool HM_2CH::isValidSerial(const uint64_t serial)
|
||||||
{
|
{
|
||||||
// serial >= 0x114100000000 && serial <= 0x1141ffffffff
|
// serial >= 0x114100000000 && serial <= 0x1141ffffffff
|
||||||
|
|
||||||
uint8_t preId[2];
|
uint8_t preId[2];
|
||||||
preId[0] = static_cast<uint8_t>(serial >> 40);
|
preId[0] = (uint8_t)(serial >> 40);
|
||||||
preId[1] = static_cast<uint8_t>(serial >> 32);
|
preId[1] = (uint8_t)(serial >> 32);
|
||||||
|
|
||||||
if (static_cast<uint8_t>((((static_cast<uint16_t>(preId[0]) << 8) | preId[1]) >> 4) & 0xff) == 0x14) {
|
if ((uint8_t)(((((uint16_t)preId[0] << 8) | preId[1]) >> 4) & 0xff) == 0x14) {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -50,19 +50,17 @@ static const byteAssign_t byteAssignment[] = {
|
|||||||
};
|
};
|
||||||
|
|
||||||
HM_4CH::HM_4CH(HoymilesRadio* radio, const uint64_t serial)
|
HM_4CH::HM_4CH(HoymilesRadio* radio, const uint64_t serial)
|
||||||
: HM_Abstract(radio, serial)
|
: HM_Abstract(radio, serial) {};
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
bool HM_4CH::isValidSerial(const uint64_t serial)
|
bool HM_4CH::isValidSerial(const uint64_t serial)
|
||||||
{
|
{
|
||||||
// serial >= 0x116100000000 && serial <= 0x1161ffffffff
|
// serial >= 0x116100000000 && serial <= 0x1161ffffffff
|
||||||
|
|
||||||
uint8_t preId[2];
|
uint8_t preId[2];
|
||||||
preId[0] = static_cast<uint8_t>(serial >> 40);
|
preId[0] = (uint8_t)(serial >> 40);
|
||||||
preId[1] = static_cast<uint8_t>(serial >> 32);
|
preId[1] = (uint8_t)(serial >> 32);
|
||||||
|
|
||||||
if (static_cast<uint8_t>((((static_cast<uint16_t>(preId[0]) << 8) | preId[1]) >> 4) & 0xff) == 0x16) {
|
if ((uint8_t)(((((uint16_t)preId[0] << 8) | preId[1]) >> 4) & 0xff) == 0x16) {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -14,9 +14,7 @@
|
|||||||
#include "commands/SystemConfigParaCommand.h"
|
#include "commands/SystemConfigParaCommand.h"
|
||||||
|
|
||||||
HM_Abstract::HM_Abstract(HoymilesRadio* radio, const uint64_t serial)
|
HM_Abstract::HM_Abstract(HoymilesRadio* radio, const uint64_t serial)
|
||||||
: InverterAbstract(radio, serial)
|
: InverterAbstract(radio, serial) {};
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
bool HM_Abstract::sendStatsRequest()
|
bool HM_Abstract::sendStatsRequest()
|
||||||
{
|
{
|
||||||
@ -52,13 +50,13 @@ bool HM_Abstract::sendAlarmLogRequest(const bool force)
|
|||||||
|
|
||||||
if (!force) {
|
if (!force) {
|
||||||
if (Statistics()->hasChannelFieldValue(TYPE_INV, CH0, FLD_EVT_LOG)) {
|
if (Statistics()->hasChannelFieldValue(TYPE_INV, CH0, FLD_EVT_LOG)) {
|
||||||
if (static_cast<uint8_t>(Statistics()->getChannelFieldValue(TYPE_INV, CH0, FLD_EVT_LOG) == _lastAlarmLogCnt)) {
|
if ((uint8_t)Statistics()->getChannelFieldValue(TYPE_INV, CH0, FLD_EVT_LOG) == _lastAlarmLogCnt) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
_lastAlarmLogCnt = static_cast<uint8_t>(Statistics()->getChannelFieldValue(TYPE_INV, CH0, FLD_EVT_LOG));
|
_lastAlarmLogCnt = (uint8_t)Statistics()->getChannelFieldValue(TYPE_INV, CH0, FLD_EVT_LOG);
|
||||||
|
|
||||||
time_t now;
|
time_t now;
|
||||||
time(&now);
|
time(&now);
|
||||||
@ -219,8 +217,3 @@ bool HM_Abstract::sendGridOnProFileParaRequest()
|
|||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool HM_Abstract::supportsPowerDistributionLogic()
|
|
||||||
{
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|||||||
@ -16,7 +16,6 @@ public:
|
|||||||
bool sendRestartControlRequest();
|
bool sendRestartControlRequest();
|
||||||
bool resendPowerControlRequest();
|
bool resendPowerControlRequest();
|
||||||
bool sendGridOnProFileParaRequest();
|
bool sendGridOnProFileParaRequest();
|
||||||
bool supportsPowerDistributionLogic() override;
|
|
||||||
|
|
||||||
private:
|
private:
|
||||||
uint8_t _lastAlarmLogCnt = 0;
|
uint8_t _lastAlarmLogCnt = 0;
|
||||||
@ -24,4 +23,4 @@ private:
|
|||||||
PowerLimitControlType _activePowerControlType = PowerLimitControlType::AbsolutNonPersistent;
|
PowerLimitControlType _activePowerControlType = PowerLimitControlType::AbsolutNonPersistent;
|
||||||
|
|
||||||
uint8_t _powerState = 1;
|
uint8_t _powerState = 1;
|
||||||
};
|
};
|
||||||
@ -14,8 +14,8 @@ InverterAbstract::InverterAbstract(HoymilesRadio* radio, const uint64_t serial)
|
|||||||
|
|
||||||
char serial_buff[sizeof(uint64_t) * 8 + 1];
|
char serial_buff[sizeof(uint64_t) * 8 + 1];
|
||||||
snprintf(serial_buff, sizeof(serial_buff), "%0x%08x",
|
snprintf(serial_buff, sizeof(serial_buff), "%0x%08x",
|
||||||
static_cast<uint32_t>((serial >> 32) & 0xFFFFFFFF),
|
((uint32_t)((serial >> 32) & 0xFFFFFFFF)),
|
||||||
static_cast<uint32_t>(serial & 0xFFFFFFFF));
|
((uint32_t)(serial & 0xFFFFFFFF)));
|
||||||
_serialString = serial_buff;
|
_serialString = serial_buff;
|
||||||
|
|
||||||
_alarmLogParser.reset(new AlarmLogParser());
|
_alarmLogParser.reset(new AlarmLogParser());
|
||||||
|
|||||||
@ -103,9 +103,6 @@ public:
|
|||||||
virtual bool sendChangeChannelRequest();
|
virtual bool sendChangeChannelRequest();
|
||||||
virtual bool sendGridOnProFileParaRequest() = 0;
|
virtual bool sendGridOnProFileParaRequest() = 0;
|
||||||
|
|
||||||
// This feature will limit the AC output instead of limiting the DC inputs.
|
|
||||||
virtual bool supportsPowerDistributionLogic() = 0;
|
|
||||||
|
|
||||||
HoymilesRadio* getRadio();
|
HoymilesRadio* getRadio();
|
||||||
|
|
||||||
AlarmLogParser* EventLog();
|
AlarmLogParser* EventLog();
|
||||||
|
|||||||
@ -1,16 +1,16 @@
|
|||||||
# Class overview
|
# Class overview
|
||||||
|
|
||||||
| Class | Models | Serial range |
|
| Class | Models | Serial range |
|
||||||
| ------------- | --------------------------- | ---------------- |
|
| --------------| --------------------------- | ------------- -- |
|
||||||
| HM_1CH | HM-300/350/400-1T | 1121 |
|
| HM_1CH | HM-300/350/400-1T | 1121 |
|
||||||
| HM_2CH | HM-600/700/800-2T | 1141 |
|
| HM_2CH | HM-600/700/800-2T | 1141 |
|
||||||
| HM_4CH | HM-1000/1200/1500-4T | 1161 |
|
| HM_4CH | HM-1000/1200/1500-4T | 1161 |
|
||||||
| HMS_1CH | HMS-300/350/400/450/500-1T | 1124 |
|
| HMS_1CH | HMS-300/350/400/450/500-1T | 1124 |
|
||||||
| HMS_1CHv2 | HMS-450/500-1T v2 | 1125, 1400 |
|
| HMS_1CHv2 | HMS-500-1T v2 | 1125 |
|
||||||
| HMS_2CH | HMS-600/700/800/900/1000-2T | 1143, 1144, 1410 |
|
| HMS_2CH | HMS-600/700/800/900/1000-2T | 1143, 1144, 1410 |
|
||||||
| HMS_4CH | HMS-1600/1800/2000-4T | 1164 |
|
| HMS_4CH | HMS-1600/1800/2000-4T | 1164 |
|
||||||
| HMT_4CH | HMT-1600/1800/2000-4T | 1361 |
|
| HMT_4CH | HMT-1600/1800/2000-4T | 1361 |
|
||||||
| HMT_6CH | HMT-1800/2250-6T | 1382 |
|
| HMT_6CH | HMT-1800/2250-6T | 1382 |
|
||||||
| HERF_1CH | HERF 300 | 2841 |
|
| HERF_1CH | HERF 300 | 2841 |
|
||||||
| HERF_2CH | HERF 600/800 | 2821 |
|
| HERF_2CH | HERF 800 | 2821 |
|
||||||
| HERF_4CH | HERF 1800 | 2801 |
|
| HERF_4CH | HERF 1800 | 2801 |
|
||||||
|
|||||||
@ -243,7 +243,7 @@ void AlarmLogParser::getLogEntry(const uint8_t entryId, AlarmLogEntry_t& entry,
|
|||||||
|
|
||||||
HOY_SEMAPHORE_TAKE();
|
HOY_SEMAPHORE_TAKE();
|
||||||
|
|
||||||
const uint32_t wcode = static_cast<uint16_t>(_payloadAlarmLog[entryStartOffset]) << 8 | _payloadAlarmLog[entryStartOffset + 1];
|
const uint32_t wcode = (uint16_t)_payloadAlarmLog[entryStartOffset] << 8 | _payloadAlarmLog[entryStartOffset + 1];
|
||||||
uint32_t startTimeOffset = 0;
|
uint32_t startTimeOffset = 0;
|
||||||
if (((wcode >> 13) & 0x01) == 1) {
|
if (((wcode >> 13) & 0x01) == 1) {
|
||||||
startTimeOffset = 12 * 60 * 60;
|
startTimeOffset = 12 * 60 * 60;
|
||||||
@ -255,8 +255,8 @@ void AlarmLogParser::getLogEntry(const uint8_t entryId, AlarmLogEntry_t& entry,
|
|||||||
}
|
}
|
||||||
|
|
||||||
entry.MessageId = _payloadAlarmLog[entryStartOffset + 1];
|
entry.MessageId = _payloadAlarmLog[entryStartOffset + 1];
|
||||||
entry.StartTime = ((static_cast<uint16_t>(_payloadAlarmLog[entryStartOffset + 4]) << 8) | static_cast<uint16_t>(_payloadAlarmLog[entryStartOffset + 5])) + startTimeOffset + timezoneOffset;
|
entry.StartTime = (((uint16_t)_payloadAlarmLog[entryStartOffset + 4] << 8) | ((uint16_t)_payloadAlarmLog[entryStartOffset + 5])) + startTimeOffset + timezoneOffset;
|
||||||
entry.EndTime = (static_cast<uint16_t>(_payloadAlarmLog[entryStartOffset + 6]) << 8) | static_cast<uint16_t>(_payloadAlarmLog[entryStartOffset + 7]);
|
entry.EndTime = ((uint16_t)_payloadAlarmLog[entryStartOffset + 6] << 8) | ((uint16_t)_payloadAlarmLog[entryStartOffset + 7]);
|
||||||
|
|
||||||
HOY_SEMAPHORE_GIVE();
|
HOY_SEMAPHORE_GIVE();
|
||||||
|
|
||||||
|
|||||||
@ -61,7 +61,6 @@ const devInfo_t devInfo[] = {
|
|||||||
{ { 0x10, 0x10, 0x71, ALL }, 500, "HMS-500-1T" }, // 02
|
{ { 0x10, 0x10, 0x71, ALL }, 500, "HMS-500-1T" }, // 02
|
||||||
{ { 0x10, 0x20, 0x71, ALL }, 500, "HMS-500-1T v2" }, // 02
|
{ { 0x10, 0x20, 0x71, ALL }, 500, "HMS-500-1T v2" }, // 02
|
||||||
{ { 0x10, 0x21, 0x11, ALL }, 600, "HMS-600-2T" }, // 01
|
{ { 0x10, 0x21, 0x11, ALL }, 600, "HMS-600-2T" }, // 01
|
||||||
{ { 0x10, 0x21, 0x21, ALL }, 700, "HMS-700-2T" }, // 00
|
|
||||||
{ { 0x10, 0x21, 0x41, ALL }, 800, "HMS-800-2T" }, // 00
|
{ { 0x10, 0x21, 0x41, ALL }, 800, "HMS-800-2T" }, // 00
|
||||||
{ { 0x10, 0x11, 0x41, ALL }, 800, "HMS-800-2T-LV" }, // 00
|
{ { 0x10, 0x11, 0x41, ALL }, 800, "HMS-800-2T-LV" }, // 00
|
||||||
{ { 0x10, 0x11, 0x51, ALL }, 900, "HMS-900-2T" }, // 01
|
{ { 0x10, 0x11, 0x51, ALL }, 900, "HMS-900-2T" }, // 01
|
||||||
@ -81,7 +80,6 @@ const devInfo_t devInfo[] = {
|
|||||||
{ { 0x10, 0x33, 0x11, ALL }, 1800, "HMT-1800-6T" }, // 01
|
{ { 0x10, 0x33, 0x11, ALL }, 1800, "HMT-1800-6T" }, // 01
|
||||||
{ { 0x10, 0x33, 0x31, ALL }, 2250, "HMT-2250-6T" }, // 01
|
{ { 0x10, 0x33, 0x31, ALL }, 2250, "HMT-2250-6T" }, // 01
|
||||||
|
|
||||||
{ { 0xF1, 0x01, 0x10, ALL }, 600, "HERF-600" }, // 00
|
|
||||||
{ { 0xF1, 0x01, 0x14, ALL }, 800, "HERF-800" }, // 00
|
{ { 0xF1, 0x01, 0x14, ALL }, 800, "HERF-800" }, // 00
|
||||||
{ { 0xF1, 0x01, 0x24, ALL }, 1600, "HERF-1600" }, // 00
|
{ { 0xF1, 0x01, 0x24, ALL }, 1600, "HERF-1600" }, // 00
|
||||||
{ { 0xF1, 0x01, 0x22, ALL }, 1800, "HERF-1800" }, // 00
|
{ { 0xF1, 0x01, 0x22, ALL }, 1800, "HERF-1800" }, // 00
|
||||||
@ -151,7 +149,7 @@ void DevInfoParser::setLastUpdateSimple(const uint32_t lastUpdate)
|
|||||||
uint16_t DevInfoParser::getFwBuildVersion() const
|
uint16_t DevInfoParser::getFwBuildVersion() const
|
||||||
{
|
{
|
||||||
HOY_SEMAPHORE_TAKE();
|
HOY_SEMAPHORE_TAKE();
|
||||||
const uint16_t ret = (static_cast<uint16_t>(_payloadDevInfoAll[0]) << 8) | _payloadDevInfoAll[1];
|
const uint16_t ret = (((uint16_t)_payloadDevInfoAll[0]) << 8) | _payloadDevInfoAll[1];
|
||||||
HOY_SEMAPHORE_GIVE();
|
HOY_SEMAPHORE_GIVE();
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
@ -160,13 +158,13 @@ time_t DevInfoParser::getFwBuildDateTime() const
|
|||||||
{
|
{
|
||||||
struct tm timeinfo = {};
|
struct tm timeinfo = {};
|
||||||
HOY_SEMAPHORE_TAKE();
|
HOY_SEMAPHORE_TAKE();
|
||||||
timeinfo.tm_year = ((static_cast<uint16_t>(_payloadDevInfoAll[2]) << 8) | _payloadDevInfoAll[3]) - 1900;
|
timeinfo.tm_year = ((((uint16_t)_payloadDevInfoAll[2]) << 8) | _payloadDevInfoAll[3]) - 1900;
|
||||||
|
|
||||||
timeinfo.tm_mon = ((static_cast<uint16_t>(_payloadDevInfoAll[4]) << 8) | _payloadDevInfoAll[5]) / 100 - 1;
|
timeinfo.tm_mon = ((((uint16_t)_payloadDevInfoAll[4]) << 8) | _payloadDevInfoAll[5]) / 100 - 1;
|
||||||
timeinfo.tm_mday = ((static_cast<uint16_t>(_payloadDevInfoAll[4]) << 8) | _payloadDevInfoAll[5]) % 100;
|
timeinfo.tm_mday = ((((uint16_t)_payloadDevInfoAll[4]) << 8) | _payloadDevInfoAll[5]) % 100;
|
||||||
|
|
||||||
timeinfo.tm_hour = ((static_cast<uint16_t>(_payloadDevInfoAll[6]) << 8) | _payloadDevInfoAll[7]) / 100;
|
timeinfo.tm_hour = ((((uint16_t)_payloadDevInfoAll[6]) << 8) | _payloadDevInfoAll[7]) / 100;
|
||||||
timeinfo.tm_min = ((static_cast<uint16_t>(_payloadDevInfoAll[6]) << 8) | _payloadDevInfoAll[7]) % 100;
|
timeinfo.tm_min = ((((uint16_t)_payloadDevInfoAll[6]) << 8) | _payloadDevInfoAll[7]) % 100;
|
||||||
HOY_SEMAPHORE_GIVE();
|
HOY_SEMAPHORE_GIVE();
|
||||||
|
|
||||||
return timegm(&timeinfo);
|
return timegm(&timeinfo);
|
||||||
@ -183,7 +181,7 @@ String DevInfoParser::getFwBuildDateTimeStr() const
|
|||||||
uint16_t DevInfoParser::getFwBootloaderVersion() const
|
uint16_t DevInfoParser::getFwBootloaderVersion() const
|
||||||
{
|
{
|
||||||
HOY_SEMAPHORE_TAKE();
|
HOY_SEMAPHORE_TAKE();
|
||||||
const uint16_t ret = (static_cast<uint16_t>(_payloadDevInfoAll[8]) << 8) | _payloadDevInfoAll[9];
|
const uint16_t ret = (((uint16_t)_payloadDevInfoAll[8]) << 8) | _payloadDevInfoAll[9];
|
||||||
HOY_SEMAPHORE_GIVE();
|
HOY_SEMAPHORE_GIVE();
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
@ -191,11 +189,11 @@ uint16_t DevInfoParser::getFwBootloaderVersion() const
|
|||||||
uint32_t DevInfoParser::getHwPartNumber() const
|
uint32_t DevInfoParser::getHwPartNumber() const
|
||||||
{
|
{
|
||||||
HOY_SEMAPHORE_TAKE();
|
HOY_SEMAPHORE_TAKE();
|
||||||
const uint16_t hwpn_h = (static_cast<uint16_t>(_payloadDevInfoSimple[2]) << 8) | _payloadDevInfoSimple[3];
|
const uint16_t hwpn_h = (((uint16_t)_payloadDevInfoSimple[2]) << 8) | _payloadDevInfoSimple[3];
|
||||||
const uint16_t hwpn_l = (static_cast<uint16_t>(_payloadDevInfoSimple[4]) << 8) | _payloadDevInfoSimple[5];
|
const uint16_t hwpn_l = (((uint16_t)_payloadDevInfoSimple[4]) << 8) | _payloadDevInfoSimple[5];
|
||||||
HOY_SEMAPHORE_GIVE();
|
HOY_SEMAPHORE_GIVE();
|
||||||
|
|
||||||
return (static_cast<uint32_t>(hwpn_h) << 16) | static_cast<uint32_t>(hwpn_l);
|
return ((uint32_t)hwpn_h << 16) | ((uint32_t)hwpn_l);
|
||||||
}
|
}
|
||||||
|
|
||||||
String DevInfoParser::getHwVersion() const
|
String DevInfoParser::getHwVersion() const
|
||||||
|
|||||||
@ -443,7 +443,7 @@ std::list<GridProfileSection_t> GridProfileParser::getProfile() const
|
|||||||
for (uint8_t val_id = 0; val_id < section_size; val_id++) {
|
for (uint8_t val_id = 0; val_id < section_size; val_id++) {
|
||||||
auto itemDefinition = itemDefinitions.at(_profileValues[section_start + val_id].ItemDefinition);
|
auto itemDefinition = itemDefinitions.at(_profileValues[section_start + val_id].ItemDefinition);
|
||||||
|
|
||||||
float value = static_cast<int16_t>((_payloadGridProfile[pos] << 8) | _payloadGridProfile[pos + 1]);
|
float value = (int16_t)((_payloadGridProfile[pos] << 8) | _payloadGridProfile[pos + 1]);
|
||||||
value /= itemDefinition.Divider;
|
value /= itemDefinition.Divider;
|
||||||
|
|
||||||
GridProfileItem_t v;
|
GridProfileItem_t v;
|
||||||
|
|||||||
@ -45,7 +45,7 @@ void SystemConfigParaParser::appendFragment(const uint8_t offset, const uint8_t*
|
|||||||
float SystemConfigParaParser::getLimitPercent() const
|
float SystemConfigParaParser::getLimitPercent() const
|
||||||
{
|
{
|
||||||
HOY_SEMAPHORE_TAKE();
|
HOY_SEMAPHORE_TAKE();
|
||||||
const float ret = ((static_cast<uint16_t>(_payload[2]) << 8) | _payload[3]) / 10.0;
|
const float ret = ((((uint16_t)_payload[2]) << 8) | _payload[3]) / 10.0;
|
||||||
HOY_SEMAPHORE_GIVE();
|
HOY_SEMAPHORE_GIVE();
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
@ -53,8 +53,8 @@ float SystemConfigParaParser::getLimitPercent() const
|
|||||||
void SystemConfigParaParser::setLimitPercent(const float value)
|
void SystemConfigParaParser::setLimitPercent(const float value)
|
||||||
{
|
{
|
||||||
HOY_SEMAPHORE_TAKE();
|
HOY_SEMAPHORE_TAKE();
|
||||||
_payload[2] = static_cast<uint16_t>(value * 10) >> 8;
|
_payload[2] = ((uint16_t)(value * 10)) >> 8;
|
||||||
_payload[3] = static_cast<uint16_t>(value * 10);
|
_payload[3] = ((uint16_t)(value * 10));
|
||||||
HOY_SEMAPHORE_GIVE();
|
HOY_SEMAPHORE_GIVE();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -1,51 +0,0 @@
|
|||||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
|
||||||
/*
|
|
||||||
* Copyright (C) 2024 Thomas Basler and others
|
|
||||||
*/
|
|
||||||
#include "CommandQueue.h"
|
|
||||||
#include "../inverters/InverterAbstract.h"
|
|
||||||
#include <algorithm>
|
|
||||||
|
|
||||||
void CommandQueue::removeAllEntriesForInverter(InverterAbstract* inv)
|
|
||||||
{
|
|
||||||
std::lock_guard<std::mutex> lock(_mutex);
|
|
||||||
|
|
||||||
auto it = std::remove_if(_queue.begin(), _queue.end(),
|
|
||||||
[&inv](std::shared_ptr<CommandAbstract> v) -> bool { return v.get()->getTargetAddress() == inv->serial(); });
|
|
||||||
_queue.erase(it, _queue.end());
|
|
||||||
}
|
|
||||||
|
|
||||||
void CommandQueue::removeDuplicatedEntries(std::shared_ptr<CommandAbstract> cmd)
|
|
||||||
{
|
|
||||||
std::lock_guard<std::mutex> lock(_mutex);
|
|
||||||
|
|
||||||
auto it = std::remove_if(_queue.begin() + 1, _queue.end(),
|
|
||||||
[&cmd](std::shared_ptr<CommandAbstract> v) -> bool {
|
|
||||||
return cmd->areSameParameter(v.get())
|
|
||||||
&& cmd.get()->getQueueInsertType() == QueueInsertType::RemoveOldest;
|
|
||||||
});
|
|
||||||
_queue.erase(it, _queue.end());
|
|
||||||
}
|
|
||||||
|
|
||||||
void CommandQueue::replaceEntries(std::shared_ptr<CommandAbstract> cmd)
|
|
||||||
{
|
|
||||||
std::lock_guard<std::mutex> lock(_mutex);
|
|
||||||
|
|
||||||
std::replace_if(_queue.begin() + 1, _queue.end(),
|
|
||||||
[&cmd](std::shared_ptr<CommandAbstract> v)-> bool {
|
|
||||||
return cmd.get()->getQueueInsertType() == QueueInsertType::ReplaceExistent
|
|
||||||
&& cmd->areSameParameter(v.get());
|
|
||||||
},
|
|
||||||
cmd
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
uint8_t CommandQueue::countSimilarCommands(std::shared_ptr<CommandAbstract> cmd)
|
|
||||||
{
|
|
||||||
std::lock_guard<std::mutex> lock(_mutex);
|
|
||||||
|
|
||||||
return std::count_if(_queue.begin(), _queue.end(),
|
|
||||||
[&cmd](std::shared_ptr<CommandAbstract> v) -> bool {
|
|
||||||
return cmd->areSameParameter(v.get());
|
|
||||||
});
|
|
||||||
}
|
|
||||||
@ -1,17 +0,0 @@
|
|||||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
|
||||||
#pragma once
|
|
||||||
|
|
||||||
#include "../commands/CommandAbstract.h"
|
|
||||||
#include <ThreadSafeQueue.h>
|
|
||||||
#include <memory>
|
|
||||||
|
|
||||||
class InverterAbstract;
|
|
||||||
|
|
||||||
class CommandQueue : public ThreadSafeQueue<std::shared_ptr<CommandAbstract>> {
|
|
||||||
public:
|
|
||||||
void removeAllEntriesForInverter(InverterAbstract* inv);
|
|
||||||
void removeDuplicatedEntries(std::shared_ptr<CommandAbstract> cmd);
|
|
||||||
void replaceEntries(std::shared_ptr<CommandAbstract> cmd);
|
|
||||||
|
|
||||||
uint8_t countSimilarCommands(std::shared_ptr<CommandAbstract> cmd);
|
|
||||||
};
|
|
||||||
@ -18,19 +18,11 @@ SpiBus::SpiBus(const std::string& _id, spi_host_device_t _host_device)
|
|||||||
.data5_io_num = -1,
|
.data5_io_num = -1,
|
||||||
.data6_io_num = -1,
|
.data6_io_num = -1,
|
||||||
.data7_io_num = -1,
|
.data7_io_num = -1,
|
||||||
.max_transfer_sz = 0, // defaults to SPI_MAX_DMA_LEN (=4092) or SOC_SPI_MAXIMUM_BUFFER_SIZE (=64)
|
.max_transfer_sz = SPI_MAX_DMA_LEN,
|
||||||
.flags = 0,
|
.flags = 0,
|
||||||
.intr_flags = 0
|
.intr_flags = 0
|
||||||
};
|
};
|
||||||
|
ESP_ERROR_CHECK(spi_bus_initialize(host_device, &bus_config, SPI_DMA_CH_AUTO));
|
||||||
#if !CONFIG_IDF_TARGET_ESP32S2
|
|
||||||
spi_dma_chan_t dma_channel = SPI_DMA_CH_AUTO;
|
|
||||||
#else
|
|
||||||
// DMA for SPI3 on ESP32-S2 is shared with ADC/DAC, so we cannot use it here
|
|
||||||
spi_dma_chan_t dma_channel = (host_device != SPI3_HOST ? SPI_DMA_CH_AUTO : SPI_DMA_DISABLED);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
ESP_ERROR_CHECK(spi_bus_initialize(host_device, &bus_config, dma_channel));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
SpiBus::~SpiBus()
|
SpiBus::~SpiBus()
|
||||||
|
|||||||
@ -3,7 +3,7 @@
|
|||||||
|
|
||||||
#include <mutex>
|
#include <mutex>
|
||||||
#include <optional>
|
#include <optional>
|
||||||
#include <deque>
|
#include <queue>
|
||||||
|
|
||||||
template <typename T>
|
template <typename T>
|
||||||
class ThreadSafeQueue {
|
class ThreadSafeQueue {
|
||||||
@ -33,14 +33,14 @@ public:
|
|||||||
return {};
|
return {};
|
||||||
}
|
}
|
||||||
T tmp = _queue.front();
|
T tmp = _queue.front();
|
||||||
_queue.pop_front();
|
_queue.pop();
|
||||||
return tmp;
|
return tmp;
|
||||||
}
|
}
|
||||||
|
|
||||||
void push(const T& item)
|
void push(const T& item)
|
||||||
{
|
{
|
||||||
std::lock_guard<std::mutex> lock(_mutex);
|
std::lock_guard<std::mutex> lock(_mutex);
|
||||||
_queue.push_back(item);
|
_queue.push(item);
|
||||||
}
|
}
|
||||||
|
|
||||||
T front()
|
T front()
|
||||||
@ -49,10 +49,6 @@ public:
|
|||||||
return _queue.front();
|
return _queue.front();
|
||||||
}
|
}
|
||||||
|
|
||||||
protected:
|
|
||||||
std::deque<T> _queue;
|
|
||||||
mutable std::mutex _mutex;
|
|
||||||
|
|
||||||
private:
|
private:
|
||||||
// Moved out of public interface to prevent races between this
|
// Moved out of public interface to prevent races between this
|
||||||
// and pop().
|
// and pop().
|
||||||
@ -60,4 +56,7 @@ private:
|
|||||||
{
|
{
|
||||||
return _queue.empty();
|
return _queue.empty();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
std::queue<T> _queue;
|
||||||
|
mutable std::mutex _mutex;
|
||||||
};
|
};
|
||||||
|
|||||||
@ -49,7 +49,7 @@ def get_firmware_specifier_build_flag():
|
|||||||
build_version = get_build_version()
|
build_version = get_build_version()
|
||||||
build_flag = "-D AUTO_GIT_HASH=\\\"" + build_version + "\\\""
|
build_flag = "-D AUTO_GIT_HASH=\\\"" + build_version + "\\\""
|
||||||
build_branch = get_build_branch()
|
build_branch = get_build_branch()
|
||||||
build_flag += " -D AUTO_GIT_BRANCH=\\\"" + build_branch + "\\\""
|
build_flag += " -D AUTO_GIT_BRANCH=\\\"" + branch_name + "\\\""
|
||||||
return (build_flag)
|
return (build_flag)
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -130,5 +130,4 @@ def esp32_create_combined_bin(source, target, env):
|
|||||||
esptool.main(cmd)
|
esptool.main(cmd)
|
||||||
|
|
||||||
|
|
||||||
from SCons.Script import AlwaysBuild
|
env.AddPostAction("$BUILD_DIR/${PROGNAME}.bin", esp32_create_combined_bin)
|
||||||
AlwaysBuild(env.AddPostAction("buildprog", esp32_create_combined_bin))
|
|
||||||
|
|||||||
@ -23,20 +23,20 @@ def is_tool(name):
|
|||||||
return which(name) is not None
|
return which(name) is not None
|
||||||
|
|
||||||
def replaceInFile(in_file, out_file, text, subs, flags=0):
|
def replaceInFile(in_file, out_file, text, subs, flags=0):
|
||||||
"""Function for replacing content for the given file."""
|
"""
|
||||||
|
Function for replacing content for the given file
|
||||||
|
Taken from https://www.studytonight.com/python-howtos/search-and-replace-a-text-in-a-file-in-python
|
||||||
|
"""
|
||||||
if os.path.exists(in_file):
|
if os.path.exists(in_file):
|
||||||
# read the file contents
|
with open(in_file, "rb") as infile:
|
||||||
with open(in_file, "r", encoding="utf-8") as infile:
|
with open(out_file, "wb") as outfile:
|
||||||
file_contents = infile.read()
|
#read the file contents
|
||||||
|
file_contents = infile.read()
|
||||||
# do replacement
|
text_pattern = re.compile(re.escape(text), flags)
|
||||||
text_pattern = re.compile(re.escape(text), flags)
|
file_contents = text_pattern.sub(subs, file_contents.decode('utf-8'))
|
||||||
file_contents = text_pattern.sub(subs, file_contents)
|
outfile.seek(0)
|
||||||
|
outfile.truncate()
|
||||||
# write the result
|
outfile.write(file_contents.encode())
|
||||||
with open(out_file, "w", encoding="utf-8") as outfile:
|
|
||||||
outfile.write(file_contents)
|
|
||||||
|
|
||||||
def main():
|
def main():
|
||||||
if (env.GetProjectOption('custom_patches', '') == ''):
|
if (env.GetProjectOption('custom_patches', '') == ''):
|
||||||
|
|||||||
@ -30,7 +30,6 @@ build_flags =
|
|||||||
-DCONFIG_ASYNC_TCP_EVENT_QUEUE_SIZE=128
|
-DCONFIG_ASYNC_TCP_EVENT_QUEUE_SIZE=128
|
||||||
-DCONFIG_ASYNC_TCP_QUEUE_SIZE=128
|
-DCONFIG_ASYNC_TCP_QUEUE_SIZE=128
|
||||||
-DEMC_TASK_STACK_SIZE=6400
|
-DEMC_TASK_STACK_SIZE=6400
|
||||||
; -DHOY_DEBUG_QUEUE
|
|
||||||
-Wall -Wextra -Wunused -Wmisleading-indentation -Wduplicated-cond -Wlogical-op -Wnull-dereference
|
-Wall -Wextra -Wunused -Wmisleading-indentation -Wduplicated-cond -Wlogical-op -Wnull-dereference
|
||||||
; Have to remove -Werror because of
|
; Have to remove -Werror because of
|
||||||
; https://github.com/espressif/arduino-esp32/issues/9044 and
|
; https://github.com/espressif/arduino-esp32/issues/9044 and
|
||||||
@ -42,11 +41,11 @@ build_unflags =
|
|||||||
-std=gnu++11
|
-std=gnu++11
|
||||||
|
|
||||||
lib_deps =
|
lib_deps =
|
||||||
mathieucarbou/ESPAsyncWebServer @ 3.6.0
|
mathieucarbou/ESPAsyncWebServer @ 3.3.12
|
||||||
bblanchon/ArduinoJson @ 7.3.0
|
bblanchon/ArduinoJson @ 7.2.0
|
||||||
https://github.com/bertmelis/espMqttClient.git#v1.7.0
|
https://github.com/bertmelis/espMqttClient.git#v1.7.0
|
||||||
nrf24/RF24 @ 1.4.11
|
nrf24/RF24 @ 1.4.9
|
||||||
olikraus/U8g2 @ 2.36.2
|
olikraus/U8g2 @ 2.35.30
|
||||||
buelowp/sunset @ 1.1.7
|
buelowp/sunset @ 1.1.7
|
||||||
arkhipenko/TaskScheduler @ 3.8.5
|
arkhipenko/TaskScheduler @ 3.8.5
|
||||||
|
|
||||||
@ -79,7 +78,6 @@ upload_protocol = esptool
|
|||||||
[env:generic_esp32]
|
[env:generic_esp32]
|
||||||
board = esp32dev
|
board = esp32dev
|
||||||
build_flags = ${env.build_flags}
|
build_flags = ${env.build_flags}
|
||||||
-DPIN_MAPPING_REQUIRED=1
|
|
||||||
|
|
||||||
|
|
||||||
[env:generic_esp32_16mb_psram]
|
[env:generic_esp32_16mb_psram]
|
||||||
@ -88,7 +86,6 @@ board_build.flash_mode = qio
|
|||||||
board_build.partitions = partitions_custom_16mb.csv
|
board_build.partitions = partitions_custom_16mb.csv
|
||||||
board_upload.flash_size = 16MB
|
board_upload.flash_size = 16MB
|
||||||
build_flags = ${env.build_flags}
|
build_flags = ${env.build_flags}
|
||||||
-DPIN_MAPPING_REQUIRED=1
|
|
||||||
-DBOARD_HAS_PSRAM
|
-DBOARD_HAS_PSRAM
|
||||||
-mfix-esp32-psram-cache-issue
|
-mfix-esp32-psram-cache-issue
|
||||||
|
|
||||||
@ -97,7 +94,6 @@ build_flags = ${env.build_flags}
|
|||||||
board = esp32-c3-devkitc-02
|
board = esp32-c3-devkitc-02
|
||||||
custom_patches = ${env.custom_patches}
|
custom_patches = ${env.custom_patches}
|
||||||
build_flags = ${env.build_flags}
|
build_flags = ${env.build_flags}
|
||||||
-DPIN_MAPPING_REQUIRED=1
|
|
||||||
|
|
||||||
|
|
||||||
[env:generic_esp32c3_usb]
|
[env:generic_esp32c3_usb]
|
||||||
@ -106,13 +102,11 @@ custom_patches = ${env.custom_patches}
|
|||||||
build_flags = ${env.build_flags}
|
build_flags = ${env.build_flags}
|
||||||
-DARDUINO_USB_MODE=1
|
-DARDUINO_USB_MODE=1
|
||||||
-DARDUINO_USB_CDC_ON_BOOT=1
|
-DARDUINO_USB_CDC_ON_BOOT=1
|
||||||
-DPIN_MAPPING_REQUIRED=1
|
|
||||||
|
|
||||||
|
|
||||||
[env:generic_esp32s3]
|
[env:generic_esp32s3]
|
||||||
board = esp32-s3-devkitc-1
|
board = esp32-s3-devkitc-1
|
||||||
build_flags = ${env.build_flags}
|
build_flags = ${env.build_flags}
|
||||||
-DPIN_MAPPING_REQUIRED=1
|
|
||||||
|
|
||||||
|
|
||||||
[env:generic_esp32s3_usb]
|
[env:generic_esp32s3_usb]
|
||||||
@ -121,7 +115,6 @@ upload_protocol = esp-builtin
|
|||||||
build_flags = ${env.build_flags}
|
build_flags = ${env.build_flags}
|
||||||
-DARDUINO_USB_MODE=1
|
-DARDUINO_USB_MODE=1
|
||||||
-DARDUINO_USB_CDC_ON_BOOT=1
|
-DARDUINO_USB_CDC_ON_BOOT=1
|
||||||
-DPIN_MAPPING_REQUIRED=1
|
|
||||||
|
|
||||||
|
|
||||||
[env:generic]
|
[env:generic]
|
||||||
|
|||||||
@ -13,17 +13,8 @@
|
|||||||
|
|
||||||
CONFIG_T config;
|
CONFIG_T config;
|
||||||
|
|
||||||
static std::condition_variable sWriterCv;
|
void ConfigurationClass::init()
|
||||||
static std::mutex sWriterMutex;
|
|
||||||
static unsigned sWriterCount = 0;
|
|
||||||
|
|
||||||
void ConfigurationClass::init(Scheduler& scheduler)
|
|
||||||
{
|
{
|
||||||
scheduler.addTask(_loopTask);
|
|
||||||
_loopTask.setCallback(std::bind(&ConfigurationClass::loop, this));
|
|
||||||
_loopTask.setIterations(TASK_FOREVER);
|
|
||||||
_loopTask.enable();
|
|
||||||
|
|
||||||
memset(&config, 0x0, sizeof(config));
|
memset(&config, 0x0, sizeof(config));
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -116,7 +107,7 @@ bool ConfigurationClass::write()
|
|||||||
display["screensaver"] = config.Display.ScreenSaver;
|
display["screensaver"] = config.Display.ScreenSaver;
|
||||||
display["rotation"] = config.Display.Rotation;
|
display["rotation"] = config.Display.Rotation;
|
||||||
display["contrast"] = config.Display.Contrast;
|
display["contrast"] = config.Display.Contrast;
|
||||||
display["locale"] = config.Display.Locale;
|
display["language"] = config.Display.Language;
|
||||||
display["diagram_duration"] = config.Display.Diagram.Duration;
|
display["diagram_duration"] = config.Display.Diagram.Duration;
|
||||||
display["diagram_mode"] = config.Display.Diagram.Mode;
|
display["diagram_mode"] = config.Display.Diagram.Mode;
|
||||||
|
|
||||||
@ -168,7 +159,6 @@ bool ConfigurationClass::write()
|
|||||||
bool ConfigurationClass::read()
|
bool ConfigurationClass::read()
|
||||||
{
|
{
|
||||||
File f = LittleFS.open(CONFIG_FILENAME, "r", false);
|
File f = LittleFS.open(CONFIG_FILENAME, "r", false);
|
||||||
Utils::skipBom(f);
|
|
||||||
|
|
||||||
JsonDocument doc;
|
JsonDocument doc;
|
||||||
|
|
||||||
@ -292,7 +282,7 @@ bool ConfigurationClass::read()
|
|||||||
config.Display.ScreenSaver = display["screensaver"] | DISPLAY_SCREENSAVER;
|
config.Display.ScreenSaver = display["screensaver"] | DISPLAY_SCREENSAVER;
|
||||||
config.Display.Rotation = display["rotation"] | DISPLAY_ROTATION;
|
config.Display.Rotation = display["rotation"] | DISPLAY_ROTATION;
|
||||||
config.Display.Contrast = display["contrast"] | DISPLAY_CONTRAST;
|
config.Display.Contrast = display["contrast"] | DISPLAY_CONTRAST;
|
||||||
strlcpy(config.Display.Locale, display["locale"] | DISPLAY_LOCALE, sizeof(config.Display.Locale));
|
config.Display.Language = display["language"] | DISPLAY_LANGUAGE;
|
||||||
config.Display.Diagram.Duration = display["diagram_duration"] | DISPLAY_DIAGRAM_DURATION;
|
config.Display.Diagram.Duration = display["diagram_duration"] | DISPLAY_DIAGRAM_DURATION;
|
||||||
config.Display.Diagram.Mode = display["diagram_mode"] | DISPLAY_DIAGRAM_MODE;
|
config.Display.Diagram.Mode = display["diagram_mode"] | DISPLAY_DIAGRAM_MODE;
|
||||||
|
|
||||||
@ -328,20 +318,6 @@ bool ConfigurationClass::read()
|
|||||||
}
|
}
|
||||||
|
|
||||||
f.close();
|
f.close();
|
||||||
|
|
||||||
// Check for default DTU serial
|
|
||||||
MessageOutput.print("Check for default DTU serial... ");
|
|
||||||
if (config.Dtu.Serial == DTU_SERIAL) {
|
|
||||||
MessageOutput.print("generate serial based on ESP chip id: ");
|
|
||||||
const uint64_t dtuId = Utils::generateDtuSerial();
|
|
||||||
MessageOutput.printf("%0" PRIx32 "%08" PRIx32 "... ",
|
|
||||||
static_cast<uint32_t>((dtuId >> 32) & 0xFFFFFFFF),
|
|
||||||
static_cast<uint32_t>(dtuId & 0xFFFFFFFF));
|
|
||||||
config.Dtu.Serial = dtuId;
|
|
||||||
write();
|
|
||||||
}
|
|
||||||
MessageOutput.println("done");
|
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -353,8 +329,6 @@ void ConfigurationClass::migrate()
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
Utils::skipBom(f);
|
|
||||||
|
|
||||||
JsonDocument doc;
|
JsonDocument doc;
|
||||||
|
|
||||||
// Deserialize the JSON document
|
// Deserialize the JSON document
|
||||||
@ -409,22 +383,6 @@ void ConfigurationClass::migrate()
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (config.Cfg.Version < 0x00011d00) {
|
|
||||||
JsonObject device = doc["device"];
|
|
||||||
JsonObject display = device["display"];
|
|
||||||
switch (display["language"] | 0U) {
|
|
||||||
case 0U:
|
|
||||||
strlcpy(config.Display.Locale, "en", sizeof(config.Display.Locale));
|
|
||||||
break;
|
|
||||||
case 1U:
|
|
||||||
strlcpy(config.Display.Locale, "de", sizeof(config.Display.Locale));
|
|
||||||
break;
|
|
||||||
case 2U:
|
|
||||||
strlcpy(config.Display.Locale, "fr", sizeof(config.Display.Locale));
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
f.close();
|
f.close();
|
||||||
|
|
||||||
config.Cfg.Version = CONFIG_VERSION;
|
config.Cfg.Version = CONFIG_VERSION;
|
||||||
@ -432,16 +390,11 @@ void ConfigurationClass::migrate()
|
|||||||
read();
|
read();
|
||||||
}
|
}
|
||||||
|
|
||||||
CONFIG_T const& ConfigurationClass::get()
|
CONFIG_T& ConfigurationClass::get()
|
||||||
{
|
{
|
||||||
return config;
|
return config;
|
||||||
}
|
}
|
||||||
|
|
||||||
ConfigurationClass::WriteGuard ConfigurationClass::getWriteGuard()
|
|
||||||
{
|
|
||||||
return WriteGuard();
|
|
||||||
}
|
|
||||||
|
|
||||||
INVERTER_CONFIG_T* ConfigurationClass::getFreeInverterSlot()
|
INVERTER_CONFIG_T* ConfigurationClass::getFreeInverterSlot()
|
||||||
{
|
{
|
||||||
for (uint8_t i = 0; i < INV_MAX_COUNT; i++) {
|
for (uint8_t i = 0; i < INV_MAX_COUNT; i++) {
|
||||||
@ -486,30 +439,4 @@ void ConfigurationClass::deleteInverterById(const uint8_t id)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void ConfigurationClass::loop()
|
|
||||||
{
|
|
||||||
std::unique_lock<std::mutex> lock(sWriterMutex);
|
|
||||||
if (sWriterCount == 0) { return; }
|
|
||||||
|
|
||||||
sWriterCv.notify_all();
|
|
||||||
sWriterCv.wait(lock, [] { return sWriterCount == 0; });
|
|
||||||
}
|
|
||||||
|
|
||||||
CONFIG_T& ConfigurationClass::WriteGuard::getConfig()
|
|
||||||
{
|
|
||||||
return config;
|
|
||||||
}
|
|
||||||
|
|
||||||
ConfigurationClass::WriteGuard::WriteGuard()
|
|
||||||
: _lock(sWriterMutex)
|
|
||||||
{
|
|
||||||
sWriterCount++;
|
|
||||||
sWriterCv.wait(_lock);
|
|
||||||
}
|
|
||||||
|
|
||||||
ConfigurationClass::WriteGuard::~WriteGuard() {
|
|
||||||
sWriterCount--;
|
|
||||||
if (sWriterCount == 0) { sWriterCv.notify_all(); }
|
|
||||||
}
|
|
||||||
|
|
||||||
ConfigurationClass Configuration;
|
ConfigurationClass Configuration;
|
||||||
|
|||||||
@ -4,7 +4,6 @@
|
|||||||
*/
|
*/
|
||||||
#include "Display_Graphic.h"
|
#include "Display_Graphic.h"
|
||||||
#include "Datastore.h"
|
#include "Datastore.h"
|
||||||
#include "I18n.h"
|
|
||||||
#include <NetworkSettings.h>
|
#include <NetworkSettings.h>
|
||||||
#include <map>
|
#include <map>
|
||||||
#include <time.h>
|
#include <time.h>
|
||||||
@ -17,11 +16,18 @@ std::map<DisplayType_t, std::function<U8G2*(uint8_t, uint8_t, uint8_t, uint8_t)>
|
|||||||
{ DisplayType_t::ST7567_GM12864I_59N, [](uint8_t reset, uint8_t clock, uint8_t data, uint8_t cs) { return new U8G2_ST7567_ENH_DG128064I_F_HW_I2C(U8G2_R0, reset, clock, data); } },
|
{ DisplayType_t::ST7567_GM12864I_59N, [](uint8_t reset, uint8_t clock, uint8_t data, uint8_t cs) { return new U8G2_ST7567_ENH_DG128064I_F_HW_I2C(U8G2_R0, reset, clock, data); } },
|
||||||
};
|
};
|
||||||
|
|
||||||
// Language defintion, respect order in translation lists
|
// Language defintion, respect order in languages[] and translation lists
|
||||||
#define I18N_LOCALE_EN 0
|
#define I18N_LOCALE_EN 0
|
||||||
#define I18N_LOCALE_DE 1
|
#define I18N_LOCALE_DE 1
|
||||||
#define I18N_LOCALE_FR 2
|
#define I18N_LOCALE_FR 2
|
||||||
|
|
||||||
|
// Languages supported. Note: the order is important and must match locale_translations.h
|
||||||
|
const uint8_t languages[] = {
|
||||||
|
I18N_LOCALE_EN,
|
||||||
|
I18N_LOCALE_DE,
|
||||||
|
I18N_LOCALE_FR
|
||||||
|
};
|
||||||
|
|
||||||
static const char* const i18n_offline[] = { "Offline", "Offline", "Offline" };
|
static const char* const i18n_offline[] = { "Offline", "Offline", "Offline" };
|
||||||
|
|
||||||
static const char* const i18n_current_power_w[] = { "%.0f W", "%.0f W", "%.0f W" };
|
static const char* const i18n_current_power_w[] = { "%.0f W", "%.0f W", "%.0f W" };
|
||||||
@ -160,34 +166,9 @@ void DisplayGraphicClass::setOrientation(const uint8_t rotation)
|
|||||||
calcLineHeights();
|
calcLineHeights();
|
||||||
}
|
}
|
||||||
|
|
||||||
void DisplayGraphicClass::setLocale(const String& locale)
|
void DisplayGraphicClass::setLanguage(const uint8_t language)
|
||||||
{
|
{
|
||||||
_display_language = locale;
|
_display_language = language < sizeof(languages) / sizeof(languages[0]) ? language : DISPLAY_LANGUAGE;
|
||||||
uint8_t idx = I18N_LOCALE_EN;
|
|
||||||
if (locale == "de") {
|
|
||||||
idx = I18N_LOCALE_DE;
|
|
||||||
} else if (locale == "fr") {
|
|
||||||
idx = I18N_LOCALE_FR;
|
|
||||||
}
|
|
||||||
|
|
||||||
_i18n_date_format = i18n_date_format[idx];
|
|
||||||
_i18n_offline = i18n_offline[idx];
|
|
||||||
_i18n_current_power_w = i18n_current_power_w[idx];
|
|
||||||
_i18n_current_power_kw = i18n_current_power_kw[idx];
|
|
||||||
_i18n_yield_today_wh = i18n_yield_today_wh[idx];
|
|
||||||
_i18n_yield_today_kwh = i18n_yield_today_kwh[idx];
|
|
||||||
_i18n_yield_total_kwh = i18n_yield_total_kwh[idx];
|
|
||||||
_i18n_yield_total_mwh = i18n_yield_total_mwh[idx];
|
|
||||||
|
|
||||||
I18n.readDisplayStrings(locale,
|
|
||||||
_i18n_date_format,
|
|
||||||
_i18n_offline,
|
|
||||||
_i18n_current_power_w,
|
|
||||||
_i18n_current_power_kw,
|
|
||||||
_i18n_yield_today_wh,
|
|
||||||
_i18n_yield_today_kwh,
|
|
||||||
_i18n_yield_total_kwh,
|
|
||||||
_i18n_yield_total_mwh);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void DisplayGraphicClass::setDiagramMode(DiagramMode_t mode)
|
void DisplayGraphicClass::setDiagramMode(DiagramMode_t mode)
|
||||||
@ -244,9 +225,9 @@ void DisplayGraphicClass::loop()
|
|||||||
if (showText) {
|
if (showText) {
|
||||||
const float watts = Datastore.getTotalAcPowerEnabled();
|
const float watts = Datastore.getTotalAcPowerEnabled();
|
||||||
if (watts > 999) {
|
if (watts > 999) {
|
||||||
snprintf(_fmtText, sizeof(_fmtText), _i18n_current_power_kw.c_str(), watts / 1000);
|
snprintf(_fmtText, sizeof(_fmtText), i18n_current_power_kw[_display_language], watts / 1000);
|
||||||
} else {
|
} else {
|
||||||
snprintf(_fmtText, sizeof(_fmtText), _i18n_current_power_w.c_str(), watts);
|
snprintf(_fmtText, sizeof(_fmtText), i18n_current_power_w[_display_language], watts);
|
||||||
}
|
}
|
||||||
printText(_fmtText, 0);
|
printText(_fmtText, 0);
|
||||||
}
|
}
|
||||||
@ -256,7 +237,7 @@ void DisplayGraphicClass::loop()
|
|||||||
|
|
||||||
//=====> Offline ===========
|
//=====> Offline ===========
|
||||||
else {
|
else {
|
||||||
printText(_i18n_offline.c_str(), 0);
|
printText(i18n_offline[_display_language], 0);
|
||||||
// check if it's time to enter power saving mode
|
// check if it's time to enter power saving mode
|
||||||
if (millis() - _previousMillis >= (_interval * 2)) {
|
if (millis() - _previousMillis >= (_interval * 2)) {
|
||||||
displayPowerSave = enablePowerSafe;
|
displayPowerSave = enablePowerSafe;
|
||||||
@ -268,16 +249,16 @@ void DisplayGraphicClass::loop()
|
|||||||
// Daily production
|
// Daily production
|
||||||
float wattsToday = Datastore.getTotalAcYieldDayEnabled();
|
float wattsToday = Datastore.getTotalAcYieldDayEnabled();
|
||||||
if (wattsToday >= 10000) {
|
if (wattsToday >= 10000) {
|
||||||
snprintf(_fmtText, sizeof(_fmtText), _i18n_yield_today_kwh.c_str(), wattsToday / 1000);
|
snprintf(_fmtText, sizeof(_fmtText), i18n_yield_today_kwh[_display_language], wattsToday / 1000);
|
||||||
} else {
|
} else {
|
||||||
snprintf(_fmtText, sizeof(_fmtText), _i18n_yield_today_wh.c_str(), wattsToday);
|
snprintf(_fmtText, sizeof(_fmtText), i18n_yield_today_wh[_display_language], wattsToday);
|
||||||
}
|
}
|
||||||
printText(_fmtText, 1);
|
printText(_fmtText, 1);
|
||||||
|
|
||||||
// Total production
|
// Total production
|
||||||
const float wattsTotal = Datastore.getTotalAcYieldTotalEnabled();
|
const float wattsTotal = Datastore.getTotalAcYieldTotalEnabled();
|
||||||
auto const format = (wattsTotal >= 1000) ? _i18n_yield_total_mwh : _i18n_yield_total_kwh;
|
auto const format = (wattsTotal >= 1000) ? i18n_yield_total_mwh : i18n_yield_total_kwh;
|
||||||
snprintf(_fmtText, sizeof(_fmtText), format.c_str(), wattsTotal);
|
snprintf(_fmtText, sizeof(_fmtText), format[_display_language], wattsTotal);
|
||||||
printText(_fmtText, 2);
|
printText(_fmtText, 2);
|
||||||
|
|
||||||
//=====> IP or Date-Time ========
|
//=====> IP or Date-Time ========
|
||||||
@ -287,7 +268,7 @@ void DisplayGraphicClass::loop()
|
|||||||
} else {
|
} else {
|
||||||
// Get current time
|
// Get current time
|
||||||
time_t now = time(nullptr);
|
time_t now = time(nullptr);
|
||||||
strftime(_fmtText, sizeof(_fmtText), _i18n_date_format.c_str(), localtime(&now));
|
strftime(_fmtText, sizeof(_fmtText), i18n_date_format[_display_language], localtime(&now));
|
||||||
printText(_fmtText, 3);
|
printText(_fmtText, 3);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
158
src/I18n.cpp
158
src/I18n.cpp
@ -1,158 +0,0 @@
|
|||||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
|
||||||
/*
|
|
||||||
* Copyright (C) 2024 Thomas Basler and others
|
|
||||||
*/
|
|
||||||
#include "I18n.h"
|
|
||||||
#include "MessageOutput.h"
|
|
||||||
#include "Utils.h"
|
|
||||||
#include "defaults.h"
|
|
||||||
#include <ArduinoJson.h>
|
|
||||||
#include <LittleFS.h>
|
|
||||||
|
|
||||||
I18nClass I18n;
|
|
||||||
|
|
||||||
I18nClass::I18nClass()
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
void I18nClass::init(Scheduler& scheduler)
|
|
||||||
{
|
|
||||||
readLangPacks();
|
|
||||||
}
|
|
||||||
|
|
||||||
std::list<LanguageInfo_t> I18nClass::getAvailableLanguages()
|
|
||||||
{
|
|
||||||
return _availLanguages;
|
|
||||||
}
|
|
||||||
|
|
||||||
String I18nClass::getFilenameByLocale(const String& locale) const
|
|
||||||
{
|
|
||||||
auto it = std::find_if(_availLanguages.begin(), _availLanguages.end(), [locale](const LanguageInfo_t& elem) {
|
|
||||||
return elem.code == locale;
|
|
||||||
});
|
|
||||||
|
|
||||||
if (it != _availLanguages.end()) {
|
|
||||||
return it->filename;
|
|
||||||
} else {
|
|
||||||
return String();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void I18nClass::readDisplayStrings(
|
|
||||||
const String& locale,
|
|
||||||
String& date_format,
|
|
||||||
String& offline,
|
|
||||||
String& power_w, String& power_kw,
|
|
||||||
String& yield_today_wh, String& yield_today_kwh,
|
|
||||||
String& yield_total_kwh, String& yield_total_mwh)
|
|
||||||
{
|
|
||||||
auto filename = getFilenameByLocale(locale);
|
|
||||||
if (filename == "") {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
JsonDocument filter;
|
|
||||||
filter["display"] = true;
|
|
||||||
|
|
||||||
File f = LittleFS.open(filename, "r", false);
|
|
||||||
|
|
||||||
JsonDocument doc;
|
|
||||||
|
|
||||||
// Deserialize the JSON document
|
|
||||||
const DeserializationError error = deserializeJson(doc, f, DeserializationOption::Filter(filter));
|
|
||||||
if (error) {
|
|
||||||
MessageOutput.printf("Failed to read file %s\r\n", filename.c_str());
|
|
||||||
f.close();
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!Utils::checkJsonAlloc(doc, __FUNCTION__, __LINE__)) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
auto displayData = doc["display"];
|
|
||||||
|
|
||||||
if (displayData["date_format"].as<String>() != "null") {
|
|
||||||
date_format = displayData["date_format"].as<String>();
|
|
||||||
}
|
|
||||||
|
|
||||||
if (displayData["offline"].as<String>() != "null") {
|
|
||||||
offline = displayData["offline"].as<String>();
|
|
||||||
}
|
|
||||||
|
|
||||||
if (displayData["power_w"].as<String>() != "null") {
|
|
||||||
power_w = displayData["power_w"].as<String>();
|
|
||||||
}
|
|
||||||
|
|
||||||
if (displayData["power_kw"].as<String>() != "null") {
|
|
||||||
power_kw = displayData["power_kw"].as<String>();
|
|
||||||
}
|
|
||||||
|
|
||||||
if (displayData["yield_today_wh"].as<String>() != "null") {
|
|
||||||
yield_today_wh = displayData["yield_today_wh"].as<String>();
|
|
||||||
}
|
|
||||||
|
|
||||||
if (displayData["yield_today_kwh"].as<String>() != "null") {
|
|
||||||
yield_today_kwh = displayData["yield_today_kwh"].as<String>();
|
|
||||||
}
|
|
||||||
|
|
||||||
if (displayData["yield_total_kwh"].as<String>() != "null") {
|
|
||||||
yield_total_kwh = displayData["yield_total_kwh"].as<String>();
|
|
||||||
}
|
|
||||||
|
|
||||||
if (displayData["yield_total_mwh"].as<String>() != "null") {
|
|
||||||
yield_total_mwh = displayData["yield_total_mwh"].as<String>();
|
|
||||||
}
|
|
||||||
|
|
||||||
f.close();
|
|
||||||
}
|
|
||||||
|
|
||||||
void I18nClass::readLangPacks()
|
|
||||||
{
|
|
||||||
auto root = LittleFS.open("/");
|
|
||||||
auto file = root.getNextFileName();
|
|
||||||
|
|
||||||
while (file != "") {
|
|
||||||
if (file.endsWith(LANG_PACK_SUFFIX)) {
|
|
||||||
MessageOutput.printf("Read File %s\r\n", file.c_str());
|
|
||||||
readConfig(file);
|
|
||||||
}
|
|
||||||
file = root.getNextFileName();
|
|
||||||
}
|
|
||||||
root.close();
|
|
||||||
}
|
|
||||||
|
|
||||||
void I18nClass::readConfig(String file)
|
|
||||||
{
|
|
||||||
JsonDocument filter;
|
|
||||||
filter["meta"] = true;
|
|
||||||
|
|
||||||
File f = LittleFS.open(file, "r", false);
|
|
||||||
|
|
||||||
JsonDocument doc;
|
|
||||||
|
|
||||||
// Deserialize the JSON document
|
|
||||||
const DeserializationError error = deserializeJson(doc, f, DeserializationOption::Filter(filter));
|
|
||||||
if (error) {
|
|
||||||
MessageOutput.printf("Failed to read file %s\r\n", file.c_str());
|
|
||||||
f.close();
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!Utils::checkJsonAlloc(doc, __FUNCTION__, __LINE__)) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
LanguageInfo_t lang;
|
|
||||||
lang.code = String(doc["meta"]["code"] | "");
|
|
||||||
lang.name = String(doc["meta"]["name"] | "");
|
|
||||||
lang.filename = file;
|
|
||||||
|
|
||||||
if (lang.code != "" && lang.name != "") {
|
|
||||||
_availLanguages.push_back(lang);
|
|
||||||
} else {
|
|
||||||
MessageOutput.printf("Invalid meta data\r\n");
|
|
||||||
}
|
|
||||||
|
|
||||||
f.close();
|
|
||||||
}
|
|
||||||
@ -60,10 +60,10 @@ void InverterSettingsClass::init(Scheduler& scheduler)
|
|||||||
|
|
||||||
for (uint8_t i = 0; i < INV_MAX_COUNT; i++) {
|
for (uint8_t i = 0; i < INV_MAX_COUNT; i++) {
|
||||||
if (config.Inverter[i].Serial > 0) {
|
if (config.Inverter[i].Serial > 0) {
|
||||||
MessageOutput.printf(" Adding inverter: %0" PRIx32 "%08" PRIx32 " - %s",
|
MessageOutput.print(" Adding inverter: ");
|
||||||
static_cast<uint32_t>((config.Inverter[i].Serial >> 32) & 0xFFFFFFFF),
|
MessageOutput.print(config.Inverter[i].Serial, HEX);
|
||||||
static_cast<uint32_t>(config.Inverter[i].Serial & 0xFFFFFFFF),
|
MessageOutput.print(" - ");
|
||||||
config.Inverter[i].Name);
|
MessageOutput.print(config.Inverter[i].Name);
|
||||||
auto inv = Hoymiles.addInverter(
|
auto inv = Hoymiles.addInverter(
|
||||||
config.Inverter[i].Name,
|
config.Inverter[i].Name,
|
||||||
config.Inverter[i].Serial);
|
config.Inverter[i].Serial);
|
||||||
|
|||||||
@ -32,7 +32,7 @@ void MqttHandleDtuClass::loop()
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
MqttSettings.publish("dtu/uptime", String(esp_timer_get_time() / 1000000));
|
MqttSettings.publish("dtu/uptime", String(millis() / 1000));
|
||||||
MqttSettings.publish("dtu/ip", NetworkSettings.localIP().toString());
|
MqttSettings.publish("dtu/ip", NetworkSettings.localIP().toString());
|
||||||
MqttSettings.publish("dtu/hostname", NetworkSettings.getHostname());
|
MqttSettings.publish("dtu/hostname", NetworkSettings.getHostname());
|
||||||
MqttSettings.publish("dtu/heap/size", String(ESP.getHeapSize()));
|
MqttSettings.publish("dtu/heap/size", String(ESP.getHeapSize()));
|
||||||
|
|||||||
@ -70,7 +70,6 @@ void MqttHandleHassClass::publishConfig()
|
|||||||
publishDtuSensor("Yield Total", "ac/yieldtotal", "kWh", "", DEVICE_CLS_ENERGY, STATE_CLS_TOTAL_INCREASING, CATEGORY_NONE);
|
publishDtuSensor("Yield Total", "ac/yieldtotal", "kWh", "", DEVICE_CLS_ENERGY, STATE_CLS_TOTAL_INCREASING, CATEGORY_NONE);
|
||||||
publishDtuSensor("Yield Day", "ac/yieldday", "Wh", "", DEVICE_CLS_ENERGY, STATE_CLS_TOTAL_INCREASING, CATEGORY_NONE);
|
publishDtuSensor("Yield Day", "ac/yieldday", "Wh", "", DEVICE_CLS_ENERGY, STATE_CLS_TOTAL_INCREASING, CATEGORY_NONE);
|
||||||
publishDtuSensor("AC Power", "ac/power", "W", "", DEVICE_CLS_PWR, STATE_CLS_MEASUREMENT, CATEGORY_NONE);
|
publishDtuSensor("AC Power", "ac/power", "W", "", DEVICE_CLS_PWR, STATE_CLS_MEASUREMENT, CATEGORY_NONE);
|
||||||
publishDtuSensor("DC Power", "dc/power", "W", "", DEVICE_CLS_PWR, STATE_CLS_MEASUREMENT, CATEGORY_NONE);
|
|
||||||
|
|
||||||
publishDtuBinarySensor("Status", config.Mqtt.Lwt.Topic, config.Mqtt.Lwt.Value_Online, config.Mqtt.Lwt.Value_Offline, DEVICE_CLS_CONNECTIVITY, STATE_CLS_NONE, CATEGORY_DIAGNOSTIC);
|
publishDtuBinarySensor("Status", config.Mqtt.Lwt.Topic, config.Mqtt.Lwt.Value_Online, config.Mqtt.Lwt.Value_Offline, DEVICE_CLS_CONNECTIVITY, STATE_CLS_NONE, CATEGORY_DIAGNOSTIC);
|
||||||
|
|
||||||
|
|||||||
@ -91,7 +91,8 @@ void MqttSettingsClass::onMqttDisconnect(espMqttClientTypes::DisconnectReason re
|
|||||||
|
|
||||||
void MqttSettingsClass::onMqttMessage(const espMqttClientTypes::MessageProperties& properties, const char* topic, const uint8_t* payload, const size_t len, const size_t index, const size_t total)
|
void MqttSettingsClass::onMqttMessage(const espMqttClientTypes::MessageProperties& properties, const char* topic, const uint8_t* payload, const size_t len, const size_t index, const size_t total)
|
||||||
{
|
{
|
||||||
MessageOutput.printf("Received MQTT message on topic: %s\r\n", topic);
|
MessageOutput.print("Received MQTT message on topic: ");
|
||||||
|
MessageOutput.println(topic);
|
||||||
|
|
||||||
_mqttSubscribeParser.handle_message(properties, topic, payload, len, index, total);
|
_mqttSubscribeParser.handle_message(properties, topic, payload, len, index, total);
|
||||||
}
|
}
|
||||||
@ -179,7 +180,7 @@ String MqttSettingsClass::getPrefix() const
|
|||||||
return Configuration.get().Mqtt.Topic;
|
return Configuration.get().Mqtt.Topic;
|
||||||
}
|
}
|
||||||
|
|
||||||
String MqttSettingsClass::getClientId() const
|
String MqttSettingsClass::getClientId()
|
||||||
{
|
{
|
||||||
String clientId = Configuration.get().Mqtt.ClientId;
|
String clientId = Configuration.get().Mqtt.ClientId;
|
||||||
if (clientId == "") {
|
if (clientId == "") {
|
||||||
|
|||||||
@ -98,7 +98,7 @@ void NetworkSettingsClass::NetworkEvent(const WiFiEvent_t event, WiFiEventInfo_t
|
|||||||
break;
|
break;
|
||||||
case ARDUINO_EVENT_WIFI_STA_DISCONNECTED:
|
case ARDUINO_EVENT_WIFI_STA_DISCONNECTED:
|
||||||
// Reason codes can be found here: https://github.com/espressif/esp-idf/blob/5454d37d496a8c58542eb450467471404c606501/components/esp_wifi/include/esp_wifi_types_generic.h#L79-L141
|
// Reason codes can be found here: https://github.com/espressif/esp-idf/blob/5454d37d496a8c58542eb450467471404c606501/components/esp_wifi/include/esp_wifi_types_generic.h#L79-L141
|
||||||
MessageOutput.printf("WiFi disconnected: %" PRIu8 "\r\n", info.wifi_sta_disconnected.reason);
|
MessageOutput.printf("WiFi disconnected: %" PRId8 "\r\n", info.wifi_sta_disconnected.reason);
|
||||||
if (_networkMode == network_mode::WiFi) {
|
if (_networkMode == network_mode::WiFi) {
|
||||||
MessageOutput.println("Try reconnecting");
|
MessageOutput.println("Try reconnecting");
|
||||||
WiFi.disconnect(true, false);
|
WiFi.disconnect(true, false);
|
||||||
@ -287,7 +287,8 @@ void NetworkSettingsClass::applyConfig()
|
|||||||
MessageOutput.print("new credentials... ");
|
MessageOutput.print("new credentials... ");
|
||||||
WiFi.begin(
|
WiFi.begin(
|
||||||
Configuration.get().WiFi.Ssid,
|
Configuration.get().WiFi.Ssid,
|
||||||
Configuration.get().WiFi.Password);
|
Configuration.get().WiFi.Password,
|
||||||
|
WIFI_ALL_CHANNEL_SCAN);
|
||||||
} else {
|
} else {
|
||||||
MessageOutput.print("existing credentials... ");
|
MessageOutput.print("existing credentials... ");
|
||||||
WiFi.begin();
|
WiFi.begin();
|
||||||
|
|||||||
@ -4,7 +4,6 @@
|
|||||||
*/
|
*/
|
||||||
#include "PinMapping.h"
|
#include "PinMapping.h"
|
||||||
#include "MessageOutput.h"
|
#include "MessageOutput.h"
|
||||||
#include "Utils.h"
|
|
||||||
#include <ArduinoJson.h>
|
#include <ArduinoJson.h>
|
||||||
#include <LittleFS.h>
|
#include <LittleFS.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
@ -200,8 +199,6 @@ bool PinMappingClass::init(const String& deviceMapping)
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
Utils::skipBom(f);
|
|
||||||
|
|
||||||
JsonDocument doc;
|
JsonDocument doc;
|
||||||
// Deserialize the JSON document
|
// Deserialize the JSON document
|
||||||
DeserializationError error = deserializeJson(doc, f);
|
DeserializationError error = deserializeJson(doc, f);
|
||||||
@ -212,8 +209,6 @@ bool PinMappingClass::init(const String& deviceMapping)
|
|||||||
for (uint8_t i = 0; i < doc.size(); i++) {
|
for (uint8_t i = 0; i < doc.size(); i++) {
|
||||||
String devName = doc[i]["name"] | "";
|
String devName = doc[i]["name"] | "";
|
||||||
if (devName == deviceMapping) {
|
if (devName == deviceMapping) {
|
||||||
_mappingSelected = true;
|
|
||||||
|
|
||||||
strlcpy(_pinMapping.name, devName.c_str(), sizeof(_pinMapping.name));
|
strlcpy(_pinMapping.name, devName.c_str(), sizeof(_pinMapping.name));
|
||||||
_pinMapping.nrf24_clk = doc[i]["nrf24"]["clk"] | HOYMILES_PIN_SCLK;
|
_pinMapping.nrf24_clk = doc[i]["nrf24"]["clk"] | HOYMILES_PIN_SCLK;
|
||||||
_pinMapping.nrf24_cs = doc[i]["nrf24"]["cs"] | HOYMILES_PIN_CS;
|
_pinMapping.nrf24_cs = doc[i]["nrf24"]["cs"] | HOYMILES_PIN_CS;
|
||||||
|
|||||||
@ -7,8 +7,6 @@
|
|||||||
#include "Utils.h"
|
#include "Utils.h"
|
||||||
#include <Arduino.h>
|
#include <Arduino.h>
|
||||||
|
|
||||||
#define CALC_UNIQUE_ID (((timeinfo.tm_year << 9) | (timeinfo.tm_mon << 5) | timeinfo.tm_mday) << 1 | timeinfo.tm_isdst)
|
|
||||||
|
|
||||||
SunPositionClass SunPosition;
|
SunPositionClass SunPosition;
|
||||||
|
|
||||||
SunPositionClass::SunPositionClass()
|
SunPositionClass::SunPositionClass()
|
||||||
@ -59,7 +57,7 @@ bool SunPositionClass::checkRecalcDayChanged() const
|
|||||||
time(&now);
|
time(&now);
|
||||||
localtime_r(&now, &timeinfo); // don't use getLocalTime() as there could be a delay of 10ms
|
localtime_r(&now, &timeinfo); // don't use getLocalTime() as there could be a delay of 10ms
|
||||||
|
|
||||||
const uint32_t ymd = CALC_UNIQUE_ID;
|
const uint32_t ymd = (timeinfo.tm_year << 9) | (timeinfo.tm_mon << 5) | timeinfo.tm_mday;
|
||||||
|
|
||||||
return _lastSunPositionCalculatedYMD != ymd;
|
return _lastSunPositionCalculatedYMD != ymd;
|
||||||
}
|
}
|
||||||
@ -69,7 +67,7 @@ void SunPositionClass::updateSunData()
|
|||||||
struct tm timeinfo;
|
struct tm timeinfo;
|
||||||
const bool gotLocalTime = getLocalTime(&timeinfo, 5);
|
const bool gotLocalTime = getLocalTime(&timeinfo, 5);
|
||||||
|
|
||||||
_lastSunPositionCalculatedYMD = CALC_UNIQUE_ID;
|
_lastSunPositionCalculatedYMD = (timeinfo.tm_year << 9) | (timeinfo.tm_mon << 5) | timeinfo.tm_mday;
|
||||||
setDoRecalc(false);
|
setDoRecalc(false);
|
||||||
|
|
||||||
if (!gotLocalTime) {
|
if (!gotLocalTime) {
|
||||||
|
|||||||
@ -7,7 +7,6 @@
|
|||||||
#include "MessageOutput.h"
|
#include "MessageOutput.h"
|
||||||
#include "PinMapping.h"
|
#include "PinMapping.h"
|
||||||
#include <LittleFS.h>
|
#include <LittleFS.h>
|
||||||
#include <MD5Builder.h>
|
|
||||||
|
|
||||||
uint32_t Utils::getChipId()
|
uint32_t Utils::getChipId()
|
||||||
{
|
{
|
||||||
@ -81,45 +80,3 @@ void Utils::removeAllFiles()
|
|||||||
file = root.getNextFileName();
|
file = root.getNextFileName();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
String Utils::generateMd5FromFile(String file)
|
|
||||||
{
|
|
||||||
if (!LittleFS.exists(file)) {
|
|
||||||
return String();
|
|
||||||
}
|
|
||||||
|
|
||||||
File f = LittleFS.open(file, "r");
|
|
||||||
if (!file) {
|
|
||||||
return String();
|
|
||||||
}
|
|
||||||
|
|
||||||
MD5Builder md5;
|
|
||||||
md5.begin();
|
|
||||||
|
|
||||||
// Read the file in chunks to avoid using too much memory
|
|
||||||
uint8_t buffer[512];
|
|
||||||
|
|
||||||
while (f.available()) {
|
|
||||||
size_t bytesRead = f.read(buffer, sizeof(buffer) / sizeof(buffer[0]));
|
|
||||||
md5.add(buffer, bytesRead);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Finalize and calculate the MD5 hash
|
|
||||||
md5.calculate();
|
|
||||||
|
|
||||||
f.close();
|
|
||||||
|
|
||||||
return md5.toString();
|
|
||||||
}
|
|
||||||
|
|
||||||
void Utils::skipBom(File& f)
|
|
||||||
{
|
|
||||||
// skip Byte Order Mask (BOM). valid JSON docs always start with '{' or '['.
|
|
||||||
while (f.available() > 0) {
|
|
||||||
int c = f.peek();
|
|
||||||
if (c == '{' || c == '[') {
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
f.read();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|||||||
@ -15,14 +15,13 @@ WebApiClass::WebApiClass()
|
|||||||
|
|
||||||
void WebApiClass::init(Scheduler& scheduler)
|
void WebApiClass::init(Scheduler& scheduler)
|
||||||
{
|
{
|
||||||
|
_webApiConfig.init(_server, scheduler);
|
||||||
_webApiDevice.init(_server, scheduler);
|
_webApiDevice.init(_server, scheduler);
|
||||||
_webApiDevInfo.init(_server, scheduler);
|
_webApiDevInfo.init(_server, scheduler);
|
||||||
_webApiDtu.init(_server, scheduler);
|
_webApiDtu.init(_server, scheduler);
|
||||||
_webApiEventlog.init(_server, scheduler);
|
_webApiEventlog.init(_server, scheduler);
|
||||||
_webApiFile.init(_server, scheduler);
|
|
||||||
_webApiFirmware.init(_server, scheduler);
|
_webApiFirmware.init(_server, scheduler);
|
||||||
_webApiGridprofile.init(_server, scheduler);
|
_webApiGridprofile.init(_server, scheduler);
|
||||||
_webApiI18n.init(_server, scheduler);
|
|
||||||
_webApiInverter.init(_server, scheduler);
|
_webApiInverter.init(_server, scheduler);
|
||||||
_webApiLimit.init(_server, scheduler);
|
_webApiLimit.init(_server, scheduler);
|
||||||
_webApiMaintenance.init(_server, scheduler);
|
_webApiMaintenance.init(_server, scheduler);
|
||||||
@ -48,7 +47,7 @@ void WebApiClass::reload()
|
|||||||
|
|
||||||
bool WebApiClass::checkCredentials(AsyncWebServerRequest* request)
|
bool WebApiClass::checkCredentials(AsyncWebServerRequest* request)
|
||||||
{
|
{
|
||||||
auto const& config = Configuration.get();
|
CONFIG_T& config = Configuration.get();
|
||||||
if (request->authenticate(AUTH_USERNAME, config.Security.Password)) {
|
if (request->authenticate(AUTH_USERNAME, config.Security.Password)) {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
@ -66,7 +65,7 @@ bool WebApiClass::checkCredentials(AsyncWebServerRequest* request)
|
|||||||
|
|
||||||
bool WebApiClass::checkCredentialsReadonly(AsyncWebServerRequest* request)
|
bool WebApiClass::checkCredentialsReadonly(AsyncWebServerRequest* request)
|
||||||
{
|
{
|
||||||
auto const& config = Configuration.get();
|
CONFIG_T& config = Configuration.get();
|
||||||
if (config.Security.AllowReadonly) {
|
if (config.Security.AllowReadonly) {
|
||||||
return true;
|
return true;
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
@ -2,7 +2,7 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright (C) 2022-2024 Thomas Basler and others
|
* Copyright (C) 2022-2024 Thomas Basler and others
|
||||||
*/
|
*/
|
||||||
#include "WebApi_file.h"
|
#include "WebApi_config.h"
|
||||||
#include "Configuration.h"
|
#include "Configuration.h"
|
||||||
#include "RestartHelper.h"
|
#include "RestartHelper.h"
|
||||||
#include "Utils.h"
|
#include "Utils.h"
|
||||||
@ -11,7 +11,7 @@
|
|||||||
#include <AsyncJson.h>
|
#include <AsyncJson.h>
|
||||||
#include <LittleFS.h>
|
#include <LittleFS.h>
|
||||||
|
|
||||||
void WebApiFileClass::init(AsyncWebServer& server, Scheduler& scheduler)
|
void WebApiConfigClass::init(AsyncWebServer& server, Scheduler& scheduler)
|
||||||
{
|
{
|
||||||
using std::placeholders::_1;
|
using std::placeholders::_1;
|
||||||
using std::placeholders::_2;
|
using std::placeholders::_2;
|
||||||
@ -20,43 +20,15 @@ void WebApiFileClass::init(AsyncWebServer& server, Scheduler& scheduler)
|
|||||||
using std::placeholders::_5;
|
using std::placeholders::_5;
|
||||||
using std::placeholders::_6;
|
using std::placeholders::_6;
|
||||||
|
|
||||||
server.on("/api/file/get", HTTP_GET, std::bind(&WebApiFileClass::onFileGet, this, _1));
|
server.on("/api/config/get", HTTP_GET, std::bind(&WebApiConfigClass::onConfigGet, this, _1));
|
||||||
server.on("/api/file/delete", HTTP_POST, std::bind(&WebApiFileClass::onFileDelete, this, _1));
|
server.on("/api/config/delete", HTTP_POST, std::bind(&WebApiConfigClass::onConfigDelete, this, _1));
|
||||||
server.on("/api/file/delete_all", HTTP_POST, std::bind(&WebApiFileClass::onFileDeleteAll, this, _1));
|
server.on("/api/config/list", HTTP_GET, std::bind(&WebApiConfigClass::onConfigListGet, this, _1));
|
||||||
server.on("/api/file/list", HTTP_GET, std::bind(&WebApiFileClass::onFileListGet, this, _1));
|
server.on("/api/config/upload", HTTP_POST,
|
||||||
server.on("/api/file/upload", HTTP_POST,
|
std::bind(&WebApiConfigClass::onConfigUploadFinish, this, _1),
|
||||||
std::bind(&WebApiFileClass::onFileUploadFinish, this, _1),
|
std::bind(&WebApiConfigClass::onConfigUpload, this, _1, _2, _3, _4, _5, _6));
|
||||||
std::bind(&WebApiFileClass::onFileUpload, this, _1, _2, _3, _4, _5, _6));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void WebApiFileClass::onFileListGet(AsyncWebServerRequest* request)
|
void WebApiConfigClass::onConfigGet(AsyncWebServerRequest* request)
|
||||||
{
|
|
||||||
if (!WebApi.checkCredentials(request)) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
AsyncJsonResponse* response = new AsyncJsonResponse();
|
|
||||||
auto& root = response->getRoot();
|
|
||||||
auto data = root.to<JsonArray>();
|
|
||||||
|
|
||||||
File rootfs = LittleFS.open("/");
|
|
||||||
File file = rootfs.openNextFile();
|
|
||||||
while (file) {
|
|
||||||
if (file.isDirectory()) {
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
JsonObject obj = data.add<JsonObject>();
|
|
||||||
obj["name"] = String(file.name());
|
|
||||||
obj["size"] = file.size();
|
|
||||||
|
|
||||||
file = rootfs.openNextFile();
|
|
||||||
}
|
|
||||||
file.close();
|
|
||||||
|
|
||||||
WebApi.sendJsonResponse(request, response, __FUNCTION__, __LINE__);
|
|
||||||
}
|
|
||||||
|
|
||||||
void WebApiFileClass::onFileGet(AsyncWebServerRequest* request)
|
|
||||||
{
|
{
|
||||||
if (!WebApi.checkCredentials(request)) {
|
if (!WebApi.checkCredentials(request)) {
|
||||||
return;
|
return;
|
||||||
@ -76,43 +48,7 @@ void WebApiFileClass::onFileGet(AsyncWebServerRequest* request)
|
|||||||
request->send(LittleFS, requestFile, String(), true);
|
request->send(LittleFS, requestFile, String(), true);
|
||||||
}
|
}
|
||||||
|
|
||||||
void WebApiFileClass::onFileDelete(AsyncWebServerRequest* request)
|
void WebApiConfigClass::onConfigDelete(AsyncWebServerRequest* request)
|
||||||
{
|
|
||||||
if (!WebApi.checkCredentials(request)) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
AsyncJsonResponse* response = new AsyncJsonResponse();
|
|
||||||
JsonDocument root;
|
|
||||||
if (!WebApi.parseRequestData(request, response, root)) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
auto& retMsg = response->getRoot();
|
|
||||||
|
|
||||||
if (!(root["file"].is<String>())) {
|
|
||||||
retMsg["message"] = "Values are missing!";
|
|
||||||
retMsg["code"] = WebApiError::GenericValueMissing;
|
|
||||||
WebApi.sendJsonResponse(request, response, __FUNCTION__, __LINE__);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
String name = "/" + root["file"].as<String>();
|
|
||||||
if (!LittleFS.exists(name)) {
|
|
||||||
request->send(404);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
LittleFS.remove(name);
|
|
||||||
|
|
||||||
retMsg["type"] = "success";
|
|
||||||
retMsg["message"] = "File deleted";
|
|
||||||
retMsg["code"] = WebApiError::FileDeleteSuccess;
|
|
||||||
|
|
||||||
WebApi.sendJsonResponse(request, response, __FUNCTION__, __LINE__);
|
|
||||||
}
|
|
||||||
|
|
||||||
void WebApiFileClass::onFileDeleteAll(AsyncWebServerRequest* request)
|
|
||||||
{
|
{
|
||||||
if (!WebApi.checkCredentials(request)) {
|
if (!WebApi.checkCredentials(request)) {
|
||||||
return;
|
return;
|
||||||
@ -135,14 +71,14 @@ void WebApiFileClass::onFileDeleteAll(AsyncWebServerRequest* request)
|
|||||||
|
|
||||||
if (root["delete"].as<bool>() == false) {
|
if (root["delete"].as<bool>() == false) {
|
||||||
retMsg["message"] = "Not deleted anything!";
|
retMsg["message"] = "Not deleted anything!";
|
||||||
retMsg["code"] = WebApiError::FileNotDeleted;
|
retMsg["code"] = WebApiError::ConfigNotDeleted;
|
||||||
WebApi.sendJsonResponse(request, response, __FUNCTION__, __LINE__);
|
WebApi.sendJsonResponse(request, response, __FUNCTION__, __LINE__);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
retMsg["type"] = "success";
|
retMsg["type"] = "success";
|
||||||
retMsg["message"] = "Configuration resettet. Rebooting now...";
|
retMsg["message"] = "Configuration resettet. Rebooting now...";
|
||||||
retMsg["code"] = WebApiError::FileSuccess;
|
retMsg["code"] = WebApiError::ConfigSuccess;
|
||||||
|
|
||||||
WebApi.sendJsonResponse(request, response, __FUNCTION__, __LINE__);
|
WebApi.sendJsonResponse(request, response, __FUNCTION__, __LINE__);
|
||||||
|
|
||||||
@ -150,7 +86,49 @@ void WebApiFileClass::onFileDeleteAll(AsyncWebServerRequest* request)
|
|||||||
RestartHelper.triggerRestart();
|
RestartHelper.triggerRestart();
|
||||||
}
|
}
|
||||||
|
|
||||||
void WebApiFileClass::onFileUpload(AsyncWebServerRequest* request, String filename, size_t index, uint8_t* data, size_t len, bool final)
|
void WebApiConfigClass::onConfigListGet(AsyncWebServerRequest* request)
|
||||||
|
{
|
||||||
|
if (!WebApi.checkCredentials(request)) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
AsyncJsonResponse* response = new AsyncJsonResponse();
|
||||||
|
auto& root = response->getRoot();
|
||||||
|
auto data = root["configs"].to<JsonArray>();
|
||||||
|
|
||||||
|
File rootfs = LittleFS.open("/");
|
||||||
|
File file = rootfs.openNextFile();
|
||||||
|
while (file) {
|
||||||
|
if (file.isDirectory()) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
JsonObject obj = data.add<JsonObject>();
|
||||||
|
obj["name"] = String(file.name());
|
||||||
|
|
||||||
|
file = rootfs.openNextFile();
|
||||||
|
}
|
||||||
|
file.close();
|
||||||
|
|
||||||
|
WebApi.sendJsonResponse(request, response, __FUNCTION__, __LINE__);
|
||||||
|
}
|
||||||
|
|
||||||
|
void WebApiConfigClass::onConfigUploadFinish(AsyncWebServerRequest* request)
|
||||||
|
{
|
||||||
|
if (!WebApi.checkCredentials(request)) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// the request handler is triggered after the upload has finished...
|
||||||
|
// create the response, add header, and send response
|
||||||
|
|
||||||
|
AsyncWebServerResponse* response = request->beginResponse(200, "text/plain", "OK");
|
||||||
|
response->addHeader("Connection", "close");
|
||||||
|
response->addHeader("Access-Control-Allow-Origin", "*");
|
||||||
|
request->send(response);
|
||||||
|
RestartHelper.triggerRestart();
|
||||||
|
}
|
||||||
|
|
||||||
|
void WebApiConfigClass::onConfigUpload(AsyncWebServerRequest* request, String filename, size_t index, uint8_t* data, size_t len, bool final)
|
||||||
{
|
{
|
||||||
if (!WebApi.checkCredentials(request)) {
|
if (!WebApi.checkCredentials(request)) {
|
||||||
return;
|
return;
|
||||||
@ -176,19 +154,3 @@ void WebApiFileClass::onFileUpload(AsyncWebServerRequest* request, String filena
|
|||||||
request->_tempFile.close();
|
request->_tempFile.close();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void WebApiFileClass::onFileUploadFinish(AsyncWebServerRequest* request)
|
|
||||||
{
|
|
||||||
if (!WebApi.checkCredentials(request)) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
// the request handler is triggered after the upload has finished...
|
|
||||||
// create the response, add header, and send response
|
|
||||||
|
|
||||||
AsyncWebServerResponse* response = request->beginResponse(200, "text/plain", "OK");
|
|
||||||
response->addHeader("Connection", "close");
|
|
||||||
response->addHeader("Access-Control-Allow-Origin", "*");
|
|
||||||
request->send(response);
|
|
||||||
RestartHelper.triggerRestart();
|
|
||||||
}
|
|
||||||
@ -86,7 +86,7 @@ void WebApiDeviceClass::onDeviceAdminGet(AsyncWebServerRequest* request)
|
|||||||
display["power_safe"] = config.Display.PowerSafe;
|
display["power_safe"] = config.Display.PowerSafe;
|
||||||
display["screensaver"] = config.Display.ScreenSaver;
|
display["screensaver"] = config.Display.ScreenSaver;
|
||||||
display["contrast"] = config.Display.Contrast;
|
display["contrast"] = config.Display.Contrast;
|
||||||
display["locale"] = config.Display.Locale;
|
display["language"] = config.Display.Language;
|
||||||
display["diagramduration"] = config.Display.Diagram.Duration;
|
display["diagramduration"] = config.Display.Diagram.Duration;
|
||||||
display["diagrammode"] = config.Display.Diagram.Mode;
|
display["diagrammode"] = config.Display.Diagram.Mode;
|
||||||
|
|
||||||
@ -129,37 +129,29 @@ void WebApiDeviceClass::onDeviceAdminPost(AsyncWebServerRequest* request)
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool performRestart = false;
|
CONFIG_T& config = Configuration.get();
|
||||||
|
bool performRestart = root["curPin"]["name"].as<String>() != config.Dev_PinMapping;
|
||||||
|
|
||||||
{
|
strlcpy(config.Dev_PinMapping, root["curPin"]["name"].as<String>().c_str(), sizeof(config.Dev_PinMapping));
|
||||||
auto guard = Configuration.getWriteGuard();
|
config.Display.Rotation = root["display"]["rotation"].as<uint8_t>();
|
||||||
auto& config = guard.getConfig();
|
config.Display.PowerSafe = root["display"]["power_safe"].as<bool>();
|
||||||
|
config.Display.ScreenSaver = root["display"]["screensaver"].as<bool>();
|
||||||
|
config.Display.Contrast = root["display"]["contrast"].as<uint8_t>();
|
||||||
|
config.Display.Language = root["display"]["language"].as<uint8_t>();
|
||||||
|
config.Display.Diagram.Duration = root["display"]["diagramduration"].as<uint32_t>();
|
||||||
|
config.Display.Diagram.Mode = root["display"]["diagrammode"].as<DiagramMode_t>();
|
||||||
|
|
||||||
performRestart = root["curPin"]["name"].as<String>() != config.Dev_PinMapping;
|
for (uint8_t i = 0; i < PINMAPPING_LED_COUNT; i++) {
|
||||||
|
config.Led_Single[i].Brightness = root["led"][i]["brightness"].as<uint8_t>();
|
||||||
strlcpy(config.Dev_PinMapping, root["curPin"]["name"].as<String>().c_str(), sizeof(config.Dev_PinMapping));
|
config.Led_Single[i].Brightness = min<uint8_t>(100, config.Led_Single[i].Brightness);
|
||||||
config.Display.Rotation = root["display"]["rotation"].as<uint8_t>();
|
|
||||||
config.Display.PowerSafe = root["display"]["power_safe"].as<bool>();
|
|
||||||
config.Display.ScreenSaver = root["display"]["screensaver"].as<bool>();
|
|
||||||
config.Display.Contrast = root["display"]["contrast"].as<uint8_t>();
|
|
||||||
strlcpy(config.Display.Locale, root["display"]["locale"].as<String>().c_str(), sizeof(config.Display.Locale));
|
|
||||||
config.Display.Diagram.Duration = root["display"]["diagramduration"].as<uint32_t>();
|
|
||||||
config.Display.Diagram.Mode = root["display"]["diagrammode"].as<DiagramMode_t>();
|
|
||||||
|
|
||||||
for (uint8_t i = 0; i < PINMAPPING_LED_COUNT; i++) {
|
|
||||||
config.Led_Single[i].Brightness = root["led"][i]["brightness"].as<uint8_t>();
|
|
||||||
config.Led_Single[i].Brightness = min<uint8_t>(100, config.Led_Single[i].Brightness);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
auto const& config = Configuration.get();
|
|
||||||
|
|
||||||
Display.setDiagramMode(static_cast<DiagramMode_t>(config.Display.Diagram.Mode));
|
Display.setDiagramMode(static_cast<DiagramMode_t>(config.Display.Diagram.Mode));
|
||||||
Display.setOrientation(config.Display.Rotation);
|
Display.setOrientation(config.Display.Rotation);
|
||||||
Display.enablePowerSafe = config.Display.PowerSafe;
|
Display.enablePowerSafe = config.Display.PowerSafe;
|
||||||
Display.enableScreensaver = config.Display.ScreenSaver;
|
Display.enableScreensaver = config.Display.ScreenSaver;
|
||||||
Display.setContrast(config.Display.Contrast);
|
Display.setContrast(config.Display.Contrast);
|
||||||
Display.setLocale(config.Display.Locale);
|
Display.setLanguage(config.Display.Language);
|
||||||
Display.Diagram().updatePeriod();
|
Display.Diagram().updatePeriod();
|
||||||
|
|
||||||
WebApi.writeConfig(retMsg);
|
WebApi.writeConfig(retMsg);
|
||||||
|
|||||||
@ -35,7 +35,6 @@ void WebApiDevInfoClass::onDevInfoStatus(AsyncWebServerRequest* request)
|
|||||||
root["hw_model_name"] = inv->DevInfo()->getHwModelName();
|
root["hw_model_name"] = inv->DevInfo()->getHwModelName();
|
||||||
root["max_power"] = inv->DevInfo()->getMaxPower();
|
root["max_power"] = inv->DevInfo()->getMaxPower();
|
||||||
root["fw_build_datetime"] = inv->DevInfo()->getFwBuildDateTimeStr();
|
root["fw_build_datetime"] = inv->DevInfo()->getFwBuildDateTimeStr();
|
||||||
root["pdl_supported"] = inv->supportsPowerDistributionLogic();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
WebApi.sendJsonResponse(request, response, __FUNCTION__, __LINE__);
|
WebApi.sendJsonResponse(request, response, __FUNCTION__, __LINE__);
|
||||||
|
|||||||
@ -27,7 +27,7 @@ void WebApiDtuClass::init(AsyncWebServer& server, Scheduler& scheduler)
|
|||||||
void WebApiDtuClass::applyDataTaskCb()
|
void WebApiDtuClass::applyDataTaskCb()
|
||||||
{
|
{
|
||||||
// Execute stuff in main thread to avoid busy SPI bus
|
// Execute stuff in main thread to avoid busy SPI bus
|
||||||
auto const& config = Configuration.get();
|
CONFIG_T& config = Configuration.get();
|
||||||
Hoymiles.getRadioNrf()->setPALevel((rf24_pa_dbm_e)config.Dtu.Nrf.PaLevel);
|
Hoymiles.getRadioNrf()->setPALevel((rf24_pa_dbm_e)config.Dtu.Nrf.PaLevel);
|
||||||
Hoymiles.getRadioCmt()->setPALevel(config.Dtu.Cmt.PaLevel);
|
Hoymiles.getRadioCmt()->setPALevel(config.Dtu.Cmt.PaLevel);
|
||||||
Hoymiles.getRadioNrf()->setDtuSerial(config.Dtu.Serial);
|
Hoymiles.getRadioNrf()->setDtuSerial(config.Dtu.Serial);
|
||||||
@ -50,8 +50,8 @@ void WebApiDtuClass::onDtuAdminGet(AsyncWebServerRequest* request)
|
|||||||
// DTU Serial is read as HEX
|
// DTU Serial is read as HEX
|
||||||
char buffer[sizeof(uint64_t) * 8 + 1];
|
char buffer[sizeof(uint64_t) * 8 + 1];
|
||||||
snprintf(buffer, sizeof(buffer), "%0" PRIx32 "%08" PRIx32,
|
snprintf(buffer, sizeof(buffer), "%0" PRIx32 "%08" PRIx32,
|
||||||
static_cast<uint32_t>((config.Dtu.Serial >> 32) & 0xFFFFFFFF),
|
((uint32_t)((config.Dtu.Serial >> 32) & 0xFFFFFFFF)),
|
||||||
static_cast<uint32_t>(config.Dtu.Serial & 0xFFFFFFFF));
|
((uint32_t)(config.Dtu.Serial & 0xFFFFFFFF)));
|
||||||
root["serial"] = buffer;
|
root["serial"] = buffer;
|
||||||
root["pollinterval"] = config.Dtu.PollInterval;
|
root["pollinterval"] = config.Dtu.PollInterval;
|
||||||
root["nrf_enabled"] = Hoymiles.getRadioNrf()->isInitialized();
|
root["nrf_enabled"] = Hoymiles.getRadioNrf()->isInitialized();
|
||||||
@ -153,16 +153,14 @@ void WebApiDtuClass::onDtuAdminPost(AsyncWebServerRequest* request)
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
{
|
CONFIG_T& config = Configuration.get();
|
||||||
auto guard = Configuration.getWriteGuard();
|
|
||||||
auto& config = guard.getConfig();
|
config.Dtu.Serial = serial;
|
||||||
config.Dtu.Serial = serial;
|
config.Dtu.PollInterval = root["pollinterval"].as<uint32_t>();
|
||||||
config.Dtu.PollInterval = root["pollinterval"].as<uint32_t>();
|
config.Dtu.Nrf.PaLevel = root["nrf_palevel"].as<uint8_t>();
|
||||||
config.Dtu.Nrf.PaLevel = root["nrf_palevel"].as<uint8_t>();
|
config.Dtu.Cmt.PaLevel = root["cmt_palevel"].as<int8_t>();
|
||||||
config.Dtu.Cmt.PaLevel = root["cmt_palevel"].as<int8_t>();
|
config.Dtu.Cmt.Frequency = root["cmt_frequency"].as<uint32_t>();
|
||||||
config.Dtu.Cmt.Frequency = root["cmt_frequency"].as<uint32_t>();
|
config.Dtu.Cmt.CountryMode = root["cmt_country"].as<CountryModeId_t>();
|
||||||
config.Dtu.Cmt.CountryMode = root["cmt_country"].as<CountryModeId_t>();
|
|
||||||
}
|
|
||||||
|
|
||||||
WebApi.writeConfig(retMsg);
|
WebApi.writeConfig(retMsg);
|
||||||
|
|
||||||
|
|||||||
@ -5,10 +5,11 @@
|
|||||||
#include "WebApi_firmware.h"
|
#include "WebApi_firmware.h"
|
||||||
#include "Configuration.h"
|
#include "Configuration.h"
|
||||||
#include "RestartHelper.h"
|
#include "RestartHelper.h"
|
||||||
|
#include "Update.h"
|
||||||
|
#include "Utils.h"
|
||||||
#include "WebApi.h"
|
#include "WebApi.h"
|
||||||
#include "helper.h"
|
#include "helper.h"
|
||||||
#include <AsyncJson.h>
|
#include <AsyncJson.h>
|
||||||
#include <Update.h>
|
|
||||||
|
|
||||||
void WebApiFirmwareClass::init(AsyncWebServer& server, Scheduler& scheduler)
|
void WebApiFirmwareClass::init(AsyncWebServer& server, Scheduler& scheduler)
|
||||||
{
|
{
|
||||||
|
|||||||
@ -1,76 +0,0 @@
|
|||||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
|
||||||
/*
|
|
||||||
* Copyright (C) 2024 Thomas Basler and others
|
|
||||||
*/
|
|
||||||
#include "WebApi_i18n.h"
|
|
||||||
#include "I18n.h"
|
|
||||||
#include "Utils.h"
|
|
||||||
#include "WebApi.h"
|
|
||||||
#include <AsyncJson.h>
|
|
||||||
#include <LittleFS.h>
|
|
||||||
|
|
||||||
void WebApiI18nClass::init(AsyncWebServer& server, Scheduler& scheduler)
|
|
||||||
{
|
|
||||||
using std::placeholders::_1;
|
|
||||||
|
|
||||||
server.on("/api/i18n/languages", HTTP_GET, std::bind(&WebApiI18nClass::onI18nLanguages, this, _1));
|
|
||||||
server.on("/api/i18n/language", HTTP_GET, std::bind(&WebApiI18nClass::onI18nLanguage, this, _1));
|
|
||||||
}
|
|
||||||
|
|
||||||
void WebApiI18nClass::onI18nLanguages(AsyncWebServerRequest* request)
|
|
||||||
{
|
|
||||||
AsyncJsonResponse* response = new AsyncJsonResponse(true);
|
|
||||||
auto& root = response->getRoot();
|
|
||||||
const auto& languages = I18n.getAvailableLanguages();
|
|
||||||
|
|
||||||
for (auto& language : languages) {
|
|
||||||
auto jsonLang = root.add<JsonObject>();
|
|
||||||
|
|
||||||
jsonLang["code"] = language.code;
|
|
||||||
jsonLang["name"] = language.name;
|
|
||||||
}
|
|
||||||
|
|
||||||
WebApi.sendJsonResponse(request, response, __FUNCTION__, __LINE__);
|
|
||||||
}
|
|
||||||
|
|
||||||
void WebApiI18nClass::onI18nLanguage(AsyncWebServerRequest* request)
|
|
||||||
{
|
|
||||||
if (request->hasParam("code")) {
|
|
||||||
String code = request->getParam("code")->value();
|
|
||||||
|
|
||||||
String filename = I18n.getFilenameByLocale(code);
|
|
||||||
|
|
||||||
if (filename != "") {
|
|
||||||
String md5 = Utils::generateMd5FromFile(filename);
|
|
||||||
|
|
||||||
String expectedEtag;
|
|
||||||
expectedEtag = "\"";
|
|
||||||
expectedEtag += md5;
|
|
||||||
expectedEtag += "\"";
|
|
||||||
|
|
||||||
bool eTagMatch = false;
|
|
||||||
if (request->hasHeader("If-None-Match")) {
|
|
||||||
const AsyncWebHeader* h = request->getHeader("If-None-Match");
|
|
||||||
eTagMatch = h->value().equals(expectedEtag);
|
|
||||||
}
|
|
||||||
|
|
||||||
// begin response 200 or 304
|
|
||||||
AsyncWebServerResponse* response;
|
|
||||||
if (eTagMatch) {
|
|
||||||
response = request->beginResponse(304);
|
|
||||||
} else {
|
|
||||||
response = request->beginResponse(LittleFS, filename, asyncsrv::T_application_json);
|
|
||||||
}
|
|
||||||
|
|
||||||
// HTTP requires cache headers in 200 and 304 to be identical
|
|
||||||
response->addHeader("Cache-Control", "public, must-revalidate");
|
|
||||||
response->addHeader("ETag", expectedEtag);
|
|
||||||
|
|
||||||
request->send(response);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
request->send(404);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
@ -46,8 +46,8 @@ void WebApiInverterClass::onInverterList(AsyncWebServerRequest* request)
|
|||||||
// Inverter Serial is read as HEX
|
// Inverter Serial is read as HEX
|
||||||
char buffer[sizeof(uint64_t) * 8 + 1];
|
char buffer[sizeof(uint64_t) * 8 + 1];
|
||||||
snprintf(buffer, sizeof(buffer), "%0" PRIx32 "%08" PRIx32,
|
snprintf(buffer, sizeof(buffer), "%0" PRIx32 "%08" PRIx32,
|
||||||
static_cast<uint32_t>((config.Inverter[i].Serial >> 32) & 0xFFFFFFFF),
|
((uint32_t)((config.Inverter[i].Serial >> 32) & 0xFFFFFFFF)),
|
||||||
static_cast<uint32_t>(config.Inverter[i].Serial & 0xFFFFFFFF));
|
((uint32_t)(config.Inverter[i].Serial & 0xFFFFFFFF)));
|
||||||
obj["serial"] = buffer;
|
obj["serial"] = buffer;
|
||||||
obj["poll_enable"] = config.Inverter[i].Poll_Enable;
|
obj["poll_enable"] = config.Inverter[i].Poll_Enable;
|
||||||
obj["poll_enable_night"] = config.Inverter[i].Poll_Enable_Night;
|
obj["poll_enable_night"] = config.Inverter[i].Poll_Enable_Night;
|
||||||
@ -184,9 +184,9 @@ void WebApiInverterClass::onInverterEdit(AsyncWebServerRequest* request)
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Interpret the string as a hex value and convert it to uint64_t
|
// Interpret the string as a hex value and convert it to uint64_t
|
||||||
const uint64_t new_serial = strtoll(root["serial"].as<String>().c_str(), NULL, 16);
|
const uint64_t serial = strtoll(root["serial"].as<String>().c_str(), NULL, 16);
|
||||||
|
|
||||||
if (new_serial == 0) {
|
if (serial == 0) {
|
||||||
retMsg["message"] = "Serial must be a number > 0!";
|
retMsg["message"] = "Serial must be a number > 0!";
|
||||||
retMsg["code"] = WebApiError::InverterSerialZero;
|
retMsg["code"] = WebApiError::InverterSerialZero;
|
||||||
WebApi.sendJsonResponse(request, response, __FUNCTION__, __LINE__);
|
WebApi.sendJsonResponse(request, response, __FUNCTION__, __LINE__);
|
||||||
@ -209,42 +209,37 @@ void WebApiInverterClass::onInverterEdit(AsyncWebServerRequest* request)
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
uint64_t old_serial = 0;
|
INVERTER_CONFIG_T& inverter = Configuration.get().Inverter[root["id"].as<uint8_t>()];
|
||||||
|
|
||||||
{
|
uint64_t new_serial = serial;
|
||||||
auto guard = Configuration.getWriteGuard();
|
uint64_t old_serial = inverter.Serial;
|
||||||
auto& config = guard.getConfig();
|
|
||||||
|
|
||||||
INVERTER_CONFIG_T& inverter = config.Inverter[root["id"].as<uint8_t>()];
|
// Interpret the string as a hex value and convert it to uint64_t
|
||||||
|
inverter.Serial = new_serial;
|
||||||
|
strncpy(inverter.Name, root["name"].as<String>().c_str(), INV_MAX_NAME_STRLEN);
|
||||||
|
|
||||||
old_serial = inverter.Serial;
|
inverter.Poll_Enable = root["poll_enable"] | true;
|
||||||
inverter.Serial = new_serial;
|
inverter.Poll_Enable_Night = root["poll_enable_night"] | true;
|
||||||
strncpy(inverter.Name, root["name"].as<String>().c_str(), INV_MAX_NAME_STRLEN);
|
inverter.Command_Enable = root["command_enable"] | true;
|
||||||
|
inverter.Command_Enable_Night = root["command_enable_night"] | true;
|
||||||
|
inverter.ReachableThreshold = root["reachable_threshold"] | REACHABLE_THRESHOLD;
|
||||||
|
inverter.ZeroRuntimeDataIfUnrechable = root["zero_runtime"] | false;
|
||||||
|
inverter.ZeroYieldDayOnMidnight = root["zero_day"] | false;
|
||||||
|
inverter.ClearEventlogOnMidnight = root["clear_eventlog"] | false;
|
||||||
|
inverter.YieldDayCorrection = root["yieldday_correction"] | false;
|
||||||
|
|
||||||
inverter.Poll_Enable = root["poll_enable"] | true;
|
uint8_t arrayCount = 0;
|
||||||
inverter.Poll_Enable_Night = root["poll_enable_night"] | true;
|
for (JsonVariant channel : channelArray) {
|
||||||
inverter.Command_Enable = root["command_enable"] | true;
|
inverter.channel[arrayCount].MaxChannelPower = channel["max_power"].as<uint16_t>();
|
||||||
inverter.Command_Enable_Night = root["command_enable_night"] | true;
|
inverter.channel[arrayCount].YieldTotalOffset = channel["yield_total_offset"].as<float>();
|
||||||
inverter.ReachableThreshold = root["reachable_threshold"] | REACHABLE_THRESHOLD;
|
strncpy(inverter.channel[arrayCount].Name, channel["name"] | "", sizeof(inverter.channel[arrayCount].Name));
|
||||||
inverter.ZeroRuntimeDataIfUnrechable = root["zero_runtime"] | false;
|
arrayCount++;
|
||||||
inverter.ZeroYieldDayOnMidnight = root["zero_day"] | false;
|
|
||||||
inverter.ClearEventlogOnMidnight = root["clear_eventlog"] | false;
|
|
||||||
inverter.YieldDayCorrection = root["yieldday_correction"] | false;
|
|
||||||
|
|
||||||
uint8_t arrayCount = 0;
|
|
||||||
for (JsonVariant channel : channelArray) {
|
|
||||||
inverter.channel[arrayCount].MaxChannelPower = channel["max_power"].as<uint16_t>();
|
|
||||||
inverter.channel[arrayCount].YieldTotalOffset = channel["yield_total_offset"].as<float>();
|
|
||||||
strncpy(inverter.channel[arrayCount].Name, channel["name"] | "", sizeof(inverter.channel[arrayCount].Name));
|
|
||||||
arrayCount++;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
WebApi.writeConfig(retMsg, WebApiError::InverterChanged, "Inverter changed!");
|
WebApi.writeConfig(retMsg, WebApiError::InverterChanged, "Inverter changed!");
|
||||||
|
|
||||||
WebApi.sendJsonResponse(request, response, __FUNCTION__, __LINE__);
|
WebApi.sendJsonResponse(request, response, __FUNCTION__, __LINE__);
|
||||||
|
|
||||||
INVERTER_CONFIG_T const& inverter = Configuration.get().Inverter[root["id"].as<uint8_t>()];
|
|
||||||
std::shared_ptr<InverterAbstract> inv = Hoymiles.getInverterBySerial(old_serial);
|
std::shared_ptr<InverterAbstract> inv = Hoymiles.getInverterBySerial(old_serial);
|
||||||
|
|
||||||
if (inv != nullptr && new_serial != old_serial) {
|
if (inv != nullptr && new_serial != old_serial) {
|
||||||
@ -305,7 +300,7 @@ void WebApiInverterClass::onInverterDelete(AsyncWebServerRequest* request)
|
|||||||
}
|
}
|
||||||
|
|
||||||
uint8_t inverter_id = root["id"].as<uint8_t>();
|
uint8_t inverter_id = root["id"].as<uint8_t>();
|
||||||
INVERTER_CONFIG_T const& inverter = Configuration.get().Inverter[inverter_id];
|
INVERTER_CONFIG_T& inverter = Configuration.get().Inverter[inverter_id];
|
||||||
|
|
||||||
Hoymiles.removeInverterBySerial(inverter.Serial);
|
Hoymiles.removeInverterBySerial(inverter.Serial);
|
||||||
|
|
||||||
@ -342,18 +337,13 @@ void WebApiInverterClass::onInverterOrder(AsyncWebServerRequest* request)
|
|||||||
// The order array contains list or id in the right order
|
// The order array contains list or id in the right order
|
||||||
JsonArray orderArray = root["order"].as<JsonArray>();
|
JsonArray orderArray = root["order"].as<JsonArray>();
|
||||||
uint8_t order = 0;
|
uint8_t order = 0;
|
||||||
{
|
for (JsonVariant id : orderArray) {
|
||||||
auto guard = Configuration.getWriteGuard();
|
uint8_t inverter_id = id.as<uint8_t>();
|
||||||
auto& config = guard.getConfig();
|
if (inverter_id < INV_MAX_COUNT) {
|
||||||
|
INVERTER_CONFIG_T& inverter = Configuration.get().Inverter[inverter_id];
|
||||||
for (JsonVariant id : orderArray) {
|
inverter.Order = order;
|
||||||
uint8_t inverter_id = id.as<uint8_t>();
|
|
||||||
if (inverter_id < INV_MAX_COUNT) {
|
|
||||||
INVERTER_CONFIG_T& inverter = config.Inverter[inverter_id];
|
|
||||||
inverter.Order = order;
|
|
||||||
}
|
|
||||||
order++;
|
|
||||||
}
|
}
|
||||||
|
order++;
|
||||||
}
|
}
|
||||||
|
|
||||||
WebApi.writeConfig(retMsg, WebApiError::InverterOrdered, "Inverter order saved!");
|
WebApi.writeConfig(retMsg, WebApiError::InverterOrdered, "Inverter order saved!");
|
||||||
|
|||||||
@ -271,40 +271,36 @@ void WebApiMqttClass::onMqttAdminPost(AsyncWebServerRequest* request)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
{
|
CONFIG_T& config = Configuration.get();
|
||||||
auto guard = Configuration.getWriteGuard();
|
config.Mqtt.Enabled = root["mqtt_enabled"].as<bool>();
|
||||||
auto& config = guard.getConfig();
|
config.Mqtt.Retain = root["mqtt_retain"].as<bool>();
|
||||||
|
config.Mqtt.Tls.Enabled = root["mqtt_tls"].as<bool>();
|
||||||
|
strlcpy(config.Mqtt.Tls.RootCaCert, root["mqtt_root_ca_cert"].as<String>().c_str(), sizeof(config.Mqtt.Tls.RootCaCert));
|
||||||
|
config.Mqtt.Tls.CertLogin = root["mqtt_tls_cert_login"].as<bool>();
|
||||||
|
strlcpy(config.Mqtt.Tls.ClientCert, root["mqtt_client_cert"].as<String>().c_str(), sizeof(config.Mqtt.Tls.ClientCert));
|
||||||
|
strlcpy(config.Mqtt.Tls.ClientKey, root["mqtt_client_key"].as<String>().c_str(), sizeof(config.Mqtt.Tls.ClientKey));
|
||||||
|
config.Mqtt.Port = root["mqtt_port"].as<uint>();
|
||||||
|
strlcpy(config.Mqtt.Hostname, root["mqtt_hostname"].as<String>().c_str(), sizeof(config.Mqtt.Hostname));
|
||||||
|
strlcpy(config.Mqtt.ClientId, root["mqtt_clientid"].as<String>().c_str(), sizeof(config.Mqtt.ClientId));
|
||||||
|
strlcpy(config.Mqtt.Username, root["mqtt_username"].as<String>().c_str(), sizeof(config.Mqtt.Username));
|
||||||
|
strlcpy(config.Mqtt.Password, root["mqtt_password"].as<String>().c_str(), sizeof(config.Mqtt.Password));
|
||||||
|
strlcpy(config.Mqtt.Lwt.Topic, root["mqtt_lwt_topic"].as<String>().c_str(), sizeof(config.Mqtt.Lwt.Topic));
|
||||||
|
strlcpy(config.Mqtt.Lwt.Value_Online, root["mqtt_lwt_online"].as<String>().c_str(), sizeof(config.Mqtt.Lwt.Value_Online));
|
||||||
|
strlcpy(config.Mqtt.Lwt.Value_Offline, root["mqtt_lwt_offline"].as<String>().c_str(), sizeof(config.Mqtt.Lwt.Value_Offline));
|
||||||
|
config.Mqtt.Lwt.Qos = root["mqtt_lwt_qos"].as<uint8_t>();
|
||||||
|
config.Mqtt.PublishInterval = root["mqtt_publish_interval"].as<uint32_t>();
|
||||||
|
config.Mqtt.CleanSession = root["mqtt_clean_session"].as<bool>();
|
||||||
|
config.Mqtt.Hass.Enabled = root["mqtt_hass_enabled"].as<bool>();
|
||||||
|
config.Mqtt.Hass.Expire = root["mqtt_hass_expire"].as<bool>();
|
||||||
|
config.Mqtt.Hass.Retain = root["mqtt_hass_retain"].as<bool>();
|
||||||
|
config.Mqtt.Hass.IndividualPanels = root["mqtt_hass_individualpanels"].as<bool>();
|
||||||
|
strlcpy(config.Mqtt.Hass.Topic, root["mqtt_hass_topic"].as<String>().c_str(), sizeof(config.Mqtt.Hass.Topic));
|
||||||
|
|
||||||
config.Mqtt.Enabled = root["mqtt_enabled"].as<bool>();
|
// Check if base topic was changed
|
||||||
config.Mqtt.Retain = root["mqtt_retain"].as<bool>();
|
if (strcmp(config.Mqtt.Topic, root["mqtt_topic"].as<String>().c_str())) {
|
||||||
config.Mqtt.Tls.Enabled = root["mqtt_tls"].as<bool>();
|
MqttHandleInverter.unsubscribeTopics();
|
||||||
strlcpy(config.Mqtt.Tls.RootCaCert, root["mqtt_root_ca_cert"].as<String>().c_str(), sizeof(config.Mqtt.Tls.RootCaCert));
|
strlcpy(config.Mqtt.Topic, root["mqtt_topic"].as<String>().c_str(), sizeof(config.Mqtt.Topic));
|
||||||
config.Mqtt.Tls.CertLogin = root["mqtt_tls_cert_login"].as<bool>();
|
MqttHandleInverter.subscribeTopics();
|
||||||
strlcpy(config.Mqtt.Tls.ClientCert, root["mqtt_client_cert"].as<String>().c_str(), sizeof(config.Mqtt.Tls.ClientCert));
|
|
||||||
strlcpy(config.Mqtt.Tls.ClientKey, root["mqtt_client_key"].as<String>().c_str(), sizeof(config.Mqtt.Tls.ClientKey));
|
|
||||||
config.Mqtt.Port = root["mqtt_port"].as<uint>();
|
|
||||||
strlcpy(config.Mqtt.Hostname, root["mqtt_hostname"].as<String>().c_str(), sizeof(config.Mqtt.Hostname));
|
|
||||||
strlcpy(config.Mqtt.ClientId, root["mqtt_clientid"].as<String>().c_str(), sizeof(config.Mqtt.ClientId));
|
|
||||||
strlcpy(config.Mqtt.Username, root["mqtt_username"].as<String>().c_str(), sizeof(config.Mqtt.Username));
|
|
||||||
strlcpy(config.Mqtt.Password, root["mqtt_password"].as<String>().c_str(), sizeof(config.Mqtt.Password));
|
|
||||||
strlcpy(config.Mqtt.Lwt.Topic, root["mqtt_lwt_topic"].as<String>().c_str(), sizeof(config.Mqtt.Lwt.Topic));
|
|
||||||
strlcpy(config.Mqtt.Lwt.Value_Online, root["mqtt_lwt_online"].as<String>().c_str(), sizeof(config.Mqtt.Lwt.Value_Online));
|
|
||||||
strlcpy(config.Mqtt.Lwt.Value_Offline, root["mqtt_lwt_offline"].as<String>().c_str(), sizeof(config.Mqtt.Lwt.Value_Offline));
|
|
||||||
config.Mqtt.Lwt.Qos = root["mqtt_lwt_qos"].as<uint8_t>();
|
|
||||||
config.Mqtt.PublishInterval = root["mqtt_publish_interval"].as<uint32_t>();
|
|
||||||
config.Mqtt.CleanSession = root["mqtt_clean_session"].as<bool>();
|
|
||||||
config.Mqtt.Hass.Enabled = root["mqtt_hass_enabled"].as<bool>();
|
|
||||||
config.Mqtt.Hass.Expire = root["mqtt_hass_expire"].as<bool>();
|
|
||||||
config.Mqtt.Hass.Retain = root["mqtt_hass_retain"].as<bool>();
|
|
||||||
config.Mqtt.Hass.IndividualPanels = root["mqtt_hass_individualpanels"].as<bool>();
|
|
||||||
strlcpy(config.Mqtt.Hass.Topic, root["mqtt_hass_topic"].as<String>().c_str(), sizeof(config.Mqtt.Hass.Topic));
|
|
||||||
|
|
||||||
// Check if base topic was changed
|
|
||||||
if (strcmp(config.Mqtt.Topic, root["mqtt_topic"].as<String>().c_str())) {
|
|
||||||
MqttHandleInverter.unsubscribeTopics();
|
|
||||||
strlcpy(config.Mqtt.Topic, root["mqtt_topic"].as<String>().c_str(), sizeof(config.Mqtt.Topic));
|
|
||||||
MqttHandleInverter.subscribeTopics();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
WebApi.writeConfig(retMsg);
|
WebApi.writeConfig(retMsg);
|
||||||
|
|||||||
@ -164,41 +164,37 @@ void WebApiNetworkClass::onNetworkAdminPost(AsyncWebServerRequest* request)
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
{
|
CONFIG_T& config = Configuration.get();
|
||||||
auto guard = Configuration.getWriteGuard();
|
config.WiFi.Ip[0] = ipaddress[0];
|
||||||
auto& config = guard.getConfig();
|
config.WiFi.Ip[1] = ipaddress[1];
|
||||||
|
config.WiFi.Ip[2] = ipaddress[2];
|
||||||
config.WiFi.Ip[0] = ipaddress[0];
|
config.WiFi.Ip[3] = ipaddress[3];
|
||||||
config.WiFi.Ip[1] = ipaddress[1];
|
config.WiFi.Netmask[0] = netmask[0];
|
||||||
config.WiFi.Ip[2] = ipaddress[2];
|
config.WiFi.Netmask[1] = netmask[1];
|
||||||
config.WiFi.Ip[3] = ipaddress[3];
|
config.WiFi.Netmask[2] = netmask[2];
|
||||||
config.WiFi.Netmask[0] = netmask[0];
|
config.WiFi.Netmask[3] = netmask[3];
|
||||||
config.WiFi.Netmask[1] = netmask[1];
|
config.WiFi.Gateway[0] = gateway[0];
|
||||||
config.WiFi.Netmask[2] = netmask[2];
|
config.WiFi.Gateway[1] = gateway[1];
|
||||||
config.WiFi.Netmask[3] = netmask[3];
|
config.WiFi.Gateway[2] = gateway[2];
|
||||||
config.WiFi.Gateway[0] = gateway[0];
|
config.WiFi.Gateway[3] = gateway[3];
|
||||||
config.WiFi.Gateway[1] = gateway[1];
|
config.WiFi.Dns1[0] = dns1[0];
|
||||||
config.WiFi.Gateway[2] = gateway[2];
|
config.WiFi.Dns1[1] = dns1[1];
|
||||||
config.WiFi.Gateway[3] = gateway[3];
|
config.WiFi.Dns1[2] = dns1[2];
|
||||||
config.WiFi.Dns1[0] = dns1[0];
|
config.WiFi.Dns1[3] = dns1[3];
|
||||||
config.WiFi.Dns1[1] = dns1[1];
|
config.WiFi.Dns2[0] = dns2[0];
|
||||||
config.WiFi.Dns1[2] = dns1[2];
|
config.WiFi.Dns2[1] = dns2[1];
|
||||||
config.WiFi.Dns1[3] = dns1[3];
|
config.WiFi.Dns2[2] = dns2[2];
|
||||||
config.WiFi.Dns2[0] = dns2[0];
|
config.WiFi.Dns2[3] = dns2[3];
|
||||||
config.WiFi.Dns2[1] = dns2[1];
|
strlcpy(config.WiFi.Ssid, root["ssid"].as<String>().c_str(), sizeof(config.WiFi.Ssid));
|
||||||
config.WiFi.Dns2[2] = dns2[2];
|
strlcpy(config.WiFi.Password, root["password"].as<String>().c_str(), sizeof(config.WiFi.Password));
|
||||||
config.WiFi.Dns2[3] = dns2[3];
|
strlcpy(config.WiFi.Hostname, root["hostname"].as<String>().c_str(), sizeof(config.WiFi.Hostname));
|
||||||
strlcpy(config.WiFi.Ssid, root["ssid"].as<String>().c_str(), sizeof(config.WiFi.Ssid));
|
if (root["dhcp"].as<bool>()) {
|
||||||
strlcpy(config.WiFi.Password, root["password"].as<String>().c_str(), sizeof(config.WiFi.Password));
|
config.WiFi.Dhcp = true;
|
||||||
strlcpy(config.WiFi.Hostname, root["hostname"].as<String>().c_str(), sizeof(config.WiFi.Hostname));
|
} else {
|
||||||
if (root["dhcp"].as<bool>()) {
|
config.WiFi.Dhcp = false;
|
||||||
config.WiFi.Dhcp = true;
|
|
||||||
} else {
|
|
||||||
config.WiFi.Dhcp = false;
|
|
||||||
}
|
|
||||||
config.WiFi.ApTimeout = root["aptimeout"].as<uint>();
|
|
||||||
config.Mdns.Enabled = root["mdnsenabled"].as<bool>();
|
|
||||||
}
|
}
|
||||||
|
config.WiFi.ApTimeout = root["aptimeout"].as<uint>();
|
||||||
|
config.Mdns.Enabled = root["mdnsenabled"].as<bool>();
|
||||||
|
|
||||||
WebApi.writeConfig(retMsg);
|
WebApi.writeConfig(retMsg);
|
||||||
|
|
||||||
|
|||||||
@ -135,17 +135,13 @@ void WebApiNtpClass::onNtpAdminPost(AsyncWebServerRequest* request)
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
{
|
CONFIG_T& config = Configuration.get();
|
||||||
auto guard = Configuration.getWriteGuard();
|
strlcpy(config.Ntp.Server, root["ntp_server"].as<String>().c_str(), sizeof(config.Ntp.Server));
|
||||||
auto& config = guard.getConfig();
|
strlcpy(config.Ntp.Timezone, root["ntp_timezone"].as<String>().c_str(), sizeof(config.Ntp.Timezone));
|
||||||
|
strlcpy(config.Ntp.TimezoneDescr, root["ntp_timezone_descr"].as<String>().c_str(), sizeof(config.Ntp.TimezoneDescr));
|
||||||
strlcpy(config.Ntp.Server, root["ntp_server"].as<String>().c_str(), sizeof(config.Ntp.Server));
|
config.Ntp.Latitude = root["latitude"].as<double>();
|
||||||
strlcpy(config.Ntp.Timezone, root["ntp_timezone"].as<String>().c_str(), sizeof(config.Ntp.Timezone));
|
config.Ntp.Longitude = root["longitude"].as<double>();
|
||||||
strlcpy(config.Ntp.TimezoneDescr, root["ntp_timezone_descr"].as<String>().c_str(), sizeof(config.Ntp.TimezoneDescr));
|
config.Ntp.SunsetType = root["sunsettype"].as<uint8_t>();
|
||||||
config.Ntp.Latitude = root["latitude"].as<double>();
|
|
||||||
config.Ntp.Longitude = root["longitude"].as<double>();
|
|
||||||
config.Ntp.SunsetType = root["sunsettype"].as<uint8_t>();
|
|
||||||
}
|
|
||||||
|
|
||||||
WebApi.writeConfig(retMsg);
|
WebApi.writeConfig(retMsg);
|
||||||
|
|
||||||
|
|||||||
@ -64,13 +64,9 @@ void WebApiSecurityClass::onSecurityPost(AsyncWebServerRequest* request)
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
{
|
CONFIG_T& config = Configuration.get();
|
||||||
auto guard = Configuration.getWriteGuard();
|
strlcpy(config.Security.Password, root["password"].as<String>().c_str(), sizeof(config.Security.Password));
|
||||||
auto& config = guard.getConfig();
|
config.Security.AllowReadonly = root["allow_readonly"].as<bool>();
|
||||||
|
|
||||||
strlcpy(config.Security.Password, root["password"].as<String>().c_str(), sizeof(config.Security.Password));
|
|
||||||
config.Security.AllowReadonly = root["allow_readonly"].as<bool>();
|
|
||||||
}
|
|
||||||
|
|
||||||
WebApi.writeConfig(retMsg);
|
WebApi.writeConfig(retMsg);
|
||||||
|
|
||||||
|
|||||||
@ -52,20 +52,6 @@ void WebApiSysstatusClass::onSystemStatus(AsyncWebServerRequest* request)
|
|||||||
root["chipcores"] = ESP.getChipCores();
|
root["chipcores"] = ESP.getChipCores();
|
||||||
root["flashsize"] = ESP.getFlashChipSize();
|
root["flashsize"] = ESP.getFlashChipSize();
|
||||||
|
|
||||||
JsonArray taskDetails = root["task_details"].to<JsonArray>();
|
|
||||||
static std::array<char const*, 12> constexpr task_names = {
|
|
||||||
"IDLE0", "IDLE1", "wifi", "tiT", "loopTask", "async_tcp", "mqttclient",
|
|
||||||
"HUAWEI_CAN_0", "PM:SDM", "PM:HTTP+JSON", "PM:SML", "PM:HTTP+SML"
|
|
||||||
};
|
|
||||||
for (char const* task_name : task_names) {
|
|
||||||
TaskHandle_t const handle = xTaskGetHandle(task_name);
|
|
||||||
if (!handle) { continue; }
|
|
||||||
JsonObject task = taskDetails.add<JsonObject>();
|
|
||||||
task["name"] = task_name;
|
|
||||||
task["stack_watermark"] = uxTaskGetStackHighWaterMark(handle);
|
|
||||||
task["priority"] = uxTaskPriorityGet(handle);
|
|
||||||
}
|
|
||||||
|
|
||||||
String reason;
|
String reason;
|
||||||
reason = ResetReason::get_reset_reason_verbose(0);
|
reason = ResetReason::get_reset_reason_verbose(0);
|
||||||
root["resetreason_0"] = reason;
|
root["resetreason_0"] = reason;
|
||||||
|
|||||||
@ -10,10 +10,6 @@
|
|||||||
#include "defaults.h"
|
#include "defaults.h"
|
||||||
#include <AsyncJson.h>
|
#include <AsyncJson.h>
|
||||||
|
|
||||||
#ifndef PIN_MAPPING_REQUIRED
|
|
||||||
#define PIN_MAPPING_REQUIRED 0
|
|
||||||
#endif
|
|
||||||
|
|
||||||
WebApiWsLiveClass::WebApiWsLiveClass()
|
WebApiWsLiveClass::WebApiWsLiveClass()
|
||||||
: _ws("/livedata")
|
: _ws("/livedata")
|
||||||
, _wsCleanupTask(1 * TASK_SECOND, TASK_FOREVER, std::bind(&WebApiWsLiveClass::wsCleanupTaskCb, this))
|
, _wsCleanupTask(1 * TASK_SECOND, TASK_FOREVER, std::bind(&WebApiWsLiveClass::wsCleanupTaskCb, this))
|
||||||
@ -129,8 +125,6 @@ void WebApiWsLiveClass::generateCommonJsonResponse(JsonVariant& root)
|
|||||||
hintObj["time_sync"] = !getLocalTime(&timeinfo, 5);
|
hintObj["time_sync"] = !getLocalTime(&timeinfo, 5);
|
||||||
hintObj["radio_problem"] = (Hoymiles.getRadioNrf()->isInitialized() && (!Hoymiles.getRadioNrf()->isConnected() || !Hoymiles.getRadioNrf()->isPVariant())) || (Hoymiles.getRadioCmt()->isInitialized() && (!Hoymiles.getRadioCmt()->isConnected()));
|
hintObj["radio_problem"] = (Hoymiles.getRadioNrf()->isInitialized() && (!Hoymiles.getRadioNrf()->isConnected() || !Hoymiles.getRadioNrf()->isPVariant())) || (Hoymiles.getRadioCmt()->isInitialized() && (!Hoymiles.getRadioCmt()->isConnected()));
|
||||||
hintObj["default_password"] = strcmp(Configuration.get().Security.Password, ACCESS_POINT_PASSWORD) == 0;
|
hintObj["default_password"] = strcmp(Configuration.get().Security.Password, ACCESS_POINT_PASSWORD) == 0;
|
||||||
|
|
||||||
hintObj["pin_mapping_issue"] = PIN_MAPPING_REQUIRED && !PinMapping.isMappingSelected();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void WebApiWsLiveClass::generateInverterCommonJsonResponse(JsonObject& root, std::shared_ptr<InverterAbstract> inv)
|
void WebApiWsLiveClass::generateInverterCommonJsonResponse(JsonObject& root, std::shared_ptr<InverterAbstract> inv)
|
||||||
|
|||||||
38
src/main.cpp
38
src/main.cpp
@ -5,7 +5,6 @@
|
|||||||
#include "Configuration.h"
|
#include "Configuration.h"
|
||||||
#include "Datastore.h"
|
#include "Datastore.h"
|
||||||
#include "Display_Graphic.h"
|
#include "Display_Graphic.h"
|
||||||
#include "I18n.h"
|
|
||||||
#include "InverterSettings.h"
|
#include "InverterSettings.h"
|
||||||
#include "Led_Single.h"
|
#include "Led_Single.h"
|
||||||
#include "MessageOutput.h"
|
#include "MessageOutput.h"
|
||||||
@ -25,9 +24,11 @@
|
|||||||
#include "defaults.h"
|
#include "defaults.h"
|
||||||
#include <Arduino.h>
|
#include <Arduino.h>
|
||||||
#include <LittleFS.h>
|
#include <LittleFS.h>
|
||||||
#include <SpiManager.h>
|
|
||||||
#include <TaskScheduler.h>
|
#include <TaskScheduler.h>
|
||||||
#include <esp_heap_caps.h>
|
#include <esp_heap_caps.h>
|
||||||
|
#include <SpiManager.h>
|
||||||
|
|
||||||
|
#include <driver/uart.h>
|
||||||
|
|
||||||
void setup()
|
void setup()
|
||||||
{
|
{
|
||||||
@ -42,8 +43,10 @@ void setup()
|
|||||||
|
|
||||||
// Initialize serial output
|
// Initialize serial output
|
||||||
Serial.begin(SERIAL_BAUDRATE);
|
Serial.begin(SERIAL_BAUDRATE);
|
||||||
#if !ARDUINO_USB_CDC_ON_BOOT
|
#if ARDUINO_USB_CDC_ON_BOOT
|
||||||
// Only wait for serial interface to be set up when not using CDC
|
Serial.setTxTimeoutMs(0);
|
||||||
|
delay(100);
|
||||||
|
#else
|
||||||
while (!Serial)
|
while (!Serial)
|
||||||
yield();
|
yield();
|
||||||
#endif
|
#endif
|
||||||
@ -65,9 +68,10 @@ void setup()
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Read configuration values
|
// Read configuration values
|
||||||
Configuration.init(scheduler);
|
|
||||||
MessageOutput.print("Reading configuration... ");
|
MessageOutput.print("Reading configuration... ");
|
||||||
if (!Configuration.read()) {
|
if (!Configuration.read()) {
|
||||||
|
MessageOutput.print("initializing... ");
|
||||||
|
Configuration.init();
|
||||||
if (Configuration.write()) {
|
if (Configuration.write()) {
|
||||||
MessageOutput.print("written... ");
|
MessageOutput.print("written... ");
|
||||||
} else {
|
} else {
|
||||||
@ -81,14 +85,9 @@ void setup()
|
|||||||
auto& config = Configuration.get();
|
auto& config = Configuration.get();
|
||||||
MessageOutput.println("done");
|
MessageOutput.println("done");
|
||||||
|
|
||||||
// Read languate pack
|
|
||||||
MessageOutput.print("Reading language pack... ");
|
|
||||||
I18n.init(scheduler);
|
|
||||||
MessageOutput.println("done");
|
|
||||||
|
|
||||||
// Load PinMapping
|
// Load PinMapping
|
||||||
MessageOutput.print("Reading PinMapping... ");
|
MessageOutput.print("Reading PinMapping... ");
|
||||||
if (PinMapping.init(Configuration.get().Dev_PinMapping)) {
|
if (PinMapping.init(String(Configuration.get().Dev_PinMapping))) {
|
||||||
MessageOutput.print("found valid mapping ");
|
MessageOutput.print("found valid mapping ");
|
||||||
} else {
|
} else {
|
||||||
MessageOutput.print("using default config ");
|
MessageOutput.print("using default config ");
|
||||||
@ -96,7 +95,7 @@ void setup()
|
|||||||
const auto& pin = PinMapping.get();
|
const auto& pin = PinMapping.get();
|
||||||
MessageOutput.println("done");
|
MessageOutput.println("done");
|
||||||
|
|
||||||
// Initialize Network
|
// Initialize WiFi
|
||||||
MessageOutput.print("Initialize Network... ");
|
MessageOutput.print("Initialize Network... ");
|
||||||
NetworkSettings.init(scheduler);
|
NetworkSettings.init(scheduler);
|
||||||
MessageOutput.println("done");
|
MessageOutput.println("done");
|
||||||
@ -140,7 +139,7 @@ void setup()
|
|||||||
Display.enablePowerSafe = config.Display.PowerSafe;
|
Display.enablePowerSafe = config.Display.PowerSafe;
|
||||||
Display.enableScreensaver = config.Display.ScreenSaver;
|
Display.enableScreensaver = config.Display.ScreenSaver;
|
||||||
Display.setContrast(config.Display.Contrast);
|
Display.setContrast(config.Display.Contrast);
|
||||||
Display.setLocale(config.Display.Locale);
|
Display.setLanguage(config.Display.Language);
|
||||||
Display.setStartupDisplay();
|
Display.setStartupDisplay();
|
||||||
MessageOutput.println("done");
|
MessageOutput.println("done");
|
||||||
|
|
||||||
@ -149,6 +148,19 @@ void setup()
|
|||||||
LedSingle.init(scheduler);
|
LedSingle.init(scheduler);
|
||||||
MessageOutput.println("done");
|
MessageOutput.println("done");
|
||||||
|
|
||||||
|
// Check for default DTU serial
|
||||||
|
MessageOutput.print("Check for default DTU serial... ");
|
||||||
|
if (config.Dtu.Serial == DTU_SERIAL) {
|
||||||
|
MessageOutput.print("generate serial based on ESP chip id: ");
|
||||||
|
const uint64_t dtuId = Utils::generateDtuSerial();
|
||||||
|
MessageOutput.printf("%0" PRIx32 "%08" PRIx32 "... ",
|
||||||
|
((uint32_t)((dtuId >> 32) & 0xFFFFFFFF)),
|
||||||
|
((uint32_t)(dtuId & 0xFFFFFFFF)));
|
||||||
|
config.Dtu.Serial = dtuId;
|
||||||
|
Configuration.write();
|
||||||
|
}
|
||||||
|
MessageOutput.println("done");
|
||||||
|
|
||||||
InverterSettings.init(scheduler);
|
InverterSettings.init(scheduler);
|
||||||
|
|
||||||
Datastore.init(scheduler);
|
Datastore.init(scheduler);
|
||||||
|
|||||||
2
webapp/env.d.ts
vendored
2
webapp/env.d.ts
vendored
@ -1,7 +1,7 @@
|
|||||||
/// <reference types="vite/client" />
|
/// <reference types="vite/client" />
|
||||||
|
|
||||||
import { Router, Route } from 'vue-router'
|
import { Router, Route } from 'vue-router'
|
||||||
declare module 'vue' {
|
declare module '@vue/runtime-core' {
|
||||||
interface ComponentCustomProperties {
|
interface ComponentCustomProperties {
|
||||||
$router: Router
|
$router: Router
|
||||||
$route: Route
|
$route: Route
|
||||||
|
|||||||
@ -17,35 +17,35 @@
|
|||||||
"bootstrap": "^5.3.3",
|
"bootstrap": "^5.3.3",
|
||||||
"bootstrap-icons-vue": "^1.11.3",
|
"bootstrap-icons-vue": "^1.11.3",
|
||||||
"mitt": "^3.0.1",
|
"mitt": "^3.0.1",
|
||||||
"sortablejs": "^1.15.6",
|
"sortablejs": "^1.15.3",
|
||||||
"spark-md5": "^3.0.2",
|
"spark-md5": "^3.0.2",
|
||||||
"vue": "^3.5.13",
|
"vue": "^3.5.11",
|
||||||
"vue-i18n": "11.0.1",
|
"vue-i18n": "9.13.1",
|
||||||
"vue-router": "^4.5.0"
|
"vue-router": "^4.4.5"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@intlify/unplugin-vue-i18n": "^6.0.3",
|
"@intlify/unplugin-vue-i18n": "^4.0.0",
|
||||||
"@tsconfig/node22": "^22.0.0",
|
"@tsconfig/node22": "^22.0.0",
|
||||||
"@types/bootstrap": "^5.2.10",
|
"@types/bootstrap": "^5.2.10",
|
||||||
"@types/node": "^22.10.6",
|
"@types/node": "^22.7.4",
|
||||||
"@types/pulltorefreshjs": "^0.1.7",
|
"@types/pulltorefreshjs": "^0.1.7",
|
||||||
"@types/sortablejs": "^1.15.8",
|
"@types/sortablejs": "^1.15.8",
|
||||||
"@types/spark-md5": "^3.0.5",
|
"@types/spark-md5": "^3.0.4",
|
||||||
"@vitejs/plugin-vue": "^5.2.1",
|
"@vitejs/plugin-vue": "^5.1.4",
|
||||||
"@vue/eslint-config-typescript": "^14.3.0",
|
"@vue/eslint-config-typescript": "^14.0.0",
|
||||||
"@vue/tsconfig": "^0.7.0",
|
"@vue/tsconfig": "^0.5.1",
|
||||||
"eslint": "^9.18.0",
|
"eslint": "^9.12.0",
|
||||||
"eslint-plugin-vue": "^9.32.0",
|
"eslint-plugin-vue": "^9.28.0",
|
||||||
"npm-run-all": "^4.1.5",
|
"npm-run-all": "^4.1.5",
|
||||||
"prettier": "^3.4.2",
|
"prettier": "^3.3.3",
|
||||||
"pulltorefreshjs": "^0.1.22",
|
"pulltorefreshjs": "^0.1.22",
|
||||||
"sass": "=1.77.6",
|
"sass": "^1.77.6",
|
||||||
"terser": "^5.37.0",
|
"terser": "^5.34.1",
|
||||||
"typescript": "~5.6.3",
|
"typescript": "^5.6.2",
|
||||||
"vite": "^6.0.7",
|
"vite": "^5.4.8",
|
||||||
"vite-plugin-compression": "^0.5.1",
|
"vite-plugin-compression": "^0.5.1",
|
||||||
"vite-plugin-css-injected-by-js": "^3.5.2",
|
"vite-plugin-css-injected-by-js": "^3.5.2",
|
||||||
"vue-tsc": "^2.2.0"
|
"vue-tsc": "^2.1.6"
|
||||||
},
|
},
|
||||||
"packageManager": "yarn@1.22.22+sha512.a6b2f7906b721bba3d67d4aff083df04dad64c399707841b7acf00f6b133b7ac24255f2652fa22ae3534329dc6180534e98d17432037ff6fd140556e2bb3137e"
|
"packageManager": "yarn@1.22.22+sha512.a6b2f7906b721bba3d67d4aff083df04dad64c399707841b7acf00f6b133b7ac24255f2652fa22ae3534329dc6180534e98d17432037ff6fd140556e2bb3137e"
|
||||||
}
|
}
|
||||||
|
|||||||
@ -18,7 +18,7 @@ export default defineComponent({
|
|||||||
<style>
|
<style>
|
||||||
/* Show it is fixed to the top */
|
/* Show it is fixed to the top */
|
||||||
body {
|
body {
|
||||||
padding-bottom: 1rem;
|
min-height: 75rem;
|
||||||
padding-top: 4.5rem;
|
padding-top: 4.5rem;
|
||||||
}
|
}
|
||||||
</style>
|
</style>
|
||||||
|
|||||||
@ -1,9 +1,9 @@
|
|||||||
<template>
|
<template>
|
||||||
<div :class="{ 'container-xxl': !isWideScreen, 'container-fluid': isWideScreen }" role="main">
|
<div :class="{ 'container-xxl': !isWideScreen, 'container-fluid': isWideScreen }" role="main">
|
||||||
<div class="page-header">
|
<div class="page-header">
|
||||||
<div class="row mb-3">
|
<div class="row">
|
||||||
<div :class="'align-content-center ' + (showReload ? 'col-10' : 'col-12')">
|
<div class="col-sm-11">
|
||||||
<h1 class="mb-0">
|
<h1>
|
||||||
{{ title }}
|
{{ title }}
|
||||||
<span
|
<span
|
||||||
v-if="showWebSocket"
|
v-if="showWebSocket"
|
||||||
@ -14,10 +14,10 @@
|
|||||||
></span>
|
></span>
|
||||||
</h1>
|
</h1>
|
||||||
</div>
|
</div>
|
||||||
<div class="col-2 align-content-center" v-if="showReload">
|
<div class="col-sm-1" v-if="showReload">
|
||||||
<button
|
<button
|
||||||
type="button"
|
type="button"
|
||||||
class="float-end btn btn-outline-primary fs-5"
|
class="float-end btn btn-outline-primary"
|
||||||
@click="$emit('reload')"
|
@click="$emit('reload')"
|
||||||
v-tooltip
|
v-tooltip
|
||||||
:title="$t('base.Reload')"
|
:title="$t('base.Reload')"
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
<template>
|
<template>
|
||||||
<div :class="['card', table ? 'card-table' : '', addSpace ? 'mt-5' : '']">
|
<div :class="['card', addSpace ? 'mt-5' : '']">
|
||||||
<div :class="['card-header', textVariant]">{{ text }}</div>
|
<div :class="['card-header', textVariant]">{{ text }}</div>
|
||||||
<div :class="['card-body', 'card-text', centerContent ? 'text-center' : '']">
|
<div :class="['card-body', 'card-text', centerContent ? 'text-center' : '']">
|
||||||
<slot />
|
<slot />
|
||||||
@ -14,7 +14,6 @@ export default defineComponent({
|
|||||||
props: {
|
props: {
|
||||||
text: String,
|
text: String,
|
||||||
textVariant: String,
|
textVariant: String,
|
||||||
table: Boolean,
|
|
||||||
addSpace: Boolean,
|
addSpace: Boolean,
|
||||||
centerContent: Boolean,
|
centerContent: Boolean,
|
||||||
},
|
},
|
||||||
|
|||||||
@ -46,12 +46,6 @@
|
|||||||
<td>{{ $t('devinfo.HardwareVersion') }}</td>
|
<td>{{ $t('devinfo.HardwareVersion') }}</td>
|
||||||
<td>{{ devInfoList.hw_version }}</td>
|
<td>{{ devInfoList.hw_version }}</td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
|
||||||
<td>{{ $t('devinfo.SupportsPowerDistributionLogic') }}</td>
|
|
||||||
<td>
|
|
||||||
<StatusBadge :status="devInfoList.pdl_supported" true_text="devinfo.Yes" false_text="devinfo.No" />
|
|
||||||
</td>
|
|
||||||
</tr>
|
|
||||||
</tbody>
|
</tbody>
|
||||||
</table>
|
</table>
|
||||||
</template>
|
</template>
|
||||||
@ -59,7 +53,6 @@
|
|||||||
<script lang="ts">
|
<script lang="ts">
|
||||||
import BootstrapAlert from '@/components/BootstrapAlert.vue';
|
import BootstrapAlert from '@/components/BootstrapAlert.vue';
|
||||||
import type { DevInfoStatus } from '@/types/DevInfoStatus';
|
import type { DevInfoStatus } from '@/types/DevInfoStatus';
|
||||||
import StatusBadge from '@/components/StatusBadge.vue';
|
|
||||||
import { BIconInfoSquare } from 'bootstrap-icons-vue';
|
import { BIconInfoSquare } from 'bootstrap-icons-vue';
|
||||||
import { defineComponent, type PropType } from 'vue';
|
import { defineComponent, type PropType } from 'vue';
|
||||||
|
|
||||||
@ -67,7 +60,6 @@ export default defineComponent({
|
|||||||
components: {
|
components: {
|
||||||
BootstrapAlert,
|
BootstrapAlert,
|
||||||
BIconInfoSquare,
|
BIconInfoSquare,
|
||||||
StatusBadge,
|
|
||||||
},
|
},
|
||||||
props: {
|
props: {
|
||||||
devInfoList: { type: Object as PropType<DevInfoStatus>, required: true },
|
devInfoList: { type: Object as PropType<DevInfoStatus>, required: true },
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
<template>
|
<template>
|
||||||
<CardElement :text="$t('firmwareinfo.FirmwareInformation')" textVariant="text-bg-primary" table>
|
<CardElement :text="$t('firmwareinfo.FirmwareInformation')" textVariant="text-bg-primary">
|
||||||
<div class="table-responsive">
|
<div class="table-responsive">
|
||||||
<table class="table table-hover table-condensed">
|
<table class="table table-hover table-condensed">
|
||||||
<tbody>
|
<tbody>
|
||||||
|
|||||||
@ -7,9 +7,3 @@
|
|||||||
<button type="submit" class="btn btn-primary">{{ $t('base.Save') }}</button>
|
<button type="submit" class="btn btn-primary">{{ $t('base.Save') }}</button>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script lang="ts">
|
|
||||||
export default {
|
|
||||||
emits: ['reload'],
|
|
||||||
};
|
|
||||||
</script>
|
|
||||||
|
|||||||
@ -19,11 +19,7 @@
|
|||||||
</table>
|
</table>
|
||||||
|
|
||||||
<div class="accordion" id="accordionProfile">
|
<div class="accordion" id="accordionProfile">
|
||||||
<div
|
<div class="accordion-item" v-for="(section, index) in gridProfileList.sections" :key="index">
|
||||||
class="accordion-item accordion-table"
|
|
||||||
v-for="(section, index) in gridProfileList.sections"
|
|
||||||
:key="index"
|
|
||||||
>
|
|
||||||
<h2 class="accordion-header">
|
<h2 class="accordion-header">
|
||||||
<button
|
<button
|
||||||
class="accordion-button collapsed"
|
class="accordion-button collapsed"
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
<template>
|
<template>
|
||||||
<CardElement :text="$t('hardwareinfo.HardwareInformation')" textVariant="text-bg-primary" table>
|
<CardElement :text="$t('hardwareinfo.HardwareInformation')" textVariant="text-bg-primary">
|
||||||
<div class="table-responsive">
|
<div class="table-responsive">
|
||||||
<table class="table table-hover table-condensed">
|
<table class="table table-hover table-condensed">
|
||||||
<tbody>
|
<tbody>
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
<template>
|
<template>
|
||||||
<CardElement :text="$t('heapdetails.HeapDetails')" textVariant="text-bg-primary" table>
|
<CardElement :text="$t('heapdetails.HeapDetails')" textVariant="text-bg-primary">
|
||||||
<div class="table-responsive">
|
<div class="table-responsive">
|
||||||
<table class="table table-hover table-condensed">
|
<table class="table table-hover table-condensed">
|
||||||
<tbody>
|
<tbody>
|
||||||
|
|||||||
@ -1,36 +1,16 @@
|
|||||||
<template>
|
<template>
|
||||||
<BootstrapAlert :show="hints.radio_problem" variant="danger">
|
<BootstrapAlert :show="hints.radio_problem" variant="danger">
|
||||||
<div class="d-flex">
|
<BIconBroadcast class="fs-4" /> {{ $t('hints.RadioProblem') }}
|
||||||
<div class="align-content-center"><BIconBroadcast class="fs-4" /></div>
|
|
||||||
<div class="align-content-center ms-3">{{ $t('hints.RadioProblem') }}</div>
|
|
||||||
</div>
|
|
||||||
</BootstrapAlert>
|
</BootstrapAlert>
|
||||||
|
|
||||||
<BootstrapAlert :show="hints.time_sync" variant="danger">
|
<BootstrapAlert :show="hints.time_sync" variant="danger">
|
||||||
<div class="d-flex">
|
<BIconClock class="fs-4" /> {{ $t('hints.TimeSync') }}
|
||||||
<div class="align-content-center"><BIconClock class="fs-4" /></div>
|
<a @click="gotoTimeSettings" href="#" class="alert-link">{{ $t('hints.TimeSyncLink') }}</a>
|
||||||
<div class="align-content-center ms-3">
|
|
||||||
{{ $t('hints.TimeSync') }}
|
|
||||||
<a @click="gotoTimeSettings" href="#" class="alert-link">{{ $t('hints.TimeSyncLink') }}</a>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</BootstrapAlert>
|
</BootstrapAlert>
|
||||||
|
|
||||||
<BootstrapAlert :show="hints.default_password" variant="danger">
|
<BootstrapAlert :show="hints.default_password" variant="danger">
|
||||||
<div class="d-flex">
|
<BIconExclamationCircle class="fs-4" /> {{ $t('hints.DefaultPassword') }}
|
||||||
<div class="align-content-center"><BIconExclamationCircle class="fs-4" /></div>
|
<a @click="gotoPasswordSettings" href="#" class="alert-link">{{ $t('hints.DefaultPasswordLink') }}</a>
|
||||||
<div class="align-content-center ms-3">
|
|
||||||
{{ $t('hints.DefaultPassword') }}
|
|
||||||
<a @click="gotoPasswordSettings" href="#" class="alert-link">{{ $t('hints.DefaultPasswordLink') }}</a>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</BootstrapAlert>
|
|
||||||
|
|
||||||
<BootstrapAlert :show="hints.pin_mapping_issue" variant="warning">
|
|
||||||
<div class="d-flex">
|
|
||||||
<div class="align-content-center"><BIconExclamationCircle class="fs-4" /></div>
|
|
||||||
<div class="align-content-center ms-3" v-html="$t('hints.PinMappingIssue')"></div>
|
|
||||||
</div>
|
|
||||||
</BootstrapAlert>
|
</BootstrapAlert>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
<template>
|
<template>
|
||||||
<CardElement :text="$t('interfaceapinfo.NetworkInterface')" textVariant="text-bg-primary" table>
|
<CardElement :text="$t('interfaceapinfo.NetworkInterface')" textVariant="text-bg-primary">
|
||||||
<div class="table-responsive">
|
<div class="table-responsive">
|
||||||
<table class="table table-hover table-condensed">
|
<table class="table table-hover table-condensed">
|
||||||
<tbody>
|
<tbody>
|
||||||
|
|||||||
@ -2,7 +2,6 @@
|
|||||||
<CardElement
|
<CardElement
|
||||||
:text="$t('interfacenetworkinfo.NetworkInterface', { iface: networkStatus.network_mode })"
|
:text="$t('interfacenetworkinfo.NetworkInterface', { iface: networkStatus.network_mode })"
|
||||||
textVariant="text-bg-primary"
|
textVariant="text-bg-primary"
|
||||||
table
|
|
||||||
>
|
>
|
||||||
<div class="table-responsive">
|
<div class="table-responsive">
|
||||||
<table class="table table-hover table-condensed">
|
<table class="table table-hover table-condensed">
|
||||||
|
|||||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user