Merge pull request #181 from kloptops/main

Fixed Knulli/Batocera mapper.txt issue for now, added fixed gptokeyb2 builds.
PortsMaster · Nov 6, 2024 · 8148440 · 8148440
2 parents c5aa884 + de90558
commit 8148440
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 4 deletions.
diff --git a/PortMaster/batocera/control.txt b/PortMaster/batocera/control.txt
@@ -34,8 +34,10 @@ get_controls() {
     echo "" > /tmp/gamecontrollerdb.txt
   fi
 
-  if [ -f "${HOME}/configs/emulationstation/es_input.cfg" ]; then
-    $controlfolder/mapper.txt /tmp/gamecontrollerdb.txt > /dev/null 2>&1
+  if [ -f "$controlfolder/cwtbe_flag" ]; then
+    if [ -f "${HOME}/configs/emulationstation/es_input.cfg" ]; then
+      $controlfolder/mapper.txt /tmp/gamecontrollerdb.txt > /dev/null 2>&1
+    fi
   fi
 
   sdl_controllerconfig="$(< "${SDL_GAMECONTROLLERCONFIG_FILE}")"

diff --git a/PortMaster/gptokeyb2 b/PortMaster/gptokeyb2
diff --git a/PortMaster/gptokeyb2.armhf b/PortMaster/gptokeyb2.armhf
diff --git a/PortMaster/gptokeyb2.x86_64 b/PortMaster/gptokeyb2.x86_64
diff --git a/PortMaster/knulli/control.txt b/PortMaster/knulli/control.txt
@@ -22,6 +22,8 @@ get_controls() {
   ANALOGSTICKS="2"
   LOWRES="N"
 
+  DEVICE="Deeplay-keys"
+
   export SDL_GAMECONTROLLERCONFIG_FILE="/tmp/gamecontrollerdb.txt"
 
   # Spit the controller of the device our heuristics found (if it did).
@@ -31,8 +33,10 @@ get_controls() {
     echo "" > /tmp/gamecontrollerdb.txt
   fi
 
-  if [ -f "${HOME}/configs/emulationstation/es_input.cfg" ]; then
-    $controlfolder/mapper.txt /tmp/gamecontrollerdb.txt > /dev/null 2>&1
+  if [ -f "$controlfolder/cwtbe_flag" ]; then
+    if [ -f "${HOME}/configs/emulationstation/es_input.cfg" ]; then
+      $controlfolder/mapper.txt /tmp/gamecontrollerdb.txt > /dev/null 2>&1
+    fi
   fi
 
   sdl_controllerconfig="$(< "${SDL_GAMECONTROLLERCONFIG_FILE}")"

diff --git a/PortMaster/libinterpose.aarch64.so b/PortMaster/libinterpose.aarch64.so