Merge branch 'develop' into feature/PM-422-add-motor-voltage

Olavhaasie · web-flow · commit 51aa95b3840a · 2020-05-19T10:59:58.000+02:00
diff --git a/march_hardware/include/march_hardware/PDOmap.h b/march_hardware/include/march_hardware/PDOmap.h
@@ -20,11 +20,11 @@ struct IMCObject
   uint8_t length;             // bits (see IMC manual)
   uint32_t combined_address;  // combine the address(hex), sub-index(hex) and length(hex)
 
-  explicit IMCObject(uint16_t _address, uint8_t _sub_index, uint8_t _length)
+  IMCObject(uint16_t _address, uint8_t _sub_index, uint8_t _length)
     : address(_address), sub_index(_sub_index), length(_length)
   {
-    uint32_t MSword = ((address & 0xFFFF) << 16);
-    uint32_t LSword = ((sub_index & 0xFFFF) << 8) | length;
+    uint32_t MSword = (address << 16);
+    uint32_t LSword = (sub_index << 8) | length;
 
     combined_address = (MSword | LSword);
   }

Original file line number	Diff line number	Diff line change
`@@ -20,11 +20,11 @@ struct IMCObject`
`20`	`20`	`uint8_t length; // bits (see IMC manual)`
`21`	`21`	`uint32_t combined_address; // combine the address(hex), sub-index(hex) and length(hex)`
`22`	`22`
`23`		`- explicit IMCObject(uint16_t _address, uint8_t _sub_index, uint8_t _length)`
	`23`	`+ IMCObject(uint16_t _address, uint8_t _sub_index, uint8_t _length)`
`24`	`24`	`: address(_address), sub_index(_sub_index), length(_length)`
`25`	`25`	`{`
`26`		`- uint32_t MSword = ((address & 0xFFFF) << 16);`
`27`		`- uint32_t LSword = ((sub_index & 0xFFFF) << 8) \| length;`
	`26`	`+ uint32_t MSword = (address << 16);`
	`27`	`+ uint32_t LSword = (sub_index << 8) \| length;`
`28`	`28`
`29`	`29`	`combined_address = (MSword \| LSword);`
`30`	`30`	`}`