Skip to content

Draft - HAL types update - Remove 32-bit and move to 64-bit #4247

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
BsAtHome wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Draft - HAL types update - Remove 32-bit and move to 64-bit #4247

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion VERSION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
2.10.0~pre1
2.10.0~pre2

2 changes: 1 addition & 1 deletion configs/apps/gladevcp/complex/complex.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ def _hal_setup(self,halcomp, builder):

# standard hal pins not associated with any widget
self.halcomp.newpin("example-out", hal.Type.BOOL, hal.Dir.OUT)
self.halcomp.newpin("example-in", hal.HAL_S32, hal.Dir.IN)
self.halcomp.newpin("example-in", hal.Type.SINT, hal.Dir.IN)

# hal pins with change callback. Also unrelated to any HAL widget.
# When the pin's value changes the callback is executed.
Expand Down
8 changes: 4 additions & 4 deletions configs/attic/unclaimed/plasma-thc/mp1000A.hal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ loadrt or2 count=9
loadrt scale
loadrt sum2 count=5
loadrt xor2 count=4
loadrt conv_s32_float
loadrt conv_sint_real
loadrt edge count=2

# Attach realtime hal components to a realtime thread
Expand All @@ -32,7 +32,7 @@ addf and2.8 servo-thread
addf comp.0 servo-thread
addf comp.1 servo-thread
addf comp.2 servo-thread
addf conv-s32-float.0 servo-thread
addf conv-sint-real.0 servo-thread
addf edge.0 servo-thread
addf edge.1 servo-thread
addf flipflop.0 servo-thread
Expand Down Expand Up @@ -178,8 +178,8 @@ net FeedHold xor2.0.out => motion.feed-hold
net CHLSwitched xor2.2.out => and2.1.in1
net ArcOKTimer oneshot.2.out => xor2.1.in0
net PierceLatch flipflop.1.out => mux2.0.sel oneshot.0.in
net IgnitionCounterS32 updown.0.count => conv-s32-float.0.in
net IgnitionCounterFloat conv-s32-float.0.out => comp.2.in1
net IgnitionCounterS32 updown.0.count => conv-sint-real.0.in
net IgnitionCounterFloat conv-sint-real.0.out => comp.2.in1
net IgnitionTimerOff oneshot.1.out-not => updown.0.countup
net TorchOff not.2.out => flipflop.1.reset
net TorchTurnedOffOrTimeout or2.7.out => or2.6.in1
Expand Down
8 changes: 4 additions & 4 deletions configs/attic/unclaimed/plasma-thc/mp1000B.hal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ loadrt or2 count=9
loadrt scale
loadrt sum2 count=5
loadrt xor2 count=4
loadrt conv_s32_float
loadrt conv_sint_real
loadrt edge count=2

# Attach realtime hal components to a realtime thread
Expand All @@ -32,7 +32,7 @@ addf and2.8 servo-thread
addf comp.0 servo-thread
addf comp.1 servo-thread
addf comp.2 servo-thread
addf conv-s32-float.0 servo-thread
addf conv-sint-real.0 servo-thread
addf edge.0 servo-thread
addf edge.1 servo-thread
addf flipflop.0 servo-thread
Expand Down Expand Up @@ -178,8 +178,8 @@ net FeedHold xor2.0.out => motion.feed-hold
net CHLSwitched xor2.2.out => and2.1.in1
net ArcOKTimer oneshot.2.out => xor2.1.in0
net PierceLatch flipflop.1.out => mux2.0.sel oneshot.0.in
net IgnitionCounterS32 updown.0.count => conv-s32-float.0.in
net IgnitionCounterFloat conv-s32-float.0.out => comp.2.in1
net IgnitionCounterS32 updown.0.count => conv-sint-real.0.in
net IgnitionCounterFloat conv-sint-real.0.out => comp.2.in1
net IgnitionTimerOff oneshot.1.out-not => updown.0.countup
net TorchOff not.2.out => flipflop.1.reset
net TorchTurnedOffOrTimeout or2.7.out => or2.6.in1
Expand Down
8 changes: 4 additions & 4 deletions configs/attic/unclaimed/plasma-thc/thc300.hal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ loadrt or2 count=9
loadrt scale
loadrt sum2 count=5
loadrt xor2 count=4
loadrt conv_s32_float
loadrt conv_sint_real
loadrt edge count=2

# Attach realtime hal components to a realtime thread
Expand All @@ -32,7 +32,7 @@ addf and2.8 servo-thread
addf comp.0 servo-thread
addf comp.1 servo-thread
addf comp.2 servo-thread
addf conv-s32-float.0 servo-thread
addf conv-sint-real.0 servo-thread
addf edge.0 servo-thread
addf edge.1 servo-thread
addf flipflop.0 servo-thread
Expand Down Expand Up @@ -178,8 +178,8 @@ net FeedHold xor2.0.out => motion.feed-hold
net CHLSwitched xor2.2.out => and2.1.in1
net ArcOKTimer oneshot.2.out => xor2.1.in0
net PierceLatch flipflop.1.out => mux2.0.sel oneshot.0.in
net IgnitionCounterS32 updown.0.count => conv-s32-float.0.in
net IgnitionCounterFloat conv-s32-float.0.out => comp.2.in1
net IgnitionCounterS32 updown.0.count => conv-sint-real.0.in
net IgnitionCounterFloat conv-sint-real.0.out => comp.2.in1
net IgnitionTimerOff oneshot.1.out-not => updown.0.countup
net TorchOff not.2.out => flipflop.1.reset
net TorchTurnedOffOrTimeout or2.7.out => or2.6.in1
Expand Down
36 changes: 18 additions & 18 deletions configs/by_interface/mesa/hm2-modbus/bldc_and_wavebox.mbccs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,27 +28,27 @@
<command device="dummy" function="W_COIL" address="0x0000" noanswer="1"><data value="0xff00" /></command>
</initlist>
<commands> <!-- Command function sequences and HAL pin assignments -->
<command device="bldc" function="R_REGISTERS" address="0x0020" modbustype="U_AB" haltype="S32" scale="1">
<command device="bldc" function="R_REGISTERS" address="0x0020" modbustype="U_AB" haltype="SINT" scale="1">
<pin name="rtpwm"/>
<pin name="rtcurrent"/>
<pin name="comfreq" modbustype="S_AB"/>
<pin skip="1" />
<pin name="rtpos" modbustype="S_ABCD" scale="0"/>
</command>
<!-- Gives us the following pins:
- hm2_modbus.0.bldc.rtpwm (out, s32) (range [0..65535])
- hm2_modbus.0.bldc.rtpwm.offset (in, u64)
- hm2_modbus.0.bldc.rtpwm.scale (in, float) (must be set to 0.1)
- hm2_modbus.0.bldc.rtpwm.scaled (out, float)
- hm2_modbus.0.bldc.rtcurrent (out, s32) (range [0..65535])
- hm2_modbus.0.bldc.rtcurrent.offset (in, u64)
- hm2_modbus.0.bldc.rtcurrent.scale (in, float) (must be set to 0.01)
- hm2_modbus.0.bldc.rtcurrent.scaled (out, float)
- hm2_modbus.0.bldc.comfreq (out, s32) (range [-32768..+32767])
- hm2_modbus.0.bldc.comfreq.offset (in, s64)
- hm2_modbus.0.bldc.comfreq.scale (in, float) (must be set to 0.1)
- hm2_modbus.0.bldc.comfreq.scaled (out, float)
- hm2_modbus.0.bldc.rtpos (out, s32) (range [-2147483648..+2147483647])
- hm2_modbus.0.bldc.rtpwm (out, sint) (range [0..65535])
- hm2_modbus.0.bldc.rtpwm.offset (in, uint)
- hm2_modbus.0.bldc.rtpwm.scale (in, real) (must be set to 0.1)
- hm2_modbus.0.bldc.rtpwm.scaled (out, real)
- hm2_modbus.0.bldc.rtcurrent (out, sint) (range [0..65535])
- hm2_modbus.0.bldc.rtcurrent.offset (in, uint)
- hm2_modbus.0.bldc.rtcurrent.scale (in, real) (must be set to 0.01)
- hm2_modbus.0.bldc.rtcurrent.scaled (out, real)
- hm2_modbus.0.bldc.comfreq (out, sint) (range [-32768..+32767])
- hm2_modbus.0.bldc.comfreq.offset (in, sint)
- hm2_modbus.0.bldc.comfreq.scale (in, real) (must be set to 0.1)
- hm2_modbus.0.bldc.comfreq.scaled (out, real)
- hm2_modbus.0.bldc.rtpos (out, sint) (range [-2147483648..+2147483647])

The start will be suspended (see top). The .scale pins will be set in
the hal-file. Offset pins are automatically initialized to zero.
Expand All @@ -58,9 +58,9 @@
<command device="wavebox" function="R_INPUTS" address="0x0000" count="8" name="switch" />
<!-- Gives us the following pins:
- Eight switch inputs on the box are HAL output pins
* hm2_modbus.0.wavebox.switch-00 (out, HAL_BIT)
* hm2_modbus.0.wavebox.switch-00 (out, HAL_BOOL)
* ...
* hm2_modbus.0.wavebox.switch-07 (out, HAL_BIT)
* hm2_modbus.0.wavebox.switch-07 (out, HAL_BOOL)
-->

<!--
Expand All @@ -74,9 +74,9 @@
<command device="wavebox" function="W_COILS" address="0x0000" count="8" name="relay" />
<!-- Gives us the following pins:
- Eight relay outputs on the box are HAL input pins
* hm2_modbus.0.wavebox.relay-00 (in, HAL_BIT)
* hm2_modbus.0.wavebox.relay-00 (in, HAL_BOOL)
* ...
* hm2_modbus.0.wavebox.relay-07 (in, HAL_BIT)
* hm2_modbus.0.wavebox.relay-07 (in, HAL_BOOL)
-->
</commands>
</mesamodbus>
28 changes: 14 additions & 14 deletions configs/by_interface/mesa/hm2-modbus/brushless-dc-motor-driver.mbccs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,27 +36,27 @@
<command device="dummy" function="W_COIL" address="0x0000" noanswer="1"><data value="0xff00" /></command>
</initlist>
<commands> <!-- Command function sequences and HAL pin assignments -->
<command device="bldc" function="R_REGISTERS" address="0x0020" modbustype="U_AB" haltype="S32" scale="1">
<command device="bldc" function="R_REGISTERS" address="0x0020" modbustype="U_AB" haltype="SINT" scale="1">
<pin name="rtpwm"/>
<pin name="rtcurrent"/>
<pin name="comfreq" modbustype="S_AB"/>
<pin skip="1" />
<pin name="rtpos" modbustype="S_ABCD" scale="0"/>
</command>
<!-- Gives us the following pins:
- hm2_modbus.0.bldc.rtpwm (out, s32) (range [0..65535])
- hm2_modbus.0.bldc.rtpwm.offset (in, u64)
- hm2_modbus.0.bldc.rtpwm.scale (in, float) (must be set to 0.1)
- hm2_modbus.0.bldc.rtpwm.scaled (out, float)
- hm2_modbus.0.bldc.rtcurrent (out, s32) (range [0..65535])
- hm2_modbus.0.bldc.rtcurrent.offset (in, u64)
- hm2_modbus.0.bldc.rtcurrent.scale (in, float) (must be set to 0.01)
- hm2_modbus.0.bldc.rtcurrent.scaled (out, float)
- hm2_modbus.0.bldc.comfreq (out, s32) (range [-32768..+32767])
- hm2_modbus.0.bldc.comfreq.offset (in, s64)
- hm2_modbus.0.bldc.comfreq.scale (in, float) (must be set to 0.1)
- hm2_modbus.0.bldc.comfreq.scaled (out, float)
- hm2_modbus.0.bldc.rtpos (out, s32) (range [-2147483648..+2147483647])
- hm2_modbus.0.bldc.rtpwm (out, sint) (range [0..65535])
- hm2_modbus.0.bldc.rtpwm.offset (in, uint)
- hm2_modbus.0.bldc.rtpwm.scale (in, real) (must be set to 0.1)
- hm2_modbus.0.bldc.rtpwm.scaled (out, real)
- hm2_modbus.0.bldc.rtcurrent (out, sint) (range [0..65535])
- hm2_modbus.0.bldc.rtcurrent.offset (in, uint)
- hm2_modbus.0.bldc.rtcurrent.scale (in, real) (must be set to 0.01)
- hm2_modbus.0.bldc.rtcurrent.scaled (out, real)
- hm2_modbus.0.bldc.comfreq (out, sint) (range [-32768..+32767])
- hm2_modbus.0.bldc.comfreq.offset (in, sint)
- hm2_modbus.0.bldc.comfreq.scale (in, real) (must be set to 0.1)
- hm2_modbus.0.bldc.comfreq.scaled (out, real)
- hm2_modbus.0.bldc.rtpos (out, sint) (range [-2147483648..+2147483647])

The start will be suspended (see top). The .scale pins will be set in
the hal-file. Offset pins are automatically initialized to zero.
Expand Down
8 changes: 4 additions & 4 deletions configs/by_interface/mesa/hm2-modbus/rs485io.mbccs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@
<initlist>
</initlist>
<commands>
<command device="rs485io" address="0x1000" function="R_REGISTERS" modbustype="U_ABCD" haltype="HAL_U32" name="potu" count="2" />
<command device="rs485io" address="0x2000" function="R_REGISTERS" modbustype="S_ABCD" haltype="HAL_S32" name="pots" count="2" />
<command device="rs485io" address="0x3000" function="R_REGISTERS" modbustype="F_ABCD" haltype="HAL_FLOAT" name="potf" count="2" />
<command device="rs485io" address="0x4000" function="R_REGISTERS" modbustype="F_HGFEDCBA" haltype="HAL_FLOAT" name="potd" count="1" />
<command device="rs485io" address="0x1000" function="R_REGISTERS" modbustype="U_ABCD" haltype="UINT" name="potu" count="2" />
<command device="rs485io" address="0x2000" function="R_REGISTERS" modbustype="S_ABCD" haltype="SINT" name="pots" count="2" />
<command device="rs485io" address="0x3000" function="R_REGISTERS" modbustype="F_ABCD" haltype="REAL" name="potf" count="2" />
<command device="rs485io" address="0x4000" function="R_REGISTERS" modbustype="F_HGFEDCBA" haltype="REAL" name="potd" count="1" />
<command device="rs485io" address="0x0000" function="R_INPUTS" name="button" count="4" />
<command device="rs485io" address="0x0000" function="W_COILS" name="led" count="6" />
</commands>
Expand Down
8 changes: 4 additions & 4 deletions configs/by_interface/parport/plasma-thc-sim/thc.hal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ loadrt or2 count=10
loadrt scale
loadrt sum2 count=5
loadrt xor2 count=4
loadrt conv_s32_float
loadrt conv_sint_real
loadrt edge count=2

# Attach realtime hal components to a realtime thread
Expand All @@ -35,7 +35,7 @@ addf and2.8 servo-thread
addf comp.0 servo-thread
addf comp.1 servo-thread
addf comp.2 servo-thread
addf conv-s32-float.0 servo-thread
addf conv-sint-real.0 servo-thread
addf edge.0 servo-thread
addf edge.1 servo-thread
addf flipflop.0 servo-thread
Expand Down Expand Up @@ -186,8 +186,8 @@ net FeedHold xor2.0.out => motion.feed-hold
net CHLSwitched xor2.2.out => and2.1.in1
net ArcOKTimer oneshot.2.out => xor2.1.in0
net PierceLatch flipflop.1.out => mux2.0.sel oneshot.0.in
net IgnitionCounterS32 updown.0.count => conv-s32-float.0.in
net IgnitionCounterFloat conv-s32-float.0.out => comp.2.in1
net IgnitionCounterS32 updown.0.count => conv-sint-real.0.in
net IgnitionCounterFloat conv-sint-real.0.out => comp.2.in1
net IgnitionTimerOff oneshot.1.out-not => updown.0.countup
net TorchOff not.2.out => flipflop.1.reset
net TorchTurnedOffOrTimeout or2.7.out => or2.6.in1
Expand Down
4 changes: 2 additions & 2 deletions configs/by_interface/pico/univpwmv/univpwm_load.hal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ loadrt not count=1
loadrt estop_latch count=1
loadrt and2 count=1
loadrt or2 count=1
loadrt conv_s32_float count=1
loadrt conv_sint_real count=1
loadrt mult2 count=2
loadrt lowpass count=1

Expand All @@ -50,7 +50,7 @@ addf pid.2.do-pid-calcs servo-thread
addf pid.3.do-pid-calcs servo-thread
# for spindle
addf or2.0 servo-thread
addf conv-s32-float.0 servo-thread
addf conv-sint-real.0 servo-thread
addf mult2.0 servo-thread
addf mult2.1 servo-thread
addf lowpass.0 servo-thread
Expand Down
4 changes: 2 additions & 2 deletions configs/by_interface/pico/univpwmv/univpwm_motion.hal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,8 +92,8 @@ linksp SpindleRev => or2.0.in1
linkps or2.0.out => spindle-enable
linksp spindle-enable ppmc.0.pwm.03.enable
# spindle speed display
net spinraw ppmc.0.encoder.03.delta conv-s32-float.0.in
net spinfloat conv-s32-float.0.out mult2.0.in0
net spinraw ppmc.0.encoder.03.delta conv-sint-real.0.in
net spinfloat conv-sint-real.0.out mult2.0.in0
setp mult2.0.in1 8.6805555
newsig SpindleRPM real
linkps mult2.0.out => SpindleRPM
24 changes: 12 additions & 12 deletions configs/by_machine/smithy/8i20.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,10 @@
<label>
<text>"Encoder Count:"</text>
</label>
<s32>
<sint>
<halpin>"count"</halpin>
<format>"6d"</format>
</s32>
</sint>
</hbox>
<hbox>
<label>
Expand Down Expand Up @@ -108,28 +108,28 @@
<label>
<text>"8i20 Comms:"</text>
</label>
<u32>
<uint>
<halpin>"comms"</halpin>
<format>"8x"</format>
</u32>
</uint>
</hbox>
<hbox>
<label>
<text>"8i20 Fault:"</text>
</label>
<u32>
<uint>
<halpin>"fault"</halpin>
<format>"8x"</format>
</u32>
</uint>
</hbox>
<hbox>
<label>
<text>"8i20 Status:"</text>
</label>
<u32>
<uint>
<halpin>"status"</halpin>
<format>"8x"</format>
</u32>
</uint>
</hbox>
<hbox>
<label>
Expand All @@ -153,19 +153,19 @@
<label>
<text>"SS Fault Count:"</text>
</label>
<u32>
<uint>
<halpin>"faults"</halpin>
<format>"6d"</format>
</u32>
</uint>
</hbox>
<hbox>
<label>
<text>"SS Port0 State:"</text>
</label>
<u32>
<uint>
<halpin>"port_state"</halpin>
<format>"8x"</format>
</u32>
</uint>
</hbox>
<hbox>
<label>
Expand Down
Loading
Loading