version 2.1

Author: kylon

CHANGELOG.md

@@ -1,3 +1,7 @@
+## 2.1
+
+- Enable creation of back buttons macro with 5+ keys
+
 ## 2.0
 
 - Support win5 and mini 25

CMakeLists.txt

@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.23)
 
-project(OpenWinControlsCLI VERSION 2.0 DESCRIPTION "Multiplatform GPD WinControls replacement (command-line)" LANGUAGES CXX)
+project(OpenWinControlsCLI VERSION 2.1 DESCRIPTION "Multiplatform GPD WinControls replacement (command-line)" LANGUAGES CXX)
 
 set(PROJECT_AUTHOR "kylon")
 set(CMAKE_CXX_STANDARD 20)

README.md

@@ -44,8 +44,14 @@ sudo udevadm control --reload-rules && sudo udevadm trigger
 
 ## Usage
 
+**Controller V2 macros**
+
+Chain multiple keys by assigning an incremental start time (**l4d**/**r4d**) and a fixed hold time to each slot.
+
+### Help
+
 ```text
-OpenWinControlsCLI 2.0
+OpenWinControlsCLI 2.1
 
 Usage: OpenWinControlsCLI command [args]
 
@@ -269,6 +275,7 @@ Notes:
 
   Controller V2 features:
      Support up to 32 key/time/hold slots for back buttons.
+     The number of active key slots is automatically updated on write.
 
   Deadzone settings:
      This is composed of two values, center and boundary.

src/Utils.cpp

@@ -549,11 +549,11 @@ namespace OWCL {
                 continue;
 
             const std::vector<std::string> keys = std::get<std::vector<std::string>>(cmd.getValue(btn.data()));
-            //int slotsC = 0;
+            int slotsC = 0;
 
             for (int i=0,l=keys.size(); i<l && i<32; ++i) {
-                //if (keys[i] != "UNSET")
-                    //++slotsC;
+                if (keys[i] != "UNSET")
+                    ++slotsC;
 
                 if (!gpd->setBackButton(num, i+1, keys[i]))
                     std::cerr << "failed to set " << btn << " slot " << (i + 1) << "\n";
@@ -565,9 +565,9 @@ namespace OWCL {
             else if (keys.size() <= 4)
                 gpd->setBackButtonMode(num, OWC::BackButtonMode::Four);
             else
-                gpd->setBackButtonMode(num, OWC::BackButtonMode::Macro);
+                gpd->setBackButtonMode(num, OWC::BackButtonMode::Macro);*/
 
-            gpd->setBackButtonActiveSlots(num, std::clamp(slotsC, 0, 32));*/
+            gpd->setBackButtonActiveSlots(num, std::clamp(slotsC, 4, 32));
             ++num;
         }
 

src/classes/CMDParser.cpp

@@ -187,10 +187,10 @@ namespace OWC {
             "     The 4th time slot is special, it sets the whole macro start time.\n\n"
 
             "  Controller V2 features:\n"
-            "     Support up to 32 key/time/hold slots for back buttons.\n\n"
+            "     Support up to 32 key/time/hold slots for back buttons.\n"
             /*"     Back buttons have 3 modes: single, 4-buttons, 32-slots macro.\n"
-            "     Mode is automatically updated based on the number of keys being set: 1, 2-4, 5+.\n"
-            "     Same for the active slots count.\n\n"*/
+            "     Mode is automatically updated based on the number of keys being set: 1, 2-4, 5+.\n"*/
+            "     The number of active key slots is automatically updated on write.\n\n"
 
             "  Deadzone settings:\n"
             "     This is composed of two values, center and boundary.\n"