Merge branch 'dev' of https://github.com/emsesp/EMS-ESP32 into dev2

interface/src/types/ap.ts

@@ -10,14 +10,14 @@ export enum APNetworkStatus {
   LINGERING = 2
 }
 
-export interface APStatus {
+export interface APStatusType {
   status: APNetworkStatus;
   ip_address: string;
   mac_address: string;
   station_num: number;
 }
 
-export interface APSettings {
+export interface APSettingsType {
   provision_mode: APProvisionMode;
   ssid: string;
   password: string;

interface/src/types/mqtt.ts

@@ -9,7 +9,7 @@ export enum MqttDisconnectReason {
   TCP_DISCONNECTED = 7
 }
 
-export interface MqttStatus {
+export interface MqttStatusType {
   enabled: boolean;
   connected: boolean;
   client_id: string;
@@ -19,7 +19,7 @@ export interface MqttStatus {
   connect_count: number;
 }
 
-export interface MqttSettings {
+export interface MqttSettingsType {
   enabled: boolean;
   host: string;
   port: number;

interface/src/types/network.ts

@@ -20,7 +20,7 @@ export enum WiFiEncryptionType {
   WIFI_AUTH_WPA2_WPA3_PSK = 7
 }
 
-export interface NetworkStatus {
+export interface NetworkStatusType {
   status: NetworkConnectionStatus;
   local_ip: string;
   local_ipv6: string;
@@ -36,7 +36,7 @@ export interface NetworkStatus {
   hostname: string;
 }
 
-export interface NetworkSettings {
+export interface NetworkSettingsType {
   ssid: string;
   bssid: string;
   password: string;

interface/src/types/ntp.ts

@@ -4,14 +4,14 @@ export enum NTPSyncStatus {
   NTP_ACTIVE = 2
 }
 
-export interface NTPStatus {
+export interface NTPStatusType {
   status: NTPSyncStatus;
   utc_time: string;
   local_time: string;
   server: string;
 }
 
-export interface NTPSettings {
+export interface NTPSettingsType {
   enabled: boolean;
   server: string;
   tz_label: string;

interface/src/types/security.ts

@@ -1,11 +1,11 @@
-export interface User {
+export interface UserType {
   username: string;
   password: string;
   admin: boolean;
 }
 
-export interface SecuritySettings {
-  users: User[];
+export interface SecuritySettingsType {
+  users: UserType[];
   jwt_secret: string;
 }
 

interface/src/types/system.ts

@@ -1,4 +1,6 @@
-export interface SystemStatus {
+import type { busConnectionStatus } from 'project/types';
+
+export interface ESPSystemStatus {
   emsesp_version: string;
   esp_platform: string;
   max_alloc_heap: number;
@@ -16,14 +18,29 @@ export interface SystemStatus {
   app_free: number;
   fs_used: number;
   fs_free: number;
-  uptime: string;
   free_mem: number;
   psram_size?: number;
   free_psram?: number;
   has_loader: boolean;
 }
 
-export interface OTASettings {
+export interface SystemStatus {
+  emsesp_version: string;
+  esp_platform: string;
+  status: busConnectionStatus;
+  uptime: number;
+  bus_uptime: number;
+  num_devices: number;
+  num_sensors: number;
+  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;