161 Commits

Author SHA1 Message Date
Neil Dorin
e94f860b6e Merged in maintenance/PR-17 (pull request #17)
Maintenance/PR-17

Approved-by: Neil Dorin <ndorin@pepperdash.com>
1.0.22
2019-06-12 18:11:29 +00:00
Neil Dorin
3d270499ba Incremented Assembly version to 1.0.22. Set build option to generate .xml file. Added .xml file to CLZ Builds folder as well as compiled output 2019-06-12 12:10:45 -06:00
Neil Dorin
763a11da7d Merge remote-tracking branch 'origin/development' into HEAD 2019-06-12 12:01:07 -06:00
Jason DeVito
f835a20dee Merged in feature/json2.4.1 (pull request #15)
Feature/json2.4.1

Approved-by: Neil Dorin <ndorin@pepperdash.com>
2019-06-12 17:58:48 +00:00
Joshua Gutenplan
fcc1ef3d1d add same updates to secure tcp client for server. Moves on ready to fire on connect call back and makes sure that first message fires text received when shared key not enabled. 2019-06-10 02:23:34 -07:00
Joshua Gutenplan
229723b50f Moved on ready to call on connect callback if shared key not required and connected. Moved text received event to else to get called on first message if shared key is off 2019-06-10 02:07:00 -07:00
Joshua Gutenplan
8362197030 Updated to add check for heartbeat enabled before setting a SendOrReceiveTimeOutInMs. Used find to find all refs of that prop being set and added check for heartbeat enable. 2019-06-06 15:05:01 -07:00
Jason DeVito
2b79071bd8 Updates to json2.4.1 to resolve issues with reading nested array objects 2019-06-03 13:30:13 -05:00
Heath Volmer
40b8ae6219 Changed Array module Initialize to InitializeWithAppend 2019-05-29 08:15:31 -06:00
Heath Volmer
ef489ab48e Added AppendToPathPrefix to JSON array modules, to facilitate array lookup modules chained together; corresponds to 2.4.1 modules 2019-05-28 16:48:57 -06:00
Neil Dorin
bdf32e2c14 Merged in maintenance/PR-1 (pull request #14)
Maintenance/PR-1

Approved-by: Neil Dorin <ndorin@pepperdash.com>
2019-05-23 20:17:52 +00:00
Neil Dorin
1968f8b96e Updates CLZ Builds for release 2019-05-23 14:14:37 -06:00
Neil Dorin
0cf77f1c51 Merge remote-tracking branch 'origin/development' into maintenance/PR-1
# Conflicts:
#	Pepperdash Core/Pepperdash Core/Properties/AssemblyInfo.cs
2019-05-23 14:10:26 -06:00
Neil Dorin
27940027ad Merge remote-tracking branch 'origin/feature/PDC-9_ReceivedDataAsyncCallbackFixes' into maintenance/PR-1
# Conflicts:
#	Pepperdash Core/Pepperdash Core/Properties/AssemblyInfo.cs
2019-05-23 14:08:37 -06:00
Neil Dorin
7208f4dc80 Updated Assembly version to 1.0.20. 2019-05-23 14:06:43 -06:00
Neil Dorin
cf7eb37ac5 Merged in feature/pdc-11 (pull request #13)
Adds revision number to PepperDashCoreVersion string.

Approved-by: Neil Dorin <ndorin@pepperdash.com>
2019-05-23 15:16:48 +00:00
Neil Dorin
1a17843399 Adds revision number to PepperDashCoreVersion string. 2019-05-23 09:15:23 -06:00
Jason T Alborough
03e42cdb5b # PDC-9_ReceivedDataAsync
- Fixes the ReceivedDataAsyncCallback on GenericTcpServer and GenericSecureTcpServer per internal code review.
2019-05-21 16:20:30 -04:00
Trevor Payne
44f085d6dd Merged in feature/pdc-8 (pull request #11)
pdc-8 : Added PepperDashVersion property to Debug Class
2019-05-16 20:08:32 +00:00
Trevor Payne
0f19d22fdc Added .dll and .clz to builds folder 2019-05-16 15:07:23 -05:00
Trevor Payne
87e8223d35 pdc-8 : Added PepperDashVersion property to Debug Class 1.0.18 2019-05-16 15:00:58 -05:00
Neil Dorin
6441e9ca6e Merged in bugfix/pdc-7 (pull request #10)
Bugfix/pdc 7

Approved-by: Neil Dorin <ndorin@pepperdash.com>
2019-05-16 18:31:22 +00:00
Neil Dorin
f330cc0f5a Minor adjustment to event registration for SocketStatusChange 2019-05-16 11:44:09 -06:00
Neil Dorin
4aded28792 Resolves both bugfix pdc-6 and pdc-7 2019-05-16 10:53:15 -06:00
Neil Dorin
ada6090b43 Resoves bug where on program stop event, GenericSshClient was only calling Client.Disconnect() instead of its own Disconnect() methods which disconnects the client and also prevents auto reconnect attempts. 2019-05-07 16:50:36 -06:00
Jason T Alborough
b3a003352e # PDC-5 AddQueueToGenericUdpServer
- Removed the Finally statement. Using finally caused a null refence exception for the CCriticalSection object at shutdown.
2019-04-25 08:32:46 -04:00
Neil Dorin
9e76a817fc Added additional inline comments for clarity 2019-04-24 11:30:58 -06:00
Neil Dorin
860118b3c6 Updated Assembly Version to 1.0.17 2019-04-24 11:21:13 -06:00
Neil Dorin
47b0399e3a Reworks dequeueing and CCriticalSection usage to ensure proper threading behavoir. 2019-04-24 11:16:57 -06:00
Jason T Alborough
54324d7e43 # GenericUdpServer
- Adds an event GenericUdpReceiveTextExtraArgs which has args that include TextRx, BytesRx, IpAddressRecivedFrom, PortRecievedFrom
- Removes the getter property for LastMessageReceivedFrom
2019-04-22 10:30:39 -04:00
Jason T Alborough
73b9cd8c31 Adds a getter in GenericUdpServer for the UdpServer property IPAddressLastMessageReceivedFrom 2019-04-19 11:31:59 -04:00
Neil Dorin
2bf12027b5 Merged in feature/pdc-4 (pull request #7)
Feature/pdc 4
v1.0.16.20061
2019-04-03 20:17:39 +00:00
Neil Dorin
c479ac185b Updated CLZ Builds 2019-04-03 14:08:36 -06:00
Neil Dorin
b693c1850a Adds feature to print to console and log the Assembly version of the library on program start, for debug and reference purposes. 2019-04-03 14:02:34 -06:00
Neil Dorin
295f73756c Merged in bugfiix/pdc-3 (pull request #6)
Bugfiix/pdc 3

Approved-by: Neil Dorin <ndorin@pepperdash.com>
Approved-by: Heath Volmer <hvolmer@pepperdash.com>
v1.0.15.26179
2019-04-02 21:43:47 +00:00
Neil Dorin
242ef010de Updates the CLZ Builds 2019-04-02 15:41:49 -06:00
Neil Dorin
1bd0d2df9c Attempts to resolve exception thrown from inside CrestronLogger.Initialize() that occurs when RM is present, but cannot be accessed for some reason. 2019-04-02 15:38:05 -06:00
Neil Dorin
d075f56b2a Update to attempt to resolve issue with intitializing Crestron Logger if RM is not present. 2019-04-02 13:10:38 -06:00
Neil Dorin
51971f601e Updated CLZ Builds to latest 2019-04-01 16:24:37 -06:00
Neil Dorin
c723545dc6 Merge remote-tracking branch 'origin/release' into bugfiix/pdc-3
# Conflicts:
#	Pepperdash Core/Pepperdash Core/Properties/AssemblyInfo.cs
2019-04-01 16:19:28 -06:00
Neil Dorin
5b1f1e683f Updates merge methods to handle unkeyed arrays by replacing the template array with the system array 2019-04-01 16:18:29 -06:00
Joshua Gutenplan
b919adba3b Merged in bugfix/GenericServers (pull request #5)
Bugfix/GenericServers
2019-02-25 18:46:12 +00:00
Jason T Alborough
46c71d8f70 Changes GenericTCPServer to use Non Secure TCPServer Classes. 2019-02-20 11:30:32 -05:00
Joshua Gutenplan
0d124ef93b Updated clz and dll and tag to v1.14.27867 v1.0.14.27867 2019-02-18 15:52:35 -08:00
Joshua Gutenplan
b3203cf961 updated the secure and non secure servers and added clients that are meant to be used with our server classes. The clients add the shared key and other stability features when we manage the server. 2019-02-18 15:49:45 -08:00
Heath Volmer
79b9059f1b Merged in bugfix/json-merge-arrays (pull request #4)
Bugfix/json merge arrays
2019-02-12 20:06:14 +00:00
Heath Volmer
e5efbdec5e v1.0.13; clz builds; touchups v1.0.13 2019-02-12 12:50:16 -07:00
Heath Volmer
255095ee7f Added step to merge arrays on key property; try/catch in merge with some additional path debugging 2019-02-12 12:26:34 -07:00
Heath Volmer
d22c4f08f0 Merge branch 'development' into bugfix/pdc-2 2019-02-12 09:58:35 -07:00
Neil Dorin
c58a2633de Added missing third constuctor to EventArgs classes for JsonToSimpl 2019-02-07 14:21:48 -07:00