Mercurial Mercurial > beremiz / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
targets/beremiz.h
author Andrey Skvortsov <andrej.skvortzov@gmail.com>
Thu, 14 Feb 2019 10:19:30 +0300
changeset 2510 4f78f0e201d9
parent 2504 f3aced6c5f8b
child 3294 e3db472b0dfb
permissions -rw-r--r--
Additional fix for rewrite ForceVariableDialog commit (9076249f)

fix following backtrace:

Traceback (most recent call last):
File "/usr/lib/python2.7/dist-packages/wx-3.0-gtk3/wx/_core.py", line 16765, in <lambda>
lambda event: event.callable(*event.args, **event.kw) )
File "/home/developer/WorkData/PLC/beremiz/beremiz/controls/DebugVariablePanel/DebugVariableViewer.py", line 232, in HandleButton
button.ProcessCallback()
File "/home/developer/WorkData/PLC/beremiz/beremiz/controls/DebugVariablePanel/GraphButton.py", line 156, in ProcessCallback
self.Callback()
File "/home/developer/WorkData/PLC/beremiz/beremiz/controls/DebugVariablePanel/DebugVariableViewer.py", line 350, in OnForceButton
self.ForceValue(self.ItemsDict.values()[0])
File "/home/developer/WorkData/PLC/beremiz/beremiz/controls/DebugVariablePanel/DebugVariableViewer.py", line 428, in ForceValue
dialog.GetValue())
File "/home/developer/WorkData/PLC/beremiz/beremiz/dialogs/ForceVariableDialog.py", line 232, in GetValue
return GetTypeValue[self.IEC_Type](wx.TextEntryDialog.GetValue(self))
TypeError: unbound method GetValue() must be called with TextEntryDialog instance as first argument (got ForceVariableDialog instance instead)
2504
f3aced6c5f8b fix problems with recursive beremiz.h inclusion
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 2503
diff changeset 
     1
 
#ifndef _BEREMIZ_H_
f3aced6c5f8b fix problems with recursive beremiz.h inclusion
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 2503
diff changeset 
     2
 
#define _BEREMIZ_H_
f3aced6c5f8b fix problems with recursive beremiz.h inclusion
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 2503
diff changeset 
     3
 







1001






3f966bbb3fba
Added beremiz.h header file for extensions



Edouard Tisserant


parents: 

diff
changeset




     4


/* Beremiz' header file for use by extensions */













3f966bbb3fba
Added beremiz.h header file for extensions



Edouard Tisserant


parents: 

diff
changeset




     5














3f966bbb3fba
Added beremiz.h header file for extensions



Edouard Tisserant


parents: 

diff
changeset




     6


#include "iec_types.h"













3f966bbb3fba
Added beremiz.h header file for extensions



Edouard Tisserant


parents: 

diff
changeset




     7














3f966bbb3fba
Added beremiz.h header file for extensions



Edouard Tisserant


parents: 

diff
changeset




     8


#define LOG_LEVELS 4













3f966bbb3fba
Added beremiz.h header file for extensions



Edouard Tisserant


parents: 

diff
changeset




     9


#define LOG_CRITICAL 0













3f966bbb3fba
Added beremiz.h header file for extensions



Edouard Tisserant


parents: 

diff
changeset




    10


#define LOG_WARNING 1













3f966bbb3fba
Added beremiz.h header file for extensions



Edouard Tisserant


parents: 

diff
changeset




    11


#define LOG_INFO 2













3f966bbb3fba
Added beremiz.h header file for extensions



Edouard Tisserant


parents: 

diff
changeset




    12


#define LOG_DEBUG 3













3f966bbb3fba
Added beremiz.h header file for extensions



Edouard Tisserant


parents: 

diff
changeset




    13














3f966bbb3fba
Added beremiz.h header file for extensions



Edouard Tisserant


parents: 

diff
changeset




    14


extern unsigned long long common_ticktime__;








2175






667f7de69cf6
Fix compilation problem in case of TARGET_LOGGING_DISABLE turned on and TARGET_DEBUG_DISABLE turned off



Andrey Skvortsov <andrej.skvortzov@gmail.com>


parents: 
1050

diff
changeset




    15














667f7de69cf6
Fix compilation problem in case of TARGET_LOGGING_DISABLE turned on and TARGET_DEBUG_DISABLE turned off



Andrey Skvortsov <andrej.skvortzov@gmail.com>


parents: 
1050

diff
changeset




    16


#ifdef TARGET_LOGGING_DISABLE








2503






6ffeffb6d635
remove LogMessage prototype from plc_main_head.c



Andrey Skvortsov <andrej.skvortzov@gmail.com>


parents: 
2175

diff
changeset




    17


static inline int LogMessage(uint8_t level, char* buf, uint32_t size)













6ffeffb6d635
remove LogMessage prototype from plc_main_head.c



Andrey Skvortsov <andrej.skvortzov@gmail.com>


parents: 
2175

diff
changeset




    18


{













6ffeffb6d635
remove LogMessage prototype from plc_main_head.c



Andrey Skvortsov <andrej.skvortzov@gmail.com>


parents: 
2175

diff
changeset




    19


	(void)level;













6ffeffb6d635
remove LogMessage prototype from plc_main_head.c



Andrey Skvortsov <andrej.skvortzov@gmail.com>


parents: 
2175

diff
changeset




    20


	(void)buf;













6ffeffb6d635
remove LogMessage prototype from plc_main_head.c



Andrey Skvortsov <andrej.skvortzov@gmail.com>


parents: 
2175

diff
changeset




    21


	(void)size;













6ffeffb6d635
remove LogMessage prototype from plc_main_head.c



Andrey Skvortsov <andrej.skvortzov@gmail.com>


parents: 
2175

diff
changeset




    22


	return 0;













6ffeffb6d635
remove LogMessage prototype from plc_main_head.c



Andrey Skvortsov <andrej.skvortzov@gmail.com>


parents: 
2175

diff
changeset




    23


}








2175






667f7de69cf6
Fix compilation problem in case of TARGET_LOGGING_DISABLE turned on and TARGET_DEBUG_DISABLE turned off



Andrey Skvortsov <andrej.skvortzov@gmail.com>


parents: 
1050

diff
changeset




    24


#else













667f7de69cf6
Fix compilation problem in case of TARGET_LOGGING_DISABLE turned on and TARGET_DEBUG_DISABLE turned off



Andrey Skvortsov <andrej.skvortzov@gmail.com>


parents: 
1050

diff
changeset




    25


int     LogMessage(uint8_t level, char* buf, uint32_t size);













667f7de69cf6
Fix compilation problem in case of TARGET_LOGGING_DISABLE turned on and TARGET_DEBUG_DISABLE turned off



Andrey Skvortsov <andrej.skvortzov@gmail.com>


parents: 
1050

diff
changeset




    26


#endif













667f7de69cf6
Fix compilation problem in case of TARGET_LOGGING_DISABLE turned on and TARGET_DEBUG_DISABLE turned off



Andrey Skvortsov <andrej.skvortzov@gmail.com>


parents: 
1050

diff
changeset




    27









1050






56bef276055e
Made declaration from beremiz.h available to C pragmas in POUs. Added AtomicCompareExchange to beremiz.h



Edouard Tisserant


parents: 
1002

diff
changeset




    28


long AtomicCompareExchange(long* atomicvar,long compared, long exchange);








1001






3f966bbb3fba
Added beremiz.h header file for extensions



Edouard Tisserant


parents: 

diff
changeset




    29









2504






f3aced6c5f8b
fix problems with recursive beremiz.h inclusion



Andrey Skvortsov <andrej.skvortzov@gmail.com>


parents: 
2503

diff
changeset




    30


#endif













beremiz