Now use global index on filtered view to actually change correct setting

Sienci-Labs · Jan 25, 2024 · e8d58d3 · e8d58d3
1 parent 6a48775
commit e8d58d3
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/src/app/containers/Firmware/components/HalSettings/index.jsx b/src/app/containers/Firmware/components/HalSettings/index.jsx
@@ -7,12 +7,16 @@ import CategoryTag from 'Containers/Firmware/components/Settings/CategoryTag';
 
 const HalSettings = ({ descriptions }) => {
     const { settings, setSettings, setSettingsToApply } = useContext(FirmwareContext);
-
+    console.log(settings);
     const handleSettingsChange = (index) => (value) => {
         setSettingsToApply(true);
         setSettings(prev => {
+            console.log(`index: ${index}`);
             const updated = [...prev];
+            console.log(updated[index]);
+
             updated[index].value = value;
+            console.log(updated);
             return updated;
         });
     };
@@ -66,7 +70,7 @@ const HalSettings = ({ descriptions }) => {
                                     </div>
                                 </div>
                                 <div className={styles.settingsControl}>
-                                    <InputElement info={info} setting={setting} onChange={handleSettingsChange(index)} />
+                                    <InputElement info={info} setting={setting} onChange={handleSettingsChange(setting.globalIndex)} />
                                 </div>
                             </div>
                         </div>

diff --git a/src/app/containers/Firmware/index.jsx b/src/app/containers/Firmware/index.jsx
@@ -19,7 +19,7 @@ import styles from './index.styl';
 import { collectUserUsageData } from '../../lib/heatmap';
 
 const getFilteredEEPROM = (settings, eeprom = {}, halDescriptions = {}, halGroups = {}) => {
-    return Object.keys(eeprom).map((setting) => {
+    return Object.keys(eeprom).map((setting, index) => {
         const properties = settings.find(obj => {
             return obj.setting === setting;
         });
@@ -29,6 +29,7 @@ const getFilteredEEPROM = (settings, eeprom = {}, halDescriptions = {}, halGroup
 
         return {
             ...properties || {},
+            globalIndex: index,
             setting: setting,
             value: eeprom[setting],
             ...halData,

diff --git a/src/app/containers/Firmware/utils/index.js b/src/app/containers/Firmware/utils/index.js
@@ -139,6 +139,8 @@ export const convertValueToArray = (value, possibilities) => {
 };
 
 export const applyNewSettings = (settings, eeprom, setSettingsToApply) => {
+    console.log(settings);
+
     let index22 = 200; // index of $22 - default is 200 because we have less eeprom values than that, so it will never be set to this value
     let index2021 = -1; // index of $20 or $21, whichever comes first
     let changedSettings = settings
@@ -162,9 +164,8 @@ export const applyNewSettings = (settings, eeprom, setSettingsToApply) => {
         changedSettings[index22] = changedSettings[index2021];
         changedSettings[index2021] = setting22;
     }
-
+    changedSettings.push('$$'); // Add setting refresh to end so tool updates values
     controller.command('gcode', changedSettings);
-    controller.command('gcode', '$$'); //Needed so next time wizard is opened changes are reflected
     setSettingsToApply(false);
     Toaster.pop({
         msg: 'Firmware Settings Updated',