fixed some hal issues with sim_cannon to work with both sims name /count

Lcvette · Lcvette · commit d5c3cd9f9412 · 2020-03-11T14:49:25.000-04:00
diff --git a/config/atc_sim/sim_cannon.hal b/config/atc_sim/sim_cannon.hal
@@ -1,15 +1,15 @@
 loadrt pwmgen output_type=0
-addf scale.servo servo-thread
+addf scale.1 servo-thread
 
 addf pwmgen.update servo-thread
 addf pwmgen.make-pulses servo-thread
 
 setp pwmgen.0.enable 1
-setp pwmgen.0.pwm-freq 333
+setp pwmgen.0.pwm-freq 50
 
-setp scale.servo.gain 0.0037
-setp scale.servo.offset 0.333
+setp scale.1.gain 0.00059
+setp scale.1.offset 0.05
 
 #CONNECTIONS
-net scale-sig    motion.analog-out-20    =>    scale.servo.in    #input degrees
-net scale-pwm    scale.servo.out    =>    pwmgen.0.value
+net scale-sig    motion.analog-out-20    =>    scale.1.in
+net scale-pwm    scale.1.out    =>    pwmgen.0.value
diff --git a/config/atc_sim/sim_vmc.hal b/config/atc_sim/sim_vmc.hal
@@ -85,7 +85,7 @@ net bit4 bitslice.0.out-04
 loadrt conv_s32_float count=2
 loadrt conv_float_s32 count=3
 loadrt near count=3
-loadrt scale
+loadrt scale count=2
 addf conv-s32-float.0 servo-thread
 addf conv-float-s32.0 servo-thread
 addf conv-s32-float.1 servo-thread
diff --git a/config/atc_sim/sim_vmc_inch.hal b/config/atc_sim/sim_vmc_inch.hal
@@ -102,7 +102,7 @@ net bit4 bitslice.0.out-04
 loadrt conv_s32_float count=2
 loadrt conv_float_s32 count=3
 loadrt near count=3
-loadrt scale
+loadrt scale count=2
 addf conv-s32-float.0 servo-thread
 addf conv-float-s32.0 servo-thread
 addf conv-s32-float.1 servo-thread
diff --git a/config/atc_sim/time.hal b/config/atc_sim/time.hal
diff --git a/config/atc_sim/vmc.var b/config/atc_sim/vmc.var
@@ -41,9 +41,9 @@
 5218	0.000000
 5219	0.000000
 5220	1.000000
-5221	2.000000
-5222	3.000000
-5223	-4.000000
+5221	0.000000
+5222	0.000000
+5223	0.000000
 5224	0.000000
 5225	0.000000
 5226	0.000000
diff --git a/config/atc_sim/vmc.var.bak b/config/atc_sim/vmc.var.bak
@@ -7,11 +7,7 @@
 5167	0.000000
 5168	0.000000
 5169	0.000000
-<<<<<<< HEAD
-5170	1.000000
-=======
 5170	2.000000
->>>>>>> programmable_coolant
 5171	1.000000
 5181	0.000000
 5182	0.000000
@@ -22,17 +18,10 @@
 5187	0.000000
 5188	0.000000
 5189	0.000000
-<<<<<<< HEAD
-5190	0.000000
-5191	0.000000
-5192	21.000000
-5193	23.000000
-=======
 5190	2.000000
 5191	0.000000
 5192	26.000000
 5193	0.000000
->>>>>>> programmable_coolant
 5194	0.000000
 5195	0.000000
 5196	0.000000
@@ -52,27 +41,20 @@
 5218	0.000000
 5219	0.000000
 5220	1.000000
-5221	2.000000
-5222	3.000000
-5223	-4.000000
+5221	0.000000
+5222	0.000000
+5223	0.000000
 5224	0.000000
 5225	0.000000
 5226	0.000000
 5227	0.000000
 5228	0.000000
 5229	0.000000
 5230	0.000000
-<<<<<<< HEAD
-5231	7.000000
-5241	3.000000
-5242	2.000000
-5243	-2.500000
-=======
 5231	9.000000
 5241	0.000000
 5242	0.000000
 5243	0.000000
->>>>>>> programmable_coolant
 5244	0.000000
 5245	0.000000
 5246	0.000000
diff --git a/config/atc_sim/vmc_index_inch.ini b/config/atc_sim/vmc_index_inch.ini
@@ -84,7 +84,6 @@ HALFILE = vmc.hal
 HALFILE = sim_vmc_inch.hal
 HALFILE = spindle.hal
 HALFILE = toolchange_index.hal
-HALFILE = time.hal
 HALFILE = sim_cannon.hal
 
 [TRAJ]
diff --git a/config/atc_sim/vmc_index_metric.ini b/config/atc_sim/vmc_index_metric.ini
@@ -84,7 +84,6 @@ HALFILE = vmc.hal
 HALFILE = sim_vmc.hal
 HALFILE = spindle.hal
 HALFILE = toolchange_index.hal
-HALFILE = time.hal
 HALFILE = sim_cannon.hal
 
 [TRAJ]
diff --git a/config/probe_basic/.vcp_persistent_data.pickle b/config/probe_basic/.vcp_persistent_data.pickle
diff --git a/docs/source/quick_start.rst b/docs/source/quick_start.rst
@@ -67,7 +67,7 @@ Now linuxcnc needs to be started for the first time for it to create its directo
 Cick the link below to download the ProbeBasicInstaller file.  Once downloaded, find in its destination folder and right click and selecxt properties.  Select the Permissions Tab in the window that appears and check the box for "Allow this file to run as a program", see images below for reference. now double click the installer icon to begin the installation.  Follow the installer instructions to install Probe Basic.  Select all of the available items during initial installation.  after installation probe basic should show up in the linuxcnc launch screen and you can select to create a desktop icon for it by selecting the check box to do so at the bottom of the page.
 
 
-https://github.com/kcjengr/probe_basic/releases/download/v0.2.7/ProbeBasic-Installer-v0.2.7
+https://github.com/kcjengr/probe_basic/releases/download/v0.2.8/ProbeBasic-Installer-v0.2.8
 
 
 
diff --git a/probe_basic/probe_basic.ui b/probe_basic/probe_basic.ui
@@ -224,7 +224,7 @@ bottom-margin: 0px;
            <enum>QTabWidget::South</enum>
           </property>
           <property name="currentIndex">
-           <number>7</number>
+           <number>0</number>
           </property>
           <widget class="QWidget" name="main_tab">
            <attribute name="title">
@@ -321,7 +321,7 @@ background-color: transparent;
                  <widget class="RecentFileComboBox" name="recentfilecombobox">
                   <property name="minimumSize">
                    <size>
-                    <width>148</width>
+                    <width>142</width>
                     <height>30</height>
                    </size>
                   </property>
@@ -30887,7 +30887,7 @@ border-radius: 1px;
      <x>0</x>
      <y>0</y>
      <width>1918</width>
-     <height>27</height>
+     <height>26</height>
     </rect>
    </property>
    <property name="minimumSize">
@@ -32605,17 +32605,17 @@ font: 11pt bebas kai;
   </property>
  </designerdata>
  <buttongroups>
-  <buttongroup name="plotorthoperspbtnGroup"/>
-  <buttongroup name="probemodeGroup"/>
-  <buttongroup name="probepagewcsbtnGroup"/>
   <buttongroup name="plotviewGroup"/>
+  <buttongroup name="probetabGroup"/>
+  <buttongroup name="proberoutinebtnGroup"/>
+  <buttongroup name="customwcsbtnGroup"/>
   <buttongroup name="guiaxisdisplayGroup"/>
-  <buttongroup name="fileviewerbtnGroup"/>
   <buttongroup name="probehelpGroup"/>
-  <buttongroup name="probetabGroup"/>
+  <buttongroup name="plotorthoperspbtnGroup"/>
+  <buttongroup name="probemodeGroup"/>
+  <buttongroup name="fileviewerbtnGroup"/>
   <buttongroup name="mainorthoperspbtnGroup"/>
-  <buttongroup name="proberoutinebtnGroup"/>
+  <buttongroup name="probepagewcsbtnGroup"/>
   <buttongroup name="xycalbtnGroup"/>
-  <buttongroup name="customwcsbtnGroup"/>
  </buttongroups>
 </ui>

Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ Now linuxcnc needs to be started for the first time for it to create its directo`
`67`	`67`	Cick the link below to download the ProbeBasicInstaller file. Once downloaded, find in its destination folder and right click and selecxt properties. Select the Permissions Tab in the window that appears and check the box for "Allow this file to run as a program", see images below for reference. now double click the installer icon to begin the installation. Follow the installer instructions to install Probe Basic. Select all of the available items during initial installation. after installation probe basic should show up in the linuxcnc launch screen and you can select to create a desktop icon for it by selecting the check box to do so at the bottom of the page.
`68`	`68`
`69`	`69`
`70`		`-https://github.com/kcjengr/probe_basic/releases/download/v0.2.7/ProbeBasic-Installer-v0.2.7`
	`70`	`+https://github.com/kcjengr/probe_basic/releases/download/v0.2.8/ProbeBasic-Installer-v0.2.8`
`71`	`71`
`72`	`72`
`73`	`73`