pepperdash/Essentials
1
0
Fork 0
mirror of https://github.com/PepperDash/Essentials.git synced 2026-04-12 12:06:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'bugfix/ecs-1252' into local/BuildBetaBaml

Browse source
This commit is contained in:
Trevor Payne 2020-01-31 11:18:33 -06:00
commit d2b8d38000
4 changed files with 31 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
PepperDashEssentials/Bridges/C2nRthsControllerBridge.cs
View file

@ -23,6 +23,13 @@ namespace PepperDash.Essentials.Bridges
Debug.Console(1, device, "Linking to Trilist '{0}'", triList.ID.ToString("X")); Debug.Console(1, device, "Linking to Trilist '{0}'", triList.ID.ToString("X"));
triList.SetBoolSigAction(joinMap.TemperatureFormat, device.SetTemperatureFormat); triList.SetBoolSigAction(joinMap.TemperatureFormat, device.SetTemperatureFormat);
device.TemperatureFeedback.LinkInputSig(triList.UShortInput[joinMap.Temperature]);
device.HumidityFeedback.LinkInputSig(triList.UShortInput[joinMap.Temperature]);
triList.StringInput[joinMap.Name].StringValue = device.Name;
} }
} }

4
PepperDashEssentials/Bridges/JoinMaps/C2nRthsControllerJoinMap.cs
View file

@ -7,6 +7,7 @@ namespace PepperDash.Essentials.Bridges
public class C2nRthsControllerJoinMap:JoinMapBase public class C2nRthsControllerJoinMap:JoinMapBase
{ {
public uint IsOnline { get; set; } public uint IsOnline { get; set; }
public uint Name { get; set; }
public uint Temperature { get; set; } public uint Temperature { get; set; }
public uint Humidity { get; set; } public uint Humidity { get; set; }
public uint TemperatureFormat { get; set; } public uint TemperatureFormat { get; set; }
@ -21,6 +22,9 @@ namespace PepperDash.Essentials.Bridges
Temperature = 2; Temperature = 2;
Humidity = 3; Humidity = 3;
//serial
Name = 1;
OffsetJoinNumbers(joinStart); OffsetJoinNumbers(joinStart);
} }

5
PepperDashEssentials/Bridges/JoinMaps/StatusSignControllerJoinMap.cs
View file

@ -7,6 +7,7 @@ namespace PepperDash.Essentials.Bridges
public class StatusSignControllerJoinMap:JoinMapBase public class StatusSignControllerJoinMap:JoinMapBase
{ {
public uint IsOnline { get; set; } public uint IsOnline { get; set; }
public uint Name { get; set; }
public uint RedLed { get; set; } public uint RedLed { get; set; }
public uint GreenLed { get; set; } public uint GreenLed { get; set; }
public uint BlueLed { get; set; } public uint BlueLed { get; set; }
@ -27,6 +28,10 @@ namespace PepperDash.Essentials.Bridges
GreenLed = 3; GreenLed = 3;
BlueLed = 4; BlueLed = 4;
//string
Name = 1;
OffsetJoinNumbers(joinStart); OffsetJoinNumbers(joinStart);
} }

11
PepperDashEssentials/Bridges/StatusSignControllerBridge.cs
View file

@ -29,6 +29,17 @@ namespace PepperDash.Essentials.Bridges
trilist.SetUShortSigAction(joinMap.RedLed, u => SetColor(trilist, joinMap, ssDevice)); trilist.SetUShortSigAction(joinMap.RedLed, u => SetColor(trilist, joinMap, ssDevice));
trilist.SetUShortSigAction(joinMap.GreenLed, u => SetColor(trilist, joinMap, ssDevice)); trilist.SetUShortSigAction(joinMap.GreenLed, u => SetColor(trilist, joinMap, ssDevice));
trilist.SetUShortSigAction(joinMap.BlueLed, u => SetColor(trilist, joinMap, ssDevice)); trilist.SetUShortSigAction(joinMap.BlueLed, u => SetColor(trilist, joinMap, ssDevice));
trilist.StringInput[joinMap.Name].StringValue = ssDevice.Name;
ssDevice.RedLedEnabledFeedback.LinkInputSig(trilist.BooleanInput[joinMap.RedControl]);
ssDevice.BlueLedEnabledFeedback.LinkInputSig(trilist.BooleanInput[joinMap.BlueControl]);
ssDevice.GreenLedEnabledFeedback.LinkInputSig(trilist.BooleanInput[joinMap.GreenControl]);
ssDevice.RedLedBrightnessFeedback.LinkInputSig(trilist.UShortInput[joinMap.RedLed]);
ssDevice.BlueLedBrightnessFeedback.LinkInputSig(trilist.UShortInput[joinMap.BlueLed]);
ssDevice.GreenLedBrightnessFeedback.LinkInputSig(trilist.UShortInput[joinMap.GreenLed]);
} }
private static void EnableControl(BasicTriList triList, StatusSignControllerJoinMap joinMap, private static void EnableControl(BasicTriList triList, StatusSignControllerJoinMap joinMap,