Adaptation of the CAN demos to the latest fmi-ls-bus header version

modelica · Feb 21, 2024 · db4ae08 · db4ae08
1 parent 6573bc8
commit db4ae08
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/ls-bus-guide/demos/can-bus-simulation/PackFmu.py b/ls-bus-guide/demos/can-bus-simulation/PackFmu.py
@@ -9,7 +9,7 @@
 
 # Repository to fetch the LS-BUS headers from
 LS_BUS_REPO = 'modelica/fmi-ls-bus'
-LS_BUS_REV = '7d277c5d55b294f69d61627b1968f39d7ff9fc4d'
+LS_BUS_REV = '6c4b6b27e17046e439a653adafd7e9019925d4bf'
 LS_BUS_HEADERS = [ 'fmi3LsBus.h', 'fmi3LsBusCan.h', 'fmi3LsBusUtil.h', 'fmi3LsBusUtilCan.h' ]
 
 

diff --git a/ls-bus-guide/demos/can-bus-simulation/src/App.c b/ls-bus-guide/demos/can-bus-simulation/src/App.c
@@ -241,14 +241,14 @@ void App_EvaluateDiscreteStates(FmuInstance* instance)
             fmi3LsBusOperationHeader* operation = NULL;
             while (FMI3_LS_BUS_READ_NEXT_OPERATION(&instance->App->Nodes[i].RxBufferInfo, operation))
             {
-                if (operation->type == FMI3_LS_BUS_CAN_OP_CAN_TRANSMIT)
+                if (operation->opCode == FMI3_LS_BUS_CAN_OP_CAN_TRANSMIT)
                 {
                     const fmi3LsBusCanOperationCanTransmit* transmitOp = (fmi3LsBusCanOperationCanTransmit*)operation;
                     LogFmuMessage(instance, fmi3OK, "Info", "Received CAN frame with ID %u and length %u from node %u",
                                   transmitOp->id, transmitOp->dataLength, i + 1);
                     FrameQueue_Enqueue(&instance->App->Nodes[i].FrameQueue, transmitOp);
                 }
-                else if (operation->type == FMI3_LS_BUS_CAN_OP_CONFIGURATION)
+                else if (operation->opCode == FMI3_LS_BUS_CAN_OP_CONFIGURATION)
                 {
                     const fmi3LsBusCanOperationConfiguration* configOp = (fmi3LsBusCanOperationConfiguration*)operation;
                     if (configOp->parameterType == FMI3_LS_BUS_CAN_CONFIG_PARAM_TYPE_CAN_BAUDRATE)

diff --git a/ls-bus-guide/demos/can-node-triggered-output/PackFmu.py b/ls-bus-guide/demos/can-node-triggered-output/PackFmu.py
@@ -9,7 +9,7 @@
 
 # Repository to fetch the LS-BUS headers from
 LS_BUS_REPO = 'modelica/fmi-ls-bus'
-LS_BUS_REV = '7d277c5d55b294f69d61627b1968f39d7ff9fc4d'
+LS_BUS_REV = '6c4b6b27e17046e439a653adafd7e9019925d4bf'
 LS_BUS_HEADERS = [ 'fmi3LsBus.h', 'fmi3LsBusCan.h', 'fmi3LsBusUtil.h', 'fmi3LsBusUtilCan.h' ]
 
 

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
@@ -125,17 +125,17 @@ void App_UpdateDiscreteStates(FmuInstance* instance)
         fmi3LsBusOperationHeader* operation = NULL;
         while (FMI3_LS_BUS_READ_NEXT_OPERATION(&instance->App->RxBufferInfo, operation))
         {
-            if (operation->type == FMI3_LS_BUS_CAN_OP_CAN_TRANSMIT)
+            if (operation->opCode == FMI3_LS_BUS_CAN_OP_CAN_TRANSMIT)
             {
                 const fmi3LsBusCanOperationCanTransmit* transmitOp = (fmi3LsBusCanOperationCanTransmit*)operation;
                 LogFmuMessage(instance, fmi3OK, "Info", "Received CAN frame with ID %u and length %u", transmitOp->id,
                               transmitOp->dataLength);
             }
-            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_BUS_ERROR ||
-                     operation->type == FMI3_LS_BUS_CAN_OP_ARBITRATION_LOST)
+            else if (operation->opCode == FMI3_LS_BUS_CAN_OP_CONFIGURATION ||
+                     operation->opCode == FMI3_LS_BUS_CAN_OP_STATUS ||
+                     operation->opCode == FMI3_LS_BUS_CAN_OP_CONFIRM ||
+                     operation->opCode == FMI3_LS_BUS_CAN_OP_BUS_ERROR ||
+                     operation->opCode == FMI3_LS_BUS_CAN_OP_ARBITRATION_LOST)
             {
                 // Ignore
             }