Skip to content

Update IntType with_divider() function to resolve issue with divider being calculated incorrectly (Fixes #9) #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
krcook wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Update IntType with_divider() function to resolve issue with divider being calculated incorrectly (Fixes #9) #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
58f866d
Update types.py
krcook Jan 29, 2025
4235b08
updated unit tests for change to divider
Jan 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pyebus/types.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -416,7 +416,7 @@ def _getkwargs(self):

def with_divider(self, divider):
"""Return copy and apply `divider`."""
divider = _try_int(divider * (self.divider or 1))
divider = _try_int(divider / (self.divider or 1))
min_ = _try_int(self.min_ / divider)
max_ = _try_int(self.max_ / divider)
return IntType(min_, max_, divider=divider)
Expand Down
18 changes: 9 additions & 9 deletions tests/testdata/find0.decoded.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2607,11 +2607,11 @@ MsgDef('mc.4', 'CoolingRequest', read=True)

r,mc.4,CoolingStartOffset,,s,D1C,2,,
MsgDef('mc.4', 'CoolingStartOffset', read=True)
FieldDef(0, '', IntType(0, 25, divider=4))
FieldDef(0, '', IntType(0, 100, divider=1))

w,mc.4,CoolingStartOffset,,m,D1C,2,,
MsgDef('mc.4', 'CoolingStartOffset', write=True)
FieldDef(0, '', IntType(0, 25, divider=4))
FieldDef(0, '', IntType(0, 100, divider=1))

r,mc.4,CoolingSupported,yesno,s,UCH,0=no;1=yes,,
MsgDef('mc.4', 'CoolingSupported', read=True)
Expand Down Expand Up @@ -2787,11 +2787,11 @@ MsgDef('mc.4', 'DWMOffToHeatingDelay', read=True)

r,mc.4,EfficiencyHysteresisMin,,s,D1C,2,,
MsgDef('mc.4', 'EfficiencyHysteresisMin', read=True)
FieldDef(0, '', IntType(0, 25, divider=4))
FieldDef(0, '', IntType(0, 100, divider=1))

w,mc.4,EfficiencyHysteresisMin,,m,D1C,2,,
MsgDef('mc.4', 'EfficiencyHysteresisMin', write=True)
FieldDef(0, '', IntType(0, 25, divider=4))
FieldDef(0, '', IntType(0, 100, divider=1))

r,mc.4,errorhistory,index,m,UCH,,,,status,s,UCH,,,Status,time2,s,VTM,,,Zeit,date,s,HDA,,,Datum,error,s,UIN,,,Fehlernummer
MsgDef('mc.4', 'errorhistory', read=True)
Expand Down Expand Up @@ -3093,7 +3093,7 @@ MsgDef('mc.4', 'TempDesiredLow', write=True)

r,mc.4,TempDiffInOutdoor,,s,D1C,2,,
MsgDef('mc.4', 'TempDiffInOutdoor', read=True)
FieldDef(0, '', IntType(0, 25, divider=4))
FieldDef(0, '', IntType(0, 100, divider=1))

r,mc.4,Timer.Friday,from,s,TTM,,,Slots 1-3,to,s,TTM,,,bis,from,s,TTM,,,Slot 2 von/bis,to,s,TTM,,,bis,from,s,TTM,,,Slot 3 von/bis,to,s,TTM,,,bis,daysel,s,UCH,0=selected;1=Mo-Fr;2=Sa-So;3=Mo-So,,Tage
MsgDef('mc.4', 'Timer.Friday', read=True)
Expand Down Expand Up @@ -3273,11 +3273,11 @@ MsgDef('mc.5', 'CoolingRequest', read=True)

r,mc.5,CoolingStartOffset,,s,D1C,2,,
MsgDef('mc.5', 'CoolingStartOffset', read=True)
FieldDef(0, '', IntType(0, 25, divider=4))
FieldDef(0, '', IntType(0, 100, divider=1))

w,mc.5,CoolingStartOffset,,m,D1C,2,,
MsgDef('mc.5', 'CoolingStartOffset', write=True)
FieldDef(0, '', IntType(0, 25, divider=4))
FieldDef(0, '', IntType(0, 100, divider=1))

r,mc.5,CoolingSupported,yesno,s,UCH,0=no;1=yes,,
MsgDef('mc.5', 'CoolingSupported', read=True)
Expand Down Expand Up @@ -3453,7 +3453,7 @@ MsgDef('mc.5', 'DWMOffToHeatingDelay', read=True)

r,mc.5,EfficiencyHysteresisMin,,s,D1C,2,,
MsgDef('mc.5', 'EfficiencyHysteresisMin', read=True)
FieldDef(0, '', IntType(0, 25, divider=4))
FieldDef(0, '', IntType(0, 100, divider=1))

r,mc.5,errorhistory,index,m,UCH,,,,status,s,UCH,,,Status,time2,s,VTM,,,Zeit,date,s,HDA,,,Datum,error,s,UIN,,,Fehlernummer
MsgDef('mc.5', 'errorhistory', read=True)
Expand Down Expand Up @@ -3747,7 +3747,7 @@ MsgDef('mc.5', 'TempDesiredLow', write=True)

r,mc.5,TempDiffInOutdoor,,s,D1C,2,,
MsgDef('mc.5', 'TempDiffInOutdoor', read=True)
FieldDef(0, '', IntType(0, 25, divider=4))
FieldDef(0, '', IntType(0, 100, divider=1))

r,mc.5,Timer.Friday,from,s,TTM,,,Slots 1-3,to,s,TTM,,,bis,from,s,TTM,,,Slot 2 von/bis,to,s,TTM,,,bis,from,s,TTM,,,Slot 3 von/bis,to,s,TTM,,,bis,daysel,s,UCH,0=selected;1=Mo-Fr;2=Sa-So;3=Mo-So,,Tage
MsgDef('mc.5', 'Timer.Friday', read=True)
Expand Down
4 changes: 2 additions & 2 deletions tests/testdata/icon.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,9 +88,9 @@ mdi:timer (False, True, HourMinuteType(minres=30), None)
(False, True, EnumType(('disabled', 'on', 'off', 'auto', 'eco', 'low')), None)
(False, True, IntType(0, 254), 'min')
(False, True, EnumType(('inactive', 'mixer', 'fixed', 'hwc', 'returnincr', 'pool')), None)
(True, True, IntType(0, 25, divider=4), None)
(True, True, IntType(0, 100, divider=1), None)
(True, False, IntType(-127, 127), '%')
(True, False, IntType(0, 25, divider=4), None)
(True, False, IntType(0, 100, divider=1), None)
(True, False, HexType(), None)
(False, True, IntType(0, 65534), None)
(False, True, HexType(), None)
Expand Down