Major Update:
- Implement new ApplicationCore:
- Manage Tools: Log, DataTree, JSONparser & Selector
- Load configuration, Manage FunctionBlocks
- FunctionCore & dirived classes, SignalCore:
- affects: SelectableCore, DeviceCore, FileCore, WatchdogCore
- Do not pass Log()
- Define and pass Type
- Update/reduce included headers
- Use ProcessName and Application global vars
- Get Log, DataTree from Application
- Use virtual Init() function to set must have Channels/Handles
- DataTreeCore:
- Bug fix: Check if child members exist and destroy in SetValuePtr()
- Add method GetFirstChild with BaseMember & Path
- Bug fix: do not use RootMember if no Parent in GetChildxxx() methods
- SignalCore, SelectCore:
- Use Application->Log()
- FunctionCore:
- Add itself to Application (function list)
- Add parameter: LinkConfigMember, Type
- Use virtual LoadConfigData() to configure from DataTree
- Rename methods: LoadConfig() -> InitConfig(),
InitLogging() -> SetLogParam(), SetDebugLevel() -> SetLogLevel()
- Add method: GetType(), LoadChannelLinkData(), InitChannelLinks()
- Modify LinkIn/OutputChannel() to use name for InFunction, not pointer
- SelectableCore & Dirived classes:
- Affects DeviceCore & WatchdogClient
- Rename parameter: Select -> Selector, BaseMember -> ConfigMember
- Get Selector from Application->Selector
- Change Handles JSON structure from Array to Key:Value pairs
- Bug fix: check if Selector exist during Input()
- Bug fix: do not set PortNo if not exist
This commit is contained in:
@@ -20,8 +20,8 @@
|
||||
//---------------------------------------------------------------------------
|
||||
|
||||
// Preview
|
||||
typedef struct SChannel TChannel;
|
||||
typedef struct SChannelLink TChannelLink;
|
||||
typedef struct SChannel TChannel;
|
||||
typedef struct SChannelLink TChannelLink;
|
||||
|
||||
class CFunctionCore;
|
||||
|
||||
@@ -55,10 +55,12 @@ class CFunctionCore
|
||||
protected:
|
||||
// Function Definition
|
||||
char * Name;
|
||||
char * Type;
|
||||
|
||||
// Configuration
|
||||
CDataTree * DataTree;
|
||||
TDataMember * BaseMember;
|
||||
TDataMember * ConfigMember;
|
||||
TDataMember * LinkConfigMember;
|
||||
|
||||
// Channels
|
||||
TChannel * FirstChannel;
|
||||
@@ -77,27 +79,34 @@ protected:
|
||||
return Channel;
|
||||
}
|
||||
|
||||
// Load configuraiton
|
||||
// Load configuration
|
||||
virtual bool LoadConfigData();
|
||||
virtual bool LoadChannelLinkData();
|
||||
|
||||
// Manual Data Input/Output
|
||||
virtual int Output( const TChannel * Channel, const char * Data, int Len );
|
||||
|
||||
public:
|
||||
// Life cycle
|
||||
CFunctionCore( const char * pName, CLogCore * pLog );
|
||||
CFunctionCore( const char * pName, const char * Type );
|
||||
virtual ~CFunctionCore();
|
||||
|
||||
// Load Configuration
|
||||
virtual bool LoadConfig( CDataTree * pDataTree, const char * pBasePath );
|
||||
virtual bool LoadConfig( CDataTree * pDataTree, TDataMember * pBaseMember );
|
||||
virtual bool Init();
|
||||
|
||||
bool InitConfig( const char * pConfigPath );
|
||||
bool InitConfig( TDataMember * pConfigMember );
|
||||
|
||||
bool InitChannelLinks( const char * pLinkConfigPath );
|
||||
bool InitChannelLinks( TDataMember *pLinkConfigMember );
|
||||
|
||||
// Set Parameters Manually
|
||||
bool InitLogging( EDebugLevel pDebugLevel, int pOutputDisplay );
|
||||
bool SetDebugLevel( EDebugLevel pDebugLevel );
|
||||
bool SetLogParam( EDebugLevel pDebugLevel, int pOutputDisplay );
|
||||
bool SetLogLevel( EDebugLevel pDebugLevel );
|
||||
|
||||
// Miscellaneous
|
||||
inline const char * GetName() { return Name; };
|
||||
inline const char * GetType() { return Type; };
|
||||
|
||||
// Manage Channels
|
||||
virtual TChannel * AddChannel( const char * ChannelName, const bool pInputEnable = true, const bool pOutputEnabled = true );
|
||||
@@ -127,8 +136,8 @@ public:
|
||||
virtual int Output( const char * ChannelName, const char * Data, int Len = -1 );
|
||||
|
||||
// Automated Data Input/Output
|
||||
virtual bool LinkInputChannel( const char * ChannelName, CFunctionCore * OutFunction, const char * OutChannelName, bool Bidirectional );
|
||||
virtual bool LinkOutputChannel( const char * ChannelName, CFunctionCore * InFunction, const char * InChannelName, bool Bidirectional );
|
||||
virtual bool LinkInputChannel( const char * ChannelName, const char * OutFunctionName, const char * OutChannelName, bool Bidirectional );
|
||||
virtual bool LinkOutputChannel( const char * ChannelName, const char * InFunctionName, const char * InChannelName, bool Bidirectional );
|
||||
virtual bool Process() = 0;
|
||||
};
|
||||
|
||||
|
||||
Reference in New Issue
Block a user