fix channel counting

Richard Unger · Richard Unger · commit 3b7b261c8575 · 2022-03-10T16:20:07.000+01:00
diff --git a/src/drivers/hardware_specific/stm32_mcu.cpp b/src/drivers/hardware_specific/stm32_mcu.cpp
@@ -307,15 +307,15 @@ int scoreCombination(int numPins, PinMap* pinTimers[]) {
         return -4; // bad combination - duplicated channel
     }
   }
-  int score = 1;
+  int score = 0;
   for (int i=0; i<numPins; i++) {
     // count distinct timers
-    for (int j=1; j<i; j++) {
+    bool found = false;
+    for (int j=i+1; j<numPins; j++) {
       if (pinTimers[i]->peripheral == pinTimers[j]->peripheral)
-        break;
-      if (i==j)
-        score++;
+        found = true;
     }
+    if (!found) score++;
   }
   if (numPins==6) {
     // check for inverted channels - best: 1 timer, 3 channels, 3 matching inverted channels

Original file line number	Diff line number	Diff line change
`@@ -307,15 +307,15 @@ int scoreCombination(int numPins, PinMap* pinTimers[]) {`
`307`	`307`	`return -4; // bad combination - duplicated channel`
`308`	`308`	`}`
`309`	`309`	`}`
`310`		`- int score = 1;`
	`310`	`+ int score = 0;`
`311`	`311`	`for (int i=0; i<numPins; i++) {`
`312`	`312`	`// count distinct timers`
`313`		`- for (int j=1; j<i; j++) {`
	`313`	`+ bool found = false;`
	`314`	`+ for (int j=i+1; j<numPins; j++) {`
`314`	`315`	`if (pinTimers[i]->peripheral == pinTimers[j]->peripheral)`
`315`		`- break;`
`316`		`- if (i==j)`
`317`		`- score++;`
	`316`	`+ found = true;`
`318`	`317`	`}`
	`318`	`+ if (!found) score++;`
`319`	`319`	`}`
`320`	`320`	`if (numPins==6) {`
`321`	`321`	`// check for inverted channels - best: 1 timer, 3 channels, 3 matching inverted channels`