pepperdash/Essentials
1
0
Fork 0
mirror of https://github.com/PepperDash/Essentials.git synced 2026-02-16 21:24:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Post-merge 344, compile and warning cleanup

Browse Source
This commit is contained in:
Heath Volmer
2018-01-26 09:46:53 -07:00
parent 29c60548cc
commit 19284b171a
4 changed files with 182 additions and 190 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Essentials Devices Common/Essentials Devices Common/Factory/DeviceFactory.cs
View File

@@ -299,7 +299,6 @@ namespace PepperDash.Essentials.Devices.Common
{ {
var comm = CommFactory.GetControlPropertiesConfig(dc); var comm = CommFactory.GetControlPropertiesConfig(dc);
uint id = 0x00;
GlsOccupancySensorBase occSensor = null; GlsOccupancySensorBase occSensor = null;
occSensor = new GlsOirCCn(comm.CresnetIdInt, Global.ControlSystem); occSensor = new GlsOirCCn(comm.CresnetIdInt, Global.ControlSystem);
@@ -314,7 +313,6 @@ namespace PepperDash.Essentials.Devices.Common
{ {
var comm = CommFactory.GetControlPropertiesConfig(dc); var comm = CommFactory.GetControlPropertiesConfig(dc);
uint id = 0x00;
GlsOccupancySensorBase occSensor = null; GlsOccupancySensorBase occSensor = null;
occSensor = new GlsOdtCCn(comm.CresnetIdInt, Global.ControlSystem); occSensor = new GlsOdtCCn(comm.CresnetIdInt, Global.ControlSystem);

9
Essentials/PepperDashEssentials/Room/Cotija/CotijaSystemController.cs
View File

@@ -200,7 +200,7 @@ namespace PepperDash.Essentials
request.Header.SetHeaderValue("Content-Type", "application/json"); request.Header.SetHeaderValue("Content-Type", "application/json");
request.ContentString = postBody; request.ContentString = postBody;
Client.DispatchAsync(request, PostConnectionCallback); var err = Client.DispatchAsync(request, PostConnectionCallback);
} }
} }
@@ -316,6 +316,7 @@ namespace PepperDash.Essentials
/// <param name="err"></param> /// <param name="err"></param>
void PostConnectionCallback(HttpClientResponse resp, HTTP_CALLBACK_ERROR err) void PostConnectionCallback(HttpClientResponse resp, HTTP_CALLBACK_ERROR err)
{ {
Debug.Console(1, this, "PostConnectionCallback err: {0}", err);
try try
{ {
if (resp != null && resp.Code == 200) if (resp != null && resp.Code == 200)
@@ -326,11 +327,7 @@ namespace PepperDash.Essentials
ServerReconnectTimer = null; ServerReconnectTimer = null;
} }
#warning The SSE Client from a previous session might need to be killed... ConnectSseClient(null);
//if (SseClient == null)
//{
ConnectSseClient(null);
//}
} }
else else
{ {

3
Essentials/PepperDashEssentials/UIDrivers/VC/EssentialsVideoCodecUiDriver.cs
View File

@@ -79,9 +79,6 @@ namespace PepperDash.Essentials.UIDrivers.VC
StringBuilder SearchStringBuilder = new StringBuilder(); StringBuilder SearchStringBuilder = new StringBuilder();
BoolFeedback SearchStringBackspaceVisibleFeedback; BoolFeedback SearchStringBackspaceVisibleFeedback;
#warning WHAT THE HELL happened to this?????
BoolFeedback LayoutButtonEnableFeedback;
ModalDialog IncomingCallModal; ModalDialog IncomingCallModal;
eKeypadMode KeypadMode; eKeypadMode KeypadMode;