diff --git a/app/src/lib/models.ts b/app/src/lib/models.ts index dae1c8e..647f6e0 100644 --- a/app/src/lib/models.ts +++ b/app/src/lib/models.ts @@ -86,12 +86,6 @@ export type LightState = { led_on: boolean; }; -export type BrokerSettings = { - mqtt_path: string; - name: string; - unique_id: string; -}; - export type NTPStatus = { status: number; utc_time: string; @@ -138,24 +132,6 @@ export type StaticSystemInformation = { export type SystemInformation = Analytics & StaticSystemInformation; - -export type MQTTStatus = { - enabled: boolean; - connected: boolean; - client_id: string; - last_error: string; -}; - -export type MQTTSettings = { - enabled: boolean; - uri: string; - username: string; - password: string; - client_id: string; - keep_alive: number; - clean_session: boolean; -}; - export type CameraSettings = { framesize: number; quality: number; diff --git a/app/src/lib/types/models.ts b/app/src/lib/types/models.ts index 183117e..f9dd23a 100644 --- a/app/src/lib/types/models.ts +++ b/app/src/lib/types/models.ts @@ -56,16 +56,6 @@ export type ApSettings = { subnet_mask: string; }; -export type LightState = { - led_on: boolean; -}; - -export type BrokerSettings = { - mqtt_path: string; - name: string; - unique_id: string; -}; - export type NTPStatus = { status: number; utc_time: string; diff --git a/app/src/routes/menu.svelte b/app/src/routes/menu.svelte index d123633..5bbdd33 100644 --- a/app/src/routes/menu.svelte +++ b/app/src/routes/menu.svelte @@ -82,7 +82,7 @@ { title: 'Connections', icon: Remote, - feature: $page.data.features.mqtt || $page.data.features.ntp, + feature: $page.data.features.ntp, submenu: [ { title: 'NTP', diff --git a/docs/api.md b/docs/api.md index 4cff200..7d0d4d3 100644 --- a/docs/api.md +++ b/docs/api.md @@ -7,9 +7,6 @@ The back end exposes a number of API endpoints which are referenced in the table | Method | Endpoint | Authentication | POST JSON Body | Info | | ------ | --------------------------------------- | ------------------ | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------- | | GET | /rest/features | `NONE_REQUIRED` | none | Tells the client which features of the UI should be use | -| GET | /rest/mqttStatus | `IS_AUTHENTICATED` | none | Current MQTT connection status | -| GET | /rest/mqttSettings | `IS_ADMIN` | none | Currently used MQTT settings | -| POST | /rest/mqttSettings | `IS_ADMIN` | `{"enabled":false,"uri":"mqtt://192.168.1.12:1883","username":"","password":"","client_id":"esp32-f412fa4495f8","keep_alive":120,"clean_session":true}` | Update MQTT settings with new parameters | | GET | /rest/ntpStatus | `IS_AUTHENTICATED` | none | Current NTP connection status | | GET | /rest/ntpSettings | `IS_ADMIN` | none | Current NTP settings | | POST | /rest/ntpSettings | `IS_ADMIN` | `{"enabled": true,"server": "time.google.com","tz_label": "Europe/London","tz_format": "GMT0BST,M3.5.0/1,M10.5.0"}` | Update the NTP settings | diff --git a/readme.md b/readme.md index 3d069a0..2afe8fa 100644 --- a/readme.md +++ b/readme.md @@ -128,7 +128,6 @@ To dis-/enable the major feature defines are used. Define them in either feature | FT_BATTERY | Whether or not to use battery | 0 | FT_NTP | Whether or not to use time server | 1 | FT_SECURITY | Whether or not to use login system | 0 -| FT_MQTT | Whether or not to use MQTT | 0 | FT_SLEEP | Whether or not include sleep management | 0 | FT_UPLOAD_FIRMWARE | Whether or not to use OAT | 0 | FT_DOWNLOAD_FIRMWARE | Whether or not to use github for firmware updates | 0