Skip to content

Commit

Permalink
adapt mb2hal tests to new halcmd output format
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 committed Jun 21, 2023
1 parent f5ef537 commit d8db53b
Show file tree
Hide file tree
Showing 2 changed files with 84 additions and 84 deletions.
58 changes: 29 additions & 29 deletions tests/mb2hal/mb2hal.1b/expected
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
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

0 comments on commit d8db53b

Please sign in to comment.