Remove OTA feature emsesp#1738

CHANGELOG_LATEST.md

@@ -17,6 +17,7 @@
 - heatpump entities `fan` and `shutdown` [#1690](https://github.com/emsesp/EMS-ESP32/discussions/1690)
 - mqtt HA-mode 3 for v3.6 compatible HA entities, set on update v3.6->v3.7
 - HP input states [#1723](https://github.com/emsesp/EMS-ESP32/discussions/1723)
+- Added scripts for OTA (scripts/upload.py and upload_cli.py) [#1738](https://github.com/emsesp/EMS-ESP32/issues/1738)
 
 ## Fixed
 
@@ -31,3 +32,4 @@
 - Refresh UI - moving settings to one location [#1665](https://github.com/emsesp/EMS-ESP32/issues/1665)
 - rename DeviceValueTypes, add UINT32 for custom entities
 - dynamic register dhw circuits for thermostat
+- removed OTA feature [#1738](https://github.com/emsesp/EMS-ESP32/issues/1738)

factory_settings.ini

@@ -25,11 +25,6 @@ build_flags =
     -D FACTORY_NTP_TIME_ZONE_FORMAT=\"CET-1CEST,M3.5.0,M10.5.0/3\"
     -D FACTORY_NTP_SERVER=\"time.google.com\"
 
-    ; OTA settings
-    -D FACTORY_OTA_PORT=8266
-    -D FACTORY_OTA_PASSWORD=\"ems-esp-neo\"
-    -D FACTORY_OTA_ENABLED=false
-
     ; MQTT settings
     -D FACTORY_MQTT_ENABLED=false
     -D FACTORY_MQTT_HOST=\"\"

interface/src/AuthenticatedRouting.tsx

@@ -8,7 +8,6 @@ import AccessPoint from 'framework/ap/AccessPoint';
 import Mqtt from 'framework/mqtt/Mqtt';
 import Network from 'framework/network/Network';
 import NetworkTime from 'framework/ntp/NetworkTime';
-import OTASettings from 'framework/ota/OTASettings';
 import Security from 'framework/security/Security';
 import ESPSystemStatus from 'framework/system/ESPSystemStatus';
 import System from 'framework/system/System';
@@ -43,7 +42,6 @@ const AuthenticatedRouting: FC = () => {
             <Route path="/settings/ap/*" element={<AccessPoint />} />
             <Route path="/settings/ntp/*" element={<NetworkTime />} />
             <Route path="/settings/mqtt/*" element={<Mqtt />} />
-            <Route path="/settings/ota/*" element={<OTASettings />} />
             <Route path="/settings/security/*" element={<Security />} />
             <Route
               path="/settings/espsystemstatus/*"

interface/src/api/system.ts

@@ -3,7 +3,7 @@
 /* eslint-disable @typescript-eslint/no-unsafe-call */
 
 /* eslint-disable @typescript-eslint/no-unsafe-return */
-import type { ESPSystemStatus, LogSettings, OTASettings, SystemStatus } from 'types';
+import type { ESPSystemStatus, LogSettings, SystemStatus } from 'types';
 
 import { alovaInstance, alovaInstanceGH } from './endpoints';
 
@@ -20,12 +20,6 @@ export const restart = () => alovaInstance.Post('/rest/restart');
 export const partition = () => alovaInstance.Post('/rest/partition');
 export const factoryReset = () => alovaInstance.Post('/rest/factoryReset');
 
-// OTA
-export const readOTASettings = () =>
-  alovaInstance.Get<OTASettings>(`/rest/otaSettings`);
-export const updateOTASettings = (data: OTASettings) =>
-  alovaInstance.Post('/rest/otaSettings', data);
-
 // SystemLog
 export const readLogSettings = () =>
   alovaInstance.Get<LogSettings>(`/rest/logSettings`);

interface/src/framework/Settings.tsx

@@ -3,7 +3,6 @@ import { toast } from 'react-toastify';
 
 import AccessTimeIcon from '@mui/icons-material/AccessTime';
 import CancelIcon from '@mui/icons-material/Cancel';
-import CastIcon from '@mui/icons-material/Cast';
 import DeviceHubIcon from '@mui/icons-material/DeviceHub';
 import ImportExportIcon from '@mui/icons-material/ImportExport';
 import LockIcon from '@mui/icons-material/Lock';
@@ -212,13 +211,7 @@ const Settings: FC = () => {
           text={LL.CONFIGURE('MQTT')}
           to="mqtt"
         />
-        <ListMenuItem
-          icon={CastIcon}
-          bgcolor="#efc34b"
-          label="OTA"
-          text={LL.CONFIGURE('OTA')}
-          to="ota"
-        />
+
         <ListMenuItem
           icon={LockIcon}
           label={LL.SECURITY(0)}

interface/src/framework/system/SystemStatus.tsx

@@ -4,7 +4,6 @@ import { toast } from 'react-toastify';
 import AccessTimeIcon from '@mui/icons-material/AccessTime';
 import BuildIcon from '@mui/icons-material/Build';
 import CancelIcon from '@mui/icons-material/Cancel';
-import CastIcon from '@mui/icons-material/Cast';
 import DeviceHubIcon from '@mui/icons-material/DeviceHub';
 import DirectionsBusIcon from '@mui/icons-material/DirectionsBus';
 import MemoryIcon from '@mui/icons-material/Memory';
@@ -277,20 +276,10 @@ const SystemStatus: FC = () => {
           />
           <Divider variant="inset" component="li" />
 
-          <ListMenuItem
-            disabled={!me.admin}
-            icon={CastIcon}
-            bgcolor={activeHighlight(data.ota_status)}
-            label={LL.STATUS_OF('OTA')}
-            text={data.ota_status ? LL.ACTIVE() : LL.INACTIVE(0)}
-            to="/settings/ota"
-          />
-          <Divider variant="inset" component="li" />
-
           <ListMenuItem
             disabled={!me.admin}
             icon={SettingsInputAntennaIcon}
-            bgcolor={activeHighlight(data.ota_status)}
+            bgcolor={activeHighlight(data.ap_status)}
             label={LL.ACCESS_POINT(0)}
             text={data.ap_status ? LL.ACTIVE() : LL.INACTIVE(0)}
             to="/settings/ap/status"

interface/src/i18n/de/index.ts

@@ -192,7 +192,6 @@ const de: Translation = {
   FILESYSTEM: 'Dateisystem (Genutzt / Frei)',
   BUFFER_SIZE: 'max. Puffergröße',
   COMPACT: 'Kompakte Darstellung',
-  ENABLE_OTA: 'OTA Updates verwenden',
   DOWNLOAD_CUSTOMIZATION_TEXT: 'Herunterladen der individuellen Entitätsanpassungen',
   DOWNLOAD_SCHEDULE_TEXT: 'Herunterladen geplanter Befehle',
   DOWNLOAD_SETTINGS_TEXT: 'Herunterladen der Anwendungseinstellungen. Vorsicht beim Teilen der Einstellungen, da sie Passwörter und andere sensitive Einstellungen enthalten',

interface/src/i18n/en/index.ts

@@ -192,7 +192,6 @@ const en: Translation = {
   FILESYSTEM: 'File System (Used / Free)',
   BUFFER_SIZE: 'Max Buffer Size',
   COMPACT: 'Compact',
-  ENABLE_OTA: 'Enable OTA Updates',
   DOWNLOAD_CUSTOMIZATION_TEXT: 'Download the entity customizations',
   DOWNLOAD_SCHEDULE_TEXT: 'Download Scheduler Events',
   DOWNLOAD_SETTINGS_TEXT: 'Download the application settings. Be careful when sharing your settings as this file contains passwords and other sensitive system information',

interface/src/i18n/fr/index.ts

@@ -192,7 +192,6 @@ const fr: Translation = {
   FILESYSTEM: 'File System (Utilisée / Libre)',
   BUFFER_SIZE: 'Max taille du buffer',
   COMPACT: 'Compact',
-  ENABLE_OTA: 'Activer les updates OTA',
   DOWNLOAD_CUSTOMIZATION_TEXT: "Télécharger les personnalisations d'entités",
   DOWNLOAD_SCHEDULE_TEXT: 'Download Scheduler Events', // TODO translate
   DOWNLOAD_SETTINGS_TEXT: "Téléchargez les paramètres de l'application. Soyez prudent lorsque vous partagez vos paramètres car ce fichier contient des mots de passe et d'autres informations système sensibles.",

interface/src/i18n/it/index.ts

@@ -192,7 +192,6 @@ const it: Translation = {
   FILESYSTEM: 'Memoria Sistema (Usata / Libera)',
   BUFFER_SIZE: 'Max Buffer Size',
   COMPACT: 'Compact',
-  ENABLE_OTA: 'Abilita aggiornamenti OTA',
   DOWNLOAD_CUSTOMIZATION_TEXT: 'Scarica personalizzazioni entità',
   DOWNLOAD_SCHEDULE_TEXT: 'Download Scheduler Events',
   DOWNLOAD_SETTINGS_TEXT: 'Scarica le impostazioni dell applicazione. Fai attenzione quando condividi le tue impostazioni poiché questo file contiene password e altre informazioni di sistema riservate',

interface/src/i18n/nl/index.ts

@@ -192,7 +192,6 @@ const nl: Translation = {
   FILESYSTEM: 'File System (Used / Free)',
   BUFFER_SIZE: 'Max Buffer Size',
   COMPACT: 'Compact',
-  ENABLE_OTA: 'Acitveer OTA Updates',
   DOWNLOAD_CUSTOMIZATION_TEXT: 'Download alle custom instellingen',
   DOWNLOAD_SCHEDULE_TEXT: 'Download Scheduler Events',
   DOWNLOAD_SETTINGS_TEXT: 'Download de applicatie settings. Wees voorzichting met het delen van dit bestand want het bevat o.a. de wachtwoorden in plain text',

interface/src/i18n/no/index.ts

@@ -192,7 +192,6 @@ const no: Translation = {
   FILESYSTEM: 'File System (Brukt / Ledig)',
   BUFFER_SIZE: 'Max Buffer Størrelse',
   COMPACT: 'Komprimere',
-  ENABLE_OTA: 'Aktiviser OTA oppdateringer',
   DOWNLOAD_CUSTOMIZATION_TEXT: 'Last ned objektstilpasninger',
   DOWNLOAD_SCHEDULE_TEXT: 'Last ned planlagte oppgaver',
   DOWNLOAD_SETTINGS_TEXT: 'Last ned applikasjonskonfigurasjon. Vær varsom med å dele fila da den inneholder passord og annen sensitiv system informasjon',

interface/src/i18n/pl/index.ts

@@ -192,7 +192,6 @@ const pl: BaseTranslation = {
   FILESYSTEM: 'System plików (wykorzystane / wolne)',
   BUFFER_SIZE: 'Maksymalna pojemność bufora (ilość wpisów)',
   COMPACT: 'Kompaktowy',
-  ENABLE_OTA: 'Aktywuj aktualizację OTA',
   DOWNLOAD_CUSTOMIZATION_TEXT: 'Pobierz personalizacje.',
   DOWNLOAD_SCHEDULE_TEXT: 'Pobierz harmonogram zdarzeń.',
   DOWNLOAD_SETTINGS_TEXT: 'Pobierz ustawienia aplikacji. Uwaga! Plik z ustawieniami zawiera hasła oraz inne wrażliwe informacje systemowe! Nie udostepniaj go pochopnie!',

interface/src/i18n/sk/index.ts

@@ -192,7 +192,6 @@ const sk: Translation = {
   FILESYSTEM: 'Súborový systém (Použité / Voľné)',
   BUFFER_SIZE: 'Buffer-max.veľkosť',
   COMPACT: 'Kompaktné',
-  ENABLE_OTA: 'Povoliť OTA aktualizácie',
   DOWNLOAD_CUSTOMIZATION_TEXT: 'Stiahnutie prispôsobení entity',
   DOWNLOAD_SCHEDULE_TEXT: 'Stiahnutie plánovača udalostí',
   DOWNLOAD_SETTINGS_TEXT: 'Stiahnite si nastavenia aplikácie. Pri zdieľaní nastavení buďte opatrní, pretože tento súbor obsahuje heslá a iné citlivé systémové informácie.',

interface/src/i18n/sv/index.ts

@@ -192,7 +192,6 @@ const sv: Translation = {
   FILESYSTEM: 'Filsystem (Använt / Ledigt)',
   BUFFER_SIZE: 'Max Bufferstorlek',
   COMPACT: 'Komprimera',
-  ENABLE_OTA: 'Aktivera OTA-uppdateringar',
   DOWNLOAD_CUSTOMIZATION_TEXT: 'Ladda ner entitetsanpassningar',
   DOWNLOAD_SCHEDULE_TEXT: 'Download Scheduler Events', // TODO translate
   DOWNLOAD_SETTINGS_TEXT: 'Ladda ner applikationsinställningar. Var försiktig om du delar dina iställlningar då de innehåller lösenord och annan känslig systeminformation',

interface/src/i18n/tr/index.ts

@@ -192,7 +192,6 @@ const tr: Translation = {
   FILESYSTEM: 'Dosya Sistemi (Kullanılmış / Boş)',
   BUFFER_SIZE: 'En fazla bellek boyutu',
   COMPACT: 'Sıkışık',
-  ENABLE_OTA: 'OTA Güncellemelerine izin ver',
   DOWNLOAD_CUSTOMIZATION_TEXT: 'Varlık özelleştirmelerini indir',
   DOWNLOAD_SCHEDULE_TEXT: 'Download Scheduler Events', // TODO translate
   DOWNLOAD_SETTINGS_TEXT: 'Uygulama ayarlarını indir. Bu dosya hassas sistem bilgileri ve şifrelerinizi içerdiğinden ayarlarınızı paylaşırken dikkatli olun',

interface/src/types/system.ts

@@ -35,17 +35,10 @@ export interface SystemStatus {
   num_analogs: number;
   free_heap: number;
   ntp_status: number;
-  ota_status: boolean;
   mqtt_status: boolean;
   ap_status: boolean;
 }
 
-export interface OTASettingsType {
-  enabled: boolean;
-  port: number;
-  password: string;
-}
-
 export enum LogLevel {
   ERROR = 3,
   WARNING = 4,
@@ -69,9 +62,3 @@ export interface LogSettings {
   max_messages: number;
   compact: boolean;
 }
-
-export interface OTASettings {
-  enabled: boolean;
-  port: number;
-  password: string;
-}

interface/src/validators/index.ts

@@ -4,5 +4,4 @@ export * from './mqtt';
 export * from './ntp';
 export * from './security';
 export * from './shared';
-export * from './system';
 export * from './network';