Peter M. Groen / EasyOpenTherm

Commit 96c90c88764536b7dffca3a1da0c99d5e9791e91

Authored by Jeroen88
2 parents 5ed6b8b9 d4ae0482

Merge branch 'rename' into main

Inline Side-by-side
Showing 1 changed file with 74 additions and 54 deletions
keywords.txt
  View file @96c90c8
... ... @@ -22,7 +22,7 @@ REMOTE_COMMANDS KEYWORD1
22 22 HVAC_STATUS_FLAGS KEYWORD1
23 23 SOLAR_STATUS_FLAGS KEYWORD1
24 24 SOLAR_MODE_FLAGS_AND_MASKS KEYWORD1
25   -SOLAR_SLAVE_CONFIGURATION_FLAGS KEYWORD1
  25 +SOLAR_SECONDARY_CONFIGURATION_FLAGS KEYWORD1
26 26 ERROR_CODES KEYWORD1
27 27 MSG_TYPE KEYWORD1
28 28  
... ... @@ -67,9 +67,9 @@ SOLAR_STATUS LITERAL1
67 67  
68 68 FAULT_FLAGS LITERAL1
69 69 OEM_DIAGNOSTIC LITERAL1
70   -SLAVE_CONFIGURATION LITERAL1
71   -OPENTHERM_VERSION_SLAVE LITERAL1
72   -SLAVE_PRODUCT_VERSION LITERAL1
  70 +SECONDARY_CONFIGURATION LITERAL1
  71 +OPENTHERM_VERSION_SECONDARY LITERAL1
  72 +SECONDARY_PRODUCT_VERSION LITERAL1
73 73 RELATIVE_MODULATION_LEVEL LITERAL1
74 74 CH_WATER_PRESSURE LITERAL1
75 75 DHW_FLOW_RATE LITERAL1
... ... @@ -113,9 +113,9 @@ ELECTRICAL_CURRENT_BURNER_FLAME LITERAL1
113 113 HVAC_RELATIVE_VENT_SETPOINT LITERAL1
114 114 HVAC_FAULT_FLAGS LITERAL1
115 115 HVAC_OEM_DIAGNOSTIC_CODE LITERAL1
116   -HVAC_SLAVE_CONFIGURATION LITERAL1
117   -HVAC_OPENTHERM_VERSION_SLAVE LITERAL1
118   -HVAC_SLAVE_PRODUCT_VERSION LITERAL1
  116 +HVAC_SECONDARY_CONFIGURATION LITERAL1
  117 +HVAC_OPENTHERM_VERSION_SECONDARY LITERAL1
  118 +HVAC_SECONDARY_PRODUCT_VERSION LITERAL1
119 119 HVAC_RELATIVE_VENTILATION LITERAL1
120 120 HVAC_RELATIVE_HUMIDITY_EXHAUST LITERAL1
121 121 HVAC_CO2_LEVEL_EXHAUST_AIR LITERAL1
... ... @@ -134,8 +134,8 @@ HVAC_FAULT_BUFFER_DATA LITERAL1
134 134 HVAC_RF_STRENGTH_BATTERY_LEVEL LITERAL1
135 135 HVAC_OPERATING_MODE LITERAL1
136 136 SOLAR_FAULT_FLAGS LITERAL1
137   -SOLAR_SLAVE_CONFIGURATION LITERAL1
138   -SOLAR_SLAVE_PRODUCT_VERSION LITERAL1
  137 +SOLAR_SECONDARY_CONFIGURATION LITERAL1
  138 +SOLAR_SECONDARY_PRODUCT_VERSION LITERAL1
139 139 SOLAR_NUMBER_OF_TSPS LITERAL1
140 140 SOLAR_TSP_COMMAND LITERAL1
141 141 SOLAR_FAULT_BUFFER_SIZE LITERAL1
... ... @@ -149,9 +149,9 @@ FLAME_SIGNAL_TOO_LOW LITERAL1
149 149  
150 150 CONTROL_SETPOINT_CH LITERAL1
151 151 CONTROL_SETPOINT_CH2 LITERAL1
152   -MASTER_CONFIGURATION LITERAL1
153   -OPENTHERM_VERSION_MASTER LITERAL1
154   -MASTER_PRODUCT_VERSION LITERAL1
  152 +PRIMARY_CONFIGURATION LITERAL1
  153 +OPENTHERM_VERSION_PRIMARY LITERAL1
  154 +PRIMARY_PRODUCT_VERSION LITERAL1
155 155 ROOM_SETPOINT LITERAL1
156 156 DAY_TIME LITERAL1
157 157 DATE LITERAL1
... ... @@ -174,20 +174,40 @@ COOLING_CONTROL LITERAL1
174 174 MAX_MODULATION_LEVEL LITERAL1
175 175 ROOM_TEMPERATURE_CH2 LITERAL1
176 176  
177   -MASTER_CH_ENABLE LITERAL1
178   -MASTER_DHW_ENABLE LITERAL1
179   -MASTER_COOLING_ENABLE LITERAL1
180   -MASTER_OTC_ENABLE LITERAL1
181   -MASTER_CH2_ENABLE LITERAL1
182   -SLAVE_FAULT_INDICATION LITERAL1
183   -SLAVE_CH_MODE LITERAL1
184   -SLAVE_DHW_MODE LITERAL1
185   -SLAVE_FLAME_STATUS LITERAL1
186   -SLAVE_COOLING_STATUS LITERAL1
187   -SLAVE_CH2_MODE LITERAL1
188   -SLAVE_DIAGNOSTIC_IND LITERAL1
  177 +PRIMARY_CH_ENABLE LITERAL1
  178 +PRIMARY_DHW_ENABLE LITERAL1
  179 +PRIMARY_COOLING_ENABLE LITERAL1
  180 +PRIMARY_OTC_ENABLE LITERAL1
  181 +PRIMARY_CH2_ENABLE LITERAL1
  182 +SECONDARY_FAULT_INDICATION LITERAL1
  183 +SECONDARY_CH_MODE LITERAL1
  184 +SECONDARY_DHW_MODE LITERAL1
  185 +SECONDARY_FLAME_STATUS LITERAL1
  186 +SECONDARY_COOLING_STATUS LITERAL1
  187 +SECONDARY_CH2_MODE LITERAL1
  188 +SECONDARY_DIAGNOSTIC_IND LITERAL1
189 189  
  190 +ATAG LITERAL1
  191 +AWB LITERAL1
  192 +BAXI LITERAL1
  193 +BOSCH LITERAL1
  194 +BRINK LITERAL1
  195 +BROTJE LITERAL1
  196 +BULEX LITERAL1
  197 +DAALDEROP LITERAL1
  198 +DE_DIETRICH LITERAL1
  199 +ELCO LITERAL1
  200 +FERROLI LITERAL1
  201 +GEMINOX LITERAL1
  202 +HOVAL LITERAL1
  203 +IDEAL LITERAL1
  204 +INTERGAS LITERAL1
  205 +ITHO_DAALDEROP LITERAL1
  206 +NEFIT LITERAL1
190 207 REMEHA LITERAL1
  208 +UNICAL LITERAL1
  209 +VAILLANT LITERAL1
  210 +VIESSMANN LITERAL1
191 211  
192 212 SERVICE_REQUEST LITERAL1
193 213 LOCKOUT_RESET LITERAL1
... ... @@ -196,12 +216,12 @@ GAS_FLAME LITERAL1
196 216 AIR_PRESS LITERAL1
197 217 WATER_OVER_TEMP LITERAL1
198 218  
199   -SLAVE_DHW_PRESENT LITERAL1
200   -SLAVE_CONTROL_TYPE LITERAL1
201   -SLAVE_COOLING LITERAL1
202   -SLAVE_DHW LITERAL1
203   -SLAVE_LOW_OFF_PUMP_CTRL LITERAL1
204   -SLAVE_CH2_PRESENT LITERAL1
  219 +SECONDARY_DHW_PRESENT LITERAL1
  220 +SECONDARY_CONTROL_TYPE LITERAL1
  221 +SECONDARY_COOLING LITERAL1
  222 +SECONDARY_DHW LITERAL1
  223 +SECONDARY_LOW_OFF_PUMP_CTRL LITERAL1
  224 +SECONDARY_CH2_PRESENT LITERAL1
205 225  
206 226 TRANSFER_ENABLE_DHW_SETPOINT LITERAL1
207 227 TRANSFER_ENABLE_MAX_CH_SETPOINT LITERAL1
... ... @@ -214,27 +234,27 @@ REMOTE_CHANGE_PRIORITY LITERAL1
214 234 BLOR LITERAL1
215 235 CHWF LITERAL1
216 236  
217   -MASTER_VENTILATION_ENABLE LITERAL1
218   -MASTER_BYPASS_POSTION LITERAL1
219   -MASTER__BYPASS_MODE LITERAL1
220   -MASTER_FREE_VENTILATION_MODE LITERAL1
221   -SLAVE_FAULT_INDICATION LITERAL1
222   -SLAVE_VENTILATION_MODE LITERAL1
223   -SLAVE_BYPASS_STATUS LITERAL1
224   -SLAVE_BYPASS_AUTOMATIC_STATUS LITERAL1
225   -SLAVE_FREE_VENTILATION_MODE LITERAL1
226   -SLAVE_DIAGNOSTIC_IND LITERAL1
227   -
228   -MASTER_MODE LITERAL1
229   -SLAVE_FAULT_INDICATION LITERAL1
230   -SLAVE_MODE LITERAL1
231   -SLAVE_STATUS LITERAL1
  237 +PRIMARY_VENTILATION_ENABLE LITERAL1
  238 +PRIMARY_BYPASS_POSTION LITERAL1
  239 +PRIMARY_BYPASS_MODE LITERAL1
  240 +PRIMARY_FREE_VENTILATION_MODE LITERAL1
  241 +SECONDARY_FAULT_INDICATION LITERAL1
  242 +SECONDARY_VENTILATION_MODE LITERAL1
  243 +SECONDARY_BYPASS_STATUS LITERAL1
  244 +SECONDARY_BYPASS_AUTOMATIC_STATUS LITERAL1
  245 +SECONDARY_FREE_VENTILATION_MODE LITERAL1
  246 +SECONDARY_DIAGNOSTIC_IND LITERAL1
  247 +
  248 +PRIMARY_MODE LITERAL1
  249 +SECONDARY_FAULT_INDICATION LITERAL1
  250 +SECONDARY_MODE LITERAL1
  251 +SECONDARY_STATUS LITERAL1
232 252  
233 253 SYSTEM_TYPE LITERAL1
234 254 BYPASS LITERAL1
235 255 SPEED_CONTROL LITERAL1
236 256  
237   -SLAVE_SYSTEM_TYPE LITERAL1
  257 +SECONDARY_SYSTEM_TYPE LITERAL1
238 258  
239 259 OK LITERAL1
240 260 UNKNOWN_DATA_ID LITERAL1
... ... @@ -244,12 +264,12 @@ RECEIVE_TIMEOUT LITERAL1
244 264 PARITY_ERROR LITERAL1
245 265 UNKNOWN_ERROR LITERAL1
246 266  
247   -MASTER_TO_SLAVE_READ_DATA LITERAL1
248   -MASTER_TO_SLAVE_WRITE_DATA LITERAL1
249   -MASTER_TO_SLAVE_INVALID_DATA LITERAL1
250   -MASTER_TO_SLAVE_RESERVED LITERAL1
251   -SLAVE_TO_MASTER_READ_ACK LITERAL1
252   -SLAVE_TO_MASTER_WRITE_ACK LITERAL1
253   -SLAVE_TO_MASTER_DATA_INVALID LITERAL1
254   -SLAVE_TO_MASTER_UNKNOWN_DATA_ID LITERAL1
  267 +PRIMARY_TO_SECONDARY_READ_DATA LITERAL1
  268 +PRIMARY_TO_SECONDARY_WRITE_DATA LITERAL1
  269 +PRIMARY_TO_SECONDARY_INVALID_DATA LITERAL1
  270 +PRIMARY_TO_SECONDARY_RESERVED LITERAL1
  271 +SECONDARY_TO_PRIMARY_READ_ACK LITERAL1
  272 +SECONDARY_TO_PRIMARY_WRITE_ACK LITERAL1
  273 +SECONDARY_TO_PRIMARY_DATA_INVALID LITERAL1
  274 +SECONDARY_TO_PRIMARY_UNKNOWN_DATA_ID LITERAL1
255 275  
... ...