Commit Graph

172 Commits

Author SHA1 Message Date
Charl Wentzel
434377f122 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
2017-07-16 20:29:01 +02:00
Charl Wentzel
8933ec1ae6 Important Update:
- FunctionCore:
  - Fix Memory Leaks:
    - Recreate Name in LoadConfig()
    - Setting FirstChannel to NULL in LoadConfig()
  - Fix fault on empty Log/Output in LoadConfig()
  - Check if Log/Level exists in LoadConfig()
  - Do not auto-create all config parameters
- SelectableCore:
  - Fix Memory Leaks:
    - Setting FirstHandle to NULL in LoadConfig()
  - Do not auto-create all config parameters
  - Update logs to specifically refer to "TCP" server/client
2017-07-12 06:19:06 +02:00
Charl Wentzel
3f86de71b1 Major update:
- DataTreeCore:
  - Bug fix: GetMember() error if member not found
- FunctionCore: (affected: SelectableCore, FileCore, WatchdogCore)
  - Made destructor virual
  - Standardize method parameter naming, e.g. pName, pLog
  - Renamed parameters: DebugLevel -> LogLevel, OutputDisplay -> LogOutput
  - Reinstated parameter BaseMember
  - Removed logging parameters from constructor
  - Created method InitLoggging() (shows "Function Created" message)
  - Split LoadConfig() method into parts:
    - Implemented public LoadConfig() methods
    - Implemented LoadConfigData() method, load parameters from DataTree
- WatchdogCore:
  - Derive from CSelectableCore instead of CFunctionCore
  - Rename parameter: PingTimeout -> PingInterval
  - Replace Ping Channel with Handle only
  - Add method SetInterval()
  - Send command direct to handle with (channel) Input()
- SelectableCore:
  - Rename parameters: Auto -> AutoManage, ReopenTimeout -> ReopenDelay
  - Implemented own virtual LoadConfigData() method
- DeviceCore:
  - Made all logging conditional: if (Log) Log->Message(...)
- SelectCore:
  - Renamed parameters: DebugLevel -> LogLevel
2017-07-11 06:20:14 +02:00
Charl Wentzel
b7ed169730 Major Update & Bug fixes:
- FileCore:
  - Replace dlNone -> dlLow
  - Remove temporary code used by CBaslerCamera
- Function Core:
  - Add method SetDebugLevel()
  - Remove global parameter BaseMember;
- JSONparse:
  - Print Bool parameters as true/false, not 1/0
- SelectCore:
  - Add method SetDebugLevel()
- SignalCore:
  - Replace dlNone -> dlLow
2017-07-09 16:31:47 +02:00
Charl Wentzel
b900d735b9 Important update:
- Used new core protocol function to create command
- Bug fix: use correct sequence: From, To, Command
2017-07-08 22:39:32 +02:00
Charl Wentzel
4802452a7c Important Update:
- CLiteProtocol:
  - Set input string on methods to const char *
  - Simplify checking for verification
  - Ensure Length parameter can be left out on all methods
  - Add quick functions for structured commands: To, From, Command
- CLogCore:
  - Use only "\n", not "\r\n"
- SignalCore:
  - Use std::endl instead of "\r\n"
2017-07-08 22:23:50 +02:00
Charl Wentzel
0c20103c9c Merge branch 'master' of /home/development/source/core/redAcore into WatchdogCore 2017-07-05 18:21:27 +02:00
Charl Wentzel
d013078c1f Bug fixes:
- Remove LogStr var
- Create new Command Str before adding parameters
- Set Watchdog name correctly
2017-07-05 18:20:29 +02:00
Charl Wentzel
812677615d Merge branch 'master' of /home/development/source/core/redAcore into WatchdogCore 2017-07-05 17:20:13 +02:00
Charl Wentzel
b6a7969894 Merge branch 'master' of /home/development/source/core/redAcore into InterAfrica 2017-07-05 17:16:51 +02:00
Charl Wentzel
1b64fd17f9 Minor update:
- BufferCore:
  - Add Overwrite parameter for ReadFromFD
  - Bug fix: ReadFromFD MaxRead size
- SignalCore:
  - ProcessName is external pointer
2017-07-05 17:16:29 +02:00
Charl Wentzel
168253acbc Merge branch 'master' into WatchdogCore 2017-07-05 17:08:43 +02:00
Charl Wentzel
04edaf6e34 Major update:
- Add CWatchdogCore component.  Sends ping to watchdog server
2017-07-05 17:06:31 +02:00
Charl Wentzel
748b62d235 Important Update:
- SelectableCore:
  - Made GetType() & GetState() public methods
  - Update logs in Input()
- FunctionCore:
  - Add Input/OutputEnabled parameters with Get/Set methods.
  - Update logging in Input() and Output()
  - Check if input/output enabled in Input() and Output()
2017-07-05 10:59:24 +02:00
Charl Wentzel
c50d920f94 Important update:
- Log signals direct to StdErr if no Log instance
- Bug fix: ProcessName is external pointer, not literal
2017-07-01 12:07:34 +02:00
Charl Wentzel
706cd9caf6 Bug fix:
- Validate File Path and add '/' when saving JSON file
2017-06-22 17:21:28 +02:00
Charl Wentzel
9677052042 Important Update:
- Bug fix JSONparseCore: Allow for blank path in file name
- Added new Class LiteProtocolCore for basic protocol
2017-04-30 17:32:19 +02:00
Charl Wentzel
ee29625b9a Important update:
- DataTree->GetStr return Member->Value or NULL if not found
- Rename DeviceCore EDataType to EMBDataType, avoid conflict with JSONpaser
- Add DataTree to FunctionCore with LoadConfig() method
- Change ProcessName to char * (from char[])
- JSONparse:
  - Rename RootPath to BasePath on all methods to reduce confusion
  - Allow FilePath to be NULL, add '/' if not present
  - Fixed Parsing sequence in ParseObject & ParseArray
2017-04-10 21:33:14 +02:00
Charl Wentzel
9b42d516a1 Important Update:
- Implemented basic child element navigation:
  GetFirstChild(), GetNextChild(), GetIndexChild()
- Bug fix: Faulty name comparison using length
2017-04-06 06:56:03 +02:00
Charl Wentzel
23db2539d9 Important Update:
- Bug fix: Create wrong member name because not zero terminated
- Bug fix: Only create array element if brackets empty
2017-04-06 05:35:30 +02:00
Charl Wentzel
200f7e1f8b Important Update:
- Improve "printing" for JSON with single & multi line objects
- Fix bugs in getting, setting & creating array elements
- "array[]" allowed to create/add element at end of an array
- No longer duplicate get() path (reduce memory allocation)
  - added NameLen to TMember to eliminate zero-terminate requirement
- Fix ReadfromXXX() return values
2017-04-05 08:07:53 +02:00
Charl Wentzel
66fc4bc123 Important Update:
- Bug fix: incorrect memory allocation in SetValue()
- Implement conversion of escaped chars during parsing
- Implement escaping chars during printing
2017-04-03 21:48:29 +02:00
Charl Wentzel
2e2ba113f1 Major Update:
- Update printing: Do not use '\n' if indent = 0
- Implement refilling of buffer (from fd) while parsing
  - No longer use LineMark, but keep track of char position with CharNo
  - Use Mark to reference point for shifting buffer on refill
- SkipWhiteSpace no longer inline method
  - Refill buffer if required, change Mark & CharNo on line break
- CreateBuffer(), RefillBuffer() & FreeBuffer() now public methods
- Make Loading and Saving more flexible:
  - Refactor from LoadFromFile():
    ReadFromFile(), ReadFromHandle(), ReadFromBuffer()
  - Refactor from SaveToFile() & PrintToScreen:
    WriteToFile(), WriteToScreen, WriteToHandle()
2017-04-02 19:44:44 +02:00
Charl Wentzel
8f39adb0f3 Important update:
- Buffer:
  - fix undefined value: zero terminate buffer when loading from FD
- DataTree:
  - fix memory leak: destroy temporary search path
  - improve delete(): delete all children for member if no path given
  - bug fix: initiate object with 0 length (not -1)
- JSONparse:
  - Remove level parameter
  - Add path to load/save/print methods (print only portion of tree)
  - fix memory leak: destroy temporary object name
2017-03-29 21:27:28 +02:00
Charl Wentzel
5691b22df9 Minor Update:
- Pass printf Mask for Int/Float values on Get/Set methods
  - On GetValue use mask for default value
- Add SetArray() method
- Bug fix: Incorrect malloc size in SetValue()
- Bug fix: Len not calculated if -1 passed to SetValue()
- Set default value for Len = -1 on SetValue() methods
- Don't pass Len to SetValue() unless required
2017-03-27 04:29:11 +02:00
Charl Wentzel
a22f60b152 Major Update:
- Bug fix: BufferCore - set correct auto buffer size
- Change Get/Set methods to use BaseReference and full path instead of
    ParentPath and MemberName
- Add Create param to all Get methods (create if not found)
- Implement arrays & parsing of arrays
- Set CJSONparse as friend class to DataTree (access protected methods)
- Print JSON to screen
2017-03-26 22:26:52 +02:00
Charl Wentzel
b823bd7ea7 Important Update: (incomplete)
- Split CConfigCore into two classes:
  - DataTreeCore.h - Tree data structure and access
  - JSONparseCore.h - JSON parsing functionality
- Renamed TConfigParam struct to TDataMember
- Renamed most of CDataTreeCore methods
2017-03-23 20:53:32 +02:00
Charl Wentzel
ad4d8e8b5f Important update: (untested)
- Switch from FILE pointers to file descriptors (e.g. fopen() -> open())
- Replace internal buffer with CShiftBuffer
2017-03-23 13:21:21 +02:00
Charl Wentzel
5b4e6822c7 Bug fixes:
- Fixed bugs on CRollingBuffer and CShiftBuffer
  - Remove "virtual" from methods declarations
  - Correct validation checks on methods
  - Use memmove to shift data in ShiftBuffer
  - Initialise buffer in RollingBuffer
  - FindStr() -> Return start position of match
  - Fix incorrect params passed to Peek()/PeekCopy() in Pop()/PopCopy()
  - Fix endless lopp in RollingBuffer::Push()
2017-03-22 07:52:58 +02:00
Charl Wentzel
b5763d7f50 Major Update: (compiling but untested)
- Replace CBuffer with CRollingBuffer and CShiftBuffer
  ShiftBuffer is faster and simpler and always zero terminates
- Updated SelectableCore to use RollingBuffer
- Add Overwrite parameter to Push() and ReadFromFD() methods
- Add PeakDirect() method for fast direct access to buffer
2017-03-22 03:43:29 +02:00
Charl Wentzel
bb07ef63bf Important Update: (ConfigCore)
- Implemented full support for multi-layer objects
- Implemented RootObject for all other elements
- Added method CreateParam()
- Converted GetParam methods from inline to normal methods
- Added GetParent method
- Use Object->Len to count no of child objects
2017-03-18 23:03:51 +02:00
Charl Wentzel
508cf0fb0d Important Update: (incomplete)
- Implemented JSON type NULL
- Implement dynamic buffer
- Split parsing int separate re-usable methods
- Implement basic parsing of an object
- Add GetError() method
- Add SkipWhiteSpace as inline method
- Make parsing variable private attributes
- Improve checking when getting parameters
2017-03-15 04:29:01 +02:00
Charl Wentzel
9b180c77f5 Important Update:
- Added new Class: ConfigCore (Working but incomplete)
  - Provides basic parameter listing (bool, int, float, string)
  - Read/writes parameters from/to file
  - Support JSON format for key-value pair primitive and strings values
  - Support for objects and arrays to follow
2017-03-08 04:05:26 +02:00
Charl Wentzel
f57b340be6 Merge branch 'master' of /home/development/source/core/redAcore into BaslerCamera 2017-03-04 22:08:56 +02:00
Charl Wentzel
9c338715db Merge branch 'master' into JoaneControl 2017-03-04 21:51:42 +02:00
Charl Wentzel
e50ef57b47 gMerge branch 'JoaneTelemetry' 2017-03-04 21:44:53 +02:00
Charl Wentzel
ae95602f64 Important update:
- Bug fix: make DateTimeCore functions linkable by using it in CLogCore
- CLogCore:
  - Rename FileOutput -> OutputFile
  - Add DateTimeStr to Output if FileNo > 3
2017-03-04 21:44:39 +02:00
Charl Wentzel
e35ba3f024 Merge branch 'JoaneTelemetry' 2017-03-03 18:20:25 +02:00
Charl Wentzel
02b43fe6b8 Important update:
- Add new DateTimeCore file
- Provides functions to get/set system date
- Create Date, Time and Date/Time string with custom separators
2017-03-03 18:00:44 +02:00
Charl Wentzel
2d9faa7fa6 Important Update:
- Add GetValue/SetValue commands for Device command interface
- Bug fix: use case compare on searches
2017-03-02 12:31:50 +02:00
Charl Wentzel
92db4da7de Importnant update:
- Add callback functions for change in socket states
2017-02-16 03:12:18 +02:00
Charl Wentzel
d4ee138da8 Update in progress:
- Started work on Set/Get commands for DeviceCore
2017-02-16 03:02:18 +02:00
Charl Wentzel
6d810e33ba Merge branch 'JoaneControl'
- additions for pipe control
- correction to display signed parameters correctly
2017-02-08 08:45:59 +02:00
Charl Wentzel
5c2d7d4b51 Bug fix:
- Display signed parameters correctly
2017-02-08 08:44:30 +02:00
Charl Wentzel
c2acb4b77d Minor updates:
- CSelectableCore:
  - Allow ForkPipeHandle to change ExecPath
  - Remove parent/child process test comments
  - Move FD operations methods from private -> public
2016-10-24 17:53:50 +02:00
Charl Wentzel
47577e9f4c Major Updated:
- Added new CDeviceCore Class
  - Methods and structures moved from CModbusInterface
  - Keep track of Devices and DeviceParameters
  - Provides methods & parameters related to polling process
  - Provides parameter events
2016-09-07 08:49:58 +02:00
Charl Wentzel
7564e6a288 Major update:
- Rename Function LocalIO -> Channel (Parameters & Methods)
2016-08-23 13:19:43 +02:00
Charl Wentzel
5ea05d119e Major update:
- Logging
  - Created LogCore Class
  - Updated LogCore to use file descriptors instead of stdout
  - Add Log object reference to constructors for:
    FunctionCore, SelectCore
  - Use extern Log() object in SignalCore
- SelectableCore
  - Added new connection type: ForkedPipe
    Create pipe, fork process, connect pipe out to child stdin, exec
2016-08-22 12:14:53 +02:00
Charl Wentzel
eaace97ec9 Minor Update:
- BufferCore:
  - Method WriteToFD should ignore EAGAIN
- LogCore:
  - Add OUT_COUNT output bit (show total output bytes)
- SelectableCore:
  - Add Force param on WriteToFD, ignore EAGAIN if !Force
2016-07-27 13:42:50 +02:00
Charl Wentzel
1a9f825b25 Major Update:
- Minor fix: Set correct names in comments at top of file
- New FileCore Class:
  - Writing data to output file
- BufferCore:
  - Check for "EAGAIN" on write and retry write
- FunctionCore:
  - Add new Output method that references LocalIO directly
- SelectableCore:
  - New method SetAutomanage to specify auto re-open parameters
  - Re-open timer implemented to slow re-open events
  - Only call ProcessBuffer() if data received on socket
  - Force processing input data when no input marker set
  - Use new Output method to simplify code
  - Bug fix: Read correctly from buffer on multiple reads/writes on FD
  - Check for "EAGAIN" on write to FD and retry write
2016-07-20 09:37:25 +02:00