jepler/linuxcnc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

haltcl -fix spindle.0.speed-in scale

Browse source 
requires RPS was getting RPM
This commit is contained in:
Chris Morley 2020-07-14 20:03:11 -07:00
parent 41712f623d
commit 8e3f222c04
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
lib/hallib/sim_lib.tcl
View file

@ -331,6 +331,9 @@ proc sim_spindle {} {
loadrt limit2 names=limit_speed loadrt limit2 names=limit_speed
loadrt lowpass names=spindle_mass loadrt lowpass names=spindle_mass
loadrt near names=near_speed loadrt near names=near_speed
loadrt scale names=rpm_rps
setp rpm_rps.gain .0167
# this limit doesnt make any sense to me: # this limit doesnt make any sense to me:
do_setp limit_speed.maxv 5000.0 ;# rpm/second do_setp limit_speed.maxv 5000.0 ;# rpm/second
@ -358,7 +361,8 @@ proc sim_spindle {} {
# for spindle velocity estimate # for spindle velocity estimate
net spindle-rpm-filtered <= spindle_mass.out net spindle-rpm-filtered <= spindle_mass.out
net spindle-rpm-filtered => spindle.0.speed-in net spindle-rpm-filtered rpm_rps.in
net spindle-rps-filtered rpm_rps.out spindle.0.speed-in
net spindle-rpm-filtered => near_speed.in2 net spindle-rpm-filtered => near_speed.in2
# at-speed detection # at-speed detection
@ -370,6 +374,7 @@ proc sim_spindle {} {
addf limit_speed servo-thread addf limit_speed servo-thread
addf spindle_mass servo-thread addf spindle_mass servo-thread
addf rpm_rps servo-thread
addf near_speed servo-thread addf near_speed servo-thread
addf sim_spindle servo-thread addf sim_spindle servo-thread
} ;# sim_spindle } ;# sim_spindle