-
Notifications
You must be signed in to change notification settings - Fork 45
Replaced D'n'D component, rework of network settings, enhanced a couple of UI components, some minor fixes #100
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
- Implemented a new page for managing sensors in the frontend. - Created an EditSensor component for editing sensor details with validation. - Developed ControllerSettingsService to manage controller settings via HTTP endpoints. - Introduced FanController to handle fan control logic based on temperature readings. - Added OneWireESP32 library for interfacing with DS18B20 temperature sensors. - Implemented TempSensorsService to manage temperature sensors and their data acquisition. - Established persistence for sensor settings and states using file storage. - Enhanced error handling and logging throughout the services.
- Added FFCMqttConfig component for configuring MQTT settings. - Removed GatewayMQTTConfig component to streamline MQTT configuration. - Updated MQTT routing to use FFCMqttConfig. - Introduced new alarms page for managing alarm events. - Created backend services for alarm logging and MQTT settings. - Integrated alarm notifications via MQTT. - Enhanced temperature sensor service to publish alarms on sensor status changes. - Added utility functions for ISO 8601 date conversion. - Updated UI to include alarm log and relevant error handling.
… enhance temperature sensor discovery logging
- Changed to PCB v2.0 settings - Updated version string
# Conflicts: # .gitignore # README.md # factory_settings.ini # features.ini # interface/package-lock.json # interface/package.json # interface/src/app.css # interface/src/lib/DaisyUiHelper.ts # interface/src/lib/assets/logo.png # interface/src/lib/components/Collapsible.svelte # interface/src/lib/components/ConfirmDialog.svelte # interface/src/lib/components/InputPassword.svelte # interface/src/lib/components/SettingsCard.svelte # interface/src/lib/components/Spinner.svelte # interface/src/lib/components/UpdateIndicator.svelte # interface/src/lib/components/toasts/Toast.svelte # interface/src/lib/stores/analytics.ts # interface/src/lib/stores/socket.ts # interface/src/lib/types/models.ts # interface/src/routes/+layout.svelte # interface/src/routes/+layout.ts # interface/src/routes/+page.svelte # interface/src/routes/connections/mqtt/+page.svelte # interface/src/routes/connections/mqtt/MQTT.svelte # interface/src/routes/connections/ntp/NTP.svelte # interface/src/routes/login.svelte # interface/src/routes/menu.svelte # interface/src/routes/statusbar.svelte # interface/src/routes/system/metrics/BatteryMetrics.svelte # interface/src/routes/system/metrics/SystemMetrics.svelte # interface/src/routes/system/status/SystemStatus.svelte # interface/src/routes/system/update/GithubFirmwareManager.svelte # interface/src/routes/system/update/UploadFirmware.svelte # interface/src/routes/user/+page.svelte # interface/src/routes/user/EditUser.svelte # interface/src/routes/wifi/ap/Accesspoint.svelte # interface/src/routes/wifi/sta/Scan.svelte # interface/src/routes/wifi/sta/Wifi.svelte # interface/static/favicon.png # interface/static/manifest.json # interface/vite.config.ts # lib/PsychicHttp/src/PsychicCore.h # lib/PsychicHttp/src/PsychicEndpoint.cpp # lib/PsychicHttp/src/PsychicEndpoint.h # lib/PsychicHttp/src/PsychicHttp.h # lib/PsychicHttp/src/PsychicHttpServer.cpp # lib/PsychicHttp/src/PsychicStaticFileHander.cpp # lib/PsychicHttp/src/PsychicUploadHandler.cpp # lib/framework/APSettingsService.cpp # lib/framework/APSettingsService.h # lib/framework/APStatus.cpp # lib/framework/APStatus.h # lib/framework/AnalyticsService.h # lib/framework/ArduinoJsonJWT.cpp # lib/framework/ArduinoJsonJWT.h # lib/framework/AuthenticationService.cpp # lib/framework/AuthenticationService.h # lib/framework/BatteryService.cpp # lib/framework/BatteryService.h # lib/framework/DownloadFirmwareService.cpp # lib/framework/DownloadFirmwareService.h # lib/framework/ESP32SvelteKit.cpp # lib/framework/ESP32SvelteKit.h # lib/framework/ESPFS.h # lib/framework/EventEndpoint.h # lib/framework/EventSocket.cpp # lib/framework/EventSocket.h # lib/framework/FSPersistence.h # lib/framework/FactoryResetService.cpp # lib/framework/FactoryResetService.h # lib/framework/Features.h # lib/framework/FeaturesService.cpp # lib/framework/FeaturesService.h # lib/framework/HttpEndpoint.h # lib/framework/IPUtils.h # lib/framework/JsonUtils.h # lib/framework/MqttEndpoint.h # lib/framework/MqttSettingsService.cpp # lib/framework/MqttSettingsService.h # lib/framework/MqttStatus.cpp # lib/framework/MqttStatus.h # lib/framework/NTPSettingsService.cpp # lib/framework/NTPSettingsService.h # lib/framework/NTPStatus.cpp # lib/framework/NTPStatus.h # lib/framework/NotificationService.h # lib/framework/RestartService.cpp # lib/framework/RestartService.h # lib/framework/SecurityManager.h # lib/framework/SecuritySettingsService.cpp # lib/framework/SecuritySettingsService.h # lib/framework/SettingValue.cpp # lib/framework/SettingValue.h # lib/framework/SleepService.cpp # lib/framework/SleepService.h # lib/framework/StatefulService.cpp # lib/framework/StatefulService.h # lib/framework/SystemStatus.cpp # lib/framework/SystemStatus.h # lib/framework/UploadFirmwareService.cpp # lib/framework/UploadFirmwareService.h # lib/framework/WebSocketClient.bak # lib/framework/WebSocketServer.h # lib/framework/WiFiScanner.cpp # lib/framework/WiFiScanner.h # lib/framework/WiFiSettingsService.cpp # lib/framework/WiFiSettingsService.h # lib/framework/WiFiStatus.cpp # lib/framework/WiFiStatus.h # platformio.ini # scripts/build_interface.py # scripts/rename_fw.py # src/main.cpp
# Conflicts: # platformio.ini
(cherry picked from commit bda977530a219d6f820a7dec7acd86008004d1ef)
# Conflicts: # interface/src/routes/gateway/smoke-detectors/+page.svelte # platformio.ini
# Conflicts: # interface/src/routes/gateway/smoke-detectors/+page.svelte
# Conflicts: # interface/src/lib/components/DraggableList.svelte
# Conflicts: # interface/src/routes/gateway/smoke-detectors/+page.svelte # src/GatewayDevicesService.cpp
# Conflicts: # scripts/generate_enums.py
…s in scripts # Conflicts: # scripts/generate_enums.py
|
Thank you so much! I'm on vacation this coming week and will test it next weekend. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Hi @theelims, this is a summary of the rework I did to my fork:
Replaced
svelte-dnd-listwithsvelte-dnd-actionassvelte-dnd-listcreates build warnings and appears to no longer be maintained, whilesvelte-dnd-actionis under active community developmentCreated
DraggableListcomponent based onsvelte-dnd-action(used in WiFi Settings)Extended
CollapsibleandSettingsCardcomponents to support a dirty statusEnhanced
ConfirmDialog,InfoDialogandToastcomponents to support HTML contentMade
Spinnercomponent more flexible (to allow other texts than "Loading..." or no text at all)Added connection check to WebSocket store (
socket.ts)Allow secure WebSocket connections
Fixed some Svelte warnings (in JS console)
Reworked WiFi Settings (Station) dialog: added edit dialog for networks, rearranged UI components, used new DraggableList component
Fixed preprocessor warning: usage of
#ifdefwith OR operatorFixed preprocessor warning: redefinition of
ESP_PLATFORMAdded a delayed reconnect function to
WifiSettingsService.cppto allow the last POST request from frontend (providing new network settings) to be properly responded to. In the previous implementation, the POST request was never responded to by the backend, as the connection was closed immediately upon receiving the request in the backend. This resulted in the user receiving no feedback about whether the settings update was successful, only a timeout that suggested something had gone wrong.Fixed deprecated usage of
merge-binand its parameters inscripts/merge_bin.pyAdded
scripts/prebuild_utils.pythat allows other build scripts to be executed depending on the type of the executed task (e.g. I don't want to have the interface built or the certificate bundle created on clean tasks)