Skip to content

Commit

Permalink
adapt tests to new halcmd output format (u64/s64 support)
Browse files Browse the repository at this point in the history 
Because of the recently added support for 64 bit data types, the column width for 'Value' was increased
  • Loading branch information
@hansu
hansu committed Jan 11, 2024
1 parent f541206 commit ee0a8a8
Show file tree
Hide file tree
Showing 4 changed files with 98 additions and 98 deletions.
4 changes: 2 additions & 2 deletions tests/hal-backslash/expected
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Signals:
Type Value Name (linked to)
bit TRUE hello
Type Value Name (linked to)
bit TRUE hello

58 changes: 29 additions & 29 deletions tests/mb2hal/mb2hal.1b/expected
View file
Original file line number Diff line number Diff line change
@@ -1,39 +1,39 @@
Component Pins:
Owner Type Dir Value Name
(ignored comp id) bit OUT FALSE mb2hal.Modbus_fnct_02.00
(ignored comp id) bit OUT FALSE mb2hal.Modbus_fnct_02.01
(ignored comp id) bit OUT FALSE mb2hal.Modbus_fnct_02.02
(ignored comp id) bit OUT FALSE mb2hal.Modbus_fnct_02.03
Owner Type Dir Value Name
(ignored comp id) bit OUT FALSE mb2hal.Modbus_fnct_02.00
(ignored comp id) bit OUT FALSE mb2hal.Modbus_fnct_02.01
(ignored comp id) bit OUT FALSE mb2hal.Modbus_fnct_02.02
(ignored comp id) bit OUT FALSE mb2hal.Modbus_fnct_02.03

Component Pins:
Owner Type Dir Value Name
(ignored comp id) float OUT 0 mb2hal.Modbus_fnct_03.00.float
(ignored comp id) s32 OUT 0 mb2hal.Modbus_fnct_03.00.int
(ignored comp id) float OUT 0 mb2hal.Modbus_fnct_03.01.float
(ignored comp id) s32 OUT 0 mb2hal.Modbus_fnct_03.01.int
(ignored comp id) float OUT 0 mb2hal.Modbus_fnct_03.02.float
(ignored comp id) s32 OUT 0 mb2hal.Modbus_fnct_03.02.int
(ignored comp id) float OUT 0 mb2hal.Modbus_fnct_03.03.float
(ignored comp id) s32 OUT 0 mb2hal.Modbus_fnct_03.03.int
Owner Type Dir Value Name
(ignored comp id) float OUT 0 mb2hal.Modbus_fnct_03.00.float
(ignored comp id) s32 OUT 0 mb2hal.Modbus_fnct_03.00.int
(ignored comp id) float OUT 0 mb2hal.Modbus_fnct_03.01.float
(ignored comp id) s32 OUT 0 mb2hal.Modbus_fnct_03.01.int
(ignored comp id) float OUT 0 mb2hal.Modbus_fnct_03.02.float
(ignored comp id) s32 OUT 0 mb2hal.Modbus_fnct_03.02.int
(ignored comp id) float OUT 0 mb2hal.Modbus_fnct_03.03.float
(ignored comp id) s32 OUT 0 mb2hal.Modbus_fnct_03.03.int

Component Pins:
Owner Type Dir Value Name
(ignored comp id) float IN 0 mb2hal.Modbus_fnct_06.00
(ignored comp id) float IN 0 mb2hal.Modbus_fnct_06.01
(ignored comp id) float IN 0 mb2hal.Modbus_fnct_06.02
(ignored comp id) float IN 0 mb2hal.Modbus_fnct_06.03
Owner Type Dir Value Name
(ignored comp id) float IN 0 mb2hal.Modbus_fnct_06.00
(ignored comp id) float IN 0 mb2hal.Modbus_fnct_06.01
(ignored comp id) float IN 0 mb2hal.Modbus_fnct_06.02
(ignored comp id) float IN 0 mb2hal.Modbus_fnct_06.03

Component Pins:
Owner Type Dir Value Name
(ignored comp id) bit IN FALSE mb2hal.Modbus_fnct_15.00
(ignored comp id) bit IN FALSE mb2hal.Modbus_fnct_15.01
(ignored comp id) bit IN FALSE mb2hal.Modbus_fnct_15.02
(ignored comp id) bit IN FALSE mb2hal.Modbus_fnct_15.03
Owner Type Dir Value Name
(ignored comp id) bit IN FALSE mb2hal.Modbus_fnct_15.00
(ignored comp id) bit IN FALSE mb2hal.Modbus_fnct_15.01
(ignored comp id) bit IN FALSE mb2hal.Modbus_fnct_15.02
(ignored comp id) bit IN FALSE mb2hal.Modbus_fnct_15.03

Component Pins:
Owner Type Dir Value Name
(ignored comp id) float IN 0 mb2hal.Modbus_fnct_16.00
(ignored comp id) float IN 0 mb2hal.Modbus_fnct_16.01
(ignored comp id) float IN 0 mb2hal.Modbus_fnct_16.02
(ignored comp id) float IN 0 mb2hal.Modbus_fnct_16.03
Owner Type Dir Value Name
(ignored comp id) float IN 0 mb2hal.Modbus_fnct_16.00
(ignored comp id) float IN 0 mb2hal.Modbus_fnct_16.01
(ignored comp id) float IN 0 mb2hal.Modbus_fnct_16.02
(ignored comp id) float IN 0 mb2hal.Modbus_fnct_16.03

110 changes: 55 additions & 55 deletions tests/mb2hal/mb2hal.2b/expected
View file
Original file line number Diff line number Diff line change
@@ -1,69 +1,69 @@
Component Pins:
Owner Type Dir Value Name
(ignored comp id) bit OUT FALSE mb2hal.Modbus_fnct_02.00.bit
(ignored comp id) bit OUT TRUE mb2hal.Modbus_fnct_02.00.bit-inv
(ignored comp id) bit OUT FALSE mb2hal.Modbus_fnct_02.01.bit
(ignored comp id) bit OUT TRUE mb2hal.Modbus_fnct_02.01.bit-inv
(ignored comp id) bit OUT FALSE mb2hal.Modbus_fnct_02.02.bit
(ignored comp id) bit OUT TRUE mb2hal.Modbus_fnct_02.02.bit-inv
(ignored comp id) bit OUT FALSE mb2hal.Modbus_fnct_02.03.bit
(ignored comp id) bit OUT TRUE mb2hal.Modbus_fnct_02.03.bit-inv
Owner Type Dir Value Name
(ignored comp id) bit OUT FALSE mb2hal.Modbus_fnct_02.00.bit
(ignored comp id) bit OUT TRUE mb2hal.Modbus_fnct_02.00.bit-inv
(ignored comp id) bit OUT FALSE mb2hal.Modbus_fnct_02.01.bit
(ignored comp id) bit OUT TRUE mb2hal.Modbus_fnct_02.01.bit-inv
(ignored comp id) bit OUT FALSE mb2hal.Modbus_fnct_02.02.bit
(ignored comp id) bit OUT TRUE mb2hal.Modbus_fnct_02.02.bit-inv
(ignored comp id) bit OUT FALSE mb2hal.Modbus_fnct_02.03.bit
(ignored comp id) bit OUT TRUE mb2hal.Modbus_fnct_02.03.bit-inv

Component Pins:
Owner Type Dir Value Name
(ignored comp id) float OUT 0 mb2hal.Modbus_fnct_03.00.float
(ignored comp id) s32 OUT 0 mb2hal.Modbus_fnct_03.00.int
(ignored comp id) float OUT 0 mb2hal.Modbus_fnct_03.01.float
(ignored comp id) s32 OUT 0 mb2hal.Modbus_fnct_03.01.int
(ignored comp id) float OUT 0 mb2hal.Modbus_fnct_03.02.float
(ignored comp id) s32 OUT 0 mb2hal.Modbus_fnct_03.02.int
(ignored comp id) float OUT 0 mb2hal.Modbus_fnct_03.03.float
(ignored comp id) s32 OUT 0 mb2hal.Modbus_fnct_03.03.int
Owner Type Dir Value Name
(ignored comp id) float OUT 0 mb2hal.Modbus_fnct_03.00.float
(ignored comp id) s32 OUT 0 mb2hal.Modbus_fnct_03.00.int
(ignored comp id) float OUT 0 mb2hal.Modbus_fnct_03.01.float
(ignored comp id) s32 OUT 0 mb2hal.Modbus_fnct_03.01.int
(ignored comp id) float OUT 0 mb2hal.Modbus_fnct_03.02.float
(ignored comp id) s32 OUT 0 mb2hal.Modbus_fnct_03.02.int
(ignored comp id) float OUT 0 mb2hal.Modbus_fnct_03.03.float
(ignored comp id) s32 OUT 0 mb2hal.Modbus_fnct_03.03.int

Component Pins:
Owner Type Dir Value Name
(ignored comp id) float IN 0 mb2hal.Modbus_fnct_06.00.float
(ignored comp id) s32 IN 0 mb2hal.Modbus_fnct_06.00.int
(ignored comp id) float IN 0 mb2hal.Modbus_fnct_06.01.float
(ignored comp id) s32 IN 0 mb2hal.Modbus_fnct_06.01.int
(ignored comp id) float IN 0 mb2hal.Modbus_fnct_06.02.float
(ignored comp id) s32 IN 0 mb2hal.Modbus_fnct_06.02.int
(ignored comp id) float IN 0 mb2hal.Modbus_fnct_06.03.float
(ignored comp id) s32 IN 0 mb2hal.Modbus_fnct_06.03.int
Owner Type Dir Value Name
(ignored comp id) float IN 0 mb2hal.Modbus_fnct_06.00.float
(ignored comp id) s32 IN 0 mb2hal.Modbus_fnct_06.00.int
(ignored comp id) float IN 0 mb2hal.Modbus_fnct_06.01.float
(ignored comp id) s32 IN 0 mb2hal.Modbus_fnct_06.01.int
(ignored comp id) float IN 0 mb2hal.Modbus_fnct_06.02.float
(ignored comp id) s32 IN 0 mb2hal.Modbus_fnct_06.02.int
(ignored comp id) float IN 0 mb2hal.Modbus_fnct_06.03.float
(ignored comp id) s32 IN 0 mb2hal.Modbus_fnct_06.03.int

Component Pins:
Owner Type Dir Value Name
(ignored comp id) bit IN FALSE mb2hal.Modbus_fnct_15.00.bit
(ignored comp id) bit IN FALSE mb2hal.Modbus_fnct_15.01.bit
(ignored comp id) bit IN FALSE mb2hal.Modbus_fnct_15.02.bit
(ignored comp id) bit IN FALSE mb2hal.Modbus_fnct_15.03.bit
Owner Type Dir Value Name
(ignored comp id) bit IN FALSE mb2hal.Modbus_fnct_15.00.bit
(ignored comp id) bit IN FALSE mb2hal.Modbus_fnct_15.01.bit
(ignored comp id) bit IN FALSE mb2hal.Modbus_fnct_15.02.bit
(ignored comp id) bit IN FALSE mb2hal.Modbus_fnct_15.03.bit

Component Pins:
Owner Type Dir Value Name
(ignored comp id) float IN 0 mb2hal.Modbus_fnct_16.00.float
(ignored comp id) s32 IN 0 mb2hal.Modbus_fnct_16.00.int
(ignored comp id) float IN 0 mb2hal.Modbus_fnct_16.01.float
(ignored comp id) s32 IN 0 mb2hal.Modbus_fnct_16.01.int
(ignored comp id) float IN 0 mb2hal.Modbus_fnct_16.02.float
(ignored comp id) s32 IN 0 mb2hal.Modbus_fnct_16.02.int
(ignored comp id) float IN 0 mb2hal.Modbus_fnct_16.03.float
(ignored comp id) s32 IN 0 mb2hal.Modbus_fnct_16.03.int
Owner Type Dir Value Name
(ignored comp id) float IN 0 mb2hal.Modbus_fnct_16.00.float
(ignored comp id) s32 IN 0 mb2hal.Modbus_fnct_16.00.int
(ignored comp id) float IN 0 mb2hal.Modbus_fnct_16.01.float
(ignored comp id) s32 IN 0 mb2hal.Modbus_fnct_16.01.int
(ignored comp id) float IN 0 mb2hal.Modbus_fnct_16.02.float
(ignored comp id) s32 IN 0 mb2hal.Modbus_fnct_16.02.int
(ignored comp id) float IN 0 mb2hal.Modbus_fnct_16.03.float
(ignored comp id) s32 IN 0 mb2hal.Modbus_fnct_16.03.int

Component Pins:
Owner Type Dir Value Name
(ignored comp id) bit OUT FALSE mb2hal.Modbus_fnct_01.00.bit
(ignored comp id) bit OUT TRUE mb2hal.Modbus_fnct_01.00.bit-inv
(ignored comp id) bit OUT FALSE mb2hal.Modbus_fnct_01.01.bit
(ignored comp id) bit OUT TRUE mb2hal.Modbus_fnct_01.01.bit-inv
(ignored comp id) bit OUT FALSE mb2hal.Modbus_fnct_01.02.bit
(ignored comp id) bit OUT TRUE mb2hal.Modbus_fnct_01.02.bit-inv
(ignored comp id) bit OUT FALSE mb2hal.Modbus_fnct_01.03.bit
(ignored comp id) bit OUT TRUE mb2hal.Modbus_fnct_01.03.bit-inv
Owner Type Dir Value Name
(ignored comp id) bit OUT FALSE mb2hal.Modbus_fnct_01.00.bit
(ignored comp id) bit OUT TRUE mb2hal.Modbus_fnct_01.00.bit-inv
(ignored comp id) bit OUT FALSE mb2hal.Modbus_fnct_01.01.bit
(ignored comp id) bit OUT TRUE mb2hal.Modbus_fnct_01.01.bit-inv
(ignored comp id) bit OUT FALSE mb2hal.Modbus_fnct_01.02.bit
(ignored comp id) bit OUT TRUE mb2hal.Modbus_fnct_01.02.bit-inv
(ignored comp id) bit OUT FALSE mb2hal.Modbus_fnct_01.03.bit
(ignored comp id) bit OUT TRUE mb2hal.Modbus_fnct_01.03.bit-inv

Component Pins:
Owner Type Dir Value Name
(ignored comp id) bit IN FALSE mb2hal.Modbus_fnct_05.00.bit
(ignored comp id) bit IN FALSE mb2hal.Modbus_fnct_05.01.bit
(ignored comp id) bit IN FALSE mb2hal.Modbus_fnct_05.02.bit
(ignored comp id) bit IN FALSE mb2hal.Modbus_fnct_05.03.bit
Owner Type Dir Value Name
(ignored comp id) bit IN FALSE mb2hal.Modbus_fnct_05.00.bit
(ignored comp id) bit IN FALSE mb2hal.Modbus_fnct_05.01.bit
(ignored comp id) bit IN FALSE mb2hal.Modbus_fnct_05.02.bit
(ignored comp id) bit IN FALSE mb2hal.Modbus_fnct_05.03.bit

24 changes: 12 additions & 12 deletions tests/save.0/expected
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,18 +11,18 @@ newsig unlinked bit
net dir stepgen.0.dir => sampler.0.pin.0
net step stepgen.0.step => sampler.0.pin.1
# parameter values
setp fast.tmax 0
setp sampler.0.tmax 0
setp stepgen.0.dirhold 0x00000001
setp stepgen.0.dirsetup 0x00000001
setp stepgen.0.maxaccel 2
setp stepgen.0.maxvel 0.15
setp stepgen.0.position-scale 32000
setp stepgen.0.steplen 0x00000001
setp stepgen.0.stepspace 0x00000001
setp stepgen.capture-position.tmax 0
setp stepgen.make-pulses.tmax 0
setp stepgen.update-freq.tmax 0
setp fast.tmax 0
setp sampler.0.tmax 0
setp stepgen.0.dirhold 0x00000001
setp stepgen.0.dirsetup 0x00000001
setp stepgen.0.maxaccel 2
setp stepgen.0.maxvel 0.15
setp stepgen.0.position-scale 32000
setp stepgen.0.steplen 0x00000001
setp stepgen.0.stepspace 0x00000001
setp stepgen.capture-position.tmax 0
setp stepgen.make-pulses.tmax 0
setp stepgen.update-freq.tmax 0
# realtime thread/function links
addf stepgen.update-freq fast
addf stepgen.make-pulses fast
Expand Down

0 comments on commit ee0a8a8

Please sign in to comment.