Skip to content

Commit

Permalink
taking back last change - seems like there in fact could be a Vitoven…
Browse files Browse the repository at this point in the history 
…t with a plus variant, as some of the vitovents have plus variants
  • Loading branch information
@pvyleta
pvyleta committed Mar 24, 2024
1 parent 5f75ee2 commit a777ea9
Show file tree
Hide file tree
Showing 7 changed files with 101 additions and 5 deletions.
0 ...ation/Vitovent200W.10104.10104.params.csv → ...Vitovent200W.10104.10104.params.basic.csv
View file
File renamed without changes.
31 changes: 31 additions & 0 deletions ebusd-configuration/Vitovent200W.10104.10104.params.plus.csv
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
# type (r[1-9];w;u),circuit,name,[comment],[QQ],ZZ,PBSB,[ID],field1,part (m/s),datatypes/templates,divider/values,unit,comment,field2,part (m/s),datatypes/templates,divider/values,unit,comment,field3,part (m/s),datatypes/templates,divider/values,unit,comment,field4,part (m/s),datatypes/templates,divider/values,unit,comment,field5,part (m/s),datatypes/templates,divider/values,unit,comment
w,Vitovent200W,RpmInletMode0,RpmInletMode0,,,4080,01,,,SIR,,%,[min:10;max:100;step:1;default:15]
r,Vitovent200W,RpmInletMode0,RpmInletMode0,,,4050,01,,,SIR,,%,,Min,,SIR,,%,[min:10],Max,,SIR,,%,[max:100],Step,,SIR,,%,[step:1],Default,,SIR,,%,[default:15]
w,Vitovent200W,RpmExhaustMode0,RpmExhaustMode0,,,4080,02,,,SIR,,%,[min:10;max:100;step:1;default:15]
r,Vitovent200W,RpmExhaustMode0,RpmExhaustMode0,,,4050,02,,,SIR,,%,,Min,,SIR,,%,[min:10],Max,,SIR,,%,[max:100],Step,,SIR,,%,[step:1],Default,,SIR,,%,[default:15]
w,Vitovent200W,RpmInletMode1,RpmInletMode1,,,4080,03,,,SIR,,%,[min:10;max:100;step:1;default:25]
r,Vitovent200W,RpmInletMode1,RpmInletMode1,,,4050,03,,,SIR,,%,,Min,,SIR,,%,[min:10],Max,,SIR,,%,[max:100],Step,,SIR,,%,[step:1],Default,,SIR,,%,[default:25]
w,Vitovent200W,RpmExhaustMode1,RpmExhaustMode1,,,4080,04,,,SIR,,%,[min:10;max:100;step:1;default:25]
r,Vitovent200W,RpmExhaustMode1,RpmExhaustMode1,,,4050,04,,,SIR,,%,,Min,,SIR,,%,[min:10],Max,,SIR,,%,[max:100],Step,,SIR,,%,[step:1],Default,,SIR,,%,[default:25]
w,Vitovent200W,RpmInletMode2,RpmInletMode2,,,4080,05,,,SIR,,%,[min:10;max:100;step:1;default:50]
r,Vitovent200W,RpmInletMode2,RpmInletMode2,,,4050,05,,,SIR,,%,,Min,,SIR,,%,[min:10],Max,,SIR,,%,[max:100],Step,,SIR,,%,[step:1],Default,,SIR,,%,[default:50]
w,Vitovent200W,RpmExhaustMode2,RpmExhaustMode2,,,4080,06,,,SIR,,%,[min:10;max:100;step:1;default:50]
r,Vitovent200W,RpmExhaustMode2,RpmExhaustMode2,,,4050,06,,,SIR,,%,,Min,,SIR,,%,[min:10],Max,,SIR,,%,[max:100],Step,,SIR,,%,[step:1],Default,,SIR,,%,[default:50]
w,Vitovent200W,RpmInletMode3,RpmInletMode3,,,4080,07,,,SIR,,%,[min:10;max:100;step:1;default:75]
r,Vitovent200W,RpmInletMode3,RpmInletMode3,,,4050,07,,,SIR,,%,,Min,,SIR,,%,[min:10],Max,,SIR,,%,[max:100],Step,,SIR,,%,[step:1],Default,,SIR,,%,[default:75]
w,Vitovent200W,RpmExhaustMode3,RpmExhaustMode3,,,4080,08,,,SIR,,%,[min:10;max:100;step:1;default:75]
r,Vitovent200W,RpmExhaustMode3,RpmExhaustMode3,,,4050,08,,,SIR,,%,,Min,,SIR,,%,[min:10],Max,,SIR,,%,[max:100],Step,,SIR,,%,[step:1],Default,,SIR,,%,[default:75]
w,Vitovent200W,BypassTemp,BypassTemp,,,4080,0a,,,SIR,10,°C,[min:150;max:350;step:5;default:220]
r,Vitovent200W,BypassTemp,BypassTemp,,,4050,0a,,,SIR,10,°C,,Min,,SIR,10,°C,[min:150],Max,,SIR,10,°C,[max:350],Step,,SIR,10,°C,[step:5],Default,,SIR,10,°C,[default:220]
w,Vitovent200W,BypassTempHyst,BypassTempHyst,,,4080,0b,,,SIR,10,°C,[min:0;max:50;step:5;default:20]
r,Vitovent200W,BypassTempHyst,BypassTempHyst,,,4050,0b,,,SIR,10,°C,,Min,,SIR,10,°C,[min:0],Max,,SIR,10,°C,[max:50],Step,,SIR,10,°C,[step:5],Default,,SIR,10,°C,[default:20]
w,Vitovent200W,BypassMode,BypassMode,,,4080,09,,,UIR,0=Auto;1=Closed;2=Open,,[min:0;max:2;step:1;default:0]
r,Vitovent200W,BypassMode,BypassMode,,,4050,09,,,UIR,0=Auto;1=Closed;2=Open,,,,,IGN:6,,,,Default,,UIR,0=Auto;1=Closed;2=Open,,[default:0] - min/max/step fields of enum message omitted
w,Vitovent200W,ExtraPreheater,ExtraPreheater,,,4080,0d,,,UIR,,,[min:0;max:1;step:1;default:0]
r,Vitovent200W,ExtraPreheater,ExtraPreheater,,,4050,0d,,,UIR,,,,Min,,UIR,,,[min:0],Max,,UIR,,,[max:1],Step,,UIR,,,[step:1],Default,,UIR,,,[default:0]
w,Vitovent200W,RHTSensorPresent,RHTSensorPresent,,,4080,0e,,,UIR,,,[min:0;max:1;step:1;default:0]
r,Vitovent200W,RHTSensorPresent,RHTSensorPresent,,,4050,0e,,,UIR,,,,Min,,UIR,,,[min:0],Max,,UIR,,,[max:1],Step,,UIR,,,[step:1],Default,,UIR,,,[default:0]
w,Vitovent200W,RHTSensorSensitivity,RHTSensorSensitivity,,,4080,0f,,,SIR,,,[min:-2;max:2;step:1;default:0]
r,Vitovent200W,RHTSensorSensitivity,RHTSensorSensitivity,,,4050,0f,,,SIR,,,,Min,,SIR,,,[min:-2],Max,,SIR,,,[max:2],Step,,SIR,,,[step:1],Default,,SIR,,,[default:0]
w,Vitovent200W,SwitchDefaultPos,SwitchDefaultPos,,,4080,10,,,UIR,0=off;1=on,,[min:0;max:1;step:1;default:1]
r,Vitovent200W,SwitchDefaultPos,SwitchDefaultPos,,,4050,10,,,UIR,0=off;1=on,,,,,IGN:6,,,,Default,,UIR,0=off;1=on,,[default:1] - min/max/step fields of enum message omitted
0 ...ation/Vitovent200W.10105.10105.params.csv → ...Vitovent200W.10105.10105.params.basic.csv
View file
File renamed without changes.
35 changes: 35 additions & 0 deletions ebusd-configuration/Vitovent200W.10105.10105.params.plus.csv
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
# type (r[1-9];w;u),circuit,name,[comment],[QQ],ZZ,PBSB,[ID],field1,part (m/s),datatypes/templates,divider/values,unit,comment,field2,part (m/s),datatypes/templates,divider/values,unit,comment,field3,part (m/s),datatypes/templates,divider/values,unit,comment,field4,part (m/s),datatypes/templates,divider/values,unit,comment,field5,part (m/s),datatypes/templates,divider/values,unit,comment
w,Vitovent200W,RpmInletMode0,RpmInletMode0,,,4080,01,,,SIR,,%,[min:10;max:100;step:1;default:15]
r,Vitovent200W,RpmInletMode0,RpmInletMode0,,,4050,01,,,SIR,,%,,Min,,SIR,,%,[min:10],Max,,SIR,,%,[max:100],Step,,SIR,,%,[step:1],Default,,SIR,,%,[default:15]
w,Vitovent200W,RpmExhaustMode0,RpmExhaustMode0,,,4080,02,,,SIR,,%,[min:10;max:100;step:1;default:15]
r,Vitovent200W,RpmExhaustMode0,RpmExhaustMode0,,,4050,02,,,SIR,,%,,Min,,SIR,,%,[min:10],Max,,SIR,,%,[max:100],Step,,SIR,,%,[step:1],Default,,SIR,,%,[default:15]
w,Vitovent200W,RpmInletMode1,RpmInletMode1,,,4080,03,,,SIR,,%,[min:10;max:100;step:1;default:25]
r,Vitovent200W,RpmInletMode1,RpmInletMode1,,,4050,03,,,SIR,,%,,Min,,SIR,,%,[min:10],Max,,SIR,,%,[max:100],Step,,SIR,,%,[step:1],Default,,SIR,,%,[default:25]
w,Vitovent200W,RpmExhaustMode1,RpmExhaustMode1,,,4080,04,,,SIR,,%,[min:10;max:100;step:1;default:25]
r,Vitovent200W,RpmExhaustMode1,RpmExhaustMode1,,,4050,04,,,SIR,,%,,Min,,SIR,,%,[min:10],Max,,SIR,,%,[max:100],Step,,SIR,,%,[step:1],Default,,SIR,,%,[default:25]
w,Vitovent200W,RpmInletMode2,RpmInletMode2,,,4080,05,,,SIR,,%,[min:10;max:100;step:1;default:50]
r,Vitovent200W,RpmInletMode2,RpmInletMode2,,,4050,05,,,SIR,,%,,Min,,SIR,,%,[min:10],Max,,SIR,,%,[max:100],Step,,SIR,,%,[step:1],Default,,SIR,,%,[default:50]
w,Vitovent200W,RpmExhaustMode2,RpmExhaustMode2,,,4080,06,,,SIR,,%,[min:10;max:100;step:1;default:50]
r,Vitovent200W,RpmExhaustMode2,RpmExhaustMode2,,,4050,06,,,SIR,,%,,Min,,SIR,,%,[min:10],Max,,SIR,,%,[max:100],Step,,SIR,,%,[step:1],Default,,SIR,,%,[default:50]
w,Vitovent200W,RpmInletMode3,RpmInletMode3,,,4080,07,,,SIR,,%,[min:10;max:100;step:1;default:75]
r,Vitovent200W,RpmInletMode3,RpmInletMode3,,,4050,07,,,SIR,,%,,Min,,SIR,,%,[min:10],Max,,SIR,,%,[max:100],Step,,SIR,,%,[step:1],Default,,SIR,,%,[default:75]
w,Vitovent200W,RpmExhaustMode3,RpmExhaustMode3,,,4080,08,,,SIR,,%,[min:10;max:100;step:1;default:75]
r,Vitovent200W,RpmExhaustMode3,RpmExhaustMode3,,,4050,08,,,SIR,,%,,Min,,SIR,,%,[min:10],Max,,SIR,,%,[max:100],Step,,SIR,,%,[step:1],Default,,SIR,,%,[default:75]
w,Vitovent200W,BypassTemp,BypassTemp,,,4080,0a,,,SIR,10,°C,[min:150;max:350;step:5;default:220]
r,Vitovent200W,BypassTemp,BypassTemp,,,4050,0a,,,SIR,10,°C,,Min,,SIR,10,°C,[min:150],Max,,SIR,10,°C,[max:350],Step,,SIR,10,°C,[step:5],Default,,SIR,10,°C,[default:220]
w,Vitovent200W,BypassTempHyst,BypassTempHyst,,,4080,0b,,,SIR,10,°C,[min:0;max:50;step:5;default:20]
r,Vitovent200W,BypassTempHyst,BypassTempHyst,,,4050,0b,,,SIR,10,°C,,Min,,SIR,10,°C,[min:0],Max,,SIR,10,°C,[max:50],Step,,SIR,10,°C,[step:5],Default,,SIR,10,°C,[default:20]
w,Vitovent200W,BypassMode,BypassMode,,,4080,09,,,UIR,0=Auto;1=Closed;2=Open,,[min:0;max:2;step:1;default:0]
r,Vitovent200W,BypassMode,BypassMode,,,4050,09,,,UIR,0=Auto;1=Closed;2=Open,,,,,IGN:6,,,,Default,,UIR,0=Auto;1=Closed;2=Open,,[default:0] - min/max/step fields of enum message omitted
w,Vitovent200W,ExtraPreheater,ExtraPreheater,,,4080,0d,,,UIR,,,[min:0;max:1;step:1;default:0]
r,Vitovent200W,ExtraPreheater,ExtraPreheater,,,4050,0d,,,UIR,,,,Min,,UIR,,,[min:0],Max,,UIR,,,[max:1],Step,,UIR,,,[step:1],Default,,UIR,,,[default:0]
w,Vitovent200W,RHTSensorPresent,RHTSensorPresent,,,4080,0e,,,UIR,,,[min:0;max:1;step:1;default:0]
r,Vitovent200W,RHTSensorPresent,RHTSensorPresent,,,4050,0e,,,UIR,,,,Min,,UIR,,,[min:0],Max,,UIR,,,[max:1],Step,,UIR,,,[step:1],Default,,UIR,,,[default:0]
w,Vitovent200W,RHTSensorSensitivity,RHTSensorSensitivity,,,4080,0f,,,SIR,,,[min:-2;max:2;step:1;default:0]
r,Vitovent200W,RHTSensorSensitivity,RHTSensorSensitivity,,,4050,0f,,,SIR,,,,Min,,SIR,,,[min:-2],Max,,SIR,,,[max:2],Step,,SIR,,,[step:1],Default,,SIR,,,[default:0]
w,Vitovent200W,SwitchDefaultPos,SwitchDefaultPos,,,4080,10,,,UIR,0=off;1=on,,[min:0;max:1;step:1;default:1]
r,Vitovent200W,SwitchDefaultPos,SwitchDefaultPos,,,4050,10,,,UIR,0=off;1=on,,,,,IGN:6,,,,Default,,UIR,0=off;1=on,,[default:1] - min/max/step fields of enum message omitted
w,Vitovent200W,DispSwitchActive,DispSwitchActive,,,4080,2a,,,UIR,,,[min:0;max:1;step:1;default:0]
r,Vitovent200W,DispSwitchActive,DispSwitchActive,,,4050,2a,,,UIR,,,,Min,,UIR,,,[min:0],Max,,UIR,,,[max:1],Step,,UIR,,,[step:1],Default,,UIR,,,[default:0]
w,Vitovent200W,UnbalanceMode,UnbalanceMode,,,4080,2b,,,UIR,0=Not Permitted;1=Permitted,,[min:0;max:1;step:1;default:1]
r,Vitovent200W,UnbalanceMode,UnbalanceMode,,,4050,2b,,,UIR,0=Not Permitted;1=Permitted,,,,,IGN:6,,,,Default,,UIR,0=Not Permitted;1=Permitted,,[default:1] - min/max/step fields of enum message omitted
0 ...ation/Vitovent200W.10106.99999.params.csv → ...Vitovent200W.10106.99999.params.basic.csv
View file
File renamed without changes.
35 changes: 35 additions & 0 deletions ebusd-configuration/Vitovent200W.10106.99999.params.plus.csv
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
# type (r[1-9];w;u),circuit,name,[comment],[QQ],ZZ,PBSB,[ID],field1,part (m/s),datatypes/templates,divider/values,unit,comment,field2,part (m/s),datatypes/templates,divider/values,unit,comment,field3,part (m/s),datatypes/templates,divider/values,unit,comment,field4,part (m/s),datatypes/templates,divider/values,unit,comment,field5,part (m/s),datatypes/templates,divider/values,unit,comment
w,Vitovent200W,RpmInletMode0,RpmInletMode0,,,4080,01,,,SIR,,%,[min:10;max:100;step:1;default:15]
r,Vitovent200W,RpmInletMode0,RpmInletMode0,,,4050,01,,,SIR,,%,,Min,,SIR,,%,[min:10],Max,,SIR,,%,[max:100],Step,,SIR,,%,[step:1],Default,,SIR,,%,[default:15]
w,Vitovent200W,RpmExhaustMode0,RpmExhaustMode0,,,4080,02,,,SIR,,%,[min:10;max:100;step:1;default:15]
r,Vitovent200W,RpmExhaustMode0,RpmExhaustMode0,,,4050,02,,,SIR,,%,,Min,,SIR,,%,[min:10],Max,,SIR,,%,[max:100],Step,,SIR,,%,[step:1],Default,,SIR,,%,[default:15]
w,Vitovent200W,RpmInletMode1,RpmInletMode1,,,4080,03,,,SIR,,%,[min:10;max:100;step:1;default:25]
r,Vitovent200W,RpmInletMode1,RpmInletMode1,,,4050,03,,,SIR,,%,,Min,,SIR,,%,[min:10],Max,,SIR,,%,[max:100],Step,,SIR,,%,[step:1],Default,,SIR,,%,[default:25]
w,Vitovent200W,RpmExhaustMode1,RpmExhaustMode1,,,4080,04,,,SIR,,%,[min:10;max:100;step:1;default:25]
r,Vitovent200W,RpmExhaustMode1,RpmExhaustMode1,,,4050,04,,,SIR,,%,,Min,,SIR,,%,[min:10],Max,,SIR,,%,[max:100],Step,,SIR,,%,[step:1],Default,,SIR,,%,[default:25]
w,Vitovent200W,RpmInletMode2,RpmInletMode2,,,4080,05,,,SIR,,%,[min:10;max:100;step:1;default:50]
r,Vitovent200W,RpmInletMode2,RpmInletMode2,,,4050,05,,,SIR,,%,,Min,,SIR,,%,[min:10],Max,,SIR,,%,[max:100],Step,,SIR,,%,[step:1],Default,,SIR,,%,[default:50]
w,Vitovent200W,RpmExhaustMode2,RpmExhaustMode2,,,4080,06,,,SIR,,%,[min:10;max:100;step:1;default:50]
r,Vitovent200W,RpmExhaustMode2,RpmExhaustMode2,,,4050,06,,,SIR,,%,,Min,,SIR,,%,[min:10],Max,,SIR,,%,[max:100],Step,,SIR,,%,[step:1],Default,,SIR,,%,[default:50]
w,Vitovent200W,RpmInletMode3,RpmInletMode3,,,4080,07,,,SIR,,%,[min:10;max:100;step:1;default:75]
r,Vitovent200W,RpmInletMode3,RpmInletMode3,,,4050,07,,,SIR,,%,,Min,,SIR,,%,[min:10],Max,,SIR,,%,[max:100],Step,,SIR,,%,[step:1],Default,,SIR,,%,[default:75]
w,Vitovent200W,RpmExhaustMode3,RpmExhaustMode3,,,4080,08,,,SIR,,%,[min:10;max:100;step:1;default:75]
r,Vitovent200W,RpmExhaustMode3,RpmExhaustMode3,,,4050,08,,,SIR,,%,,Min,,SIR,,%,[min:10],Max,,SIR,,%,[max:100],Step,,SIR,,%,[step:1],Default,,SIR,,%,[default:75]
w,Vitovent200W,BypassTemp,BypassTemp,,,4080,0a,,,SIR,10,°C,[min:100;max:300;step:5;default:200]
r,Vitovent200W,BypassTemp,BypassTemp,,,4050,0a,,,SIR,10,°C,,Min,,SIR,10,°C,[min:100],Max,,SIR,10,°C,[max:300],Step,,SIR,10,°C,[step:5],Default,,SIR,10,°C,[default:200]
w,Vitovent200W,BypassTempHyst,BypassTempHyst,,,4080,0b,,,SIR,10,°C,[min:0;max:50;step:5;default:20]
r,Vitovent200W,BypassTempHyst,BypassTempHyst,,,4050,0b,,,SIR,10,°C,,Min,,SIR,10,°C,[min:0],Max,,SIR,10,°C,[max:50],Step,,SIR,10,°C,[step:5],Default,,SIR,10,°C,[default:20]
w,Vitovent200W,BypassMode,BypassMode,,,4080,09,,,UIR,0=Auto;1=Closed;2=Open,,[min:0;max:2;step:1;default:0]
r,Vitovent200W,BypassMode,BypassMode,,,4050,09,,,UIR,0=Auto;1=Closed;2=Open,,,,,IGN:6,,,,Default,,UIR,0=Auto;1=Closed;2=Open,,[default:0] - min/max/step fields of enum message omitted
w,Vitovent200W,ExtraPreheater,ExtraPreheater,,,4080,0d,,,UIR,,,[min:0;max:1;step:1;default:0]
r,Vitovent200W,ExtraPreheater,ExtraPreheater,,,4050,0d,,,UIR,,,,Min,,UIR,,,[min:0],Max,,UIR,,,[max:1],Step,,UIR,,,[step:1],Default,,UIR,,,[default:0]
w,Vitovent200W,RHTSensorPresent,RHTSensorPresent,,,4080,0e,,,UIR,,,[min:0;max:1;step:1;default:0]
r,Vitovent200W,RHTSensorPresent,RHTSensorPresent,,,4050,0e,,,UIR,,,,Min,,UIR,,,[min:0],Max,,UIR,,,[max:1],Step,,UIR,,,[step:1],Default,,UIR,,,[default:0]
w,Vitovent200W,RHTSensorSensitivity,RHTSensorSensitivity,,,4080,0f,,,SIR,,,[min:-2;max:2;step:1;default:0]
r,Vitovent200W,RHTSensorSensitivity,RHTSensorSensitivity,,,4050,0f,,,SIR,,,,Min,,SIR,,,[min:-2],Max,,SIR,,,[max:2],Step,,SIR,,,[step:1],Default,,SIR,,,[default:0]
w,Vitovent200W,SwitchDefaultPos,SwitchDefaultPos,,,4080,10,,,UIR,0=off;1=on,,[min:0;max:1;step:1;default:1]
r,Vitovent200W,SwitchDefaultPos,SwitchDefaultPos,,,4050,10,,,UIR,0=off;1=on,,,,,IGN:6,,,,Default,,UIR,0=off;1=on,,[default:1] - min/max/step fields of enum message omitted
w,Vitovent200W,DispSwitchActive,DispSwitchActive,,,4080,2a,,,UIR,,,[min:0;max:1;step:1;default:0]
r,Vitovent200W,DispSwitchActive,DispSwitchActive,,,4050,2a,,,UIR,,,,Min,,UIR,,,[min:0],Max,,UIR,,,[max:1],Step,,UIR,,,[step:1],Default,,UIR,,,[default:0]
w,Vitovent200W,UnbalanceMode,UnbalanceMode,,,4080,2b,,,UIR,0=Not Permitted;1=Permitted,,[min:0;max:1;step:1;default:1]
r,Vitovent200W,UnbalanceMode,UnbalanceMode,,,4050,2b,,,UIR,0=Not Permitted;1=Permitted,,,,,IGN:6,,,,Default,,UIR,0=Not Permitted;1=Permitted,,[default:1] - min/max/step fields of enum message omitted
5 changes: 0 additions & 5 deletions src/parameter.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,11 +64,6 @@ def get_device_parameters() -> dict[DeviceParameters, list[Parameter]]:
if match.group('basic_auto') == "AUTO":
assert match.group('plus_manual') == "MANUAL"
assert params_basic == params_plus

# Vitovent200w for whatever reason has plus/basic parameters defined, but since it is rebranded Flair, there is no plus variant actually
if device_name == 'Vitovent200W':
assert params_basic == params_plus
has_plus_variant = False

match = re.search(
r'public (new )?const (uint|byte) CONTROLLER_CODE = (?P<controller_code>\d*);[\s\S]*'
Expand Down

0 comments on commit a777ea9

Please sign in to comment.