Merge pull request #241 from runger1101001/dev

runger1101001 · web-flow · commit 7b8bb49f8107 · 2023-01-10T15:35:41.000+01:00
Several small bug fixes
diff --git a/src/common/base_classes/FOCMotor.cpp b/src/common/base_classes/FOCMotor.cpp
@@ -36,6 +36,7 @@ FOCMotor::FOCMotor()
   //monitor_port 
   monitor_port = nullptr;
   //sensor 
+  sensor_offset = 0.0f;
   sensor = nullptr;
   //current sensor 
   current_sense = nullptr;
diff --git a/src/current_sense/hardware_specific/rp2040/rp2040_mcu.cpp b/src/current_sense/hardware_specific/rp2040/rp2040_mcu.cpp
@@ -151,10 +151,9 @@ bool RP2040ADCEngine::init() {
     for (int i = 3; i>=0; i--) {
         if (channelsEnabled[i]){
             adc_gpio_init(i+26);
-            enableMask |= 0x01;
+            enableMask |= (0x01<<i);
             channelCount++;
         }
-        enableMask = (enableMask<<1);
     }
     adc_set_round_robin(enableMask);
     adc_fifo_setup(

Original file line number	Diff line number	Diff line change
`@@ -151,10 +151,9 @@ bool RP2040ADCEngine::init() {`
`151`	`151`	`for (int i = 3; i>=0; i--) {`
`152`	`152`	`if (channelsEnabled[i]){`
`153`	`153`	`adc_gpio_init(i+26);`
`154`		`- enableMask \|= 0x01;`
	`154`	`+ enableMask \|= (0x01<<i);`
`155`	`155`	`channelCount++;`
`156`	`156`	`}`
`157`		`- enableMask = (enableMask<<1);`
`158`	`157`	`}`
`159`	`158`	`adc_set_round_robin(enableMask);`
`160`	`159`	`adc_fifo_setup(`