From ee0a8a8b90491ce91fd6276269c8dee50811cf53 Mon Sep 17 00:00:00 2001 From: Hans Unzner Date: Wed, 21 Jun 2023 21:41:02 +0200 Subject: [PATCH] adapt tests to new halcmd output format (u64/s64 support) Because of the recently added support for 64 bit data types, the column width for 'Value' was increased --- tests/hal-backslash/expected | 4 +- tests/mb2hal/mb2hal.1b/expected | 58 ++++++++--------- tests/mb2hal/mb2hal.2b/expected | 110 ++++++++++++++++---------------- tests/save.0/expected | 24 +++---- 4 files changed, 98 insertions(+), 98 deletions(-) diff --git a/tests/hal-backslash/expected b/tests/hal-backslash/expected index 034f784d6fb..9f41ddd057f 100644 --- a/tests/hal-backslash/expected +++ b/tests/hal-backslash/expected @@ -1,4 +1,4 @@ Signals: -Type Value Name (linked to) -bit TRUE hello +Type Value Name (linked to) +bit TRUE hello diff --git a/tests/mb2hal/mb2hal.1b/expected b/tests/mb2hal/mb2hal.1b/expected index fd48d38f658..61a45c4a4c0 100644 --- a/tests/mb2hal/mb2hal.1b/expected +++ b/tests/mb2hal/mb2hal.1b/expected @@ -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 diff --git a/tests/mb2hal/mb2hal.2b/expected b/tests/mb2hal/mb2hal.2b/expected index 0504a55ccf2..abbcbcb63f8 100644 --- a/tests/mb2hal/mb2hal.2b/expected +++ b/tests/mb2hal/mb2hal.2b/expected @@ -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 diff --git a/tests/save.0/expected b/tests/save.0/expected index 25258a4b914..1ad2895953a 100644 --- a/tests/save.0/expected +++ b/tests/save.0/expected @@ -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