Mirrors_Framework/OpenPLC_v3
1
0
Fork 0
mirror of https://github.com/thiagoralves/OpenPLC_v3.git synced 2026-09-24 07:23:59 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #316 from Autonomy-Logic/master

Browse Source 
Fix Simulink driver bug
This commit is contained in:
Thiago Alves
2025-12-23 11:12:35 -07:00
committed by GitHub
parent 650e3da20a 8ad31a9553
commit f0d627a7f8
1 changed files with 4 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
webserver/core/hardware_layers/simulink.cpp
+4 -14
View File
@@ -38,10 +38,6 @@
#include "ladder.h"
#if !defined(ARRAY_SIZE)
#define ARRAY_SIZE(x) (sizeof((x)) / sizeof((x)[0]))
#endif
#define PORT 6668
#define ANALOG_BUF_SIZE 8
@@ -131,19 +127,13 @@ void *exchangeData(void *arg)
pthread_mutex_lock(&bufferLock); //lock mutex
for (int i = 0; i < ANALOG_BUF_SIZE; i++)
{
if (pinNotPresent(ignored_int_inputs, ARRAY_SIZE(ignored_int_inputs), i))
if (int_input[i] != NULL) *int_input[i] = plc_data->analogIn[i];
if (pinNotPresent(ignored_int_outputs, ARRAY_SIZE(ignored_int_outputs), i))
if (int_output[i] != NULL) plc_data->analogOut[i] = *int_output[i];
if (int_input[i] != NULL) *int_input[i] = plc_data->analogIn[i];
if (int_output[i] != NULL) plc_data->analogOut[i] = *int_output[i];
}
for (int i = 0; i < DIGITAL_BUF_SIZE; i++)
{
if (pinNotPresent(ignored_bool_inputs, ARRAY_SIZE(ignored_bool_inputs), i))
if (bool_input[i/8][i%8] != NULL) *bool_input[i/8][i%8] = plc_data->digitalIn[i];
if (pinNotPresent(ignored_bool_outputs, ARRAY_SIZE(ignored_bool_outputs), i))
if (bool_output[i/8][i%8] != NULL) plc_data->digitalOut[i] = *bool_output[i/8][i%8];
if (bool_input[i/8][i%8] != NULL) *bool_input[i/8][i%8] = plc_data->digitalIn[i];
if (bool_output[i/8][i%8] != NULL) plc_data->digitalOut[i] = *bool_output[i/8][i%8];
}
pthread_mutex_unlock(&bufferLock); //unlock mutex