Merge branch 'master' of mz-automation.de:libiec61850

pull/6/head
Michael Zillgith 10 years ago
commit 29d53cbc08

@ -17,7 +17,7 @@
#define DEBUG_COTP 0 #define DEBUG_COTP 0
#define DEBUG_ISO_SERVER 0 #define DEBUG_ISO_SERVER 0
#define DEBUG_ISO_CLIENT 0 #define DEBUG_ISO_CLIENT 0
#define DEBUG_IED_SERVER 1 #define DEBUG_IED_SERVER 0
#define DEBUG_IED_CLIENT 0 #define DEBUG_IED_CLIENT 0
#define DEBUG_MMS_CLIENT 0 #define DEBUG_MMS_CLIENT 0
#define DEBUG_MMS_SERVER 0 #define DEBUG_MMS_SERVER 0

@ -54,7 +54,10 @@ int main(int argc, char** argv) {
MmsValue* ctlValOff = MmsValue_newBoolean(false); MmsValue* ctlValOff = MmsValue_newBoolean(false);
if (!ControlObjectClient_operate(controlLED1, ctlValOff, 0)) goto control_error; if (!ControlObjectClient_operate(controlLED1, ctlValOff, 0)) goto control_error;
ControlObjectClient_select(controlLED2);
if (!ControlObjectClient_operate(controlLED2, ctlValOff, 0)) goto control_error; if (!ControlObjectClient_operate(controlLED2, ctlValOff, 0)) goto control_error;
if (!ControlObjectClient_operate(controlLED4, ctlValOff, 0)) goto control_error; if (!ControlObjectClient_operate(controlLED4, ctlValOff, 0)) goto control_error;
while (1) { while (1) {
@ -63,10 +66,15 @@ int main(int argc, char** argv) {
Thread_sleep(1000); Thread_sleep(1000);
if (!ControlObjectClient_operate(controlLED1, ctlValOff, 0)) goto control_error; if (!ControlObjectClient_operate(controlLED1, ctlValOff, 0)) goto control_error;
ControlObjectClient_select(controlLED2);
if (!ControlObjectClient_operate(controlLED2, ctlValOn, 0)) goto control_error; if (!ControlObjectClient_operate(controlLED2, ctlValOn, 0)) goto control_error;
Thread_sleep(1000); Thread_sleep(1000);
ControlObjectClient_select(controlLED2);
if (!ControlObjectClient_operate(controlLED2, ctlValOff, 0)) goto control_error; if (!ControlObjectClient_operate(controlLED2, ctlValOff, 0)) goto control_error;
if (!ControlObjectClient_operate(controlLED3, ctlValOn, 0)) goto control_error; if (!ControlObjectClient_operate(controlLED3, ctlValOn, 0)) goto control_error;
Thread_sleep(1000); Thread_sleep(1000);

@ -66,8 +66,6 @@ performCheckHandler(void* parameter, MmsValue* ctlVal, bool test, bool interlock
if (test) if (test)
return CONTROL_TEMPORARILY_UNAVAILABLE; return CONTROL_TEMPORARILY_UNAVAILABLE;
printf("controllingClient: %p connection: %p\n", controllingClient, connection);
/* If there is already another client that controls the device reject the control attempt */ /* If there is already another client that controls the device reject the control attempt */
if (controllingClient == connection) if (controllingClient == connection)
return CONTROL_ACCEPTED; return CONTROL_ACCEPTED;

@ -6,8 +6,8 @@
#define BEAGLEBONE_LEDS_H_ #define BEAGLEBONE_LEDS_H_
#define SIMULATED 1 /* set to 1 if you want to run the demo on a PC */
//#define SIMULATED 1
#if 0 #if 0
#define LED1 "/sys/class/leds/beaglebone::usr0" #define LED1 "/sys/class/leds/beaglebone::usr0"

Loading…
Cancel
Save