From 52ff27b14608a882bd8fb589bfcbacac7b2bf89f Mon Sep 17 00:00:00 2001 From: Jarno Rankinen Date: Sun, 15 Jan 2023 23:37:18 +0200 Subject: [PATCH] Class renaming 2 --- enervent-ctrl-python/src/PingvinKL.py | 150 ++++++++++---------- enervent-ctrl-python/src/enervent-logger.py | 2 +- 2 files changed, 76 insertions(+), 76 deletions(-) diff --git a/enervent-ctrl-python/src/PingvinKL.py b/enervent-ctrl-python/src/PingvinKL.py index bf4ab78..d840f21 100644 --- a/enervent-ctrl-python/src/PingvinKL.py +++ b/enervent-ctrl-python/src/PingvinKL.py @@ -2,7 +2,7 @@ import minimalmodbus import logging from flask import jsonify -class EnerventCoil(): +class PingvinCoil(): """Single coil data structure""" def __init__(self, symbol="reserved", description="reserved"): self.symbol = symbol @@ -24,7 +24,7 @@ class EnerventCoil(): def flip(self): self.value = not self.value -class Coils(): +class PingvinCoils(): """Class for handling Modbus coils""" coillogger = logging.getLogger(__name__) logging.basicConfig( @@ -35,78 +35,78 @@ class Coils(): ## coil descriptions and symbols courtesy of Ensto Enervent ## https://doc.enervent.com/out/out.ViewDocument.php?documentid=59 coils = [ - EnerventCoil("COIL_STOP", "Stop"), - EnerventCoil("COIL_AWAY", "Away mode"), - EnerventCoil("COIL_AWAY_L", "Away Long mode"), - EnerventCoil(), - EnerventCoil(), - EnerventCoil(), - EnerventCoil("COIL_MAX_H", "Max Heating"), - EnerventCoil("COIL_MAX_C", "Max Cooling"), - EnerventCoil("COIL_CO_BOOST_EN", "CO2 boost"), - EnerventCoil("COIL_RH_BOOST_EN", "Relative humidity boost"), - EnerventCoil("COIL_M_BOOST", "Manual boost 100%"), - EnerventCoil("COIL_TEMP_BOOST_EN", "Temperature boost"), - EnerventCoil("COIL_SNC", "Summer night cooling"), - EnerventCoil(), - EnerventCoil(), - EnerventCoil(), - EnerventCoil(), - EnerventCoil(), - EnerventCoil("COIL_AWAY_H", "Heating enabled/disabled in AWAY mode"), - EnerventCoil("COIL_AWAY_C", "Cooling enabled/disabled in AWAY mode"), - EnerventCoil(), - EnerventCoil(), - EnerventCoil(), - EnerventCoil(), - EnerventCoil(), - EnerventCoil(), - EnerventCoil(), - EnerventCoil(), - EnerventCoil(), - EnerventCoil(), - EnerventCoil("COIL_LTO_ON", "Heat recycler state (running=1, stopped = 0)"), - EnerventCoil(), - EnerventCoil("COIL_HEAT_ON", "After heater element state (On = 1, Off = 0)"), - EnerventCoil(), - EnerventCoil(), - EnerventCoil(), - EnerventCoil("COIL_TEMP_DECREASE", "Temperature decrease function"), - EnerventCoil("COIL_OVERTIME", "Programmatic equivalent of OVERTIME digital input"), - EnerventCoil(), - EnerventCoil(), - EnerventCoil("COIL_ECO_MODE", "Eco mode"), - EnerventCoil("COIL_ALARM_A", "Alarm of class A active"), - EnerventCoil("COIL_ALARM_B", "Alarm of class B active"), - EnerventCoil("COIL_CLK_PROG", "Clock program is currently active"), - EnerventCoil(), - EnerventCoil(), - EnerventCoil(), - EnerventCoil("COIL_SILENT_MODE", "Silent mode"), - EnerventCoil("COIL_STOP_SLP_COOLING", "Electrical heater cool-off function enabled when the machine has stopped"), - EnerventCoil("COIL_SERVICE_EN", "Service reminder"), - EnerventCoil(), - EnerventCoil(), - EnerventCoil("COIL_COOLING_EN", "Active cooling function enabled"), - EnerventCoil("COIL_LTO_EN"), - EnerventCoil("COIL_HEATING_EN", "Active heating function enabled"), - EnerventCoil("COIL_LTO_DEFROST_EN", "HRC defrosting function enabled during winter season"), - EnerventCoil(), - EnerventCoil(), - EnerventCoil(), - EnerventCoil(), - EnerventCoil(), - EnerventCoil(), - EnerventCoil(), - EnerventCoil(), - EnerventCoil(), - EnerventCoil(), - EnerventCoil(), - EnerventCoil(), - EnerventCoil(), - EnerventCoil(), - EnerventCoil(), - EnerventCoil() + PingvinCoil("COIL_STOP", "Stop"), + PingvinCoil("COIL_AWAY", "Away mode"), + PingvinCoil("COIL_AWAY_L", "Away Long mode"), + PingvinCoil(), + PingvinCoil(), + PingvinCoil(), + PingvinCoil("COIL_MAX_H", "Max Heating"), + PingvinCoil("COIL_MAX_C", "Max Cooling"), + PingvinCoil("COIL_CO_BOOST_EN", "CO2 boost"), + PingvinCoil("COIL_RH_BOOST_EN", "Relative humidity boost"), + PingvinCoil("COIL_M_BOOST", "Manual boost 100%"), + PingvinCoil("COIL_TEMP_BOOST_EN", "Temperature boost"), + PingvinCoil("COIL_SNC", "Summer night cooling"), + PingvinCoil(), + PingvinCoil(), + PingvinCoil(), + PingvinCoil(), + PingvinCoil(), + PingvinCoil("COIL_AWAY_H", "Heating enabled/disabled in AWAY mode"), + PingvinCoil("COIL_AWAY_C", "Cooling enabled/disabled in AWAY mode"), + PingvinCoil(), + PingvinCoil(), + PingvinCoil(), + PingvinCoil(), + PingvinCoil(), + PingvinCoil(), + PingvinCoil(), + PingvinCoil(), + PingvinCoil(), + PingvinCoil(), + PingvinCoil("COIL_LTO_ON", "Heat recycler state (running=1, stopped = 0)"), + PingvinCoil(), + PingvinCoil("COIL_HEAT_ON", "After heater element state (On = 1, Off = 0)"), + PingvinCoil(), + PingvinCoil(), + PingvinCoil(), + PingvinCoil("COIL_TEMP_DECREASE", "Temperature decrease function"), + PingvinCoil("COIL_OVERTIME", "Programmatic equivalent of OVERTIME digital input"), + PingvinCoil(), + PingvinCoil(), + PingvinCoil("COIL_ECO_MODE", "Eco mode"), + PingvinCoil("COIL_ALARM_A", "Alarm of class A active"), + PingvinCoil("COIL_ALARM_B", "Alarm of class B active"), + PingvinCoil("COIL_CLK_PROG", "Clock program is currently active"), + PingvinCoil(), + PingvinCoil(), + PingvinCoil(), + PingvinCoil("COIL_SILENT_MODE", "Silent mode"), + PingvinCoil("COIL_STOP_SLP_COOLING", "Electrical heater cool-off function enabled when the machine has stopped"), + PingvinCoil("COIL_SERVICE_EN", "Service reminder"), + PingvinCoil(), + PingvinCoil(), + PingvinCoil("COIL_COOLING_EN", "Active cooling function enabled"), + PingvinCoil("COIL_LTO_EN"), + PingvinCoil("COIL_HEATING_EN", "Active heating function enabled"), + PingvinCoil("COIL_LTO_DEFROST_EN", "HRC defrosting function enabled during winter season"), + PingvinCoil(), + PingvinCoil(), + PingvinCoil(), + PingvinCoil(), + PingvinCoil(), + PingvinCoil(), + PingvinCoil(), + PingvinCoil(), + PingvinCoil(), + PingvinCoil(), + PingvinCoil(), + PingvinCoil(), + PingvinCoil(), + PingvinCoil(), + PingvinCoil(), + PingvinCoil() ] def __init__(self, device, debug=False): @@ -172,4 +172,4 @@ class PingvinKL(): """Class for communicating with an Enervent Pinvin Kotilämpö ventilation/heating unit""" def __init__(self, serialdevice='/dev/ttyS0', modbusaddr=1, debug=False): self.pingvin = minimalmodbus.Instrument(serialdevice, modbusaddr) - self.coils = Coils(self.pingvin, debug) \ No newline at end of file + self.coils = PingvinCoils(self.pingvin, debug) \ No newline at end of file diff --git a/enervent-ctrl-python/src/enervent-logger.py b/enervent-ctrl-python/src/enervent-logger.py index 37d37a3..034994b 100755 --- a/enervent-ctrl-python/src/enervent-logger.py +++ b/enervent-ctrl-python/src/enervent-logger.py @@ -1,6 +1,6 @@ #!/usr/bin/env python import logging -from EnerventCoils import PingvinKL +from PingvinKL import PingvinKL from flask import Flask, request VERSION = "0.0.1"