Added hotwater set point and diff

motoz · Aug 15, 2014 · 5699600 · 5699600
1 parent f726348
commit 5699600
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 0 deletions.
diff --git a/src/Pellmonsrv/plugins/scottecom/datamenu.py b/src/Pellmonsrv/plugins/scottecom/datamenu.py
@@ -39,6 +39,8 @@
     'ignition_count':        ('X',   'X',      ' ',       'X',          'X',     ' ',   'X',     ' ',   ' ',   ' ',  ' ',     ' '),
     'boiler_return_temp':    ('X',   'X',      ' ',       'X',          'X',     ' ',   ' ',     ' ',   ' ',   ' ',  ' ',     'X'),
     'hotwater_temp':         ('X',   'X',      ' ',       'X',          'X',     ' ',   ' ',     ' ',   ' ',   ' ',  ' ',     'X'),
+    'hotwater_temp_set':     ('X',   'X',      'X',       'X',          ' ',     ' ',   ' ',     ' ',   ' ',   ' ',  ' ',     'X'),
+    'hotwater_temp_diff':    ('X',   'X',      'X',       'X',          ' ',     ' ',   ' ',     ' ',   ' ',   ' ',  ' ',     'X'),
     'outside_temp':          ('X',   'X',      ' ',       'X',          'X',     ' ',   ' ',     ' ',   ' ',   ' ',  ' ',     'X'),
     'indoor_temp':           ('X',   'X',      ' ',       'X',          'X',     ' ',   ' ',     ' ',   ' ',   ' ',  ' ',     'X'),
     'flow':                  ('X',   'X',      ' ',       'X',          'X',     ' ',   ' ',     ' ',   ' ',   ' ',  ' ',     ' '),

diff --git a/src/Pellmonsrv/plugins/scottecom/descriptions.py b/src/Pellmonsrv/plugins/scottecom/descriptions.py
@@ -40,6 +40,8 @@
     'ignition_count':        ('number of ignitions', 'times',  'Total number of burner cold-startups'),
     'boiler_return_temp':    ('boiler return temp', '°',  'Temperature of return flow to boiler'),
     'hotwater_temp':         ('hotwater temp', '°',  'Temperature in hotwater boiler'),
+    'hotwater_temp_set':     ('hotwater desired temp', '°',  'The desired temperature in hotwater boiler'),
+    'hotwater_temp_diff':    ('hotwater temp diff', '°',  'Shift to hotwater production when this much below the set point'),
     'outside_temp':          ('outside temp', '°',  'Outside temperature'),
     'indoor_temp':           ('indoor temp', '°',  'Indoor temperature'),
     'flow':                  ('flow', 'l/s',  'Water flow'),

diff --git a/src/Scotteprotocol/datamap.py b/src/Scotteprotocol/datamap.py
@@ -112,6 +112,8 @@
     'oxygen_regulation_P':  { ('4.99','zzzz') : param (FrameZ03, 5,     2,    'I04',   0,     5) },
     'oxygen_regulation_D':  { ('4.99','zzzz') : param (FrameZ03, 6,     0,    'I05',   0,   100) },
     'blower_off_time':      { ('4.99','zzzz') : param (FrameZ03, 9,     0,    'I07',   0,    30) },
+    'hotwater_temp_set':    { ('6.03','zzzz') : param (FrameZ03, 15,    0,    'B08',   0,    80) },
+    'hotwater_temp_diff':   { ('6.03','zzzz') : param (FrameZ03, 16,    0,    'B09',   0,    20) },
 
     'timer_heating_period': { ('6.03','zzzz') : param (FrameZ05, 9, 	0,    'K00',   0,  1440) },
     'timer_hotwater_period':{ ('6.03','zzzz') : param (FrameZ05, 10, 	0,    'K01',   0,  1440) },