More CaiXianlin cleanup

hhvrc · hhvrc · commit 6ee7bcd942f2 · 2024-11-16T01:59:06.000+01:00
diff --git a/src/radio/rmt/CaiXianlinEncoder.cpp b/src/radio/rmt/CaiXianlinEncoder.cpp
@@ -37,7 +37,7 @@ std::vector<rmt_data_t> Rmt::CaiXianlinEncoder::GetSequence(uint16_t transmitter
   }
 
   // Payload layout: [transmitterId:16][channelId:4][type:4][intensity:8]
-  uint32_t payload = (static_cast<uint32_t>(transmitterId & 0xFFFF) << 16) | (static_cast<uint32_t>(channelId & 0xF) << 12) | (static_cast<uint32_t>(typeVal) << 8) | static_cast<uint32_t>(intensity & 0xFF);
+  uint32_t payload = (static_cast<uint32_t>(transmitterId) << 16) | (static_cast<uint32_t>(channelId & 0xF) << 12) | (static_cast<uint32_t>(typeVal & 0xF) << 8) | static_cast<uint32_t>(intensity);
 
   // Calculate the checksum of the payload
   uint8_t checksum = Checksum::Sum8(payload);

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ std::vector<rmt_data_t> Rmt::CaiXianlinEncoder::GetSequence(uint16_t transmitter`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`// Payload layout: [transmitterId:16][channelId:4][type:4][intensity:8]`
`40`		`- uint32_t payload = (static_cast<uint32_t>(transmitterId & 0xFFFF) << 16) \| (static_cast<uint32_t>(channelId & 0xF) << 12) \| (static_cast<uint32_t>(typeVal) << 8) \| static_cast<uint32_t>(intensity & 0xFF);`
	`40`	`+ uint32_t payload = (static_cast<uint32_t>(transmitterId) << 16) \| (static_cast<uint32_t>(channelId & 0xF) << 12) \| (static_cast<uint32_t>(typeVal & 0xF) << 8) \| static_cast<uint32_t>(intensity);`
`41`	`41`
`42`	`42`	`// Calculate the checksum of the payload`
`43`	`43`	`uint8_t checksum = Checksum::Sum8(payload);`