Skip to content

Commit 394cad2

Browse files
hiperiondevhiperiondev
committed
Rename TOF opcode and function
1 parent 159e7ae commit 394cad2

7 files changed

Lines changed: 45 additions & 45 deletions

File tree

‎ladder.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ typedef enum LADDER_INSTRUCTIONS {
147147
LADDER_INS_COILL, /**< Instruction COILL */
148148
LADDER_INS_COILU, /**< Instruction COILU */
149149
LADDER_INS_TON, /**< Instruction TON */
150-
LADDER_INS_TOFF, /**< Instruction TOFF */
150+
LADDER_INS_TOF, /**< Instruction TOFF */
151151
LADDER_INS_TP, /**< Instruction TP */
152152
LADDER_INS_CTU, /**< Instruction CTU */
153153
LADDER_INS_CTD, /**< Instruction CTD */

‎source/include/ladder_instructions.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -281,7 +281,7 @@ ladder_ins_err_t fn_TON(ladder_ctx_t *ladder_ctx, uint32_t column, uint32_t row)
281281
* @param row Row
282282
* @return Status
283283
*/
284-
ladder_ins_err_t fn_TOFF(ladder_ctx_t *ladder_ctx, uint32_t column, uint32_t row);
284+
ladder_ins_err_t fn_TOF(ladder_ctx_t *ladder_ctx, uint32_t column, uint32_t row);
285285

286286
/**
287287
* @fn ladder_ins_err_t fn_TP(ladder_ctx_t *ladder_ctx, uint32_t column, uint32_t row)

‎source/ladder_instructions.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ const ladder_instructions_iocd_t ladder_fn_iocd[] = {
5252
{ 1, 1, 1, 1 }, // COILL
5353
{ 1, 1, 1, 1 }, // COILU
5454
{ 1, 2, 2, 2 }, // TON
55-
{ 1, 2, 2, 2 }, // TOFF
55+
{ 1, 2, 2, 2 }, // TOF
5656
{ 1, 2, 2, 2 }, // TP
5757
{ 2, 2, 2, 2 }, // CTU
5858
{ 2, 2, 2, 2 }, // CTD
@@ -206,7 +206,7 @@ ladder_ins_err_t fn_TON(ladder_ctx_t *ladder_ctx, uint32_t column, uint32_t row)
206206
return LADDER_INS_ERR_OK;
207207
}
208208

209-
ladder_ins_err_t fn_TOFF(ladder_ctx_t *ladder_ctx, uint32_t column, uint32_t row) {
209+
ladder_ins_err_t fn_TOF(ladder_ctx_t *ladder_ctx, uint32_t column, uint32_t row) {
210210
// timer is activated
211211
if (CELL_STATE_LEFT(ladder_ctx, column, row)) {
212212
(*ladder_ctx).memory.Td[ladder_cell_data_exec(ladder_ctx, row, column, 0).value.i32] = true;

‎source/ladder_scan.c‎

Lines changed: 37 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -38,43 +38,43 @@
3838
#include "ladder_internals.h"
3939

4040
static ladder_fn_t const ladder_function[] = { //
41-
fn_NOP, // 00
42-
fn_CONN, // 01
43-
fn_NEG, // 02
44-
fn_NO, // 03
45-
fn_NC, // 04
46-
fn_RE, // 05
47-
fn_FE, // 06
48-
fn_COIL, // 07
49-
fn_COILL, // 08
50-
fn_COILU, // 09
51-
fn_TON, // 10
52-
fn_TOFF, // 11
53-
fn_TP, // 12
54-
fn_CTU, // 13
55-
fn_CTD, // 14
56-
fn_MOVE, // 15
57-
fn_SUB, // 16
58-
fn_ADD, // 17
59-
fn_MUL, // 18
60-
fn_DIV, // 19
61-
fn_MOD, // 20
62-
fn_SHL, // 21
63-
fn_SHR, // 22
64-
fn_ROL, // 23
65-
fn_ROR, // 24
66-
fn_AND, // 25
67-
fn_OR, // 26
68-
fn_XOR, // 27
69-
fn_NOT, // 28
70-
fn_EQ, // 29
71-
fn_GT, // 30
72-
fn_GE, // 31
73-
fn_LT, // 32
74-
fn_LE, // 33
75-
fn_NE, // 34
76-
fn_FOREIGN, // 35
77-
fn_TMOVE, // 36
41+
fn_NOP, // 00
42+
fn_CONN, // 01
43+
fn_NEG, // 02
44+
fn_NO, // 03
45+
fn_NC, // 04
46+
fn_RE, // 05
47+
fn_FE, // 06
48+
fn_COIL, // 07
49+
fn_COILL, // 08
50+
fn_COILU, // 09
51+
fn_TON, // 10
52+
fn_TOF, // 11
53+
fn_TP, // 12
54+
fn_CTU, // 13
55+
fn_CTD, // 14
56+
fn_MOVE, // 15
57+
fn_SUB, // 16
58+
fn_ADD, // 17
59+
fn_MUL, // 18
60+
fn_DIV, // 19
61+
fn_MOD, // 20
62+
fn_SHL, // 21
63+
fn_SHR, // 22
64+
fn_ROL, // 23
65+
fn_ROR, // 24
66+
fn_AND, // 25
67+
fn_OR, // 26
68+
fn_XOR, // 27
69+
fn_NOT, // 28
70+
fn_EQ, // 29
71+
fn_GT, // 30
72+
fn_GE, // 31
73+
fn_LT, // 32
74+
fn_LE, // 33
75+
fn_NE, // 34
76+
fn_FOREIGN, // 35
77+
fn_TMOVE, // 36
7878
};
7979

8080
ladder_ins_err_t ins_err;

‎utils/ladder_print.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ static void fn_to_str(ladder_ctx_t ladder_ctx, uint32_t net, char (*cells)[6][32
244244
}
245245

246246
memset(strtmp, 0, 9 * sizeof(char));
247-
if (ladder_ctx.network[net].cells[row][column].code == LADDER_INS_TON || ladder_ctx.network[net].cells[row][column].code == LADDER_INS_TOFF
247+
if (ladder_ctx.network[net].cells[row][column].code == LADDER_INS_TON || ladder_ctx.network[net].cells[row][column].code == LADDER_INS_TOF
248248
|| ladder_ctx.network[net].cells[row][column].code == LADDER_INS_TP) {
249249
sprintf((*cells)[2], "%s| %04d %s |%s", actual_ioc.inputs == 1 ? " " : "---",
250250
(int) ladder_ctx.network[net].cells[row][column].data[1].value.i32,

‎utils/ladder_program_check.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ ladder_prg_check_t ladder_program_check(ladder_ctx_t ladder_ctx) {
4747
status.error = LADDER_ERR_PRG_CHECK_OK;
4848
status.code = ladder_ctx.network[nt].cells[row][column].code;
4949

50-
if (ladder_ctx.network[nt].cells[row][column].code == LADDER_INS_TON || ladder_ctx.network[nt].cells[row][column].code == LADDER_INS_TOFF
50+
if (ladder_ctx.network[nt].cells[row][column].code == LADDER_INS_TON || ladder_ctx.network[nt].cells[row][column].code == LADDER_INS_TOF
5151
|| ladder_ctx.network[nt].cells[row][column].code == LADDER_INS_TP)
5252
continue;
5353

‎utils/ladder_program_json.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,7 @@ ladder_json_error_t ladder_json_to_program(const char *prg, ladder_ctx_t *ladder
260260
cJSON *value_json = cJSON_GetObjectItem(data_item, "value");
261261
char *value_str = cJSON_GetStringValue(value_json);
262262

263-
if (cell->code == LADDER_INS_TON || cell->code == LADDER_INS_TOFF || cell->code == LADDER_INS_TP) {
263+
if (cell->code == LADDER_INS_TON || cell->code == LADDER_INS_TOF || cell->code == LADDER_INS_TP) {
264264
cell->data[d].value.u32 = strtoul(value_str, NULL, 10);
265265
} else {
266266
switch (cell->data[d].type) {
@@ -377,7 +377,7 @@ ladder_json_error_t ladder_program_to_json(const char *prg, ladder_ctx_t *ladder
377377
}
378378

379379
const char *type_str =
380-
((cell->code == LADDER_INS_TON || cell->code == LADDER_INS_TOFF || cell->code == LADDER_INS_TP) && d == 1) ?
380+
((cell->code == LADDER_INS_TON || cell->code == LADDER_INS_TOF || cell->code == LADDER_INS_TP) && d == 1) ?
381381
((val->type < sizeof(str_basetime) / sizeof(str_basetime[0])) ? str_basetime[val->type] : "INV") :
382382
((val->type < sizeof(str_types) / sizeof(str_types[0])) ? str_types[val->type] : "INV");
383383
char val_str[16];

0 commit comments

Comments
 (0)