github.com/mist-devel.mist-firmware
1
0
Fork 0
mirror of https://github.com/mist-devel/mist-firmware.git synced 2026-02-03 14:53:05 +00:00
Code Releases Activity

Merge commit 'e8f26025860a6551718f0d337bb337c895a64e53' into firmware_160610

Browse Source 
Tweaks to include latest turbo code (even if disabled)
This commit is contained in:
Newsdee
2016-06-25 13:30:38 +08:00
parent e7cf99581a
commit c3dd554c6e
3 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
osd.c
View File

@@ -826,13 +826,8 @@ unsigned int OsdUsbVidGetB() {
unsigned int OsdUsbPidGetB() {
return usb_pid_b;
}
/* return Joy state including turbo settings */
uint8_t OsdJoyState ( uint8_t joy_num ) {
if(joy_num>1) return 0;
uint8_t result = mist_joy[joy_num].state;
if(mist_joy[joy_num].turbo==0) return result;
result &= mist_joy[joy_num].turbo_state;
return result;
unsigned int OsdUsbGetNumButtonsB() {
return num_buttons_b;
}
/* keyboard data */

2
osd.h
View File

@@ -150,7 +150,7 @@ unsigned char OsdJoyGetExtra2();
// Keep track of connected sticks
unsigned char OsdNumJoysticks();
unsigned char OsdNumJoysticksSet(unsigned char num);
void OsdNumJoysticksSet(unsigned char num);
// USB raw data for joystick 1
void OsdUsbJoySet(uint8_t usbjoy, uint8_t usbextra);

4
user_io.c
View File

@@ -329,12 +329,12 @@ void user_io_digital_joystick(unsigned char joystick, unsigned char map) {
// (mouse port)
if (joystick==1) {
OsdJoySet(map, 0);
OsdJoySet(map);
//OsdTurboUpdate(0);
//map = (unsigned char)OsdJoyState(0); //apply turbo
}
else if (joystick==0) {// WARNING: 0 is the second joystick, either USB or DB9
OsdJoySet(map, 1);
OsdJoySet2(map);
//OsdTurboUpdate(1);
//map = (unsigned char)OsdJoyState(1); //apply turbo
}