From 31ee3b022f0022273e457bb6d0b0cb2111fb1eb3 Mon Sep 17 00:00:00 2001
From: Mohamed Gaber <me@donn.website>
Date: Mon, 2 Jan 2023 08:03:06 +0200
Subject: [PATCH] Switch around Mac and Windows modes for Halo75 (#18)

---
 include/nuphy.hpp |  8 ++++----
 package.json      |  2 +-
 src/main.cpp      | 12 ++++++------
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/include/nuphy.hpp b/include/nuphy.hpp
index c2df547..0554510 100644
--- a/include/nuphy.hpp
+++ b/include/nuphy.hpp
@@ -141,18 +141,18 @@ class Halo75 : public NuPhy {
 
         virtual std::vector< uint8_t > getKeymapReportHeader(bool mac = false) {
             return mac ? std::vector< uint8_t >(
-                       {0x05, 0x84, 0xd8, 0x00, 0x00, 0x00}
+                       {0x05, 0x84, 0xd4, 0x00, 0x00, 0x00}
                    ) :
                          std::vector< uint8_t >(
-                             {0x05, 0x84, 0xd4, 0x00, 0x00, 0x00}
+                             {0x05, 0x84, 0xd8, 0x00, 0x00, 0x00}
                          );
         }
         virtual std::vector< uint8_t > setKeymapReportHeader(bool mac = false) {
             return mac ? std::vector< uint8_t >(
-                       {0x06, 0x04, 0xd8, 0x00, 0x40, 0x00, 0x00, 0x00}
+                       {0x06, 0x04, 0xd4, 0x00, 0x40, 0x00, 0x00, 0x00}
                    ) :
                          std::vector< uint8_t >(
-                             {0x06, 0x04, 0xd4, 0x00, 0x40, 0x00, 0x00, 0x00}
+                             {0x06, 0x04, 0xd8, 0x00, 0x40, 0x00, 0x00, 0x00}
                          );
         }
     private:
diff --git a/package.json b/package.json
index ed32579..e7c50e8 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "nudelta",
     "author": "Mohamed Gaber <me@donn.website>",
-    "version": "0.6.2",
+    "version": "0.6.3",
     "license": "GPL-3.0-or-later",
     "homepage": "https://github.com/donn/nudelta#readme",
     "description": "An open-source alternative to the NuPhy Console",
diff --git a/src/main.cpp b/src/main.cpp
index 26b7731..404fefe 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -190,15 +190,16 @@ int main(int argc, char *argv[]) {
              "Print the connected keyboard's firmware and exit.",
              false,
              printFirmware},
-         Opt{"mac",
-             'M',
-             "Valid only if dump-keys or load-keys are passed: operate on the Mac mode of the keyboard instead of the Win mode.",
-             false},
+         Opt{"load-profile", 'l', "Load YAML keymap", true, loadYAML},
          Opt{"reset-keys",
              'r',
              "Restore the original keymap.",
              false,
              resetKeymap},
+         Opt{"mac",
+             'M',
+             "Valid only if dump-keys or load-keys are passed: operate on the Mac mode of the keyboard instead of the Win mode.",
+             false},
          Opt{"dump-keys",
              'D',
              "Dump the keymap to a binary file.",
@@ -212,8 +213,7 @@ int main(int argc, char *argv[]) {
              'L',
              "Load the keymap from a binary file.",
              true,
-             loadKeymap},
-         Opt{"load-profile", 'l', "Load YAML keymap", true, loadYAML}}
+             loadKeymap}}
     );
 
     try {