Merge pull request #2113 from porschemad911/s922x-melonds-sa-hotkeys

S922X - melonds-sa - hotkeys

projects/ROCKNIX/packages/emulators/standalone/melonds-sa/config/S922X/melonDS.ini

@@ -37,8 +37,8 @@ HKKey_FrameStep=-1
 HKKey_PowerButton=-1
 HKKey_VolumeUp=-1
 HKKey_VolumeDown=-1
-HKKey_SaveState=-1
-HKKey_LoadState=-1
+HKKey_SaveState=83
+HKKey_LoadState=76
 HKJoy_Lid=-1
 HKJoy_Mic=-1
 HKJoy_Pause=-1
@@ -46,7 +46,7 @@ HKJoy_Reset=-1
 HKJoy_FastForward=-1
 HKJoy_FastForwardToggle=-1
 HKJoy_FullscreenToggle=-1
-HKJoy_SwapScreens=-1
+HKJoy_SwapScreens=7
 HKJoy_SwapScreenEmphasis=-1
 HKJoy_SolarSensorDecrease=-1
 HKJoy_SolarSensorIncrease=-1

projects/ROCKNIX/packages/emulators/standalone/melonds-sa/scripts/start_melonds.sh

@@ -29,6 +29,11 @@ if [ ! -f "${CONF_DIR}/melonDS.gptk" ]; then
 	cp -r "/usr/config/melonDS/melonDS.gptk" "${CONF_DIR}/melonDS.gptk"
 fi
 
+#Make sure melonDS config exists
+if [ ! -f "${CONF_DIR}/${MELONDS_INI}" ]; then
+	cp -r "/usr/config/melonDS/melonDS.ini" "${CONF_DIR}/${MELONDS_INI}"
+fi
+
 #Emulation Station Features
 GAME=$(echo "${1}" | sed "s#^/.*/##")
 PLATFORM=$(echo "${2}"| sed "s#^/.*/##")

projects/ROCKNIX/packages/rocknix/sources/post-update

@@ -221,3 +221,9 @@ fi
 
 # Clean melonds-sa Gallium HUD config
 sed -i '/nds.show_fps=/d' /storage/.config/system/configs/system.cfg
+
+# Clean S922X melonds-sa config
+if [[ "${HW_DEVICE}" == "S922X" ]]; then
+  rm -f /storage/.config/melonDS/melonDS.gptk
+  rm -f /storage/.config/melonDS/melonDS.ini
+fi