Skip to content

mb2hal: fix pin type change for version 1.000#2270

Merged
hansu merged 1 commit intoLinuxCNC:2.9from
sensille:mb2hal_fix_2.9
Jan 15, 2023
Merged

mb2hal: fix pin type change for version 1.000#2270
hansu merged 1 commit intoLinuxCNC:2.9from
sensille:mb2hal_fix_2.9

Conversation

@sensille
Copy link
Copy Markdown
Contributor

followup to #2299 against 2.9, @hansu @petterreinholdtsen

@hansu
Copy link
Copy Markdown
Member

hansu commented Jan 15, 2023

I added a test for that in #2274
It shows really good the failure in current 2.9 without this patch:

Running test: ../tests/mb2hal/mb2hal.2
--- ../tests/mb2hal/mb2hal.2/expected   2023-01-15 14:53:00.838001000 +0100
+++ ../tests/mb2hal/mb2hal.2/result     2023-01-15 14:57:49.774001000 +0100
@@ -18,10 +18,10 @@
 
 Component Pins:
 Owner   Type  Dir         Value  Name
-     4  float IN              0  mb2hal.Modbus_fnct_06.00
-     4  float IN              0  mb2hal.Modbus_fnct_06.01
-     4  float IN              0  mb2hal.Modbus_fnct_06.02
-     4  float IN              0  mb2hal.Modbus_fnct_06.03
+     4  s32   IN              0  mb2hal.Modbus_fnct_06.00
+     4  s32   IN              0  mb2hal.Modbus_fnct_06.01
+     4  s32   IN              0  mb2hal.Modbus_fnct_06.02
+     4  s32   IN              0  mb2hal.Modbus_fnct_06.03
 
 Component Pins:
 Owner   Type  Dir         Value  Name
@@ -32,8 +32,8 @@
 
 Component Pins:
 Owner   Type  Dir         Value  Name
-     4  float IN              0  mb2hal.Modbus_fnct_16.00
-     4  float IN              0  mb2hal.Modbus_fnct_16.01
-     4  float IN              0  mb2hal.Modbus_fnct_16.02
-     4  float IN              0  mb2hal.Modbus_fnct_16.03
+     4  s32   IN              0  mb2hal.Modbus_fnct_16.00
+     4  s32   IN              0  mb2hal.Modbus_fnct_16.01
+     4  s32   IN              0  mb2hal.Modbus_fnct_16.02
+     4  s32   IN              0  mb2hal.Modbus_fnct_16.03
 
*** ../tests/mb2hal/mb2hal.2: XFAIL: result differed from expected

@hansu
Copy link
Copy Markdown
Member

hansu commented Jan 15, 2023

Thank you!

@hansu hansu merged commit 2e394a9 into LinuxCNC:2.9 Jan 15, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants