github.com/mist-devel.mist-firmware
1
0
Fork 0
mirror of https://github.com/mist-devel/mist-firmware.git synced 2026-02-17 12:47:00 +00:00
Code Releases Activity

Working joy2 test

Browse Source
This commit is contained in:
Newsdee
2016-06-26 10:48:52 +08:00
parent 9bfe8e5cea
commit 3831e44d7e
3 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
menu.c
View File

@@ -1444,8 +1444,10 @@ void HandleUI(void)
OsdSetTitle("Turbo", 0);
menustate = MENU_8BIT_TURBO2;
parentstate=MENU_8BIT_TURBO1;
StateJoyState(0, &mist_joy[0]);
StateJoyState(1, &mist_joy[1]);
//StateJoyState(0, &mist_joy[0]);
joy0 = mist_joy[0];//StateJoyGet(0);
//StateJoyState(1, &mist_joy[1]);
joy1 = mist_joy[1];//StateJoyGet(1);
OsdWrite(0, " Button Configuration", 1, 0);
OsdWrite(1, "", 0, 0);
strcpy(s, " Joy 1 Turbo : ");
@@ -1465,8 +1467,10 @@ void HandleUI(void)
break;
case MENU_8BIT_TURBO2:
StateJoyState(0, &mist_joy[0]);
StateJoyState(1, &mist_joy[1]);
//StateJoyState(0, &mist_joy[0]);
//StateJoyState(1, &mist_joy[1]);
joy0 = mist_joy[0];//StateJoyGet(0);
joy1 = mist_joy[1];//StateJoyGet(1);
strcpy(s, " Joy 1 Turbo : ");
strcat(s, config_button_turbo_msg[(int)joy0.turbo/OSD_TURBO_STEP]);
OsdWrite(2, s, menusub==0, 0);

2
state.c
View File

@@ -62,7 +62,7 @@ void StateJoySetExtra(uint8_t c, uint8_t joy_num) {
if(joy_num==0)
osd_joy_extra = c;
else
osd_joy_extra = c;
osd_joy_extra2 = c;
}
uint8_t StateJoyGet(uint8_t joy_num) {
return joy_num==0?osd_joy:osd_joy2;

9
usb/hid.c
View File

@@ -755,17 +755,18 @@ static void usb_process_iface (usb_hid_iface_info_t *iface,
//if (jmap != 0) iprintf("JMAP post map:%d\n", jmap);
// report joystick 1 to OSD
StateJoySetExtra( btn_extra, iface->jindex);
// report joysticks to OSD
idx=iface->jindex;
StateJoySetExtra( btn_extra, idx);
// swap joystick 0 and 1 since 1 is the one
// used primarily on most systems
if(idx == 0) idx = 1;
else if(idx == 1) idx = 0;
//StateJoySetExtra( btn_extra, idx);
// run even if not changed
user_io_digital_joystick(idx, jmap);
user_io_digital_joystick(idx, jmap);
// also send analog values
user_io_analog_joystick(idx, a[0]-128, a[1]-128);