core/redAcore
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Important Update;

Browse Source 
- ApplicationCore:
  - Minor log updates
- FunctionCore:
  - Initialise structs & object params in declaration
- DeviceCore:
  - Update logs with more consistent structure
  - Initialise structs & object params in declaration
  - Implemented DeviceType templates
    - Added Add/Get/Destroy methods
    - Load from config or separate template file
    - Build Devices/Params from template
  - Implemented ParamGroups
    - Added Add/Get/Destroy methods
    - Load with DeviceTypes
  - Added JSON parser to read separate template files
  - Bug fix: Getxxxx() methods
This commit is contained in:
Charl Wentzel
2018-12-13 09:17:39 +02:00
parent 90beb031af
commit dc76d99b58
5 changed files with 565 additions and 220 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ApplicationCore.cpp
View File

@@ -140,7 +140,7 @@ bool CApplication::LoadConfig()
{
// Load Configuration Data
if (!JSONparser->ReadFromFile( "Config", ConfigFile )) {
if (Log) Log->Message( dlLow, dlLow, "%s: Fail to load Configuration file (%s)- %s", ProcessName, ConfigFile, JSONparser->GetError() );
if (Log) Log->Message( dlLow, dlLow, "%s: Fail to load Configuration file (%s) - %s", ProcessName, ConfigFile, JSONparser->GetError() );
return false;
}
else {
@@ -154,7 +154,7 @@ bool CApplication::LoadConfig()
return false;
}
else if (!JSONparser->ReadFromFile( "Definition", DefinitionFile )) {
if (Log) Log->Message( dlLow, dlLow, "%s: Fail to load Application Definition file (%s)- %s", ProcessName, DefinitionFile, JSONparser->GetError() );
if (Log) Log->Message( dlLow, dlLow, "%s: Fail to load Application Definition file (%s) - %s", ProcessName, DefinitionFile, JSONparser->GetError() );
return false;
}
else {
@@ -167,7 +167,7 @@ bool CApplication::LoadConfig()
if (Log) Log->Message( dlLow, dlLow, "%s: No Address List file specified", ProcessName );
}
else if (!JSONparser->ReadFromFile( "AddressList", AddressFile )) {
if (Log) Log->Message( dlLow, dlLow, "%s: Fail to load Address List file (%s)- %s", ProcessName, AddressFile, JSONparser->GetError() );
if (Log) Log->Message( dlLow, dlLow, "%s: Fail to load Address List file (%s) - %s", ProcessName, AddressFile, JSONparser->GetError() );
return false;
}
else {