Reduced size by removing spaces

This commit is contained in:
Technik Gegg
2021-02-25 08:14:04 +01:00
parent fe23e8abd8
commit fb15334cdc
4 changed files with 144 additions and 138 deletions

View File

@@ -4,7 +4,7 @@ root = true
[{*.patch,syntax_test_*}] [{*.patch,syntax_test_*}]
trim_trailing_whitespace = false trim_trailing_whitespace = false
[{*.c,*.cpp,*.h,*.CFG}, *.gcode] [{*.c,*.cpp,*.h}, *.gcode]
charset = utf-8 charset = utf-8
trim_trailing_whitespace = true trim_trailing_whitespace = true
insert_final_newline = true insert_final_newline = true
@@ -12,6 +12,14 @@ end_of_line = lf
indent_style = tab indent_style = tab
indent_size = 4 indent_size = 4
[{*.CFG.json, *.CFG}]
charset = utf-8
trim_trailing_whitespace = true
insert_final_newline = true
end_of_line = crlf
indent_style = tab
indent_size = 2
[*.mnu, *.opt] [*.mnu, *.opt]
charset = utf-8 charset = utf-8
end_of_line = crlf end_of_line = crlf

2
.gitattributes vendored
View File

@@ -5,7 +5,7 @@
*.cpp text eol=lf *.cpp text eol=lf
*.h text eol=lf *.h text eol=lf
*.gcode text eol=lf *.gcode text eol=lf
*.CFG text eol=lf *.CFG.json text eol=lf
*.mnu text eol=crlf *.mnu text eol=crlf
*.opt text eol=crlf *.opt text eol=crlf

View File

@@ -1,91 +1,89 @@
{ {
"Ser0Spd": 57600, "Ser0Spd": 57600,
"Ser1Spd": 57600, "Ser1Spd": 57600,
"Ser2Spd": 57600, "Ser2Spd": 57600,
"Ser3Spd": 57600, "Ser3Spd": 57600,
"Tools": 5, "Tools": 5,
"BowdenLen": 550.0, "BowdenLen": 550.0,
"SelectorDist": 34.0, "SelectorDist": 34.0,
"LCDCont": 190, "LCDCont": 190,
"I2CAddr": 136, "I2CAddr": 136,
"MenuClose": 20, "MenuClose": 20,
"FanSpeed": 0, "FanSpeed": 0,
"PwrSavTime": 300, "PwrSavTime": 300,
"SendAction": false, "SendAction": false,
"EmulPrusa": false, "EmulPrusa": false,
"UnldCmd": "", "UnldCmd": "",
"ServoMinPwm": 800, "ServoMinPwm": 800,
"ServoMaxPwm": 2400, "ServoMaxPwm": 2400,
"WipeSeq": "S200 I140 J160 P90 R20", "WipeSeq": "S200 I140 J160 P90 R20",
"BackColor": 4, "BackColor": 4,
"ToolColor": 5, "ToolColor": 5,
"HasPanelDue": 0, "HasPanelDue": 0,
"EncTicks": true, "EncTicks": true,
"SendStats": true, "SendStats": true,
"LBtnDown": "", "LBtnDown": "",
"LBtnHold": "M999", "LBtnHold": "M999",
"RBtnDown": "M18", "RBtnDown": "M18",
"RBtnHold": "", "RBtnHold": "",
"SpdsInMms": false, "SpdsInMms": false,
"UseCutter": false, "UseCutter": false,
"UsePurge": false, "UsePurge": false,
"CutOpen": 90, "CutOpen": 90,
"CutClose": 50, "CutClose": 50,
"CutterLen": 50, "CutterLen": 50,
"Selector": {
"Selector": { "Offset": 0.5,
"Offset": 0.5, "Spacing": 21.0,
"Spacing": 21.0, "StepsMM": 80,
"StepsMM": 80, "AccelSpeed": 4000,
"AccelSpeed": 4000, "AccelDist": 21,
"AccelDist": 21, "MaxSpeed": 1000,
"MaxSpeed": 1000, "InvDir": false,
"InvDir": false, "EStopTrg": 1,
"EStopTrg": 1, "StepDly": 2,
"StepDly": 2, "MS3": 0
"MS3": 0 },
}, "Revolver": {
"Revolver": { "StepsRev": 9600,
"StepsRev": 9600, "Offset": 1275,
"Offset": 1275, "AccelSpeed": 6000,
"AccelSpeed": 6000, "AccelDist": 20,
"AccelDist": 20, "MaxSpeed": 2000,
"MaxSpeed": 2000, "ResetBeforeFd": true,
"ResetBeforeFd": true, "HomeAfterFd": true,
"HomeAfterFd": true, "InvDir": false,
"InvDir": false, "EStopTrg": 1,
"EStopTrg": 1, "StepDly": 0,
"StepDly": 0, "Wiggle": false,
"Wiggle": false, "UseServo": true,
"UseServo": true, "ServoOpen": 125,
"ServoOpen": 125, "ServoClose": 90,
"ServoClose": 90, "MS3": 0
"MS3": 0 },
}, "Feeder": {
"Feeder": { "ExtCtrl": false,
"ExtCtrl": false, "StepsMM": 410,
"StepsMM": 410, "AccelSpeed": 6000,
"AccelSpeed": 6000, "AccelDist": 5,
"AccelDist": 5, "MaxSpeed": 500,
"MaxSpeed": 500, "InsSpeed": 5000,
"InsSpeed": 5000, "PurgeSpeed": 40000,
"PurgeSpeed": 40000, "PurgeLen": 100,
"PurgeLen": 100, "ReinforceLen": 0,
"ReinforceLen": 0, "UnldRetract": 0,
"UnldRetract": 0, "UnldPushback": 0,
"UnldPushback": 0, "PushbackDelay": 2.0,
"PushbackDelay": 2.0, "InvDir": true,
"InvDir": true, "EStopTrigger": 1,
"EStopTrigger": 1, "EStopTest": 0,
"EStopTest": 0, "StepDly": 0,
"StepDly": 0, "UseChunks": false,
"UseChunks": false, "Chunks": 20,
"Chunks": 20, "InsLen": 5,
"InsLen": 5, "DuetLaser": false,
"DuetLaser": false, "SharedStepper": false,
"SharedStepper": false, "MS3": 0,
"MS3": 0, "UseEStop2": false
"UseEStop2": false }
} }
}

View File

@@ -1,47 +1,47 @@
{ {
"Selector": { "Selector": {
"Mode": 1, "Mode": 0,
"TMode": true, "TMode": true,
"Power": 700, "Power": 700,
"RSense": 0.11, "RSense": 0.11,
"MS": 16, "MS": 16,
"Stall": 40, "Stall": 40,
"CSMin": 0, "CSMin": 0,
"CSMax": 0, "CSMax": 0,
"CSDown": 0, "CSDown": 0,
"DrvAddr": 0, "DrvAddr": 0,
"TOff": -1, "TOff": -1,
"StopOnStall": false, "StopOnStall": false,
"MaxStall": 10 "MaxStall": 10
}, },
"Revolver": { "Revolver": {
"Mode": 1, "Mode": 0,
"TMode": false, "TMode": false,
"Power": 700, "Power": 700,
"RSense": 0.11, "RSense": 0.11,
"MS": 16, "MS": 16,
"Stall": 40, "Stall": 40,
"CSMin": 0, "CSMin": 0,
"CSMax": 0, "CSMax": 0,
"CSDown": 0, "CSDown": 0,
"DrvAddr": 0, "DrvAddr": 0,
"TOff": -1, "TOff": -1,
"StopOnStall": false, "StopOnStall": false,
"MaxStall": 10 "MaxStall": 10
}, },
"Feeder": { "Feeder": {
"Mode": 1, "Mode": 0,
"TMode": false, "TMode": false,
"Power": 700, "Power": 700,
"RSense": 0.11, "RSense": 0.11,
"MS": 16, "MS": 16,
"Stall": 40, "Stall": 40,
"CSMin": 0, "CSMin": 0,
"CSMax": 0, "CSMax": 0,
"CSDown": 0, "CSDown": 0,
"DrvAddr": 0, "DrvAddr": 0,
"TOff": -1, "TOff": -1,
"StopOnStall": false, "StopOnStall": false,
"MaxStall": 10 "MaxStall": 10
} }
} }