Fix Interlacing issue with CAN Analog Axis 5-6 (#124)

Sqwince · Ultrawipf · commit 643e7fe8eb60 · 2025-02-15T16:04:34.000+01:00
diff --git a/Firmware/FFBoard/UserExtensions/Src/CanAnalog.cpp b/Firmware/FFBoard/UserExtensions/Src/CanAnalog.cpp
@@ -127,8 +127,8 @@ void CanAnalogBase::canRxPendCallback(CANPort* port,CAN_rx_msg& msg){
 		if(id != this->canId+packet){
 			continue;
 		}
-		for(uint8_t i = 0; i< axes-(packet*4) ; i++){
-			this->buf[i+(packet*4)] = msg.data[i*2] | (msg.data[i*2+1] << 8);
+		for(uint8_t i = 0; i < 4 && (i + packet*4) < axes; i++) {
+    	this->buf[i + packet*4] = msg.data[i*2] | (msg.data[i*2+1] << 8);
 		}
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -127,8 +127,8 @@ void CanAnalogBase::canRxPendCallback(CANPort* port,CAN_rx_msg& msg){`
`127`	`127`	`if(id != this->canId+packet){`
`128`	`128`	`continue;`
`129`	`129`	`}`
`130`		`- for(uint8_t i = 0; i< axes-(packet*4) ; i++){`
`131`		`- this->buf[i+(packet4)] = msg.data[i2] \| (msg.data[i*2+1] << 8);`
	`130`	`+ for(uint8_t i = 0; i < 4 && (i + packet*4) < axes; i++) {`
	`131`	`+ this->buf[i + packet4] = msg.data[i2] \| (msg.data[i*2+1] << 8);`
`132`	`132`	`}`
`133`	`133`	`}`
`134`	`134`	`}`