Skip to content

osie
osie
Commit 2637e942 authored by Ivan Tyagov's avatar Ivan Tyagov
Browse files
Options

Remove traces from modbus.

parent 8e01fe95
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 32 additions and 2801 deletions
Beremiz/beremiz_tutorial_opc_ua/build/LOCATED_VARIABLES.h
View file @ 2637e942
__LOCATED_VAR(BOOL,__QX0_0_0_0,Q,X,0,0,0,0)
__LOCATED_VAR(BOOL,__QX0_0_1_1,Q,X,0,0,1,1)
__LOCATED_VAR(BOOL,__QX0_0_2_2,Q,X,0,0,2,2)
__LOCATED_VAR(BOOL,__QX0_0_3_3,Q,X,0,0,3,3)
__LOCATED_VAR(DINT,__QD1_0,Q,D,1,0) __LOCATED_VAR(DINT,__QD1_0,Q,D,1,0)
__LOCATED_VAR(DINT,__QD1_1,Q,D,1,1) __LOCATED_VAR(DINT,__QD1_1,Q,D,1,1)
__LOCATED_VAR(DINT,__QD1_2,Q,D,1,2) __LOCATED_VAR(DINT,__QD1_2,Q,D,1,2)
......
Beremiz/beremiz_tutorial_opc_ua/build/MB_0.c deleted 100644 → 0
View file @ 8e01fe95
This diff is collapsed.
Beremiz/beremiz_tutorial_opc_ua/build/MB_0.h deleted 100644 → 0
View file @ 8e01fe95
This diff is collapsed.
Beremiz/beremiz_tutorial_opc_ua/build/POUS.c
View file @ 2637e942
...@@ -209,10 +209,6 @@ void COUNTERST_init__(COUNTERST *data__, BOOL retain) { ...@@ -209,10 +209,6 @@ void COUNTERST_init__(COUNTERST *data__, BOOL retain) {
__INIT_VAR(data__->CNT1,0,retain) __INIT_VAR(data__->CNT1,0,retain)
__INIT_VAR(data__->CNT0,0,retain) __INIT_VAR(data__->CNT0,0,retain)
__INIT_EXTERNAL(INT,RESETCOUNTERVALUE,data__->RESETCOUNTERVALUE,retain) __INIT_EXTERNAL(INT,RESETCOUNTERVALUE,data__->RESETCOUNTERVALUE,retain)
__INIT_EXTERNAL(BOOL,RELAY0VALUE,data__->RELAY0VALUE,retain)
__INIT_EXTERNAL(BOOL,RELAY1VALUE,data__->RELAY1VALUE,retain)
__INIT_EXTERNAL(BOOL,RELAY2VALUE,data__->RELAY2VALUE,retain)
__INIT_EXTERNAL(BOOL,RELAY3VALUE,data__->RELAY3VALUE,retain)
__INIT_EXTERNAL(DINT,RELAY3VALUE0,data__->RELAY3VALUE0,retain) __INIT_EXTERNAL(DINT,RELAY3VALUE0,data__->RELAY3VALUE0,retain)
__INIT_EXTERNAL(DINT,RELAY3VALUE1,data__->RELAY3VALUE1,retain) __INIT_EXTERNAL(DINT,RELAY3VALUE1,data__->RELAY3VALUE1,retain)
__INIT_EXTERNAL(DINT,RELAY3VALUE2,data__->RELAY3VALUE2,retain) __INIT_EXTERNAL(DINT,RELAY3VALUE2,data__->RELAY3VALUE2,retain)
......
Beremiz/beremiz_tutorial_opc_ua/build/POUS.h
View file @ 2637e942
...@@ -114,10 +114,6 @@ typedef struct { ...@@ -114,10 +114,6 @@ typedef struct {
__DECLARE_VAR(INT,CNT1) __DECLARE_VAR(INT,CNT1)
__DECLARE_VAR(INT,CNT0) __DECLARE_VAR(INT,CNT0)
__DECLARE_EXTERNAL(INT,RESETCOUNTERVALUE) __DECLARE_EXTERNAL(INT,RESETCOUNTERVALUE)
__DECLARE_EXTERNAL(BOOL,RELAY0VALUE)
__DECLARE_EXTERNAL(BOOL,RELAY1VALUE)
__DECLARE_EXTERNAL(BOOL,RELAY2VALUE)
__DECLARE_EXTERNAL(BOOL,RELAY3VALUE)
__DECLARE_EXTERNAL(DINT,RELAY3VALUE0) __DECLARE_EXTERNAL(DINT,RELAY3VALUE0)
__DECLARE_EXTERNAL(DINT,RELAY3VALUE1) __DECLARE_EXTERNAL(DINT,RELAY3VALUE1)
__DECLARE_EXTERNAL(DINT,RELAY3VALUE2) __DECLARE_EXTERNAL(DINT,RELAY3VALUE2)
......
Beremiz/beremiz_tutorial_opc_ua/build/VARIABLES.csv
View file @ 2637e942
...@@ -3,36 +3,28 @@ ...@@ -3,36 +3,28 @@
// Variables // Variables
0;VAR;CONFIG.RESETCOUNTERVALUE;CONFIG.RESETCOUNTERVALUE;INT;INT; 0;VAR;CONFIG.RESETCOUNTERVALUE;CONFIG.RESETCOUNTERVALUE;INT;INT;
1;OUT;CONFIG.RELAY0VALUE;CONFIG.RELAY0VALUE;BOOL;BOOL; 1;OUT;CONFIG.RELAY3VALUE0;CONFIG.RELAY3VALUE0;DINT;DINT;
2;OUT;CONFIG.RELAY1VALUE;CONFIG.RELAY1VALUE;BOOL;BOOL; 2;OUT;CONFIG.RELAY3VALUE1;CONFIG.RELAY3VALUE1;DINT;DINT;
3;OUT;CONFIG.RELAY2VALUE;CONFIG.RELAY2VALUE;BOOL;BOOL; 3;OUT;CONFIG.RELAY3VALUE2;CONFIG.RELAY3VALUE2;DINT;DINT;
4;OUT;CONFIG.RELAY3VALUE;CONFIG.RELAY3VALUE;BOOL;BOOL; 4;OUT;CONFIG.RELAY3VALUE3;CONFIG.RELAY3VALUE3;DINT;DINT;
5;OUT;CONFIG.RELAY3VALUE0;CONFIG.RELAY3VALUE0;DINT;DINT; 5;FB;CONFIG.RESOURCE1.INSTANCE0;CONFIG.RESOURCE1.INSTANCE0;PLC_PRG;;
6;OUT;CONFIG.RELAY3VALUE1;CONFIG.RELAY3VALUE1;DINT;DINT; 6;VAR;CONFIG.RESOURCE1.INSTANCE0.RESET;CONFIG.RESOURCE1.INSTANCE0.RESET;BOOL;BOOL;
7;OUT;CONFIG.RELAY3VALUE2;CONFIG.RELAY3VALUE2;DINT;DINT; 7;VAR;CONFIG.RESOURCE1.INSTANCE0.CNT0;CONFIG.RESOURCE1.INSTANCE0.CNT0;INT;INT;
8;OUT;CONFIG.RELAY3VALUE3;CONFIG.RELAY3VALUE3;DINT;DINT; 8;VAR;CONFIG.RESOURCE1.INSTANCE0.CNT1;CONFIG.RESOURCE1.INSTANCE0.CNT1;INT;INT;
9;FB;CONFIG.RESOURCE1.INSTANCE0;CONFIG.RESOURCE1.INSTANCE0;PLC_PRG;; 9;FB;CONFIG.RESOURCE1.INSTANCE0.COUNTERST0;CONFIG.RESOURCE1.INSTANCE0.COUNTERST0;COUNTERST;;
10;VAR;CONFIG.RESOURCE1.INSTANCE0.RESET;CONFIG.RESOURCE1.INSTANCE0.RESET;BOOL;BOOL; 10;VAR;CONFIG.RESOURCE1.INSTANCE0.COUNTERST0.EN;CONFIG.RESOURCE1.INSTANCE0.COUNTERST0.EN;BOOL;BOOL;
11;VAR;CONFIG.RESOURCE1.INSTANCE0.CNT0;CONFIG.RESOURCE1.INSTANCE0.CNT0;INT;INT; 11;VAR;CONFIG.RESOURCE1.INSTANCE0.COUNTERST0.ENO;CONFIG.RESOURCE1.INSTANCE0.COUNTERST0.ENO;BOOL;BOOL;
12;VAR;CONFIG.RESOURCE1.INSTANCE0.CNT1;CONFIG.RESOURCE1.INSTANCE0.CNT1;INT;INT; 12;VAR;CONFIG.RESOURCE1.INSTANCE0.COUNTERST0.RESET;CONFIG.RESOURCE1.INSTANCE0.COUNTERST0.RESET;BOOL;BOOL;
13;FB;CONFIG.RESOURCE1.INSTANCE0.COUNTERST0;CONFIG.RESOURCE1.INSTANCE0.COUNTERST0;COUNTERST;; 13;VAR;CONFIG.RESOURCE1.INSTANCE0.COUNTERST0.OUT1;CONFIG.RESOURCE1.INSTANCE0.COUNTERST0.OUT1;INT;INT;
14;VAR;CONFIG.RESOURCE1.INSTANCE0.COUNTERST0.EN;CONFIG.RESOURCE1.INSTANCE0.COUNTERST0.EN;BOOL;BOOL; 14;VAR;CONFIG.RESOURCE1.INSTANCE0.COUNTERST0.OUT0;CONFIG.RESOURCE1.INSTANCE0.COUNTERST0.OUT0;INT;INT;
15;VAR;CONFIG.RESOURCE1.INSTANCE0.COUNTERST0.ENO;CONFIG.RESOURCE1.INSTANCE0.COUNTERST0.ENO;BOOL;BOOL; 15;VAR;CONFIG.RESOURCE1.INSTANCE0.COUNTERST0.CNT1;CONFIG.RESOURCE1.INSTANCE0.COUNTERST0.CNT1;INT;INT;
16;VAR;CONFIG.RESOURCE1.INSTANCE0.COUNTERST0.RESET;CONFIG.RESOURCE1.INSTANCE0.COUNTERST0.RESET;BOOL;BOOL; 16;VAR;CONFIG.RESOURCE1.INSTANCE0.COUNTERST0.CNT0;CONFIG.RESOURCE1.INSTANCE0.COUNTERST0.CNT0;INT;INT;
17;VAR;CONFIG.RESOURCE1.INSTANCE0.COUNTERST0.OUT1;CONFIG.RESOURCE1.INSTANCE0.COUNTERST0.OUT1;INT;INT; 17;EXT;CONFIG.RESOURCE1.INSTANCE0.COUNTERST0.RESETCOUNTERVALUE;CONFIG.RESOURCE1.INSTANCE0.COUNTERST0.RESETCOUNTERVALUE;INT;INT;
18;VAR;CONFIG.RESOURCE1.INSTANCE0.COUNTERST0.OUT0;CONFIG.RESOURCE1.INSTANCE0.COUNTERST0.OUT0;INT;INT; 18;EXT;CONFIG.RESOURCE1.INSTANCE0.COUNTERST0.RELAY3VALUE0;CONFIG.RESOURCE1.INSTANCE0.COUNTERST0.RELAY3VALUE0;DINT;DINT;
19;VAR;CONFIG.RESOURCE1.INSTANCE0.COUNTERST0.CNT1;CONFIG.RESOURCE1.INSTANCE0.COUNTERST0.CNT1;INT;INT; 19;EXT;CONFIG.RESOURCE1.INSTANCE0.COUNTERST0.RELAY3VALUE1;CONFIG.RESOURCE1.INSTANCE0.COUNTERST0.RELAY3VALUE1;DINT;DINT;
20;VAR;CONFIG.RESOURCE1.INSTANCE0.COUNTERST0.CNT0;CONFIG.RESOURCE1.INSTANCE0.COUNTERST0.CNT0;INT;INT; 20;EXT;CONFIG.RESOURCE1.INSTANCE0.COUNTERST0.RELAY3VALUE2;CONFIG.RESOURCE1.INSTANCE0.COUNTERST0.RELAY3VALUE2;DINT;DINT;
21;EXT;CONFIG.RESOURCE1.INSTANCE0.COUNTERST0.RESETCOUNTERVALUE;CONFIG.RESOURCE1.INSTANCE0.COUNTERST0.RESETCOUNTERVALUE;INT;INT; 21;EXT;CONFIG.RESOURCE1.INSTANCE0.COUNTERST0.RELAY3VALUE3;CONFIG.RESOURCE1.INSTANCE0.COUNTERST0.RELAY3VALUE3;DINT;DINT;
22;EXT;CONFIG.RESOURCE1.INSTANCE0.COUNTERST0.RELAY0VALUE;CONFIG.RESOURCE1.INSTANCE0.COUNTERST0.RELAY0VALUE;BOOL;BOOL;
23;EXT;CONFIG.RESOURCE1.INSTANCE0.COUNTERST0.RELAY1VALUE;CONFIG.RESOURCE1.INSTANCE0.COUNTERST0.RELAY1VALUE;BOOL;BOOL;
24;EXT;CONFIG.RESOURCE1.INSTANCE0.COUNTERST0.RELAY2VALUE;CONFIG.RESOURCE1.INSTANCE0.COUNTERST0.RELAY2VALUE;BOOL;BOOL;
25;EXT;CONFIG.RESOURCE1.INSTANCE0.COUNTERST0.RELAY3VALUE;CONFIG.RESOURCE1.INSTANCE0.COUNTERST0.RELAY3VALUE;BOOL;BOOL;
26;EXT;CONFIG.RESOURCE1.INSTANCE0.COUNTERST0.RELAY3VALUE0;CONFIG.RESOURCE1.INSTANCE0.COUNTERST0.RELAY3VALUE0;DINT;DINT;
27;EXT;CONFIG.RESOURCE1.INSTANCE0.COUNTERST0.RELAY3VALUE1;CONFIG.RESOURCE1.INSTANCE0.COUNTERST0.RELAY3VALUE1;DINT;DINT;
28;EXT;CONFIG.RESOURCE1.INSTANCE0.COUNTERST0.RELAY3VALUE2;CONFIG.RESOURCE1.INSTANCE0.COUNTERST0.RELAY3VALUE2;DINT;DINT;
29;EXT;CONFIG.RESOURCE1.INSTANCE0.COUNTERST0.RELAY3VALUE3;CONFIG.RESOURCE1.INSTANCE0.COUNTERST0.RELAY3VALUE3;DINT;DINT;
// Ticktime // Ticktime
20000000 30000000
Beremiz/beremiz_tutorial_opc_ua/build/config.c
View file @ 2637e942
...@@ -11,14 +11,6 @@ ...@@ -11,14 +11,6 @@
// CONFIGURATION CONFIG // CONFIGURATION CONFIG
__DECLARE_GLOBAL(INT,CONFIG,RESETCOUNTERVALUE) __DECLARE_GLOBAL(INT,CONFIG,RESETCOUNTERVALUE)
__DECLARE_GLOBAL_LOCATION(BOOL,__QX0_0_0_0)
__DECLARE_GLOBAL_LOCATED(BOOL,CONFIG,RELAY0VALUE)
__DECLARE_GLOBAL_LOCATION(BOOL,__QX0_0_1_1)
__DECLARE_GLOBAL_LOCATED(BOOL,CONFIG,RELAY1VALUE)
__DECLARE_GLOBAL_LOCATION(BOOL,__QX0_0_2_2)
__DECLARE_GLOBAL_LOCATED(BOOL,CONFIG,RELAY2VALUE)
__DECLARE_GLOBAL_LOCATION(BOOL,__QX0_0_3_3)
__DECLARE_GLOBAL_LOCATED(BOOL,CONFIG,RELAY3VALUE)
__DECLARE_GLOBAL_LOCATION(DINT,__QD1_0) __DECLARE_GLOBAL_LOCATION(DINT,__QD1_0)
__DECLARE_GLOBAL_LOCATED(DINT,CONFIG,RELAY3VALUE0) __DECLARE_GLOBAL_LOCATED(DINT,CONFIG,RELAY3VALUE0)
__DECLARE_GLOBAL_LOCATION(DINT,__QD1_1) __DECLARE_GLOBAL_LOCATION(DINT,__QD1_1)
...@@ -34,14 +26,6 @@ void config_init__(void) { ...@@ -34,14 +26,6 @@ void config_init__(void) {
BOOL retain; BOOL retain;
retain = 0; retain = 0;
__INIT_GLOBAL(INT,RESETCOUNTERVALUE,__INITIAL_VALUE(0),retain) __INIT_GLOBAL(INT,RESETCOUNTERVALUE,__INITIAL_VALUE(0),retain)
__INIT_GLOBAL_LOCATED(CONFIG,RELAY0VALUE,__QX0_0_0_0,retain)
__INIT_GLOBAL(BOOL,RELAY0VALUE,__INITIAL_VALUE(0),retain)
__INIT_GLOBAL_LOCATED(CONFIG,RELAY1VALUE,__QX0_0_1_1,retain)
__INIT_GLOBAL(BOOL,RELAY1VALUE,__INITIAL_VALUE(0),retain)
__INIT_GLOBAL_LOCATED(CONFIG,RELAY2VALUE,__QX0_0_2_2,retain)
__INIT_GLOBAL(BOOL,RELAY2VALUE,__INITIAL_VALUE(0),retain)
__INIT_GLOBAL_LOCATED(CONFIG,RELAY3VALUE,__QX0_0_3_3,retain)
__INIT_GLOBAL(BOOL,RELAY3VALUE,__INITIAL_VALUE(0),retain)
__INIT_GLOBAL_LOCATED(CONFIG,RELAY3VALUE0,__QD1_0,retain) __INIT_GLOBAL_LOCATED(CONFIG,RELAY3VALUE0,__QD1_0,retain)
__INIT_GLOBAL(DINT,RELAY3VALUE0,__INITIAL_VALUE(0),retain) __INIT_GLOBAL(DINT,RELAY3VALUE0,__INITIAL_VALUE(0),retain)
__INIT_GLOBAL_LOCATED(CONFIG,RELAY3VALUE1,__QD1_1,retain) __INIT_GLOBAL_LOCATED(CONFIG,RELAY3VALUE1,__QD1_1,retain)
...@@ -58,5 +42,5 @@ void RESOURCE1_run__(unsigned long tick); ...@@ -58,5 +42,5 @@ void RESOURCE1_run__(unsigned long tick);
void config_run__(unsigned long tick) { void config_run__(unsigned long tick) {
RESOURCE1_run__(tick); RESOURCE1_run__(tick);
} }
unsigned long long common_ticktime__ = 20000000ULL * 1ULL; /*ns*/ unsigned long long common_ticktime__ = 30000000ULL * 1ULL; /*ns*/
unsigned long greatest_tick_count__ = (unsigned long)0UL; /*tick*/ unsigned long greatest_tick_count__ = (unsigned long)0UL; /*tick*/
Beremiz/beremiz_tutorial_opc_ua/build/config.h
View file @ 2637e942
#include "beremiz.h" #include "beremiz.h"
__DECLARE_GLOBAL_PROTOTYPE(INT,RESETCOUNTERVALUE) __DECLARE_GLOBAL_PROTOTYPE(INT,RESETCOUNTERVALUE)
__DECLARE_GLOBAL_PROTOTYPE(BOOL,RELAY0VALUE)
__DECLARE_GLOBAL_PROTOTYPE(BOOL,RELAY1VALUE)
__DECLARE_GLOBAL_PROTOTYPE(BOOL,RELAY2VALUE)
__DECLARE_GLOBAL_PROTOTYPE(BOOL,RELAY3VALUE)
__DECLARE_GLOBAL_PROTOTYPE(DINT,RELAY3VALUE0) __DECLARE_GLOBAL_PROTOTYPE(DINT,RELAY3VALUE0)
__DECLARE_GLOBAL_PROTOTYPE(DINT,RELAY3VALUE1) __DECLARE_GLOBAL_PROTOTYPE(DINT,RELAY3VALUE1)
__DECLARE_GLOBAL_PROTOTYPE(DINT,RELAY3VALUE2) __DECLARE_GLOBAL_PROTOTYPE(DINT,RELAY3VALUE2)
......
Beremiz/beremiz_tutorial_opc_ua/build/generated_plc.st
View file @ 2637e942
...@@ -12,10 +12,6 @@ FUNCTION_BLOCK CounterST ...@@ -12,10 +12,6 @@ FUNCTION_BLOCK CounterST
END_VAR END_VAR
VAR_EXTERNAL VAR_EXTERNAL
ResetCounterValue : INT; ResetCounterValue : INT;
Relay0Value : BOOL;
Relay1Value : BOOL;
Relay2Value : BOOL;
Relay3Value : BOOL;
Relay3Value0 : DINT; Relay3Value0 : DINT;
Relay3Value1 : DINT; Relay3Value1 : DINT;
Relay3Value2 : DINT; Relay3Value2 : DINT;
...@@ -71,10 +67,6 @@ END_PROGRAM ...@@ -71,10 +67,6 @@ END_PROGRAM
CONFIGURATION config CONFIGURATION config
VAR_GLOBAL VAR_GLOBAL
ResetCounterValue : INT := 0; ResetCounterValue : INT := 0;
Relay0Value AT %QX0.0.0.0 : BOOL := 0;
Relay1Value AT %QX0.0.1.1 : BOOL := 0;
Relay2Value AT %QX0.0.2.2 : BOOL := 0;
Relay3Value AT %QX0.0.3.3 : BOOL := 0;
Relay3Value0 AT %QD1.0 : DINT := 0; Relay3Value0 AT %QD1.0 : DINT := 0;
Relay3Value1 AT %QD1.1 : DINT := 0; Relay3Value1 AT %QD1.1 : DINT := 0;
Relay3Value2 AT %QD1.2 : DINT := 0; Relay3Value2 AT %QD1.2 : DINT := 0;
...@@ -82,7 +74,7 @@ CONFIGURATION config ...@@ -82,7 +74,7 @@ CONFIGURATION config
END_VAR END_VAR
RESOURCE resource1 ON PLC RESOURCE resource1 ON PLC
TASK task0(INTERVAL := T#20ms,PRIORITY := 0); TASK task0(INTERVAL := T#30ms,PRIORITY := 0);
PROGRAM instance0 WITH task0 : plc_prg; PROGRAM instance0 WITH task0 : plc_prg;
END_RESOURCE END_RESOURCE
END_CONFIGURATION END_CONFIGURATION
Beremiz/beremiz_tutorial_opc_ua/build/lastbuildPLC.md5
View file @ 2637e942
649c9626fabc16ab1a46207076a4b602 7cf1024dd8f5d640c14541871d602956
\ No newline at end of file \ No newline at end of file
Beremiz/beremiz_tutorial_opc_ua/build/plc.st
View file @ 2637e942
...@@ -106,10 +106,6 @@ FUNCTION_BLOCK CounterST ...@@ -106,10 +106,6 @@ FUNCTION_BLOCK CounterST
END_VAR END_VAR
VAR_EXTERNAL VAR_EXTERNAL
ResetCounterValue : INT; ResetCounterValue : INT;
Relay0Value : BOOL;
Relay1Value : BOOL;
Relay2Value : BOOL;
Relay3Value : BOOL;
Relay3Value0 : DINT; Relay3Value0 : DINT;
Relay3Value1 : DINT; Relay3Value1 : DINT;
Relay3Value2 : DINT; Relay3Value2 : DINT;
...@@ -165,10 +161,6 @@ END_PROGRAM ...@@ -165,10 +161,6 @@ END_PROGRAM
CONFIGURATION config CONFIGURATION config
VAR_GLOBAL VAR_GLOBAL
ResetCounterValue : INT := 0; ResetCounterValue : INT := 0;
Relay0Value AT %QX0.0.0.0 : BOOL := 0;
Relay1Value AT %QX0.0.1.1 : BOOL := 0;
Relay2Value AT %QX0.0.2.2 : BOOL := 0;
Relay3Value AT %QX0.0.3.3 : BOOL := 0;
Relay3Value0 AT %QD1.0 : DINT := 0; Relay3Value0 AT %QD1.0 : DINT := 0;
Relay3Value1 AT %QD1.1 : DINT := 0; Relay3Value1 AT %QD1.1 : DINT := 0;
Relay3Value2 AT %QD1.2 : DINT := 0; Relay3Value2 AT %QD1.2 : DINT := 0;
...@@ -176,7 +168,7 @@ CONFIGURATION config ...@@ -176,7 +168,7 @@ CONFIGURATION config
END_VAR END_VAR
RESOURCE resource1 ON PLC RESOURCE resource1 ON PLC
TASK task0(INTERVAL := T#20ms,PRIORITY := 0); TASK task0(INTERVAL := T#30ms,PRIORITY := 0);
PROGRAM instance0 WITH task0 : plc_prg; PROGRAM instance0 WITH task0 : plc_prg;
END_RESOURCE END_RESOURCE
END_CONFIGURATION END_CONFIGURATION
Beremiz/beremiz_tutorial_opc_ua/build/plc_debugger.c
View file @ 2637e942
...@@ -26,7 +26,7 @@ void __publish_debug (void){} ...@@ -26,7 +26,7 @@ void __publish_debug (void){}
#include <stdio.h> #include <stdio.h>
#ifndef TARGET_ONLINE_DEBUG_DISABLE #ifndef TARGET_ONLINE_DEBUG_DISABLE
#define BUFFER_SIZE 60 #define BUFFER_SIZE 52
/* Atomically accessed variable for buffer state */ /* Atomically accessed variable for buffer state */
#define BUFFER_FREE 0 #define BUFFER_FREE 0
...@@ -50,10 +50,6 @@ extern PLC_PRG RESOURCE1__INSTANCE0; ...@@ -50,10 +50,6 @@ extern PLC_PRG RESOURCE1__INSTANCE0;
* Declare global variables from resources and conf * Declare global variables from resources and conf
**/ **/
extern __IEC_INT_t CONFIG__RESETCOUNTERVALUE; extern __IEC_INT_t CONFIG__RESETCOUNTERVALUE;
extern __IEC_BOOL_p CONFIG__RELAY0VALUE;
extern __IEC_BOOL_p CONFIG__RELAY1VALUE;
extern __IEC_BOOL_p CONFIG__RELAY2VALUE;
extern __IEC_BOOL_p CONFIG__RELAY3VALUE;
extern __IEC_DINT_p CONFIG__RELAY3VALUE0; extern __IEC_DINT_p CONFIG__RELAY3VALUE0;
extern __IEC_DINT_p CONFIG__RELAY3VALUE1; extern __IEC_DINT_p CONFIG__RELAY3VALUE1;
extern __IEC_DINT_p CONFIG__RELAY3VALUE2; extern __IEC_DINT_p CONFIG__RELAY3VALUE2;
...@@ -67,10 +63,6 @@ typedef const struct { ...@@ -67,10 +63,6 @@ typedef const struct {
static dbgvardsc_t dbgvardsc[] = { static dbgvardsc_t dbgvardsc[] = {
{&(CONFIG__RESETCOUNTERVALUE), INT_ENUM}, {&(CONFIG__RESETCOUNTERVALUE), INT_ENUM},
{&(CONFIG__RELAY0VALUE), BOOL_O_ENUM},
{&(CONFIG__RELAY1VALUE), BOOL_O_ENUM},
{&(CONFIG__RELAY2VALUE), BOOL_O_ENUM},
{&(CONFIG__RELAY3VALUE), BOOL_O_ENUM},
{&(CONFIG__RELAY3VALUE0), DINT_O_ENUM}, {&(CONFIG__RELAY3VALUE0), DINT_O_ENUM},
{&(CONFIG__RELAY3VALUE1), DINT_O_ENUM}, {&(CONFIG__RELAY3VALUE1), DINT_O_ENUM},
{&(CONFIG__RELAY3VALUE2), DINT_O_ENUM}, {&(CONFIG__RELAY3VALUE2), DINT_O_ENUM},
...@@ -86,10 +78,6 @@ static dbgvardsc_t dbgvardsc[] = { ...@@ -86,10 +78,6 @@ static dbgvardsc_t dbgvardsc[] = {
{&(RESOURCE1__INSTANCE0.COUNTERST0.CNT1), INT_ENUM}, {&(RESOURCE1__INSTANCE0.COUNTERST0.CNT1), INT_ENUM},
{&(RESOURCE1__INSTANCE0.COUNTERST0.CNT0), INT_ENUM}, {&(RESOURCE1__INSTANCE0.COUNTERST0.CNT0), INT_ENUM},
{&(RESOURCE1__INSTANCE0.COUNTERST0.RESETCOUNTERVALUE), INT_P_ENUM}, {&(RESOURCE1__INSTANCE0.COUNTERST0.RESETCOUNTERVALUE), INT_P_ENUM},
{&(RESOURCE1__INSTANCE0.COUNTERST0.RELAY0VALUE), BOOL_P_ENUM},
{&(RESOURCE1__INSTANCE0.COUNTERST0.RELAY1VALUE), BOOL_P_ENUM},
{&(RESOURCE1__INSTANCE0.COUNTERST0.RELAY2VALUE), BOOL_P_ENUM},
{&(RESOURCE1__INSTANCE0.COUNTERST0.RELAY3VALUE), BOOL_P_ENUM},
{&(RESOURCE1__INSTANCE0.COUNTERST0.RELAY3VALUE0), DINT_P_ENUM}, {&(RESOURCE1__INSTANCE0.COUNTERST0.RELAY3VALUE0), DINT_P_ENUM},
{&(RESOURCE1__INSTANCE0.COUNTERST0.RELAY3VALUE1), DINT_P_ENUM}, {&(RESOURCE1__INSTANCE0.COUNTERST0.RELAY3VALUE1), DINT_P_ENUM},
{&(RESOURCE1__INSTANCE0.COUNTERST0.RELAY3VALUE2), DINT_P_ENUM}, {&(RESOURCE1__INSTANCE0.COUNTERST0.RELAY3VALUE2), DINT_P_ENUM},
......
Beremiz/beremiz_tutorial_opc_ua/build/plc_main.c
View file @ 2637e942
...@@ -42,10 +42,6 @@ int __init_py_ext(int argc,char **argv); ...@@ -42,10 +42,6 @@ int __init_py_ext(int argc,char **argv);
void __cleanup_py_ext(void); void __cleanup_py_ext(void);
void __retrieve_py_ext(void); void __retrieve_py_ext(void);
void __publish_py_ext(void); void __publish_py_ext(void);
int __init_0(int argc,char **argv);
void __cleanup_0(void);
void __retrieve_0(void);
void __publish_0(void);
int __init_1(int argc,char **argv); int __init_1(int argc,char **argv);
void __cleanup_1(void); void __cleanup_1(void);
void __retrieve_1(void); void __retrieve_1(void);
...@@ -61,7 +57,6 @@ void __run(void) ...@@ -61,7 +57,6 @@ void __run(void)
__tick %= greatest_tick_count__; __tick %= greatest_tick_count__;
__retrieve_py_ext(); __retrieve_py_ext();
__retrieve_0();
__retrieve_1(); __retrieve_1();
/*__retrieve_debug();*/ /*__retrieve_debug();*/
...@@ -71,7 +66,6 @@ void __run(void) ...@@ -71,7 +66,6 @@ void __run(void)
__publish_debug(); __publish_debug();
__publish_1(); __publish_1();
__publish_0();
__publish_py_ext(); __publish_py_ext();
} }
...@@ -92,8 +86,7 @@ int __init(int argc,char **argv) ...@@ -92,8 +86,7 @@ int __init(int argc,char **argv)
config_init__(); config_init__();
__init_debug(); __init_debug();
init_level=1; if((res = __init_py_ext(argc,argv))){return res;} init_level=1; if((res = __init_py_ext(argc,argv))){return res;}
init_level=2; if((res = __init_0(argc,argv))){return res;} init_level=2; if((res = __init_1(argc,argv))){return res;}
init_level=3; if((res = __init_1(argc,argv))){return res;}
return res; return res;
} }
/* /*
...@@ -101,8 +94,7 @@ int __init(int argc,char **argv) ...@@ -101,8 +94,7 @@ int __init(int argc,char **argv)
**/ **/
void __cleanup(void) void __cleanup(void)
{ {
if(init_level >= 3) __cleanup_1(); if(init_level >= 2) __cleanup_1();
if(init_level >= 2) __cleanup_0();
if(init_level >= 1) __cleanup_py_ext(); if(init_level >= 1) __cleanup_py_ext();
__cleanup_debug(); __cleanup_debug();
} }
...@@ -331,7 +323,7 @@ int WaitPythonCommands(void) ...@@ -331,7 +323,7 @@ int WaitPythonCommands(void)
/* Called by PLC thread on each new python command*/ /* Called by PLC thread on each new python command*/
void UnBlockPythonCommands(void) void UnBlockPythonCommands(void)
{ {
/* signal debugger thread it can read data */ /* signal python thread it can read data */
pthread_mutex_unlock(&python_wait_mutex); pthread_mutex_unlock(&python_wait_mutex);
} }
......
Beremiz/beremiz_tutorial_opc_ua/modbus_0@modbus/ModbusTCPclient_0@ModbusTCPclient/ModbusRequest_0@ModbusRequest/baseconfnode.xml deleted 100644 → 0
View file @ 8e01fe95
<?xml version='1.0' encoding='utf-8'?>
<BaseParams xmlns:xsd="http://www.w3.org/2001/XMLSchema" IEC_Channel="0" Name="ModbusRequest_0"/>
Beremiz/beremiz_tutorial_opc_ua/modbus_0@modbus/ModbusTCPclient_0@ModbusTCPclient/ModbusRequest_0@ModbusRequest/confnode.xml deleted 100644 → 0
View file @ 8e01fe95
<?xml version='1.0' encoding='utf-8'?>
<ModbusRequest xmlns:xsd="http://www.w3.org/2001/XMLSchema" Write_on_change="false" SlaveID="0" Function="05 - Write Single coil" Timeout_in_ms="30"/>
Beremiz/beremiz_tutorial_opc_ua/modbus_0@modbus/ModbusTCPclient_0@ModbusTCPclient/ModbusRequest_1@ModbusRequest/baseconfnode.xml deleted 100644 → 0
View file @ 8e01fe95
<?xml version='1.0' encoding='utf-8'?>
<BaseParams xmlns:xsd="http://www.w3.org/2001/XMLSchema" IEC_Channel="1" Name="ModbusRequest_1"/>
Beremiz/beremiz_tutorial_opc_ua/modbus_0@modbus/ModbusTCPclient_0@ModbusTCPclient/ModbusRequest_1@ModbusRequest/confnode.xml deleted 100644 → 0
View file @ 8e01fe95
<?xml version='1.0' encoding='utf-8'?>
<ModbusRequest xmlns:xsd="http://www.w3.org/2001/XMLSchema" Function="05 - Write Single coil" Write_on_change="false" Start_Address="1" SlaveID="0" Timeout_in_ms="30"/>
Beremiz/beremiz_tutorial_opc_ua/modbus_0@modbus/ModbusTCPclient_0@ModbusTCPclient/ModbusRequest_2@ModbusRequest/baseconfnode.xml deleted 100644 → 0
View file @ 8e01fe95
<?xml version='1.0' encoding='utf-8'?>
<BaseParams xmlns:xsd="http://www.w3.org/2001/XMLSchema" IEC_Channel="2" Name="ModbusRequest_2"/>
Beremiz/beremiz_tutorial_opc_ua/modbus_0@modbus/ModbusTCPclient_0@ModbusTCPclient/ModbusRequest_2@ModbusRequest/confnode.xml deleted 100644 → 0
View file @ 8e01fe95
<?xml version='1.0' encoding='utf-8'?>
<ModbusRequest xmlns:xsd="http://www.w3.org/2001/XMLSchema" Function="05 - Write Single coil" Start_Address="2" SlaveID="0" Timeout_in_ms="30"/>
Beremiz/beremiz_tutorial_opc_ua/modbus_0@modbus/ModbusTCPclient_0@ModbusTCPclient/ModbusRequest_3@ModbusRequest/baseconfnode.xml deleted 100644 → 0
View file @ 8e01fe95
<?xml version='1.0' encoding='utf-8'?>
<BaseParams xmlns:xsd="http://www.w3.org/2001/XMLSchema" IEC_Channel="3" Name="ModbusRequest_3"/>
Beremiz/beremiz_tutorial_opc_ua/modbus_0@modbus/ModbusTCPclient_0@ModbusTCPclient/ModbusRequest_3@ModbusRequest/confnode.xml deleted 100644 → 0
View file @ 8e01fe95
<?xml version='1.0' encoding='utf-8'?>
<ModbusRequest xmlns:xsd="http://www.w3.org/2001/XMLSchema" Function="05 - Write Single coil" SlaveID="0" Start_Address="3" Timeout_in_ms="30"/>
Beremiz/beremiz_tutorial_opc_ua/modbus_0@modbus/ModbusTCPclient_0@ModbusTCPclient/baseconfnode.xml deleted 100644 → 0
View file @ 8e01fe95
<?xml version='1.0' encoding='utf-8'?>
<BaseParams xmlns:xsd="http://www.w3.org/2001/XMLSchema" IEC_Channel="0" Name="ModbusTCPclient_0"/>
Beremiz/beremiz_tutorial_opc_ua/modbus_0@modbus/ModbusTCPclient_0@ModbusTCPclient/confnode.xml deleted 100644 → 0
View file @ 8e01fe95
<?xml version='1.0' encoding='utf-8'?>
<ModbusTCPclient xmlns:xsd="http://www.w3.org/2001/XMLSchema" Configuration_Name="Modbus TCP Client 0.0" Remote_IP_Address="192.168.0.78" Invocation_Rate_in_ms="1000" Remote_Port_Number="1502"/>
Beremiz/beremiz_tutorial_opc_ua/modbus_0@modbus/baseconfnode.xml deleted 100644 → 0
View file @ 8e01fe95
<?xml version='1.0' encoding='utf-8'?>
<BaseParams xmlns:xsd="http://www.w3.org/2001/XMLSchema" IEC_Channel="0" Name="modbus_0"/>
Beremiz/beremiz_tutorial_opc_ua/modbus_0@modbus/confnode.xml deleted 100644 → 0
View file @ 8e01fe95
<?xml version='1.0' encoding='utf-8'?>
<ModbusRoot xmlns:xsd="http://www.w3.org/2001/XMLSchema"/>
Beremiz/beremiz_tutorial_opc_ua/plc.xml
View file @ 2637e942
<?xml version='1.0' encoding='utf-8'?> <?xml version='1.0' encoding='utf-8'?>
<project xmlns:ns1="http://www.plcopen.org/xml/tc6_0201" xmlns:xhtml="http://www.w3.org/1999/xhtml" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://www.plcopen.org/xml/tc6_0201"> <project xmlns:ns1="http://www.plcopen.org/xml/tc6_0201" xmlns:xhtml="http://www.w3.org/1999/xhtml" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://www.plcopen.org/xml/tc6_0201">
<fileHeader companyName="Unknown" productName="Unnamed" productVersion="1" creationDateTime="2021-05-14T14:33:11"/> <fileHeader companyName="Unknown" productName="Unnamed" productVersion="1" creationDateTime="2021-05-14T14:33:11"/>
<contentHeader name="Counter (OSIE)" modificationDateTime="2021-10-20T17:08:40"> <contentHeader name="Counter (OSIE)" modificationDateTime="2021-10-21T16:00:32">
<coordinateInfo> <coordinateInfo>
<fbd> <fbd>
<scaling x="0" y="0"/> <scaling x="0" y="0"/>
...@@ -154,26 +154,6 @@ ...@@ -154,26 +154,6 @@
<INT/> <INT/>
</type> </type>
</variable> </variable>
<variable name="Relay0Value">
<type>
<BOOL/>
</type>
</variable>
<variable name="Relay1Value">
<type>
<BOOL/>
</type>
</variable>
<variable name="Relay2Value">
<type>
<BOOL/>
</type>
</variable>
<variable name="Relay3Value">
<type>
<BOOL/>
</type>
</variable>
<variable name="Relay3Value0"> <variable name="Relay3Value0">
<type> <type>
<DINT/> <DINT/>
...@@ -233,7 +213,7 @@ Out0 := Cnt0;]]></xhtml:p> ...@@ -233,7 +213,7 @@ Out0 := Cnt0;]]></xhtml:p>
<configurations> <configurations>
<configuration name="config"> <configuration name="config">
<resource name="resource1"> <resource name="resource1">
<task name="task0" priority="0" interval="T#20ms"> <task name="task0" priority="0" interval="T#30ms">
<pouInstance name="instance0" typeName="plc_prg"/> <pouInstance name="instance0" typeName="plc_prg"/>
</task> </task>
</resource> </resource>
...@@ -246,50 +226,6 @@ Out0 := Cnt0;]]></xhtml:p> ...@@ -246,50 +226,6 @@ Out0 := Cnt0;]]></xhtml:p>
<simpleValue value="0"/> <simpleValue value="0"/>
</initialValue> </initialValue>
</variable> </variable>
<variable name="Relay0Value" address="%QX0.0.0.0">
<type>
<BOOL/>
</type>
<initialValue>
<simpleValue value="0"/>
</initialValue>
<documentation>
<xhtml:p><![CDATA[The status of the Lime's relay0 (read over modbus)]]></xhtml:p>
</documentation>
</variable>
<variable name="Relay1Value" address="%QX0.0.1.1">
<type>
<BOOL/>
</type>
<initialValue>
<simpleValue value="0"/>
</initialValue>
<documentation>
<xhtml:p><![CDATA[The status of the Lime's relay1 (read over modbus)]]></xhtml:p>
</documentation>
</variable>
<variable name="Relay2Value" address="%QX0.0.2.2">
<type>
<BOOL/>
</type>
<initialValue>
<simpleValue value="0"/>
</initialValue>
<documentation>
<xhtml:p><![CDATA[The status of the Lime's relay2 (read over modbus)]]></xhtml:p>
</documentation>
</variable>
<variable name="Relay3Value" address="%QX0.0.3.3">
<type>
<BOOL/>
</type>
<initialValue>
<simpleValue value="0"/>
</initialValue>
<documentation>
<xhtml:p><![CDATA[The status of the Lime's relay3 (read over modbus)]]></xhtml:p>
</documentation>
</variable>
<variable name="Relay3Value0" address="%QD1.0"> <variable name="Relay3Value0" address="%QD1.0">
<type> <type>
<DINT/> <DINT/>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7