Enable IR support for linux, Add ON IR cmd for fans that need it, allow multiple instances of the app to run (for advanced use cases)

Author: nicko88

FanTrayIcon/TrayIcon.cs

@@ -12,6 +12,8 @@ namespace FanTrayIcon
     public class TrayIcon
     {
         string _IP;
+        string _port;
+        string _instanceName;
 
         private NotifyIcon trayIcon;
         private ToolStripMenuItem itemConsole;
@@ -26,15 +28,17 @@ public class TrayIcon
         const int SW_HIDE = 0;
         const int SW_SHOW = 5;
 
-        public TrayIcon(string IP)
+        public TrayIcon(string IP, string port, string instanceName)
         {
             _IP = IP;
+            _port = port;
+            _instanceName = instanceName;
 
             IntPtr handle = GetConsoleWindow();
             ShowWindow(handle, SW_HIDE);
 
             trayIcon = new NotifyIcon();
-            trayIcon.Text = "HTFanControl (Right Click For Menu)";
+            trayIcon.Text = $"{_instanceName} (Right Click For Menu)";
             trayIcon.Icon = new Icon(GetType(), "htfancontrol.ico");
             trayIcon.MouseClick += new MouseEventHandler(trayIcon_MouseClick);
             trayIcon.DoubleClick += new EventHandler(trayIcon_DoubleClick);
@@ -49,19 +53,19 @@ public TrayIcon(string IP)
             itemConsole.Click += new EventHandler(itemConsole_Click);
 
             itemAutostart = new ToolStripMenuItem();
-            itemAutostart.Text = "Start HTFanControl Automatically";
+            itemAutostart.Text = $"Start {_instanceName} Automatically";
             itemAutostart.CheckOnClick = true;
             itemAutostart.CheckedChanged += new EventHandler(itemAutostart_CheckedChanged);
 
-            if (CheckRegKey("SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Run", "HTFanControl"))
+            if (CheckRegKey("SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Run", _instanceName))
             {
                 itemAutostart.Checked = true;
             }
 
             ToolStripSeparator sep1 = new ToolStripSeparator();
 
             ToolStripMenuItem itemClose = new ToolStripMenuItem();
-            itemClose.Text = "Shutdown HTFanControl";
+            itemClose.Text = $"Shutdown {_instanceName}";
             itemClose.Click += new EventHandler(itemClose_Click);
 
             ContextMenuStrip trayMenu = new ContextMenuStrip();
@@ -97,7 +101,7 @@ private void trayIcon_DoubleClick(object sender, EventArgs e)
 
         private void itemWebUI_Click(object sender, EventArgs e)
         {
-            string url = $"http://{_IP}:5500";
+            string url = $"http://{_IP}:{_port}";
 
             try
             {
@@ -136,12 +140,19 @@ private void itemAutostart_CheckedChanged(object sender, EventArgs e)
             if (itemAutostart.Checked)
             {
                 RegistryKey key = Registry.CurrentUser.OpenSubKey("SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Run", true);
-                key.SetValue("HTFanControl", Process.GetCurrentProcess().MainModule.FileName);
+                if (_port == "5500")
+                {
+                    key.SetValue("HTFanControl", Process.GetCurrentProcess().MainModule.FileName);
+                }
+                else
+                {
+                    key.SetValue(_instanceName, $@"{Process.GetCurrentProcess().MainModule.FileName} ""{_port}"" ""{_instanceName}""");
+                }
             }
             else
             {
                 RegistryKey key = Registry.CurrentUser.OpenSubKey("SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Run", true);
-                key.DeleteValue("HTFanControl", false);
+                key.DeleteValue(_instanceName, false);
             }
         }
 

HTFanControl/Controllers/LIRCController.cs

@@ -1,6 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.IO;
 using System.Net;
 using System.Net.Sockets;
 using System.Text;
@@ -12,94 +10,57 @@ namespace HTFanControl.Controllers
     class LIRCController : IController
     {
         private Socket _lircSocket;
-        private Dictionary<string, string> _lircMapping;
-
         private Settings _settings;
 
+        private bool _isOFF = true;
+        private bool _ONcmd = false;
+
         public string ErrorStatus { get; private set; }
 
         public LIRCController(Settings settings)
         {
             _settings = settings;
-
-            LoadLIRCMapping();
+            _ONcmd = _settings.LIRC_ON_Delay > 0;
         }
 
-        public bool Connect()
+        public bool SendCMD(string cmd)
         {
-            Disconnect();
+            bool send = true;
+            bool goodResult = true;
 
-            try
+            //case when fan needs to be turned ON before a command can be sent
+            if (_ONcmd && _isOFF)
             {
-                IPAddress ipAddress = IPAddress.Parse(_settings.LIRC_IP);
-                IPEndPoint remoteEP = new IPEndPoint(ipAddress, _settings.LIRC_Port);
-                _lircSocket = new Socket(ipAddress.AddressFamily, SocketType.Stream, ProtocolType.Tcp);
-
-                IAsyncResult result = _lircSocket.BeginConnect(remoteEP, null, null);
-                result.AsyncWaitHandle.WaitOne(3000);
+                if (cmd != "OFF")
+                {
+                    string lircOnCMD = $"SEND_ONCE {_settings.LIRC_Remote} ON\n";
+                    SendLIRCBytes(Encoding.ASCII.GetBytes(lircOnCMD));
 
-                if (!_lircSocket.Connected)
+                    Thread.Sleep(_settings.MQTT_ON_Delay);
+                }
+                //fan is already OFF, but it's being asked to turn OFF, so don't send a command, because that would cause it to turn ON again if ON/OFF are the same IR command
+                else
                 {
-                    throw new Exception();
+                    send = false;
                 }
-
-                _lircSocket.EndConnect(result);
-
-                Thread.Sleep(25);
-            }
-            catch
-            {
-                ErrorStatus = $"({DateTime.Now:h:mm:ss tt}) Cannot connect to LIRC at: {_settings.LIRC_IP}:{_settings.LIRC_Port}";
-                return false;
             }
 
-            Thread.Sleep(25);
-
-            return true;
-        }
-
-        public void Disconnect()
-        {
-            if (_lircSocket != null)
+            if (send)
             {
-                try
-                {
-                    _lircSocket.Shutdown(SocketShutdown.Both);
-                    _lircSocket.Close();
-                }
-                catch { }
+                string lircCMD = $"SEND_ONCE {_settings.LIRC_Remote} {cmd}\n";
+                goodResult = SendLIRCBytes(Encoding.ASCII.GetBytes(lircCMD));
             }
-        }
 
-        public bool SendCMD(string cmd)
-        {
-            if (cmd == "STOP")
+            if (cmd == "OFF")
             {
-                if (_lircMapping != null && _lircMapping.TryGetValue("STOP", out string stopCMD))
-                {
-                    cmd = stopCMD;
-                }
-                else
-                {
-                    cmd = "OFF";
-                }
+                _isOFF = true;
             }
-
-            string[] cmds = cmd.Split(',');
-            bool goodResult = true;
-
-            foreach (string c in cmds)
+            else
             {
-                if (_lircMapping != null && _lircMapping.TryGetValue(c, out string remote))
-                {
-                    _settings.LIRC_Remote = remote;
-                }
-
-                string lircCMD = $"SEND_ONCE {_settings.LIRC_Remote} {c}\n";
-                goodResult = SendLIRCBytes(Encoding.ASCII.GetBytes(lircCMD));
+                _isOFF = false;
             }
 
-            if(!goodResult)
+            if (!goodResult)
             {
                 return false;
             }
@@ -150,23 +111,49 @@ private bool SendLIRCBytes(byte[] cmd)
             return true;
         }
 
-        private void LoadLIRCMapping()
+        public bool Connect()
         {
-            _lircMapping = null;
-            if (File.Exists(Path.Combine(ConfigHelper._rootPath, "lircmapping.txt")))
+            Disconnect();
+
+            try
             {
-                _lircMapping = new Dictionary<string, string>();
-                string[] mappingFile = File.ReadAllLines(Path.Combine(ConfigHelper._rootPath, "lircmapping.txt"));
+                IPAddress ipAddress = IPAddress.Parse(_settings.LIRC_IP);
+                IPEndPoint remoteEP = new IPEndPoint(ipAddress, _settings.LIRC_Port);
+                _lircSocket = new Socket(ipAddress.AddressFamily, SocketType.Stream, ProtocolType.Tcp);
+
+                IAsyncResult result = _lircSocket.BeginConnect(remoteEP, null, null);
+                result.AsyncWaitHandle.WaitOne(3000);
 
-                foreach (string s in mappingFile)
+                if (!_lircSocket.Connected)
                 {
-                    try
-                    {
-                        string[] vals = s.Split('=');
-                        _lircMapping.Add(vals[1], vals[0]);
-                    }
-                    catch { }
+                    throw new Exception();
                 }
+
+                _lircSocket.EndConnect(result);
+
+                Thread.Sleep(25);
+            }
+            catch
+            {
+                ErrorStatus = $"({DateTime.Now:h:mm:ss tt}) Cannot connect to LIRC at: {_settings.LIRC_IP}:{_settings.LIRC_Port}";
+                return false;
+            }
+
+            Thread.Sleep(25);
+
+            return true;
+        }
+
+        public void Disconnect()
+        {
+            if (_lircSocket != null)
+            {
+                try
+                {
+                    _lircSocket.Shutdown(SocketShutdown.Both);
+                    _lircSocket.Close();
+                }
+                catch { }
             }
         }
     }