Skip to content

Commit 864f383

Browse files
committed
Fix for bitshift input issues and changes to address that breaking firmware tool
1 parent 2d39cd0 commit 864f383

File tree

3 files changed

+7
-9
lines changed

3 files changed

+7
-9
lines changed

src/app/containers/Firmware/components/Settings/List.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ const SettingsList = () => {
6464
max={grbl.max}
6565
step={grbl.step}
6666
units={grbl.units}
67-
onChange={() => handleSettingsChange(index)}
67+
onChange={handleSettingsChange(index)}
6868
value={grbl.value}
6969
/>
7070
</div>

src/app/containers/Firmware/components/Settings/input/BitShiftInput.jsx

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,9 @@ import styles from './index.styl';
99
const BitShiftInput = ({ value, onChange }) => {
1010
const [bitShiftSettings, setBitShiftSettings] = useState([false, false, false]); //X, Y, Z
1111

12-
useEffect(() => {
13-
initializeSettings();
14-
}, []);
15-
16-
useEffect(() => {
12+
/*useEffect(() => {
1713
updateValues(bitShiftSettings);
18-
}, [bitShiftSettings]);
14+
}, [bitShiftSettings]);*/
1915

2016
useEffect(() => {
2117
initializeSettings();
@@ -25,6 +21,7 @@ const BitShiftInput = ({ value, onChange }) => {
2521
setBitShiftSettings(prev => {
2622
const newBitShiftSettings = [...prev];
2723
newBitShiftSettings[index] = value;
24+
updateValues(newBitShiftSettings);
2825
return newBitShiftSettings;
2926
});
3027
};
@@ -57,8 +54,9 @@ const BitShiftInput = ({ value, onChange }) => {
5754
sum += x ? 1 : 0;
5855
sum += y ? 2 : 0;
5956
sum += z ? 4 : 0;
60-
57+
console.log(sum);
6158
onChange(sum.toString());
59+
return bitShiftSettings;
6260
};
6361

6462
const [X, Y, Z] = bitShiftSettings;
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +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.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 commit comments

Comments
 (0)