eaw/Main
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Option to translate Digital<->Analog joysticks.

Browse Source
This commit is contained in:
sorgelig
2018-05-17 12:38:04 +08:00
parent 5c64ee2f61
commit d35601d2cf
3 changed files with 48 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
input.cpp
View File

@@ -1999,11 +1999,12 @@ int input_test(int getchar)
if (ev.code < 16) offset += 4;
if (ev.code < 2) offset += 4;
uint16_t base_axis = !user_io_get_joy_transl() ? 0 : ~ev.code;
uint16_t extra_axis = 2;
if (input[i].vid == 0x0079 && input[i].pid == 0x0006) extra_axis = 0; // AliExpress USB encoder PCB floods axis 2
if (input[i].vid == 0x045e && input[i].pid == 0x028e) extra_axis = 3; // 8BitDo Retro Receiver
if(ev.code == 0 || ev.code == extra_axis || ev.code == 16) // x
if(ev.code == base_axis || ev.code == extra_axis || ev.code == 16) // x
{
if ((ev.code < 16) ? ev.value < mid_axis - treshold : ev.value == -1) l = 1;
if ((ev.code < 16) ? ev.value > mid_axis + treshold : ev.value == 1) r = 1;
@@ -2026,13 +2027,13 @@ int input_test(int getchar)
}
}
uint16_t base_y_axis = 1;
if (input[i].vid == 0x0079 && input[i].pid == 0x0006) base_y_axis = 3; // AliExpress USB encoder PCB
base_axis = !user_io_get_joy_transl() ? 1 : ~ev.code;
if (input[i].vid == 0x0079 && input[i].pid == 0x0006) base_axis = 3; // AliExpress USB encoder PCB
extra_axis = 5;
if (input[i].vid == 0x045e && input[i].pid == 0x028e) extra_axis = 4; // 8BitDo Retro Receiver
if (ev.code == base_y_axis || ev.code == extra_axis || ev.code == 17) // y
if (ev.code == base_axis || ev.code == extra_axis || ev.code == 17) // y
{
// override specific to x axis
if (input[i].vid == 0x046d && input[i].pid == 0xc21f) mid_axis = -129; // Logitech F710
@@ -2160,6 +2161,7 @@ int input_poll(int getchar)
if (!time[i]) time[i] = GetTimer(af_delay[i]);
int send = 0;
int newdir = ((joy[i] & 0xF) != (joy_prev[i] & 0xF));
if (joy[i] != joy_prev[i])
{
if ((joy[i] ^ joy_prev[i]) & autofire[i])
@@ -2181,7 +2183,7 @@ int input_poll(int getchar)
if (send)
{
user_io_digital_joystick(i, af[i] ? joy[i] & ~autofire[i] : joy[i]);
user_io_digital_joystick(i, af[i] ? joy[i] & ~autofire[i] : joy[i], newdir);
}
}
}

58
user_io.cpp
View File

@@ -234,6 +234,17 @@ int user_io_get_kbdemu()
static int joy_force = 0;
// Analog/Digital Joystick translation
// 0 - translate Analog to Digital (default)
// 1 - translate Digital to Analog
// 2 - do not translate
static int joy_transl = 0;
int user_io_get_joy_transl()
{
return joy_transl;
}
static void parse_config()
{
int i = 0;
@@ -252,7 +263,12 @@ static void parse_config()
{
if (p[0] == 'J')
{
if (p[1] == '1')
int n = 1;
if (p[1] == 'D') { joy_transl = 0; n++; }
if (p[1] == 'A') { joy_transl = 1; n++; }
if (p[1] == 'N') { joy_transl = 2; n++; }
if (p[n] == '1')
{
joy_force = 1;
set_emu_mode(EMU_JOY0);
@@ -511,9 +527,8 @@ void user_io_analog_joystick(unsigned char joystick, char valueX, char valueY)
{
if (core_type == CORE_TYPE_8BIT)
{
uint16_t pos = valueY;
spi_uio_cmd8_cont(UIO_ASTICK, joystick);
if(io_ver) spi_w((pos<<8) | (uint8_t)(valueX));
if(io_ver) spi_w((valueY<<8) | (uint8_t)(valueX));
else
{
spi8(valueX);
@@ -523,25 +538,27 @@ void user_io_analog_joystick(unsigned char joystick, char valueX, char valueY)
}
}
void user_io_digital_joystick(unsigned char joystick, uint16_t map)
void user_io_digital_joystick(unsigned char joystick, uint16_t map, int newdir)
{
if (joystick >= 6) return;
if (is_minimig())
{
if (joystick < 2) spi_uio_cmd16(UIO_JOYSTICK0 + joystick, map);
spi_uio_cmd16(UIO_JOYSTICK0 + joystick, map);
return;
}
// atari ST handles joystick 0 and 1 through the ikbd emulated by the io controller
// but only for joystick 1 and 2
if ((core_type == CORE_TYPE_MIST) && (joystick < 2))
if (core_type == CORE_TYPE_MIST)
{
ikbd_joystick(joystick, (uint8_t)map);
return;
}
spi_uio_cmd16((joystick < 2) ? (UIO_JOYSTICK0 + joystick) : (UIO_JOYSTICK2 + joystick - 2), map);
spi_uio_cmd16(UIO_JOYSTICK0 + joystick, map);
if (joy_transl == 1 && newdir)
{
user_io_analog_joystick(joystick, (map & 2) ? 128 : (map & 1) ? 127 : 0, (map & 8) ? 128 : (map & 4) ? 127 : 0);
}
}
// transmit serial/rs232 data into core
@@ -1742,25 +1759,28 @@ static void send_keycode(unsigned short key, int press)
void user_io_mouse(unsigned char b, int16_t x, int16_t y)
{
// send mouse data as minimig expects it
if (core_type == CORE_TYPE_MINIMIG2)
switch (core_type)
{
case CORE_TYPE_MINIMIG2:
mouse_pos[X] += x;
mouse_pos[Y] += y;
mouse_flags |= 0x80 | (b & 7);
}
return;
// 8 bit core expects ps2 like data
if (core_type == CORE_TYPE_8BIT)
{
case CORE_TYPE_8BIT:
mouse_pos[X] += x;
mouse_pos[Y] -= y; // ps2 y axis is reversed over usb
mouse_flags |= 0x08 | (b & 7);
}
return;
// send mouse data as mist expects it
if (core_type == CORE_TYPE_MIST) ikbd_mouse(b, x, y);
if (core_type == CORE_TYPE_ARCHIE) archie_mouse(b, x, y);
case CORE_TYPE_MIST:
ikbd_mouse(b, x, y);
return;
case CORE_TYPE_ARCHIE:
archie_mouse(b, x, y);
return;
}
}
/* usb modifer bits:

4
user_io.h
View File

@@ -204,11 +204,11 @@ uint32_t user_io_eth_get_status(void);
void user_io_eth_send_rx_frame(uint8_t *, uint16_t);
void user_io_eth_receive_tx_frame(uint8_t *, uint16_t);
// hooks from the usb layer
void user_io_mouse(unsigned char b, int16_t x, int16_t y);
void user_io_kbd(uint16_t key, int press);
char* user_io_create_config_name();
void user_io_digital_joystick(unsigned char, uint16_t);
int user_io_get_joy_transl();
void user_io_digital_joystick(unsigned char, uint16_t, int);
void user_io_analog_joystick(unsigned char, char, char);
char user_io_osd_is_visible();
void user_io_send_buttons(char);