Index: dialin/dg/alarms.py =================================================================== diff -u -r88b4967ce6b9ac816ac21b26326450de4b540887 -r62bdb3fb550eea0d65c407cfa2cab668dddf7805 --- dialin/dg/alarms.py (.../alarms.py) (revision 88b4967ce6b9ac816ac21b26326450de4b540887) +++ dialin/dg/alarms.py (.../alarms.py) (revision 62bdb3fb550eea0d65c407cfa2cab668dddf7805) @@ -60,7 +60,7 @@ self.alarm_conditions = [False] * self._ALARM_ID_MAX_ALARMS self.safety_shutdown_active = False - def get_alarm_states(self): + def get_alarms_states(self): """ Gets all states for all alarms Index: dialin/hd/treatment.py =================================================================== diff -u -rf68fe8233a10e080d2adf61e8a93f13680e517f0 -r62bdb3fb550eea0d65c407cfa2cab668dddf7805 --- dialin/hd/treatment.py (.../treatment.py) (revision f68fe8233a10e080d2adf61e8a93f13680e517f0) +++ dialin/hd/treatment.py (.../treatment.py) (revision 62bdb3fb550eea0d65c407cfa2cab668dddf7805) @@ -57,7 +57,8 @@ DIALYZER_TYPE_BBRAUN_PRO_16H = 1 # BBraun Diacap Pro 16H DIALYZER_TYPE_BBRAUN_PRO_19H = 2 # BBraun Diacap Pro 19H DIALYZER_TYPE_FRESENIUS_OPTIFLUX_F160NRE = 3 # Fresenius Optiflux F160NRe - DIALYZER_TYPE_FRESENIUS_OPTIFLUX_F180NRE = 4 + DIALYZER_TYPE_FRESENIUS_OPTIFLUX_F180NRE = 4 # Fresenius Optiflux F180NRe + DIALYZER_TYPE_FRESENIUS_OPTIFLUX_F200NRE = 5 # Fresenius Optiflux F200NRe # Acid Concentrate IDs ACID_CONC_TYPE_FRESENIUS_08_1251_1 = 0 @@ -1001,7 +1002,9 @@ DIALYZER_TYPE_BBRAUN_PRO_19H = 2 DIALYZER_TYPE_FRESENIUS_OPTIFLUX_F160NRE = 3 DIALYZER_TYPE_FRESENIUS_OPTIFLUX_F180NRE = 4 + DIALYZER_TYPE_FRESENIUS_OPTIFLUX_F200NRE = 5 + @param dialyzer: integer - set dialyzer type @return: 1 if successful, zero otherwise """