Skip to content

Commit 3f01c51

Browse files
committed
joy2key - remove ini config allowing overriding of joy2key script
There has been no user reports of issues, and fron my own testing I have found no issues why we may need to force the old version apart from if the python library isn't available.
1 parent 50ed2e7 commit 3f01c51

File tree

2 files changed

+0
-13
lines changed

2 files changed

+0
-13
lines changed

scriptmodules/admin/joy2key.sh

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,11 +59,7 @@ if [[ "\${#params[@]}" -eq 0 ]]; then
5959
params=(kcub1 kcuf1 kcuu1 kcud1 0x0a 0x20 0x1b 0x09 kpp knp)
6060
fi
6161
62-
source "$rootdir/lib/inifuncs.sh"
63-
iniConfig " = " '"' "$configdir/all/runcommand.cfg"
64-
iniGet "joy2key_version"
6562
script="joy2key_sdl.py"
66-
[[ "\$ini_value" == "0" ]] && script="joy2key.py"
6763
! python3 -c "import sdl2" 2>/dev/null && script="joy2key.py"
6864
6965
case "\$mode" in

scriptmodules/supplementary/runcommand.sh

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,6 @@ function gui_runcommand() {
107107
'disable_joystick=0' \
108108
'image_delay=2' \
109109
'governor=' \
110-
'joy2key_version=1' \
111110
)"
112111

113112
[[ -z "$governor" ]] && governor="Default: don't change"
@@ -135,11 +134,6 @@ function gui_runcommand() {
135134

136135
options+=(4 "Launch image delay in seconds (currently $image_delay)")
137136
options+=(5 "CPU governor configuration (currently: $governor)")
138-
if [[ "$joy2key_version" -eq 1 ]]; then
139-
options+=(6 "Joy2key version (currently: sdl)")
140-
else
141-
options+=(6 "Joy2key version (currently: udev)")
142-
fi
143137

144138
local choice=$("${cmd[@]}" "${options[@]}" 2>&1 >/dev/tty)
145139
[[ -z "$choice" ]] && break
@@ -162,9 +156,6 @@ function gui_runcommand() {
162156
5)
163157
governor_runcommand
164158
;;
165-
6)
166-
iniSet "joy2key_version" "$((joy2key_version ^ 1))"
167-
;;
168159
esac
169160
done
170161
}

0 commit comments

Comments
 (0)