From 3dca381aec352c14e5ab03446fa9fe679babf1b8 Mon Sep 17 00:00:00 2001 From: Clemens Boos Date: Mon, 27 Nov 2023 14:06:51 +0100 Subject: [PATCH] Update CAN demo FMUs for updated headers --- ls-bus-guide/demos/can-bus-simulation/src/App.c | 2 +- ls-bus-guide/demos/can-node-triggered-output/src/App.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ls-bus-guide/demos/can-bus-simulation/src/App.c b/ls-bus-guide/demos/can-bus-simulation/src/App.c index cf4c493..edb8978 100644 --- a/ls-bus-guide/demos/can-bus-simulation/src/App.c +++ b/ls-bus-guide/demos/can-bus-simulation/src/App.c @@ -234,7 +234,7 @@ void App_EvaluateDiscreteStates(FmuInstance* instance) } else if (operation->type == FMI3_LS_BUS_CAN_OP_CONFIGURATION) { - const fmi3LsBusOperationCanConfiguration* configOp = (fmi3LsBusOperationCanConfiguration*)operation; + const fmi3LsBusCanOperationConfiguration* configOp = (fmi3LsBusCanOperationConfiguration*)operation; if (configOp->parameterType == FMI3_LS_BUS_CAN_CONFIG_PARAM_TYPE_CAN_BAUDRATE) { LogFmuMessage(instance, fmi3OK, "Info", diff --git a/ls-bus-guide/demos/can-node-triggered-output/src/App.c b/ls-bus-guide/demos/can-node-triggered-output/src/App.c index a36d799..5a328d9 100644 --- a/ls-bus-guide/demos/can-node-triggered-output/src/App.c +++ b/ls-bus-guide/demos/can-node-triggered-output/src/App.c @@ -86,7 +86,7 @@ bool App_DoStep(FmuInstance* instance, fmi3Float64 currentTime, fmi3Float64 targ instance->App->NextTransmitTime); // Create a CAN transmit operation - FMI3_LS_BUS_CAN_CREATE_OP_CAN_TRANSMIT(&instance->App->TxBufferInfo, id, 0, 0, sizeof data, data); + FMI3_LS_BUS_CAN_CREATE_OP_CAN_TRANSMIT(&instance->App->TxBufferInfo, id, FMI3_LS_BUS_FALSE, FMI3_LS_BUS_FALSE, sizeof data, data); // Check that operation was created successfully if (!instance->App->TxBufferInfo.status) @@ -134,7 +134,7 @@ void App_UpdateDiscreteStates(FmuInstance* instance) else if (operation->type == FMI3_LS_BUS_CAN_OP_CONFIGURATION || operation->type == FMI3_LS_BUS_CAN_OP_STATUS || operation->type == FMI3_LS_BUS_CAN_OP_CONFIRM || - operation->type == FMI3_LS_BUS_CAN_OP_CAN_BUS_ERROR || + operation->type == FMI3_LS_BUS_CAN_OP_BUS_ERROR || operation->type == FMI3_LS_BUS_CAN_OP_ARBITRATION_LOST) { // Ignore