Merge branch 'rename' into main

keywords.txt

@@ -22,7 +22,7 @@ REMOTE_COMMANDS			KEYWORD1
 HVAC_STATUS_FLAGS			KEYWORD1
 SOLAR_STATUS_FLAGS			KEYWORD1
 SOLAR_MODE_FLAGS_AND_MASKS		KEYWORD1
-SOLAR_SLAVE_CONFIGURATION_FLAGS	KEYWORD1
+SOLAR_SECONDARY_CONFIGURATION_FLAGS	KEYWORD1
 ERROR_CODES				KEYWORD1
 MSG_TYPE				KEYWORD1
 
@@ -67,9 +67,9 @@ SOLAR_STATUS				LITERAL1
 
 FAULT_FLAGS				LITERAL1
 OEM_DIAGNOSTIC				LITERAL1
-SLAVE_CONFIGURATION			LITERAL1
-OPENTHERM_VERSION_SLAVE		LITERAL1
-SLAVE_PRODUCT_VERSION			LITERAL1
+SECONDARY_CONFIGURATION		LITERAL1
+OPENTHERM_VERSION_SECONDARY		LITERAL1
+SECONDARY_PRODUCT_VERSION		LITERAL1
 RELATIVE_MODULATION_LEVEL		LITERAL1
 CH_WATER_PRESSURE			LITERAL1
 DHW_FLOW_RATE				LITERAL1
@@ -113,9 +113,9 @@ ELECTRICAL_CURRENT_BURNER_FLAME	LITERAL1
 HVAC_RELATIVE_VENT_SETPOINT		LITERAL1
 HVAC_FAULT_FLAGS			LITERAL1
 HVAC_OEM_DIAGNOSTIC_CODE		LITERAL1
-HVAC_SLAVE_CONFIGURATION		LITERAL1
-HVAC_OPENTHERM_VERSION_SLAVE		LITERAL1
-HVAC_SLAVE_PRODUCT_VERSION		LITERAL1
+HVAC_SECONDARY_CONFIGURATION		LITERAL1
+HVAC_OPENTHERM_VERSION_SECONDARY	LITERAL1
+HVAC_SECONDARY_PRODUCT_VERSION	LITERAL1
 HVAC_RELATIVE_VENTILATION		LITERAL1
 HVAC_RELATIVE_HUMIDITY_EXHAUST	LITERAL1
 HVAC_CO2_LEVEL_EXHAUST_AIR		LITERAL1
@@ -134,8 +134,8 @@ HVAC_FAULT_BUFFER_DATA			LITERAL1
 HVAC_RF_STRENGTH_BATTERY_LEVEL	LITERAL1
 HVAC_OPERATING_MODE			LITERAL1
 SOLAR_FAULT_FLAGS			LITERAL1
-SOLAR_SLAVE_CONFIGURATION		LITERAL1
-SOLAR_SLAVE_PRODUCT_VERSION		LITERAL1
+SOLAR_SECONDARY_CONFIGURATION		LITERAL1
+SOLAR_SECONDARY_PRODUCT_VERSION	LITERAL1
 SOLAR_NUMBER_OF_TSPS			LITERAL1
 SOLAR_TSP_COMMAND			LITERAL1
 SOLAR_FAULT_BUFFER_SIZE		LITERAL1
@@ -149,9 +149,9 @@ FLAME_SIGNAL_TOO_LOW			LITERAL1
 
 CONTROL_SETPOINT_CH			LITERAL1
 CONTROL_SETPOINT_CH2			LITERAL1
-MASTER_CONFIGURATION			LITERAL1
-OPENTHERM_VERSION_MASTER		LITERAL1
-MASTER_PRODUCT_VERSION			LITERAL1
+PRIMARY_CONFIGURATION			LITERAL1
+OPENTHERM_VERSION_PRIMARY		LITERAL1
+PRIMARY_PRODUCT_VERSION		LITERAL1
 ROOM_SETPOINT				LITERAL1
 DAY_TIME				LITERAL1
 DATE					LITERAL1
@@ -174,20 +174,40 @@ COOLING_CONTROL			LITERAL1
 MAX_MODULATION_LEVEL			LITERAL1
 ROOM_TEMPERATURE_CH2			LITERAL1
 
-MASTER_CH_ENABLE			LITERAL1
-MASTER_DHW_ENABLE			LITERAL1
-MASTER_COOLING_ENABLE			LITERAL1
-MASTER_OTC_ENABLE			LITERAL1
-MASTER_CH2_ENABLE			LITERAL1
-SLAVE_FAULT_INDICATION			LITERAL1
-SLAVE_CH_MODE				LITERAL1
-SLAVE_DHW_MODE				LITERAL1
-SLAVE_FLAME_STATUS			LITERAL1
-SLAVE_COOLING_STATUS			LITERAL1
-SLAVE_CH2_MODE				LITERAL1
-SLAVE_DIAGNOSTIC_IND			LITERAL1
+PRIMARY_CH_ENABLE			LITERAL1
+PRIMARY_DHW_ENABLE			LITERAL1
+PRIMARY_COOLING_ENABLE			LITERAL1
+PRIMARY_OTC_ENABLE			LITERAL1
+PRIMARY_CH2_ENABLE			LITERAL1
+SECONDARY_FAULT_INDICATION		LITERAL1
+SECONDARY_CH_MODE			LITERAL1
+SECONDARY_DHW_MODE			LITERAL1
+SECONDARY_FLAME_STATUS			LITERAL1
+SECONDARY_COOLING_STATUS		LITERAL1
+SECONDARY_CH2_MODE			LITERAL1
+SECONDARY_DIAGNOSTIC_IND		LITERAL1
 
+ATAG					LITERAL1
+AWB					LITERAL1
+BAXI					LITERAL1
+BOSCH					LITERAL1
+BRINK					LITERAL1
+BROTJE					LITERAL1
+BULEX					LITERAL1
+DAALDEROP				LITERAL1
+DE_DIETRICH				LITERAL1
+ELCO					LITERAL1
+FERROLI				LITERAL1
+GEMINOX				LITERAL1
+HOVAL					LITERAL1
+IDEAL					LITERAL1
+INTERGAS				LITERAL1
+ITHO_DAALDEROP				LITERAL1
+NEFIT					LITERAL1
 REMEHA					LITERAL1
+UNICAL					LITERAL1
+VAILLANT				LITERAL1
+VIESSMANN				LITERAL1
 
 SERVICE_REQUEST			LITERAL1
 LOCKOUT_RESET				LITERAL1
@@ -196,12 +216,12 @@ GAS_FLAME				LITERAL1
 AIR_PRESS				LITERAL1
 WATER_OVER_TEMP			LITERAL1
 
-SLAVE_DHW_PRESENT			LITERAL1
-SLAVE_CONTROL_TYPE			LITERAL1
-SLAVE_COOLING				LITERAL1
-SLAVE_DHW				LITERAL1
-SLAVE_LOW_OFF_PUMP_CTRL		LITERAL1
-SLAVE_CH2_PRESENT			LITERAL1
+SECONDARY_DHW_PRESENT			LITERAL1
+SECONDARY_CONTROL_TYPE			LITERAL1
+SECONDARY_COOLING			LITERAL1
+SECONDARY_DHW				LITERAL1
+SECONDARY_LOW_OFF_PUMP_CTRL		LITERAL1
+SECONDARY_CH2_PRESENT			LITERAL1
 
 TRANSFER_ENABLE_DHW_SETPOINT		LITERAL1
 TRANSFER_ENABLE_MAX_CH_SETPOINT	LITERAL1
@@ -214,27 +234,27 @@ REMOTE_CHANGE_PRIORITY			LITERAL1
 BLOR					LITERAL1
 CHWF					LITERAL1
 
-MASTER_VENTILATION_ENABLE		LITERAL1
-MASTER_BYPASS_POSTION			LITERAL1
-MASTER__BYPASS_MODE			LITERAL1
-MASTER_FREE_VENTILATION_MODE		LITERAL1
-SLAVE_FAULT_INDICATION			LITERAL1
-SLAVE_VENTILATION_MODE			LITERAL1
-SLAVE_BYPASS_STATUS			LITERAL1
-SLAVE_BYPASS_AUTOMATIC_STATUS		LITERAL1
-SLAVE_FREE_VENTILATION_MODE		LITERAL1
-SLAVE_DIAGNOSTIC_IND			LITERAL1
-
-MASTER_MODE				LITERAL1
-SLAVE_FAULT_INDICATION			LITERAL1
-SLAVE_MODE				LITERAL1
-SLAVE_STATUS				LITERAL1
+PRIMARY_VENTILATION_ENABLE		LITERAL1
+PRIMARY_BYPASS_POSTION			LITERAL1
+PRIMARY_BYPASS_MODE			LITERAL1
+PRIMARY_FREE_VENTILATION_MODE		LITERAL1
+SECONDARY_FAULT_INDICATION		LITERAL1
+SECONDARY_VENTILATION_MODE		LITERAL1
+SECONDARY_BYPASS_STATUS		LITERAL1
+SECONDARY_BYPASS_AUTOMATIC_STATUS	LITERAL1
+SECONDARY_FREE_VENTILATION_MODE	LITERAL1
+SECONDARY_DIAGNOSTIC_IND		LITERAL1
+
+PRIMARY_MODE				LITERAL1
+SECONDARY_FAULT_INDICATION		LITERAL1
+SECONDARY_MODE				LITERAL1
+SECONDARY_STATUS			LITERAL1
 
 SYSTEM_TYPE				LITERAL1
 BYPASS					LITERAL1
 SPEED_CONTROL				LITERAL1
 
-SLAVE_SYSTEM_TYPE			LITERAL1
+SECONDARY_SYSTEM_TYPE			LITERAL1
 
 OK					LITERAL1
 UNKNOWN_DATA_ID			LITERAL1
@@ -244,12 +264,12 @@ RECEIVE_TIMEOUT			LITERAL1
 PARITY_ERROR				LITERAL1
 UNKNOWN_ERROR				LITERAL1
 
-MASTER_TO_SLAVE_READ_DATA		LITERAL1
-MASTER_TO_SLAVE_WRITE_DATA		LITERAL1
-MASTER_TO_SLAVE_INVALID_DATA		LITERAL1
-MASTER_TO_SLAVE_RESERVED		LITERAL1
-SLAVE_TO_MASTER_READ_ACK		LITERAL1
-SLAVE_TO_MASTER_WRITE_ACK		LITERAL1
-SLAVE_TO_MASTER_DATA_INVALID		LITERAL1
-SLAVE_TO_MASTER_UNKNOWN_DATA_ID	LITERAL1
+PRIMARY_TO_SECONDARY_READ_DATA	LITERAL1
+PRIMARY_TO_SECONDARY_WRITE_DATA	LITERAL1
+PRIMARY_TO_SECONDARY_INVALID_DATA	LITERAL1
+PRIMARY_TO_SECONDARY_RESERVED		LITERAL1
+SECONDARY_TO_PRIMARY_READ_ACK		LITERAL1
+SECONDARY_TO_PRIMARY_WRITE_ACK	LITERAL1
+SECONDARY_TO_PRIMARY_DATA_INVALID	LITERAL1
+SECONDARY_TO_PRIMARY_UNKNOWN_DATA_ID	LITERAL1