Anime Matrix tweaks

New Crowdin updates

app/AnimeMatrix/AnimeMatrixDevice.cs

@@ -1,14 +1,11 @@
 // Source thanks to https://github.com/vddCore/Starlight with some adjustments from me
 
-using GHelper;
 using GHelper.AnimeMatrix.Communication;
 using System.Drawing.Drawing2D;
 using System.Drawing.Imaging;
 using System.Drawing.Text;
-using System.Globalization;
 using System.Management;
 using System.Text;
-using static System.Windows.Forms.VisualStyles.VisualStyleElement.Window;
 
 namespace Starlight.AnimeMatrix
 {
@@ -80,6 +77,7 @@ namespace Starlight.AnimeMatrix
     }
 
 
+
     public class AnimeMatrixDevice : Device
     {
         int UpdatePageLength = 490;
@@ -89,31 +87,36 @@ namespace Starlight.AnimeMatrix
         List<byte[]> frames = new List<byte[]>();
 
         public int MaxRows = 61;
-        //public int FullRows = 11;
-        //public int FullEvenRows = -1;
-
-        public int dx = 0;
         public int MaxColumns = 34;
+        public int LedStart = 0;
+
+        public int TextShift = 8;
 
         private int frameIndex = 0;
 
         private static AnimeType _model = AnimeType.GA402;
 
+        [System.Runtime.InteropServices.DllImport("gdi32.dll")]
+        private static extern IntPtr AddFontMemResourceEx(IntPtr pbFont, uint cbFont, IntPtr pdv, [System.Runtime.InteropServices.In] ref uint pcFonts);
+        private PrivateFontCollection fonts = new PrivateFontCollection();
 
-        public AnimeMatrixDevice()
-            : base(0x0B05, 0x193B, 640)
+        public AnimeMatrixDevice() : base(0x0B05, 0x193B, 640)
         {
             string model = GetModel();
+
             if (model.Contains("401"))
             {
                 _model = AnimeType.GA401;
 
                 MaxColumns = 33;
-                dx = 1;
                 MaxRows = 55;
                 LedCount = 1245;
 
                 UpdatePageLength = 410;
+
+                TextShift = 11;
+
+                LedStart = 1;
             }
 
             if (model.Contains("GU604"))
@@ -124,12 +127,35 @@ namespace Starlight.AnimeMatrix
                 MaxRows = 92;
                 LedCount = 1711;
                 UpdatePageLength = 630;
+
+                TextShift = 10;
             }
 
             _displayBuffer = new byte[LedCount];
 
+            /*
+            for (int i = 0; i < MaxRows; i++)
+            {
+                _model = AnimeType.GA401;
+                Logger.WriteLine(FirstX(i) + " " + Pitch(i));
+            }
+            */
+
+            LoadMFont();
+
         }
 
+        private void LoadMFont()
+        {
+            byte[] fontData = GHelper.Properties.Resources.MFont;
+            IntPtr fontPtr = System.Runtime.InteropServices.Marshal.AllocCoTaskMem(fontData.Length);
+            System.Runtime.InteropServices.Marshal.Copy(fontData, 0, fontPtr, fontData.Length);
+            uint dummy = 0;
+
+            fonts.AddMemoryFont(fontPtr, GHelper.Properties.Resources.MFont.Length);
+            AddFontMemResourceEx(fontPtr, (uint)GHelper.Properties.Resources.MFont.Length, IntPtr.Zero, ref dummy);
+            System.Runtime.InteropServices.Marshal.FreeCoTaskMem(fontPtr);
+        }
 
         public string GetModel()
         {
@@ -173,32 +199,7 @@ namespace Starlight.AnimeMatrix
         }
 
 
-        public static int FirstX(int y)
-        {
-            switch (_model)
-            {
-                case AnimeType.GA401:
-                    if (y < 5)
-                    {
-                        return 0;
-                    }
-                    else
-                    {
-                        return (y + 1) / 2 - 3;
-                    }
-                case AnimeType.GU604:
-                    if (y < 9 && y % 2 == 0)
-                    {
-                        return 1;
-                    }
-                    return (int)Math.Ceiling(Math.Max(0, y - 9) / 2F);
-
-                default:
-                    return (int)Math.Ceiling(Math.Max(0, y - 11) / 2F);
-            }
-        }
-
-        public static int Width(int y)
+        public int Width()
         {
             switch (_model)
             {
@@ -211,7 +212,30 @@ namespace Starlight.AnimeMatrix
             }
         }
 
-        public static int Pitch(int y)
+        public int FirstX(int y)
+        {
+            switch (_model)
+            {
+                case AnimeType.GA401:
+                    if (y < 5 && y % 2 == 0)
+                    {
+                        return 1;
+                    }
+                    return (int)Math.Ceiling(Math.Max(0, y - 5) / 2F);
+                case AnimeType.GU604:
+                    if (y < 9 && y % 2 == 0)
+                    {
+                        return 1;
+                    }
+                    return (int)Math.Ceiling(Math.Max(0, y - 9) / 2F);
+
+                default:
+                    return (int)Math.Ceiling(Math.Max(0, y - 11) / 2F);
+            }
+        }
+
+
+        public int Pitch(int y)
         {
             switch (_model)
             {
@@ -247,19 +271,19 @@ namespace Starlight.AnimeMatrix
                             return 39;
 
                         default:
-                            return Width(y) - FirstX(y);
+                            return Width() - FirstX(y);
                     }
 
 
                 default:
-                    return Width(y) - FirstX(y);
+                    return Width() - FirstX(y);
             }
         }
 
 
         public int RowToLinearAddress(int y)
         {
-            int ret = 0;
+            int ret = LedStart;
             for (var i = 0; i < y; i++)
                 ret += Pitch(i);
 
@@ -270,8 +294,8 @@ namespace Starlight.AnimeMatrix
         {
             if (!IsRowInRange(y)) return;
 
-            if (x >= FirstX(y) && x < Width(y))
-                SetLedLinear(RowToLinearAddress(y) - FirstX(y) + x + dx, value);
+            if (x >= FirstX(y) && x < Width())
+                SetLedLinear(RowToLinearAddress(y) - FirstX(y) + x, value);
         }
 
         public void WakeUp()
@@ -369,20 +393,49 @@ namespace Starlight.AnimeMatrix
 
         public void PresentClock()
         {
-            int second = DateTime.Now.Second;
-            string time;
+            string second = (DateTime.Now.Second % 2 == 0) ? ":" : "  ";
+            string time = DateTime.Now.ToString("HH" + second + "mm");
 
-            if (CultureInfo.CurrentCulture.DateTimeFormat.ShortTimePattern.Contains("H"))
-                time = DateTime.Now.ToString("H" + ((second % 2 == 0) ? ":" : " ") + "mm");
-            else
-                time = DateTime.Now.ToString("h" + ((second % 2 == 0) ? ":" : " ") + "mmtt");
+            Clear();
+            TextDiagonal(time, 15, 12, TextShift + 11);
+            TextDiagonal(DateTime.Now.ToString("yy'. 'MM'. 'dd"), 11.5F, 3, TextShift);
+            Present();
 
-            if (_model == AnimeType.GA401)
-                PresentText(time);
-            else
-                PresentTextDiagonal(time);
         }
 
+        public void TextDiagonal(string text, float fontSize = 10, int deltaX = 0, int deltaY = 10)
+        {
+
+            int maxX = (int)Math.Sqrt(MaxRows * MaxRows + MaxColumns * MaxColumns);
+            int textHeight;
+
+            using (Bitmap bmp = new Bitmap(maxX, MaxRows))
+            {
+                using (Graphics g = Graphics.FromImage(bmp))
+                {
+                    g.CompositingQuality = CompositingQuality.HighQuality;
+                    g.SmoothingMode = SmoothingMode.AntiAlias;
+                    g.TextRenderingHint = TextRenderingHint.SingleBitPerPixel;
+
+                    using (Font font = new Font(fonts.Families[0], fontSize, FontStyle.Regular, GraphicsUnit.Pixel))
+                    {
+                        SizeF textSize = g.MeasureString(text, font);
+                        textHeight = (int)textSize.Height;
+                        g.DrawString(text, font, Brushes.White, 0, 0);
+                    }
+                }
+
+                for (int y = 0; y < bmp.Height; y++)
+                {
+                    for (int x = 0; x < bmp.Width; x++)
+                    {
+                        var pixel = bmp.GetPixel(x, y);
+                        var color = (pixel.R + pixel.G + pixel.B) / 3;
+                        if (color > 100) SetLedDiagonal(x, y, (byte)color, deltaX, deltaY);
+                    }
+                }
+            }
+        }
 
 
         public void PresentText(string text1, string text2 = "")
@@ -410,42 +463,25 @@ namespace Starlight.AnimeMatrix
 
                 }
 
+                bmp.Save("test.bmp", ImageFormat.Bmp);
+
                 GenerateFrame(bmp);
                 Present();
             }
 
         }
 
-        public void GenerateFrame(Image image, float zoom = 1, int panX = 0, int panY = 0, InterpolationMode quality = InterpolationMode.Default)
-        {
-            using (Bitmap bmp = GeneratePicture(image, zoom, panX, panY, quality))
-            {
-                for (int y = 0; y < bmp.Height; y++)
-                {
-                    for (int x = 0; x < bmp.Width; x++)
-                        if (x % 2 == (y + dx) % 2)
-                        {
-                            var pixel = bmp.GetPixel(x, y);
-                            var color = (pixel.R + pixel.G + pixel.B) / 3;
-                            if (color < 10) color = 0;
-                            SetLedPlanar(x / 2, y, (byte)color);
-                        }
-                }
-            }
-        }
-
-
-        public Bitmap GeneratePicture(Image image, float zoom = 100, int panX = 0, int panY = 0, InterpolationMode quality = InterpolationMode.Default)
+        public void GenerateFrame(Image image, float zoom = 100, int panX = 0, int panY = 0, InterpolationMode quality = InterpolationMode.Default)
         {
 
-            int width = MaxColumns * 3;
+            int width = MaxColumns / 2 * 6;
             int height = MaxRows;
 
             int targetWidth = MaxColumns * 2;
 
             float scale;
 
-            Bitmap bmp = new Bitmap(targetWidth, height);
+            using (Bitmap bmp = new Bitmap(targetWidth, height))
             {
                 scale = Math.Min((float)width / (float)image.Width, (float)height / (float)image.Height) * zoom / 100;
 
@@ -459,61 +495,35 @@ namespace Starlight.AnimeMatrix
                     graph.SmoothingMode = SmoothingMode.AntiAlias;
 
                     graph.DrawImage(image, (float)Math.Round(targetWidth - (scaleWidth + panX) * targetWidth / width), -panY, (float)Math.Round(scaleWidth * targetWidth / width), scaleHeight);
-                    return bmp;
-                }
 
-            }
-        }
-
-
-        public void SetLedDiagonal(int x, int y, byte color, int delta = 10)
-        {
-            //x += delta;
-            y -= delta;
-
-            int dx = (x - y) / 2;
-            int dy = x + y;
-            SetLedPlanar(dx, dy, color);
-        }
-
-        public void PresentTextDiagonal(string text)
-        {
-
-            Clear();
-
-            int maxX = (int)Math.Sqrt(MaxRows * MaxRows + MaxColumns * MaxColumns);
-            int textHeight;
-
-            using (Bitmap bmp = new Bitmap(maxX, MaxRows))
-            {
-                using (Graphics g = Graphics.FromImage(bmp))
-                {
-                    g.CompositingQuality = CompositingQuality.HighQuality;
-                    g.SmoothingMode = SmoothingMode.AntiAlias;
-                    g.TextRenderingHint = TextRenderingHint.SingleBitPerPixel;
-
-                    using (Font font = new Font("Consolas", 11, FontStyle.Regular, GraphicsUnit.Pixel))
-                    {
-                        SizeF textSize = g.MeasureString(text, font);
-                        textHeight = (int)textSize.Height;
-                        g.DrawString(text, font, Brushes.White, 4, 0);
-                    }
                 }
 
                 for (int y = 0; y < bmp.Height; y++)
                 {
                     for (int x = 0; x < bmp.Width; x++)
-                    {
-                        var pixel = bmp.GetPixel(x, y);
-                        var color = (pixel.R + pixel.G + pixel.B) / 3;
-                        SetLedDiagonal(x, y, (byte)color, textHeight - 8);
-                    }
+                        if (x % 2 == y % 2)
+                        {
+                            var pixel = bmp.GetPixel(x, y);
+                            var color = (pixel.R + pixel.G + pixel.B) / 3;
+                            if (color < 10) color = 0;
+                            SetLedPlanar(x / 2, y, (byte)color);
+                        }
                 }
             }
-
-            Present();
         }
 
+
+        public void SetLedDiagonal(int x, int y, byte color, int deltaX = 0, int deltaY = 10)
+        {
+            x += deltaX;
+            y -= deltaY;
+
+            int plX = (x - y) / 2;
+            int plY = x + y;
+            SetLedPlanar(plX, plY, color);
+        }
+
+
         private bool IsRowInRange(int row)
         {
             return (row >= 0 && row < MaxRows);

app/AsusACPI.cs

@@ -94,6 +94,7 @@ public class AsusACPI
 
     public const int TUF_KB_BRIGHTNESS = 0x00050021;
     public const int TUF_KB = 0x00100056;
+    public const int TUF_KB2 = 0x0010005a;
     public const int TUF_KB_STATE = 0x00100057;
 
     public const int MICMUTE_LED = 0x00040017;
@@ -520,14 +521,8 @@ public class AsusACPI
         setting[4] = color.B;
         setting[5] = (byte)speed;
 
-        DeviceSet(TUF_KB, setting, "TUF RGB");
-
-        /*
-        setting[0] = (byte)0xb4;
-        DeviceSet(TUF_KB, setting, "TUF RGB");
-        */
-
-        //Debug.WriteLine(BitConverter.ToString(setting));
+        int result = DeviceSet(TUF_KB, setting, "TUF RGB");
+        if (result != 1) DeviceSet(TUF_KB2, setting, "TUF RGB");
 
     }
 

app/Battery/BatteryControl.cs

@@ -9,8 +9,8 @@
             if (limit < 0) limit = AppConfig.Get("charge_limit");
             if (limit < 40 || limit > 100) return;
 
-            Program.settingsForm.VisualiseBattery(limit);
             Program.acpi.DeviceSet(AsusACPI.BatteryLimit, limit, "BatteryLimit");
+            Program.settingsForm.VisualiseBattery(limit);
 
             AppConfig.Set("charge_limit", limit);
 

app/Properties/Resources.Designer.cs

@@ -610,6 +610,16 @@ namespace GHelper.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized resource of type System.Byte[].
+        /// </summary>
+        internal static byte[] MFont {
+            get {
+                object obj = ResourceManager.GetObject("MFont", resourceCulture);
+                return ((byte[])(obj));
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Icon similar to (Icon).
         /// </summary>

app/Properties/Resources.resx

@@ -289,4 +289,7 @@
   <data name="icons8_rocket_32" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\icons8-rocket-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="MFont" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Font.otf;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
 </root>

app/Properties/Strings.pl.resx

@@ -235,7 +235,7 @@
     <value>Automatycznie ustaw odświeżanie 60 Hz w czasie pracy na baterii</value>
   </data>
   <data name="Awake" xml:space="preserve">
-    <value>Aktywność</value>
+    <value>Włączone</value>
   </data>
   <data name="BacklightTimeout" xml:space="preserve">
     <value>Limit czasu podłączonego / na baterii (0 - Włączony)</value>
@@ -256,7 +256,7 @@
     <value>Aktualizacje BIOS i sterowników</value>
   </data>
   <data name="Boot" xml:space="preserve">
-    <value>Podczas uruchamiania</value>
+    <value>Uruchamianie</value>
   </data>
   <data name="Brightness" xml:space="preserve">
     <value>Jasność</value>

app/Settings.cs

@@ -10,7 +10,6 @@ using GHelper.Peripherals;
 using GHelper.Peripherals.Mouse;
 using GHelper.UI;
 using System.Diagnostics;
-using System.Drawing.Imaging;
 using System.Timers;
 
 namespace GHelper