diff --git a/ChangeLog b/ChangeLog index 659e0aab2..90fc3b86d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,18 @@ +Version 2.5.38dev: + +* Several new and update joystick and gamepad configs. +* Built-in configs for Xbox 360 / One pads on OS X (requires driver). +* Changed default stereo separation setting to 70%. +* Windows builds are digitally signed again. +* Imported updated translations from crowdin.com. + +Version 2.5.37dev: + +* Fixed a joystick issue where SDL_JoystickID was not used properly. +* Added new option log_input (replaces environment variable FS_DEBUG_INPUT). +* Also log joystick button and hat events when log_input is enabled. +* Imported updated translations from crowdin.com. + Version 2.5.36dev: * Fixed a crash (floating point exception) if audio device cannot be opened. diff --git a/Makefile.am b/Makefile.am index 4c934206c..02ac4e52a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -574,6 +574,7 @@ libfsemu_a_SOURCES = \ libfsemu/include/fs/image.h \ libfsemu/include/fs/inifile.h \ libfsemu/include/fs/init.h \ + libfsemu/include/fs/lazyness.h \ libfsemu/include/fs/log.h \ libfsemu/include/fs/main.h \ libfsemu/include/fs/malloc.h \ diff --git a/configure.ac b/configure.ac index 679c323a1..df0374b49 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ([2.67]) -AC_INIT([FS-UAE], [2.6.0beta1], +AC_INIT([FS-UAE], [2.6.0beta2], [frode@fs-uae.net], [fs-uae], [http://fs-uae.net]) AC_CONFIG_AUX_DIR([.]) AC_CANONICAL_HOST diff --git a/debian/changelog b/debian/changelog index 5334c6f98..28375fb05 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,5 @@ -fs-uae (2.6.0~beta1-0) unstable; urgency=low +fs-uae (2.6.0~beta2-0) unstable; urgency=low * Dummy changelog entry. - -- Frode Solheim Fri, 7 Aug 2015 18:21:26 +0200 + -- Frode Solheim Sun, 9 Aug 2015 19:22:41 +0200 diff --git a/dist/windows/sign.py b/dist/windows/sign.py index ea5f2a133..96fd95ca3 100644 --- a/dist/windows/sign.py +++ b/dist/windows/sign.py @@ -2,9 +2,6 @@ import sys import subprocess -print("a") if os.path.exists("c:/signtool.py"): assert os.system("python c:/signtool.py \"{}\"".format( sys.argv[1])) == 0 - # p = subprocess.Popen(["python", "c:/signtool.py", sys.argv[1]]) - # assert p.wait() == 0 diff --git a/doc/options/log_input b/doc/options/log_input new file mode 100644 index 000000000..a8b333aec --- /dev/null +++ b/doc/options/log_input @@ -0,0 +1,8 @@ +Summary: Log Input Events +Type: boolean +Default: 0 +Example: 1 + +This option will cause a lot of debug messages to be logged to +fs-uae.log.txt. It is not recommended to enable this unless needed for +testing and debugging. diff --git a/doc/options/stereo_separation b/doc/options/stereo_separation index 24b10eba9..96c7a30f0 100644 --- a/doc/options/stereo_separation +++ b/doc/options/stereo_separation @@ -1,13 +1,12 @@ Description: Stereo Separation -Default: 100 -Example: 70 +Default: 70 +Example: 100 Since: 2.3.12 Type: choice -Controls the amount of mixing of the stereo channels. The default is that the -channels are not mixed together, but especially if you are usng headphones, -and your operating system does not automatically mix channels somewhat when -headphones are plugged in, you may want to choose a lower value (say 70%). +Controls the amount of mixing of the stereo channels. 100% means that +the left and right channels are not mixed together at all, and 0% means +that you get mono sound output on stereo speaker. Value: 100 (100%) Value: 90 (90%) diff --git a/fs-uae.spec b/fs-uae.spec index f286ab88c..da18c2651 100644 --- a/fs-uae.spec +++ b/fs-uae.spec @@ -1,6 +1,6 @@ %define name fs-uae -%define version 2.6.0beta1 -%define unmangled_version 2.6.0beta1 +%define version 2.6.0beta2 +%define unmangled_version 2.6.0beta2 %define release 1%{?dist} Summary: Amiga emulator with on-screen GUI and online play support diff --git a/libfsemu/include/fs/lazyness.h b/libfsemu/include/fs/lazyness.h new file mode 100644 index 000000000..78d61be00 --- /dev/null +++ b/libfsemu/include/fs/lazyness.h @@ -0,0 +1,6 @@ +#ifndef FS_LAZYNESS_H +#define FS_LAZYNESS_H + +extern int g_fs_log_input; + +#endif /* FS_LAZYNESS_H */ diff --git a/libfsemu/include/fs/ml/options.h b/libfsemu/include/fs/ml/options.h index 039217bd2..9927c4904 100644 --- a/libfsemu/include/fs/ml/options.h +++ b/libfsemu/include/fs/ml/options.h @@ -2,6 +2,7 @@ #define FS_ML_OPTIONS_H #define OPTION_CURSOR "cursor" +#define OPTION_LOG_INPUT "log_input" #define OPTION_MOUSE_INTEGRATION "mouse_integration" /* Deprecated options */ diff --git a/libfsemu/src/emu/input.c b/libfsemu/src/emu/input.c index 136833cbf..aa6efc273 100644 --- a/libfsemu/src/emu/input.c +++ b/libfsemu/src/emu/input.c @@ -6,6 +6,7 @@ #include #include #include +#include #include "input.h" #include @@ -54,8 +55,6 @@ keyboard is MAX_DEVICES - 1 */ -static int g_debug_input = 0; - #define MAX_DEVICES 64 #define KEYBOARD 0 #define MOUSE 1 @@ -419,7 +418,7 @@ static void map_custom_joystick_action(int joy, const char *name, int axis, int hat, int button, int value, const char *n1, int n2, const char *n3) { char *config_key = g_strdup_printf("%s%s%d%s", name, n1, n2, n3); - if (g_debug_input) { + if (g_fs_log_input) { fs_log("%s\n", config_key); } const char *config_value = fs_config_get_const_string(config_key); @@ -570,7 +569,7 @@ static void map_custom_gamepad_actions(int joy, const char *name, for (int j = 0; config[j].config_key != NULL; j++) { char *config_key = g_strdup_printf("%s_%s", name, config[j].config_value); - if (g_debug_input) { + if (g_fs_log_input) { fs_log("%s\n", config_key); } const char *config_value = fs_config_get_const_string(config_key); @@ -1127,13 +1126,13 @@ int fs_emu_process_key_event(int key_code, int key_mod, int state) { g_key_modifiers_at_pressed_state[key_code] = key_mod; } - if (g_debug_input) { + if (g_fs_log_input) { fs_log("--> key_code %d key_mod %d state %d: \"%s\"\n", key_code, key_mod, state, g_fs_emu_key_names[key_code]); } // 65536 is also used as null event if (input_event > 0 && input_event < 65536) { - if (g_debug_input) { + if (g_fs_log_input) { fs_log(" = press (index %d) => " "input event %d\n", index, input_event); } @@ -1141,7 +1140,7 @@ int fs_emu_process_key_event(int key_code, int key_mod, int state) { input_event = input_event | (state << 16); fs_emu_queue_input_event(input_event); } - else if (g_debug_input) { + else if (g_fs_log_input) { fs_log(" = press (index %d) => NO INPUT EVENT\n", index); } return 1; @@ -1532,7 +1531,7 @@ static int input_function(fs_ml_event *event) } int state = event->button.state; - if (g_debug_input) { + if (g_fs_log_input) { fs_log(" => mouse button %d, %d\n", event->button.button, state); } if (event->button.button == FS_ML_BUTTON_WHEELUP) { @@ -1544,7 +1543,7 @@ static int input_function(fs_ml_event *event) int input_event = g_input_action_table[mouse_index( event->button.device, 0, 0, event->button.button)]; if (input_event > 0) { - if (g_debug_input) { + if (g_fs_log_input) { fs_log(" => button input_event %d state %d\n", input_event, state); } @@ -1565,9 +1564,6 @@ void fs_emu_input_init(void) { fs_log("fs_emu_input_init\n"); - g_debug_input = getenv("FS_DEBUG_INPUT") && \ - getenv("FS_DEBUG_INPUT")[0] == '1'; - g_input_event_mutex = fs_mutex_create(); g_input_event_queue = g_queue_new(); diff --git a/libfsemu/src/ml/input.c b/libfsemu/src/ml/input.c index 4f7edcf40..fd1c4e289 100644 --- a/libfsemu/src/ml/input.c +++ b/libfsemu/src/ml/input.c @@ -5,6 +5,7 @@ #include #include #include +#include #include #include #include @@ -17,10 +18,14 @@ static GQueue *g_input_queue = NULL; static fs_mutex *g_input_mutex = NULL; static fs_ml_input_function g_input_function = NULL; +int g_fs_log_input = 0; int g_fs_ml_first_keyboard_index = 0; int g_fs_ml_first_mouse_index = 0; int g_fs_ml_first_joystick_index = 0; +/* maps SDL joystick indices to fs_ml indices */ +SDL_JoystickID g_fs_ml_sdl_joystick_index_map[MAX_SDL_JOYSTICK_IDS]; + static int g_cursor_mode = 1; static int g_mouse_integration = 0; @@ -113,6 +118,23 @@ char *fs_ml_input_fix_joystick_name(const char *name, int upper) return n; } +static int fs_ml_check_joystick_blacklist_by_guid(const char *guid) +{ + if (false) { +#if 0 + } else if (strcasecmp(guid, "efbeedfe000000000000504944564944") == 0) { + /* VIRTUAL HID DEVICE */ + return 1; +#endif +#if 0 + } else if (strcasecmp(guid, "030000000b0400003365000000010000") == 0) { + /* MOSIC SPEED-LINK COMPETITION PRO */ + return 1; +#endif + } + return 0; +} + void fs_ml_input_init() { FS_ML_INIT_ONCE; @@ -121,6 +143,14 @@ void fs_ml_input_init() fs_log("fs_ml_input_init\n"); + g_fs_log_input = getenv("FS_DEBUG_INPUT") && \ + getenv("FS_DEBUG_INPUT")[0] == '1'; + + if (fs_config_get_boolean(OPTION_LOG_INPUT) == 1) { + fs_log("Logging: enable input event logging\n"); + g_fs_log_input = 1; + } + if (fs_config_get_boolean(OPTION_MOUSE_INTEGRATION) == 1) { g_mouse_integration = 1; } @@ -173,7 +203,19 @@ void fs_ml_input_init() fs_log("WARNING: reached max num devices\n"); break; } + + char guid_str[33]; + SDL_JoystickGUID guid = SDL_JoystickGetDeviceGUID(i); + SDL_JoystickGetGUIDString(guid, guid_str, 33); + guid_str[32] = '\0'; + fs_log("SDL_JoystickGetDeviceGUID(%d) = %s\n", i, guid_str); + if (fs_ml_check_joystick_blacklist_by_guid(guid_str)) { + fs_log("- blacklisted, not opening!\n"); + continue; + } + SDL_Joystick *joystick = SDL_JoystickOpen(i); + fs_log("SDL_JoystickOpen(%d)\n", i); #ifdef USE_SDL2 char *name = fs_ml_input_fix_joystick_name( @@ -209,6 +251,17 @@ void fs_ml_input_init() g_fs_ml_input_devices[k].hats, g_fs_ml_input_devices[k].axes, g_fs_ml_input_devices[k].balls); + + SDL_JoystickID instance_id = SDL_JoystickInstanceID(joystick); + fs_log("- instance ID = %d\n", instance_id); + if (instance_id >= MAX_SDL_JOYSTICK_IDS) { + fs_log("SDL_JoystickID > %d\n", MAX_SDL_JOYSTICK_IDS); + fs_log("- closing joystick\n"); + SDL_JoystickClose(joystick); + continue; + } + + g_fs_ml_sdl_joystick_index_map[instance_id] = k; k += 1; } diff --git a/libfsemu/src/ml/ml_internal.h b/libfsemu/src/ml/ml_internal.h index 270df44f2..a660899f2 100644 --- a/libfsemu/src/ml/ml_internal.h +++ b/libfsemu/src/ml/ml_internal.h @@ -49,7 +49,12 @@ extern fs_ml_input_device *g_fs_ml_input_devices; extern int g_fs_ml_input_device_count; extern int g_fs_ml_first_keyboard_index; extern int g_fs_ml_first_mouse_index; -extern int g_fs_ml_first_joystick_index; +// extern int g_fs_ml_first_joystick_index; +#define MAX_SDL_JOYSTICK_IDS 1024 +#ifdef USE_SDL2 +#include +extern SDL_JoystickID g_fs_ml_sdl_joystick_index_map[MAX_SDL_JOYSTICK_IDS]; +#endif extern int g_fs_ml_running; diff --git a/libfsemu/src/ml/mouse.c b/libfsemu/src/ml/mouse.c index d3830dc95..fcc790008 100644 --- a/libfsemu/src/ml/mouse.c +++ b/libfsemu/src/ml/mouse.c @@ -7,6 +7,7 @@ #include #include #include +#include #include #include @@ -15,10 +16,9 @@ static fs_thread *g_manymouse_thread = NULL; static int g_first_manymouse_index = 0; static volatile int g_manymouse_last_index = -1; -static int g_debug_input = 0; #define db_log(name, format, ...) \ - if (g_debug_ ## name) { \ + if (g_fs_log_ ## name) { \ fs_log(format, ## __VA_ARGS__); \ } @@ -160,9 +160,6 @@ void fs_ml_mouse_init(void) FS_ML_INIT_ONCE; fs_log("fs_ml_mouse_init\n"); - g_debug_input = getenv("FS_DEBUG_INPUT") && \ - getenv("FS_DEBUG_INPUT")[0] == '1'; - g_fs_ml_first_mouse_index = g_fs_ml_input_device_count; int k = g_fs_ml_input_device_count; diff --git a/libfsemu/src/ml/rawinput.c b/libfsemu/src/ml/rawinput.c index 8271d84ee..cb36a5387 100644 --- a/libfsemu/src/ml/rawinput.c +++ b/libfsemu/src/ml/rawinput.c @@ -12,6 +12,7 @@ #include #include +#include #include #include "fs/ml.h" #include "ml_internal.h" @@ -38,8 +39,6 @@ static HWND g_window = 0; //static HGLRC g_hglrc = 0; static HKL g_keyboard_layout = 0; -static int g_debug_keys = 0; - static int g_mod_lalt = 0; static int g_mod_ralt = 0; static int g_mod_lctrl = 0; @@ -71,7 +70,7 @@ static void process_keyboard_input(LPRAWINPUT raw_input) { int vkey = raw_input->data.keyboard.VKey; int flags = raw_input->data.keyboard.Flags; int make_code = raw_input->data.keyboard.MakeCode; - if (g_debug_keys) { + if (g_fs_log_input) { fs_log("vkey...: %d (0x%x) make %d extra %d flags %d E0 %d E1 %d\n", vkey, vkey, raw_input->data.keyboard.MakeCode, raw_input->data.keyboard.ExtraInformation, flags, @@ -532,9 +531,6 @@ static void init_key_mapping() { void fs_ml_init_raw_input() { fs_log("fs_ml_init_raw_input\n"); - g_debug_keys = getenv("FS_DEBUG_INPUT") && \ - getenv("FS_DEBUG_INPUT")[0] == '1'; - //list_input_devices(); init_key_mapping(); diff --git a/libfsemu/src/ml/sdl.c b/libfsemu/src/ml/sdl.c index 7623a7b33..8d125781e 100644 --- a/libfsemu/src/ml/sdl.c +++ b/libfsemu/src/ml/sdl.c @@ -25,6 +25,7 @@ //#endif #include +#include // #include #include #include @@ -65,7 +66,6 @@ static int g_fs_ml_automatic_input_grab = 1; static int g_fs_ml_keyboard_input_grab = 1; static int g_fsaa = 0; -static int g_debug_input = 0; static int g_f12_state, g_f11_state; static char *g_window_title; @@ -923,7 +923,7 @@ int fs_ml_event_loop(void) #endif case SDL_KEYDOWN: case SDL_KEYUP: - if (g_debug_input) { + if (g_fs_log_input) { fs_log("SDL key sym %d mod %d scancode %d state %d repeat %d\n", event.key.keysym.sym, event.key.keysym.mod, event.key.keysym.scancode, event.key.state, @@ -936,7 +936,7 @@ int fs_ml_event_loop(void) /* ignore "ghost key" seen on OS X which without this * specific check will cause the A key to be mysteriously * pressed. */ - if (g_debug_input) { + if (g_fs_log_input) { fs_log("- ignored key with keysym 0 and scancode 0\n"); } continue; @@ -1027,7 +1027,7 @@ int fs_ml_event_loop(void) } #endif else if (key >= 0) { - if (g_debug_input) { + if (g_fs_log_input) { fs_log("- key code set to %d (was %d) based on " "scancode %d\n", key, event.key.keysym.sym, event.key.keysym.scancode); @@ -1091,34 +1091,49 @@ int fs_ml_event_loop(void) new_event->key.state = event.key.state; } else if (event.type == SDL_JOYBUTTONDOWN) { + if (g_fs_log_input) { + fs_log("SDL_JOYBUTTONDOWN which %d button %d state %d\n", + event.jbutton.which, event.jbutton.button, + event.jbutton.state); + } new_event = fs_ml_alloc_event(); new_event->type = FS_ML_JOYBUTTONDOWN; - new_event->jbutton.which = g_fs_ml_first_joystick_index + \ - event.jbutton.which; + new_event->jbutton.which = \ + g_fs_ml_sdl_joystick_index_map[event.jbutton.which]; new_event->jbutton.button = event.jbutton.button; new_event->jbutton.state = event.jbutton.state; } else if (event.type == SDL_JOYBUTTONUP) { + if (g_fs_log_input) { + fs_log("SDL_JOYBUTTONUP which %d button %d state %d\n", + event.jbutton.which, event.jbutton.button, + event.jbutton.state); + } new_event = fs_ml_alloc_event(); new_event->type = FS_ML_JOYBUTTONUP; - new_event->jbutton.which = g_fs_ml_first_joystick_index + \ - event.jbutton.which; + new_event->jbutton.which = \ + g_fs_ml_sdl_joystick_index_map[event.jbutton.which]; new_event->jbutton.button = event.jbutton.button; new_event->jbutton.state = event.jbutton.state; } else if (event.type == SDL_JOYAXISMOTION) { + /* Not logging axis motion, too much noise */ new_event = fs_ml_alloc_event(); new_event->type = FS_ML_JOYAXISMOTION; - new_event->jaxis.which = g_fs_ml_first_joystick_index + \ - event.jaxis.which; + new_event->jaxis.which = \ + g_fs_ml_sdl_joystick_index_map[event.jaxis.which]; new_event->jaxis.axis = event.jaxis.axis; new_event->jaxis.value = event.jaxis.value; } else if (event.type == SDL_JOYHATMOTION) { + if (g_fs_log_input) { + fs_log("SDL_JOYHATMOTION which %d hat %d value %d\n", + event.jhat.which, event.jhat.hat, event.jhat.value); + } new_event = fs_ml_alloc_event(); new_event->type = FS_ML_JOYHATMOTION; - new_event->jhat.which = g_fs_ml_first_joystick_index + \ - event.jhat.which; + new_event->jhat.which = \ + g_fs_ml_sdl_joystick_index_map[event.jhat.which]; new_event->jhat.hat = event.jhat.hat; new_event->jhat.value = event.jhat.value; } @@ -1133,7 +1148,7 @@ int fs_ml_event_loop(void) new_event->motion.y = event.motion.y; //printf("ISREL %d\n", SDL_GetRelativeMouseMode()); - if (g_debug_input) { + if (g_fs_log_input) { fs_log("SDL mouse event x: %4d y: %4d xrel: %4d yrel: %4d\n", event.motion.x, event.motion.y, event.motion.xrel, event.motion.yrel); @@ -1183,7 +1198,7 @@ int fs_ml_event_loop(void) } */ if (event.wheel.y) { - if (g_debug_input) { + if (g_fs_log_input) { fs_log("SDL mouse event y-scroll: %4d\n", event.wheel.y); } @@ -1286,9 +1301,6 @@ void fs_ml_video_init() g_video_event_queue = g_queue_new(); g_video_event_mutex = fs_mutex_create(); - g_debug_input = getenv("FS_DEBUG_INPUT") && \ - getenv("FS_DEBUG_INPUT")[0] == '1'; - fs_ml_render_init(); } diff --git a/po/cs.po b/po/cs.po index b3b80144f..c12cd0cd7 100644 --- a/po/cs.po +++ b/po/cs.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: fs-uae\n" "Report-Msgid-Bugs-To: frode@fs-uae.net\n" -"POT-Creation-Date: 2015-04-02 15:52+0200\n" -"PO-Revision-Date: 2015-04-11 02:57-0400\n" +"POT-Creation-Date: 2015-08-07 20:13+0200\n" +"PO-Revision-Date: 2015-08-08 12:23-0400\n" "Last-Translator: FrodeSolheim \n" "Language-Team: Czech\n" "Language: cs_CZ\n" @@ -174,6 +174,12 @@ msgstr "Nastavení chip_memory musí být násobek 512ti" msgid "Option fast_memory must be a multiple of 1024" msgstr "Nastavení fast_memory musí být násobek 1024" +msgid "Option motherboard_ram must be a multiple of 1024" +msgstr "" + +msgid "Option motherboard_ram needs a CPU with 32-bit addressing" +msgstr "" + msgid "Option slow_memory must be a multiple of 256" msgstr "Nastavení slow_memory musí být násobek 256ti" @@ -243,9 +249,3 @@ msgstr "" msgid "[ Port 0 ] Switched to mouse mode" msgstr "" -msgid "Invalid number of CD-ROM drives specified" -msgstr "Uveden špatný počet CD-ROM mechanik" - -msgid "Options zorro_iii_memory needs a CPU with 32-bit addressing" -msgstr "Nastavení zorro_iii_memory vyžaduje CPU s 32-bit adresováním" - diff --git a/po/da.po b/po/da.po index c02df57a5..329cc3715 100644 --- a/po/da.po +++ b/po/da.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: fs-uae\n" "Report-Msgid-Bugs-To: frode@fs-uae.net\n" -"POT-Creation-Date: 2015-04-02 15:52+0200\n" -"PO-Revision-Date: 2015-04-11 02:57-0400\n" +"POT-Creation-Date: 2015-08-07 20:13+0200\n" +"PO-Revision-Date: 2015-08-08 12:23-0400\n" "Last-Translator: FrodeSolheim \n" "Language-Team: Danish\n" "Language: da_DK\n" @@ -174,6 +174,12 @@ msgstr "Indstilling chip_memory skal været et multiplicum af 512" msgid "Option fast_memory must be a multiple of 1024" msgstr "Indstilling fast_memory skal været et multiplicum af 1024" +msgid "Option motherboard_ram must be a multiple of 1024" +msgstr "" + +msgid "Option motherboard_ram needs a CPU with 32-bit addressing" +msgstr "" + msgid "Option slow_memory must be a multiple of 256" msgstr "Indstilling slow_memory skal været et multiplicum af 256" @@ -243,9 +249,3 @@ msgstr "[ Port 0 ] Skiftet til joystick tilstand" msgid "[ Port 0 ] Switched to mouse mode" msgstr "[ Port 0 ] Skiftet til mus-tilstand" -msgid "Invalid number of CD-ROM drives specified" -msgstr "Antallet af specificerede CD-ROM drev er invalid" - -msgid "Options zorro_iii_memory needs a CPU with 32-bit addressing" -msgstr "Indstilling zorro_iii_memory kræver en CPU med 32-bits adressering" - diff --git a/po/de.po b/po/de.po index 401c2166b..46295b316 100644 --- a/po/de.po +++ b/po/de.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: fs-uae\n" "Report-Msgid-Bugs-To: frode@fs-uae.net\n" -"POT-Creation-Date: 2015-04-02 15:52+0200\n" -"PO-Revision-Date: 2015-04-11 02:57-0400\n" +"POT-Creation-Date: 2015-08-07 20:13+0200\n" +"PO-Revision-Date: 2015-08-08 12:23-0400\n" "Last-Translator: FrodeSolheim \n" "Language-Team: German\n" "Language: de_DE\n" @@ -174,6 +174,12 @@ msgstr "Die Option chip_memory muss ein Vielfaches von 512 sein" msgid "Option fast_memory must be a multiple of 1024" msgstr "Die Option fast_memory muss ein Vielfaches von 1024 sein" +msgid "Option motherboard_ram must be a multiple of 1024" +msgstr "" + +msgid "Option motherboard_ram needs a CPU with 32-bit addressing" +msgstr "" + msgid "Option slow_memory must be a multiple of 256" msgstr "Die Option slow_memory muss ein Vielfaches von 256 sein" @@ -243,9 +249,3 @@ msgstr "[ Anschluss 0 ] Auf Joystick-Modus umgestellt" msgid "[ Port 0 ] Switched to mouse mode" msgstr "[ Anschluss 0 ] Auf Maus-Modus umgestellt" -msgid "Invalid number of CD-ROM drives specified" -msgstr "Ungültige Anzahl von CDROM-Laufwerken spezifiziert" - -msgid "Options zorro_iii_memory needs a CPU with 32-bit addressing" -msgstr "Die Option zorro_iii_memory benötigt eine CPU mit 32bit-Adressierung" - diff --git a/po/el.po b/po/el.po index 0e50b90de..103c37669 100644 --- a/po/el.po +++ b/po/el.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: fs-uae\n" "Report-Msgid-Bugs-To: frode@fs-uae.net\n" -"POT-Creation-Date: 2015-04-02 15:52+0200\n" -"PO-Revision-Date: 2015-04-11 02:57-0400\n" +"POT-Creation-Date: 2015-08-07 20:13+0200\n" +"PO-Revision-Date: 2015-08-08 12:23-0400\n" "Last-Translator: FrodeSolheim \n" "Language-Team: Greek\n" "Language: el_GR\n" @@ -174,6 +174,12 @@ msgstr "Η επιλογή chip_memory πρέπει να είναι πολλαπ msgid "Option fast_memory must be a multiple of 1024" msgstr "Η επιλογή fast_memory πρέπει να είναι πολλαπλάσιο του 1024" +msgid "Option motherboard_ram must be a multiple of 1024" +msgstr "" + +msgid "Option motherboard_ram needs a CPU with 32-bit addressing" +msgstr "" + msgid "Option slow_memory must be a multiple of 256" msgstr "Η επιλογή slow_memory πρέπει να είναι πολλαπλάσιο του 256" @@ -243,9 +249,3 @@ msgstr "[ Port 0 ] Άλλαξε σε λειτουργία χειριστηρίο msgid "[ Port 0 ] Switched to mouse mode" msgstr "[ Port 0 ] Άλλαξε σε λειτουργία ποντικιού" -msgid "Invalid number of CD-ROM drives specified" -msgstr "Καθορίσατε μη έγκυρο αριθμό μονάδων CD-ROM" - -msgid "Options zorro_iii_memory needs a CPU with 32-bit addressing" -msgstr "Η επιλογή Zorro_III_memory απαιτεί επεξεργαστή με δυνατότητα 32-bit" - diff --git a/po/es.po b/po/es.po index ae5fde927..406d35287 100644 --- a/po/es.po +++ b/po/es.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: fs-uae\n" "Report-Msgid-Bugs-To: frode@fs-uae.net\n" -"POT-Creation-Date: 2015-04-02 15:52+0200\n" -"PO-Revision-Date: 2015-04-11 02:57-0400\n" +"POT-Creation-Date: 2015-08-07 20:13+0200\n" +"PO-Revision-Date: 2015-08-08 12:23-0400\n" "Last-Translator: FrodeSolheim \n" "Language-Team: Spanish\n" "Language: es_ES\n" @@ -174,6 +174,12 @@ msgstr "Opción chip_memori debe ser mútiplo de 512" msgid "Option fast_memory must be a multiple of 1024" msgstr "Opción fast_memory debe ser mútiplo de 1024" +msgid "Option motherboard_ram must be a multiple of 1024" +msgstr "" + +msgid "Option motherboard_ram needs a CPU with 32-bit addressing" +msgstr "" + msgid "Option slow_memory must be a multiple of 256" msgstr "Opción fast_memory debe ser mútiplo de 256" @@ -243,9 +249,3 @@ msgstr "[ Puerto 0 ] Cambiado a joystick" msgid "[ Port 0 ] Switched to mouse mode" msgstr "[ Puerto 0 ] Cambiado a ratón" -msgid "Invalid number of CD-ROM drives specified" -msgstr "Numero inválido de disco CD-ROM especificado" - -msgid "Options zorro_iii_memory needs a CPU with 32-bit addressing" -msgstr "Opción zorro_iii_memory necesita una CPU CON direcciones de 32-bit" - diff --git a/po/fi.po b/po/fi.po index 651fa31d2..ac9999bf5 100644 --- a/po/fi.po +++ b/po/fi.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: fs-uae\n" "Report-Msgid-Bugs-To: frode@fs-uae.net\n" -"POT-Creation-Date: 2015-04-02 15:52+0200\n" -"PO-Revision-Date: 2015-04-11 02:57-0400\n" +"POT-Creation-Date: 2015-08-09 18:14+0200\n" +"PO-Revision-Date: 2015-08-09 12:15-0400\n" "Last-Translator: FrodeSolheim \n" "Language-Team: Finnish\n" "Language: fi_FI\n" @@ -169,22 +169,28 @@ msgid "Option \"%s\" is not enabled" msgstr "Asetusta \"%s\" ei ole määritetty" msgid "Option chip_memory must be a multiple of 512" -msgstr "Asetuksen \"Chip muisti\" (chip_memory) täytyy olla 512:n kerrannainen" +msgstr "Asetuksen chip_memory (Chip muisti) täytyy olla 512:n kerrannainen" msgid "Option fast_memory must be a multiple of 1024" -msgstr "Asetuksen \"Fast muisti\" (fast_memory) täytyy olla 1024:n kerrannainen" +msgstr "Asetuksen fast_memory (Fast muisti) täytyy olla 1024:n kerrannainen" + +msgid "Option motherboard_ram must be a multiple of 1024" +msgstr "Asetuksen motherboard_ram (Emolevyn muisti) täytyy olla 1024 kerrannainen" + +msgid "Option motherboard_ram needs a CPU with 32-bit addressing" +msgstr "Asetus motherboard_ram (Emolevyn muisti) vaatii suorittimen 32-bittisellä muistinosoituksella" msgid "Option slow_memory must be a multiple of 256" -msgstr "Asetuksen \"Slow muisti\" (slow_memory) täytyy olla 256:n kerrannainen" +msgstr "Asetuksen slow_memory (Slow muisti) täytyy olla 256:n kerrannainen" msgid "Option uaegfx.card needs a CPU with 32-bit addressing" -msgstr "Asetus \"Picasso96-tuki\" (uaegfx.card) vaatii suorittimen 32-bittisellä muistiosoituksella" +msgstr "Asetus uaegfx.card (Picasso96-tuki) vaatii suorittimen 32-bittisellä muistiosoituksella" msgid "Option zorro_iii_memory must be a multiple of 1024" -msgstr "Asetuksen \"Zorro III muisti\" (zorro_iii_memory) täytyy olla 1024:n kerrannainen" +msgstr "Asetuksen zorro_iii_memory (Zorro III muisti) täytyy olla 1024:n kerrannainen" msgid "Option zorro_iii_memory needs a CPU with 32-bit addressing" -msgstr "Asetus \"Zorro III muisti\" (zorro_iii_memory) vaatii suorittimen 32-bittisellä muistiosoituksella" +msgstr "Asetus zorro_iii_memory (Zorro III muisti) vaatii suorittimen 32-bittisellä muistiosoituksella" #. / TRANSLATORS: This is a menu entry and must not be too long msgid "Parallel Joystick Ports" @@ -243,9 +249,3 @@ msgstr "[Port 0] vaihdettu peliohjaintilaan" msgid "[ Port 0 ] Switched to mouse mode" msgstr "[Port 0] vaihdettu hiiritilaan" -msgid "Invalid number of CD-ROM drives specified" -msgstr "Virheellinen määrä CD-ROM asemia määritelty" - -msgid "Options zorro_iii_memory needs a CPU with 32-bit addressing" -msgstr "Asetus \"Zorro III muisti\" (zorro_iii_memory) vaatii suorittimen 32-bittisellä muistiosoituksella" - diff --git a/po/fr.po b/po/fr.po index 85362f416..cb5b39040 100644 --- a/po/fr.po +++ b/po/fr.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: fs-uae\n" "Report-Msgid-Bugs-To: frode@fs-uae.net\n" -"POT-Creation-Date: 2015-04-02 15:52+0200\n" -"PO-Revision-Date: 2015-04-11 02:57-0400\n" +"POT-Creation-Date: 2015-08-07 20:13+0200\n" +"PO-Revision-Date: 2015-08-08 12:23-0400\n" "Last-Translator: FrodeSolheim \n" "Language-Team: French\n" "Language: fr_FR\n" @@ -174,6 +174,12 @@ msgstr "L'option mémoire_chip doit être un multiple de 512" msgid "Option fast_memory must be a multiple of 1024" msgstr "L'option mémoire_fast doit être un multiple de 1024" +msgid "Option motherboard_ram must be a multiple of 1024" +msgstr "" + +msgid "Option motherboard_ram needs a CPU with 32-bit addressing" +msgstr "" + msgid "Option slow_memory must be a multiple of 256" msgstr "L'option mémoire_slow doit être un multiple de 256" @@ -184,7 +190,7 @@ msgid "Option zorro_iii_memory must be a multiple of 1024" msgstr "L'option mémoire_zorro_iii doit être un multiple de 1024" msgid "Option zorro_iii_memory needs a CPU with 32-bit addressing" -msgstr "" +msgstr "L'option mémoire_zorro_iii a besoin d'un CPU avec adressage 32 bits" #. / TRANSLATORS: This is a menu entry and must not be too long msgid "Parallel Joystick Ports" @@ -243,9 +249,3 @@ msgstr "[Port 0] Passer en mode joystick" msgid "[ Port 0 ] Switched to mouse mode" msgstr "[Port 0] Passer en mode souris" -msgid "Invalid number of CD-ROM drives specified" -msgstr "Nombre de lecteurs CD-ROM spécifié invalide" - -msgid "Options zorro_iii_memory needs a CPU with 32-bit addressing" -msgstr "L'option mémoire_zorro_iii requiert un CPU avec adressage 32 bits" - diff --git a/po/it.po b/po/it.po index 6ce7f62ad..1d086aeca 100644 --- a/po/it.po +++ b/po/it.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: fs-uae\n" "Report-Msgid-Bugs-To: frode@fs-uae.net\n" -"POT-Creation-Date: 2015-04-02 15:52+0200\n" -"PO-Revision-Date: 2015-04-11 02:57-0400\n" +"POT-Creation-Date: 2015-08-07 20:13+0200\n" +"PO-Revision-Date: 2015-08-08 12:23-0400\n" "Last-Translator: FrodeSolheim \n" "Language-Team: Italian\n" "Language: it_IT\n" @@ -174,6 +174,12 @@ msgstr "L'opzione chip_memory deve essere un multiplo di 512" msgid "Option fast_memory must be a multiple of 1024" msgstr "L'opzione fast_memory deve essere un multiplo di 1024" +msgid "Option motherboard_ram must be a multiple of 1024" +msgstr "" + +msgid "Option motherboard_ram needs a CPU with 32-bit addressing" +msgstr "" + msgid "Option slow_memory must be a multiple of 256" msgstr "L'opzione slow_memory deve essere un multiplo di 256" @@ -243,9 +249,3 @@ msgstr "[ Porta 0 ] Passata in modalità joystick" msgid "[ Port 0 ] Switched to mouse mode" msgstr "[ Porta 0 ] Passata in modalità mouse" -msgid "Invalid number of CD-ROM drives specified" -msgstr "Numero di unità CD-ROM specificato non valido" - -msgid "Options zorro_iii_memory needs a CPU with 32-bit addressing" -msgstr "L'opzioni zorro_iii_memory ha bisogno di una CPU con indirizzamento a 32-bit" - diff --git a/po/nb.po b/po/nb.po index b20399710..e759d0bee 100644 --- a/po/nb.po +++ b/po/nb.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: fs-uae\n" "Report-Msgid-Bugs-To: frode@fs-uae.net\n" -"POT-Creation-Date: 2015-04-02 15:52+0200\n" -"PO-Revision-Date: 2015-04-11 02:57-0400\n" +"POT-Creation-Date: 2015-08-07 20:13+0200\n" +"PO-Revision-Date: 2015-08-08 12:23-0400\n" "Last-Translator: FrodeSolheim \n" "Language-Team: Norwegian Bokmal\n" "Language: nb_NO\n" @@ -174,6 +174,12 @@ msgstr "Instillingen chip_memory må være multiplum av 512" msgid "Option fast_memory must be a multiple of 1024" msgstr "Instillingen fast_memory må være multiplum av 1024" +msgid "Option motherboard_ram must be a multiple of 1024" +msgstr "Instillingen motherboard_ram må være multiplum av 1024" + +msgid "Option motherboard_ram needs a CPU with 32-bit addressing" +msgstr "Instillingen motherboard_ram trenger en CPU med 32-bits adressering" + msgid "Option slow_memory must be a multiple of 256" msgstr "Instillingen slow_memory må være multiplum av 256" @@ -243,9 +249,3 @@ msgstr "[Port 0] Byttet til joystick-modus" msgid "[ Port 0 ] Switched to mouse mode" msgstr "[Port 0] Byttet til mus-modus" -msgid "Invalid number of CD-ROM drives specified" -msgstr "Ugyldig antall CD-ROM-stasjoner spesifisert" - -msgid "Options zorro_iii_memory needs a CPU with 32-bit addressing" -msgstr "Instillingen zorro_iii_memory trenger en CPU med 32-bits adressering" - diff --git a/po/pl.po b/po/pl.po index 0f3bb06b5..0cf51a294 100644 --- a/po/pl.po +++ b/po/pl.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: fs-uae\n" "Report-Msgid-Bugs-To: frode@fs-uae.net\n" -"POT-Creation-Date: 2015-04-02 15:52+0200\n" -"PO-Revision-Date: 2015-04-11 02:57-0400\n" +"POT-Creation-Date: 2015-08-07 20:13+0200\n" +"PO-Revision-Date: 2015-08-08 12:23-0400\n" "Last-Translator: FrodeSolheim \n" "Language-Team: Polish\n" "Language: pl_PL\n" @@ -174,6 +174,12 @@ msgstr "Opcja chip_memory musi być wielokrotnością 512" msgid "Option fast_memory must be a multiple of 1024" msgstr "Opcja fast_memory musi być wielokrotnością 1024" +msgid "Option motherboard_ram must be a multiple of 1024" +msgstr "Opcja motherboard_ram musi być wielokrotnością 1024" + +msgid "Option motherboard_ram needs a CPU with 32-bit addressing" +msgstr "Opcja motherboard_memory wymaga CPU z 32-bitowym adresowaniem" + msgid "Option slow_memory must be a multiple of 256" msgstr "Opcja slow_memory musi być wielokrotnością 256" @@ -243,9 +249,3 @@ msgstr "[ Port 0 ] Przełączony w tryb joysticka" msgid "[ Port 0 ] Switched to mouse mode" msgstr "[ Port 0 ] Przełączony w tryb myszy" -msgid "Invalid number of CD-ROM drives specified" -msgstr "Nieprawidłowo określona ilość napędów CD-ROM" - -msgid "Options zorro_iii_memory needs a CPU with 32-bit addressing" -msgstr "Opcja zorro_iii_memory wymaga CPU z 32-bitowym adresowaniem" - diff --git a/po/pt.po b/po/pt.po index ee228774f..896cf2b3c 100644 --- a/po/pt.po +++ b/po/pt.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: fs-uae\n" "Report-Msgid-Bugs-To: frode@fs-uae.net\n" -"POT-Creation-Date: 2015-04-02 15:52+0200\n" -"PO-Revision-Date: 2015-04-11 02:57-0400\n" +"POT-Creation-Date: 2015-08-07 20:13+0200\n" +"PO-Revision-Date: 2015-08-08 12:23-0400\n" "Last-Translator: FrodeSolheim \n" "Language-Team: Portuguese\n" "Language: pt_PT\n" @@ -174,6 +174,12 @@ msgstr "Opção chip_memory necessita de múltiplos de 512" msgid "Option fast_memory must be a multiple of 1024" msgstr "Opção fast_memory necessita de múltiplos de 1024" +msgid "Option motherboard_ram must be a multiple of 1024" +msgstr "" + +msgid "Option motherboard_ram needs a CPU with 32-bit addressing" +msgstr "" + msgid "Option slow_memory must be a multiple of 256" msgstr "Opção slow_memory necessita de múltiplos de 256" @@ -243,9 +249,3 @@ msgstr "" msgid "[ Port 0 ] Switched to mouse mode" msgstr "" -msgid "Invalid number of CD-ROM drives specified" -msgstr "Número de leitores de CD-ROM especificados inválido" - -msgid "Options zorro_iii_memory needs a CPU with 32-bit addressing" -msgstr "Opção zorro_iii_memory necessita um CPU com endereçamento de 32bits" - diff --git a/po/pt_BR.po b/po/pt_BR.po index 86388eb39..e38dae78c 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: fs-uae\n" "Report-Msgid-Bugs-To: frode@fs-uae.net\n" -"POT-Creation-Date: 2015-04-02 15:52+0200\n" -"PO-Revision-Date: 2015-04-11 02:57-0400\n" +"POT-Creation-Date: 2015-08-07 20:13+0200\n" +"PO-Revision-Date: 2015-08-08 12:23-0400\n" "Last-Translator: FrodeSolheim \n" "Language-Team: Portuguese, Brazilian\n" "Language: pt_BR\n" @@ -174,6 +174,12 @@ msgstr "" msgid "Option fast_memory must be a multiple of 1024" msgstr "" +msgid "Option motherboard_ram must be a multiple of 1024" +msgstr "" + +msgid "Option motherboard_ram needs a CPU with 32-bit addressing" +msgstr "" + msgid "Option slow_memory must be a multiple of 256" msgstr "" @@ -243,9 +249,3 @@ msgstr "" msgid "[ Port 0 ] Switched to mouse mode" msgstr "" -msgid "Invalid number of CD-ROM drives specified" -msgstr "" - -msgid "Options zorro_iii_memory needs a CPU with 32-bit addressing" -msgstr "" - diff --git a/po/sr.po b/po/sr.po index 067cc40fd..4141c2eab 100644 --- a/po/sr.po +++ b/po/sr.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: fs-uae\n" "Report-Msgid-Bugs-To: frode@fs-uae.net\n" -"POT-Creation-Date: 2015-04-02 15:52+0200\n" -"PO-Revision-Date: 2015-04-11 02:57-0400\n" +"POT-Creation-Date: 2015-08-07 20:13+0200\n" +"PO-Revision-Date: 2015-08-08 12:23-0400\n" "Last-Translator: FrodeSolheim \n" "Language-Team: Serbian (Latin)\n" "Language: sr_CS\n" @@ -174,6 +174,12 @@ msgstr "Opcija chip_memory mora biti umnožak broja 512" msgid "Option fast_memory must be a multiple of 1024" msgstr "Opcija fast_memory mora biti umnožak broja 1024" +msgid "Option motherboard_ram must be a multiple of 1024" +msgstr "" + +msgid "Option motherboard_ram needs a CPU with 32-bit addressing" +msgstr "" + msgid "Option slow_memory must be a multiple of 256" msgstr "Opcija slow_memory mora biti umnožak broja 256" @@ -243,9 +249,3 @@ msgstr "" msgid "[ Port 0 ] Switched to mouse mode" msgstr "" -msgid "Invalid number of CD-ROM drives specified" -msgstr "Naveden je neispravan broj CD-ROM ova" - -msgid "Options zorro_iii_memory needs a CPU with 32-bit addressing" -msgstr "Opcije zorro_iii_memory zahtevaju procesor sa 32-bitnim adresiranjem" - diff --git a/po/sv.po b/po/sv.po index d6ea0ffc8..559ed3372 100644 --- a/po/sv.po +++ b/po/sv.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: fs-uae\n" "Report-Msgid-Bugs-To: frode@fs-uae.net\n" -"POT-Creation-Date: 2015-04-02 15:52+0200\n" -"PO-Revision-Date: 2015-04-11 02:57-0400\n" +"POT-Creation-Date: 2015-08-07 20:13+0200\n" +"PO-Revision-Date: 2015-08-08 12:23-0400\n" "Last-Translator: FrodeSolheim \n" "Language-Team: Swedish\n" "Language: sv_SE\n" @@ -174,6 +174,12 @@ msgstr "" msgid "Option fast_memory must be a multiple of 1024" msgstr "" +msgid "Option motherboard_ram must be a multiple of 1024" +msgstr "" + +msgid "Option motherboard_ram needs a CPU with 32-bit addressing" +msgstr "" + msgid "Option slow_memory must be a multiple of 256" msgstr "" @@ -243,9 +249,3 @@ msgstr "" msgid "[ Port 0 ] Switched to mouse mode" msgstr "" -msgid "Invalid number of CD-ROM drives specified" -msgstr "" - -msgid "Options zorro_iii_memory needs a CPU with 32-bit addressing" -msgstr "" - diff --git a/po/tr.po b/po/tr.po index ba7cc94fc..7be36ff91 100644 --- a/po/tr.po +++ b/po/tr.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: fs-uae\n" "Report-Msgid-Bugs-To: frode@fs-uae.net\n" -"POT-Creation-Date: 2015-04-02 15:52+0200\n" -"PO-Revision-Date: 2015-04-11 02:57-0400\n" +"POT-Creation-Date: 2015-08-07 20:13+0200\n" +"PO-Revision-Date: 2015-08-08 12:23-0400\n" "Last-Translator: FrodeSolheim \n" "Language-Team: Turkish\n" "Language: tr_TR\n" @@ -174,6 +174,12 @@ msgstr "chip_memory ayarı 512'nin katı olmalıdır" msgid "Option fast_memory must be a multiple of 1024" msgstr "fast_memory ayarı 1024'ün katı olmalıdır" +msgid "Option motherboard_ram must be a multiple of 1024" +msgstr "" + +msgid "Option motherboard_ram needs a CPU with 32-bit addressing" +msgstr "" + msgid "Option slow_memory must be a multiple of 256" msgstr "slow_memory ayarı 256'nın katı olmalıdır" @@ -243,9 +249,3 @@ msgstr "[ Port 0 ] Joystick moduna geçildi" msgid "[ Port 0 ] Switched to mouse mode" msgstr "[ Port 0 ] Fare moduna geçildi" -msgid "Invalid number of CD-ROM drives specified" -msgstr "Belirtilen CD-ROM sürücüsü sayısı geçersiz" - -msgid "Options zorro_iii_memory needs a CPU with 32-bit addressing" -msgstr "zorro_iii_memory ayarı 32-bit adreslemeli bir CPU gerektirir" - diff --git a/share/fs-uae/input/00000000000000000000000000000000.fs-uae-controller b/share/fs-uae/input/00000000000000000000000000000000.fs-uae-controller new file mode 100644 index 000000000..2db2dae77 --- /dev/null +++ b/share/fs-uae/input/00000000000000000000000000000000.fs-uae-controller @@ -0,0 +1,43 @@ +[fs-uae-controller] +name = XInput Controller +platform = windows + +[device] +make = XInput +model = Controller +type = gamepad + +[sdl] +guid = 00000000000000000000000000000000 +buttons = 15 +hats = 0 +axes = 6 +balls = 0 + +[default] +include = universal_gamepad +axis_0_neg = lstick_left +axis_0_pos = lstick_right +axis_1_neg = lstick_up +axis_1_pos = lstick_down +axis_2_neg = rstick_left +axis_2_pos = rstick_right +axis_3_neg = rstick_up +axis_3_pos = rstick_down +axis_4_pos = left_trigger +axis_5_pos = right_trigger +button_0 = dpad_up +button_1 = dpad_down +button_10 = south_button +button_11 = east_button +button_12 = west_button +button_13 = north_button +button_14 = menu_button +button_2 = dpad_left +button_3 = dpad_right +button_4 = start_button +button_5 = select_button +button_6 = lstick_button +button_7 = rstick_button +button_8 = left_shoulder +button_9 = right_shoulder diff --git a/share/fs-uae/input/030000000b0400003365000000010000.fs-uae-controller b/share/fs-uae/input/030000000b0400003365000000010000.fs-uae-controller new file mode 100644 index 000000000..9132cf6b7 --- /dev/null +++ b/share/fs-uae/input/030000000b0400003365000000010000.fs-uae-controller @@ -0,0 +1,26 @@ +[fs-uae-controller] +name = MOSIC SPEED-LINK Competition Pro +platform = linux + +[device] +make = Speed-Link +model = Competition Pro +type = joystick + +[sdl] +guid = 030000000b0400003365000000010000 +buttons = 4 +hats = 0 +axes = 2 +balls = 0 + +[default] +include = universal_gamepad +axis_0_neg = dpad_left +axis_0_pos = dpad_right +axis_1_neg = dpad_up +axis_1_pos = dpad_down +button_0 = south_button +button_1 = west_button +button_2 = select_button +button_3 = start_button diff --git a/share/fs-uae/input/03000000300f00001201000010010000.fs-uae-controller b/share/fs-uae/input/03000000300f00001201000010010000.fs-uae-controller new file mode 100644 index 000000000..2efa4a6eb --- /dev/null +++ b/share/fs-uae/input/03000000300f00001201000010010000.fs-uae-controller @@ -0,0 +1,42 @@ +[fs-uae-controller] +name = Jess Tech Dual Analog Pad +platform = linux + +[device] +make = Saitek +model = P380 +type = gamepad + +[sdl] +guid = 03000000300f00001201000010010000 +buttons = 12 +hats = 1 +axes = 4 +balls = 0 + +[default] +include = universal_gamepad +axis_0_neg = lstick_left +axis_0_pos = lstick_right +axis_1_neg = lstick_up +axis_1_pos = lstick_down +axis_2_neg = rstick_up +axis_2_pos = rstick_down +axis_3_neg = rstick_left +axis_3_pos = rstick_right +button_0 = west_button +button_1 = north_button +button_10 = lstick_button +button_11 = rstick_button +button_2 = south_button +button_3 = east_button +button_4 = left_shoulder +button_5 = left_trigger +button_6 = right_shoulder +button_7 = right_trigger +button_8 = select_button +button_9 = start_button +hat_0_down = dpad_down +hat_0_left = dpad_left +hat_0_right = dpad_right +hat_0_up = dpad_up diff --git a/share/fs-uae/input/030000004c0500006802000011010000.fs-uae-controller b/share/fs-uae/input/030000004c0500006802000011010000.fs-uae-controller new file mode 100644 index 000000000..5d57614f2 --- /dev/null +++ b/share/fs-uae/input/030000004c0500006802000011010000.fs-uae-controller @@ -0,0 +1,43 @@ +[fs-uae-controller] +name = Sony PLAYSTATION(R)3 Controller +platform = linux + +[device] +make = Sony +model = DualShock 3 +type = gamepad + +[sdl] +guid = 030000004c0500006802000011010000 +buttons = 19 +hats = 0 +axes = 27 +balls = 0 + +[default] +include = universal_gamepad +axis_0_neg = lstick_left +axis_0_pos = lstick_right +axis_1_neg = lstick_up +axis_1_pos = lstick_down +axis_2_neg = rstick_left +axis_2_pos = rstick_right +axis_3_neg = rstick_up +axis_3_pos = rstick_down +button_0 = select_button +button_1 = lstick_button +button_10 = left_shoulder +button_11 = right_shoulder +button_12 = north_button +button_13 = east_button +button_14 = south_button +button_15 = west_button +button_16 = menu_button +button_2 = rstick_button +button_3 = start_button +button_4 = dpad_up +button_5 = dpad_right +button_6 = dpad_down +button_7 = dpad_left +button_8 = left_trigger +button_9 = right_trigger diff --git a/share/fs-uae/input/030000004c050000c405000011010000.fs-uae-controller b/share/fs-uae/input/030000004c050000c405000011010000.fs-uae-controller new file mode 100644 index 000000000..c54659084 --- /dev/null +++ b/share/fs-uae/input/030000004c050000c405000011010000.fs-uae-controller @@ -0,0 +1,43 @@ +[fs-uae-controller] +name = Sony Computer Entertainment Wireless Controller +platform = linux + +[device] +make = Sony +model = DualShock 4 +type = gamepad + +[sdl] +guid = 030000004c050000c405000011010000 +buttons = 14 +hats = 1 +axes = 10 +balls = 0 + +[default] +include = universal_gamepad +axis_0_neg = lstick_left +axis_0_pos = lstick_right +axis_1_neg = lstick_up +axis_1_pos = lstick_down +axis_2_neg = rstick_left +axis_2_pos = rstick_right +axis_5_neg = rstick_up +axis_5_pos = rstick_down +button_0 = west_button +button_1 = south_button +button_10 = lstick_button +button_11 = rstick_button +button_12 = menu_button +button_2 = east_button +button_3 = north_button +button_4 = left_shoulder +button_5 = right_shoulder +button_6 = left_trigger +button_7 = right_trigger +button_8 = select_button +button_9 = start_button +hat_0_down = dpad_down +hat_0_left = dpad_left +hat_0_right = dpad_right +hat_0_up = dpad_up diff --git a/share/fs-uae/input/030000004f04000020b3000010010000.fs-uae-controller b/share/fs-uae/input/030000004f04000020b3000010010000.fs-uae-controller new file mode 100644 index 000000000..7824f19f0 --- /dev/null +++ b/share/fs-uae/input/030000004f04000020b3000010010000.fs-uae-controller @@ -0,0 +1,42 @@ +[fs-uae-controller] +name = THRUSTMASTER 2 in 1 DT +platform = linux + +[device] +make = Thrustmaster +model = 2 in 1 DT +type = gamepad + +[sdl] +guid = 030000004f04000020b3000010010000 +buttons = 12 +hats = 1 +axes = 4 +balls = 0 + +[default] +include = universal_gamepad +axis_0_neg = lstick_left +axis_0_pos = lstick_right +axis_1_neg = lstick_up +axis_1_pos = lstick_down +axis_2_neg = rstick_left +axis_2_pos = rstick_right +axis_3_neg = rstick_up +axis_3_pos = rstick_down +button_0 = south_button +button_1 = west_button +button_10 = lstick_button +button_11 = rstick_button +button_2 = east_button +button_3 = north_button +button_4 = left_shoulder +button_5 = left_trigger +button_6 = right_shoulder +button_7 = right_trigger +button_8 = select_button +button_9 = start_button +hat_0_down = dpad_down +hat_0_left = dpad_left +hat_0_right = dpad_right +hat_0_up = dpad_up diff --git a/share/fs-uae/input/030000005e0400001907000000010000.fs-uae-controller b/share/fs-uae/input/030000005e0400001907000000010000.fs-uae-controller new file mode 100644 index 000000000..25547f764 --- /dev/null +++ b/share/fs-uae/input/030000005e0400001907000000010000.fs-uae-controller @@ -0,0 +1,43 @@ +[fs-uae-controller] +name = Xbox 360 Wireless Receiver +platform = linux + +[device] +make = Microsoft +model = Xbox 360 Pad +type = gamepad + +[sdl] +guid = 030000005e0400001907000000010000 +buttons = 15 +hats = 0 +axes = 6 +balls = 0 + +[default] +include = universal_gamepad +axis_0_neg = lstick_left +axis_0_pos = lstick_right +axis_1_neg = lstick_up +axis_1_pos = lstick_down +axis_2_pos = left_trigger +axis_3_neg = rstick_left +axis_3_pos = rstick_right +axis_4_neg = rstick_up +axis_4_pos = rstick_down +axis_5_pos = right_trigger +button_0 = south_button +button_1 = east_button +button_10 = rstick_button +button_11 = dpad_left +button_12 = dpad_right +button_13 = dpad_up +button_14 = dpad_down +button_2 = west_button +button_3 = north_button +button_4 = left_shoulder +button_5 = right_shoulder +button_6 = select_button +button_7 = start_button +button_8 = menu_button +button_9 = lstick_button diff --git a/share/fs-uae/input/030000005e0400008e02000014010000.fs-uae-controller b/share/fs-uae/input/030000005e0400008e02000014010000.fs-uae-controller new file mode 100644 index 000000000..1be7f22e3 --- /dev/null +++ b/share/fs-uae/input/030000005e0400008e02000014010000.fs-uae-controller @@ -0,0 +1,43 @@ +[fs-uae-controller] +name = Microsoft X-Box 360 pad +platform = linux + +[device] +make = Microsoft +model = Xbox 360 Pad +type = gamepad + +[sdl] +guid = 030000005e0400008e02000014010000 +buttons = 11 +hats = 1 +axes = 6 +balls = 0 + +[default] +include = universal_gamepad +axis_0_neg = lstick_left +axis_0_pos = lstick_right +axis_1_neg = lstick_up +axis_1_pos = lstick_down +axis_2_pos = left_trigger +axis_3_neg = rstick_left +axis_3_pos = rstick_right +axis_4_neg = rstick_up +axis_4_pos = rstick_down +axis_5_pos = right_trigger +button_0 = south_button +button_1 = east_button +button_10 = rstick_button +button_2 = west_button +button_3 = north_button +button_4 = left_shoulder +button_5 = right_shoulder +button_6 = select_button +button_7 = start_button +button_8 = menu_button +button_9 = lstick_button +hat_0_down = dpad_down +hat_0_left = dpad_left +hat_0_right = dpad_right +hat_0_up = dpad_up diff --git a/share/fs-uae/input/030000005e040000d102000001010000.fs-uae-controller b/share/fs-uae/input/030000005e040000d102000001010000.fs-uae-controller new file mode 100644 index 000000000..c1bee3194 --- /dev/null +++ b/share/fs-uae/input/030000005e040000d102000001010000.fs-uae-controller @@ -0,0 +1,43 @@ +[fs-uae-controller] +name = Microsoft X-Box One pad +platform = linux + +[device] +make = Microsoft +model = Xbox One Pad +type = gamepad + +[sdl] +guid = 030000005e040000d102000001010000 +buttons = 11 +hats = 1 +axes = 6 +balls = 0 + +[default] +include = universal_gamepad +axis_0_neg = lstick_left +axis_0_pos = lstick_right +axis_1_neg = lstick_up +axis_1_pos = lstick_down +axis_2_pos = left_trigger +axis_3_neg = rstick_left +axis_3_pos = rstick_right +axis_4_neg = rstick_up +axis_4_pos = rstick_down +axis_5_pos = right_trigger +button_0 = south_button +button_1 = east_button +button_10 = rstick_button +button_2 = west_button +button_3 = north_button +button_4 = left_shoulder +button_5 = right_shoulder +button_6 = select_button +button_7 = start_button +button_8 = menu_button +button_9 = lstick_button +hat_0_down = dpad_down +hat_0_left = dpad_left +hat_0_right = dpad_right +hat_0_up = dpad_up diff --git a/share/fs-uae/input/030000006d04000019c2000011010000.fs-uae-controller b/share/fs-uae/input/030000006d04000019c2000011010000.fs-uae-controller new file mode 100644 index 000000000..304263ee9 --- /dev/null +++ b/share/fs-uae/input/030000006d04000019c2000011010000.fs-uae-controller @@ -0,0 +1,42 @@ +[fs-uae-controller] +name = Logitech Logitech Cordless RumblePad 2 +platform = linux + +[device] +make = Logitech +model = F710 +type = gamepad + +[sdl] +guid = 030000006d04000019c2000011010000 +buttons = 12 +hats = 1 +axes = 4 +balls = 0 + +[default] +include = universal_gamepad +axis_0_neg = lstick_left +axis_0_pos = lstick_right +axis_1_neg = lstick_up +axis_1_pos = lstick_down +axis_2_neg = rstick_left +axis_2_pos = rstick_right +axis_3_neg = rstick_up +axis_3_pos = rstick_down +button_0 = west_button +button_1 = south_button +button_10 = lstick_button +button_11 = rstick_button +button_2 = east_button +button_3 = north_button +button_4 = left_shoulder +button_5 = right_shoulder +button_6 = left_trigger +button_7 = right_trigger +button_8 = select_button +button_9 = start_button +hat_0_down = dpad_down +hat_0_left = dpad_left +hat_0_right = dpad_right +hat_0_up = dpad_up diff --git a/share/fs-uae/input/030000006d0400001ec2000020200000.fs-uae-controller b/share/fs-uae/input/030000006d0400001ec2000020200000.fs-uae-controller new file mode 100644 index 000000000..8a242b991 --- /dev/null +++ b/share/fs-uae/input/030000006d0400001ec2000020200000.fs-uae-controller @@ -0,0 +1,42 @@ +[fs-uae-controller] +name = Logitech Gamepad F510 +platform = linux + +[device] +make = Logitech +model = F510 +type = gamepad + +[sdl] +guid = 030000006d0400001ec2000020200000 +buttons = 11 +hats = 1 +axes = 6 +balls = 0 + +[default] +include = universal_gamepad +axis_0_neg = lstick_left +axis_0_pos = lstick_right +axis_1_neg = lstick_up +axis_1_pos = lstick_down +axis_2_pos = left_trigger +axis_3_neg = rstick_left +axis_3_pos = rstick_right +axis_4_neg = rstick_up +axis_4_pos = rstick_down +axis_5_pos = right_trigger +button_0 = south_button +button_1 = east_button +button_10 = rstick_button +button_2 = west_button +button_3 = north_button +button_4 = left_shoulder +button_5 = right_shoulder +button_6 = select_button +button_7 = start_button +button_9 = lstick_button +hat_0_down = dpad_down +hat_0_left = dpad_left +hat_0_right = dpad_right +hat_0_up = dpad_up diff --git a/share/fs-uae/input/030000006d0400001fc2000005030000.fs-uae-controller b/share/fs-uae/input/030000006d0400001fc2000005030000.fs-uae-controller new file mode 100644 index 000000000..5ccac082c --- /dev/null +++ b/share/fs-uae/input/030000006d0400001fc2000005030000.fs-uae-controller @@ -0,0 +1,42 @@ +[fs-uae-controller] +name = Logitech Gamepad F710 +platform = linux + +[device] +make = Logitech +model = F710 +type = gamepad + +[sdl] +guid = 030000006d0400001fc2000005030000 +buttons = 11 +hats = 1 +axes = 6 +balls = 0 + +[default] +include = universal_gamepad +axis_0_neg = lstick_left +axis_0_pos = lstick_right +axis_1_neg = lstick_up +axis_1_pos = lstick_down +axis_2_pos = left_trigger +axis_3_neg = rstick_left +axis_3_pos = rstick_right +axis_4_neg = rstick_up +axis_4_pos = rstick_down +axis_5_pos = right_trigger +button_0 = south_button +button_1 = east_button +button_10 = rstick_button +button_2 = west_button +button_3 = north_button +button_4 = left_shoulder +button_5 = right_shoulder +button_6 = select_button +button_7 = start_button +button_9 = lstick_button +hat_0_down = dpad_down +hat_0_left = dpad_left +hat_0_right = dpad_right +hat_0_up = dpad_up diff --git a/share/fs-uae/input/030000006d040000d2ca000011010000.fs-uae-controller b/share/fs-uae/input/030000006d040000d2ca000011010000.fs-uae-controller new file mode 100644 index 000000000..283b40bb7 --- /dev/null +++ b/share/fs-uae/input/030000006d040000d2ca000011010000.fs-uae-controller @@ -0,0 +1,43 @@ +[fs-uae-controller] +name = PS3/USB Cordless Gamepad +platform = linux + +[device] +make = Logitech +model = Cordless Precision +type = gamepad + +[sdl] +guid = 030000006d040000d2ca000011010000 +buttons = 13 +hats = 1 +axes = 4 +balls = 0 + +[default] +include = universal_gamepad +axis_0_neg = lstick_left +axis_0_pos = lstick_right +axis_1_neg = lstick_up +axis_1_pos = lstick_down +axis_2_neg = rstick_right +axis_2_pos = rstick_left +axis_3_neg = rstick_up +axis_3_pos = rstick_down +button_0 = west_button +button_1 = south_button +button_10 = lstick_button +button_11 = rstick_button +button_12 = menu_button +button_2 = east_button +button_3 = north_button +button_4 = left_shoulder +button_5 = right_shoulder +button_6 = left_trigger +button_7 = right_trigger +button_8 = select_button +button_9 = start_button +hat_0_down = dpad_down +hat_0_left = dpad_left +hat_0_right = dpad_right +hat_0_up = dpad_up diff --git a/share/fs-uae/input/03000000790000001100000010010000.fs-uae-controller b/share/fs-uae/input/03000000790000001100000010010000.fs-uae-controller new file mode 100644 index 000000000..0741f5dc2 --- /dev/null +++ b/share/fs-uae/input/03000000790000001100000010010000.fs-uae-controller @@ -0,0 +1,30 @@ +[fs-uae-controller] +name = USB Gamepad +platform = linux + +[device] +make = Retrolink +model = Classic Controller +type = gamepad + +[sdl] +guid = 03000000790000001100000010010000 +buttons = 10 +hats = 0 +axes = 2 +balls = 0 + +[default] +include = universal_gamepad +axis_0_neg = dpad_left +axis_0_pos = dpad_right +axis_1_neg = dpad_up +axis_1_pos = dpad_down +button_0 = north_button +button_1 = east_button +button_2 = south_button +button_3 = west_button +button_4 = left_shoulder +button_5 = right_shoulder +button_8 = select_button +button_9 = start_button diff --git a/share/fs-uae/input/0300000081170000990a000001010000.fs-uae-controller b/share/fs-uae/input/0300000081170000990a000001010000.fs-uae-controller new file mode 100644 index 000000000..bd809ab81 --- /dev/null +++ b/share/fs-uae/input/0300000081170000990a000001010000.fs-uae-controller @@ -0,0 +1,23 @@ +[fs-uae-controller] +name = retronicdesign.com Retro Joystick Adapter v2.0 +platform = linux + +[device] +make = Retronic +model = Joystick Adapter 2 +type = joystick + +[sdl] +guid = 0300000081170000990a000001010000 +buttons = 8 +hats = 0 +axes = 2 +balls = 0 + +[default] +include = universal_gamepad +axis_0_neg = dpad_left +axis_0_pos = dpad_right +axis_1_neg = dpad_up +axis_1_pos = dpad_down +button_0 = south_button diff --git a/share/fs-uae/input/03000000830500006020000010010000.fs-uae-controller b/share/fs-uae/input/03000000830500006020000010010000.fs-uae-controller new file mode 100644 index 000000000..a6f4e0575 --- /dev/null +++ b/share/fs-uae/input/03000000830500006020000010010000.fs-uae-controller @@ -0,0 +1,30 @@ +[fs-uae-controller] +name = USB,2-axis 8-button gamepad +platform = linux + +[device] +make = iBuffalo +model = SNES Pad +type = gamepad + +[sdl] +guid = 03000000830500006020000010010000 +buttons = 8 +hats = 0 +axes = 2 +balls = 0 + +[default] +include = universal_gamepad +axis_0_neg = dpad_left +axis_0_pos = dpad_right +axis_1_neg = dpad_up +axis_1_pos = dpad_down +button_0 = east_button +button_1 = south_button +button_2 = north_button +button_3 = west_button +button_4 = left_shoulder +button_5 = right_shoulder +button_6 = select_button +button_7 = start_button diff --git a/share/fs-uae/input/03000000a30600000901000000010000.fs-uae-controller b/share/fs-uae/input/03000000a30600000901000000010000.fs-uae-controller new file mode 100644 index 000000000..aa23a8730 --- /dev/null +++ b/share/fs-uae/input/03000000a30600000901000000010000.fs-uae-controller @@ -0,0 +1,40 @@ +[fs-uae-controller] +name = SAITEK P880 +platform = linux + +[device] +make = Saitek +model = P880 +type = gamepad + +[sdl] +guid = 03000000a30600000901000000010000 +buttons = 12 +hats = 1 +axes = 4 +balls = 0 + +[default] +include = universal_gamepad +axis_0_neg = lstick_left +axis_0_pos = lstick_right +axis_1_neg = lstick_up +axis_1_pos = lstick_down +axis_2_neg = rstick_up +axis_2_pos = rstick_down +axis_3_neg = rstick_left +axis_3_pos = rstick_right +button_0 = west_button +button_1 = north_button +button_2 = south_button +button_3 = east_button +button_4 = select_button +button_5 = start_button +button_6 = left_shoulder +button_7 = right_shoulder +button_8 = lstick_button +button_9 = rstick_button +hat_0_down = dpad_down +hat_0_left = dpad_left +hat_0_right = dpad_right +hat_0_up = dpad_up diff --git a/share/fs-uae/input/0b040000000000003365000000000000.fs-uae-controller b/share/fs-uae/input/0b040000000000003365000000000000.fs-uae-controller new file mode 100644 index 000000000..81dcc56c5 --- /dev/null +++ b/share/fs-uae/input/0b040000000000003365000000000000.fs-uae-controller @@ -0,0 +1,26 @@ +[fs-uae-controller] +name = SPEED-LINK Competition Pro +platform = macosx + +[device] +make = Speed-Link +model = Competition Pro +type = joystick + +[sdl] +guid = 0b040000000000003365000000000000 +buttons = 4 +hats = 0 +axes = 2 +balls = 0 + +[default] +include = universal_gamepad +axis_0_neg = dpad_left +axis_0_pos = dpad_right +axis_1_neg = dpad_up +axis_1_pos = dpad_down +button_0 = south_button +button_1 = west_button +button_2 = select_button +button_3 = start_button diff --git a/share/fs-uae/input/0b043365000000000000504944564944.fs-uae-controller b/share/fs-uae/input/0b043365000000000000504944564944.fs-uae-controller new file mode 100644 index 000000000..867c7cf9e --- /dev/null +++ b/share/fs-uae/input/0b043365000000000000504944564944.fs-uae-controller @@ -0,0 +1,26 @@ +[fs-uae-controller] +name = SPEED-LINK Competition Pro +platform = windows + +[device] +make = Speed-Link +model = Competition Pro +type = joystick + +[sdl] +guid = 0b043365000000000000504944564944 +buttons = 4 +hats = 0 +axes = 2 +balls = 0 + +[default] +include = universal_gamepad +axis_0_neg = dpad_left +axis_0_pos = dpad_right +axis_1_neg = dpad_up +axis_1_pos = dpad_down +button_0 = south_button +button_1 = west_button +button_2 = select_button +button_3 = start_button diff --git a/share/fs-uae/input/2_in_1_dt_12_4_1_0_macosx.conf b/share/fs-uae/input/2_in_1_dt_12_4_1_0_macosx.conf index 966f9b936..1a888b73c 100644 --- a/share/fs-uae/input/2_in_1_dt_12_4_1_0_macosx.conf +++ b/share/fs-uae/input/2_in_1_dt_12_4_1_0_macosx.conf @@ -1,28 +1,42 @@ -# 2 in 1 DT +[fs-uae-controller] +name = 2 in 1 DT +platform = macosx + +[device] +make = Thrustmaster +model = 2 in 1 DT +type = gamepad + +[sdl] +guid = 4f0400000000000020b3000000000000 +buttons = 12 +hats = 1 +axes = 4 +balls = 0 [default] include = universal_gamepad -hat_0_left = dpad_left -hat_0_right = dpad_right -hat_0_up = dpad_up -hat_0_down = dpad_down axis_0_neg = lstick_left axis_0_pos = lstick_right axis_1_neg = lstick_up axis_1_pos = lstick_down -button_10 = lstick_button axis_2_neg = rstick_left axis_2_pos = rstick_right axis_3_neg = rstick_up axis_3_pos = rstick_down -button_11 = rstick_button +button_0 = south_button button_1 = west_button -button_3 = north_button +button_10 = lstick_button +button_11 = rstick_button button_2 = east_button -button_0 = south_button -button_8 = select_button -button_9 = start_button +button_3 = north_button button_4 = left_shoulder button_5 = left_trigger button_6 = right_shoulder button_7 = right_trigger +button_8 = select_button +button_9 = start_button +hat_0_down = dpad_down +hat_0_left = dpad_left +hat_0_right = dpad_right +hat_0_up = dpad_up diff --git a/share/fs-uae/input/2_in_1_dt_12_4_1_0_windows.conf b/share/fs-uae/input/2_in_1_dt_12_4_1_0_windows.conf index d31dd6b56..efb6d351b 100644 --- a/share/fs-uae/input/2_in_1_dt_12_4_1_0_windows.conf +++ b/share/fs-uae/input/2_in_1_dt_12_4_1_0_windows.conf @@ -1,28 +1,42 @@ -# 2 in 1 DT +[fs-uae-controller] +name = 2 in 1 DT +platform = windows + +[device] +make = Thrustmaster +model = 2 in 1 DT +type = gamepad + +[sdl] +guid = 4f0420b3000000000000504944564944 +buttons = 12 +hats = 1 +axes = 4 +balls = 0 [default] include = universal_gamepad -hat_0_left = dpad_left -hat_0_right = dpad_right -hat_0_up = dpad_up -hat_0_down = dpad_down axis_0_neg = lstick_left axis_0_pos = lstick_right axis_1_neg = lstick_up axis_1_pos = lstick_down +axis_2_neg = rstick_left +axis_2_pos = rstick_right +axis_3_neg = rstick_up +axis_3_pos = rstick_down +button_0 = south_button +button_1 = west_button button_10 = lstick_button -axis_3_neg = rstick_left -axis_3_pos = rstick_right -axis_2_neg = rstick_up -axis_2_pos = rstick_down button_11 = rstick_button -button_1 = west_button -button_3 = north_button button_2 = east_button -button_0 = south_button -button_8 = select_button -button_9 = start_button +button_3 = north_button button_4 = left_shoulder button_5 = left_trigger button_6 = right_shoulder button_7 = right_trigger +button_8 = select_button +button_9 = start_button +hat_0_down = dpad_down +hat_0_left = dpad_left +hat_0_right = dpad_right +hat_0_up = dpad_up diff --git a/share/fs-uae/input/300f0000000000001201000000000000.fs-uae-controller b/share/fs-uae/input/300f0000000000001201000000000000.fs-uae-controller new file mode 100644 index 000000000..38f7dd027 --- /dev/null +++ b/share/fs-uae/input/300f0000000000001201000000000000.fs-uae-controller @@ -0,0 +1,42 @@ +[fs-uae-controller] +name = Dual Analog Pad +platform = macosx + +[device] +make = Saitek +model = P380 +type = gamepad + +[sdl] +guid = 300f0000000000001201000000000000 +buttons = 12 +hats = 1 +axes = 4 +balls = 0 + +[default] +include = universal_gamepad +axis_0_neg = lstick_left +axis_0_pos = lstick_right +axis_1_neg = lstick_up +axis_1_pos = lstick_down +axis_2_neg = rstick_up +axis_2_pos = rstick_down +axis_3_neg = rstick_left +axis_3_pos = rstick_right +button_0 = west_button +button_1 = north_button +button_10 = lstick_button +button_11 = rstick_button +button_2 = south_button +button_3 = east_button +button_4 = left_shoulder +button_5 = left_trigger +button_6 = right_shoulder +button_7 = right_trigger +button_8 = select_button +button_9 = start_button +hat_0_down = dpad_down +hat_0_left = dpad_left +hat_0_right = dpad_right +hat_0_up = dpad_up diff --git a/share/fs-uae/input/300f1201000000000000504944564944.fs-uae-controller b/share/fs-uae/input/300f1201000000000000504944564944.fs-uae-controller new file mode 100644 index 000000000..5b1081881 --- /dev/null +++ b/share/fs-uae/input/300f1201000000000000504944564944.fs-uae-controller @@ -0,0 +1,42 @@ +[fs-uae-controller] +name = Dual Analog Pad +platform = windows + +[device] +make = Saitek +model = P380 +type = gamepad + +[sdl] +guid = 300f1201000000000000504944564944 +buttons = 12 +hats = 1 +axes = 4 +balls = 0 + +[default] +include = universal_gamepad +axis_0_neg = lstick_left +axis_0_pos = lstick_right +axis_1_neg = lstick_up +axis_1_pos = lstick_down +axis_2_neg = rstick_up +axis_2_pos = rstick_down +axis_3_neg = rstick_left +axis_3_pos = rstick_right +button_0 = west_button +button_1 = north_button +button_10 = lstick_button +button_11 = rstick_button +button_2 = south_button +button_3 = east_button +button_4 = left_shoulder +button_5 = left_trigger +button_6 = right_shoulder +button_7 = right_trigger +button_8 = select_button +button_9 = start_button +hat_0_down = dpad_down +hat_0_left = dpad_left +hat_0_right = dpad_right +hat_0_up = dpad_up diff --git a/share/fs-uae/input/4c050000000000006802000000000000.fs-uae-controller b/share/fs-uae/input/4c050000000000006802000000000000.fs-uae-controller new file mode 100644 index 000000000..29184946e --- /dev/null +++ b/share/fs-uae/input/4c050000000000006802000000000000.fs-uae-controller @@ -0,0 +1,43 @@ +[fs-uae-controller] +name = PLAYSTATION(R)3 Controller +platform = macosx + +[device] +make = Sony +model = DualShock 3 +type = gamepad + +[sdl] +guid = 4c050000000000006802000000000000 +buttons = 19 +hats = 0 +axes = 4 +balls = 0 + +[default] +include = universal_gamepad +axis_0_neg = lstick_left +axis_0_pos = lstick_right +axis_1_neg = lstick_up +axis_1_pos = lstick_down +axis_2_neg = rstick_left +axis_2_pos = rstick_right +axis_3_neg = rstick_up +axis_3_pos = rstick_down +button_0 = select_button +button_1 = lstick_button +button_10 = left_shoulder +button_11 = right_shoulder +button_12 = north_button +button_13 = east_button +button_14 = south_button +button_15 = west_button +button_16 = menu_button +button_2 = rstick_button +button_3 = start_button +button_4 = dpad_up +button_5 = dpad_right +button_6 = dpad_down +button_7 = dpad_left +button_8 = left_trigger +button_9 = right_trigger diff --git a/share/fs-uae/input/4c05000000000000c405000000000000.fs-uae-controller b/share/fs-uae/input/4c05000000000000c405000000000000.fs-uae-controller new file mode 100644 index 000000000..c0e689a08 --- /dev/null +++ b/share/fs-uae/input/4c05000000000000c405000000000000.fs-uae-controller @@ -0,0 +1,43 @@ +[fs-uae-controller] +name = Wireless Controller +platform = macosx + +[device] +make = Sony +model = DualShock 4 +type = gamepad + +[sdl] +guid = 4c05000000000000c405000000000000 +buttons = 14 +hats = 1 +axes = 6 +balls = 0 + +[default] +include = universal_gamepad +axis_0_neg = lstick_left +axis_0_pos = lstick_right +axis_1_neg = lstick_up +axis_1_pos = lstick_down +axis_2_neg = rstick_left +axis_2_pos = rstick_right +axis_5_neg = rstick_up +axis_5_pos = rstick_down +button_0 = west_button +button_1 = south_button +button_10 = lstick_button +button_11 = rstick_button +button_12 = menu_button +button_2 = east_button +button_3 = north_button +button_4 = left_shoulder +button_5 = right_shoulder +button_6 = left_trigger +button_7 = right_trigger +button_8 = select_button +button_9 = start_button +hat_0_down = dpad_down +hat_0_left = dpad_left +hat_0_right = dpad_right +hat_0_up = dpad_up diff --git a/share/fs-uae/input/4c05c405000000000000504944564944.fs-uae-controller b/share/fs-uae/input/4c05c405000000000000504944564944.fs-uae-controller new file mode 100644 index 000000000..11e069d24 --- /dev/null +++ b/share/fs-uae/input/4c05c405000000000000504944564944.fs-uae-controller @@ -0,0 +1,43 @@ +[fs-uae-controller] +name = Wireless Controller +platform = windows + +[device] +make = Sony +model = DualShock 4 +type = gamepad + +[sdl] +guid = 4c05c405000000000000504944564944 +buttons = 14 +hats = 1 +axes = 6 +balls = 0 + +[default] +include = universal_gamepad +axis_0_neg = lstick_left +axis_0_pos = lstick_right +axis_1_neg = lstick_up +axis_1_pos = lstick_down +axis_2_neg = rstick_left +axis_2_pos = rstick_right +axis_5_neg = rstick_up +axis_5_pos = rstick_down +button_0 = west_button +button_1 = south_button +button_10 = lstick_button +button_11 = rstick_button +button_12 = menu_button +button_2 = east_button +button_3 = north_button +button_4 = left_shoulder +button_5 = right_shoulder +button_6 = left_trigger +button_7 = right_trigger +button_8 = select_button +button_9 = start_button +hat_0_down = dpad_down +hat_0_left = dpad_left +hat_0_right = dpad_right +hat_0_up = dpad_up diff --git a/share/fs-uae/input/4f0400000000000020b3000000000000.fs-uae-controller b/share/fs-uae/input/4f0400000000000020b3000000000000.fs-uae-controller new file mode 100644 index 000000000..1a888b73c --- /dev/null +++ b/share/fs-uae/input/4f0400000000000020b3000000000000.fs-uae-controller @@ -0,0 +1,42 @@ +[fs-uae-controller] +name = 2 in 1 DT +platform = macosx + +[device] +make = Thrustmaster +model = 2 in 1 DT +type = gamepad + +[sdl] +guid = 4f0400000000000020b3000000000000 +buttons = 12 +hats = 1 +axes = 4 +balls = 0 + +[default] +include = universal_gamepad +axis_0_neg = lstick_left +axis_0_pos = lstick_right +axis_1_neg = lstick_up +axis_1_pos = lstick_down +axis_2_neg = rstick_left +axis_2_pos = rstick_right +axis_3_neg = rstick_up +axis_3_pos = rstick_down +button_0 = south_button +button_1 = west_button +button_10 = lstick_button +button_11 = rstick_button +button_2 = east_button +button_3 = north_button +button_4 = left_shoulder +button_5 = left_trigger +button_6 = right_shoulder +button_7 = right_trigger +button_8 = select_button +button_9 = start_button +hat_0_down = dpad_down +hat_0_left = dpad_left +hat_0_right = dpad_right +hat_0_up = dpad_up diff --git a/share/fs-uae/input/4f0420b3000000000000504944564944.fs-uae-controller b/share/fs-uae/input/4f0420b3000000000000504944564944.fs-uae-controller new file mode 100644 index 000000000..efb6d351b --- /dev/null +++ b/share/fs-uae/input/4f0420b3000000000000504944564944.fs-uae-controller @@ -0,0 +1,42 @@ +[fs-uae-controller] +name = 2 in 1 DT +platform = windows + +[device] +make = Thrustmaster +model = 2 in 1 DT +type = gamepad + +[sdl] +guid = 4f0420b3000000000000504944564944 +buttons = 12 +hats = 1 +axes = 4 +balls = 0 + +[default] +include = universal_gamepad +axis_0_neg = lstick_left +axis_0_pos = lstick_right +axis_1_neg = lstick_up +axis_1_pos = lstick_down +axis_2_neg = rstick_left +axis_2_pos = rstick_right +axis_3_neg = rstick_up +axis_3_pos = rstick_down +button_0 = south_button +button_1 = west_button +button_10 = lstick_button +button_11 = rstick_button +button_2 = east_button +button_3 = north_button +button_4 = left_shoulder +button_5 = left_trigger +button_6 = right_shoulder +button_7 = right_trigger +button_8 = select_button +button_9 = start_button +hat_0_down = dpad_down +hat_0_left = dpad_left +hat_0_right = dpad_right +hat_0_up = dpad_up diff --git a/share/fs-uae/input/5e040000000000008e02000000000000.fs-uae-controller b/share/fs-uae/input/5e040000000000008e02000000000000.fs-uae-controller new file mode 100644 index 000000000..fce45db4a --- /dev/null +++ b/share/fs-uae/input/5e040000000000008e02000000000000.fs-uae-controller @@ -0,0 +1,43 @@ +[fs-uae-controller] +name = X360Controller +platform = macosx + +[device] +make = Microsoft +model = Xbox One Pad +type = gamepad + +[sdl] +guid = 5e040000000000008e02000000000000 +buttons = 16 +hats = 0 +axes = 6 +balls = 0 + +[default] +include = universal_gamepad +axis_0_neg = lstick_left +axis_0_pos = lstick_right +axis_1_neg = lstick_up +axis_1_pos = lstick_down +axis_2_pos = left_trigger +axis_3_neg = rstick_left +axis_3_pos = rstick_right +axis_4_neg = rstick_up +axis_4_pos = rstick_down +axis_5_pos = right_trigger +button_0 = south_button +button_1 = east_button +button_11 = dpad_up +button_12 = dpad_down +button_13 = dpad_left +button_14 = dpad_right +button_15 = menu_button +button_2 = west_button +button_3 = north_button +button_4 = left_shoulder +button_5 = right_shoulder +button_6 = lstick_button +button_7 = rstick_button +button_8 = start_button +button_9 = select_button diff --git a/share/fs-uae/input/6d0400000000000018c2000000000000.fs-uae-controller b/share/fs-uae/input/6d0400000000000018c2000000000000.fs-uae-controller new file mode 100644 index 000000000..6ecceefb1 --- /dev/null +++ b/share/fs-uae/input/6d0400000000000018c2000000000000.fs-uae-controller @@ -0,0 +1,42 @@ +[fs-uae-controller] +name = Logitech Rumblepad 2 USB +platform = macosx + +[device] +make = Logitech +model = F510 +type = gamepad + +[sdl] +guid = 6d0400000000000018c2000000000000 +buttons = 12 +hats = 1 +axes = 4 +balls = 0 + +[default] +include = universal_gamepad +axis_0_neg = lstick_left +axis_0_pos = lstick_right +axis_1_neg = lstick_up +axis_1_pos = lstick_down +axis_2_neg = rstick_left +axis_2_pos = rstick_right +axis_3_neg = rstick_up +axis_3_pos = rstick_down +button_0 = west_button +button_1 = south_button +button_10 = lstick_button +button_11 = rstick_button +button_2 = east_button +button_3 = north_button +button_4 = left_shoulder +button_5 = right_shoulder +button_6 = left_trigger +button_7 = right_trigger +button_8 = select_button +button_9 = start_button +hat_0_down = dpad_down +hat_0_left = dpad_left +hat_0_right = dpad_right +hat_0_up = dpad_up diff --git a/share/fs-uae/input/6d0400000000000019c2000000000000.fs-uae-controller b/share/fs-uae/input/6d0400000000000019c2000000000000.fs-uae-controller new file mode 100644 index 000000000..6a3d05afd --- /dev/null +++ b/share/fs-uae/input/6d0400000000000019c2000000000000.fs-uae-controller @@ -0,0 +1,42 @@ +[fs-uae-controller] +name = Logitech Cordless RumblePad 2 +platform = macosx + +[device] +make = Logitech +model = F710 +type = gamepad + +[sdl] +guid = 6d0400000000000019c2000000000000 +buttons = 12 +hats = 1 +axes = 4 +balls = 0 + +[default] +include = universal_gamepad +axis_0_neg = lstick_left +axis_0_pos = lstick_right +axis_1_neg = lstick_up +axis_1_pos = lstick_down +axis_2_neg = rstick_left +axis_2_pos = rstick_right +axis_3_neg = rstick_up +axis_3_pos = rstick_down +button_0 = west_button +button_1 = south_button +button_10 = lstick_button +button_11 = rstick_button +button_2 = east_button +button_3 = north_button +button_4 = left_shoulder +button_5 = right_shoulder +button_6 = left_trigger +button_7 = right_trigger +button_8 = select_button +button_9 = start_button +hat_0_down = dpad_down +hat_0_left = dpad_left +hat_0_right = dpad_right +hat_0_up = dpad_up diff --git a/share/fs-uae/input/6d04000000000000d2ca000000000000.fs-uae-controller b/share/fs-uae/input/6d04000000000000d2ca000000000000.fs-uae-controller new file mode 100644 index 000000000..d1eb1928e --- /dev/null +++ b/share/fs-uae/input/6d04000000000000d2ca000000000000.fs-uae-controller @@ -0,0 +1,43 @@ +[fs-uae-controller] +name = PS3/USB Cordless Gamepad +platform = macosx + +[device] +make = Logitech +model = Cordless Precision +type = gamepad + +[sdl] +guid = 6d04000000000000d2ca000000000000 +buttons = 13 +hats = 1 +axes = 4 +balls = 0 + +[default] +include = universal_gamepad +axis_0_neg = lstick_left +axis_0_pos = lstick_right +axis_1_neg = lstick_up +axis_1_pos = lstick_down +axis_2_neg = rstick_left +axis_2_pos = rstick_right +axis_3_neg = rstick_up +axis_3_pos = rstick_down +button_0 = west_button +button_1 = south_button +button_10 = lstick_button +button_11 = rstick_button +button_12 = menu_button +button_2 = east_button +button_3 = north_button +button_4 = left_shoulder +button_5 = right_shoulder +button_6 = left_trigger +button_7 = right_trigger +button_8 = select_button +button_9 = start_button +hat_0_down = dpad_down +hat_0_left = dpad_left +hat_0_right = dpad_right +hat_0_up = dpad_up diff --git a/share/fs-uae/input/6d0418c2000000000000504944564944.fs-uae-controller b/share/fs-uae/input/6d0418c2000000000000504944564944.fs-uae-controller new file mode 100644 index 000000000..83617e046 --- /dev/null +++ b/share/fs-uae/input/6d0418c2000000000000504944564944.fs-uae-controller @@ -0,0 +1,42 @@ +[fs-uae-controller] +name = Logitech Rumblepad 2 USB +platform = windows + +[device] +make = Logitech +model = F510 +type = gamepad + +[sdl] +guid = 6d0418c2000000000000504944564944 +buttons = 12 +hats = 1 +axes = 4 +balls = 0 + +[default] +include = universal_gamepad +axis_0_neg = lstick_left +axis_0_pos = lstick_right +axis_1_neg = lstick_up +axis_1_pos = lstick_down +axis_2_neg = rstick_left +axis_2_pos = rstick_right +axis_3_neg = rstick_up +axis_3_pos = rstick_down +button_0 = west_button +button_1 = south_button +button_10 = lstick_button +button_11 = rstick_button +button_2 = east_button +button_3 = north_button +button_4 = left_shoulder +button_5 = right_shoulder +button_6 = left_trigger +button_7 = right_trigger +button_8 = select_button +button_9 = start_button +hat_0_down = dpad_down +hat_0_left = dpad_left +hat_0_right = dpad_right +hat_0_up = dpad_up diff --git a/share/fs-uae/input/6d0419c2000000000000504944564944.fs-uae-controller b/share/fs-uae/input/6d0419c2000000000000504944564944.fs-uae-controller new file mode 100644 index 000000000..51cd8a304 --- /dev/null +++ b/share/fs-uae/input/6d0419c2000000000000504944564944.fs-uae-controller @@ -0,0 +1,42 @@ +[fs-uae-controller] +name = Logitech Cordless RumblePad 2 +platform = windows + +[device] +make = Logitech +model = F710 +type = gamepad + +[sdl] +guid = 6d0419c2000000000000504944564944 +buttons = 12 +hats = 1 +axes = 4 +balls = 0 + +[default] +include = universal_gamepad +axis_0_neg = lstick_left +axis_0_pos = lstick_right +axis_1_neg = lstick_up +axis_1_pos = lstick_down +axis_2_neg = rstick_left +axis_2_pos = rstick_right +axis_3_neg = rstick_up +axis_3_pos = rstick_down +button_0 = west_button +button_1 = south_button +button_10 = lstick_button +button_11 = rstick_button +button_2 = east_button +button_3 = north_button +button_4 = left_shoulder +button_5 = right_shoulder +button_6 = left_trigger +button_7 = right_trigger +button_8 = select_button +button_9 = start_button +hat_0_down = dpad_down +hat_0_left = dpad_left +hat_0_right = dpad_right +hat_0_up = dpad_up diff --git a/share/fs-uae/input/6d04d2ca000000000000504944564944.fs-uae-controller b/share/fs-uae/input/6d04d2ca000000000000504944564944.fs-uae-controller new file mode 100644 index 000000000..6c0f368e3 --- /dev/null +++ b/share/fs-uae/input/6d04d2ca000000000000504944564944.fs-uae-controller @@ -0,0 +1,43 @@ +[fs-uae-controller] +name = PS3/USB Cordless Gamepad +platform = windows + +[device] +make = Logitech +model = Cordless Precision +type = gamepad + +[sdl] +guid = 6d04d2ca000000000000504944564944 +buttons = 13 +hats = 1 +axes = 4 +balls = 0 + +[default] +include = universal_gamepad +axis_0_neg = lstick_left +axis_0_pos = lstick_right +axis_1_neg = lstick_up +axis_1_pos = lstick_down +axis_2_neg = rstick_left +axis_2_pos = rstick_right +axis_3_neg = rstick_up +axis_3_pos = rstick_down +button_0 = west_button +button_1 = south_button +button_10 = lstick_button +button_11 = rstick_button +button_12 = menu_button +button_2 = east_button +button_3 = north_button +button_4 = left_shoulder +button_5 = right_shoulder +button_6 = left_trigger +button_7 = right_trigger +button_8 = select_button +button_9 = start_button +hat_0_down = dpad_down +hat_0_left = dpad_left +hat_0_right = dpad_right +hat_0_up = dpad_up diff --git a/share/fs-uae/input/8117000000000000990a000000000000.fs-uae-controller b/share/fs-uae/input/8117000000000000990a000000000000.fs-uae-controller new file mode 100644 index 000000000..53cbd8b17 --- /dev/null +++ b/share/fs-uae/input/8117000000000000990a000000000000.fs-uae-controller @@ -0,0 +1,23 @@ +[fs-uae-controller] +name = Retro Joystick Adapter v2.0 +platform = macosx + +[device] +make = Retronic +model = Joystick Adapter 2 +type = joystick + +[sdl] +guid = 8117000000000000990a000000000000 +buttons = 3 +hats = 0 +axes = 2 +balls = 0 + +[default] +include = universal_gamepad +axis_0_neg = dpad_left +axis_0_pos = dpad_right +axis_1_neg = dpad_up +axis_1_pos = dpad_down +button_0 = south_button diff --git a/share/fs-uae/input/8117990a000000000000504944564944.fs-uae-controller b/share/fs-uae/input/8117990a000000000000504944564944.fs-uae-controller new file mode 100644 index 000000000..b4c0eb2c0 --- /dev/null +++ b/share/fs-uae/input/8117990a000000000000504944564944.fs-uae-controller @@ -0,0 +1,23 @@ +[fs-uae-controller] +name = Retro Joystick Adapter v2.0 +platform = windows + +[device] +make = Retro-Link +model = Joystick Adapter 2 +type = gamepad + +[sdl] +guid = 8117990a000000000000504944564944 +buttons = 3 +hats = 0 +axes = 2 +balls = 0 + +[default] +include = universal_gamepad +axis_0_neg = dpad_left +axis_0_pos = dpad_right +axis_1_neg = dpad_up +axis_1_pos = dpad_down +button_0 = south_button diff --git a/share/fs-uae/input/83050000000000006020000000000000.fs-uae-controller b/share/fs-uae/input/83050000000000006020000000000000.fs-uae-controller new file mode 100644 index 000000000..0b5cb71ec --- /dev/null +++ b/share/fs-uae/input/83050000000000006020000000000000.fs-uae-controller @@ -0,0 +1,30 @@ +[fs-uae-controller] +name = USB,2-axis 8-button gamepad +platform = macosx + +[device] +make = iBuffalo +model = SNES Pad +type = gamepad + +[sdl] +guid = 83050000000000006020000000000000 +buttons = 8 +hats = 0 +axes = 2 +balls = 0 + +[default] +include = universal_gamepad +axis_0_neg = dpad_left +axis_0_pos = dpad_right +axis_1_neg = dpad_up +axis_1_pos = dpad_down +button_0 = east_button +button_1 = south_button +button_2 = north_button +button_3 = west_button +button_4 = left_shoulder +button_5 = right_shoulder +button_6 = select_button +button_7 = start_button diff --git a/share/fs-uae/input/83056020000000000000504944564944.fs-uae-controller b/share/fs-uae/input/83056020000000000000504944564944.fs-uae-controller new file mode 100644 index 000000000..7d25dec09 --- /dev/null +++ b/share/fs-uae/input/83056020000000000000504944564944.fs-uae-controller @@ -0,0 +1,30 @@ +[fs-uae-controller] +name = USB,2-axis 8-button gamepad +platform = windows + +[device] +make = iBuffalo +model = SNES Pad +type = gamepad + +[sdl] +guid = 83056020000000000000504944564944 +buttons = 8 +hats = 0 +axes = 2 +balls = 0 + +[default] +include = universal_gamepad +axis_0_neg = dpad_left +axis_0_pos = dpad_right +axis_1_neg = dpad_up +axis_1_pos = dpad_down +button_0 = east_button +button_1 = south_button +button_2 = north_button +button_3 = west_button +button_4 = left_shoulder +button_5 = right_shoulder +button_6 = select_button +button_7 = start_button diff --git a/share/fs-uae/input/a3060000000000000901000000000000.fs-uae-controller b/share/fs-uae/input/a3060000000000000901000000000000.fs-uae-controller new file mode 100644 index 000000000..b6759129b --- /dev/null +++ b/share/fs-uae/input/a3060000000000000901000000000000.fs-uae-controller @@ -0,0 +1,40 @@ +[fs-uae-controller] +name = P880 +platform = macosx + +[device] +make = Saitek +model = P880 +type = gamepad + +[sdl] +guid = a3060000000000000901000000000000 +buttons = 12 +hats = 1 +axes = 4 +balls = 0 + +[default] +include = universal_gamepad +axis_0_neg = lstick_left +axis_0_pos = lstick_right +axis_1_neg = lstick_up +axis_1_pos = lstick_down +axis_2_neg = rstick_up +axis_2_pos = rstick_down +axis_3_neg = rstick_left +axis_3_pos = rstick_right +button_0 = west_button +button_1 = north_button +button_2 = south_button +button_3 = east_button +button_4 = select_button +button_5 = start_button +button_6 = left_shoulder +button_7 = right_shoulder +button_8 = lstick_button +button_9 = rstick_button +hat_0_down = dpad_down +hat_0_left = dpad_left +hat_0_right = dpad_right +hat_0_up = dpad_up diff --git a/share/fs-uae/input/a3060901000000000000504944564944.fs-uae-controller b/share/fs-uae/input/a3060901000000000000504944564944.fs-uae-controller new file mode 100644 index 000000000..f9b660457 --- /dev/null +++ b/share/fs-uae/input/a3060901000000000000504944564944.fs-uae-controller @@ -0,0 +1,40 @@ +[fs-uae-controller] +name = P880 +platform = windows + +[device] +make = Saitek +model = P880 +type = gamepad + +[sdl] +guid = a3060901000000000000504944564944 +buttons = 12 +hats = 1 +axes = 4 +balls = 0 + +[default] +include = universal_gamepad +axis_0_neg = lstick_left +axis_0_pos = lstick_right +axis_1_neg = lstick_up +axis_1_pos = lstick_down +axis_2_neg = rstick_up +axis_2_pos = rstick_down +axis_3_neg = rstick_left +axis_3_pos = rstick_right +button_0 = west_button +button_1 = north_button +button_2 = south_button +button_3 = east_button +button_4 = select_button +button_5 = start_button +button_6 = left_shoulder +button_7 = right_shoulder +button_8 = lstick_button +button_9 = rstick_button +hat_0_down = dpad_down +hat_0_left = dpad_left +hat_0_right = dpad_right +hat_0_up = dpad_up diff --git a/share/fs-uae/input/dual_analog_pad_12_4_1_0_macosx.conf b/share/fs-uae/input/dual_analog_pad_12_4_1_0_macosx.conf index 291cb87df..38f7dd027 100644 --- a/share/fs-uae/input/dual_analog_pad_12_4_1_0_macosx.conf +++ b/share/fs-uae/input/dual_analog_pad_12_4_1_0_macosx.conf @@ -1,28 +1,42 @@ -# Dual Analog Pad +[fs-uae-controller] +name = Dual Analog Pad +platform = macosx + +[device] +make = Saitek +model = P380 +type = gamepad + +[sdl] +guid = 300f0000000000001201000000000000 +buttons = 12 +hats = 1 +axes = 4 +balls = 0 [default] include = universal_gamepad -hat_0_left = dpad_left -hat_0_right = dpad_right -hat_0_up = dpad_up -hat_0_down = dpad_down axis_0_neg = lstick_left axis_0_pos = lstick_right axis_1_neg = lstick_up axis_1_pos = lstick_down -button_10 = lstick_button -axis_3_neg = rstick_left -axis_3_pos = rstick_right axis_2_neg = rstick_up axis_2_pos = rstick_down -button_11 = rstick_button +axis_3_neg = rstick_left +axis_3_pos = rstick_right button_0 = west_button button_1 = north_button -button_3 = east_button +button_10 = lstick_button +button_11 = rstick_button button_2 = south_button -button_8 = select_button -button_9 = start_button +button_3 = east_button button_4 = left_shoulder button_5 = left_trigger button_6 = right_shoulder button_7 = right_trigger +button_8 = select_button +button_9 = start_button +hat_0_down = dpad_down +hat_0_left = dpad_left +hat_0_right = dpad_right +hat_0_up = dpad_up diff --git a/share/fs-uae/input/dual_analog_pad_12_4_1_0_windows.conf b/share/fs-uae/input/dual_analog_pad_12_4_1_0_windows.conf index 291cb87df..5b1081881 100644 --- a/share/fs-uae/input/dual_analog_pad_12_4_1_0_windows.conf +++ b/share/fs-uae/input/dual_analog_pad_12_4_1_0_windows.conf @@ -1,28 +1,42 @@ -# Dual Analog Pad +[fs-uae-controller] +name = Dual Analog Pad +platform = windows + +[device] +make = Saitek +model = P380 +type = gamepad + +[sdl] +guid = 300f1201000000000000504944564944 +buttons = 12 +hats = 1 +axes = 4 +balls = 0 [default] include = universal_gamepad -hat_0_left = dpad_left -hat_0_right = dpad_right -hat_0_up = dpad_up -hat_0_down = dpad_down axis_0_neg = lstick_left axis_0_pos = lstick_right axis_1_neg = lstick_up axis_1_pos = lstick_down -button_10 = lstick_button -axis_3_neg = rstick_left -axis_3_pos = rstick_right axis_2_neg = rstick_up axis_2_pos = rstick_down -button_11 = rstick_button +axis_3_neg = rstick_left +axis_3_pos = rstick_right button_0 = west_button button_1 = north_button -button_3 = east_button +button_10 = lstick_button +button_11 = rstick_button button_2 = south_button -button_8 = select_button -button_9 = start_button +button_3 = east_button button_4 = left_shoulder button_5 = left_trigger button_6 = right_shoulder button_7 = right_trigger +button_8 = select_button +button_9 = start_button +hat_0_down = dpad_down +hat_0_left = dpad_left +hat_0_right = dpad_right +hat_0_up = dpad_up diff --git a/share/fs-uae/input/jess_tech_dual_analog_pad_12_4_1_0_linux.conf b/share/fs-uae/input/jess_tech_dual_analog_pad_12_4_1_0_linux.conf new file mode 100644 index 000000000..2efa4a6eb --- /dev/null +++ b/share/fs-uae/input/jess_tech_dual_analog_pad_12_4_1_0_linux.conf @@ -0,0 +1,42 @@ +[fs-uae-controller] +name = Jess Tech Dual Analog Pad +platform = linux + +[device] +make = Saitek +model = P380 +type = gamepad + +[sdl] +guid = 03000000300f00001201000010010000 +buttons = 12 +hats = 1 +axes = 4 +balls = 0 + +[default] +include = universal_gamepad +axis_0_neg = lstick_left +axis_0_pos = lstick_right +axis_1_neg = lstick_up +axis_1_pos = lstick_down +axis_2_neg = rstick_up +axis_2_pos = rstick_down +axis_3_neg = rstick_left +axis_3_pos = rstick_right +button_0 = west_button +button_1 = north_button +button_10 = lstick_button +button_11 = rstick_button +button_2 = south_button +button_3 = east_button +button_4 = left_shoulder +button_5 = left_trigger +button_6 = right_shoulder +button_7 = right_trigger +button_8 = select_button +button_9 = start_button +hat_0_down = dpad_down +hat_0_left = dpad_left +hat_0_right = dpad_right +hat_0_up = dpad_up diff --git a/share/fs-uae/input/logitech_cordless_rumblepad_2_12_4_1_0_macosx.conf b/share/fs-uae/input/logitech_cordless_rumblepad_2_12_4_1_0_macosx.conf new file mode 100644 index 000000000..6a3d05afd --- /dev/null +++ b/share/fs-uae/input/logitech_cordless_rumblepad_2_12_4_1_0_macosx.conf @@ -0,0 +1,42 @@ +[fs-uae-controller] +name = Logitech Cordless RumblePad 2 +platform = macosx + +[device] +make = Logitech +model = F710 +type = gamepad + +[sdl] +guid = 6d0400000000000019c2000000000000 +buttons = 12 +hats = 1 +axes = 4 +balls = 0 + +[default] +include = universal_gamepad +axis_0_neg = lstick_left +axis_0_pos = lstick_right +axis_1_neg = lstick_up +axis_1_pos = lstick_down +axis_2_neg = rstick_left +axis_2_pos = rstick_right +axis_3_neg = rstick_up +axis_3_pos = rstick_down +button_0 = west_button +button_1 = south_button +button_10 = lstick_button +button_11 = rstick_button +button_2 = east_button +button_3 = north_button +button_4 = left_shoulder +button_5 = right_shoulder +button_6 = left_trigger +button_7 = right_trigger +button_8 = select_button +button_9 = start_button +hat_0_down = dpad_down +hat_0_left = dpad_left +hat_0_right = dpad_right +hat_0_up = dpad_up diff --git a/share/fs-uae/input/logitech_cordless_rumblepad_2_12_4_1_0_windows.conf b/share/fs-uae/input/logitech_cordless_rumblepad_2_12_4_1_0_windows.conf new file mode 100644 index 000000000..51cd8a304 --- /dev/null +++ b/share/fs-uae/input/logitech_cordless_rumblepad_2_12_4_1_0_windows.conf @@ -0,0 +1,42 @@ +[fs-uae-controller] +name = Logitech Cordless RumblePad 2 +platform = windows + +[device] +make = Logitech +model = F710 +type = gamepad + +[sdl] +guid = 6d0419c2000000000000504944564944 +buttons = 12 +hats = 1 +axes = 4 +balls = 0 + +[default] +include = universal_gamepad +axis_0_neg = lstick_left +axis_0_pos = lstick_right +axis_1_neg = lstick_up +axis_1_pos = lstick_down +axis_2_neg = rstick_left +axis_2_pos = rstick_right +axis_3_neg = rstick_up +axis_3_pos = rstick_down +button_0 = west_button +button_1 = south_button +button_10 = lstick_button +button_11 = rstick_button +button_2 = east_button +button_3 = north_button +button_4 = left_shoulder +button_5 = right_shoulder +button_6 = left_trigger +button_7 = right_trigger +button_8 = select_button +button_9 = start_button +hat_0_down = dpad_down +hat_0_left = dpad_left +hat_0_right = dpad_right +hat_0_up = dpad_up diff --git a/share/fs-uae/input/logitech_gamepad_f510_11_6_1_0_linux.conf b/share/fs-uae/input/logitech_gamepad_f510_11_6_1_0_linux.conf new file mode 100644 index 000000000..8a242b991 --- /dev/null +++ b/share/fs-uae/input/logitech_gamepad_f510_11_6_1_0_linux.conf @@ -0,0 +1,42 @@ +[fs-uae-controller] +name = Logitech Gamepad F510 +platform = linux + +[device] +make = Logitech +model = F510 +type = gamepad + +[sdl] +guid = 030000006d0400001ec2000020200000 +buttons = 11 +hats = 1 +axes = 6 +balls = 0 + +[default] +include = universal_gamepad +axis_0_neg = lstick_left +axis_0_pos = lstick_right +axis_1_neg = lstick_up +axis_1_pos = lstick_down +axis_2_pos = left_trigger +axis_3_neg = rstick_left +axis_3_pos = rstick_right +axis_4_neg = rstick_up +axis_4_pos = rstick_down +axis_5_pos = right_trigger +button_0 = south_button +button_1 = east_button +button_10 = rstick_button +button_2 = west_button +button_3 = north_button +button_4 = left_shoulder +button_5 = right_shoulder +button_6 = select_button +button_7 = start_button +button_9 = lstick_button +hat_0_down = dpad_down +hat_0_left = dpad_left +hat_0_right = dpad_right +hat_0_up = dpad_up diff --git a/share/fs-uae/input/logitech_gamepad_f710_11_6_1_0_linux.conf b/share/fs-uae/input/logitech_gamepad_f710_11_6_1_0_linux.conf new file mode 100644 index 000000000..5ccac082c --- /dev/null +++ b/share/fs-uae/input/logitech_gamepad_f710_11_6_1_0_linux.conf @@ -0,0 +1,42 @@ +[fs-uae-controller] +name = Logitech Gamepad F710 +platform = linux + +[device] +make = Logitech +model = F710 +type = gamepad + +[sdl] +guid = 030000006d0400001fc2000005030000 +buttons = 11 +hats = 1 +axes = 6 +balls = 0 + +[default] +include = universal_gamepad +axis_0_neg = lstick_left +axis_0_pos = lstick_right +axis_1_neg = lstick_up +axis_1_pos = lstick_down +axis_2_pos = left_trigger +axis_3_neg = rstick_left +axis_3_pos = rstick_right +axis_4_neg = rstick_up +axis_4_pos = rstick_down +axis_5_pos = right_trigger +button_0 = south_button +button_1 = east_button +button_10 = rstick_button +button_2 = west_button +button_3 = north_button +button_4 = left_shoulder +button_5 = right_shoulder +button_6 = select_button +button_7 = start_button +button_9 = lstick_button +hat_0_down = dpad_down +hat_0_left = dpad_left +hat_0_right = dpad_right +hat_0_up = dpad_up diff --git a/share/fs-uae/input/logitech_logitech_cordless_rumblepad_2_12_4_1_0_linux.conf b/share/fs-uae/input/logitech_logitech_cordless_rumblepad_2_12_4_1_0_linux.conf new file mode 100644 index 000000000..304263ee9 --- /dev/null +++ b/share/fs-uae/input/logitech_logitech_cordless_rumblepad_2_12_4_1_0_linux.conf @@ -0,0 +1,42 @@ +[fs-uae-controller] +name = Logitech Logitech Cordless RumblePad 2 +platform = linux + +[device] +make = Logitech +model = F710 +type = gamepad + +[sdl] +guid = 030000006d04000019c2000011010000 +buttons = 12 +hats = 1 +axes = 4 +balls = 0 + +[default] +include = universal_gamepad +axis_0_neg = lstick_left +axis_0_pos = lstick_right +axis_1_neg = lstick_up +axis_1_pos = lstick_down +axis_2_neg = rstick_left +axis_2_pos = rstick_right +axis_3_neg = rstick_up +axis_3_pos = rstick_down +button_0 = west_button +button_1 = south_button +button_10 = lstick_button +button_11 = rstick_button +button_2 = east_button +button_3 = north_button +button_4 = left_shoulder +button_5 = right_shoulder +button_6 = left_trigger +button_7 = right_trigger +button_8 = select_button +button_9 = start_button +hat_0_down = dpad_down +hat_0_left = dpad_left +hat_0_right = dpad_right +hat_0_up = dpad_up diff --git a/share/fs-uae/input/logitech_rumblepad_2_usb_12_4_1_0_macosx.conf b/share/fs-uae/input/logitech_rumblepad_2_usb_12_4_1_0_macosx.conf index ec6948d98..6ecceefb1 100644 --- a/share/fs-uae/input/logitech_rumblepad_2_usb_12_4_1_0_macosx.conf +++ b/share/fs-uae/input/logitech_rumblepad_2_usb_12_4_1_0_macosx.conf @@ -1,28 +1,42 @@ -# Logitech Rumblepad 2 USB +[fs-uae-controller] +name = Logitech Rumblepad 2 USB +platform = macosx + +[device] +make = Logitech +model = F510 +type = gamepad + +[sdl] +guid = 6d0400000000000018c2000000000000 +buttons = 12 +hats = 1 +axes = 4 +balls = 0 [default] include = universal_gamepad -hat_0_left = dpad_left -hat_0_right = dpad_right -hat_0_up = dpad_up -hat_0_down = dpad_down axis_0_neg = lstick_left axis_0_pos = lstick_right axis_1_neg = lstick_up axis_1_pos = lstick_down -button_10 = lstick_button axis_2_neg = rstick_left axis_2_pos = rstick_right axis_3_neg = rstick_up axis_3_pos = rstick_down -button_11 = rstick_button button_0 = west_button -button_3 = north_button -button_2 = east_button button_1 = south_button -button_8 = select_button -button_9 = start_button +button_10 = lstick_button +button_11 = rstick_button +button_2 = east_button +button_3 = north_button button_4 = left_shoulder -button_6 = left_trigger button_5 = right_shoulder +button_6 = left_trigger button_7 = right_trigger +button_8 = select_button +button_9 = start_button +hat_0_down = dpad_down +hat_0_left = dpad_left +hat_0_right = dpad_right +hat_0_up = dpad_up diff --git a/share/fs-uae/input/logitech_rumblepad_2_usb_12_4_1_0_windows.conf b/share/fs-uae/input/logitech_rumblepad_2_usb_12_4_1_0_windows.conf index afeefd03d..83617e046 100644 --- a/share/fs-uae/input/logitech_rumblepad_2_usb_12_4_1_0_windows.conf +++ b/share/fs-uae/input/logitech_rumblepad_2_usb_12_4_1_0_windows.conf @@ -1,28 +1,42 @@ -# Logitech RumblePad 2 USB +[fs-uae-controller] +name = Logitech Rumblepad 2 USB +platform = windows + +[device] +make = Logitech +model = F510 +type = gamepad + +[sdl] +guid = 6d0418c2000000000000504944564944 +buttons = 12 +hats = 1 +axes = 4 +balls = 0 [default] include = universal_gamepad -hat_0_left = dpad_left -hat_0_right = dpad_right -hat_0_up = dpad_up -hat_0_down = dpad_down axis_0_neg = lstick_left axis_0_pos = lstick_right axis_1_neg = lstick_up axis_1_pos = lstick_down -button_10 = lstick_button axis_2_neg = rstick_left axis_2_pos = rstick_right axis_3_neg = rstick_up axis_3_pos = rstick_down -button_11 = rstick_button button_0 = west_button -button_3 = north_button -button_2 = east_button button_1 = south_button -button_8 = select_button -button_9 = start_button +button_10 = lstick_button +button_11 = rstick_button +button_2 = east_button +button_3 = north_button button_4 = left_shoulder -button_6 = left_trigger button_5 = right_shoulder +button_6 = left_trigger button_7 = right_trigger +button_8 = select_button +button_9 = start_button +hat_0_down = dpad_down +hat_0_left = dpad_left +hat_0_right = dpad_right +hat_0_up = dpad_up diff --git a/share/fs-uae/input/microsoft_x_box_360_pad_11_6_1_0_linux.conf b/share/fs-uae/input/microsoft_x_box_360_pad_11_6_1_0_linux.conf new file mode 100644 index 000000000..1be7f22e3 --- /dev/null +++ b/share/fs-uae/input/microsoft_x_box_360_pad_11_6_1_0_linux.conf @@ -0,0 +1,43 @@ +[fs-uae-controller] +name = Microsoft X-Box 360 pad +platform = linux + +[device] +make = Microsoft +model = Xbox 360 Pad +type = gamepad + +[sdl] +guid = 030000005e0400008e02000014010000 +buttons = 11 +hats = 1 +axes = 6 +balls = 0 + +[default] +include = universal_gamepad +axis_0_neg = lstick_left +axis_0_pos = lstick_right +axis_1_neg = lstick_up +axis_1_pos = lstick_down +axis_2_pos = left_trigger +axis_3_neg = rstick_left +axis_3_pos = rstick_right +axis_4_neg = rstick_up +axis_4_pos = rstick_down +axis_5_pos = right_trigger +button_0 = south_button +button_1 = east_button +button_10 = rstick_button +button_2 = west_button +button_3 = north_button +button_4 = left_shoulder +button_5 = right_shoulder +button_6 = select_button +button_7 = start_button +button_8 = menu_button +button_9 = lstick_button +hat_0_down = dpad_down +hat_0_left = dpad_left +hat_0_right = dpad_right +hat_0_up = dpad_up diff --git a/share/fs-uae/input/microsoft_x_box_one_pad_11_6_1_0_linux.conf b/share/fs-uae/input/microsoft_x_box_one_pad_11_6_1_0_linux.conf index 225580159..c1bee3194 100644 --- a/share/fs-uae/input/microsoft_x_box_one_pad_11_6_1_0_linux.conf +++ b/share/fs-uae/input/microsoft_x_box_one_pad_11_6_1_0_linux.conf @@ -1,8 +1,18 @@ -# Microsoft X-Box One pad +[fs-uae-controller] +name = Microsoft X-Box One pad +platform = linux [device] -name = Microsoft X-Box One pad -type = unspecified +make = Microsoft +model = Xbox One Pad +type = gamepad + +[sdl] +guid = 030000005e040000d102000001010000 +buttons = 11 +hats = 1 +axes = 6 +balls = 0 [default] include = universal_gamepad diff --git a/share/fs-uae/input/mosic_speed_link_competition_pro_4_2_0_0_linux.conf b/share/fs-uae/input/mosic_speed_link_competition_pro_4_2_0_0_linux.conf new file mode 100644 index 000000000..9132cf6b7 --- /dev/null +++ b/share/fs-uae/input/mosic_speed_link_competition_pro_4_2_0_0_linux.conf @@ -0,0 +1,26 @@ +[fs-uae-controller] +name = MOSIC SPEED-LINK Competition Pro +platform = linux + +[device] +make = Speed-Link +model = Competition Pro +type = joystick + +[sdl] +guid = 030000000b0400003365000000010000 +buttons = 4 +hats = 0 +axes = 2 +balls = 0 + +[default] +include = universal_gamepad +axis_0_neg = dpad_left +axis_0_pos = dpad_right +axis_1_neg = dpad_up +axis_1_pos = dpad_down +button_0 = south_button +button_1 = west_button +button_2 = select_button +button_3 = start_button diff --git a/share/fs-uae/input/p880_12_4_1_0_macosx.conf b/share/fs-uae/input/p880_12_4_1_0_macosx.conf index 316aa1b44..b6759129b 100644 --- a/share/fs-uae/input/p880_12_4_1_0_macosx.conf +++ b/share/fs-uae/input/p880_12_4_1_0_macosx.conf @@ -1,26 +1,40 @@ -# P880 +[fs-uae-controller] +name = P880 +platform = macosx + +[device] +make = Saitek +model = P880 +type = gamepad + +[sdl] +guid = a3060000000000000901000000000000 +buttons = 12 +hats = 1 +axes = 4 +balls = 0 [default] include = universal_gamepad -hat_0_left = dpad_left -hat_0_right = dpad_right -hat_0_up = dpad_up -hat_0_down = dpad_down axis_0_neg = lstick_left axis_0_pos = lstick_right axis_1_neg = lstick_up axis_1_pos = lstick_down -button_8 = lstick_button -axis_3_neg = rstick_left -axis_3_pos = rstick_right axis_2_neg = rstick_up axis_2_pos = rstick_down -button_9 = rstick_button +axis_3_neg = rstick_left +axis_3_pos = rstick_right button_0 = west_button button_1 = north_button -button_3 = east_button button_2 = south_button +button_3 = east_button button_4 = select_button button_5 = start_button button_6 = left_shoulder button_7 = right_shoulder +button_8 = lstick_button +button_9 = rstick_button +hat_0_down = dpad_down +hat_0_left = dpad_left +hat_0_right = dpad_right +hat_0_up = dpad_up diff --git a/share/fs-uae/input/p880_12_4_1_0_windows.conf b/share/fs-uae/input/p880_12_4_1_0_windows.conf index 316aa1b44..f9b660457 100644 --- a/share/fs-uae/input/p880_12_4_1_0_windows.conf +++ b/share/fs-uae/input/p880_12_4_1_0_windows.conf @@ -1,26 +1,40 @@ -# P880 +[fs-uae-controller] +name = P880 +platform = windows + +[device] +make = Saitek +model = P880 +type = gamepad + +[sdl] +guid = a3060901000000000000504944564944 +buttons = 12 +hats = 1 +axes = 4 +balls = 0 [default] include = universal_gamepad -hat_0_left = dpad_left -hat_0_right = dpad_right -hat_0_up = dpad_up -hat_0_down = dpad_down axis_0_neg = lstick_left axis_0_pos = lstick_right axis_1_neg = lstick_up axis_1_pos = lstick_down -button_8 = lstick_button -axis_3_neg = rstick_left -axis_3_pos = rstick_right axis_2_neg = rstick_up axis_2_pos = rstick_down -button_9 = rstick_button +axis_3_neg = rstick_left +axis_3_pos = rstick_right button_0 = west_button button_1 = north_button -button_3 = east_button button_2 = south_button +button_3 = east_button button_4 = select_button button_5 = start_button button_6 = left_shoulder button_7 = right_shoulder +button_8 = lstick_button +button_9 = rstick_button +hat_0_down = dpad_down +hat_0_left = dpad_left +hat_0_right = dpad_right +hat_0_up = dpad_up diff --git a/share/fs-uae/input/playstation_r_3_controller_19_4_0_0_macosx.conf b/share/fs-uae/input/playstation_r_3_controller_19_4_0_0_macosx.conf index 14cbb1d64..29184946e 100644 --- a/share/fs-uae/input/playstation_r_3_controller_19_4_0_0_macosx.conf +++ b/share/fs-uae/input/playstation_r_3_controller_19_4_0_0_macosx.conf @@ -1,29 +1,43 @@ -# PLAYSTATION(R)3 Controller +[fs-uae-controller] +name = PLAYSTATION(R)3 Controller +platform = macosx + +[device] +make = Sony +model = DualShock 3 +type = gamepad + +[sdl] +guid = 4c050000000000006802000000000000 +buttons = 19 +hats = 0 +axes = 4 +balls = 0 [default] include = universal_gamepad -button_7 = dpad_left -button_5 = dpad_right -button_4 = dpad_up -button_6 = dpad_down axis_0_neg = lstick_left axis_0_pos = lstick_right axis_1_neg = lstick_up axis_1_pos = lstick_down -button_1 = lstick_button axis_2_neg = rstick_left axis_2_pos = rstick_right axis_3_neg = rstick_up axis_3_pos = rstick_down -button_2 = rstick_button -button_15 = west_button +button_0 = select_button +button_1 = lstick_button +button_10 = left_shoulder +button_11 = right_shoulder button_12 = north_button button_13 = east_button button_14 = south_button -button_0 = select_button -button_3 = start_button +button_15 = west_button button_16 = menu_button -button_10 = left_shoulder +button_2 = rstick_button +button_3 = start_button +button_4 = dpad_up +button_5 = dpad_right +button_6 = dpad_down +button_7 = dpad_left button_8 = left_trigger -button_11 = right_shoulder button_9 = right_trigger diff --git a/share/fs-uae/input/ps3_usb_cordless_gamepad_13_4_1_0_linux.conf b/share/fs-uae/input/ps3_usb_cordless_gamepad_13_4_1_0_linux.conf new file mode 100644 index 000000000..283b40bb7 --- /dev/null +++ b/share/fs-uae/input/ps3_usb_cordless_gamepad_13_4_1_0_linux.conf @@ -0,0 +1,43 @@ +[fs-uae-controller] +name = PS3/USB Cordless Gamepad +platform = linux + +[device] +make = Logitech +model = Cordless Precision +type = gamepad + +[sdl] +guid = 030000006d040000d2ca000011010000 +buttons = 13 +hats = 1 +axes = 4 +balls = 0 + +[default] +include = universal_gamepad +axis_0_neg = lstick_left +axis_0_pos = lstick_right +axis_1_neg = lstick_up +axis_1_pos = lstick_down +axis_2_neg = rstick_right +axis_2_pos = rstick_left +axis_3_neg = rstick_up +axis_3_pos = rstick_down +button_0 = west_button +button_1 = south_button +button_10 = lstick_button +button_11 = rstick_button +button_12 = menu_button +button_2 = east_button +button_3 = north_button +button_4 = left_shoulder +button_5 = right_shoulder +button_6 = left_trigger +button_7 = right_trigger +button_8 = select_button +button_9 = start_button +hat_0_down = dpad_down +hat_0_left = dpad_left +hat_0_right = dpad_right +hat_0_up = dpad_up diff --git a/share/fs-uae/input/ps3_usb_cordless_gamepad_13_4_1_0_macosx.conf b/share/fs-uae/input/ps3_usb_cordless_gamepad_13_4_1_0_macosx.conf index 0e27fa5b1..d1eb1928e 100644 --- a/share/fs-uae/input/ps3_usb_cordless_gamepad_13_4_1_0_macosx.conf +++ b/share/fs-uae/input/ps3_usb_cordless_gamepad_13_4_1_0_macosx.conf @@ -1,29 +1,43 @@ -# PS3/USB Cordless Gamepad +[fs-uae-controller] +name = PS3/USB Cordless Gamepad +platform = macosx + +[device] +make = Logitech +model = Cordless Precision +type = gamepad + +[sdl] +guid = 6d04000000000000d2ca000000000000 +buttons = 13 +hats = 1 +axes = 4 +balls = 0 [default] include = universal_gamepad -hat_0_left = dpad_left -hat_0_right = dpad_right -hat_0_up = dpad_up -hat_0_down = dpad_down axis_0_neg = lstick_left axis_0_pos = lstick_right axis_1_neg = lstick_up axis_1_pos = lstick_down -button_10 = lstick_button axis_2_neg = rstick_left axis_2_pos = rstick_right axis_3_neg = rstick_up axis_3_pos = rstick_down -button_11 = rstick_button button_0 = west_button -button_3 = north_button -button_2 = east_button button_1 = south_button -button_8 = select_button -button_9 = start_button +button_10 = lstick_button +button_11 = rstick_button button_12 = menu_button +button_2 = east_button +button_3 = north_button button_4 = left_shoulder -button_6 = left_trigger button_5 = right_shoulder +button_6 = left_trigger button_7 = right_trigger +button_8 = select_button +button_9 = start_button +hat_0_down = dpad_down +hat_0_left = dpad_left +hat_0_right = dpad_right +hat_0_up = dpad_up diff --git a/share/fs-uae/input/ps3_usb_cordless_gamepad_13_4_1_0_windows.conf b/share/fs-uae/input/ps3_usb_cordless_gamepad_13_4_1_0_windows.conf index 0e27fa5b1..6c0f368e3 100644 --- a/share/fs-uae/input/ps3_usb_cordless_gamepad_13_4_1_0_windows.conf +++ b/share/fs-uae/input/ps3_usb_cordless_gamepad_13_4_1_0_windows.conf @@ -1,29 +1,43 @@ -# PS3/USB Cordless Gamepad +[fs-uae-controller] +name = PS3/USB Cordless Gamepad +platform = windows + +[device] +make = Logitech +model = Cordless Precision +type = gamepad + +[sdl] +guid = 6d04d2ca000000000000504944564944 +buttons = 13 +hats = 1 +axes = 4 +balls = 0 [default] include = universal_gamepad -hat_0_left = dpad_left -hat_0_right = dpad_right -hat_0_up = dpad_up -hat_0_down = dpad_down axis_0_neg = lstick_left axis_0_pos = lstick_right axis_1_neg = lstick_up axis_1_pos = lstick_down -button_10 = lstick_button axis_2_neg = rstick_left axis_2_pos = rstick_right axis_3_neg = rstick_up axis_3_pos = rstick_down -button_11 = rstick_button button_0 = west_button -button_3 = north_button -button_2 = east_button button_1 = south_button -button_8 = select_button -button_9 = start_button +button_10 = lstick_button +button_11 = rstick_button button_12 = menu_button +button_2 = east_button +button_3 = north_button button_4 = left_shoulder -button_6 = left_trigger button_5 = right_shoulder +button_6 = left_trigger button_7 = right_trigger +button_8 = select_button +button_9 = start_button +hat_0_down = dpad_down +hat_0_left = dpad_left +hat_0_right = dpad_right +hat_0_up = dpad_up diff --git a/share/fs-uae/input/retro_joystick_adapter_v2_0_3_2_0_0_macosx.conf b/share/fs-uae/input/retro_joystick_adapter_v2_0_3_2_0_0_macosx.conf new file mode 100644 index 000000000..53cbd8b17 --- /dev/null +++ b/share/fs-uae/input/retro_joystick_adapter_v2_0_3_2_0_0_macosx.conf @@ -0,0 +1,23 @@ +[fs-uae-controller] +name = Retro Joystick Adapter v2.0 +platform = macosx + +[device] +make = Retronic +model = Joystick Adapter 2 +type = joystick + +[sdl] +guid = 8117000000000000990a000000000000 +buttons = 3 +hats = 0 +axes = 2 +balls = 0 + +[default] +include = universal_gamepad +axis_0_neg = dpad_left +axis_0_pos = dpad_right +axis_1_neg = dpad_up +axis_1_pos = dpad_down +button_0 = south_button diff --git a/share/fs-uae/input/retro_joystick_adapter_v2_0_3_2_0_0_windows.conf b/share/fs-uae/input/retro_joystick_adapter_v2_0_3_2_0_0_windows.conf new file mode 100644 index 000000000..b4c0eb2c0 --- /dev/null +++ b/share/fs-uae/input/retro_joystick_adapter_v2_0_3_2_0_0_windows.conf @@ -0,0 +1,23 @@ +[fs-uae-controller] +name = Retro Joystick Adapter v2.0 +platform = windows + +[device] +make = Retro-Link +model = Joystick Adapter 2 +type = gamepad + +[sdl] +guid = 8117990a000000000000504944564944 +buttons = 3 +hats = 0 +axes = 2 +balls = 0 + +[default] +include = universal_gamepad +axis_0_neg = dpad_left +axis_0_pos = dpad_right +axis_1_neg = dpad_up +axis_1_pos = dpad_down +button_0 = south_button diff --git a/share/fs-uae/input/retronicdesign_com_retro_joystick_adapter_v2_0_8_2_0_0_linux.conf b/share/fs-uae/input/retronicdesign_com_retro_joystick_adapter_v2_0_8_2_0_0_linux.conf new file mode 100644 index 000000000..bd809ab81 --- /dev/null +++ b/share/fs-uae/input/retronicdesign_com_retro_joystick_adapter_v2_0_8_2_0_0_linux.conf @@ -0,0 +1,23 @@ +[fs-uae-controller] +name = retronicdesign.com Retro Joystick Adapter v2.0 +platform = linux + +[device] +make = Retronic +model = Joystick Adapter 2 +type = joystick + +[sdl] +guid = 0300000081170000990a000001010000 +buttons = 8 +hats = 0 +axes = 2 +balls = 0 + +[default] +include = universal_gamepad +axis_0_neg = dpad_left +axis_0_pos = dpad_right +axis_1_neg = dpad_up +axis_1_pos = dpad_down +button_0 = south_button diff --git a/share/fs-uae/input/saitek_p880_12_4_1_0_linux.conf b/share/fs-uae/input/saitek_p880_12_4_1_0_linux.conf new file mode 100644 index 000000000..aa23a8730 --- /dev/null +++ b/share/fs-uae/input/saitek_p880_12_4_1_0_linux.conf @@ -0,0 +1,40 @@ +[fs-uae-controller] +name = SAITEK P880 +platform = linux + +[device] +make = Saitek +model = P880 +type = gamepad + +[sdl] +guid = 03000000a30600000901000000010000 +buttons = 12 +hats = 1 +axes = 4 +balls = 0 + +[default] +include = universal_gamepad +axis_0_neg = lstick_left +axis_0_pos = lstick_right +axis_1_neg = lstick_up +axis_1_pos = lstick_down +axis_2_neg = rstick_up +axis_2_pos = rstick_down +axis_3_neg = rstick_left +axis_3_pos = rstick_right +button_0 = west_button +button_1 = north_button +button_2 = south_button +button_3 = east_button +button_4 = select_button +button_5 = start_button +button_6 = left_shoulder +button_7 = right_shoulder +button_8 = lstick_button +button_9 = rstick_button +hat_0_down = dpad_down +hat_0_left = dpad_left +hat_0_right = dpad_right +hat_0_up = dpad_up diff --git a/share/fs-uae/input/sony_computer_entertainment_wireless_controller_14_10_1_0_linux.conf b/share/fs-uae/input/sony_computer_entertainment_wireless_controller_14_10_1_0_linux.conf index 8edd7c050..c54659084 100644 --- a/share/fs-uae/input/sony_computer_entertainment_wireless_controller_14_10_1_0_linux.conf +++ b/share/fs-uae/input/sony_computer_entertainment_wireless_controller_14_10_1_0_linux.conf @@ -1,8 +1,18 @@ -# Sony Computer Entertainment Wireless Controller +[fs-uae-controller] +name = Sony Computer Entertainment Wireless Controller +platform = linux [device] -name = Sony Computer Entertainment Wireless Controller -type = unspecified +make = Sony +model = DualShock 4 +type = gamepad + +[sdl] +guid = 030000004c050000c405000011010000 +buttons = 14 +hats = 1 +axes = 10 +balls = 0 [default] include = universal_gamepad @@ -12,7 +22,6 @@ axis_1_neg = lstick_up axis_1_pos = lstick_down axis_2_neg = rstick_left axis_2_pos = rstick_right -axis_4_pos = right_trigger axis_5_neg = rstick_up axis_5_pos = rstick_down button_0 = west_button @@ -25,6 +34,7 @@ button_3 = north_button button_4 = left_shoulder button_5 = right_shoulder button_6 = left_trigger +button_7 = right_trigger button_8 = select_button button_9 = start_button hat_0_down = dpad_down diff --git a/share/fs-uae/input/sony_playstation_r_3_controller_19_27_0_0_linux.conf b/share/fs-uae/input/sony_playstation_r_3_controller_19_27_0_0_linux.conf new file mode 100644 index 000000000..5d57614f2 --- /dev/null +++ b/share/fs-uae/input/sony_playstation_r_3_controller_19_27_0_0_linux.conf @@ -0,0 +1,43 @@ +[fs-uae-controller] +name = Sony PLAYSTATION(R)3 Controller +platform = linux + +[device] +make = Sony +model = DualShock 3 +type = gamepad + +[sdl] +guid = 030000004c0500006802000011010000 +buttons = 19 +hats = 0 +axes = 27 +balls = 0 + +[default] +include = universal_gamepad +axis_0_neg = lstick_left +axis_0_pos = lstick_right +axis_1_neg = lstick_up +axis_1_pos = lstick_down +axis_2_neg = rstick_left +axis_2_pos = rstick_right +axis_3_neg = rstick_up +axis_3_pos = rstick_down +button_0 = select_button +button_1 = lstick_button +button_10 = left_shoulder +button_11 = right_shoulder +button_12 = north_button +button_13 = east_button +button_14 = south_button +button_15 = west_button +button_16 = menu_button +button_2 = rstick_button +button_3 = start_button +button_4 = dpad_up +button_5 = dpad_right +button_6 = dpad_down +button_7 = dpad_left +button_8 = left_trigger +button_9 = right_trigger diff --git a/share/fs-uae/input/speed_link_competition_pro_4_2_0_0_macosx.conf b/share/fs-uae/input/speed_link_competition_pro_4_2_0_0_macosx.conf new file mode 100644 index 000000000..81dcc56c5 --- /dev/null +++ b/share/fs-uae/input/speed_link_competition_pro_4_2_0_0_macosx.conf @@ -0,0 +1,26 @@ +[fs-uae-controller] +name = SPEED-LINK Competition Pro +platform = macosx + +[device] +make = Speed-Link +model = Competition Pro +type = joystick + +[sdl] +guid = 0b040000000000003365000000000000 +buttons = 4 +hats = 0 +axes = 2 +balls = 0 + +[default] +include = universal_gamepad +axis_0_neg = dpad_left +axis_0_pos = dpad_right +axis_1_neg = dpad_up +axis_1_pos = dpad_down +button_0 = south_button +button_1 = west_button +button_2 = select_button +button_3 = start_button diff --git a/share/fs-uae/input/speed_link_competition_pro_4_2_0_0_windows.conf b/share/fs-uae/input/speed_link_competition_pro_4_2_0_0_windows.conf index af41b0893..867c7cf9e 100644 --- a/share/fs-uae/input/speed_link_competition_pro_4_2_0_0_windows.conf +++ b/share/fs-uae/input/speed_link_competition_pro_4_2_0_0_windows.conf @@ -1,12 +1,26 @@ -# name: SPEED-LINK Competition Pro +[fs-uae-controller] +name = SPEED-LINK Competition Pro +platform = windows + +[device] +make = Speed-Link +model = Competition Pro +type = joystick + +[sdl] +guid = 0b043365000000000000504944564944 +buttons = 4 +hats = 0 +axes = 2 +balls = 0 [default] include = universal_gamepad -axis_0_neg = d_pad_left -axis_0_pos = d_pad_right -axis_1_neg = d_pad_up -axis_1_pos = d_pad_down -button_1 = east_button +axis_0_neg = dpad_left +axis_0_pos = dpad_right +axis_1_neg = dpad_up +axis_1_pos = dpad_down button_0 = south_button +button_1 = west_button button_2 = select_button button_3 = start_button diff --git a/share/fs-uae/input/thrustmaster_2_in_1_dt_12_4_1_0_linux.conf b/share/fs-uae/input/thrustmaster_2_in_1_dt_12_4_1_0_linux.conf new file mode 100644 index 000000000..7824f19f0 --- /dev/null +++ b/share/fs-uae/input/thrustmaster_2_in_1_dt_12_4_1_0_linux.conf @@ -0,0 +1,42 @@ +[fs-uae-controller] +name = THRUSTMASTER 2 in 1 DT +platform = linux + +[device] +make = Thrustmaster +model = 2 in 1 DT +type = gamepad + +[sdl] +guid = 030000004f04000020b3000010010000 +buttons = 12 +hats = 1 +axes = 4 +balls = 0 + +[default] +include = universal_gamepad +axis_0_neg = lstick_left +axis_0_pos = lstick_right +axis_1_neg = lstick_up +axis_1_pos = lstick_down +axis_2_neg = rstick_left +axis_2_pos = rstick_right +axis_3_neg = rstick_up +axis_3_pos = rstick_down +button_0 = south_button +button_1 = west_button +button_10 = lstick_button +button_11 = rstick_button +button_2 = east_button +button_3 = north_button +button_4 = left_shoulder +button_5 = left_trigger +button_6 = right_shoulder +button_7 = right_trigger +button_8 = select_button +button_9 = start_button +hat_0_down = dpad_down +hat_0_left = dpad_left +hat_0_right = dpad_right +hat_0_up = dpad_up diff --git a/share/fs-uae/input/usb_2_axis_8_button_gamepad_8_2_0_0_linux.conf b/share/fs-uae/input/usb_2_axis_8_button_gamepad_8_2_0_0_linux.conf new file mode 100644 index 000000000..a6f4e0575 --- /dev/null +++ b/share/fs-uae/input/usb_2_axis_8_button_gamepad_8_2_0_0_linux.conf @@ -0,0 +1,30 @@ +[fs-uae-controller] +name = USB,2-axis 8-button gamepad +platform = linux + +[device] +make = iBuffalo +model = SNES Pad +type = gamepad + +[sdl] +guid = 03000000830500006020000010010000 +buttons = 8 +hats = 0 +axes = 2 +balls = 0 + +[default] +include = universal_gamepad +axis_0_neg = dpad_left +axis_0_pos = dpad_right +axis_1_neg = dpad_up +axis_1_pos = dpad_down +button_0 = east_button +button_1 = south_button +button_2 = north_button +button_3 = west_button +button_4 = left_shoulder +button_5 = right_shoulder +button_6 = select_button +button_7 = start_button diff --git a/share/fs-uae/input/usb_2_axis_8_button_gamepad_8_2_0_0_macosx.conf b/share/fs-uae/input/usb_2_axis_8_button_gamepad_8_2_0_0_macosx.conf new file mode 100644 index 000000000..0b5cb71ec --- /dev/null +++ b/share/fs-uae/input/usb_2_axis_8_button_gamepad_8_2_0_0_macosx.conf @@ -0,0 +1,30 @@ +[fs-uae-controller] +name = USB,2-axis 8-button gamepad +platform = macosx + +[device] +make = iBuffalo +model = SNES Pad +type = gamepad + +[sdl] +guid = 83050000000000006020000000000000 +buttons = 8 +hats = 0 +axes = 2 +balls = 0 + +[default] +include = universal_gamepad +axis_0_neg = dpad_left +axis_0_pos = dpad_right +axis_1_neg = dpad_up +axis_1_pos = dpad_down +button_0 = east_button +button_1 = south_button +button_2 = north_button +button_3 = west_button +button_4 = left_shoulder +button_5 = right_shoulder +button_6 = select_button +button_7 = start_button diff --git a/share/fs-uae/input/usb_2_axis_8_button_gamepad_8_2_0_0_windows.conf b/share/fs-uae/input/usb_2_axis_8_button_gamepad_8_2_0_0_windows.conf new file mode 100644 index 000000000..7d25dec09 --- /dev/null +++ b/share/fs-uae/input/usb_2_axis_8_button_gamepad_8_2_0_0_windows.conf @@ -0,0 +1,30 @@ +[fs-uae-controller] +name = USB,2-axis 8-button gamepad +platform = windows + +[device] +make = iBuffalo +model = SNES Pad +type = gamepad + +[sdl] +guid = 83056020000000000000504944564944 +buttons = 8 +hats = 0 +axes = 2 +balls = 0 + +[default] +include = universal_gamepad +axis_0_neg = dpad_left +axis_0_pos = dpad_right +axis_1_neg = dpad_up +axis_1_pos = dpad_down +button_0 = east_button +button_1 = south_button +button_2 = north_button +button_3 = west_button +button_4 = left_shoulder +button_5 = right_shoulder +button_6 = select_button +button_7 = start_button diff --git a/share/fs-uae/input/usb_gamepad_10_2_0_0_linux.conf b/share/fs-uae/input/usb_gamepad_10_2_0_0_linux.conf new file mode 100644 index 000000000..0741f5dc2 --- /dev/null +++ b/share/fs-uae/input/usb_gamepad_10_2_0_0_linux.conf @@ -0,0 +1,30 @@ +[fs-uae-controller] +name = USB Gamepad +platform = linux + +[device] +make = Retrolink +model = Classic Controller +type = gamepad + +[sdl] +guid = 03000000790000001100000010010000 +buttons = 10 +hats = 0 +axes = 2 +balls = 0 + +[default] +include = universal_gamepad +axis_0_neg = dpad_left +axis_0_pos = dpad_right +axis_1_neg = dpad_up +axis_1_pos = dpad_down +button_0 = north_button +button_1 = east_button +button_2 = south_button +button_3 = west_button +button_4 = left_shoulder +button_5 = right_shoulder +button_8 = select_button +button_9 = start_button diff --git a/share/fs-uae/input/wireless_controller_14_6_1_0_macosx.conf b/share/fs-uae/input/wireless_controller_14_6_1_0_macosx.conf index f08dd9c60..c0e689a08 100644 --- a/share/fs-uae/input/wireless_controller_14_6_1_0_macosx.conf +++ b/share/fs-uae/input/wireless_controller_14_6_1_0_macosx.conf @@ -1,8 +1,18 @@ -# Wireless Controller +[fs-uae-controller] +name = Wireless Controller +platform = macosx [device] -name = Wireless Controller -type = unspecified +make = Sony +model = DualShock 4 +type = gamepad + +[sdl] +guid = 4c05000000000000c405000000000000 +buttons = 14 +hats = 1 +axes = 6 +balls = 0 [default] include = universal_gamepad @@ -12,7 +22,6 @@ axis_1_neg = lstick_up axis_1_pos = lstick_down axis_2_neg = rstick_left axis_2_pos = rstick_right -axis_4_pos = right_trigger axis_5_neg = rstick_up axis_5_pos = rstick_down button_0 = west_button @@ -25,6 +34,7 @@ button_3 = north_button button_4 = left_shoulder button_5 = right_shoulder button_6 = left_trigger +button_7 = right_trigger button_8 = select_button button_9 = start_button hat_0_down = dpad_down diff --git a/share/fs-uae/input/wireless_controller_14_6_1_0_windows.conf b/share/fs-uae/input/wireless_controller_14_6_1_0_windows.conf new file mode 100644 index 000000000..11e069d24 --- /dev/null +++ b/share/fs-uae/input/wireless_controller_14_6_1_0_windows.conf @@ -0,0 +1,43 @@ +[fs-uae-controller] +name = Wireless Controller +platform = windows + +[device] +make = Sony +model = DualShock 4 +type = gamepad + +[sdl] +guid = 4c05c405000000000000504944564944 +buttons = 14 +hats = 1 +axes = 6 +balls = 0 + +[default] +include = universal_gamepad +axis_0_neg = lstick_left +axis_0_pos = lstick_right +axis_1_neg = lstick_up +axis_1_pos = lstick_down +axis_2_neg = rstick_left +axis_2_pos = rstick_right +axis_5_neg = rstick_up +axis_5_pos = rstick_down +button_0 = west_button +button_1 = south_button +button_10 = lstick_button +button_11 = rstick_button +button_12 = menu_button +button_2 = east_button +button_3 = north_button +button_4 = left_shoulder +button_5 = right_shoulder +button_6 = left_trigger +button_7 = right_trigger +button_8 = select_button +button_9 = start_button +hat_0_down = dpad_down +hat_0_left = dpad_left +hat_0_right = dpad_right +hat_0_up = dpad_up diff --git a/share/fs-uae/input/x360controller_16_6_0_0_macosx.conf b/share/fs-uae/input/x360controller_16_6_0_0_macosx.conf new file mode 100644 index 000000000..fce45db4a --- /dev/null +++ b/share/fs-uae/input/x360controller_16_6_0_0_macosx.conf @@ -0,0 +1,43 @@ +[fs-uae-controller] +name = X360Controller +platform = macosx + +[device] +make = Microsoft +model = Xbox One Pad +type = gamepad + +[sdl] +guid = 5e040000000000008e02000000000000 +buttons = 16 +hats = 0 +axes = 6 +balls = 0 + +[default] +include = universal_gamepad +axis_0_neg = lstick_left +axis_0_pos = lstick_right +axis_1_neg = lstick_up +axis_1_pos = lstick_down +axis_2_pos = left_trigger +axis_3_neg = rstick_left +axis_3_pos = rstick_right +axis_4_neg = rstick_up +axis_4_pos = rstick_down +axis_5_pos = right_trigger +button_0 = south_button +button_1 = east_button +button_11 = dpad_up +button_12 = dpad_down +button_13 = dpad_left +button_14 = dpad_right +button_15 = menu_button +button_2 = west_button +button_3 = north_button +button_4 = left_shoulder +button_5 = right_shoulder +button_6 = lstick_button +button_7 = rstick_button +button_8 = start_button +button_9 = select_button diff --git a/share/fs-uae/input/xbox_360_wireless_receiver_15_6_0_0_linux.conf b/share/fs-uae/input/xbox_360_wireless_receiver_15_6_0_0_linux.conf new file mode 100644 index 000000000..25547f764 --- /dev/null +++ b/share/fs-uae/input/xbox_360_wireless_receiver_15_6_0_0_linux.conf @@ -0,0 +1,43 @@ +[fs-uae-controller] +name = Xbox 360 Wireless Receiver +platform = linux + +[device] +make = Microsoft +model = Xbox 360 Pad +type = gamepad + +[sdl] +guid = 030000005e0400001907000000010000 +buttons = 15 +hats = 0 +axes = 6 +balls = 0 + +[default] +include = universal_gamepad +axis_0_neg = lstick_left +axis_0_pos = lstick_right +axis_1_neg = lstick_up +axis_1_pos = lstick_down +axis_2_pos = left_trigger +axis_3_neg = rstick_left +axis_3_pos = rstick_right +axis_4_neg = rstick_up +axis_4_pos = rstick_down +axis_5_pos = right_trigger +button_0 = south_button +button_1 = east_button +button_10 = rstick_button +button_11 = dpad_left +button_12 = dpad_right +button_13 = dpad_up +button_14 = dpad_down +button_2 = west_button +button_3 = north_button +button_4 = left_shoulder +button_5 = right_shoulder +button_6 = select_button +button_7 = start_button +button_8 = menu_button +button_9 = lstick_button diff --git a/share/fs-uae/input/xinput_controller_15_6_0_0_windows.conf b/share/fs-uae/input/xinput_controller_15_6_0_0_windows.conf index fed444f8d..2db2dae77 100644 --- a/share/fs-uae/input/xinput_controller_15_6_0_0_windows.conf +++ b/share/fs-uae/input/xinput_controller_15_6_0_0_windows.conf @@ -1,8 +1,18 @@ -# XInput Controller +[fs-uae-controller] +name = XInput Controller +platform = windows [device] -name = XInput Controller -type = unspecified +make = XInput +model = Controller +type = gamepad + +[sdl] +guid = 00000000000000000000000000000000 +buttons = 15 +hats = 0 +axes = 6 +balls = 0 [default] include = universal_gamepad diff --git a/src/fs-uae/config.c b/src/fs-uae/config.c index fd74b6b07..da057f492 100644 --- a/src/fs-uae/config.c +++ b/src/fs-uae/config.c @@ -254,7 +254,7 @@ void fs_uae_configure_amiga_hardware() int stereo_separation = fs_config_get_int_clamped( OPTION_STEREO_SEPARATION, 0, 100); if (stereo_separation == FS_CONFIG_NONE) { - stereo_separation = 100; + stereo_separation = 70; } stereo_separation = stereo_separation / 10; amiga_set_int_option("sound_stereo_separation", stereo_separation); diff --git a/src/fs-uae/device-helper.c b/src/fs-uae/device-helper.c index 222f06549..c4a3b91af 100644 --- a/src/fs-uae/device-helper.c +++ b/src/fs-uae/device-helper.c @@ -100,11 +100,17 @@ static void list_joysticks() printf("J: %s\n", name); g_free(name); - printf(" Buttons: %d Hats: %d Axes: %d Balls: %d\n", + char guid_str[33]; + SDL_JoystickGUID guid = SDL_JoystickGetGUID(joystick); + SDL_JoystickGetGUIDString(guid, guid_str, 33); + guid_str[32] = '\0'; + + printf(" Buttons: %d Hats: %d Axes: %d Balls: %d GUID: %s\n", SDL_JoystickNumButtons(joystick), SDL_JoystickNumHats(joystick), SDL_JoystickNumAxes(joystick), - SDL_JoystickNumBalls(joystick)); + SDL_JoystickNumBalls(joystick), + guid_str); SDL_JoystickClose(joystick); } #else diff --git a/src/include/uae/fs.h b/src/include/uae/fs.h index 0e79c944b..ca0ea29a5 100644 --- a/src/include/uae/fs.h +++ b/src/include/uae/fs.h @@ -8,6 +8,8 @@ #include "uae/types.h" #include "uae/uae.h" +#include + void romlist_init (void); void romlist_patch_rom(uae_u8 *buf, size_t size); void keyboard_settrans (void); diff --git a/src/od-fs/input.cpp b/src/od-fs/input.cpp index 5efe16880..de318bb68 100644 --- a/src/od-fs/input.cpp +++ b/src/od-fs/input.cpp @@ -11,7 +11,6 @@ int tablet_log = 0; -static int g_debug_input; static int g_joystick_port_autofire[4]; void amiga_set_joystick_port_autofire(int port, int autofire) { @@ -65,11 +64,9 @@ int amiga_send_input_event(int input_event, int state) { static int initialized = 0; if (!initialized) { initialized = 1; - g_debug_input = getenv("FS_DEBUG_INPUT") && \ - getenv("FS_DEBUG_INPUT")[0] == '1'; } - if (g_debug_input) { + if (g_fs_log_input) { write_log("amiga_send_input_event %d %d\n", input_event, state); }