Major Update:
- Implement consistent Function addition to application
- Use TYPE_XXX constants to declare function type
- Use NewXXXX() methods to call constructor correctly
- Add FunctionType list (with constructor) to Application
- Create Function by comparison to FunctionType list
- Simplify LoadConfig() and Init() methods for functions
- Combine methods into Init() method
- Pass relevant data member to Init() method
- Remove all CDataMember references on functions
- ApplicationCore:
- Split ReadParam() method from LoadConfig() method
- Split main configuration into separate files:
- config/ - main config file, general application settings
- definition/ - application definition, e.g. function blocks
- Definition and Address List files specified in config file
- Load address file in address/ branch
- Made DataTree & JSONparser private
- Made Config, Definition & Address branches public
- Removed unnecessary branch references
- Improved event logging
- DataTreeCore:
- Allow GetChFirstChild & GetChElement to create parent branches
with correct type, ie. Object/Array
- Remove unnecessary Create param from GetXxx functions
- Bug fix: Print empty objects/arrays correct, ie. empty brackets
- Bug fix: Adding element at specific index
- Bug fix: Error when get/create string value with "null"
- FunctionCore:
- Type param now set as constant via constructor
- Create empty Handles & Channels objects if none in Config
- SelectableCore:
- Add Queue length parameter to handles for UNIX and TCP sockets
- DeviceCore:
- Bug fix: missing Process() method
This commit is contained in:
@@ -819,6 +819,13 @@ bool CJSONparse::PrintObject( CDataMember * Object, const int Indent )
|
||||
if (write( OutputHandle, "{", 1 ) < 0)
|
||||
return false;
|
||||
|
||||
// Check if empty
|
||||
if (Object->Len == 0) {
|
||||
if (write( OutputHandle, "}", 1 ) < 0)
|
||||
return false;
|
||||
return true;
|
||||
}
|
||||
|
||||
// Extend spacer
|
||||
if (Indent) {
|
||||
memset( &Spacer[SpacerLen], ' ', 2 );
|
||||
@@ -930,6 +937,13 @@ bool CJSONparse::PrintArray( CDataMember * Array, const int Indent )
|
||||
if (write( OutputHandle, "[", 1 ) < 0)
|
||||
return false;
|
||||
|
||||
// Check if empty
|
||||
if (Array->Len == 0) {
|
||||
if (write( OutputHandle, "]", 1 ) < 0)
|
||||
return false;
|
||||
return true;
|
||||
}
|
||||
|
||||
// Extend spacer
|
||||
if (Indent) {
|
||||
memset( &Spacer[SpacerLen], ' ', 2 );
|
||||
|
||||
Reference in New Issue
Block a user