add some LG actions, fix IP address edit box

Maassoft · Sep 26, 2021 · e1800b8 · e1800b8
1 parent 7779533
commit e1800b8
Show file tree

Hide file tree

Showing 8 changed files with 47 additions and 11 deletions.
diff --git a/ColorControl/ColorControl.csproj b/ColorControl/ColorControl.csproj
@@ -27,7 +27,7 @@
     <ProductName>ColorControl</ProductName>
     <PublisherName>Maassoft</PublisherName>
     <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>4.4.0.0</ApplicationVersion>
+    <ApplicationVersion>4.5.0.0</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <PublishWizardCompleted>true</PublishWizardCompleted>
     <BootstrapperEnabled>true</BootstrapperEnabled>

diff --git a/ColorControl/LgDevice.cs b/ColorControl/LgDevice.cs
@@ -123,6 +123,12 @@ public LgDevice(string name, string ipAddress, string macAddress, bool isCustom
             AddGenericPictureAction("gameOptimizationHDMI2", typeof(OffToOn), category: "other");
             AddGenericPictureAction("gameOptimizationHDMI3", typeof(OffToOn), category: "other");
             AddGenericPictureAction("gameOptimizationHDMI4", typeof(OffToOn), category: "other");
+            //AddGenericPictureAction("freesyncOLEDHDMI4", typeof(OffToOn), category: "other");
+            //AddGenericPictureAction("freesyncSupport", typeof(OffToOn), category: "other");
+            AddGenericPictureAction("hdmiPcMode_hdmi1", typeof(FalseToTrue), category: "other");
+            AddGenericPictureAction("hdmiPcMode_hdmi2", typeof(FalseToTrue), category: "other");
+            AddGenericPictureAction("hdmiPcMode_hdmi3", typeof(FalseToTrue), category: "other");
+            AddGenericPictureAction("hdmiPcMode_hdmi4", typeof(FalseToTrue), category: "other");
             AddGenericPictureAction("adjustingLuminance", minValue: -50, maxValue: 50);
             AddInvokableAction("turnScreenOff", new Func<Dictionary<string, object>, bool>(TurnScreenOffAction));
             AddInvokableAction("turnScreenOn", new Func<Dictionary<string, object>, bool>(TurnScreenOnAction));
@@ -321,6 +327,12 @@ public async Task<bool> ExecutePreset(LgPreset preset, bool reconnect, LgService
                         {
                             @params = new { mode = "user", flagUpdate = true };
                         }
+
+                        if (preset.appId.Equals("com.webos.app.factorywin"))
+                        {
+                            @params = new { id = "executeFactory", irKey = "inStart" };
+                        }
+
                         await _lgTvApi.LaunchApp(preset.appId, @params);
                     }
                     catch (Exception ex)

diff --git a/ColorControl/LgService.cs b/ColorControl/LgService.cs
@@ -64,6 +64,7 @@ public LgDevice SelectedDevice
         private int _poweredOffByScreenSaverProcessId;
         private Task _monitorTask;
         private int _monitorTaskCounter;
+        private LgPreset _lastTriggeredPreset;
 
         public LgService(string dataPath, bool allowPowerOn) : base(dataPath, "LgPresets.json")
         {
@@ -781,9 +782,11 @@ private async Task ExecuteProcessPresets(ProcessMonitorContext context)
                     toApplyPreset = toApplyPresets.First();
                 }
 
-                if (_lastAppliedPreset != toApplyPreset)
+                if (_lastTriggeredPreset != toApplyPreset)
                 {
                     await ApplyPreset(toApplyPreset);
+
+                    _lastTriggeredPreset = toApplyPreset;
                 }
             }
         }

diff --git a/ColorControl/MainForm.cs b/ColorControl/MainForm.cs
@@ -1329,7 +1329,7 @@ private void InitLgTab()
             chkLgRemoteControlShow.Checked = _lgService.Config.ShowRemoteControl;
             scLgController.Panel2Collapsed = !_lgService.Config.ShowRemoteControl;
 
-            Utils.BuildComboBox<PresetTriggerType>(cbxLgPresetTrigger, PresetTriggerType.Resume, PresetTriggerType.Screensaver, PresetTriggerType.Shutdown, PresetTriggerType.Standby, PresetTriggerType.Startup);
+            Utils.BuildComboBox<PresetTriggerType>(cbxLgPresetTrigger, PresetTriggerType.Resume, PresetTriggerType.Shutdown, PresetTriggerType.Standby, PresetTriggerType.Startup, PresetTriggerType.Reserved5, PresetTriggerType.ScreensaverStart, PresetTriggerType.ScreensaverStop);
         }
 
         private void InitOptionsTab()
@@ -1776,7 +1776,7 @@ private void miLgAddAction_Click(object sender, EventArgs e)
                 var dropDownValues = new List<string>();
                 foreach (var enumValue in Enum.GetValues(action.EnumType))
                 {
-                    dropDownValues.Add(enumValue.ToString());
+                    dropDownValues.Add(enumValue.ToString().Replace("_", ""));
                 }
 
                 var values = MessageForms.ShowDialog("Choose value", new[] {

diff --git a/ColorControl/MessageForms.cs b/ColorControl/MessageForms.cs
@@ -97,8 +97,8 @@ public static List<FieldDefinition> ShowDialog(string caption, IEnumerable<Field
 
                         if (label.Contains("Ip-address"))
                         {
-                            textBox.Mask = "###.###.###.###";
-                            textBox.ValidatingType = typeof(System.Net.IPAddress);
+                            //textBox.Mask = "990.990.990.990";
+                            //textBox.ValidatingType = typeof(System.Net.IPAddress);
                             textBox.Culture = CultureInfo.InvariantCulture;
                         }
                         else if (label.Contains("MAC-address"))

diff --git a/ColorControl/PresetBase.cs b/ColorControl/PresetBase.cs
@@ -19,10 +19,14 @@ enum PresetTriggerType
         Shutdown = 3,
         [Description("Standby")]
         Standby = 4,
-        [Description("Screensaver")]
-        Screensaver = 5,
+        [Description("Reserved5")]
+        Reserved5 = 5,
         [Description("Process switch")]
         ProcessSwitch = 6,
+        [Description("Screensaver start")]
+        ScreensaverStart = 7,
+        [Description("Screensaver stop")]
+        ScreensaverStop = 8,
     }
 
     [Flags]

diff --git a/ColorControl/Properties/AssemblyInfo.cs b/ColorControl/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("4.4.0.0")]
-[assembly: AssemblyFileVersion("4.4.0.0")]
+[assembly: AssemblyVersion("4.5.0.0")]
+[assembly: AssemblyFileVersion("4.5.0.0")]
diff --git a/ColorControl/lgtv/LgTvApi.cs b/ColorControl/lgtv/LgTvApi.cs
@@ -96,6 +96,12 @@ public enum TruMotionMode
         user
     }
 
+    public enum FalseToTrue
+    {
+        false_,
+        true_
+    }
+
     public class LgTvApi:IDisposable
     {
         public bool ConnectionClosed { get => _connection?.ConnectionClosed ?? true; }
@@ -501,7 +507,18 @@ public async Task SetSystemSettings(string key, object value, string category =
             }
             else
             {
-                jsonValue = $"\"{value}\"";
+                if (key.Contains("_"))
+                {
+                    var keys = key.Split('_');
+                    key = keys[0];
+                    var childKey = keys[1];
+
+                    jsonValue = @"{ """ + childKey + @""": " + value + " }";
+                }
+                else
+                {
+                    jsonValue = $"\"{value}\"";
+                }
             }
 
             var lunauri = "luna://com.webos.settingsservice/setSystemSettings";