Skip to content

Commit

Permalink
Fix for bitshift input issues and changes to address that breaking fi…
Browse files Browse the repository at this point in the history
…rmware tool
  • Loading branch information
kglovern committed Aug 15, 2022
1 parent 2d39cd0 commit 864f383
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 9 deletions.
2 changes: 1 addition & 1 deletion src/app/containers/Firmware/components/Settings/List.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ const SettingsList = () => {
max={grbl.max}
step={grbl.step}
units={grbl.units}
onChange={() => handleSettingsChange(index)}
onChange={handleSettingsChange(index)}
value={grbl.value}
/>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,9 @@ import styles from './index.styl';
const BitShiftInput = ({ value, onChange }) => {
const [bitShiftSettings, setBitShiftSettings] = useState([false, false, false]); //X, Y, Z

useEffect(() => {
initializeSettings();
}, []);

useEffect(() => {
/*useEffect(() => {
updateValues(bitShiftSettings);
}, [bitShiftSettings]);
}, [bitShiftSettings]);*/

useEffect(() => {
initializeSettings();
Expand All @@ -25,6 +21,7 @@ const BitShiftInput = ({ value, onChange }) => {
setBitShiftSettings(prev => {
const newBitShiftSettings = [...prev];
newBitShiftSettings[index] = value;
updateValues(newBitShiftSettings);
return newBitShiftSettings;
});
};
Expand Down Expand Up @@ -57,8 +54,9 @@ const BitShiftInput = ({ value, onChange }) => {
sum += x ? 1 : 0;
sum += y ? 2 : 0;
sum += z ? 4 : 0;

console.log(sum);
onChange(sum.toString());
return bitShiftSettings;
};

const [X, Y, Z] = bitShiftSettings;
Expand Down
2 changes: 1 addition & 1 deletion src/app/containers/Preferences/About/releases.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
["### 1.1.3 (August 12th, 2022)","* Added profiles for Longmill extension kits","* Machine profile removed from preferences and placed in firmware tool","* Fixed incorrect default values in some machine profiles","* Fixed issue with test mode that would occasionally have it start running the file after test was complete","* Fixed issue with continuous jog when soft limits were enabled and report in inches EEPROM value was enabled","* Firmware tool improvements - new convenient profile selection, setting search, performance improvments, highlighted changed values","* Improvements to value inputs - should no longer default to min value if there is too long a pause in typing","* Surfacing labels changed to X/Y rather than length/width","* Minor styling changes"]
["### 1.1.3 (August 12th, 2022)","* Added profiles for Longmill extension kits","* Machine profile removed from preferences and placed in firmware tool","* Fixed incorrect default values in some machine profiles","* Test mode now restores WCS after the soft reset performed while exiting check mode.","* Fixed issue with test mode that would occasionally have it start running the file after test was complete","* Fixed issue with continuous jog when soft limits were enabled and report in inches EEPROM value was enabled","* Firmware tool improvements - new convenient profile selection, setting search, performance improvments, highlighted changed values","* Improvements to value inputs - should no longer default to min value if there is too long a pause in typing","* Surfacing labels changed to X/Y rather than length/width","* Minor styling changes"]

0 comments on commit 864f383

Please sign in to comment.