jeans/openHASP
jeans/openHASP
1
0
Fork 0
mirror of https://github.com/HASwitchPlate/openHASP.git synced 2025-07-24 11:46:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/altersis/openHASP into gpio-redesign

Browse Source
This commit is contained in:
fvanroie 2021-05-11 01:26:34 +02:00
commit c314e56d54
6 changed files with 226 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
.github/FUNDING.yml vendored
View File

@ -1,6 +1,6 @@
# These are supported funding model platforms
github: aderusha # Replace with up to 4 GitHub Sponsors-enabled usernames
github: [aderusha, bblanchon] # Replace with up to 4 GitHub Sponsors-enabled usernames
patreon: # Replace with a single Patreon username
open_collective: # Replace with a single Open Collective username
ko_fi: # Replace with a single Ko-fi username
@ -9,4 +9,7 @@ community_bridge: # Replace with a single Community Bridge project-name e.g., cl
liberapay: # Replace with a single Liberapay username
issuehunt: # Replace with a single IssueHunt username
otechie: # Replace with a single Otechie username
custom: ['https://www.buymeacoffee.com/gW5rPpsKR','https://arduinojson.org/book/'] # Up to 4 links
custom: [
"https://www.buymeacoffee.com/gW5rPpsKR",
"https://arduinojson.org/book/",
] # Up to 4 links

12
src/hasp/hasp_attribute.cpp
View File

@ -1795,10 +1795,20 @@ void hasp_process_obj_attribute(lv_obj_t* obj, const char* attr_p, const char* p
: attr_out_int(obj, attr, lv_obj_get_style_opa_scale(obj, LV_OBJ_PART_MAIN));
return; // attribute_found
case ATTR_ENABLED:
case ATTR_CLICK:
update ? lv_obj_set_click(obj, Parser::is_true(payload)) : attr_out_int(obj, attr, lv_obj_get_click(obj));
return; // attribute_found
case ATTR_ENABLED:
if(update)
if(Parser::is_true(payload))
lv_obj_clear_state(obj, LV_STATE_DISABLED);
else
lv_obj_add_state(obj, LV_STATE_DISABLED);
else
attr_out_int(obj, attr, !(lv_obj_get_state(obj, LV_BTN_PART_MAIN) & LV_STATE_DISABLED));
break; // attribute_found
case ATTR_SWIPE:
update ? (void)(obj->user_data.swipeid = Parser::is_true(payload) % 16)
: attr_out_int(obj, attr, obj->user_data.swipeid);

1
src/hasp/hasp_attribute.h
View File

@ -287,6 +287,7 @@ _HASP_ATTRIBUTE(SCALE_END_LINE_WIDTH, scale_end_line_width, lv_style_int_t)
#define ATTR_H 104
#define ATTR_OPTIONS 29886
#define ATTR_ENABLED 28193
#define ATTR_CLICK 17064
#define ATTR_OPACITY 10155
#define ATTR_TOGGLE 38580
#define ATTR_HIDDEN 11082

4
src/hasp/hasp_dispatch.cpp
View File

@ -49,7 +49,7 @@ struct moodlight_t
};
moodlight_t moodlight;
static void dispatch_config(const char* topic, const char* payload);
// static void dispatch_config(const char* topic, const char* payload);
// void dispatch_group_value(uint8_t groupid, int16_t state, lv_obj_t * obj);
/* Sends the payload out on the state/subtopic
@ -332,7 +332,7 @@ void dispatch_text_line(const char* cmnd)
#if HASP_USE_CONFIG > 0
// Get or Set a part of the config.json file
static void dispatch_config(const char* topic, const char* payload)
void dispatch_config(const char* topic, const char* payload)
{
DynamicJsonDocument doc(128 * 2);
char buffer[128 * 2];

2
src/hasp/hasp_dispatch.h
View File

@ -68,6 +68,8 @@ void dispatch_normalized_group_values(uint8_t groupid, lv_obj_t* obj, int16_t va
void dispatch_state_subtopic(const char* subtopic, const char* payload);
void dispatch_config(const char* topic, const char* payload);
/* ===== Getter and Setter Functions ===== */
/* ===== Read/Write Configuration ===== */

205
src/lang/sp_ES.h Normal file
View File

@ -0,0 +1,205 @@
#ifndef HASP_LANG_EN_US_H
#define HASP_LANG_EN_US_H
#define D_USERNAME "Usuario:"
#define D_PASSWORD "Contraseña:"
#define D_SSID "Ssid:"
#define D_YES "Si" // New
#define D_NO "No" // New
#define D_ERROR_OUT_OF_MEMORY "Memory llena"
#define D_ERROR_UNKNOWN "Error desconocido"
#define D_CONFIG_NOT_CHANGED "No hay cambios en la configuración"
#define D_CONFIG_CHANGED "Configuración cambiada"
#define D_CONFIG_LOADED "Configuración cargada"
#define D_FILE_LOADING "Cargando %s"
#define D_FILE_LOADED "%s cargado"
#define D_FILE_LOAD_FAILED "No se pudo cargar %s"
#define D_FILE_SAVING "Guardando %s"
#define D_FILE_SAVED "%s guardado"
#define D_FILE_SAVE_FAILED "No se pudo guardar %s"
#define D_FILE_NOT_FOUND "Archivo no encontrado" // new
#define D_SERVICE_STARTING "Inicializando..."
#define D_SERVICE_STARTED "Inicializado"
#define D_SERVICE_START_FAILED "No se pudo arrancar"
#define D_SERVICE_STOPPED "Parado"
#define D_SERVICE_DISABLED "Deshabilitado"
#define D_SERVICE_CONNECTED "Conectado"
#define D_SERVICE_DISCONNECTED "Desconectado"
#define D_SETTING_ENABLED "habilitado" // New
#define D_SETTING_DISABLED "Deshabilitado" // New
#define D_NETWORK_IP_ADDRESS_RECEIVED "Se recibió la dirección IP: %s"
#define D_NETWORK_ONLINE "en linea"
#define D_NETWORK_OFFLINE "fuera de línea"
#define D_NETWORK_CONNECTION_FAILED "Falló la conexión"
#define D_MQTT_DEFAULT_NAME "placa_%s"
#define D_MQTT_CONNECTING "Conectando..."
#define D_MQTT_CONNECTED "Conectado al Broker %s con el clientID %s"
#define D_MQTT_NOT_CONNECTED "No hay conexión ???"
#define D_MQTT_DISCONNECTING "Desconectando..."
#define D_MQTT_DISCONNECTED "Desconectado"
#define D_MQTT_RECONNECTING "Desconectado del broker, reconectando..."
#define D_MQTT_NOT_CONFIGURED "No se ha configurado el Broker"
#define D_MQTT_STARTED "Arrancando: %d bytes"
#define D_MQTT_FAILED "Falló:"
#define D_MQTT_INVALID_TOPIC "El mensaje tiene un tópico inválido"
#define D_MQTT_SUBSCRIBED "Subscrito a %s"
#define D_MQTT_NOT_SUBSCRIBED "No se pudo subscribir a %s"
#define D_MQTT_HA_AUTO_DISCOVERY "Registrando auto-descubrimiento en HA"
#define D_MQTT_PAYLOAD_TOO_LONG "Los datos enviados son demasiado largos(%u bytes)"
#define D_TELNET_CLOSING_CONNECTION "Cerrando sesión de %s"
#define D_TELNET_CLIENT_LOGIN_FROM "Se ha firmado el cliente %s"
#define D_TELNET_CLIENT_CONNECT_FROM "Se ha conectado el cliente %s"
#define D_TELNET_AUTHENTICATION_FAILED "Falló la autorización!"
#define D_TELNET_INCORRECT_LOGIN_ATTEMPT "Intento de conexión incorrecta desde %s"
#define D_TELNET_STARTED "Console Telnet arrancada"
#define D_TELNET_FAILED "Falló el arranque de la consola Telnet"
#define D_TELNET_CLIENT_CONNECTED "Cliente conectado"
#define D_TELNET_CLIENT_NOT_CONNECTED "Cliente NO conectado"
#define D_TELNET_CLIENT_REJECTED "Cliente rechazado"
#define D_HASP_INVALID_PAGE "Página inválida %u"
#define D_HASP_INVALID_LAYER "No se puede borrar una capa del sistema"
#define D_HASP_CHANGE_PAGE "Cambiando a página %u"
#define D_HASP_CLEAR_PAGE "Limpiando página %u"
#define D_OBJECT_DELETED "Objeto borrado"
#define D_OBJECT_UNKNOWN "Objeto desconocido"
#define D_OBJECT_MISMATCH "Los objetos NO SON IGUALES!"
#define D_OBJECT_LOST "Objeto perdido!"
#define D_OBJECT_CREATE_FAILED "No se pudo crear objeto %u"
#define D_OBJECT_PAGE_UNKNOWN "La página ID %u no está definida"
#define D_OBJECT_EVENT_UNKNOWN "NO se conoce el evento %d "
#define D_ATTRIBUTE_UNKNOWN "Propiedad %s desconocida"
#define D_ATTRIBUTE_READ_ONLY "%s es solo lectura"
#define D_ATTRIBUTE_PAGE_METHOD_INVALID "No se puede llamar %s en una página"
#define D_OOBE_SSID_VALIDATED "SSID %s validado"
#define D_OOBE_AUTO_CALIBRATE "Auto calibración hablitada"
#define D_OOBE_CALIBRATED "Ya se ha calibrado"
#define D_DISPATCH_COMMAND_NOT_FOUND "No se encontró el comando '%s'"
#define D_DISPATCH_INVALID_PAGE "Página inválida %s"
#define D_DISPATCH_REBOOT "Reiniciando microprocesador!"
#define D_JSON_FAILED "No se pudo analizar JSON:"
#define D_JSONL_FAILED "El análisis del JSONL falló en la línea %u"
#define D_JSONL_SUCCEEDED "JSONL analizado"
#define D_OTA_CHECK_UPDATE "Buscando actualización en URL: %s"
#define D_OTA_CHECK_COMPLETE "Verificación de actualizacion completa"
#define D_OTA_CHECK_FAILED "Falló la verificación de actualización: %s"
#define D_OTA_UPDATE_FIRMWARE "Actualización de firmware OTA"
#define D_OTA_UPDATE_COMPLETE "Actualización OTA completada"
#define D_OTA_UPDATE_APPLY "Aplicando el nuevo firmware y reinicio"
#define D_OTA_UPDATE_FAILED "La actualización OTA falló"
#define D_OTA_UPDATING_FIRMWARE "Actualizando el firmware..."
#define D_OTA_UPDATING_FILESYSTEM "Actualizando el sistema de archivos..."
#define D_HTTP_HASP_DESIGN "Diseño de HASP"
#define D_HTTP_INFORMATION "Información"
#define D_HTTP_HTTP_SETTINGS "Ajustes HTTP"
#define D_HTTP_WIFI_SETTINGS "Ajustes Wifi"
#define D_HTTP_MQTT_SETTINGS "Ajustes MQTT"
#define D_HTTP_GPIO_SETTINGS "Ajustes GPIO"
#define D_HTTP_MDNS_SETTINGS "Ajustes mDNS"
#define D_HTTP_TELNET_SETTINGS "Ajustes Telnet"
#define D_HTTP_DEBUG_SETTINGS "Ajustes de depuración"
#define D_HTTP_GUI_SETTINGS "Ajustes de Pantalla"
#define D_HTTP_SAVE_SETTINGS "Guardar configuración"
#define D_HTTP_UPLOAD_FILE "Cargar archivo"
#define D_HTTP_ERASE_DEVICE "Borrar configuración"
#define D_HTTP_ADD_GPIO "Agragar un nuevo pin"
#define D_HTTP_BACK "Atrás"
#define D_HTTP_REFRESH "Refrescar"
#define D_HTTP_PREV_PAGE "Página Previa"
#define D_HTTP_NEXT_PAGE "Siguiente Página"
#define D_HTTP_CALIBRATE "Calibrar"
#define D_HTTP_SCREENSHOT "Imagen de Pantalla"
#define D_HTTP_FILE_BROWSER "Editor de Archivos"
#define D_HTTP_FIRMWARE_UPGRADE "Actualización de firmware"
#define D_HTTP_UPDATE_FIRMWARE "Actualizar firmware"
#define D_HTTP_FACTORY_RESET "Restaurar conf de fábrica"
#define D_HTTP_MAIN_MENU "Menú principal"
#define D_HTTP_REBOOT "Reiniciar"
#define D_HTTP_CONFIGURATION "Configuración"
#define D_HTTP_SENDING_PAGE "Se envió pagina %S a %s" // New
#define D_HTTP_FOOTER "por Francis Van Roie"
#define D_INFO_VERSION "Versión"
#define D_INFO_BUILD_DATETIME "Fecha de compilación"
#define D_INFO_UPTIME "Tiempo activo"
#define D_INFO_FREE_HEAP "Heap libre"
#define D_INFO_FREE_BLOCK "Bloques libres"
#define D_INFO_DEVICE_MEMORY "Memoria de dispositivo"
#define D_INFO_LVGL_MEMORY "Memoria LVGL"
#define D_INFO_TOTAL_MEMORY "Total"
#define D_INFO_FREE_MEMORY "Libre"
#define D_INFO_FRAGMENTATION "Fragmentación"
#define D_INFO_PSRAM_FREE "PSRam libre"
#define D_INFO_PSRAM_SIZE "Tamaño PSRam "
#define D_INFO_FLASH_SIZE "Tamaño Flash"
#define D_INFO_SKETCH_USED "Memoria programa usada"
#define D_INFO_SKETCH_FREE "Memoria Programa libre"
#define D_INFO_MODULE "Módulo"
#define D_INFO_MODEL "Modelo"
#define D_INFO_FREQUENCY "Frecuencia"
#define D_INFO_CORE_VERSION "Versión del núcleo"
#define D_INFO_RESET_REASON "Razón de ultimo Reset"
#define D_INFO_STATUS "Estado"
#define D_INFO_SERVER "Servidor"
#define D_INFO_USERNAME "Nombre de usuario"
#define D_INFO_CLIENTID "ID de Cliente"
#define D_INFO_CONNECTED "Connectado"
#define D_INFO_DISCONNECTED "Desconectado"
#define D_INFO_RECEIVED "Recivido"
#define D_INFO_PUBLISHED "Publicado"
#define D_INFO_FAILED "Fallado"
#define D_INFO_ETHERNET "Ethernet"
#define D_INFO_WIFI "Wifi"
#define D_INFO_LINK_SPEED "Velocidad de enlace"
#define D_INFO_FULL_DUPLEX "Full Duplex"
#define D_INFO_SSID "SSID"
#define D_INFO_RSSI "Potencia de señal"
#define D_INFO_IP_ADDRESS "Dirección IP"
#define D_INFO_MAC_ADDRESS "Dirección MAC"
#define D_INFO_GATEWAY "Gateway"
#define D_INFO_DNS_SERVER "Servidor DNS"
#define D_OOBE_MSG "Toque la pantalla para ajustar WiFi o conectarse a un punto de acceso"
#define D_OOBE_SCAN_TO_CONNECT "Scanee para conectar"
#define D_WIFI_CONNECTING_TO "Connectando a %s"
#define D_WIFI_CONNECTED_TO "Connectado a %s, pidiendo IP..."
#define D_WIFI_RSSI_EXCELLENT "Excellente"
#define D_WIFI_RSSI_GOOD "Buena"
#define D_WIFI_RSSI_FAIR "Pasable"
#define D_WIFI_RSSI_WEAK "Débil"
#define D_WIFI_RSSI_BAD "Muy baka"
// new
#define D_GPIO_SWITCH "Switch"
#define D_GPIO_BUTTON "Botón"
#define D_GPIO_LED "DEL"
#define D_GPIO_LED_R "Ánimo Red"
#define D_GPIO_LED_G "Ánimo Green"
#define D_GPIO_LED_B "Ánimo Blue"
#define D_GPIO_RELAY "Relé"
#define D_GPIO_PWM "PWM"
#define D_GPIO_DAC "DAC"
#define D_GPIO_SERIAL_DIMMER "Atenuador serial"
#define D_GPIO_UNKNOWN "Desconocido"
#define D_GPIO_PIN "Pin"
#define D_GPIO_GROUP "Grupo"
#define D_GPIO_GROUP_NONE "Ninguno"
#endif