diff --git a/Modbus.Net/CrossLampControl.WebApi/Controllers/CrossLampController.cs b/Modbus.Net/CrossLampControl.WebApi/Controllers/CrossLampController.cs index cdbf1ab..21921e9 100644 --- a/Modbus.Net/CrossLampControl.WebApi/Controllers/CrossLampController.cs +++ b/Modbus.Net/CrossLampControl.WebApi/Controllers/CrossLampController.cs @@ -4,6 +4,7 @@ using System.Linq; using System.Net; using System.Net.Http; using System.Web.Http; +using System.Web.Http.Routing; using CrossLampControl.WebApi.Models; using ModBus.Net; @@ -41,7 +42,9 @@ namespace CrossLampControl.WebApi.Controllers { light.SubLamp = LightLamp.Red.ToString(); } + light.SetStart(lamps[6]); return light; } + } } diff --git a/Modbus.Net/CrossLampControl.WebApi/Models/Lamp.cs b/Modbus.Net/CrossLampControl.WebApi/Models/Lamp.cs index 23c7a32..f7222c3 100644 --- a/Modbus.Net/CrossLampControl.WebApi/Models/Lamp.cs +++ b/Modbus.Net/CrossLampControl.WebApi/Models/Lamp.cs @@ -10,6 +10,7 @@ namespace CrossLampControl.WebApi.Models { public string MainLamp { get; set; } public string SubLamp { get; set; } + public string StartPause { get; set; } public Lamp() { @@ -17,10 +18,15 @@ namespace CrossLampControl.WebApi.Models SubLamp = LightLamp.Red.ToString(); } - public Lamp(LightLamp mLamp, LightLamp sLamp) + public void SetLamp(LightLamp mLamp, LightLamp sLamp) { MainLamp = mLamp.ToString(); SubLamp = sLamp.ToString(); } + + public void SetStart(bool isStart) + { + StartPause = isStart ? "Start" : "Pause"; + } } } \ No newline at end of file diff --git a/Modbus.Net/CrossLampControl.WebApi/Scripts/_references.js b/Modbus.Net/CrossLampControl.WebApi/Scripts/_references.js index 518a959..cafa52a 100644 Binary files a/Modbus.Net/CrossLampControl.WebApi/Scripts/_references.js and b/Modbus.Net/CrossLampControl.WebApi/Scripts/_references.js differ