Amended instcomp - exported funct same name as component for addf

ArcEye · ArcEye · commit ef2fb9c64b45 · 2015-04-19T10:16:15.000+01:00
example sim config changed

runtests amended

instcomp.asciidoc edited

Signed-off-by: Mick &lt;arceye@mgware.co.uk&gt;
diff --git a/configs/sim/icomp-demo-sim/core_sim.hal b/configs/sim/icomp-demo-sim/core_sim.hal
@@ -31,15 +31,15 @@ addf motion-command-handler servo-thread
 addf motion-controller servo-thread
 
 # link the differentiator functions into the code
-addf ddt_x.funct servo-thread
-addf ddt_xv.funct servo-thread
-addf ddt_y.funct servo-thread
-addf ddt_yv.funct servo-thread
-addf ddt_z.funct servo-thread
-addf ddt_zv.funct servo-thread
-
-addf vel_xy.funct servo-thread
-addf vel_xyz.funct servo-thread
+addf ddt_x servo-thread
+addf ddt_xv servo-thread
+addf ddt_y servo-thread
+addf ddt_yv servo-thread
+addf ddt_z servo-thread
+addf ddt_zv servo-thread
+
+addf vel_xy servo-thread
+addf vel_xyz servo-thread
 
 # create HAL signals for position commands from motion module
 # loop position commands back to motion module feedback
diff --git a/configs/sim/icomp-demo-sim/movetest_mill.ngc b/configs/sim/icomp-demo-sim/movetest_mill.ngc
diff --git a/configs/sim/icomp-demo-sim/sim_spindle_encoder.hal b/configs/sim/icomp-demo-sim/sim_spindle_encoder.hal
@@ -38,8 +38,8 @@ setp near_speed.difference 10
 net spindle-speed-cmd => near_speed.in1
 net spindle-at-speed near_speed.out motion.spindle-at-speed
 
-addf limit_speed.funct servo-thread
-addf spindle_mass.funct servo-thread
-addf near_speed.funct servo-thread
+addf limit_speed servo-thread
+addf spindle_mass servo-thread
+addf near_speed servo-thread
 
 addf sim_spindle servo-thread
diff --git a/configs/sim/icomp-demo-sim/simulated_home.hal b/configs/sim/icomp-demo-sim/simulated_home.hal
@@ -30,7 +30,7 @@ net Xhomesw => or2_0.in0
 net Zhomesw => or2_0.in1
 net XZhomesw or2_0.out => axis.0.home-sw-in axis.2.home-sw-in
 
-addf comp_x.funct servo-thread
-addf comp_y.funct servo-thread
-addf comp_z.funct servo-thread
-addf or2_0.funct servo-thread
+addf comp_x servo-thread
+addf comp_y servo-thread
+addf comp_z servo-thread
+addf or2_0 servo-thread
diff --git a/configs/sim/icomp-demo-sim/simulated_limits.hal b/configs/sim/icomp-demo-sim/simulated_limits.hal
@@ -15,15 +15,15 @@ newinst i_wcomp wcomp_zhome
 
 # add comparators to servo thread so they will be evaluated
 # every servo period
-addf wcomp_xmin.funct servo-thread
-addf wcomp_xmax.funct servo-thread
-addf wcomp_xhome.funct servo-thread
-addf wcomp_ymin.funct servo-thread
-addf wcomp_ymax.funct servo-thread
-addf wcomp_yhome.funct servo-thread
-addf wcomp_zmin.funct servo-thread
-addf wcomp_zmax.funct servo-thread
-addf wcomp_zhome.funct servo-thread
+addf wcomp_xmin servo-thread
+addf wcomp_xmax servo-thread
+addf wcomp_xhome servo-thread
+addf wcomp_ymin servo-thread
+addf wcomp_ymax servo-thread
+addf wcomp_yhome servo-thread
+addf wcomp_zmin servo-thread
+addf wcomp_zmax servo-thread
+addf wcomp_zhome servo-thread
 
 # connect position feedback from step generators
 # to window comparators
diff --git a/src/hal/icomp-example/instcomp.asciidoc b/src/hal/icomp-example/instcomp.asciidoc
@@ -95,13 +95,10 @@ eg
 
 == Instance creation
 
-*'loadrt i_somecomponent'*
-
-Loads the component base making it ready for instantiation
 
 *'newinst i_somecomponent somecomp <iprefix=""> <pincount=0> <other_instanceparam=> extra_arg1 extra_arg2 ......'*
 
-Creates a new instance of i_somecomponent called somecomp
+Loads i_somecomponent and creates a new instance of i_somecomponent called somecomp
 
 If iprefix is supplied, it overrules any iprefix set in the .comp file and is the prefix for all pin, param and thread names for that instance.
 
@@ -116,7 +113,7 @@ eg
 
 then
 
-*'addf somecomp8.funct servo-thread'*
+*'addf somecomp8 servo-thread'*
 
 adds the function to a thread
 
diff --git a/src/hal/utils/instcomp.g b/src/hal/utils/instcomp.g
@@ -670,12 +670,7 @@ static int comp_id;
         print >>f, "        .owner_id = owner_id"
         print >>f, "        };\n"
 
-        strng =  "    rtapi_snprintf(buf, sizeof(buf),\"%s."
-        if (name == "" or name == "_" or name == " ") :
-            strng += "funct\", name);"
-        else :
-            strng += "%s.funct\", name);" % (to_hal(name))
-        print >>f, strng
+        print >>f, "    rtapi_snprintf(buf, sizeof(buf),\"%s\", name);"
 
         print >>f, "    r = hal_export_xfunctf(&%s_xf, buf, name);" % to_c(name)
         print >>f, "    if(r != 0)\n        return r;"
diff --git a/tests/i_comps/i_abs/test.hal b/tests/i_comps/i_abs/test.hal
@@ -4,7 +4,6 @@ loadrt sampler cfg=ff depth=350
 loadusr -Wn halsampler halsampler -N halsampler -n 7
 
 loadrt streamer cfg=f depth=350
-loadrt i_abs
 loadrt threads name1=fast period1=300000
 
 newinst i_abs abstest
@@ -13,7 +12,7 @@ net in streamer.0.pin.0 => sampler.0.pin.0 abstest.in
 net out abstest.out => sampler.0.pin.1
 
 addf streamer.0 fast
-addf abstest.funct fast
+addf abstest fast
 addf sampler.0 fast
 
 loadusr -w sh runstreamer
diff --git a/tests/i_comps/i_alias/expected b/tests/i_comps/i_alias/expected
@@ -1 +1 @@
-i_and2.funct.time i_and2new.funct.time i_and2new.in1 i_and2new.out something 
+i_and2.funct.time i_and2new.in1 i_and2new.out i_and2new.time something 
diff --git a/tests/i_comps/i_alias/test.hal b/tests/i_comps/i_alias/test.hal
@@ -1,4 +1,3 @@
-loadrt i_and2
 newinst i_and2 i_and2new
 alias pin i_and2new.in0 something
 alias pin i_and2new.in1 somethingelse
diff --git a/tests/i_comps/i_and-or-not-mux/test.hal b/tests/i_comps/i_and-or-not-mux/test.hal
@@ -2,11 +2,6 @@ log rt 5
 log user 0
 
 loadrt threads name1=fast period1=100000
-loadrt i_and2
-loadrt i_or2
-loadrt i_not
-loadrt i_mux2
-loadrt i_mux4
 
 loadrt sampler depth=1000 cfg=bbbff
 loadusr -Wn halsampler halsampler -N halsampler -n 16
@@ -49,11 +44,11 @@ setp i_mux4new.in2 5
 setp i_mux4new.in3 6
 
 addf streamer.0 fast
-addf i_and2new.funct fast
-addf i_or2new.funct fast
-addf i_notnew.funct fast
-addf i_mux2new.funct fast
-addf i_mux4new.funct fast
+addf i_and2new fast
+addf i_or2new fast
+addf i_notnew fast
+addf i_mux2new fast
+addf i_mux4new fast
 addf sampler.0 fast
 
 loadusr -w sh runstreamer
diff --git a/tests/i_comps/i_edge/both-starting-high/test.hal b/tests/i_comps/i_edge/both-starting-high/test.hal
@@ -5,7 +5,6 @@ loadrt sampler cfg=bbb depth=500
 loadusr -Wn halsampler halsampler -N halsampler -n 10
 
 loadrt threads name1=fast period1=100000
-loadrt i_edge
 newinst i_edge i_edgenew
 
 loadrt streamer cfg=b depth=500
@@ -15,7 +14,7 @@ net out        i_edgenew.out        => sampler.0.pin.1
 net out-invert i_edgenew.out-invert => sampler.0.pin.2
 
 addf streamer.0 fast
-addf i_edgenew.funct     fast
+addf i_edgenew     fast
 addf sampler.0  fast
 
 # look for both falling and rising edges
diff --git a/tests/i_comps/i_edge/both/test.hal b/tests/i_comps/i_edge/both/test.hal
@@ -4,7 +4,6 @@ loadrt sampler cfg=bbb depth=500
 loadusr -Wn halsampler halsampler -N halsampler -n 10
 
 loadrt threads name1=fast period1=100000
-loadrt i_edge
 
 loadrt streamer cfg=b depth=500
 newinst i_edge i_edgenew
@@ -14,7 +13,7 @@ net out        i_edgenew.out        => sampler.0.pin.1
 net out-invert i_edgenew.out-invert => sampler.0.pin.2
 
 addf streamer.0 fast
-addf i_edgenew.funct  fast
+addf i_edgenew  fast
 addf sampler.0  fast
 
 # look for both falling and rising edges
diff --git a/tests/i_comps/i_edge/falling-starting-high/test.hal b/tests/i_comps/i_edge/falling-starting-high/test.hal
@@ -1,7 +1,6 @@
 setexact_for_test_suite_only
 
 loadrt threads name1=fast period1=100000
-loadrt i_edge
 newinst i_edge i_edgenew
 
 loadrt sampler cfg=bbb depth=500
@@ -14,7 +13,7 @@ net out        i_edgenew.out        => sampler.0.pin.1
 net out-invert i_edgenew.out-invert => sampler.0.pin.2
 
 addf streamer.0 fast
-addf i_edgenew.funct     fast
+addf i_edgenew     fast
 addf sampler.0  fast
 
 # look for falling edges
diff --git a/tests/i_comps/i_edge/falling/test.hal b/tests/i_comps/i_edge/falling/test.hal
@@ -4,7 +4,6 @@ loadrt sampler cfg=bbb depth=500
 loadusr -Wn halsampler halsampler -N halsampler -n 10
 
 loadrt threads name1=fast period1=100000
-loadrt i_edge
 newinst i_edge i_edgenew
 
 loadrt streamer cfg=b depth=500
@@ -14,7 +13,7 @@ net out        i_edgenew.out        => sampler.0.pin.1
 net out-invert i_edgenew.out-invert => sampler.0.pin.2
 
 addf streamer.0 fast
-addf i_edgenew.funct     fast
+addf i_edgenew     fast
 addf sampler.0  fast
 
 # look for falling edges
diff --git a/tests/i_comps/i_edge/rising-starting-high/test.hal b/tests/i_comps/i_edge/rising-starting-high/test.hal
@@ -4,7 +4,6 @@ loadrt sampler cfg=bbb depth=500
 loadusr -Wn halsampler halsampler -N halsampler -n 10
 
 loadrt threads name1=fast period1=100000
-loadrt i_edge
 newinst i_edge i_edgenew
 
 loadrt streamer cfg=b depth=500
@@ -14,7 +13,7 @@ net out        i_edgenew.out        => sampler.0.pin.1
 net out-invert i_edgenew.out-invert => sampler.0.pin.2
 
 addf streamer.0 fast
-addf i_edgenew.funct     fast
+addf i_edgenew     fast
 addf sampler.0  fast
 
 # look for rising edges
diff --git a/tests/i_comps/i_edge/rising/test.hal b/tests/i_comps/i_edge/rising/test.hal
@@ -5,7 +5,6 @@ loadrt sampler cfg=bbb depth=500
 loadusr -Wn halsampler halsampler -N halsampler -n 10
 
 loadrt threads name1=fast period1=100000
-loadrt i_edge
 newinst i_edge i_edgenew
 
 loadrt streamer cfg=b depth=500
@@ -15,7 +14,7 @@ net out        i_edgenew.out        => sampler.0.pin.1
 net out-invert i_edgenew.out-invert => sampler.0.pin.2
 
 addf streamer.0 fast
-addf i_edgenew.funct     fast
+addf i_edgenew     fast
 addf sampler.0  fast
 
 # look for rising edges
diff --git a/tests/i_comps/i_limit3.0/test.hal b/tests/i_comps/i_limit3.0/test.hal
@@ -3,15 +3,14 @@ setexact_for_test_suite_only
 loadrt sampler cfg=f depth=4096
 loadusr -Wn halsampler halsampler -N halsampler -t -n 800
 
-loadrt i_limit3
 newinst i_limit3 i_limit3n
 
 loadrt threads name1=t period1=1000000
 setp i_limit3n.maxv 500.000000
 
 net n0 i_limit3n.out sampler.0.pin.0
 
-addf i_limit3n.funct t
+addf i_limit3n t
 addf sampler.0 t
 
 setp i_limit3n.in 500
diff --git a/tests/i_comps/i_limit3.1/test.hal b/tests/i_comps/i_limit3.1/test.hal
@@ -3,15 +3,14 @@ setexact_for_test_suite_only
 loadrt sampler cfg=f depth=4096
 loadusr -Wn halsampler halsampler -N halsampler -t -n 800
 
-loadrt i_limit3
 newinst i_limit3 i_limit3n
 
 loadrt threads name1=t period1=1000000
 setp i_limit3n.maxv 500.000000
 
 net n0 i_limit3n.out sampler.0.pin.0
 
-addf i_limit3n.funct t
+addf i_limit3n t
 addf sampler.0 t
 
 setp i_limit3n.in 500
diff --git a/tests/i_comps/i_limit3.2/test.hal b/tests/i_comps/i_limit3.2/test.hal
@@ -3,7 +3,6 @@ setexact_for_test_suite_only
 loadrt sampler cfg=f depth=4096
 loadusr -Wn halsampler halsampler -N halsampler -t -n 800
 
-loadrt i_limit3
 newinst i_limit3 i_limit3n
 
 loadrt threads name1=t period1=1000000
@@ -13,7 +12,7 @@ setp i_limit3n.max 160
 
 net n0 i_limit3n.out sampler.0.pin.0
 
-addf i_limit3n.funct t
+addf i_limit3n t
 addf sampler.0 t
 
 setp i_limit3n.in 500
diff --git a/tests/i_comps/i_lowpass/test.hal b/tests/i_comps/i_lowpass/test.hal
@@ -1,8 +1,7 @@
 loadrt threads
-loadrt i_ilowpass
 newinst i_ilowpass i_ilowpassn
 
-addf i_ilowpassn.funct thread1
+addf i_ilowpassn thread1
 setp i_ilowpassn.scale 100000
 setp i_ilowpassn.in 21474
 setp i_ilowpassn.gain 1
diff --git a/tests/i_comps/i_multiclick/test.hal b/tests/i_comps/i_multiclick/test.hal
@@ -1,7 +1,6 @@
 
 loadrt threads name1=millisecond period1=1000000
 
-loadrt i_multiclick
 newinst i_multiclick i_mc1
 newinst i_multiclick i_mc2
 
@@ -42,8 +41,8 @@ net state.1 i_mc2.state => sampler.0.pin.19
 
 
 addf streamer.0    millisecond
-addf i_mc1.funct  millisecond
-addf i_mc2.funct  millisecond
+addf i_mc1  millisecond
+addf i_mc2  millisecond
 addf sampler.0     millisecond
 
 
diff --git a/tests/i_comps/i_near/test.hal b/tests/i_comps/i_near/test.hal
@@ -1,5 +1,4 @@
 loadrt threads name1=fast period1=100000
-loadrt near
 newinst i_near i_near0
 newinst i_near i_near1
 
@@ -17,8 +16,8 @@ net outa i_near0.out => sampler.0.pin.2
 net outb i_near1.out => sampler.0.pin.3
 
 addf streamer.0 fast
-addf i_near0.funct fast
-addf i_near1.funct fast
+addf i_near0 fast
+addf i_near1 fast
 addf sampler.0 fast
 
 loadusr -w sh runstreamer
diff --git a/tests/i_comps/i_timedelay/test.hal b/tests/i_comps/i_timedelay/test.hal

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-i_and2.funct.time i_and2new.funct.time i_and2new.in1 i_and2new.out something`
	`1`	`+i_and2.funct.time i_and2new.in1 i_and2new.out i_and2new.time something`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-loadrt i_and2`
`2`	`1`	`newinst i_and2 i_and2new`
`3`	`2`	`alias pin i_and2new.in0 something`
`4`	`3`	`alias pin i_and2new.in1 somethingelse`