Update correct ESC when esc index does not equal array index #434

Author: stylesuxx

src/Components/Flash/Escs/Esc/__tests__/index.test.jsx

@@ -341,6 +341,7 @@ describe('Esc', () => {
     }));
 
     const esc = {
+      index: 0,
       firmwareName: 'Bluejay',
       layoutRevision: 207,
       settings: { DITHERING: 0 },
@@ -374,6 +375,7 @@ describe('Esc', () => {
     }));
 
     const esc = {
+      index: 0,
       firmwareName: 'Bluejay',
       layoutRevision: 207,
       settings: { DITHERING: 1 },

src/Containers/App/escsSlice.js

@@ -1,5 +1,17 @@
 import { createSlice } from '@reduxjs/toolkit';
 
+/**
+ * NOTE: The individual array holds individual ESC settings, the actual index
+ *       in the array does not represent the actual index of the ESC. If for
+ *       example only one ESC is attached, the individual length will have a
+ *       length of 1. The actual index of the ESC must be reat from that object.
+ *
+ *       Eg.: Only one ESC is attached to motor pin 2 an an FC where 4 ESCs
+ *            are expected. The individual array will have a length of 1, but
+ *            at index 0 it will have the settings for the ESC attached to motor
+ *            pin 2.
+ */
+
 const initialState = {
   connected: 0,
   master: {},
@@ -42,10 +54,16 @@ export const escsSlice = createSlice({
         settings,
       } = action.payload;
 
-      state.individual[index] = {
-        ...state.individual[index],
-        ...settings,
-      };
+      for(let i = 0; i < state.individual.length; i += 1) {
+        if(state.individual[i].index === index) {
+          state.individual[i] = {
+            ...state.individual[i],
+            ...settings,
+          };
+
+          break;
+        }
+      }
     },
   },
 });

src/changelog.json

@@ -2,7 +2,9 @@
   {
     "title": "Unreleased",
     "items": [
-      "AM32: Fix running brake range",
+      "Bugfix: Fix running brake range on AM32",
+      "Bugfix: Update correct ESC when only a single ESC is attached (when multiple would be expected)",
+      "Bugfix: Allow recovery via UI if ESC can still be read, but previous flash failed",
       "Bluejay: Adjust min/max startup power defaults",
       "Enhancement: Show checklist when chosing new firmware version",
       "Enhancement: Link to release notes of new versions if available",