Merge remote-tracking branch 'origin/dev' into flash_optimization

interface/src/i18n/de/index.ts

@@ -179,7 +179,7 @@ const de: Translation = {
   PLATFORM: 'Platform (Platform / SDK)',
   UPTIME: 'System Betriebszeit',
   CPU_FREQ: 'CPU Frequenz',
-  HEAP: 'RAM Speicher (Frei / Max Belegt)',
+  HEAP: 'RAM freier Speicher (Gesamt / max. Block)',
   PSRAM: 'PSRAM (Größe / Frei)',
   FLASH: 'Flash Speicher (Größe / Geschwindigkeit)',
   APPSIZE: 'Programm (Genutzt / Frei)',
@@ -263,7 +263,7 @@ const de: Translation = {
   GUEST: 'Gast',
   NEW: 'Neuer',
   RENAME: 'Ändere',
-  ENTITY: 'Einheit'
+  ENTITY: 'Entität'
 };
 
 export default de;

interface/src/project/SettingsCustomization.tsx

@@ -137,7 +137,7 @@ const SettingsCustomization: FC = () => {
   }, [LL]);
 
   const setInitialMask = (data: DeviceEntity[]) => {
-    setDeviceEntities(data.map((de) => ({ ...de, o_m: de.m, o_cn: de.cn })));
+    setDeviceEntities(data.map((de) => ({ ...de, o_m: de.m, o_cn: de.cn, o_mi: de.mi, o_ma: de.ma })));
   };
 
   const fetchDeviceEntities = async (unique_id: number) => {
@@ -249,8 +249,16 @@ const SettingsCustomization: FC = () => {
   const saveCustomization = async () => {
     if (devices && deviceEntities && selectedDevice !== -1) {
       const masked_entities = deviceEntities
-        .filter((de) => de.m !== de.o_m || de.cn !== de.o_cn)
-        .map((new_de) => new_de.m.toString(16).padStart(2, '0') + new_de.id + (new_de.cn ? '|' + new_de.cn : ''));
+        .filter((de) => de.m !== de.o_m || de.cn !== de.o_cn || de.ma !== de.o_ma || de.mi !== de.o_mi)
+        .map(
+          (new_de) =>
+            new_de.m.toString(16).padStart(2, '0') +
+            new_de.id +
+            (new_de.cn || new_de.mi || new_de.ma ? '|' : '') +
+            (new_de.cn ? new_de.cn : '') +
+            (new_de.mi ? '>' + new_de.mi : '') +
+            (new_de.ma ? '<' + new_de.ma : '')
+        );
 
       // check size in bytes to match buffer in CPP, which is 4096
       const bytes = new TextEncoder().encode(JSON.stringify(masked_entities)).length;
@@ -331,7 +339,7 @@ const SettingsCustomization: FC = () => {
       setDeviceEntities((prevState) => {
         const newState = prevState.map((obj) => {
           if (obj.id === deviceEntity.id) {
-            return { ...obj, cn: deviceEntity.cn };
+            return { ...obj, cn: deviceEntity.cn, mi: deviceEntity.mi, ma: deviceEntity.ma };
           }
           return obj;
         });
@@ -627,6 +635,28 @@ const SettingsCustomization: FC = () => {
                   onChange={updateValue(setDeviceEntity)}
                 />
               </Grid>
+              {typeof de.v === 'number' && de.w && (
+                <>
+                  <Grid item>
+                    <TextField
+                      name="mi"
+                      label="min"
+                      value={deviceEntity.mi}
+                      sx={{ width: '8ch' }}
+                      onChange={updateValue(setDeviceEntity)}
+                    />
+                  </Grid>
+                  <Grid item>
+                    <TextField
+                      name="ma"
+                      label="max"
+                      value={deviceEntity.ma}
+                      sx={{ width: '8ch' }}
+                      onChange={updateValue(setDeviceEntity)}
+                    />
+                  </Grid>
+                </>
+              )}
             </Grid>
           </DialogContent>
           <DialogActions>

interface/src/project/types.ts

@@ -142,6 +142,10 @@ export interface DeviceEntity {
   o_m?: number; // original mask before edits
   o_cn?: string; // original cn before edits
   w: boolean; // writeable
+  mi?: string; // min value
+  ma?: string; // max value
+  o_mi?: string;
+  o_ma?: string;
 }
 
 export interface CustomEntities {