AI_Assistant/grid-apps-cmms
Watch
1
0
Fork
You've already forked grid-apps-cmms
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

change cam preview behavior. update ft5 profile for marlin 1.1.8

Browse source
This commit is contained in:
Stewart Allen 2018-02-23 22:39:02 -05:00
commit 80acd4d120
3 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
js/kiri.js
View file

@ -487,7 +487,7 @@ self.kiri.license = exports.LICENSE;
widget_deselected_color = 0xffff00, widget_deselected_color = 0xffff00,
widget_slicing_color = 0xffaaaa, widget_slicing_color = 0xffaaaa,
widget_cam_preview_color = 0x0055bb, widget_cam_preview_color = 0x0055bb,
preview_opacity_cam = 1, preview_opacity_cam = 0.25,
preview_opacity = 0.0, preview_opacity = 0.0,
model_opacity = 1.0, model_opacity = 1.0,
slicing_opacity = 0.5, slicing_opacity = 0.5,
@ -752,8 +752,6 @@ self.kiri.license = exports.LICENSE;
function showSlice(index, range, layer) { function showSlice(index, range, layer) {
if (range) { if (range) {
return index <= layer && index > layer-range; return index <= layer && index > layer-range;
} else if (MODE === MODES.CAM) {
return index >= layer;
} else { } else {
return index <= layer; return index <= layer;
} }

2
js/license.js
View file

@ -1,7 +1,7 @@
var exports = { var exports = {
COPYRIGHT:"Copyright (C) 2014-2017 Stewart Allen <stewart@neuron.com> - All Rights Reserved", COPYRIGHT:"Copyright (C) 2014-2017 Stewart Allen <stewart@neuron.com> - All Rights Reserved",
LICENSE:"Unauthorized copying, modification and re-distribution are strictly prohibited without prior written consent.", LICENSE:"Unauthorized copying, modification and re-distribution are strictly prohibited without prior written consent.",
VERSION:"1.1.2" VERSION:"1.1.3"
}; };
if (!module) var module = {}; if (!module) var module = {};
module.exports = exports; module.exports = exports;

7
web/kiri/filter/FDM/FolgerTech.FT5
View file

@ -11,7 +11,12 @@
"M190 S{bed_temp} T0 ; wait for bed to reach target temp", "M190 S{bed_temp} T0 ; wait for bed to reach target temp",
"M109 S{temp} T0 ; wait for extruder to reach target temp", "M109 S{temp} T0 ; wait for extruder to reach target temp",
"G0 Z0.25 ; position 0.25mm over bed", "G0 Z0.25 ; position 0.25mm over bed",
"G1 X100 E30 F600 ; purge 30mm from extruder" "G1 X100 E30 F600 ; purge 30mm from extruder",
"M201 X1000 Y1000 Z100 E2000 ; max accel",
"M204 P1000 T2000 ; default accel",
"M301 P17.14 I1.12 D65.29 ; pid params",
"M900 K{kfactor} ; k factor",
"M205 X5 ; max xy jerk"
], ],
"post":[ "post":[
"M107 ; turn off filament cooling fan", "M107 ; turn off filament cooling fan",