Skip to content

Commit

Permalink
Fixed accidental use of conn ID instead of config ID.
Browse files Browse the repository at this point in the history
  • Loading branch information
@kyle-github
kyle-github committed Jun 2, 2024
1 parent 562b35d commit 82fbb8c
Show file tree
Hide file tree
Showing 4 changed files with 25 additions and 25 deletions.
28 changes: 14 additions & 14 deletions src/examples/simple_multiple_tag_async.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
*/
int main(void)
{
plc_comm_id_t conn_id = PLC_COMM_CONN_NULL_ID;
plc_comm_id_t conn_id = PLC_COMM_CONFIG_NULL_ID;
plc_comm_id_t request_batch_id = PLC_COMM_REQUEST_BATCH_NULL_ID;
plc_comm_id_t result_batch_id = PLC_COMM_RESULT_BATCH_NULL_ID;
int32_t rc = PLC_COMM_STATUS_OK;
Expand All @@ -69,42 +69,42 @@ int main(void)
if(conn_id < 0) break;

/* build a batch of requests. */
request_batch_id = plc_comm_request_batch_init(conn_id, 10, PLC_COMM_CONN_NULL_ID);
request_batch_id = plc_comm_request_batch_init(conn_id, 10, PLC_COMM_CONFIG_NULL_ID);
if(request_batch_id < 0) break;

/* fill in the requests */
rc = plc_comm_request_init(request_batch_id, 0, "MyDINTTag[0]", 1, PLC_COMM_REQUEST_TYPE_READ, PLC_COMM_CONN_NULL_ID);
rc = plc_comm_request_init(request_batch_id, 0, "MyDINTTag[0]", 1, PLC_COMM_REQUEST_TYPE_READ, PLC_COMM_CONFIG_NULL_ID);
if(rc != PLC_COMM_STATUS_OK) break;

rc = plc_comm_request_init(request_batch_id, 1, "MyDINTTag[1]", 1, PLC_COMM_REQUEST_TYPE_READ, PLC_COMM_CONN_NULL_ID);
rc = plc_comm_request_init(request_batch_id, 1, "MyDINTTag[1]", 1, PLC_COMM_REQUEST_TYPE_READ, PLC_COMM_CONFIG_NULL_ID);
if(rc != PLC_COMM_STATUS_OK) break;

rc = plc_comm_request_init(request_batch_id, 2, "MyDINTTag[2]", 1, PLC_COMM_REQUEST_TYPE_READ, PLC_COMM_CONN_NULL_ID);
rc = plc_comm_request_init(request_batch_id, 2, "MyDINTTag[2]", 1, PLC_COMM_REQUEST_TYPE_READ, PLC_COMM_CONFIG_NULL_ID);
if(rc != PLC_COMM_STATUS_OK) break;

rc = plc_comm_request_init(request_batch_id, 3, "MyDINTTag[3]", 1, PLC_COMM_REQUEST_TYPE_READ, PLC_COMM_CONN_NULL_ID);
rc = plc_comm_request_init(request_batch_id, 3, "MyDINTTag[3]", 1, PLC_COMM_REQUEST_TYPE_READ, PLC_COMM_CONFIG_NULL_ID);
if(rc != PLC_COMM_STATUS_OK) break;

rc = plc_comm_request_init(request_batch_id, 4, "MyDINTTag[4]", 1, PLC_COMM_REQUEST_TYPE_READ, PLC_COMM_CONN_NULL_ID);
rc = plc_comm_request_init(request_batch_id, 4, "MyDINTTag[4]", 1, PLC_COMM_REQUEST_TYPE_READ, PLC_COMM_CONFIG_NULL_ID);
if(rc != PLC_COMM_STATUS_OK) break;

rc = plc_comm_request_init(request_batch_id, 5, "MyDINTTag[5]", 1, PLC_COMM_REQUEST_TYPE_READ, PLC_COMM_CONN_NULL_ID);
rc = plc_comm_request_init(request_batch_id, 5, "MyDINTTag[5]", 1, PLC_COMM_REQUEST_TYPE_READ, PLC_COMM_CONFIG_NULL_ID);
if(rc != PLC_COMM_STATUS_OK) break;

rc = plc_comm_request_init(request_batch_id, 6, "MyDINTTag[6]", 1, PLC_COMM_REQUEST_TYPE_READ, PLC_COMM_CONN_NULL_ID);
rc = plc_comm_request_init(request_batch_id, 6, "MyDINTTag[6]", 1, PLC_COMM_REQUEST_TYPE_READ, PLC_COMM_CONFIG_NULL_ID);
if(rc != PLC_COMM_STATUS_OK) break;

rc = plc_comm_request_init(request_batch_id, 7, "MyDINTTag[7]", 1, PLC_COMM_REQUEST_TYPE_READ, PLC_COMM_CONN_NULL_ID);
rc = plc_comm_request_init(request_batch_id, 7, "MyDINTTag[7]", 1, PLC_COMM_REQUEST_TYPE_READ, PLC_COMM_CONFIG_NULL_ID);
if(rc != PLC_COMM_STATUS_OK) break;

rc = plc_comm_request_init(request_batch_id, 8, "MyDINTTag[8]", 1, PLC_COMM_REQUEST_TYPE_READ, PLC_COMM_CONN_NULL_ID);
rc = plc_comm_request_init(request_batch_id, 8, "MyDINTTag[8]", 1, PLC_COMM_REQUEST_TYPE_READ, PLC_COMM_CONFIG_NULL_ID);
if(rc != PLC_COMM_STATUS_OK) break;

rc = plc_comm_request_init(request_batch_id, 9, "MyDINTTag[9]", 1, PLC_COMM_REQUEST_TYPE_READ, PLC_COMM_CONN_NULL_ID);
rc = plc_comm_request_init(request_batch_id, 9, "MyDINTTag[9]", 1, PLC_COMM_REQUEST_TYPE_READ, PLC_COMM_CONFIG_NULL_ID);
if(rc != PLC_COMM_STATUS_OK) break;

/* a timeout of zero tell the library to queue up the batch of requests and then return. */
result_batch_id = plc_comm_conn_do_request_batch(conn_id, request_batch_id, PLC_COMM_CONN_NULL_ID, 0);
result_batch_id = plc_comm_conn_do_request_batch(conn_id, request_batch_id, PLC_COMM_CONFIG_NULL_ID, 0);
if(result_batch_id < 0) break;

/*
Expand Down Expand Up @@ -147,7 +147,7 @@ int main(void)
printf("Connection opening failed with status %"PRId32"!\n", (int32_t)conn_id);
rc = conn_id;
} else {
if(conn_id != PLC_COMM_CONN_NULL_ID) {
if(conn_id != PLC_COMM_CONFIG_NULL_ID) {
plc_comm_conn_dispose(conn_id, 5000);
}
}
Expand Down
8 changes: 4 additions & 4 deletions src/examples/simple_single_tag_async.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,19 +55,19 @@
*/
int main(void)
{
plc_comm_id_t conn_id = PLC_COMM_CONN_NULL_ID;
plc_comm_id_t conn_id = PLC_COMM_CONFIG_NULL_ID;
plc_comm_id_t result_batch_id = PLC_COMM_RESULT_BATCH_NULL_ID;
int32_t rc = PLC_COMM_STATUS_OK;
int64_t end_time = (int64_t)0;
int32_t *tag_elements = NULL;
int32_t num_elements = 0;

do {
conn_id = plc_comm_conn_open(PLC_COMM_PLC_TYPE_COMPACTLOGIX, "10.1.2.3", PLC_COMM_CONN_NULL_ID, 5000);
conn_id = plc_comm_conn_open(PLC_COMM_PLC_TYPE_COMPACTLOGIX, "10.1.2.3", PLC_COMM_CONFIG_NULL_ID, 5000);
if(conn_id < 0) break;

/* a timeout of zero tell the library to queue up the request and then return. */
result_batch_id = plc_comm_conn_do_request(conn_id, "MyDINTTag", 10, PLC_COMM_REQUEST_TYPE_READ, PLC_COMM_CONN_NULL_ID, 0);
result_batch_id = plc_comm_conn_do_request(conn_id, "MyDINTTag", 10, PLC_COMM_REQUEST_TYPE_READ, PLC_COMM_CONFIG_NULL_ID, 0);
if(result_batch_id < 0) break;

/*
Expand Down Expand Up @@ -105,7 +105,7 @@ int main(void)
printf("Connection opening failed with status %"PRId32"!\n", (int32_t)conn_id);
rc = conn_id;
} else {
if(conn_id != PLC_COMM_CONN_NULL_ID) {
if(conn_id != PLC_COMM_CONFIG_NULL_ID) {
plc_comm_conn_dispose(conn_id, 5000);
}
}
Expand Down
6 changes: 3 additions & 3 deletions src/examples/simple_single_tag_config.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,15 +55,15 @@
*/
int main(void)
{
plc_comm_id_t conn_id = PLC_COMM_CONN_NULL_ID;
plc_comm_id_t conn_id = PLC_COMM_CONFIG_NULL_ID;
plc_comm_id_t config_id = PLC_COMM_CONFIG_NULL_ID;
plc_comm_id_t result_batch_id = PLC_COMM_RESULT_BATCH_NULL_ID;
int32_t rc = PLC_COMM_STATUS_OK;
int32_t tag_elements[NUM_ELEMENTS] = {0};
int32_t num_elements = 0;

do {
conn_id = plc_comm_conn_open(PLC_COMM_PLC_TYPE_COMPACTLOGIX, "10.1.2.3", PLC_COMM_CONN_NULL_ID, 5000);
conn_id = plc_comm_conn_open(PLC_COMM_PLC_TYPE_COMPACTLOGIX, "10.1.2.3", PLC_COMM_CONFIG_NULL_ID, 5000);
if(conn_id < 0) break;

/* get a config object for a request */
Expand Down Expand Up @@ -91,7 +91,7 @@ int main(void)
printf("Connection opening failed with status %"PRId32"!\n", (int32_t)conn_id);
rc = conn_id;
} else {
if(conn_id != PLC_COMM_CONN_NULL_ID) {
if(conn_id != PLC_COMM_CONFIG_NULL_ID) {
plc_comm_conn_dispose(conn_id, 5000);
}
}
Expand Down
8 changes: 4 additions & 4 deletions src/examples/simple_single_tag_sync.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,17 +54,17 @@
*/
int main(void)
{
plc_comm_id_t conn_id = PLC_COMM_CONN_NULL_ID;
plc_comm_id_t conn_id = PLC_COMM_CONFIG_NULL_ID;
plc_comm_id_t result_batch_id = PLC_COMM_RESULT_BATCH_NULL_ID;
int32_t rc = PLC_COMM_STATUS_OK;
int32_t *tag_elements = NULL;
int32_t num_elements = 0;

do {
conn_id = plc_comm_conn_open(PLC_COMM_PLC_TYPE_COMPACTLOGIX, "10.1.2.3", PLC_COMM_CONN_NULL_ID, 5000);
conn_id = plc_comm_conn_open(PLC_COMM_PLC_TYPE_COMPACTLOGIX, "10.1.2.3", PLC_COMM_CONFIG_NULL_ID, 5000);
if(conn_id < 0) break;

result_batch_id = plc_comm_conn_do_request(conn_id, "MyDINTTag", 10, PLC_COMM_REQUEST_TYPE_READ, PLC_COMM_CONN_NULL_ID, 5000);
result_batch_id = plc_comm_conn_do_request(conn_id, "MyDINTTag", 10, PLC_COMM_REQUEST_TYPE_READ, PLC_COMM_CONFIG_NULL_ID, 5000);
if(result_batch_id < 0) break;

rc = plc_comm_result_batch_get_status(result_batch_id);
Expand All @@ -82,7 +82,7 @@ int main(void)
printf("Connection opening failed with status %"PRId32"!\n", (int32_t)conn_id);
rc = conn_id;
} else {
if(conn_id != PLC_COMM_CONN_NULL_ID) {
if(conn_id != PLC_COMM_CONFIG_NULL_ID) {
plc_comm_conn_dispose(conn_id, 5000);
}
}
Expand Down

0 comments on commit 82fbb8c

Please sign in to comment.