diff --git a/PepperDashEssentials/Bridges/C2nRthsControllerBridge.cs b/PepperDashEssentials/Bridges/C2nRthsControllerBridge.cs index a29512dd..a479797b 100644 --- a/PepperDashEssentials/Bridges/C2nRthsControllerBridge.cs +++ b/PepperDashEssentials/Bridges/C2nRthsControllerBridge.cs @@ -22,7 +22,14 @@ namespace PepperDash.Essentials.Bridges 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; + + } } diff --git a/PepperDashEssentials/Bridges/JoinMaps/C2nRthsControllerJoinMap.cs b/PepperDashEssentials/Bridges/JoinMaps/C2nRthsControllerJoinMap.cs index 76d99edb..00e6112a 100644 --- a/PepperDashEssentials/Bridges/JoinMaps/C2nRthsControllerJoinMap.cs +++ b/PepperDashEssentials/Bridges/JoinMaps/C2nRthsControllerJoinMap.cs @@ -6,7 +6,8 @@ namespace PepperDash.Essentials.Bridges { 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 Humidity { get; set; } public uint TemperatureFormat { get; set; } @@ -21,6 +22,9 @@ namespace PepperDash.Essentials.Bridges Temperature = 2; Humidity = 3; + //serial + Name = 1; + OffsetJoinNumbers(joinStart); } diff --git a/PepperDashEssentials/Bridges/JoinMaps/StatusSignControllerJoinMap.cs b/PepperDashEssentials/Bridges/JoinMaps/StatusSignControllerJoinMap.cs index 80e1dcef..933f6f74 100644 --- a/PepperDashEssentials/Bridges/JoinMaps/StatusSignControllerJoinMap.cs +++ b/PepperDashEssentials/Bridges/JoinMaps/StatusSignControllerJoinMap.cs @@ -6,7 +6,8 @@ namespace PepperDash.Essentials.Bridges { 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 GreenLed { get; set; } public uint BlueLed { get; set; } @@ -27,6 +28,10 @@ namespace PepperDash.Essentials.Bridges GreenLed = 3; BlueLed = 4; + //string + Name = 1; + + OffsetJoinNumbers(joinStart); } diff --git a/PepperDashEssentials/Bridges/StatusSignControllerBridge.cs b/PepperDashEssentials/Bridges/StatusSignControllerBridge.cs index 8d977467..7c0bab9e 100644 --- a/PepperDashEssentials/Bridges/StatusSignControllerBridge.cs +++ b/PepperDashEssentials/Bridges/StatusSignControllerBridge.cs @@ -28,7 +28,18 @@ namespace PepperDash.Essentials.Bridges trilist.SetUShortSigAction(joinMap.RedLed, 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,