Andrew Welker
436db82006
fix weird merge conflicts
2020-08-26 14:49:11 -06:00
Andrew Welker
5938869e7a
fix show & hide methods
2020-08-26 14:26:59 -06:00
Andrew Welker
4bad8585e5
add null check to popup handler method
2020-08-26 14:24:20 -06:00
Andrew Welker
5e74eaf3f2
Merge branch 'main' into release/1.6.2
2020-08-25 12:05:41 -06:00
Trevor Payne
4d53e6b33e
Resolves #16
...
Changed some error messages to notices in LoadRooms() to make them a little less spooky
2020-08-19 17:07:11 -05:00
Andrew Welker
25fccbd095
Merge branch 'development' into bugfix/ScreenSaver-Never-Starts
2020-08-19 17:11:54 -04:00
Neil Dorin
c9fce06bd7
Updates necessary to make screen saver disappear on incoming call
2020-08-19 14:53:47 -06:00
Andrew Welker
a2fc1b9f40
make essentials use nuget instead of submodule
2020-08-18 17:01:51 -06:00
Trevor Payne
f5410c0786
Merge branch 'development' into bugfix/ScreenSaver-Never-Starts
2020-08-18 16:27:09 -05:00
Trevor Payne
182499a79b
Merge branch 'development' into bugfix/ScreenSaver-Never-Starts
2020-08-18 15:35:18 -05:00
Trevor Payne
6e148e7d62
Resolves #378
...
Fixed improperly set up device extender
2020-08-18 15:30:58 -05:00
Andrew Welker
6a31504cf8
Merge branch 'development' into bugfix/SystemMonitor-IndexOutOfRange
2020-08-18 15:42:56 -04:00
Andrew Welker
d6fd9517f0
Revert "Update docker build image to use Crestron DB 200.00.004.00 & Device DB 200.00.015.00"
2020-08-18 13:06:18 -06:00
Andrew Welker
4ad966d909
back to main image
2020-08-18 12:20:31 -06:00
Trevor Payne
95fb6cc204
Merge branch 'development' into bugfix/SystemMonitor-IndexOutOfRange
2020-08-18 11:38:27 -05:00
Trevor Payne
3325d81cab
Merge branch 'development' into bugfix/SystemMonitor-IndexOutOfRange
2020-08-18 10:55:07 -05:00
Trevor Payne
951da716a6
Added try/catch to ParseUptime with a way to view what was being parsed
...
Testing for #368
2020-08-18 10:18:49 -05:00
Jason Alborough
67f0ae92ef
Adds null check before running RunRouteAction event in Cisco Spark class.
...
Fixes spelling error and other minor cleanup.
2020-08-18 10:00:53 -04:00
Jason Alborough
4e2683f8fc
Removes ToDo's
2020-08-17 14:57:33 -04:00
Jason Alborough
f0d10fb1f9
Finalized IHasExternalSourceSwitching adding method for setting the ExternalSource State
...
Adds arguments for External Source type it the AddExternalSource()
Adds subscription and parsing for External Source events
2020-08-17 14:52:49 -04:00
Jason Alborough
aea6942a1f
Update to support Cisco Codec External Sources using Essentials Room logic.
...
Adds new interface for Codecs IHasExternalSourceSwitching
Adds ability to set and clear External Sources in Cisco Spark device class
Adds ability to send sources from the source list to the Cisco Spark in the "EssentialsHuddleVtc1Room" room
[ ] still needs parsing when source is selected on the Cisco touch 10
2020-08-14 15:51:37 -04:00
Neil Dorin
302603aa54
Updates to phone and video address logic
2020-08-07 09:29:55 -06:00
Neil Dorin
dea858e187
Updates to phone and video address logic
2020-08-07 09:11:31 -06:00
Neil Dorin
ddbee2ed04
Fixed incorrect join for dark background logo. Updates CodecInfo class to correclty poppulate values
2020-08-07 08:56:29 -06:00
Neil Dorin
b7c9677c7a
Updates to finesse screen saver and get phone/video number display working correclty
2020-08-06 22:04:07 -06:00
Neil Dorin
d6581cab2e
Updates to work out kinks
2020-08-06 21:16:03 -06:00
Neil Dorin
66c481e3dc
Seems to work except dynamic graphics for logos and QR code
2020-08-06 19:46:12 -06:00
Neil Dorin
edd01785d5
Adds ability to get URL for both light and dark logo options
2020-08-06 18:07:23 -06:00
Neil Dorin
192aa4255c
Adds ability for dark logo option
2020-08-06 15:20:24 -06:00
Neil Dorin
f59654d75e
working on #109 to add QR support for TSW panels
2020-08-06 13:56:42 -06:00
Neil Dorin
0b485d8d96
Revert "Merge branch 'release/1.6.0' into hotfix/cisco-large-directory-issues"
...
This reverts commit 1d42d88c3f , reversing
changes made to ec0b2fa181 .
2020-08-05 11:58:41 -06:00
Andrew Welker
dbafce0aa8
fix RunRouteAction methods
2020-07-29 14:42:26 -06:00
Andrew Welker
03cf6ffd60
change to allow console messages to print when debugging
2020-07-22 16:31:50 -06:00
Andrew Welker
97e0b732d0
Merge branch 'development' into feature/nuget-additions
2020-07-22 15:58:52 -06:00
Andrew Welker
49edaa33ac
updates for nuget
2020-07-22 15:27:57 -06:00
Andrew Welker
91aa304990
fix namespace issue
2020-07-14 11:50:09 -06:00
Andrew Welker
6aad15c452
fix device factory
2020-07-14 11:19:03 -06:00
Andrew Welker
c43fdc156d
Merge branch 'development' into feature/remove-mobile-control
2020-07-14 10:53:31 -06:00
Andrew Welker
2767bccb2c
Merge branch 'development' into hotfix/bridge-registration
2020-07-08 11:33:20 -07:00
Andrew Welker
99e2dd1ff4
Merge branch 'development' into hotfix/program-initialization
2020-07-08 11:13:07 -07:00
Andrew Welker
38d6200409
Log error and notices when necessary
2020-07-08 12:06:40 -06:00
Andrew Welker
e8d42b701e
Updated logging to write to ErrorLog as well
2020-07-08 12:00:18 -06:00
Andrew Welker
0686e9d054
Merge branch 'main' into hotfix/bridge-registration
2020-07-08 11:59:21 -06:00
Andrew Welker
a1ee157ab8
add debug statement for catching EISC registration result.
2020-07-08 11:47:36 -06:00
Andrew Welker
b1befeb32d
Add program init complete logic
2020-07-08 11:38:09 -06:00
Andrew Welker
615c0d1545
move EISC registration
2020-07-07 13:25:26 -06:00
Andrew Welker
76033f53fc
Changes Debug statement level
2020-07-06 13:48:52 -06:00
Trevor Payne
e705d2191a
Moved Occupancy Sensors into PepperDash.Essentials.Core
...
Resolves #298
2020-07-01 19:30:45 -05:00
Jason DeVito
e1c93cc13a
Updates to correct 'hardware' references accidentally changed to 'sensor'. Updated SIMPLBridge example config to include GLS-PART-CN configuration
...
Resolves #270
2020-06-30 12:03:48 -05:00
Andrew Welker
7f8d4d94d0
update path to library
2020-06-21 13:57:47 -06:00