Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/Corrected-EEPROM-1500s'
Browse files Browse the repository at this point in the history
  • Loading branch information
kglovern committed Aug 14, 2024
2 parents 3c117c5 + 7ad2732 commit 315dad9
Show file tree
Hide file tree
Showing 16 changed files with 174 additions and 791 deletions.
332 changes: 153 additions & 179 deletions src/app/containers/Firmware/components/defaultMachineProfiles.js

Large diffs are not rendered by default.

6 changes: 5 additions & 1 deletion src/app/containers/Firmware/eeprom/grbl/longmill.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ export const LONGMILL_MASTER_LIST_GRBL = {
$0: '10',
$1: '100',
$2: '1',
// $3: "* Some value *",
$4: '1',
$5: '0',
$6: '0',
Expand All @@ -30,7 +31,10 @@ export const LONGMILL_MASTER_LIST_GRBL = {
$112: '3000.000',
$120: '750.000',
$121: '750.000',
$122: '500.000',
$122: '500.000'
// $130: "* Some value *"
// $131: "* Some value *"
// $132: "* Some value *"
};

export const LONGMILL_MK1_12x12 = {
Expand Down
31 changes: 16 additions & 15 deletions src/app/containers/Firmware/eeprom/grbl/millone.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
const MILL_ONE_MASTER_LIST = {
$0: '10',
$1: '100',
$2: '1',
$1: '25',
$2: '0',
$3: '6',
$4: '1',
$4: '0',
$5: '0',
$6: '0',
$10: '1',
Expand All @@ -13,25 +13,26 @@ const MILL_ONE_MASTER_LIST = {
$20: '0',
$21: '0',
$22: '0',
$23: '3',
$23: '0',
$24: '25.000',
$25: '1500.000',
$25: '500.000',
$26: '250',
$27: '1.000',
$30: '30000',
$31: '10000',
$30: '1000',
$31: '0',
$32: '0',
$100: '200.000',
$101: '200.000',
$102: '200.000',
$110: '4000.000',
$111: '4000.000',
$112: '3000.000',
$120: '750.000',
$121: '750.000',
$122: '500.000',
$131: '750.000',
$132: '500.000',
$110: '1800.000',
$111: '1800.000',
$112: '600.000',
$120: '30.000',
$121: '30.000',
$122: '15.000',
// $130: "* Some value *"
$131: '185.000',
$132: '100.000'
};

export const MILL_ONE_V1_AND_V2 = {
Expand Down
188 changes: 0 additions & 188 deletions src/app/containers/Firmware/eepromFiles/DefaultSLBSettings.json

This file was deleted.

36 changes: 0 additions & 36 deletions src/app/containers/Firmware/eepromFiles/MK1_48x30.json

This file was deleted.

36 changes: 0 additions & 36 deletions src/app/containers/Firmware/eepromFiles/MK2_12x30.json

This file was deleted.

36 changes: 0 additions & 36 deletions src/app/containers/Firmware/eepromFiles/MK2_30x30.json

This file was deleted.

Loading

0 comments on commit 315dad9

Please sign in to comment.