From 0dcde46296ec700e4fb8a41c78cbeb7d83e77d3b Mon Sep 17 00:00:00 2001 From: proddy Date: Wed, 26 Mar 2025 20:24:08 +0100 Subject: [PATCH] upgrade mui v7, fix makefile build --- docs/Modbus-Entity-Registers.md | 34 +- docs/dump_entities.csv | 34 +- docs/dump_telegrams.csv | 10 +- interface/package.json | 4 +- .../src/app/main/CustomEntitiesDialog.tsx | 2 +- interface/src/app/main/Customizations.tsx | 2 +- .../src/app/main/CustomizationsDialog.tsx | 2 +- interface/src/app/main/Devices.tsx | 2 +- interface/src/app/main/DevicesDialog.tsx | 2 +- interface/src/app/main/ModulesDialog.tsx | 2 +- interface/src/app/main/SchedulerDialog.tsx | 2 +- .../src/app/main/SensorsAnalogDialog.tsx | 2 +- .../src/app/main/SensorsTemperatureDialog.tsx | 2 +- .../src/app/settings/ApplicationSettings.tsx | 2 +- interface/src/app/settings/DownloadUpload.tsx | 2 +- interface/src/app/settings/MqttSettings.tsx | 2 +- interface/src/app/status/SystemLog.tsx | 2 +- interface/src/app/status/Version.tsx | 2 +- interface/yarn.lock | 384 +++++++++--------- mock-api/yarn.lock | 56 +-- src/core/modbus_entity_parameters.hpp | 10 +- src/core/shuntingYard.hpp | 4 + 22 files changed, 289 insertions(+), 275 deletions(-) diff --git a/docs/Modbus-Entity-Registers.md b/docs/Modbus-Entity-Registers.md index 853e12ef9..7dbc4e734 100644 --- a/docs/Modbus-Entity-Registers.md +++ b/docs/Modbus-Entity-Registers.md @@ -4371,10 +4371,10 @@ | dhw.disinfecthour | disinfection hour | uint8 (>=0<=23) | | true | DHW | 14 | 1 | 1 | | dhw.maxtemp | maximum temperature | uint8 (>=0<=254) | C | true | DHW | 15 | 1 | 1 | | dhw.onetimekey | one time key function | boolean | | true | DHW | 16 | 1 | 1 | -| dhw.switchtime | program switchtime | string | | true | DHW | 17 | 11 | 1 | -| dhw.circswitchtime | circulation program switchtime | string | | true | DHW | 28 | 8 | 1 | -| dhw.holidays | holiday dates | string | | true | DHW | 36 | 13 | 1 | -| dhw.vacations | vacation dates | string | | true | DHW | 49 | 13 | 1 | +| dhw.switchtime | program switchtime | string | | true | DHW | 17 | 8 | 1 | +| dhw.circswitchtime | circulation program switchtime | string | | true | DHW | 25 | 8 | 1 | +| dhw.holidays | holiday dates | string | | true | DHW | 33 | 13 | 1 | +| dhw.vacations | vacation dates | string | | true | DHW | 46 | 13 | 1 | ### ES79 | shortname | fullname | type | uom | writeable | tag type | register offset | register count | scale factor | @@ -4437,10 +4437,10 @@ | dhw.disinfecthour | disinfection hour | uint8 (>=0<=23) | | true | DHW | 14 | 1 | 1 | | dhw.maxtemp | maximum temperature | uint8 (>=60<=80) | C | true | DHW | 15 | 1 | 1 | | dhw.onetimekey | one time key function | boolean | | true | DHW | 16 | 1 | 1 | -| dhw.switchtime | program switchtime | string | | true | DHW | 17 | 11 | 1 | -| dhw.circswitchtime | circulation program switchtime | string | | true | DHW | 28 | 8 | 1 | -| dhw.holidays | holiday dates | string | | true | DHW | 36 | 13 | 1 | -| dhw.vacations | vacation dates | string | | true | DHW | 49 | 13 | 1 | +| dhw.switchtime | program switchtime | string | | true | DHW | 17 | 8 | 1 | +| dhw.circswitchtime | circulation program switchtime | string | | true | DHW | 25 | 8 | 1 | +| dhw.holidays | holiday dates | string | | true | DHW | 33 | 13 | 1 | +| dhw.vacations | vacation dates | string | | true | DHW | 46 | 13 | 1 | ### EasyControl, CT200 | shortname | fullname | type | uom | writeable | tag type | register offset | register count | scale factor | @@ -4950,7 +4950,7 @@ | hc1.manualtemp | manual temperature | uint8 (>=0<=127) | C | true | HC | 6 | 1 | 1/2 | | hc1.offtemp | temperature when mode is off | uint8 (>=0<=127) | C | true | HC | 107 | 1 | 1/2 | | dhw.mode | operating mode | enum [on\|off\|auto] | | true | DHW | 0 | 1 | 1 | -| dhw.whenmodeoff | when thermostat mode off | boolean | | true | DHW | 62 | 1 | 1 | +| dhw.whenmodeoff | when thermostat mode off | boolean | | true | DHW | 59 | 1 | 1 | | dhw.disinfecting | disinfecting | boolean | | true | DHW | 7 | 1 | 1 | | dhw.disinfectday | disinfection day | enum [mo\|tu\|we\|th\|fr\|sa\|su\|all] | | true | DHW | 8 | 1 | 1 | | dhw.disinfecthour | disinfection hour | uint8 (>=0<=23) | | true | DHW | 14 | 1 | 1 | @@ -5344,10 +5344,10 @@ | dhw.disinfecthour | disinfection hour | uint8 (>=0<=23) | | true | DHW | 14 | 1 | 1 | | dhw.maxtemp | maximum temperature | uint8 (>=0<=254) | C | true | DHW | 15 | 1 | 1 | | dhw.onetimekey | one time key function | boolean | | true | DHW | 16 | 1 | 1 | -| dhw.switchtime | program switchtime | string | | true | DHW | 17 | 11 | 1 | -| dhw.circswitchtime | circulation program switchtime | string | | true | DHW | 28 | 8 | 1 | -| dhw.holidays | holiday dates | string | | true | DHW | 36 | 13 | 1 | -| dhw.vacations | vacation dates | string | | true | DHW | 49 | 13 | 1 | +| dhw.switchtime | program switchtime | string | | true | DHW | 17 | 8 | 1 | +| dhw.circswitchtime | circulation program switchtime | string | | true | DHW | 25 | 8 | 1 | +| dhw.holidays | holiday dates | string | | true | DHW | 33 | 13 | 1 | +| dhw.vacations | vacation dates | string | | true | DHW | 46 | 13 | 1 | ### RC35 | shortname | fullname | type | uom | writeable | tag type | register offset | register count | scale factor | @@ -5410,10 +5410,10 @@ | dhw.disinfecthour | disinfection hour | uint8 (>=0<=23) | | true | DHW | 14 | 1 | 1 | | dhw.maxtemp | maximum temperature | uint8 (>=60<=80) | C | true | DHW | 15 | 1 | 1 | | dhw.onetimekey | one time key function | boolean | | true | DHW | 16 | 1 | 1 | -| dhw.switchtime | program switchtime | string | | true | DHW | 17 | 11 | 1 | -| dhw.circswitchtime | circulation program switchtime | string | | true | DHW | 28 | 8 | 1 | -| dhw.holidays | holiday dates | string | | true | DHW | 36 | 13 | 1 | -| dhw.vacations | vacation dates | string | | true | DHW | 49 | 13 | 1 | +| dhw.switchtime | program switchtime | string | | true | DHW | 17 | 8 | 1 | +| dhw.circswitchtime | circulation program switchtime | string | | true | DHW | 25 | 8 | 1 | +| dhw.holidays | holiday dates | string | | true | DHW | 33 | 13 | 1 | +| dhw.vacations | vacation dates | string | | true | DHW | 46 | 13 | 1 | ### RFM20 Remote | shortname | fullname | type | uom | writeable | tag type | register offset | register count | scale factor | diff --git a/docs/dump_entities.csv b/docs/dump_entities.csv index 8b7cbc6d7..25072615f 100644 --- a/docs/dump_entities.csv +++ b/docs/dump_entities.csv @@ -3753,10 +3753,10 @@ device name,device type,product id,shortname,fullname,type [options...] \| (min/ "RC30",thermostat,67,dhw.disinfecthour,disinfection hour,uint8 (>=0<=23), ,true,number.thermostat_dhw_disinfection_hour,number.thermostat_dhw_disinfecthour,6,9,1,14,1 "RC30",thermostat,67,dhw.maxtemp,maximum temperature,uint8 (>=0<=254),C,true,number.thermostat_dhw_maximum_temperature,number.thermostat_dhw_maxtemp,6,9,1,15,1 "RC30",thermostat,67,dhw.onetimekey,one time key function,boolean, ,true,switch.thermostat_dhw_one_time_key_function,switch.thermostat_dhw_onetimekey,6,9,1,16,1 -"RC30",thermostat,67,dhw.switchtime,program switchtime,string, ,true,sensor.thermostat_dhw_program_switchtime,sensor.thermostat_dhw_switchtime,6,9,1,17,11 -"RC30",thermostat,67,dhw.circswitchtime,circulation program switchtime,string, ,true,sensor.thermostat_dhw_circulation_program_switchtime,sensor.thermostat_dhw_circswitchtime,6,9,1,28,8 -"RC30",thermostat,67,dhw.holidays,holiday dates,string, ,true,sensor.thermostat_dhw_holiday_dates,sensor.thermostat_dhw_holidays,6,9,1,36,13 -"RC30",thermostat,67,dhw.vacations,vacation dates,string, ,true,sensor.thermostat_dhw_vacation_dates,sensor.thermostat_dhw_vacations,6,9,1,49,13 +"RC30",thermostat,67,dhw.switchtime,program switchtime,string, ,true,sensor.thermostat_dhw_program_switchtime,sensor.thermostat_dhw_switchtime,6,9,1,17,8 +"RC30",thermostat,67,dhw.circswitchtime,circulation program switchtime,string, ,true,sensor.thermostat_dhw_circulation_program_switchtime,sensor.thermostat_dhw_circswitchtime,6,9,1,25,8 +"RC30",thermostat,67,dhw.holidays,holiday dates,string, ,true,sensor.thermostat_dhw_holiday_dates,sensor.thermostat_dhw_holidays,6,9,1,33,13 +"RC30",thermostat,67,dhw.vacations,vacation dates,string, ,true,sensor.thermostat_dhw_vacation_dates,sensor.thermostat_dhw_vacations,6,9,1,46,13 "RC20, Moduline 300",thermostat,77,errorcode,error code,string, ,false,sensor.thermostat_error_code,sensor.thermostat_errorcode,6,0,1,0,8 "RC20, Moduline 300",thermostat,77,lastcode,last error code,string, ,false,sensor.thermostat_last_error_code,sensor.thermostat_lastcode,6,0,1,8,25 "RC20, Moduline 300",thermostat,77,datetime,date/time,string, ,false,sensor.thermostat_date/time,sensor.thermostat_datetime,6,0,1,33,13 @@ -3809,7 +3809,7 @@ device name,device type,product id,shortname,fullname,type [options...] \| (min/ "Moduline 400",thermostat,78,hc1.manualtemp,manual temperature,uint8 (>=0<=127),C,true,number.thermostat_hc1_manual_temperature,number.thermostat_hc1_manualtemp,6,1,1/2,6,1 "Moduline 400",thermostat,78,hc1.offtemp,temperature when mode is off,uint8 (>=0<=127),C,true,number.thermostat_hc1_temperature_when_mode_is_off,number.thermostat_hc1_offtemp,6,1,1/2,107,1 "Moduline 400",thermostat,78,dhw.mode,operating mode,enum [on\|off\|auto], ,true,select.thermostat_dhw_operating_mode,select.thermostat_dhw_mode,6,9,1,0,1 -"Moduline 400",thermostat,78,dhw.whenmodeoff,when thermostat mode off,boolean, ,true,switch.thermostat_dhw_when_thermostat_mode_off,switch.thermostat_dhw_whenmodeoff,6,9,1,62,1 +"Moduline 400",thermostat,78,dhw.whenmodeoff,when thermostat mode off,boolean, ,true,switch.thermostat_dhw_when_thermostat_mode_off,switch.thermostat_dhw_whenmodeoff,6,9,1,59,1 "Moduline 400",thermostat,78,dhw.disinfecting,disinfecting,boolean, ,true,switch.thermostat_dhw_disinfecting,switch.thermostat_dhw_disinfecting,6,9,1,7,1 "Moduline 400",thermostat,78,dhw.disinfectday,disinfection day,enum [mo\|tu\|we\|th\|fr\|sa\|su\|all], ,true,select.thermostat_dhw_disinfection_day,select.thermostat_dhw_disinfectday,6,9,1,8,1 "Moduline 400",thermostat,78,dhw.disinfecthour,disinfection hour,uint8 (>=0<=23), ,true,number.thermostat_dhw_disinfection_hour,number.thermostat_dhw_disinfecthour,6,9,1,14,1 @@ -3899,10 +3899,10 @@ device name,device type,product id,shortname,fullname,type [options...] \| (min/ "RC35",thermostat,86,dhw.disinfecthour,disinfection hour,uint8 (>=0<=23), ,true,number.thermostat_dhw_disinfection_hour,number.thermostat_dhw_disinfecthour,6,9,1,14,1 "RC35",thermostat,86,dhw.maxtemp,maximum temperature,uint8 (>=60<=80),C,true,number.thermostat_dhw_maximum_temperature,number.thermostat_dhw_maxtemp,6,9,1,15,1 "RC35",thermostat,86,dhw.onetimekey,one time key function,boolean, ,true,switch.thermostat_dhw_one_time_key_function,switch.thermostat_dhw_onetimekey,6,9,1,16,1 -"RC35",thermostat,86,dhw.switchtimeWW,program switchtime warm water,string, ,true,sensor.thermostat_dhw_program_switchtime_warm_water,sensor.thermostat_dhw_switchtimeWW,6,9,1,17,11 -"RC35",thermostat,86,dhw.circswitchtime,circulation program switchtime,string, ,true,sensor.thermostat_dhw_circulation_program_switchtime,sensor.thermostat_dhw_circswitchtime,6,9,1,28,8 -"RC35",thermostat,86,dhw.holidays,holiday dates,string, ,true,sensor.thermostat_dhw_holiday_dates,sensor.thermostat_dhw_holidays,6,9,1,36,13 -"RC35",thermostat,86,dhw.vacations,vacation dates,string, ,true,sensor.thermostat_dhw_vacation_dates,sensor.thermostat_dhw_vacations,6,9,1,49,13 +"RC35",thermostat,86,dhw.switchtime,program switchtime,string, ,true,sensor.thermostat_dhw_program_switchtime,sensor.thermostat_dhw_switchtime,6,9,1,17,8 +"RC35",thermostat,86,dhw.circswitchtime,circulation program switchtime,string, ,true,sensor.thermostat_dhw_circulation_program_switchtime,sensor.thermostat_dhw_circswitchtime,6,9,1,25,8 +"RC35",thermostat,86,dhw.holidays,holiday dates,string, ,true,sensor.thermostat_dhw_holiday_dates,sensor.thermostat_dhw_holidays,6,9,1,33,13 +"RC35",thermostat,86,dhw.vacations,vacation dates,string, ,true,sensor.thermostat_dhw_vacation_dates,sensor.thermostat_dhw_vacations,6,9,1,46,13 "RC10, Moduline 100",thermostat,90,errorcode,error code,string, ,false,sensor.thermostat_error_code,sensor.thermostat_errorcode,6,0,1,0,8 "RC10, Moduline 100",thermostat,90,lastcode,last error code,string, ,false,sensor.thermostat_last_error_code,sensor.thermostat_lastcode,6,0,1,8,25 "RC10, Moduline 100",thermostat,90,datetime,date/time,string, ,false,sensor.thermostat_date/time,sensor.thermostat_datetime,6,0,1,33,13 @@ -4433,10 +4433,10 @@ device name,device type,product id,shortname,fullname,type [options...] \| (min/ "ES73",thermostat,76,dhw.disinfecthour,disinfection hour,uint8 (>=0<=23), ,true,number.thermostat_dhw_disinfection_hour,number.thermostat_dhw_disinfecthour,6,9,1,14,1 "ES73",thermostat,76,dhw.maxtemp,maximum temperature,uint8 (>=0<=254),C,true,number.thermostat_dhw_maximum_temperature,number.thermostat_dhw_maxtemp,6,9,1,15,1 "ES73",thermostat,76,dhw.onetimekey,one time key function,boolean, ,true,switch.thermostat_dhw_one_time_key_function,switch.thermostat_dhw_onetimekey,6,9,1,16,1 -"ES73",thermostat,76,dhw.switchtimeWW,program switchtime warm water,string, ,true,sensor.thermostat_dhw_program_switchtime_warm_water,sensor.thermostat_dhw_switchtimeWW,6,9,1,17,11 -"ES73",thermostat,76,dhw.circswitchtime,circulation program switchtime,string, ,true,sensor.thermostat_dhw_circulation_program_switchtime,sensor.thermostat_dhw_circswitchtime,6,9,1,28,8 -"ES73",thermostat,76,dhw.holidays,holiday dates,string, ,true,sensor.thermostat_dhw_holiday_dates,sensor.thermostat_dhw_holidays,6,9,1,36,13 -"ES73",thermostat,76,dhw.vacations,vacation dates,string, ,true,sensor.thermostat_dhw_vacation_dates,sensor.thermostat_dhw_vacations,6,9,1,49,13 +"ES73",thermostat,76,dhw.switchtime,program switchtime,string, ,true,sensor.thermostat_dhw_program_switchtime,sensor.thermostat_dhw_switchtime,6,9,1,17,8 +"ES73",thermostat,76,dhw.circswitchtime,circulation program switchtime,string, ,true,sensor.thermostat_dhw_circulation_program_switchtime,sensor.thermostat_dhw_circswitchtime,6,9,1,25,8 +"ES73",thermostat,76,dhw.holidays,holiday dates,string, ,true,sensor.thermostat_dhw_holiday_dates,sensor.thermostat_dhw_holidays,6,9,1,33,13 +"ES73",thermostat,76,dhw.vacations,vacation dates,string, ,true,sensor.thermostat_dhw_vacation_dates,sensor.thermostat_dhw_vacations,6,9,1,46,13 "ES72, RC20",thermostat,113,errorcode,error code,string, ,false,sensor.thermostat_error_code,sensor.thermostat_errorcode,6,0,1,0,8 "ES72, RC20",thermostat,113,lastcode,last error code,string, ,false,sensor.thermostat_last_error_code,sensor.thermostat_lastcode,6,0,1,8,25 "ES72, RC20",thermostat,113,datetime,date/time,string, ,false,sensor.thermostat_date/time,sensor.thermostat_datetime,6,0,1,33,13 @@ -4513,10 +4513,10 @@ device name,device type,product id,shortname,fullname,type [options...] \| (min/ "ES79",thermostat,156,dhw.disinfecthour,disinfection hour,uint8 (>=0<=23), ,true,number.thermostat_dhw_disinfection_hour,number.thermostat_dhw_disinfecthour,6,9,1,14,1 "ES79",thermostat,156,dhw.maxtemp,maximum temperature,uint8 (>=60<=80),C,true,number.thermostat_dhw_maximum_temperature,number.thermostat_dhw_maxtemp,6,9,1,15,1 "ES79",thermostat,156,dhw.onetimekey,one time key function,boolean, ,true,switch.thermostat_dhw_one_time_key_function,switch.thermostat_dhw_onetimekey,6,9,1,16,1 -"ES79",thermostat,156,dhw.switchtimeWW,program switchtime warm water,string, ,true,sensor.thermostat_dhw_program_switchtime_warm_water,sensor.thermostat_dhw_switchtimeWW,6,9,1,17,11 -"ES79",thermostat,156,dhw.circswitchtime,circulation program switchtime,string, ,true,sensor.thermostat_dhw_circulation_program_switchtime,sensor.thermostat_dhw_circswitchtime,6,9,1,28,8 -"ES79",thermostat,156,dhw.holidays,holiday dates,string, ,true,sensor.thermostat_dhw_holiday_dates,sensor.thermostat_dhw_holidays,6,9,1,36,13 -"ES79",thermostat,156,dhw.vacations,vacation dates,string, ,true,sensor.thermostat_dhw_vacation_dates,sensor.thermostat_dhw_vacations,6,9,1,49,13 +"ES79",thermostat,156,dhw.switchtime,program switchtime,string, ,true,sensor.thermostat_dhw_program_switchtime,sensor.thermostat_dhw_switchtime,6,9,1,17,8 +"ES79",thermostat,156,dhw.circswitchtime,circulation program switchtime,string, ,true,sensor.thermostat_dhw_circulation_program_switchtime,sensor.thermostat_dhw_circswitchtime,6,9,1,25,8 +"ES79",thermostat,156,dhw.holidays,holiday dates,string, ,true,sensor.thermostat_dhw_holiday_dates,sensor.thermostat_dhw_holidays,6,9,1,33,13 +"ES79",thermostat,156,dhw.vacations,vacation dates,string, ,true,sensor.thermostat_dhw_vacation_dates,sensor.thermostat_dhw_vacations,6,9,1,46,13 "FW100",thermostat,105,errorcode,error code,string, ,false,sensor.thermostat_error_code,sensor.thermostat_errorcode,6,0,1,0,8 "FW100",thermostat,105,lastcode,last error code,string, ,false,sensor.thermostat_last_error_code,sensor.thermostat_lastcode,6,0,1,8,25 "FW100",thermostat,105,datetime,date/time,string, ,true,sensor.thermostat_date/time,sensor.thermostat_datetime,6,0,1,33,13 diff --git a/docs/dump_telegrams.csv b/docs/dump_telegrams.csv index 6de36b5b4..5667e3f72 100644 --- a/docs/dump_telegrams.csv +++ b/docs/dump_telegrams.csv @@ -13,7 +13,7 @@ telegram_type_id,name,is_fetched 0x19,UBAMonitorSlow, 0x1A,UBASetPoints, 0x1C,UBAMaintenanceStatus, -0x1E,WM10TempMessage, +0x1E,HydrTemp, 0x23,JunkersSetMixer,fetched 0x26,UBASettingsWW,fetched 0x28,WeatherComp,fetched @@ -109,10 +109,10 @@ telegram_type_id,name,is_fetched 0x02A0,RC300Curves, 0x02A1,RC300Curves, 0x02A2,RC300Curves, -0x02A5,RC300Monitor,fetched +0x02A5,CRFMonitor, 0x02A6,RC300Monitor, -0x02A7,CRFMonitor, -0x02A8,RC300Monitor, +0x02A7,RC300Monitor, +0x02A8,CRFMonitor, 0x02A9,RC300Monitor, 0x02AA,RC300Monitor, 0x02AB,RC300Monitor, @@ -133,7 +133,7 @@ telegram_type_id,name,is_fetched 0x02BE,RC300Set, 0x02BF,RC300Set, 0x02C0,RC300Set, -0x02CC,HPPressure,fetched +0x02CC,RC300Set2, 0x02CD,MMPLUSConfigMessage,fetched 0x02CE,RC300Set2, 0x02D0,RC300Set2, diff --git a/interface/package.json b/interface/package.json index 8a85c05fa..f50f1f448 100644 --- a/interface/package.json +++ b/interface/package.json @@ -24,8 +24,8 @@ "@alova/adapter-xhr": "2.1.1", "@emotion/react": "^11.14.0", "@emotion/styled": "^11.14.0", - "@mui/icons-material": "^6.4.8", - "@mui/material": "^6.4.8", + "@mui/icons-material": "^7.0.0", + "@mui/material": "^7.0.0", "@table-library/react-table-library": "4.1.12", "alova": "3.2.10", "async-validator": "^4.2.5", diff --git a/interface/src/app/main/CustomEntitiesDialog.tsx b/interface/src/app/main/CustomEntitiesDialog.tsx index 898ecc557..32550cf6c 100644 --- a/interface/src/app/main/CustomEntitiesDialog.tsx +++ b/interface/src/app/main/CustomEntitiesDialog.tsx @@ -12,7 +12,7 @@ import { DialogActions, DialogContent, DialogTitle, - Grid2 as Grid, + Grid, InputAdornment, MenuItem, TextField diff --git a/interface/src/app/main/Customizations.tsx b/interface/src/app/main/Customizations.tsx index da901c14b..06d25b478 100644 --- a/interface/src/app/main/Customizations.tsx +++ b/interface/src/app/main/Customizations.tsx @@ -16,7 +16,7 @@ import { DialogActions, DialogContent, DialogTitle, - Grid2 as Grid, + Grid, InputAdornment, Link, MenuItem, diff --git a/interface/src/app/main/CustomizationsDialog.tsx b/interface/src/app/main/CustomizationsDialog.tsx index 60488cbde..d738594b1 100644 --- a/interface/src/app/main/CustomizationsDialog.tsx +++ b/interface/src/app/main/CustomizationsDialog.tsx @@ -10,7 +10,7 @@ import { DialogActions, DialogContent, DialogTitle, - Grid2 as Grid, + Grid, TextField, Typography } from '@mui/material'; diff --git a/interface/src/app/main/Devices.tsx b/interface/src/app/main/Devices.tsx index 991f3ee3f..5f5de5fb1 100644 --- a/interface/src/app/main/Devices.tsx +++ b/interface/src/app/main/Devices.tsx @@ -31,7 +31,7 @@ import { DialogActions, DialogContent, DialogTitle, - Grid2 as Grid, + Grid, IconButton, InputAdornment, List, diff --git a/interface/src/app/main/DevicesDialog.tsx b/interface/src/app/main/DevicesDialog.tsx index 21789a33d..35054b31e 100644 --- a/interface/src/app/main/DevicesDialog.tsx +++ b/interface/src/app/main/DevicesDialog.tsx @@ -11,7 +11,7 @@ import { DialogContent, DialogTitle, FormHelperText, - Grid2 as Grid, + Grid, InputAdornment, MenuItem, TextField, diff --git a/interface/src/app/main/ModulesDialog.tsx b/interface/src/app/main/ModulesDialog.tsx index 9ba069c89..570c9ab14 100644 --- a/interface/src/app/main/ModulesDialog.tsx +++ b/interface/src/app/main/ModulesDialog.tsx @@ -10,7 +10,7 @@ import { DialogActions, DialogContent, DialogTitle, - Grid2 as Grid, + Grid, TextField } from '@mui/material'; diff --git a/interface/src/app/main/SchedulerDialog.tsx b/interface/src/app/main/SchedulerDialog.tsx index c647ffc6e..89838c246 100644 --- a/interface/src/app/main/SchedulerDialog.tsx +++ b/interface/src/app/main/SchedulerDialog.tsx @@ -13,7 +13,7 @@ import { DialogActions, DialogContent, DialogTitle, - Grid2 as Grid, + Grid, TextField, ToggleButton, ToggleButtonGroup, diff --git a/interface/src/app/main/SensorsAnalogDialog.tsx b/interface/src/app/main/SensorsAnalogDialog.tsx index d82601d5e..6ee9e17e3 100644 --- a/interface/src/app/main/SensorsAnalogDialog.tsx +++ b/interface/src/app/main/SensorsAnalogDialog.tsx @@ -10,7 +10,7 @@ import { DialogActions, DialogContent, DialogTitle, - Grid2 as Grid, + Grid, InputAdornment, MenuItem, TextField, diff --git a/interface/src/app/main/SensorsTemperatureDialog.tsx b/interface/src/app/main/SensorsTemperatureDialog.tsx index 63733113a..c564b7eda 100644 --- a/interface/src/app/main/SensorsTemperatureDialog.tsx +++ b/interface/src/app/main/SensorsTemperatureDialog.tsx @@ -9,7 +9,7 @@ import { DialogActions, DialogContent, DialogTitle, - Grid2 as Grid, + Grid, InputAdornment, TextField, Typography diff --git a/interface/src/app/settings/ApplicationSettings.tsx b/interface/src/app/settings/ApplicationSettings.tsx index 3359ae477..11d02eb37 100644 --- a/interface/src/app/settings/ApplicationSettings.tsx +++ b/interface/src/app/settings/ApplicationSettings.tsx @@ -9,7 +9,7 @@ import { Button, Checkbox, Divider, - Grid2 as Grid, + Grid, InputAdornment, MenuItem, TextField, diff --git a/interface/src/app/settings/DownloadUpload.tsx b/interface/src/app/settings/DownloadUpload.tsx index a4a4daafe..dcbb63e6d 100644 --- a/interface/src/app/settings/DownloadUpload.tsx +++ b/interface/src/app/settings/DownloadUpload.tsx @@ -2,7 +2,7 @@ import { useState } from 'react'; import { toast } from 'react-toastify'; import DownloadIcon from '@mui/icons-material/GetApp'; -import { Box, Button, Grid2 as Grid, Typography } from '@mui/material'; +import { Box, Button, Grid, Typography } from '@mui/material'; import * as SystemApi from 'api/system'; import { API, callAction } from 'api/app'; diff --git a/interface/src/app/settings/MqttSettings.tsx b/interface/src/app/settings/MqttSettings.tsx index a03f139b9..8cbac5d9e 100644 --- a/interface/src/app/settings/MqttSettings.tsx +++ b/interface/src/app/settings/MqttSettings.tsx @@ -5,7 +5,7 @@ import WarningIcon from '@mui/icons-material/Warning'; import { Button, Checkbox, - Grid2 as Grid, + Grid, InputAdornment, MenuItem, TextField, diff --git a/interface/src/app/status/SystemLog.tsx b/interface/src/app/status/SystemLog.tsx index ee0207713..730881ff2 100644 --- a/interface/src/app/status/SystemLog.tsx +++ b/interface/src/app/status/SystemLog.tsx @@ -8,7 +8,7 @@ import { Box, Button, Checkbox, - Grid2 as Grid, + Grid, IconButton, MenuItem, TextField, diff --git a/interface/src/app/status/Version.tsx b/interface/src/app/status/Version.tsx index b8fc7881b..607906365 100644 --- a/interface/src/app/status/Version.tsx +++ b/interface/src/app/status/Version.tsx @@ -15,7 +15,7 @@ import { DialogContent, DialogTitle, FormControlLabel, - Grid2 as Grid, + Grid, Link, Typography } from '@mui/material'; diff --git a/interface/yarn.lock b/interface/yarn.lock index d6733d27f..ae65d57c9 100644 --- a/interface/yarn.lock +++ b/interface/yarn.lock @@ -44,7 +44,7 @@ __metadata: languageName: node linkType: hard -"@babel/compat-data@npm:^7.26.5": +"@babel/compat-data@npm:^7.26.8": version: 7.26.8 resolution: "@babel/compat-data@npm:7.26.8" checksum: 10c0/66408a0388c3457fff1c2f6c3a061278dd7b3d2f0455ea29bb7b187fa52c60ae8b4054b3c0a184e21e45f0eaac63cf390737bc7504d1f4a088a6e7f652c068ca @@ -74,16 +74,16 @@ __metadata: languageName: node linkType: hard -"@babel/generator@npm:^7.26.10, @babel/generator@npm:^7.26.5": - version: 7.26.10 - resolution: "@babel/generator@npm:7.26.10" +"@babel/generator@npm:^7.26.10, @babel/generator@npm:^7.26.5, @babel/generator@npm:^7.27.0": + version: 7.27.0 + resolution: "@babel/generator@npm:7.27.0" dependencies: - "@babel/parser": "npm:^7.26.10" - "@babel/types": "npm:^7.26.10" + "@babel/parser": "npm:^7.27.0" + "@babel/types": "npm:^7.27.0" "@jridgewell/gen-mapping": "npm:^0.3.5" "@jridgewell/trace-mapping": "npm:^0.3.25" jsesc: "npm:^3.0.2" - checksum: 10c0/88b3b3ea80592fc89349c4e1a145e1386e4042866d2507298adf452bf972f68d13bf699a845e6ab8c028bd52c2247013eb1221b86e1db5c9779faacba9c4b10e + checksum: 10c0/7cb10693d2b365c278f109a745dc08856cae139d262748b77b70ce1d97da84627f79648cab6940d847392c0e5d180441669ed958b3aee98d9c7d274b37c553bd languageName: node linkType: hard @@ -97,15 +97,15 @@ __metadata: linkType: hard "@babel/helper-compilation-targets@npm:^7.26.5": - version: 7.26.5 - resolution: "@babel/helper-compilation-targets@npm:7.26.5" + version: 7.27.0 + resolution: "@babel/helper-compilation-targets@npm:7.27.0" dependencies: - "@babel/compat-data": "npm:^7.26.5" + "@babel/compat-data": "npm:^7.26.8" "@babel/helper-validator-option": "npm:^7.25.9" browserslist: "npm:^4.24.0" lru-cache: "npm:^5.1.1" semver: "npm:^6.3.1" - checksum: 10c0/9da5c77e5722f1a2fcb3e893049a01d414124522bbf51323bb1a0c9dcd326f15279836450fc36f83c9e8a846f3c40e88be032ed939c5a9840922bed6073edfb4 + checksum: 10c0/375c9f80e6540118f41bd53dd54d670b8bf91235d631bdead44c8b313b26e9cd89aed5c6df770ad13a87a464497b5346bb72b9462ba690473da422f5402618b6 languageName: node linkType: hard @@ -161,23 +161,23 @@ __metadata: linkType: hard "@babel/helpers@npm:^7.26.10": - version: 7.26.10 - resolution: "@babel/helpers@npm:7.26.10" + version: 7.27.0 + resolution: "@babel/helpers@npm:7.27.0" dependencies: - "@babel/template": "npm:^7.26.9" - "@babel/types": "npm:^7.26.10" - checksum: 10c0/f99e1836bcffce96db43158518bb4a24cf266820021f6461092a776cba2dc01d9fc8b1b90979d7643c5c2ab7facc438149064463a52dd528b21c6ab32509784f + "@babel/template": "npm:^7.27.0" + "@babel/types": "npm:^7.27.0" + checksum: 10c0/a3c64fd2d8b164c041808826cc00769d814074ea447daaacaf2e3714b66d3f4237ef6e420f61d08f463d6608f3468c2ac5124ab7c68f704e20384def5ade95f4 languageName: node linkType: hard -"@babel/parser@npm:^7.26.10, @babel/parser@npm:^7.26.7, @babel/parser@npm:^7.26.9": - version: 7.26.10 - resolution: "@babel/parser@npm:7.26.10" +"@babel/parser@npm:^7.26.10, @babel/parser@npm:^7.26.7, @babel/parser@npm:^7.27.0": + version: 7.27.0 + resolution: "@babel/parser@npm:7.27.0" dependencies: - "@babel/types": "npm:^7.26.10" + "@babel/types": "npm:^7.27.0" bin: parser: ./bin/babel-parser.js - checksum: 10c0/c47f5c0f63cd12a663e9dc94a635f9efbb5059d98086a92286d7764357c66bceba18ccbe79333e01e9be3bfb8caba34b3aaebfd8e62c3d5921c8cf907267be75 + checksum: 10c0/ba2ed3f41735826546a3ef2a7634a8d10351df221891906e59b29b0a0cd748f9b0e7a6f07576858a9de8e77785aad925c8389ddef146de04ea2842047c9d2859 languageName: node linkType: hard @@ -218,48 +218,48 @@ __metadata: languageName: node linkType: hard -"@babel/runtime@npm:^7.0.0, @babel/runtime@npm:^7.12.5, @babel/runtime@npm:^7.18.3, @babel/runtime@npm:^7.26.0, @babel/runtime@npm:^7.5.5, @babel/runtime@npm:^7.8.7": - version: 7.26.10 - resolution: "@babel/runtime@npm:7.26.10" +"@babel/runtime@npm:^7.0.0, @babel/runtime@npm:^7.12.5, @babel/runtime@npm:^7.18.3, @babel/runtime@npm:^7.26.10, @babel/runtime@npm:^7.5.5, @babel/runtime@npm:^7.8.7": + version: 7.27.0 + resolution: "@babel/runtime@npm:7.27.0" dependencies: regenerator-runtime: "npm:^0.14.0" - checksum: 10c0/6dc6d88c7908f505c4f7770fb4677dfa61f68f659b943c2be1f2a99cb6680343462867abf2d49822adc435932919b36c77ac60125793e719ea8745f2073d3745 + checksum: 10c0/35091ea9de48bd7fd26fb177693d64f4d195eb58ab2b142b893b7f3fa0f1d7c677604d36499ae0621a3703f35ba0c6a8f6c572cc8f7dc0317213841e493cf663 languageName: node linkType: hard -"@babel/template@npm:^7.26.9": - version: 7.26.9 - resolution: "@babel/template@npm:7.26.9" +"@babel/template@npm:^7.26.9, @babel/template@npm:^7.27.0": + version: 7.27.0 + resolution: "@babel/template@npm:7.27.0" dependencies: "@babel/code-frame": "npm:^7.26.2" - "@babel/parser": "npm:^7.26.9" - "@babel/types": "npm:^7.26.9" - checksum: 10c0/019b1c4129cc01ad63e17529089c2c559c74709d225f595eee017af227fee11ae8a97a6ab19ae6768b8aa22d8d75dcb60a00b28f52e9fa78140672d928bc1ae9 + "@babel/parser": "npm:^7.27.0" + "@babel/types": "npm:^7.27.0" + checksum: 10c0/13af543756127edb5f62bf121f9b093c09a2b6fe108373887ccffc701465cfbcb17e07cf48aa7f440415b263f6ec006e9415c79dfc2e8e6010b069435f81f340 languageName: node linkType: hard "@babel/traverse@npm:^7.25.9, @babel/traverse@npm:^7.26.10, @babel/traverse@npm:^7.26.7": - version: 7.26.10 - resolution: "@babel/traverse@npm:7.26.10" + version: 7.27.0 + resolution: "@babel/traverse@npm:7.27.0" dependencies: "@babel/code-frame": "npm:^7.26.2" - "@babel/generator": "npm:^7.26.10" - "@babel/parser": "npm:^7.26.10" - "@babel/template": "npm:^7.26.9" - "@babel/types": "npm:^7.26.10" + "@babel/generator": "npm:^7.27.0" + "@babel/parser": "npm:^7.27.0" + "@babel/template": "npm:^7.27.0" + "@babel/types": "npm:^7.27.0" debug: "npm:^4.3.1" globals: "npm:^11.1.0" - checksum: 10c0/4e86bb4e3c30a6162bb91df86329df79d96566c3e2d9ccba04f108c30473a3a4fd360d9990531493d90f6a12004f10f616bf9b9229ca30c816b708615e9de2ac + checksum: 10c0/c7af29781960dacaae51762e8bc6c4b13d6ab4b17312990fbca9fc38e19c4ad7fecaae24b1cf52fb844e8e6cdc76c70ad597f90e496bcb3cc0a1d66b41a0aa5b languageName: node linkType: hard -"@babel/types@npm:^7.25.9, @babel/types@npm:^7.26.10, @babel/types@npm:^7.26.7, @babel/types@npm:^7.26.9": - version: 7.26.10 - resolution: "@babel/types@npm:7.26.10" +"@babel/types@npm:^7.25.9, @babel/types@npm:^7.26.10, @babel/types@npm:^7.26.7, @babel/types@npm:^7.27.0": + version: 7.27.0 + resolution: "@babel/types@npm:7.27.0" dependencies: "@babel/helper-string-parser": "npm:^7.25.9" "@babel/helper-validator-identifier": "npm:^7.25.9" - checksum: 10c0/7a7f83f568bfc3dfabfaf9ae3a97ab5c061726c0afa7dcd94226d4f84a81559da368ed79671e3a8039d16f12476cf110381a377ebdea07587925f69628200dac + checksum: 10c0/6f1592eabe243c89a608717b07b72969be9d9d2fce1dee21426238757ea1fa60fdfc09b29de9e48d8104311afc6e6fb1702565a9cc1e09bc1e76f2b2ddb0f6e1 languageName: node linkType: hard @@ -790,38 +790,38 @@ __metadata: languageName: node linkType: hard -"@mui/core-downloads-tracker@npm:^6.4.8": - version: 6.4.8 - resolution: "@mui/core-downloads-tracker@npm:6.4.8" - checksum: 10c0/400284ecfa4c5584148409c09b4fc7be7a59505876e41caa0d7d1b2571df43cc6857a3cc34ce61d658892b7d268ba10572b8f51f0d015a9b74a40bdbba50eca6 +"@mui/core-downloads-tracker@npm:^7.0.0": + version: 7.0.0 + resolution: "@mui/core-downloads-tracker@npm:7.0.0" + checksum: 10c0/3028987b44763774f7adf16326687a2045d4802ad3957862e262912cca63ac07f918239b2944dd0e9892df44f9c4c588cebeeb5df06e2d577b809bc432369832 languageName: node linkType: hard -"@mui/icons-material@npm:^6.4.8": - version: 6.4.8 - resolution: "@mui/icons-material@npm:6.4.8" +"@mui/icons-material@npm:^7.0.0": + version: 7.0.0 + resolution: "@mui/icons-material@npm:7.0.0" dependencies: - "@babel/runtime": "npm:^7.26.0" + "@babel/runtime": "npm:^7.26.10" peerDependencies: - "@mui/material": ^6.4.8 + "@mui/material": ^7.0.0 "@types/react": ^17.0.0 || ^18.0.0 || ^19.0.0 react: ^17.0.0 || ^18.0.0 || ^19.0.0 peerDependenciesMeta: "@types/react": optional: true - checksum: 10c0/5043f3dc013c8a5edcde71432f81a6adeb66ebeb31e9840f2734ef7cd2608e8f9b6200b03b2b6e22001b4b86a647df5ac10231795a307cb359e2bfe0166d9783 + checksum: 10c0/3915dc9bc873beba3d1846b5e4dab5ee8fa77292be68c5bc58951aaf18fb015e149fbb2a7d17a344c3ac109c238d4b6630dc4379bb5b253f6126f82069ae8a01 languageName: node linkType: hard -"@mui/material@npm:^6.4.8": - version: 6.4.8 - resolution: "@mui/material@npm:6.4.8" +"@mui/material@npm:^7.0.0": + version: 7.0.0 + resolution: "@mui/material@npm:7.0.0" dependencies: - "@babel/runtime": "npm:^7.26.0" - "@mui/core-downloads-tracker": "npm:^6.4.8" - "@mui/system": "npm:^6.4.8" - "@mui/types": "npm:~7.2.24" - "@mui/utils": "npm:^6.4.8" + "@babel/runtime": "npm:^7.26.10" + "@mui/core-downloads-tracker": "npm:^7.0.0" + "@mui/system": "npm:^7.0.0" + "@mui/types": "npm:^7.4.0" + "@mui/utils": "npm:^7.0.0" "@popperjs/core": "npm:^2.11.8" "@types/react-transition-group": "npm:^4.4.12" clsx: "npm:^2.1.1" @@ -832,7 +832,7 @@ __metadata: peerDependencies: "@emotion/react": ^11.5.0 "@emotion/styled": ^11.3.0 - "@mui/material-pigment-css": ^6.4.8 + "@mui/material-pigment-css": ^7.0.0 "@types/react": ^17.0.0 || ^18.0.0 || ^19.0.0 react: ^17.0.0 || ^18.0.0 || ^19.0.0 react-dom: ^17.0.0 || ^18.0.0 || ^19.0.0 @@ -845,16 +845,16 @@ __metadata: optional: true "@types/react": optional: true - checksum: 10c0/9604e11cbb862cdc4219f6973023ad126296ac1421cfd661db09a1bac296cfb6c3c81643790944ba9037555581ff8d590bfab4d6c60cec3ec6f56868579eb7af + checksum: 10c0/165a646d238b9e9b8c66efb55a46612aced2466c9e7cbf3808d0ad4c0200f757c26a5c227cf02aaa1978e6f27f76f8c17ad2c4cf29e010de83b7e15caae278d6 languageName: node linkType: hard -"@mui/private-theming@npm:^6.4.8": - version: 6.4.8 - resolution: "@mui/private-theming@npm:6.4.8" +"@mui/private-theming@npm:^7.0.0": + version: 7.0.0 + resolution: "@mui/private-theming@npm:7.0.0" dependencies: - "@babel/runtime": "npm:^7.26.0" - "@mui/utils": "npm:^6.4.8" + "@babel/runtime": "npm:^7.26.10" + "@mui/utils": "npm:^7.0.0" prop-types: "npm:^15.8.1" peerDependencies: "@types/react": ^17.0.0 || ^18.0.0 || ^19.0.0 @@ -862,15 +862,15 @@ __metadata: peerDependenciesMeta: "@types/react": optional: true - checksum: 10c0/5acc9ad80d70757d31e6f95e833833826c1885ef90b6ae5de5cfe2883c4b276427efb5b0ba0bba0eb37fe80e5a7ae91c2d193807f32812c30be4d53d6ee9eb18 + checksum: 10c0/c901aeee59add7b36382282a0338ec4bbfd1e22d8759c127c497fd6f6ddb464eba04dc611e86aaaa6ae44dd11037950d7bfa33189314b5e8993ceceff072863f languageName: node linkType: hard -"@mui/styled-engine@npm:^6.4.8": - version: 6.4.8 - resolution: "@mui/styled-engine@npm:6.4.8" +"@mui/styled-engine@npm:^7.0.0": + version: 7.0.0 + resolution: "@mui/styled-engine@npm:7.0.0" dependencies: - "@babel/runtime": "npm:^7.26.0" + "@babel/runtime": "npm:^7.26.10" "@emotion/cache": "npm:^11.13.5" "@emotion/serialize": "npm:^1.3.3" "@emotion/sheet": "npm:^1.4.0" @@ -885,19 +885,19 @@ __metadata: optional: true "@emotion/styled": optional: true - checksum: 10c0/25731348f3bd1767d2528419671c3b6e75911a6fdb1f71f94b1fa009b95c3a6875bd38727a93f32edbf1ed2c1ab4c08433aaee0b136b45d3dd01e223fa025422 + checksum: 10c0/9ed5ee9b16ced11ecc411ad1c98613e17a634d17868bdbb668cf57ccd9d4fe248a22607def8327e0ddc289444a4b40e3d629e6220b78d60634c4d7c80810533f languageName: node linkType: hard -"@mui/system@npm:^6.4.8": - version: 6.4.8 - resolution: "@mui/system@npm:6.4.8" +"@mui/system@npm:^7.0.0": + version: 7.0.0 + resolution: "@mui/system@npm:7.0.0" dependencies: - "@babel/runtime": "npm:^7.26.0" - "@mui/private-theming": "npm:^6.4.8" - "@mui/styled-engine": "npm:^6.4.8" - "@mui/types": "npm:~7.2.24" - "@mui/utils": "npm:^6.4.8" + "@babel/runtime": "npm:^7.26.10" + "@mui/private-theming": "npm:^7.0.0" + "@mui/styled-engine": "npm:^7.0.0" + "@mui/types": "npm:^7.4.0" + "@mui/utils": "npm:^7.0.0" clsx: "npm:^2.1.1" csstype: "npm:^3.1.3" prop-types: "npm:^15.8.1" @@ -913,28 +913,30 @@ __metadata: optional: true "@types/react": optional: true - checksum: 10c0/72cc6ce2a6695b2487fc0308ae04d93a3a3f7d5abf15c830bffb2ec9aac473167ab4f2b147035a2442d9f1dd5f5936f2aa71d7fa95afbddc195c442882920b73 + checksum: 10c0/4fb99d0594be2783d78cf820389aeb9a8c7ace69eea1edde3fae84e598223e8e35605074d8bc7fdaf25b4f414d82963d4f0bf421a6a50ab547e3fa2b10869cff languageName: node linkType: hard -"@mui/types@npm:~7.2.24": - version: 7.2.24 - resolution: "@mui/types@npm:7.2.24" +"@mui/types@npm:^7.4.0": + version: 7.4.0 + resolution: "@mui/types@npm:7.4.0" + dependencies: + "@babel/runtime": "npm:^7.26.10" peerDependencies: "@types/react": ^17.0.0 || ^18.0.0 || ^19.0.0 peerDependenciesMeta: "@types/react": optional: true - checksum: 10c0/7756339cae70e9b684c4311924e4e3882f908552b69c434b4d13faf2f5908ce72fe889a31890257c5ad42a085207be7c1661981dfc683293e90ac6dfac3759d0 + checksum: 10c0/1f456206e8c6742a76c265d6c407a930d7126b03aac98949bd35a1edd14db1fd98c5169266a7948b9e24d0295adbeb3b58635eceb38217ee5f2d04d88b6b7d1c languageName: node linkType: hard -"@mui/utils@npm:^6.4.8": - version: 6.4.8 - resolution: "@mui/utils@npm:6.4.8" +"@mui/utils@npm:^7.0.0": + version: 7.0.0 + resolution: "@mui/utils@npm:7.0.0" dependencies: - "@babel/runtime": "npm:^7.26.0" - "@mui/types": "npm:~7.2.24" + "@babel/runtime": "npm:^7.26.10" + "@mui/types": "npm:^7.4.0" "@types/prop-types": "npm:^15.7.14" clsx: "npm:^2.1.1" prop-types: "npm:^15.8.1" @@ -945,7 +947,7 @@ __metadata: peerDependenciesMeta: "@types/react": optional: true - checksum: 10c0/df2392c3a2bb5a9549eec9b897ec418d40d41f74f8317ccc0e86c6973358d0ede46e10927581415c9d265067739be3a5b7ce3ec8027375bf526cdaa2a8560862 + checksum: 10c0/89c6df710ddbd506a77428a1c0bd600c8902ccad42ff9e0d49df2435d236aa9a2d5bf600f473a742bb2934632165206caacfac2315cf2a03644f1aa6aeb4cbc1 languageName: node linkType: hard @@ -1089,135 +1091,142 @@ __metadata: languageName: node linkType: hard -"@rollup/rollup-android-arm-eabi@npm:4.36.0": - version: 4.36.0 - resolution: "@rollup/rollup-android-arm-eabi@npm:4.36.0" +"@rollup/rollup-android-arm-eabi@npm:4.37.0": + version: 4.37.0 + resolution: "@rollup/rollup-android-arm-eabi@npm:4.37.0" conditions: os=android & cpu=arm languageName: node linkType: hard -"@rollup/rollup-android-arm64@npm:4.36.0": - version: 4.36.0 - resolution: "@rollup/rollup-android-arm64@npm:4.36.0" +"@rollup/rollup-android-arm64@npm:4.37.0": + version: 4.37.0 + resolution: "@rollup/rollup-android-arm64@npm:4.37.0" conditions: os=android & cpu=arm64 languageName: node linkType: hard -"@rollup/rollup-darwin-arm64@npm:4.36.0": - version: 4.36.0 - resolution: "@rollup/rollup-darwin-arm64@npm:4.36.0" +"@rollup/rollup-darwin-arm64@npm:4.37.0": + version: 4.37.0 + resolution: "@rollup/rollup-darwin-arm64@npm:4.37.0" conditions: os=darwin & cpu=arm64 languageName: node linkType: hard -"@rollup/rollup-darwin-x64@npm:4.36.0": - version: 4.36.0 - resolution: "@rollup/rollup-darwin-x64@npm:4.36.0" +"@rollup/rollup-darwin-x64@npm:4.37.0": + version: 4.37.0 + resolution: "@rollup/rollup-darwin-x64@npm:4.37.0" conditions: os=darwin & cpu=x64 languageName: node linkType: hard -"@rollup/rollup-freebsd-arm64@npm:4.36.0": - version: 4.36.0 - resolution: "@rollup/rollup-freebsd-arm64@npm:4.36.0" +"@rollup/rollup-freebsd-arm64@npm:4.37.0": + version: 4.37.0 + resolution: "@rollup/rollup-freebsd-arm64@npm:4.37.0" conditions: os=freebsd & cpu=arm64 languageName: node linkType: hard -"@rollup/rollup-freebsd-x64@npm:4.36.0": - version: 4.36.0 - resolution: "@rollup/rollup-freebsd-x64@npm:4.36.0" +"@rollup/rollup-freebsd-x64@npm:4.37.0": + version: 4.37.0 + resolution: "@rollup/rollup-freebsd-x64@npm:4.37.0" conditions: os=freebsd & cpu=x64 languageName: node linkType: hard -"@rollup/rollup-linux-arm-gnueabihf@npm:4.36.0": - version: 4.36.0 - resolution: "@rollup/rollup-linux-arm-gnueabihf@npm:4.36.0" +"@rollup/rollup-linux-arm-gnueabihf@npm:4.37.0": + version: 4.37.0 + resolution: "@rollup/rollup-linux-arm-gnueabihf@npm:4.37.0" conditions: os=linux & cpu=arm & libc=glibc languageName: node linkType: hard -"@rollup/rollup-linux-arm-musleabihf@npm:4.36.0": - version: 4.36.0 - resolution: "@rollup/rollup-linux-arm-musleabihf@npm:4.36.0" +"@rollup/rollup-linux-arm-musleabihf@npm:4.37.0": + version: 4.37.0 + resolution: "@rollup/rollup-linux-arm-musleabihf@npm:4.37.0" conditions: os=linux & cpu=arm & libc=musl languageName: node linkType: hard -"@rollup/rollup-linux-arm64-gnu@npm:4.36.0": - version: 4.36.0 - resolution: "@rollup/rollup-linux-arm64-gnu@npm:4.36.0" +"@rollup/rollup-linux-arm64-gnu@npm:4.37.0": + version: 4.37.0 + resolution: "@rollup/rollup-linux-arm64-gnu@npm:4.37.0" conditions: os=linux & cpu=arm64 & libc=glibc languageName: node linkType: hard -"@rollup/rollup-linux-arm64-musl@npm:4.36.0": - version: 4.36.0 - resolution: "@rollup/rollup-linux-arm64-musl@npm:4.36.0" +"@rollup/rollup-linux-arm64-musl@npm:4.37.0": + version: 4.37.0 + resolution: "@rollup/rollup-linux-arm64-musl@npm:4.37.0" conditions: os=linux & cpu=arm64 & libc=musl languageName: node linkType: hard -"@rollup/rollup-linux-loongarch64-gnu@npm:4.36.0": - version: 4.36.0 - resolution: "@rollup/rollup-linux-loongarch64-gnu@npm:4.36.0" +"@rollup/rollup-linux-loongarch64-gnu@npm:4.37.0": + version: 4.37.0 + resolution: "@rollup/rollup-linux-loongarch64-gnu@npm:4.37.0" conditions: os=linux & cpu=loong64 & libc=glibc languageName: node linkType: hard -"@rollup/rollup-linux-powerpc64le-gnu@npm:4.36.0": - version: 4.36.0 - resolution: "@rollup/rollup-linux-powerpc64le-gnu@npm:4.36.0" +"@rollup/rollup-linux-powerpc64le-gnu@npm:4.37.0": + version: 4.37.0 + resolution: "@rollup/rollup-linux-powerpc64le-gnu@npm:4.37.0" conditions: os=linux & cpu=ppc64 & libc=glibc languageName: node linkType: hard -"@rollup/rollup-linux-riscv64-gnu@npm:4.36.0": - version: 4.36.0 - resolution: "@rollup/rollup-linux-riscv64-gnu@npm:4.36.0" +"@rollup/rollup-linux-riscv64-gnu@npm:4.37.0": + version: 4.37.0 + resolution: "@rollup/rollup-linux-riscv64-gnu@npm:4.37.0" conditions: os=linux & cpu=riscv64 & libc=glibc languageName: node linkType: hard -"@rollup/rollup-linux-s390x-gnu@npm:4.36.0": - version: 4.36.0 - resolution: "@rollup/rollup-linux-s390x-gnu@npm:4.36.0" +"@rollup/rollup-linux-riscv64-musl@npm:4.37.0": + version: 4.37.0 + resolution: "@rollup/rollup-linux-riscv64-musl@npm:4.37.0" + conditions: os=linux & cpu=riscv64 & libc=musl + languageName: node + linkType: hard + +"@rollup/rollup-linux-s390x-gnu@npm:4.37.0": + version: 4.37.0 + resolution: "@rollup/rollup-linux-s390x-gnu@npm:4.37.0" conditions: os=linux & cpu=s390x & libc=glibc languageName: node linkType: hard -"@rollup/rollup-linux-x64-gnu@npm:4.36.0": - version: 4.36.0 - resolution: "@rollup/rollup-linux-x64-gnu@npm:4.36.0" +"@rollup/rollup-linux-x64-gnu@npm:4.37.0": + version: 4.37.0 + resolution: "@rollup/rollup-linux-x64-gnu@npm:4.37.0" conditions: os=linux & cpu=x64 & libc=glibc languageName: node linkType: hard -"@rollup/rollup-linux-x64-musl@npm:4.36.0": - version: 4.36.0 - resolution: "@rollup/rollup-linux-x64-musl@npm:4.36.0" +"@rollup/rollup-linux-x64-musl@npm:4.37.0": + version: 4.37.0 + resolution: "@rollup/rollup-linux-x64-musl@npm:4.37.0" conditions: os=linux & cpu=x64 & libc=musl languageName: node linkType: hard -"@rollup/rollup-win32-arm64-msvc@npm:4.36.0": - version: 4.36.0 - resolution: "@rollup/rollup-win32-arm64-msvc@npm:4.36.0" +"@rollup/rollup-win32-arm64-msvc@npm:4.37.0": + version: 4.37.0 + resolution: "@rollup/rollup-win32-arm64-msvc@npm:4.37.0" conditions: os=win32 & cpu=arm64 languageName: node linkType: hard -"@rollup/rollup-win32-ia32-msvc@npm:4.36.0": - version: 4.36.0 - resolution: "@rollup/rollup-win32-ia32-msvc@npm:4.36.0" +"@rollup/rollup-win32-ia32-msvc@npm:4.37.0": + version: 4.37.0 + resolution: "@rollup/rollup-win32-ia32-msvc@npm:4.37.0" conditions: os=win32 & cpu=ia32 languageName: node linkType: hard -"@rollup/rollup-win32-x64-msvc@npm:4.36.0": - version: 4.36.0 - resolution: "@rollup/rollup-win32-x64-msvc@npm:4.36.0" +"@rollup/rollup-win32-x64-msvc@npm:4.37.0": + version: 4.37.0 + resolution: "@rollup/rollup-win32-x64-msvc@npm:4.37.0" conditions: os=win32 & cpu=x64 languageName: node linkType: hard @@ -1284,13 +1293,20 @@ __metadata: languageName: node linkType: hard -"@types/estree@npm:1.0.6, @types/estree@npm:^1.0.6": +"@types/estree@npm:1.0.6": version: 1.0.6 resolution: "@types/estree@npm:1.0.6" checksum: 10c0/cdfd751f6f9065442cd40957c07fd80361c962869aa853c1c2fd03e101af8b9389d8ff4955a43a6fcfa223dd387a089937f95be0f3eec21ca527039fd2d9859a languageName: node linkType: hard +"@types/estree@npm:^1.0.6": + version: 1.0.7 + resolution: "@types/estree@npm:1.0.7" + checksum: 10c0/be815254316882f7c40847336cd484c3bc1c3e34f710d197160d455dc9d6d050ffbf4c3bc76585dba86f737f020ab20bdb137ebe0e9116b0c86c7c0342221b8c + languageName: node + linkType: hard + "@types/formidable@npm:^3": version: 3.4.5 resolution: "@types/formidable@npm:3.4.5" @@ -1406,16 +1422,7 @@ __metadata: languageName: node linkType: hard -"@types/node@npm:*": - version: 22.13.11 - resolution: "@types/node@npm:22.13.11" - dependencies: - undici-types: "npm:~6.20.0" - checksum: 10c0/f6ee33d36372242535c38640fe7550a6640d8a775ec19b55bfc11775b521cba072d892ca92a912332ce01b317293d645c1bf767f3f882ec719f2404a3d2a5b96 - languageName: node - linkType: hard - -"@types/node@npm:^22.13.13": +"@types/node@npm:*, @types/node@npm:^22.13.13": version: 22.13.13 resolution: "@types/node@npm:22.13.13" dependencies: @@ -1604,8 +1611,8 @@ __metadata: "@emotion/react": "npm:^11.14.0" "@emotion/styled": "npm:^11.14.0" "@eslint/js": "npm:^9.23.0" - "@mui/icons-material": "npm:^6.4.8" - "@mui/material": "npm:^6.4.8" + "@mui/icons-material": "npm:^7.0.0" + "@mui/material": "npm:^7.0.0" "@preact/compat": "npm:^18.3.1" "@preact/preset-vite": "npm:^2.10.1" "@table-library/react-table-library": "npm:4.1.12" @@ -2631,9 +2638,9 @@ __metadata: linkType: hard "electron-to-chromium@npm:^1.5.73": - version: 1.5.123 - resolution: "electron-to-chromium@npm:1.5.123" - checksum: 10c0/ffaa65e9337f5ba0b51d5709795c3d1074e0cae8efda24116561feed6cedd281f523be50339d991c2fc65344e66e65e7308a157ff87047a8bb4e8008412e9eb1 + version: 1.5.124 + resolution: "electron-to-chromium@npm:1.5.124" + checksum: 10c0/f27de21f8763836daf5593bbedb8b78f41e88519aa27d3232e9f3e34b0a0fd5aee9cc37a31c3a36d2fa32291827738e996e866ad8ceb479e4c45bc0ee396ecba languageName: node linkType: hard @@ -5872,28 +5879,29 @@ __metadata: linkType: hard "rollup@npm:^4.30.1": - version: 4.36.0 - resolution: "rollup@npm:4.36.0" + version: 4.37.0 + resolution: "rollup@npm:4.37.0" dependencies: - "@rollup/rollup-android-arm-eabi": "npm:4.36.0" - "@rollup/rollup-android-arm64": "npm:4.36.0" - "@rollup/rollup-darwin-arm64": "npm:4.36.0" - "@rollup/rollup-darwin-x64": "npm:4.36.0" - "@rollup/rollup-freebsd-arm64": "npm:4.36.0" - "@rollup/rollup-freebsd-x64": "npm:4.36.0" - "@rollup/rollup-linux-arm-gnueabihf": "npm:4.36.0" - "@rollup/rollup-linux-arm-musleabihf": "npm:4.36.0" - "@rollup/rollup-linux-arm64-gnu": "npm:4.36.0" - "@rollup/rollup-linux-arm64-musl": "npm:4.36.0" - "@rollup/rollup-linux-loongarch64-gnu": "npm:4.36.0" - "@rollup/rollup-linux-powerpc64le-gnu": "npm:4.36.0" - "@rollup/rollup-linux-riscv64-gnu": "npm:4.36.0" - "@rollup/rollup-linux-s390x-gnu": "npm:4.36.0" - "@rollup/rollup-linux-x64-gnu": "npm:4.36.0" - "@rollup/rollup-linux-x64-musl": "npm:4.36.0" - "@rollup/rollup-win32-arm64-msvc": "npm:4.36.0" - "@rollup/rollup-win32-ia32-msvc": "npm:4.36.0" - "@rollup/rollup-win32-x64-msvc": "npm:4.36.0" + "@rollup/rollup-android-arm-eabi": "npm:4.37.0" + "@rollup/rollup-android-arm64": "npm:4.37.0" + "@rollup/rollup-darwin-arm64": "npm:4.37.0" + "@rollup/rollup-darwin-x64": "npm:4.37.0" + "@rollup/rollup-freebsd-arm64": "npm:4.37.0" + "@rollup/rollup-freebsd-x64": "npm:4.37.0" + "@rollup/rollup-linux-arm-gnueabihf": "npm:4.37.0" + "@rollup/rollup-linux-arm-musleabihf": "npm:4.37.0" + "@rollup/rollup-linux-arm64-gnu": "npm:4.37.0" + "@rollup/rollup-linux-arm64-musl": "npm:4.37.0" + "@rollup/rollup-linux-loongarch64-gnu": "npm:4.37.0" + "@rollup/rollup-linux-powerpc64le-gnu": "npm:4.37.0" + "@rollup/rollup-linux-riscv64-gnu": "npm:4.37.0" + "@rollup/rollup-linux-riscv64-musl": "npm:4.37.0" + "@rollup/rollup-linux-s390x-gnu": "npm:4.37.0" + "@rollup/rollup-linux-x64-gnu": "npm:4.37.0" + "@rollup/rollup-linux-x64-musl": "npm:4.37.0" + "@rollup/rollup-win32-arm64-msvc": "npm:4.37.0" + "@rollup/rollup-win32-ia32-msvc": "npm:4.37.0" + "@rollup/rollup-win32-x64-msvc": "npm:4.37.0" "@types/estree": "npm:1.0.6" fsevents: "npm:~2.3.2" dependenciesMeta: @@ -5923,6 +5931,8 @@ __metadata: optional: true "@rollup/rollup-linux-riscv64-gnu": optional: true + "@rollup/rollup-linux-riscv64-musl": + optional: true "@rollup/rollup-linux-s390x-gnu": optional: true "@rollup/rollup-linux-x64-gnu": @@ -5939,7 +5949,7 @@ __metadata: optional: true bin: rollup: dist/bin/rollup - checksum: 10c0/52ad34ba18edb3613253ecbc7db5c8d6067ed103d8786051e96d42bcb383f7473bbda91b25297435b8a531fe308726cf1bb978456b9fcce044e4885510d73252 + checksum: 10c0/2e00382e08938636edfe0a7547ea2eaa027205dc0b6ff85d8b82be0fbe55a4ef88a1995fee2a5059e33dbccf12d1376c236825353afb89c96298cc95c5160a46 languageName: node linkType: hard diff --git a/mock-api/yarn.lock b/mock-api/yarn.lock index cfbc7eb43..9812c17b7 100644 --- a/mock-api/yarn.lock +++ b/mock-api/yarn.lock @@ -16,16 +16,16 @@ __metadata: languageName: node linkType: hard -"@babel/generator@npm:^7.26.10, @babel/generator@npm:^7.26.5": - version: 7.26.10 - resolution: "@babel/generator@npm:7.26.10" +"@babel/generator@npm:^7.26.5, @babel/generator@npm:^7.27.0": + version: 7.27.0 + resolution: "@babel/generator@npm:7.27.0" dependencies: - "@babel/parser": "npm:^7.26.10" - "@babel/types": "npm:^7.26.10" + "@babel/parser": "npm:^7.27.0" + "@babel/types": "npm:^7.27.0" "@jridgewell/gen-mapping": "npm:^0.3.5" "@jridgewell/trace-mapping": "npm:^0.3.25" jsesc: "npm:^3.0.2" - checksum: 10c0/88b3b3ea80592fc89349c4e1a145e1386e4042866d2507298adf452bf972f68d13bf699a845e6ab8c028bd52c2247013eb1221b86e1db5c9779faacba9c4b10e + checksum: 10c0/7cb10693d2b365c278f109a745dc08856cae139d262748b77b70ce1d97da84627f79648cab6940d847392c0e5d180441669ed958b3aee98d9c7d274b37c553bd languageName: node linkType: hard @@ -43,50 +43,50 @@ __metadata: languageName: node linkType: hard -"@babel/parser@npm:^7.26.10, @babel/parser@npm:^7.26.7, @babel/parser@npm:^7.26.9": - version: 7.26.10 - resolution: "@babel/parser@npm:7.26.10" +"@babel/parser@npm:^7.26.7, @babel/parser@npm:^7.27.0": + version: 7.27.0 + resolution: "@babel/parser@npm:7.27.0" dependencies: - "@babel/types": "npm:^7.26.10" + "@babel/types": "npm:^7.27.0" bin: parser: ./bin/babel-parser.js - checksum: 10c0/c47f5c0f63cd12a663e9dc94a635f9efbb5059d98086a92286d7764357c66bceba18ccbe79333e01e9be3bfb8caba34b3aaebfd8e62c3d5921c8cf907267be75 + checksum: 10c0/ba2ed3f41735826546a3ef2a7634a8d10351df221891906e59b29b0a0cd748f9b0e7a6f07576858a9de8e77785aad925c8389ddef146de04ea2842047c9d2859 languageName: node linkType: hard -"@babel/template@npm:^7.26.9": - version: 7.26.9 - resolution: "@babel/template@npm:7.26.9" +"@babel/template@npm:^7.27.0": + version: 7.27.0 + resolution: "@babel/template@npm:7.27.0" dependencies: "@babel/code-frame": "npm:^7.26.2" - "@babel/parser": "npm:^7.26.9" - "@babel/types": "npm:^7.26.9" - checksum: 10c0/019b1c4129cc01ad63e17529089c2c559c74709d225f595eee017af227fee11ae8a97a6ab19ae6768b8aa22d8d75dcb60a00b28f52e9fa78140672d928bc1ae9 + "@babel/parser": "npm:^7.27.0" + "@babel/types": "npm:^7.27.0" + checksum: 10c0/13af543756127edb5f62bf121f9b093c09a2b6fe108373887ccffc701465cfbcb17e07cf48aa7f440415b263f6ec006e9415c79dfc2e8e6010b069435f81f340 languageName: node linkType: hard "@babel/traverse@npm:^7.26.7": - version: 7.26.10 - resolution: "@babel/traverse@npm:7.26.10" + version: 7.27.0 + resolution: "@babel/traverse@npm:7.27.0" dependencies: "@babel/code-frame": "npm:^7.26.2" - "@babel/generator": "npm:^7.26.10" - "@babel/parser": "npm:^7.26.10" - "@babel/template": "npm:^7.26.9" - "@babel/types": "npm:^7.26.10" + "@babel/generator": "npm:^7.27.0" + "@babel/parser": "npm:^7.27.0" + "@babel/template": "npm:^7.27.0" + "@babel/types": "npm:^7.27.0" debug: "npm:^4.3.1" globals: "npm:^11.1.0" - checksum: 10c0/4e86bb4e3c30a6162bb91df86329df79d96566c3e2d9ccba04f108c30473a3a4fd360d9990531493d90f6a12004f10f616bf9b9229ca30c816b708615e9de2ac + checksum: 10c0/c7af29781960dacaae51762e8bc6c4b13d6ab4b17312990fbca9fc38e19c4ad7fecaae24b1cf52fb844e8e6cdc76c70ad597f90e496bcb3cc0a1d66b41a0aa5b languageName: node linkType: hard -"@babel/types@npm:^7.26.10, @babel/types@npm:^7.26.7, @babel/types@npm:^7.26.9": - version: 7.26.10 - resolution: "@babel/types@npm:7.26.10" +"@babel/types@npm:^7.26.7, @babel/types@npm:^7.27.0": + version: 7.27.0 + resolution: "@babel/types@npm:7.27.0" dependencies: "@babel/helper-string-parser": "npm:^7.25.9" "@babel/helper-validator-identifier": "npm:^7.25.9" - checksum: 10c0/7a7f83f568bfc3dfabfaf9ae3a97ab5c061726c0afa7dcd94226d4f84a81559da368ed79671e3a8039d16f12476cf110381a377ebdea07587925f69628200dac + checksum: 10c0/6f1592eabe243c89a608717b07b72969be9d9d2fce1dee21426238757ea1fa60fdfc09b29de9e48d8104311afc6e6fb1702565a9cc1e09bc1e76f2b2ddb0f6e1 languageName: node linkType: hard diff --git a/src/core/modbus_entity_parameters.hpp b/src/core/modbus_entity_parameters.hpp index 707e15c3d..ca33612ac 100644 --- a/src/core/modbus_entity_parameters.hpp +++ b/src/core/modbus_entity_parameters.hpp @@ -393,11 +393,11 @@ const std::initializer_list Modbus::modbus_register_ma REGISTER_MAPPING(dt::THERMOSTAT, TAG_TYPE_DHW, FL_(wwDisinfectHour), 14, 1), // disinfecthour REGISTER_MAPPING(dt::THERMOSTAT, TAG_TYPE_DHW, FL_(wwMaxTemp), 15, 1), // maxtemp REGISTER_MAPPING(dt::THERMOSTAT, TAG_TYPE_DHW, FL_(wwOneTimeKey), 16, 1), // onetimekey - REGISTER_MAPPING(dt::THERMOSTAT, TAG_TYPE_DHW, FL_(switchtime), 17, 11), // switchtime - REGISTER_MAPPING(dt::THERMOSTAT, TAG_TYPE_DHW, FL_(wwcircswitchtime), 28, 8), // circswitchtime - REGISTER_MAPPING(dt::THERMOSTAT, TAG_TYPE_DHW, FL_(holidays), 36, 13), // holidays - REGISTER_MAPPING(dt::THERMOSTAT, TAG_TYPE_DHW, FL_(vacations), 49, 13), // vacations - REGISTER_MAPPING(dt::THERMOSTAT, TAG_TYPE_DHW, FL_(wwWhenModeOff), 62, 1), // whenmodeoff + REGISTER_MAPPING(dt::THERMOSTAT, TAG_TYPE_DHW, FL_(switchtime), 17, 8), // switchtime + REGISTER_MAPPING(dt::THERMOSTAT, TAG_TYPE_DHW, FL_(wwcircswitchtime), 25, 8), // circswitchtime + REGISTER_MAPPING(dt::THERMOSTAT, TAG_TYPE_DHW, FL_(holidays), 33, 13), // holidays + REGISTER_MAPPING(dt::THERMOSTAT, TAG_TYPE_DHW, FL_(vacations), 46, 13), // vacations + REGISTER_MAPPING(dt::THERMOSTAT, TAG_TYPE_DHW, FL_(wwWhenModeOff), 59, 1), // whenmodeoff REGISTER_MAPPING(dt::MIXER, TAG_TYPE_HC, FL_(flowTempHc), 0, 1), // flowtemphc REGISTER_MAPPING(dt::MIXER, TAG_TYPE_HC, FL_(valveStatus), 1, 1), // valvestatus REGISTER_MAPPING(dt::MIXER, TAG_TYPE_HC, FL_(flowSetTemp), 2, 1), // flowsettemp diff --git a/src/core/shuntingYard.hpp b/src/core/shuntingYard.hpp index 96e520636..eef73466a 100644 --- a/src/core/shuntingYard.hpp +++ b/src/core/shuntingYard.hpp @@ -530,7 +530,11 @@ std::string calculate(const std::string & expr) { stack.push_back(to_hex(static_cast(rhd))); break; case 'd': +#ifndef EMSESP_STANDALONE stack.push_back(to_string(rhd * esp_random() / UINT32_MAX)); +#else + stack.push_back(to_string(rhd * random())); +#endif break; } } break;