mclimate-payload-helper 1.2.13 → 1.2.15

package/src/encoders/types/schemas.ts

@@ -212,24 +212,40 @@ export const Co2PirLiteEnums = {
 const GeneralCommandSchemas = {
 	customHexCommand: z.object({
 		command: z.string().regex(/^[0-9A-Fa-f]+$/, 'Must be a valid hex string'),
+		commandNumber: z.string().optional(),
 	}),
 	setKeepAlive: z.object({
 		time: z.number().int().min(1).max(255),
+		commandNumber: z.string().optional().default('02'),
+	}),
+	getKeepAlive: z.object({
+		commandNumber: z.string().optional().default('12'),
 	}),
-	getKeepAlive: z.object({}),
 	setJoinRetryPeriod: z.object({
 		period: z.number().int().min(1).max(21),
+		commandNumber: z.string().optional().default('10'),
+	}),
+	getJoinRetryPeriod: z.object({
+		commandNumber: z.string().optional().default('19'),
 	}),
-	getJoinRetryPeriod: z.object({}),
 	setUplinkType: z.object({
 		type: z.enum(['01', '00']),
+		commandNumber: z.string().optional().default('11'),
+	}),
+	getUplinkType: z.object({
+		commandNumber: z.string().optional().default('1b'),
 	}),
-	getUplinkType: z.object({}),
 	setWatchDogParams: z.object({
 		confirmedUplinks: z.number().int().min(0).max(255),
 		unconfirmedUplinks: z.number().int().min(0).max(255),
+		commandNumber: z.string().optional().default('1c'),
+	}),
+	getWatchDogParams: z.object({
+		commandNumber: z.string().optional().default('1d'),
+	}),
+	getRegion: z.object({
+		commandNumber: z.string().optional().default('a4'),
 	}),
-	getWatchDogParams: z.object({}),
 }
 
 export namespace GeneralCommandTypes {
@@ -245,8 +261,11 @@ export namespace GeneralCommandTypes {
 const ChildLockCommandSchemas = {
 	setChildLock: z.object({
 		enabled: z.boolean(),
+		commandNumber: z.string().optional().default('07'),
+	}),
+	getChildLock: z.object({
+		commandNumber: z.string().optional().default('14'),
 	}),
-	getChildLock: z.object({}),
 }
 
 export namespace ChildLockCommandTypes {
@@ -259,8 +278,11 @@ const TemperatureCommandSchemas = {
 	setTemperatureRange: z.object({
 		min: z.number().min(5).max(30),
 		max: z.number().min(5).max(30),
+		commandNumber: z.string().optional().default('08'),
+	}),
+	getTargetTemperature: z.object({
+		commandNumber: z.string().optional().default('2f'),
 	}),
-	getTargetTemperature: z.object({}),
 }
 
 export namespace TemperatureCommandTypes {
@@ -272,28 +294,46 @@ export namespace TemperatureCommandTypes {
 const PIRCommandSchemas = {
 	setPIRSensorStatus: z.object({
 		state: z.number().min(0).max(1), // 0: disabled, 1: enabled
+		commandNumber: z.string().optional().default('3c'),
+	}),
+	getPIRSensorStatus: z.object({
+		commandNumber: z.string().optional().default('3d'),
 	}),
-	getPIRSensorStatus: z.object({}),
 	setPIRSensorSensitivity: z.object({
 		sensitivity: z.number().min(12).max(255),
+		commandNumber: z.string().optional().default('3e'),
+	}),
+	getPIRSensorSensitivity: z.object({
+		commandNumber: z.string().optional().default('3f'),
 	}),
-	getPIRSensorSensitivity: z.object({}),
 	setPIRInitPeriod: z.object({
 		time: z.number().min(0).max(255),
+		commandNumber: z.string().optional().default('46'),
 	}),
 	setPIRMeasurementPeriod: z.object({
 		time: z.number().min(3).max(255),
+		commandNumber: z.string().optional().default('48'),
 	}),
 	setPIRCheckPeriod: z.object({
 		time: z.number().min(0).max(65535),
+		commandNumber: z.string().optional().default('4a'),
 	}),
 	setPIRBlindPeriod: z.object({
 		time: z.number().min(15).max(65535),
+		commandNumber: z.string().optional().default('4c'),
+	}),
+	getPIRInitPeriod: z.object({
+		commandNumber: z.string().optional().default('47'),
+	}),
+	getPIRMeasurementPeriod: z.object({
+		commandNumber: z.string().optional().default('49'),
+	}),
+	getPIRCheckPeriod: z.object({
+		commandNumber: z.string().optional().default('4b'),
+	}),
+	getPIRBlindPeriod: z.object({
+		commandNumber: z.string().optional().default('4d'),
 	}),
-	getPIRInitPeriod: z.object({}),
-	getPIRMeasurementPeriod: z.object({}),
-	getPIRCheckPeriod: z.object({}),
-	getPIRBlindPeriod: z.object({}),
 }
 
 export namespace PIRCommandTypes {
@@ -310,23 +350,36 @@ export namespace PIRCommandTypes {
 const DisplayCommandSchemas = {
 	setDisplayRefreshPeriod: z.object({
 		period: z.number().min(1).max(24),
+		commandNumber: z.string().optional().default('33'),
+	}),
+	getDisplayRefreshPeriod: z.object({
+		commandNumber: z.string().optional().default('34'),
 	}),
-	getDisplayRefreshPeriod: z.object({}),
 	setDeepSleepMode: z.object({
 		state: z.number().min(1).max(1),
+		commandNumber: z.string().optional().default('3b'),
 	}),
 	setHumidityVisibility: z.object({
 		state: z.number().min(0).max(1), // 0: hide, 1: show
+		commandNumber: z.string().optional().default('42'),
+	}),
+	getHumidityVisibility: z.object({
+		commandNumber: z.string().optional().default('43'),
 	}),
-	getHumidityVisibility: z.object({}),
 	setLightIntensityVisibility: z.object({
 		state: z.number().min(0).max(1), // 0: hide, 1: show
+		commandNumber: z.string().optional().default('44'),
+	}),
+	getLightIntensityVisibility: z.object({
+		commandNumber: z.string().optional().default('45'),
 	}),
-	getLightIntensityVisibility: z.object({}),
 	setCurrentTemperatureVisibility: z.object({
 		state: z.number().min(0).max(1), // 0: hide, 1: show
+		commandNumber: z.string().optional().default('40'),
+	}),
+	getCurrentTemperatureVisibility: z.object({
+		commandNumber: z.string().optional().default('41'),
 	}),
-	getCurrentTemperatureVisibility: z.object({}),
 }
 
 export namespace DisplayCommandTypes {
@@ -350,123 +403,198 @@ const VickiCommandSchemas = {
 		delta: z.number().min(0).max(15),
 		closeTime: z.number().min(0).max(51),
 		motorPosition: z.number().int().min(0).max(800),
+		commandNumber: z.string().optional().default('06'),
+	}),
+	getOpenWindowParams: z.object({
+		commandNumber: z.string().optional().default('13'),
+	}),
+	recalibrateMotor: z.object({
+		commandNumber: z.string().optional().default('03'),
+	}),
+	forceClose: z.object({
+		commandNumber: z.string().optional().default('0b'),
 	}),
-	getOpenWindowParams: z.object({}),
-	recalibrateMotor: z.object({}),
-	forceClose: z.object({}),
 	setInternalAlgoParams: z.object({
 		period: z.number().int().min(0).max(255),
 		pFirstLast: z.number().int().min(0).max(255),
 		pNext: z.number().int().min(0).max(255),
+		commandNumber: z.string().optional().default('0c'),
+	}),
+	getInternalAlgoParams: z.object({
+		commandNumber: z.string().optional().default('16'),
 	}),
-	getInternalAlgoParams: z.object({}),
 	setOperationalMode: z.object({
 		mode: z.enum(['00', '01', '02']),
+		commandNumber: z.string().optional().default('0d'),
+	}),
+	getOperationalMode: z.object({
+		commandNumber: z.string().optional().default('18'),
 	}),
-	getOperationalMode: z.object({}),
 	setTargetTemperature: z.object({
 		targetTemperature: z.number().min(5).max(30),
+		commandNumber: z.string().optional().default('0e'),
 	}),
 	setExternalTemperature: z.object({
 		temp: z.number().int().min(0).max(255),
+		commandNumber: z.string().optional().default('0f'),
+	}),
+	getExternalTemperature: z.object({
+		commandNumber: z.string().optional().default('44'),
 	}),
-	getExternalTemperature: z.object({}),
 	setInternalAlgoTdiffParams: z.object({
 		cold: z.number().int().min(0).max(255),
 		warm: z.number().int().min(0).max(255),
+		commandNumber: z.string().optional().default('1a'),
+	}),
+	getInternalAlgoTdiffParams: z.object({
+		commandNumber: z.string().optional().default('17'),
 	}),
-	getInternalAlgoTdiffParams: z.object({}),
 	setPrimaryOperationalMode: z.object({
 		mode: z.enum(['00', '01']),
+		commandNumber: z.string().optional().default('1e'),
+	}),
+	getPrimaryOperationalMode: z.object({
+		commandNumber: z.string().optional().default('1f'),
 	}),
-	getPrimaryOperationalMode: z.object({}),
 	setBatteryRangesBoundaries: z.object({
 		Boundary1: z.number().int().min(0).max(65535),
 		Boundary2: z.number().int().min(0).max(65535),
 		Boundary3: z.number().int().min(0).max(65535),
+		commandNumber: z.string().optional().default('20'),
 	}),
 	setBatteryRangesOverVoltage: z.object({
 		Range1: z.number().int().min(0).max(255),
 		Range2: z.number().int().min(0).max(255),
 		Range3: z.number().int().min(0).max(255),
+		commandNumber: z.string().optional().default('22'),
 	}),
 	setOvac: z.object({
 		ovac: z.number().int().min(0).max(255),
+		commandNumber: z.string().optional().default('26'),
+	}),
+	getOvac: z.object({
+		commandNumber: z.string().optional().default('27'),
 	}),
-	getOvac: z.object({}),
 	setProportionalAlgorithmParameters: z.object({
 		coefficient: z.number().min(0).max(20),
 		period: z.number().int().min(0).max(255),
+		commandNumber: z.string().optional().default('2a'),
+	}),
+	getProportionalAlgorithmParameters: z.object({
+		commandNumber: z.string().optional().default('29'),
 	}),
-	getProportionalAlgorithmParameters: z.object({}),
 	setTemperatureControlAlgorithm: z.object({
 		algorithm: z.enum(['00', '01', '02']),
+		commandNumber: z.string().optional().default('2c'),
+	}),
+	getTemperatureControlAlgorithm: z.object({
+		commandNumber: z.string().optional().default('2b'),
 	}),
-	getTemperatureControlAlgorithm: z.object({}),
 	setMotorPositionOnly: z.object({
 		position: z.number().int().min(0).max(800),
+		commandNumber: z.string().optional().default('2d'),
+	}),
+	deviceReset: z.object({
+		commandNumber: z.string().optional().default('30'),
 	}),
-	deviceReset: z.object({}),
 	setTargetTemperatureAndMotorPosition: z.object({
 		motorPosition: z.number().int().min(0).max(800),
 		targetTemperature: z.number().min(5).max(30),
+		commandNumber: z.string().optional().default('31'),
 	}),
 	setChildLockBehavior: z.object({
 		behavior: z.number().min(0).max(1),
+		commandNumber: z.string().optional().default('35'),
+	}),
+	getChildLockBehavior: z.object({
+		commandNumber: z.string().optional().default('34'),
 	}),
-	getChildLockBehavior: z.object({}),
 	setProportionalGain: z.object({
 		proportionalGain: z.number().int().min(0).max(127),
+		commandNumber: z.string().optional().default('37'),
+	}),
+	getProportionalGain: z.object({
+		commandNumber: z.string().optional().default('36'),
 	}),
-	getProportionalGain: z.object({}),
 	setExternalTemperatureFloat: z.object({
 		temp: z.number().min(0.1).max(255.0).multipleOf(0.1),
+		commandNumber: z.string().optional().default('3c'),
 	}),
 	setIntegralGain: z.object({
 		integralGain: z.number().int().min(0).max(127),
+		commandNumber: z.string().optional().default('3e'),
+	}),
+	getIntegralGain: z.object({
+		commandNumber: z.string().optional().default('3d'),
+	}),
+	getIntegralValue: z.object({
+		commandNumber: z.string().optional().default('3f'),
 	}),
-	getIntegralGain: z.object({}),
-	getIntegralValue: z.object({}),
 	setPiRunPeriod: z.object({
 		period: z.number().int().min(0).max(255),
+		commandNumber: z.string().optional().default('41'),
+	}),
+	getPiRunPeriod: z.object({
+		commandNumber: z.string().optional().default('40'),
 	}),
-	getPiRunPeriod: z.object({}),
 	setTemperatureHysteresis: z.object({
 		hysteresis: z.number().min(0.1).max(10.0).multipleOf(0.1),
+		commandNumber: z.string().optional().default('43'),
+	}),
+	getTemperatureHysteresis: z.object({
+		commandNumber: z.string().optional().default('42'),
 	}),
-	getTemperatureHysteresis: z.object({}),
 	setOpenWindowPrecisely: z.object({
 		enabled: z.boolean(),
 		duration: z.number().min(0).max(51),
 		delta: z.number().min(0.1).max(15.0).multipleOf(0.1),
+		commandNumber: z.string().optional().default('45'),
+	}),
+	getOpenWindowPrecisely: z.object({
+		commandNumber: z.string().optional().default('46'),
 	}),
-	getOpenWindowPrecisely: z.object({}),
 	setForceAttach: z.object({
 		enabled: z.boolean(),
+		commandNumber: z.string().optional().default('47'),
+	}),
+	getForceAttach: z.object({
+		commandNumber: z.string().optional().default('48'),
 	}),
-	getForceAttach: z.object({}),
 	setAntiFreezeParams: z.object({
 		activatedTemperature: z.number().min(0).max(25),
 		deactivatedTemperature: z.number().min(0).max(25),
 		targetTemperature: z.number().min(0).max(30),
+		commandNumber: z.string().optional().default('49'),
+	}),
+	getAntiFreezeParams: z.object({
+		commandNumber: z.string().optional().default('4a'),
 	}),
-	getAntiFreezeParams: z.object({}),
 	setMaxAllowedIntegralValue: z.object({
 		value: z.number().int().min(0).max(255),
+		commandNumber: z.string().optional().default('4c'),
+	}),
+	getMaxAllowedIntegralValue: z.object({
+		commandNumber: z.string().optional().default('4d'),
 	}),
-	getMaxAllowedIntegralValue: z.object({}),
 	setValveOpennessInPercentage: z.object({
 		value: z.number().min(0).max(100),
+		commandNumber: z.string().optional().default('4e'),
 	}),
 	setValveOpennessRangeInPercentage: z.object({
 		min: z.number().min(0).max(100),
 		max: z.number().min(0).max(100),
+		commandNumber: z.string().optional().default('4f'),
+	}),
+	getValveOpennessRangeInPercentage: z.object({
+		commandNumber: z.string().optional().default('50'),
 	}),
-	getValveOpennessRangeInPercentage: z.object({}),
 	setTemperatureOffset: z.object({
 		value: z.number().min(-5).max(5),
+		commandNumber: z.string().optional().default('53'),
+	}),
+	getTemperatureOffset: z.object({
+		commandNumber: z.string().optional().default('54'),
 	}),
-	getTemperatureOffset: z.object({}),
 	setHeatingEvent: z.object({
 		eventIndex: z.number().int().min(0).max(19),
 		startHour: z.number().int().min(0).max(23),
@@ -481,37 +609,46 @@ const VickiCommandSchemas = {
 			saturday: z.boolean(),
 			sunday: z.boolean(),
 		}),
+		commandNumber: z.string().optional().default('59'),
 	}),
 	setHeatingEventState: z.object({
 		eventIndex: z.number().int().min(0).max(19),
 		active: z.boolean(),
+		commandNumber: z.string().optional().default('6b'),
 	}),
 	setTimeRequestByMACcommand: z.object({
 		enabled: z.boolean(),
+		commandNumber: z.string().optional().default('6d'),
 	}),
 	setHeatingSchedule: z.object({
 		startMonth: z.number().int().min(0).max(11),
 		startDay: z.number().int().min(0).max(31), // 0 disables schedule handling
 		endMonth: z.number().int().min(0).max(11),
 		endDay: z.number().int().min(0).max(31), // 0 disables schedule handling
+		commandNumber: z.string().optional().default('5b'),
 	}),
 	setDeviceTime: z.object({
 		timestamp: z.number().int().min(0).max(4294967295), // Unsigned 32-bit integer max value
+		commandNumber: z.string().optional().default('5d'),
 	}),
 	setDeviceTimeZone: z.object({
 		offsetHours: z.number().int().min(-12).max(12), // Time zone offset in hours, range [-12:12]
+		commandNumber: z.string().optional().default('5f'),
 	}),
 	setAutomaticSetpointRestore: z.object({
 		time: z.number().int().min(0).max(255), // Time in 10-minute increments (0-2550 minutes), 0 disables the functionality
+		commandNumber: z.string().optional().default('61'),
 	}),
 	setOfflineTargetTemperature: z.object({
 		targetTemperature: z.union([
 			z.literal(0), // To disable the feature
 			z.number().min(5).max(30).multipleOf(0.1), // Temperature range 5.0-30.0°C with 0.1°C increments
 		]),
+		commandNumber: z.string().optional().default('65'),
 	}),
 	setInternalAlgoTemporaryState: z.object({
 		enabled: z.boolean(), // true = enable algorithm (00), false = disable algorithm temporarily (01)
+		commandNumber: z.string().optional().default('67'),
 	}),
 	setTemperatureLevels: z.object({
 		scaleLevel0: z.number().min(5).max(30).multipleOf(0.1),
@@ -520,9 +657,11 @@ const VickiCommandSchemas = {
 		scaleLevel3: z.number().min(5).max(30).multipleOf(0.1),
 		scaleLevel4: z.number().min(5).max(30).multipleOf(0.1),
 		scaleLevel5: z.number().min(5).max(30).multipleOf(0.1),
+		commandNumber: z.string().optional().default('69'),
 	}),
 	setLedIndicationDuration: z.object({
 		duration: z.number().min(0.5).max(20).multipleOf(0.5), // Duration in range [0.5:20] with 0.5s resolution
+		commandNumber: z.string().optional().default('63'),
 	}),
 }
 
@@ -580,53 +719,95 @@ const Relay16CommandSchemas = {
 	setOverheatingThresholds: z.object({
 		trigger: z.number().min(30).max(100),
 		recovery: z.number().min(30).max(100),
+		commandNumber: z.string().optional().default('1e'),
+	}),
+	getOverheatingThresholds: z.object({
+		commandNumber: z.string().optional().default('1f'),
 	}),
-	getOverheatingThresholds: z.object({}),
 	setOvervoltageThresholds: z.object({
 		trigger: z.number().min(1).max(255),
 		recovery: z.number().min(1).max(255),
+		commandNumber: z.string().optional().default('20'),
+	}),
+	getOvervoltageThresholds: z.object({
+		commandNumber: z.string().optional().default('21'),
 	}),
-	getOvervoltageThresholds: z.object({}),
 	setOvercurrentThreshold: z.object({
 		current: z.number().min(1).max(16),
+		commandNumber: z.string().optional().default('22'),
+	}),
+	getOvercurrentThreshold: z.object({
+		commandNumber: z.string().optional().default('23'),
 	}),
-	getOvercurrentThreshold: z.object({}),
 	setOverpowerThreshold: z.object({
 		power: z.number().min(100).max(3680),
+		commandNumber: z.string().optional().default('24'),
+	}),
+	getOverpowerThreshold: z.object({
+		commandNumber: z.string().optional().default('25'),
+	}),
+	clearAcumulatedEnergy: z.object({
+		commandNumber: z.string().optional(),
 	}),
-	getOverpowerThreshold: z.object({}),
-	clearAcumulatedEnergy: z.object({}),
 	setAfterOverheatingProtectionRecovery: z.object({
 		state: z.number().min(0).max(1), // 0: lastState, 1: OFF
+		commandNumber: z.string().optional().default('59'),
+	}),
+	getAfterOverheatingProtectionRecovery: z.object({
+		commandNumber: z.string().optional().default('5a'),
 	}),
-	getAfterOverheatingProtectionRecovery: z.object({}),
 	setLedIndicationMode: z.object({
 		mode: z.number().min(0).max(1), // 0: OFF, 1: ON
+		commandNumber: z.string().optional().default('5b'),
+	}),
+	getLedIndicationMode: z.object({
+		commandNumber: z.string().optional().default('5c'),
 	}),
-	getLedIndicationMode: z.object({}),
 	setRelayRecoveryState: z.object({
 		state: z.number().min(0).max(2), // 0: lastState, 1: ON, 2: OFF
+		commandNumber: z.string().optional().default('5e'),
+	}),
+	getRelayRecoveryState: z.object({
+		commandNumber: z.string().optional().default('5f'),
 	}),
-	getRelayRecoveryState: z.object({}),
 	setRelayState: z.object({
 		state: z.boolean(), // 0: OFF, 1: ON
+		commandNumber: z.string().optional().default('c1'),
+	}),
+	getRelayState: z.object({
+		commandNumber: z.string().optional().default('b1'),
 	}),
-	getRelayState: z.object({}),
 	setRelayTimerInMilliseconds: z.object({
 		state: z.number().min(0).max(1), // 0: OFF, 1: ON
 		time: z.number().min(0).max(65535),
+		commandNumber: z.string().optional().default('55'),
+	}),
+	getRelayTimerInMilliseconds: z.object({
+		commandNumber: z.string().optional().default('56'),
 	}),
-	getRelayTimerInMilliseconds: z.object({}),
 	setRelayTimerInSeconds: z.object({
 		state: z.number().min(0).max(1), // 0: OFF, 1: ON
 		time: z.number().min(0).max(65535),
+		commandNumber: z.string().optional().default('57'),
+	}),
+	getRelayTimerInSeconds: z.object({
+		commandNumber: z.string().optional().default('58'),
+	}),
+	getRelayStateChangeReason: z.object({
+		commandNumber: z.string().optional().default('54'),
+	}),
+	getOverheatingEvents: z.object({
+		commandNumber: z.string().optional().default('60'),
+	}),
+	getOvervoltageEvents: z.object({
+		commandNumber: z.string().optional().default('61'),
+	}),
+	getOvercurrentEvents: z.object({
+		commandNumber: z.string().optional().default('62'),
+	}),
+	getOverpowerEvents: z.object({
+		commandNumber: z.string().optional().default('63'),
 	}),
-	getRelayTimerInSeconds: z.object({}),
-	getRelayStateChangeReason: z.object({}),
-	getOverheatingEvents: z.object({}),
-	getOvervoltageEvents: z.object({}),
-	getOvercurrentEvents: z.object({}),
-	getOverpowerEvents: z.object({}),
 }
 
 export namespace Relay16CommandTypes {
@@ -651,36 +832,61 @@ const Relay16DryCommandSchemas = {
 	setOverheatingThresholds: z.object({
 		trigger: z.number().min(30).max(100),
 		recovery: z.number().min(30).max(100),
+		commandNumber: z.string().optional().default('1e'),
+	}),
+	getOverheatingThresholds: z.object({
+		commandNumber: z.string().optional().default('1f'),
 	}),
-	getOverheatingThresholds: z.object({}),
 	setAfterOverheatingProtectionRecovery: z.object({
 		state: z.number().min(0).max(1), // 0: lastState, 1: OFF
+		commandNumber: z.string().optional().default('59'),
 	}),
 	setRelayTimerInMilliseconds: z.object({
 		state: z.number().min(0).max(1), // 0: OFF, 1: ON
 		time: z.number().min(0).max(65535),
+		commandNumber: z.string().optional().default('55'),
+	}),
+	getRelayTimerInMilliseconds: z.object({
+		commandNumber: z.string().optional().default('56'),
 	}),
-	getRelayTimerInMilliseconds: z.object({}),
 	setRelayTimerInSeconds: z.object({
 		state: z.number().min(0).max(1), // 0: OFF, 1: ON
 		time: z.number().min(0).max(65535),
+		commandNumber: z.string().optional().default('57'),
+	}),
+	getRelayTimerInSeconds: z.object({
+		commandNumber: z.string().optional().default('58'),
+	}),
+	getRelayStateChangeReason: z.object({
+		commandNumber: z.string().optional().default('54'),
+	}),
+	getAfterOverheatingProtectionRecovery: z.object({
+		commandNumber: z.string().optional().default('5a'),
 	}),
-	getRelayTimerInSeconds: z.object({}),
-	getRelayStateChangeReason: z.object({}),
-	getAfterOverheatingProtectionRecovery: z.object({}),
 	setLedIndicationMode: z.object({
 		mode: z.number().min(0).max(1), // 0: OFF, 1: ON
+		commandNumber: z.string().optional().default('5b'),
+	}),
+	getLedIndicationMode: z.object({
+		commandNumber: z.string().optional().default('5c'),
 	}),
-	getLedIndicationMode: z.object({}),
 	setRelayRecoveryState: z.object({
 		state: z.number().min(0).max(2), // 0: lastState, 1: ON, 2: OFF
+		commandNumber: z.string().optional().default('5e'),
+	}),
+	getRelayRecoveryState: z.object({
+		commandNumber: z.string().optional().default('5f'),
 	}),
-	getRelayRecoveryState: z.object({}),
 	setRelayState: z.object({
 		state: z.boolean(), // 0: OFF, 1: ON
+		commandNumber: z.string().optional().default('c1'),
+	}),
+	getRelayState: z.object({
+		commandNumber: z.string().optional().default('b1'),
+	}),
+	getOverheatingEvents: z.object({
+		commandNumber: z.string().optional().default('60'),
 	}),
-	getRelayState: z.object({}),
-	getOverheatingEvents: z.object({}),
 }
 
 // ------------------------------------------------ T-VALVE COMMANDS ------------------------------------------------
@@ -690,12 +896,16 @@ const TValveCommandSchemas = {
 	setOpenCloseTime: z.object({
 		openingTime: z.number().min(1).max(255),
 		closingTime: z.number().min(1).max(255),
+		commandNumber: z.string().optional().default('01'),
+	}),
+	getOpenCloseTime: z.object({
+		commandNumber: z.string().optional(),
 	}),
-	getOpenCloseTime: z.object({}),
 	setLED: z.object({
 		ledId: z.number().min(1).max(4),
 		behavior: z.number().min(0).max(4),
 		seconds: z.number().min(1).max(255),
+		commandNumber: z.string().optional().default('02'),
 	}),
 	setBuzzer: z.object({
 		volume: z.number().min(1).max(255),
@@ -703,54 +913,81 @@ const TValveCommandSchemas = {
 		activeTime: z.number().min(1).max(255),
 		onTime: z.number().min(1).max(255),
 		offTime: z.number().min(1).max(255),
+		commandNumber: z.string().optional().default('03'),
 	}),
 	setEmergencyOpenings: z.object({
 		maxOpenings: z.number().min(1).max(15),
+		commandNumber: z.string().optional().default('04'),
+	}),
+	getEmergencyOpenings: z.object({
+		commandNumber: z.string().optional().default('0f'),
 	}),
-	getEmergencyOpenings: z.object({}),
 	setManualControl: z.object({
 		enableOpen: z.boolean(),
 		enableClose: z.boolean(),
+		commandNumber: z.string().optional().default('05'),
 	}),
 	setFloodAlarmTime: z.object({
 		time: z.number().min(1).max(255),
+		commandNumber: z.string().optional().default('06'),
+	}),
+	getFloodAlarmTime: z.object({
+		commandNumber: z.string().optional().default('10'),
 	}),
-	getFloodAlarmTime: z.object({}),
 	setKeepAliveTValve: z.object({
 		time: z.number().min(1).max(255),
+		commandNumber: z.string().optional().default('02'),
 	}),
 	setWorkingVoltage: z.object({
 		voltage: z.number().min(1840).max(2500),
+		commandNumber: z.string().optional().default('09'),
+	}),
+	getWorkingVoltage: z.object({
+		commandNumber: z.string().optional().default('11'),
 	}),
-	getWorkingVoltage: z.object({}),
 	setValveState: z.object({
 		state: z.number().min(0).max(1), // 0: open, 1: close
+		commandNumber: z.string().optional().default('0c'),
 	}),
 	setOpenCloseTimeExtended: z.object({
 		openingTime: z.number().min(1).max(65535),
 		closingTime: z.number().min(1).max(65535),
+		commandNumber: z.string().optional().default('0d'),
+	}),
+	getOpenCloseTimeExtended: z.object({
+		commandNumber: z.string().optional().default('0e'),
 	}),
-	getOpenCloseTimeExtended: z.object({}),
 	setSingleTimeValveState: z.object({
 		state: z.number().min(0).max(1), // 0: open, 1: close
 		time: z.number().min(1).max(65535),
+		commandNumber: z.string().optional().default('14'),
 	}),
 	setDeviceFloodSensor: z.object({
 		enabled: z.boolean(),
+		commandNumber: z.string().optional().default('0a'),
+	}),
+	getDeviceFloodSensor: z.object({
+		commandNumber: z.string().optional().default('13'),
 	}),
-	getDeviceFloodSensor: z.object({}),
 	setJoinRetryPeriodTValve: z.object({
 		period: z.number().min(1).max(21),
+		commandNumber: z.string().optional().default('10'),
 	}),
 	setUplinkTypeTValve: z.object({
 		type: z.enum(['01', '00']), // 01: confirmedUplinks, 00: unconfirmedUplinks
+		commandNumber: z.string().optional().default('11'),
 	}),
 	setWatchDogTValveParams: z.object({
 		confirmedUplinks: z.number().min(0).max(255),
 		unconfirmedUplinks: z.number().min(0).max(255),
+		commandNumber: z.string().optional().default('1c'),
+	}),
+	getWatchDogTValveParams: z.object({
+		commandNumber: z.string().optional(),
+	}),
+	requestFullData: z.object({
+		commandNumber: z.string().optional().default('08'),
 	}),
-	getWatchDogTValveParams: z.object({}),
-	requestFullData: z.object({}),
 }
 
 export namespace TValveCommandTypes {
@@ -778,157 +1015,271 @@ const FanCoilThermostatCommandSchemas = {
 	...TemperatureCommandSchemas,
 	setDisplayRefreshPeriod: z.object({
 		period: z.number().min(1).max(24),
+		commandNumber: z.string().optional().default('33'),
+	}),
+	getDisplayRefreshPeriod: z.object({
+		commandNumber: z.string().optional().default('34'),
 	}),
-	getDisplayRefreshPeriod: z.object({}),
 	setHumidityVisibility: z.object({
 		state: z.number().min(0).max(1), // 0: hide, 1: show
+		commandNumber: z.string().optional().default('42'),
+	}),
+	getHumidityVisibility: z.object({
+		commandNumber: z.string().optional().default('43'),
 	}),
-	getHumidityVisibility: z.object({}),
 	setCurrentTemperatureVisibility: z.object({
 		state: z.number().min(0).max(1), // 0: hide, 1: show
+		commandNumber: z.string().optional().default('40'),
+	}),
+	getCurrentTemperatureVisibility: z.object({
+		commandNumber: z.string().optional().default('41'),
 	}),
-	getCurrentTemperatureVisibility: z.object({}),
 	setTargetTemperatureStep: z.object({
 		value: z.number().min(0.1).max(10).multipleOf(0.1),
+		commandNumber: z.string().optional().default('03'),
+	}),
+	getTargetTemperatureStep: z.object({
+		commandNumber: z.string().optional().default('05'),
 	}),
-	getTargetTemperatureStep: z.object({}),
 	setKeysLock: z.object({
 		value: z.number().min(0).max(5),
+		commandNumber: z.string().optional().default('07'),
+	}),
+	getKeysLock: z.object({
+		commandNumber: z.string().optional().default('14'),
 	}),
-	getKeysLock: z.object({}),
 	setTargetTemperature: z.object({
 		targetTemperature: z.number().min(5).max(99),
+		commandNumber: z.string().optional().default('0e'),
 	}),
 	setValveOpenCloseTime: z.object({
 		value: z.number().min(1).max(255),
+		commandNumber: z.string().optional().default('31'),
+	}),
+	getValveOpenCloseTime: z.object({
+		commandNumber: z.string().optional().default('32'),
 	}),
-	getValveOpenCloseTime: z.object({}),
 	setExtAutomaticTemperatureControl: z.object({
 		value: z.number().min(0).max(1), // 0: deactivated, 1: activated
+		commandNumber: z.string().optional().default('35'),
+	}),
+	getExtAutomaticTemperatureControl: z.object({
+		commandNumber: z.string().optional().default('36'),
 	}),
-	getExtAutomaticTemperatureControl: z.object({}),
 	setFanSpeed: z.object({
 		value: z.number().min(0).max(6),
+		commandNumber: z.string().optional().default('44'),
+	}),
+	getFanSpeed: z.object({
+		commandNumber: z.string().optional().default('45'),
 	}),
-	getFanSpeed: z.object({}),
 	setFanSpeedLimit: z.object({
 		value: z.number().min(0).max(3),
+		commandNumber: z.string().optional().default('46'),
+	}),
+	getFanSpeedLimit: z.object({
+		commandNumber: z.string().optional().default('47'),
 	}),
-	getFanSpeedLimit: z.object({}),
 	setEcmVoltageRange: z.object({
 		min: z.number().min(0).max(10),
 		max: z.number().min(0).max(10),
+		commandNumber: z.string().optional().default('48'),
+	}),
+	getEcmVoltageRange: z.object({
+		commandNumber: z.string().optional().default('49'),
 	}),
-	getEcmVoltageRange: z.object({}),
 	setEcmStartUpTime: z.object({
 		value: z.number().min(0).max(20),
+		commandNumber: z.string().optional().default('4a'),
+	}),
+	getEcmStartUpTime: z.object({
+		commandNumber: z.string().optional().default('4b'),
 	}),
-	getEcmStartUpTime: z.object({}),
 	setEcmRelay: z.object({
 		value: z.number().min(0).max(1), // 0: deactivated, 1: activated
+		commandNumber: z.string().optional().default('4c'),
+	}),
+	getEcmRelay: z.object({
+		commandNumber: z.string().optional().default('4d'),
 	}),
-	getEcmRelay: z.object({}),
 	setFrostProtection: z.object({
 		value: z.number().min(0).max(1), // 0: OFF, 1: ON
+		commandNumber: z.string().optional().default('4e'),
+	}),
+	getFrostProtection: z.object({
+		commandNumber: z.string().optional().default('4f'),
 	}),
-	getFrostProtection: z.object({}),
 	setFrostProtectionSettings: z.object({
 		threshold: z.number().min(4).max(20),
 		setpoint: z.number().min(4).max(20),
+		commandNumber: z.string().optional().default('50'),
+	}),
+	getFrostProtectionSettings: z.object({
+		commandNumber: z.string().optional().default('51'),
 	}),
-	getFrostProtectionSettings: z.object({}),
 	setFctOperationalMode: z.object({
 		value: z.number().min(0).max(2), // 0: ventilation, 1: heating, 2: cooling
+		commandNumber: z.string().optional().default('52'),
 	}),
 	setAllowedOperationalModes: z.object({
 		value: z.number().min(0).max(2),
+		commandNumber: z.string().optional().default('54'),
+	}),
+	getAllowedOperationalModes: z.object({
+		commandNumber: z.string().optional().default('55'),
 	}),
-	getAllowedOperationalModes: z.object({}),
 	setCoolingSetpointNotOccupied: z.object({
 		value: z.number().min(5).max(30),
+		commandNumber: z.string().optional().default('56'),
+	}),
+	getCoolingSetpointNotOccupied: z.object({
+		commandNumber: z.string().optional().default('57'),
 	}),
-	getCoolingSetpointNotOccupied: z.object({}),
 	setHeatingSetpointNotOccupied: z.object({
 		value: z.number().min(5).max(30),
+		commandNumber: z.string().optional().default('58'),
+	}),
+	getHeatingSetpointNotOccupied: z.object({
+		commandNumber: z.string().optional().default('59'),
 	}),
-	getHeatingSetpointNotOccupied: z.object({}),
 	setTempSensorCompensation: z.object({
 		compensation: z.number().min(0).max(1),
 		temperature: z.number().min(-5).max(5).multipleOf(0.1),
+		commandNumber: z.string().optional().default('5a'),
+	}),
+	getTempSensorCompensation: z.object({
+		commandNumber: z.string().optional().default('5b'),
 	}),
-	getTempSensorCompensation: z.object({}),
 	setFanSpeedNotOccupied: z.object({
 		value: z.number().min(0).max(2), // 0: low, 1: automatic, 2: dontChange
+		commandNumber: z.string().optional().default('5c'),
+	}),
+	getFanSpeedNotOccupied: z.object({
+		commandNumber: z.string().optional().default('5d'),
 	}),
-	getFanSpeedNotOccupied: z.object({}),
 	setAutomaticChangeover: z.object({
 		value: z.number().min(0).max(1), // 0: deactivated, 1: activated
+		commandNumber: z.string().optional().default('5e'),
+	}),
+	getAutomaticChangeover: z.object({
+		commandNumber: z.string().optional().default('5f'),
 	}),
-	getAutomaticChangeover: z.object({}),
 	setWiringDiagram: z.object({
 		value: z.number().min(0).max(6),
+		commandNumber: z.string().optional().default('60'),
+	}),
+	getWiringDiagram: z.object({
+		commandNumber: z.string().optional().default('61'),
 	}),
-	getWiringDiagram: z.object({}),
 	setOccFunction: z.object({
 		value: z.number().min(0).max(7),
+		commandNumber: z.string().optional().default('62'),
+	}),
+	getOccFunction: z.object({
+		commandNumber: z.string().optional().default('63'),
 	}),
-	getOccFunction: z.object({}),
 	setAutomaticChangeoverThreshold: z.object({
 		coolingThreshold: z.number().min(5).max(20),
 		heatingThreshold: z.number().min(30).max(60),
+		commandNumber: z.string().optional().default('64'),
+	}),
+	getAutomaticChangeoverThreshold: z.object({
+		commandNumber: z.string().optional().default('65'),
 	}),
-	getAutomaticChangeoverThreshold: z.object({}),
 	setDeviceStatus: z.object({
 		value: z.number().min(0).max(1), // 0: off, 1: on
+		commandNumber: z.string().optional().default('66'),
+	}),
+	getDeviceStatus: z.object({
+		commandNumber: z.string().optional().default('67'),
 	}),
-	getDeviceStatus: z.object({}),
 	setReturnOfPowerOperation: z.object({
 		value: z.number().min(0).max(2), // 0: lastStatus, 1: on, 2: off
+		commandNumber: z.string().optional().default('68'),
+	}),
+	getReturnOfPowerOperation: z.object({
+		commandNumber: z.string().optional().default('69'),
 	}),
-	getReturnOfPowerOperation: z.object({}),
 	setDeltaTemperature1: z.object({
 		value: z.number().min(0.5).max(10).multipleOf(0.5),
+		commandNumber: z.string().optional().default('6a'),
+	}),
+	getDeltaTemperature1: z.object({
+		commandNumber: z.string().optional().default('6b'),
 	}),
-	getDeltaTemperature1: z.object({}),
 	setDeltaTemperature2and3: z.object({
 		deltaTemperature2: z.number().min(0.5).max(10).multipleOf(0.5),
 		deltaTemperature3: z.number().min(0.5).max(10).multipleOf(0.5),
+		commandNumber: z.string().optional().default('6c'),
+	}),
+	getDeltaTemperature2and3: z.object({
+		commandNumber: z.string().optional().default('6d'),
+	}),
+	getFrostProtectionStatus: z.object({
+		commandNumber: z.string().optional().default('6e'),
+	}),
+	getOccupancySensorStatusSetPoint: z.object({
+		commandNumber: z.string().optional().default('70'),
+	}),
+	getOccupancySensorStatus: z.object({
+		commandNumber: z.string().optional().default('71'),
+	}),
+	getDewPointSensorStatus: z.object({
+		commandNumber: z.string().optional().default('72'),
+	}),
+	getFilterAlarm: z.object({
+		commandNumber: z.string().optional().default('73'),
 	}),
-	getDeltaTemperature2and3: z.object({}),
-	getFrostProtectionStatus: z.object({}),
-	getOccupancySensorStatusSetPoint: z.object({}),
-	getOccupancySensorStatus: z.object({}),
-	getDewPointSensorStatus: z.object({}),
-	getFilterAlarm: z.object({}),
 	setHeatingCoolingTargetTempRanges: z.object({
 		heatingTempMin: z.number().min(5).max(30),
 		heatingTempMax: z.number().min(5).max(30),
 		coolingTempMin: z.number().min(5).max(30),
 		coolingTempMax: z.number().min(5).max(30),
+		commandNumber: z.string().optional().default('16'),
+	}),
+	getHeatingCoolingTargetTempRanges: z.object({
+		commandNumber: z.string().optional().default('17'),
 	}),
-	getHeatingCoolingTargetTempRanges: z.object({}),
 	setHeatingCoolingTargetTempRangesUnoccupied: z.object({
 		heatingTempMin: z.number().min(5).max(30),
 		heatingTempMax: z.number().min(5).max(30),
 		coolingTempMin: z.number().min(5).max(30),
 		coolingTempMax: z.number().min(5).max(30),
+		commandNumber: z.string().optional().default('76'),
+	}),
+	getHeatingCoolingTargetTempRangesUnoccupied: z.object({
+		commandNumber: z.string().optional().default('77'),
 	}),
-	getHeatingCoolingTargetTempRangesUnoccupied: z.object({}),
 	setFanOffDelayTime: z.object({
 		time: z.number().min(0).max(255),
+		commandNumber: z.string().optional().default('78'),
+	}),
+	getFanOffDelayTime: z.object({
+		commandNumber: z.string().optional().default('79'),
 	}),
-	getFanOffDelayTime: z.object({}),
 	setAdditionalFanMode: z.object({
 		mode: z.number().min(0).max(2), // 0: TurnOffOnTargetReach, 1: KeepOnTargetReach, 2: FanAlwaysOn
+		commandNumber: z.string().optional().default('7a'),
+	}),
+	getAdditionalFanMode: z.object({
+		commandNumber: z.string().optional().default('7b'),
+	}),
+	getInternalTemperatureSensorError: z.object({
+		commandNumber: z.string().optional().default('7c'),
+	}),
+	getExternalTemperatureSensorError: z.object({
+		commandNumber: z.string().optional().default('7d'),
 	}),
-	getAdditionalFanMode: z.object({}),
-	getInternalTemperatureSensorError: z.object({}),
-	getExternalTemperatureSensorError: z.object({}),
 	setUserInterfaceLanguage: z.object({
 		value: z.number().min(0).max(3), // 0: English, 1: French, 2: German, 3: Spanish
+		commandNumber: z.string().optional().default('9a'),
+	}),
+	getUserInterfaceLanguage: z.object({
+		commandNumber: z.string().optional().default('9b'),
+	}),
+	restartDevice: z.object({
+		commandNumber: z.string().optional().default('a5'),
 	}),
-	getUserInterfaceLanguage: z.object({}),
-	restartDevice: z.object({}),
 }
 
 export namespace FanCoilThermostatCommandTypes {
@@ -986,8 +1337,11 @@ const OpenCloseSensorCommandSchemas = {
 	...GeneralCommandSchemas,
 	setNotificationBlindTime: z.object({
 		time: z.number().min(1).max(255),
+		commandNumber: z.string().optional().default('1e'),
+	}),
+	getNotificationBlindTime: z.object({
+		commandNumber: z.string().optional().default('1f'),
 	}),
-	getNotificationBlindTime: z.object({}),
 }
 
 export namespace OpenCloseSensorCommandTypes {
@@ -998,46 +1352,75 @@ export namespace OpenCloseSensorCommandTypes {
 const WirelessThermostatCommandSchemas = {
 	...GeneralCommandSchemas,
 	...TemperatureCommandSchemas,
-	getTemperatureRange: z.object({}),
+	getTemperatureRange: z.object({
+		commandNumber: z.string().optional().default('15'),
+	}),
 	...DisplayCommandSchemas,
 	...PIRCommandSchemas,
 	...ChildLockCommandSchemas,
 	setTargetTemperature: z.object({
 		targetTemperature: z.number().min(5).max(99),
+		commandNumber: z.string().optional().default('0e'),
+	}),
+	getTargetTemperature: z.object({
+		commandNumber: z.string().optional().default('2f'),
 	}),
-	getTargetTemperature: z.object({}),
 	setHeatingStatus: z.object({
 		status: z.number().min(0).max(1), // 0: disabled, 1: enabled
+		commandNumber: z.string().optional().default('31'),
+	}),
+	getHeatingStatus: z.object({
+		commandNumber: z.string().optional().default('32'),
 	}),
-	getHeatingStatus: z.object({}),
 	setDisplayRefreshPeriod: z.object({
 		period: z.number().min(1).max(24),
+		commandNumber: z.string().optional().default('33'),
+	}),
+	getDisplayRefreshPeriod: z.object({
+		commandNumber: z.string().optional().default('34'),
 	}),
-	getDisplayRefreshPeriod: z.object({}),
 	setTargetSendDelay: z.object({
 		time: z.number().min(0).max(255),
+		commandNumber: z.string().optional().default('35'),
+	}),
+	getTargetSendDelay: z.object({
+		commandNumber: z.string().optional().default('36'),
 	}),
-	getTargetSendDelay: z.object({}),
 	setAutomaticHeatingStatus: z.object({
 		state: z.number().min(0).max(1), // 0: turnOffAutomaticMode, 1: turnOnAutomaticMode
+		commandNumber: z.string().optional().default('37'),
+	}),
+	getAutomaticHeatingStatus: z.object({
+		commandNumber: z.string().optional().default('38'),
 	}),
-	getAutomaticHeatingStatus: z.object({}),
 	setSensorMode: z.object({
 		state: z.number().min(0).max(1), // 0: turnOffSensorMode, 1: turnOnSensorMode
+		commandNumber: z.string().optional().default('39'),
+	}),
+	getSensorMode: z.object({
+		commandNumber: z.string().optional().default('3a'),
 	}),
-	getSensorMode: z.object({}),
 	setTemperatureHysteresis: z.object({
 		hysteresis: z.number().min(0.1).max(25.5).multipleOf(0.1),
+		commandNumber: z.string().optional().default('43'),
+	}),
+	getTemperatureHysteresis: z.object({
+		commandNumber: z.string().optional().default('42'),
 	}),
-	getTemperatureHysteresis: z.object({}),
 	setTargetTemperaturePrecisely: z.object({
 		targetTemperature: z.number().min(5).max(99).multipleOf(0.1),
+		commandNumber: z.string().optional().default('50'),
+	}),
+	getTargetTemperaturePrecisely: z.object({
+		commandNumber: z.string().optional().default('51'),
 	}),
-	getTargetTemperaturePrecisely: z.object({}),
 	setTargetTemperatureStep: z.object({
 		value: z.number().min(0.1).max(10).multipleOf(0.1),
+		commandNumber: z.string().optional().default('03'),
+	}),
+	getTargetTemperatureStep: z.object({
+		commandNumber: z.string().optional().default('05'),
 	}),
-	getTargetTemperatureStep: z.object({}),
 }
 
 export namespace WirelessThermostatCommandTypes {
@@ -1062,24 +1445,36 @@ const CO2SensorCommandSchemas = {
 	setCo2BoundaryLevels: z.object({
 		good_medium: z.number().min(0).max(1500),
 		medium_bad: z.number().min(0).max(1500),
+		commandNumber: z.string().optional().default('1e'),
+	}),
+	getCo2BoundaryLevels: z.object({
+		commandNumber: z.string().optional().default('1f'),
 	}),
-	getCo2BoundaryLevels: z.object({}),
 	setCo2AutoZeroValue: z.object({
 		ppm: z.number().min(0).max(1500),
+		commandNumber: z.string().optional().default('20'),
+	}),
+	getCo2AutoZeroValue: z.object({
+		commandNumber: z.string().optional().default('21'),
 	}),
-	getCo2AutoZeroValue: z.object({}),
 	setNotifyPeriod: z.object({
 		good_zone: z.number().min(0).max(255),
 		medium_zone: z.number().min(0).max(255),
 		bad_zone: z.number().min(0).max(255),
+		commandNumber: z.string().optional().default('22'),
+	}),
+	getNotifyPeriod: z.object({
+		commandNumber: z.string().optional().default('23'),
 	}),
-	getNotifyPeriod: z.object({}),
 	setCo2MeasurementPeriod: z.object({
 		good_zone: z.number().min(0).max(255),
 		medium_zone: z.number().min(0).max(255),
 		bad_zone: z.number().min(0).max(255),
+		commandNumber: z.string().optional().default('24'),
+	}),
+	getCo2MeasurementPeriod: z.object({
+		commandNumber: z.string().optional().default('25'),
 	}),
-	getCo2MeasurementPeriod: z.object({}),
 	setBuzzerNotification: z.object({
 		duration_good_beeping: z.number().min(0).max(255),
 		duration_good_loud: z.number().min(0).max(255),
@@ -1090,8 +1485,11 @@ const CO2SensorCommandSchemas = {
 		duration_bad_beeping: z.number().min(0).max(255),
 		duration_bad_loud: z.number().min(0).max(255),
 		duration_bad_silent: z.number().min(0).max(255),
+		commandNumber: z.string().optional().default('26'),
+	}),
+	getBuzzerNotification: z.object({
+		commandNumber: z.string().optional().default('27'),
 	}),
-	getBuzzerNotification: z.object({}),
 	setCo2Led: z.object({
 		red_good: z.number().min(0).max(255),
 		green_good: z.number().min(0).max(255),
@@ -1105,12 +1503,18 @@ const CO2SensorCommandSchemas = {
 		green_bad: z.number().min(0).max(255),
 		blue_bad: z.number().min(0).max(255),
 		duration_bad: z.number().min(0).max(255),
+		commandNumber: z.string().optional().default('28'),
+	}),
+	getCo2Led: z.object({
+		commandNumber: z.string().optional().default('29'),
 	}),
-	getCo2Led: z.object({}),
 	setCo2AutoZeroPeriod: z.object({
 		hours: z.number().min(0).max(255),
+		commandNumber: z.string().optional().default('2a'),
+	}),
+	getCo2AutoZeroPeriod: z.object({
+		commandNumber: z.string().optional().default('2b'),
 	}),
-	getCo2AutoZeroPeriod: z.object({}),
 }
 
 export namespace CO2SensorCommandTypes {
@@ -1131,34 +1535,52 @@ const CO2DisplayCommandSchemas = {
 	...ChildLockCommandSchemas,
 	setCo2MeasurementBlindTime: z.object({
 		time: z.number().min(0).max(255),
+		commandNumber: z.string().optional().default('81'),
+	}),
+	getCo2MeasurementBlindTime: z.object({
+		commandNumber: z.string().optional().default('80'),
 	}),
-	getCo2MeasurementBlindTime: z.object({}),
 	setCo2BoundaryLevels: z.object({
 		good_medium: z.number().min(0).max(1500),
 		medium_bad: z.number().min(0).max(1500),
+		commandNumber: z.string().optional().default('1e'),
+	}),
+	getCo2BoundaryLevels: z.object({
+		commandNumber: z.string().optional().default('1f'),
 	}),
-	getCo2BoundaryLevels: z.object({}),
 	setCo2AutoZeroValue: z.object({
 		ppm: z.number().min(0).max(1500),
+		commandNumber: z.string().optional().default('20'),
+	}),
+	getCo2AutoZeroValue: z.object({
+		commandNumber: z.string().optional().default('21'),
 	}),
-	getCo2AutoZeroValue: z.object({}),
 	setCo2MeasurementPeriod: z.object({
 		good_zone: z.number().min(0).max(255),
 		medium_zone: z.number().min(0).max(255),
 		bad_zone: z.number().min(0).max(255),
+		commandNumber: z.string().optional().default('24'),
+	}),
+	getCo2MeasurementPeriod: z.object({
+		commandNumber: z.string().optional().default('25'),
 	}),
-	getCo2MeasurementPeriod: z.object({}),
 	setCo2AutoZeroPeriod: z.object({
 		hours: z.number().min(0).max(255),
+		commandNumber: z.string().optional().default('2a'),
+	}),
+	getCo2AutoZeroPeriod: z.object({
+		commandNumber: z.string().optional().default('2b'),
 	}),
-	getCo2AutoZeroPeriod: z.object({}),
 
 	setCo2ImagesVisibility: z.object({
 		chart: z.boolean(),
 		digital_value: z.boolean(),
 		emoji: z.boolean(),
+		commandNumber: z.string().optional().default('82'),
+	}),
+	getCo2ImagesVisibility: z.object({
+		commandNumber: z.string().optional().default('83'),
 	}),
-	getCo2ImagesVisibility: z.object({}),
 }
 
 export namespace CO2DisplayCommandTypes {
@@ -1174,33 +1596,53 @@ const CO2DisplayLiteCommandSchemas = {
 	setCo2BoundaryLevels: z.object({
 		good_medium: z.number().min(0).max(1500),
 		medium_bad: z.number().min(0).max(1500),
+		commandNumber: z.string().optional().default('1e'),
+	}),
+	getCo2BoundaryLevels: z.object({
+		commandNumber: z.string().optional().default('1f'),
 	}),
-	getCo2BoundaryLevels: z.object({}),
 	setCo2AutoZeroValue: z.object({
 		ppm: z.number().min(0).max(1500),
+		commandNumber: z.string().optional().default('20'),
+	}),
+	getCo2AutoZeroValue: z.object({
+		commandNumber: z.string().optional().default('21'),
 	}),
-	getCo2AutoZeroValue: z.object({}),
 	setCo2MeasurementPeriod: z.object({
 		good_zone: z.number().min(0).max(255),
 		medium_zone: z.number().min(0).max(255),
 		bad_zone: z.number().min(0).max(255),
+		commandNumber: z.string().optional().default('24'),
+	}),
+	getCo2MeasurementPeriod: z.object({
+		commandNumber: z.string().optional().default('25'),
 	}),
-	getCo2MeasurementPeriod: z.object({}),
 	setCo2AutoZeroPeriod: z.object({
 		hours: z.number().min(0).max(255),
+		commandNumber: z.string().optional().default('2a'),
+	}),
+	getCo2AutoZeroPeriod: z.object({
+		commandNumber: z.string().optional().default('2b'),
 	}),
-	getCo2AutoZeroPeriod: z.object({}),
 	setCo2ImagesVisibility: z.object({
 		chart: z.boolean(),
 		digital_value: z.boolean(),
 		emoji: z.boolean(),
+		commandNumber: z.string().optional().default('82'),
+	}),
+	getCo2ImagesVisibility: z.object({
+		commandNumber: z.string().optional().default('83'),
 	}),
-	getCo2ImagesVisibility: z.object({}),
 	setUplinkSendingOnButtonPress: z.object({
 		value: z.number().min(0).max(1),
+		commandNumber: z.string().optional().default('2e'),
+	}),
+	getUplinkSendingOnButtonPress: z.object({
+		commandNumber: z.string().optional().default('2f'),
+	}),
+	restartDevice: z.object({
+		commandNumber: z.string().optional().default('a5'),
 	}),
-	getUplinkSendingOnButtonPress: z.object({}),
-	restartDevice: z.object({}),
 }
 
 export namespace CO2DisplayLiteCommandTypes {
@@ -1214,13 +1656,19 @@ const HTSensorCommandSchemas = {
 	setTemperatureCompensation: z.object({
 		negativeCompensation: z.boolean(), // true: negative compensation, false: positive compensation
 		compensation: z.number().min(0).max(25.5).multipleOf(0.1),
+		commandNumber: z.string().optional().default('31'),
+	}),
+	getTemperatureCompensation: z.object({
+		commandNumber: z.string().optional().default('32'),
 	}),
-	getTemperatureCompensation: z.object({}),
 	setHumidityCompensation: z.object({
 		negativeCompensation: z.boolean(), // true: negative compensation, false: positive compensation
 		compensation: z.number().min(0).max(255).multipleOf(0.1),
+		commandNumber: z.string().optional().default('33'),
+	}),
+	getHumidityCompensation: z.object({
+		commandNumber: z.string().optional().default('34'),
 	}),
-	getHumidityCompensation: z.object({}),
 }
 
 export namespace HTSensorCommandTypes {
@@ -1238,6 +1686,7 @@ const AQICommandSchemas = {
 		greenDuration: z.number(),
 		blueBehavior: z.number(),
 		blueDuration: z.number(),
+		commandNumber: z.string().optional().default('05'),
 	}),
 }
 
@@ -1248,23 +1697,37 @@ export namespace AQICommandTypes {
 /* --------------------------------------- T-FLOOD COMMANDS --------------------------------------- */
 const TFloodCommandSchemas = {
 	...GeneralCommandSchemas,
-	getTemperature: z.object({}),
+	getTemperature: z.object({
+		commandNumber: z.string().optional().default('01'),
+	}),
 	setFloodAlarmTime: z.object({
 		time: z.number().min(0).max(255),
+		commandNumber: z.string().optional().default('06'),
+	}),
+	getFloodAlarmTime: z.object({
+		commandNumber: z.string().optional().default('10'),
 	}),
-	getFloodAlarmTime: z.object({}),
 	setKeepAlive: z.object({
 		time: z.number().min(1).max(14400),
+		commandNumber: z.string().optional().default('02'),
+	}),
+	getDeviceVersion: z.object({
+		commandNumber: z.string().optional().default('04'),
 	}),
-	getDeviceVersion: z.object({}),
 	setFloodEventSendTime: z.object({
 		time: z.number().min(0).max(255),
+		commandNumber: z.string().optional().default('08'),
+	}),
+	getFloodEventSendTime: z.object({
+		commandNumber: z.string().optional().default('09'),
 	}),
-	getFloodEventSendTime: z.object({}),
 	setFloodEventUplinkType: z.object({
 		type: z.enum(['01', '00']), // 01: confirmedUplinks, 00: unconfirmedUplinks
+		commandNumber: z.string().optional().default('13'),
+	}),
+	getFloodEventUplinkType: z.object({
+		commandNumber: z.string().optional().default('14'),
 	}),
-	getFloodEventUplinkType: z.object({}),
 }
 
 export namespace TFloodCommandTypes {
@@ -1278,15 +1741,18 @@ export namespace TFloodCommandTypes {
 const TringThermostatCommandSchemas = {
 	setThermostatTarget: z.object({
 		target: z.number(),
+		commandNumber: z.string().optional().default('01'),
 	}),
 	setThermostatConfig: z.object({
 		time: z.number(),
 		temp_span: z.number(),
 		temp_sampling: z.number(),
 		target: z.number(),
+		commandNumber: z.string().optional().default('02'),
 	}),
 	setKeepAlive: z.object({
 		time: z.number(),
+		commandNumber: z.string().optional().default('02'),
 	}),
 }
 
@@ -1300,12 +1766,15 @@ export namespace TringThermostatCommandTypes {
 const DSKDeviceCommandSchemas = {
 	setVrvStatus: z.object({
 		status: z.number(),
+		commandNumber: z.string().optional().default('1e'),
 	}),
 	setVrvOnTime: z.object({
 		time: z.number(),
+		commandNumber: z.string().optional().default('20'),
 	}),
 	setVrvOffTime: z.object({
 		time: z.number(),
+		commandNumber: z.string().optional().default('21'),
 	}),
 }
 
@@ -1320,15 +1789,27 @@ const ButtonCommandSchemas = {
 	...GeneralCommandSchemas,
 	setSendEventLater: z.object({
 		value: z.number().min(0).max(1), // 1: send later when allowed, 0: Don't send later when allowed
+		commandNumber: z.string().optional().default('1e'),
+	}),
+	getSendEventLater: z.object({
+		commandNumber: z.string().optional().default('1f'),
 	}),
-	getSendEventLater: z.object({}),
 	clearPressEventCounter: z.object({
 		value: z.number().min(1).max(3),
+		commandNumber: z.string().optional().default('20'),
+	}),
+	restartDevice: z.object({
+		commandNumber: z.string().optional().default('a5'),
+	}),
+	getSinglePressEventCounter: z.object({
+		commandNumber: z.string().optional().default('b1'),
+	}),
+	getDoublePressEventCounter: z.object({
+		commandNumber: z.string().optional().default('b2'),
+	}),
+	getTriplePressEventCounter: z.object({
+		commandNumber: z.string().optional().default('b3'),
 	}),
-	restartDevice: z.object({}),
-	getSinglePressEventCounter: z.object({}),
-	getDoublePressEventCounter: z.object({}),
-	getTriplePressEventCounter: z.object({}),
 }
 
 export namespace ButtonCommandTypes {
@@ -1341,21 +1822,35 @@ const HTPirLiteCommandSchemas = {
 	...GeneralCommandSchemas,
 	setUplinkSendingOnButtonPress: z.object({
 		value: z.number().min(0).max(1),
+		commandNumber: z.string().optional().default('2e'),
+	}),
+	getUplinkSendingOnButtonPress: z.object({
+		commandNumber: z.string().optional().default('2f'),
+	}),
+	restartDevice: z.object({
+		commandNumber: z.string().optional().default('a5'),
 	}),
-	getUplinkSendingOnButtonPress: z.object({}),
-	restartDevice: z.object({}),
 	setPIRSensorState: z.object({
 		state: z.number().min(0).max(1), // 0: disabled, 1: enabled
+		commandNumber: z.string().optional().default('36'),
+	}),
+	getPIRSensorState: z.object({
+		commandNumber: z.string().optional().default('37'),
 	}),
-	getPIRSensorState: z.object({}),
 	setPIRSensorSensitivity: z.object({
 		sensitivity: z.number().min(12).max(255),
+		commandNumber: z.string().optional().default('3e'),
+	}),
+	getPIRSensorSensitivity: z.object({
+		commandNumber: z.string().optional().default('3f'),
 	}),
-	getPIRSensorSensitivity: z.object({}),
 	setOccupancyTimeout: z.object({
 		timeout: z.number().min(15).max(65535), // in seconds, between 15 and 65535
+		commandNumber: z.string().optional().default('38'),
+	}),
+	getOccupancyTimeout: z.object({
+		commandNumber: z.string().optional().default('39'),
 	}),
-	getOccupancyTimeout: z.object({}),
 }
 
 export namespace HTPirLiteCommandTypes {
@@ -1375,36 +1870,59 @@ const Co2PirLiteCommandSchemas = {
 	...GeneralCommandSchemas,
 	setPIRSensorState: z.object({
 		state: z.number().min(0).max(1), // 0: disabled, 1: enabled
+		commandNumber: z.string().optional().default('36'),
+	}),
+	getPIRSensorState: z.object({
+		commandNumber: z.string().optional().default('37'),
 	}),
-	getPIRSensorState: z.object({}),
 	setPIRSensorSensitivity: z.object({
 		sensitivity: z.number().min(12).max(255),
+		commandNumber: z.string().optional().default('3e'),
+	}),
+	getPIRSensorSensitivity: z.object({
+		commandNumber: z.string().optional().default('3f'),
 	}),
-	getPIRSensorSensitivity: z.object({}),
 	setOccupancyTimeout: z.object({
 		timeout: z.number().min(15).max(65535), // in seconds, between 15 and 65535
+		commandNumber: z.string().optional().default('38'),
+	}),
+	getOccupancyTimeout: z.object({
+		commandNumber: z.string().optional().default('39'),
+	}),
+	restartDevice: z.object({
+		commandNumber: z.string().optional().default('a5'),
 	}),
-	getOccupancyTimeout: z.object({}),
-	restartDevice: z.object({}),
 	setCo2BoundaryLevels: z.object({
 		good_medium: z.number().min(0).max(1500),
 		medium_bad: z.number().min(0).max(1500),
+		commandNumber: z.string().optional().default('1e'),
+	}),
+	getCo2BoundaryLevels: z.object({
+		commandNumber: z.string().optional().default('1f'),
 	}),
-	getCo2BoundaryLevels: z.object({}),
 	setCo2AutoZeroValue: z.object({
 		ppm: z.number().min(0).max(1500),
+		commandNumber: z.string().optional().default('20'),
+	}),
+	getCo2AutoZeroValue: z.object({
+		commandNumber: z.string().optional().default('21'),
 	}),
-	getCo2AutoZeroValue: z.object({}),
 	setCo2MeasurementPeriod: z.object({
 		good_zone: z.number().min(0).max(255),
 		medium_zone: z.number().min(0).max(255),
 		bad_zone: z.number().min(0).max(255),
+		commandNumber: z.string().optional().default('24'),
+	}),
+	getCo2MeasurementPeriod: z.object({
+		commandNumber: z.string().optional().default('25'),
 	}),
-	getCo2MeasurementPeriod: z.object({}),
 	setCo2AutoZeroPeriod: z.object({
 		hours: z.number().min(0).max(255),
+		commandNumber: z.string().optional().default('2a'),
+	}),
+	getCo2AutoZeroPeriod: z.object({
+		commandNumber: z.string().optional().default('2b'),
 	}),
-	getCo2AutoZeroPeriod: z.object({}),
 }
 
 export namespace Co2PirLiteCommandTypes {
@@ -1423,6 +1941,7 @@ const MelissaCommandSchemas = {
 	setIrCodeRecording: z.object({
 		time: z.number().min(0).max(255),
 		position: z.number().min(0).max(10),
+		commandNumber: z.string().optional().default('09'),
 	}),
 }
 
@@ -1435,42 +1954,70 @@ const MultiSensorCommandSchemas = {
 	...GeneralCommandSchemas,
 	setLightState: z.object({
 		enabled: z.boolean(),
+		commandNumber: z.string().optional().default('1e'),
+	}),
+	getLightState: z.object({
+		commandNumber: z.string().optional().default('1f'),
 	}),
-	getLightState: z.object({}),
 	setHallState: z.object({
 		enabled: z.boolean(),
+		commandNumber: z.string().optional().default('20'),
+	}),
+	getHallState: z.object({
+		commandNumber: z.string().optional().default('21'),
 	}),
-	getHallState: z.object({}),
 	setHallBlindPeriod: z.object({
 		period: z.number().min(0).max(65535),
+		commandNumber: z.string().optional().default('22'),
+	}),
+	getHallBlindPeriod: z.object({
+		commandNumber: z.string().optional().default('23'),
 	}),
-	getHallBlindPeriod: z.object({}),
 	setMicrophoneState: z.object({
 		enabled: z.boolean(),
+		commandNumber: z.string().optional().default('24'),
+	}),
+	getMicrophoneState: z.object({
+		commandNumber: z.string().optional().default('25'),
 	}),
-	getMicrophoneState: z.object({}),
 	setMicrophoneSamplingPeriod: z.object({
 		period: z.number().min(0).max(65535),
+		commandNumber: z.string().optional().default('26'),
+	}),
+	getMicrophoneSamplingPeriod: z.object({
+		commandNumber: z.string().optional().default('27'),
 	}),
-	getMicrophoneSamplingPeriod: z.object({}),
 	setGasState: z.object({
 		enabled: z.boolean(),
+		commandNumber: z.string().optional().default('28'),
+	}),
+	getGasState: z.object({
+		commandNumber: z.string().optional().default('29'),
 	}),
-	getGasState: z.object({}),
 	setGasMeasurementPeriod: z.object({
 		minutes: z.number().min(0).max(255),
+		commandNumber: z.string().optional().default('2a'),
+	}),
+	getGasMeasurementPeriod: z.object({
+		commandNumber: z.string().optional().default('2b'),
 	}),
-	getGasMeasurementPeriod: z.object({}),
 	setPirState: z.object({
 		enabled: z.boolean(),
+		commandNumber: z.string().optional().default('2c'),
+	}),
+	getPirState: z.object({
+		commandNumber: z.string().optional().default('2d'),
 	}),
-	getPirState: z.object({}),
 	setPirActiveReportingPeriod: z.object({
 		time: z.number().min(0).max(65535),
+		commandNumber: z.string().optional().default('2e'),
+	}),
+	getPirActiveReportingPeriod: z.object({
+		commandNumber: z.string().optional().default('2f'),
+	}),
+	restart: z.object({
+		commandNumber: z.string().optional().default('a5'),
 	}),
-	getPirActiveReportingPeriod: z.object({}),
-	getRegion: z.object({}),
-	restart: z.object({}),
 }
 
 export namespace MultiSensorCommandTypes {