Mirrored_Repos/teachingtechYT.github.io
1
0
Fork 0
mirror of https://github.com/teachingtechYT/teachingtechYT.github.io.git synced 2024-08-30 18:23:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Teweak accel test- full feedrate control

Browse Source
This commit is contained in:
lawgicau
2021-07-19 16:25:34 +10:00
parent 3c60dddb9d
commit d74cbdd0c0
3 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
js/gcodeprocessing.js
View File

@ -216,7 +216,8 @@ function processGcode(formName) {
}
// collect acceleration inputs
if(name == "accelerationForm"){
var feed = formName.feedrate.value*60;
var inner = formName.innerFeedrate.value*60;
var outer = formName.outerFeedrate.value*60;
var jerk_or_jd = formName.jerk_or_jd.value;
var a1 = formName.accel_a1.value;
var a2 = formName.accel_a2.value;
@ -401,7 +402,7 @@ function processGcode(formName) {
gcode = gcodeArray.join("\n");
}
}
// experimental feedrate change
// feedrate change
if(name != "accelerationForm"){
if(feedMod != 1){
var gcodeArray = gcode.split(/\n/g);
@ -422,9 +423,9 @@ function processGcode(formName) {
// changes for acceleration test
if(name == "accelerationForm"){
// edit feedrates
gcode = gcode.replace(/F3600/g, "F"+feed+" ; custom feedrate - full");
gcode = gcode.replace(/F2880/g, "F"+feed+" ; custom feedrate - full");
gcode = gcode.replace(/F2160/g, "F"+feed/2+" ; custom feedrate - half");
gcode = gcode.replace(/F3600/g, "F"+outer+" ; custom outer perimeter feedrate");
gcode = gcode.replace(/F2880/g, "F"+outer+" ; custom outer perimeter feedrate");
gcode = gcode.replace(/F2160/g, "F"+inner+" ; custom inner perimeter feedrate");
// add acceleration segments
gcode = gcode.replace(/;process Process-1/, "M201 X50000 Y50000 Z50000; custom raise acceleration limits\nM204 P"+a1+" ; custom acceleration - A\n;j1");
gcode = gcode.replace(/;process Process-2/, "M204 P"+b1+" ; custom acceleration - B\n;j2");