Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

dev - auto gamepad - strip unneeded backslash in expressions #1304

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 4 additions & 4 deletions packages/sx05re/emuelec/bin/joy_common.sh
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ jc_get_players() {

# Dump gamepad information
cat /proc/bus/input/devices \
| grep -B 5 -A 3 -P "H\: Handlers=(?=.*?js[0-9])(?=.*?event[0-9]+).*$" \
| grep -Ew -B 8 "B: KEY\=[0-9a-f ]+" > /tmp/input_devices
| grep -B 5 -A 3 -P "H: Handlers=(?=.*?js[0-9])(?=.*?event[0-9]+).*$" \
| grep -Ew -B 8 "B: KEY=[0-9a-f ]+" > /tmp/input_devices

# Determine how many gamepads/players are connected
JOYS=$(ls -ltr /dev/input/js* | awk '{print $8"\t"$9"\t"$10}' | sort \
Expand All @@ -39,7 +39,7 @@ jc_get_players() {

for dev in $(echo ${JOYS}); do
local JSI=${dev}
local DETAILS=$(cat /tmp/input_devices | grep -P "H\: Handlers(?=.*?[= ]${JSI} )" -B 5)
local DETAILS=$(cat /tmp/input_devices | grep -P "H: Handlers(?=.*?[= ]${JSI} )" -B 5)

local PROC_GUID=$(echo "${DETAILS}" | grep I: | sed "s|I:\ Bus=||" | sed "s|\ Vendor=||" | sed "s|\ Product=||" | sed "s|\ Version=||")
local DEVICE_GUID=$(jc_generate_guid $((PLAYER-1)))
Expand All @@ -49,7 +49,7 @@ jc_get_players() {
echo "GC_CONFIG=${GC_CONFIG}"
[[ -z ${GC_CONFIG} ]] && continue

local JOY_NAME=$(echo "${DETAILS}" | grep -E "^N\: Name.*[\= ]?.*$" | cut -d "=" -f 2 | tr -d '"')
local JOY_NAME=$(echo "${DETAILS}" | grep -E "^N: Name.*[\= ]?.*$" | cut -d "=" -f 2 | tr -d '"')
[[ -z "${JOY_NAME}" ]] && continue

# Add the joy config to array if guid and joyname set.
Expand Down
16 changes: 8 additions & 8 deletions packages/sx05re/emulators/dolphinSA/scripts/set_dolphin_joy.sh
Original file line number Diff line number Diff line change
Expand Up @@ -171,30 +171,30 @@ set_pad() {

local JOYSTICK="Main Stick"
local GC_RECORD
GC_RECORD=$(cat ${CONFIG_TMP} | grep -E "^${JOYSTICK}\/Modifier *\= *(.*)$")
GC_RECORD=$(cat ${CONFIG_TMP} | grep -E "^${JOYSTICK}\/Modifier *= *(.*)$")
[[ -z "${GC_RECORD}" ]] && echo "${JOYSTICK}/Modifier = Shift_L" >> ${CONFIG_TMP}
GC_RECORD=$(cat ${CONFIG_TMP} | grep -E "^${JOYSTICK}\/Modifier\/Range *\= *(.*)$")
GC_RECORD=$(cat ${CONFIG_TMP} | grep -E "^${JOYSTICK}\/Modifier\/Range *= *(.*)$")
[[ -z "${GC_RECORD}" ]] && echo "${JOYSTICK}/Modifier/Range = 50.000000000000000" >> ${CONFIG_TMP}
GC_RECORD=$(cat ${CONFIG_TMP} | grep -E "^${JOYSTICK}\/Dead Zone *\= *(.*)$")
GC_RECORD=$(cat ${CONFIG_TMP} | grep -E "^${JOYSTICK}\/Dead Zone *= *(.*)$")
[[ -z "${GC_RECORD}" ]] && echo "${JOYSTICK}/Dead Zone = 25.000000000000000" >> ${CONFIG_TMP}

JOYSTICK="C-Stick"
GC_RECORD=$(cat ${CONFIG_TMP} | grep -E "^${JOYSTICK}\/Modifier *\= *(.*)$")
GC_RECORD=$(cat ${CONFIG_TMP} | grep -E "^${JOYSTICK}\/Modifier *= *(.*)$")
[[ -z "${GC_RECORD}" ]] && echo "${JOYSTICK}/Modifier = Control_L" >> ${CONFIG_TMP}
GC_RECORD=$(cat ${CONFIG_TMP} | grep -E "^${JOYSTICK}\/Modifier\/Range *\= *(.*)$")
GC_RECORD=$(cat ${CONFIG_TMP} | grep -E "^${JOYSTICK}\/Modifier\/Range *= *(.*)$")
[[ -z "${GC_RECORD}" ]] && echo "${JOYSTICK}/Modifier/Range = 50.000000000000000" >> ${CONFIG_TMP}
GC_RECORD=$(cat ${CONFIG_TMP} | grep -E "^${JOYSTICK}\/Dead Zone *\= *(.*)$")
GC_RECORD=$(cat ${CONFIG_TMP} | grep -E "^${JOYSTICK}\/Dead Zone *= *(.*)$")
[[ -z "${GC_RECORD}" ]] && echo "${JOYSTICK}/Dead Zone = 25.000000000000000" >> ${CONFIG_TMP}

cat "${CONFIG_TMP}" | sort >> ${CONFIG}
rm "${CONFIG_TMP}"
}

init_config() {
local SIDevices=$( cat "${MAIN_CONFIG}" | grep -E "^SIDevice[0-9] *\= *[^6]$")
local SIDevices=$( cat "${MAIN_CONFIG}" | grep -E "^SIDevice[0-9] *= *[^6]$")
[[ -z "${SIDevices}" ]] && return

declare -i LN=$( cat "${MAIN_CONFIG}" | grep -n -E "SIDevice[0-9] *\= *[0-9]" | cut -d: -f1 | head -1 )
declare -i LN=$( cat "${MAIN_CONFIG}" | grep -n -E "SIDevice[0-9] *= *[0-9]" | cut -d: -f1 | head -1 )
[[ "${LN}" == "0" ]] && LN=$( cat "${MAIN_CONFIG}" | grep -n "\[Core\]" | cut -d: -f1 | head -1 )
if [ ${LN} -ne 0 ]; then
sed -i '/SIDevice[0-9] *\= *[0-9]/d' "${MAIN_CONFIG}"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ set_pad() {
echo "axis_y_inverted = no" >> ${CONFIG_TMP_A}

local GC_RECORD
[[ -f "${CONFIG}" ]] && GC_RECORD=$(cat "${CONFIG}" | grep -E "^dead_zone \= [0-9]*$")
[[ -f "${CONFIG}" ]] && GC_RECORD=$(cat "${CONFIG}" | grep -E "^dead_zone = [0-9]*$")
[[ -z "${GC_RECORD}" ]] && GC_RECORD="dead_zone = 10"
echo "${GC_RECORD}" >> ${CONFIG_TMP_E}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -183,9 +183,9 @@ set_pad() {
echo "Mempak switch = \"\"" >> ${CONFIG}
echo "Rumblepak switch = \"\"" >> ${CONFIG}

local RES=$(cat ${CONFIG_TMP} | grep -E "^AnalogPeak *\= *(.*)$")
local RES=$(cat ${CONFIG_TMP} | grep -E "^AnalogPeak *= *(.*)$")
[[ -z "${RES}" ]] && echo "AnalogPeak = \"32768,32768\"" >> ${CONFIG_TMP}
RES=$(cat ${CONFIG_TMP} | grep -E "^AnalogDeadzone *\= *(.*)$")
RES=$(cat ${CONFIG_TMP} | grep -E "^AnalogDeadzone *= *(.*)$")
[[ -z "${GC_RECORD}" ]] && echo "AnalogDeadzone = \"4096,4096\"" >> ${CONFIG_TMP}

cat "${CONFIG_TMP}" | sort >> ${CONFIG}
Expand Down