Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

UI: Device emulation #1478

Closed
wants to merge 38 commits into from
Closed
Show file tree
Hide file tree
Changes from 27 commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
e0f0566
Added support for emulating other controllers
faha223 Dec 19, 2022
b6fa2bb
Fixed a bug
faha223 Dec 23, 2022
68146cf
Added Display Names for Device Drivers
faha223 Dec 23, 2022
0310b34
Fixed something that wasn't supposed to get checked in
faha223 Dec 23, 2022
30df0bf
hw: SBC uses a different endpoint address for output
Quantx Feb 7, 2023
042472d
hw: Use USB vendor IDs to differentiate controller types
Quantx Feb 7, 2023
25167be
hw: Don't need to dereference device description
Quantx Feb 7, 2023
d206b79
hw: manually initialize usb descriptor
Quantx Feb 7, 2023
d62cd8b
Merge pull request #17 from Quantx/device_emulation
faha223 Jun 14, 2023
9a242b3
Merge branch 'master' of https://github.com/xemu-project/xemu into xe…
faha223 Jul 15, 2023
3157cd7
Merge branch 'xemu-project-master' into device_emulation
faha223 Jul 15, 2023
4247ad1
Merge branch 'master' into device_emulation
faha223 Aug 20, 2023
59762db
Added the ability to simulate an arcade stick
faha223 Aug 23, 2023
8fad58a
Merge branch 'device_emulation' of https://github.com/faha223/xemu in…
faha223 Aug 23, 2023
3b8dc3d
Removed some unused variables
faha223 Aug 31, 2023
51db87a
save the bound drivers to the config
faha223 Sep 4, 2023
1bb87df
UI Adjustments and bug fixes
faha223 Sep 8, 2023
44a1fdb
Minor UI tweaks
faha223 Sep 8, 2023
9dface8
Fixed the tuner dial int the Input UI
faha223 Sep 9, 2023
89f7e41
Formatting and some refactoring
faha223 Sep 27, 2023
7872805
reverted some changes that are no longer needed
faha223 Sep 28, 2023
ae564a9
More refactoring and renaming
faha223 Sep 29, 2023
9c58dae
Commented out a call to usb_packet_copy
faha223 Sep 30, 2023
b213ee9
fleshed out the XIDSteelBattalionOutputReport
faha223 Sep 30, 2023
d077774
Merge branch 'master' of https://github.com/xemu-project/xemu into de…
faha223 Nov 27, 2023
76b29ae
Merge branch 'master' of https://github.com/faha223/xemu into device_…
faha223 Dec 24, 2023
0699999
Changed the Steel Battalion controller to not have an internal hub. R…
faha223 Dec 28, 2023
a650059
Changed the XIDSteelBattalionOutputReport to take advantage of Bitfie…
faha223 Jan 4, 2024
8d38d40
Ran clang format on this branch
faha223 Feb 28, 2024
fdbb600
fixed what the last commit broke
faha223 Feb 28, 2024
98aa18b
Merge pull request #24 from xemu-project/master
faha223 Mar 10, 2024
0036637
Merge branch 'master' into device_emulation
faha223 Mar 10, 2024
2eb8859
Added support for simulating a light gun using the mouse and keyboard
faha223 Jun 11, 2024
4cebfca
Fixed some bugs that were introduced in the last commit
faha223 Jun 12, 2024
9f38015
Merge branch 'master' into device_emulation
faha223 Jun 12, 2024
e7df683
Merge branch 'xemu-project:master' into device_emulation
faha223 Sep 20, 2024
d611f0a
Finished the final touches on Lightgun emulation. It's now capable of…
faha223 Sep 20, 2024
a3b41c0
Ran clang-format on all of the files changed or added by this PR
faha223 Sep 20, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
173 changes: 173 additions & 0 deletions config_spec.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,13 @@ general:

input:
bindings:
port1_driver: string
port1: string
port2_driver: string
port2: string
port3_driver: string
port3: string
port4_driver: string
port4: string
peripherals:
port1:
Expand Down Expand Up @@ -128,6 +132,175 @@ input:
rtrigger:
type: integer
default: 18 # w
keyboard_sbc_scancode_map:
main_weapon:
type: integer
default: 40 # enter
sub_weapon:
type: integer
default: 229 # right shift
lock_on:
type: integer
default: 42 # backspace
eject:
type: integer
default: 41 # esc
cockpit_hatch:
type: integer
default: 62 # F5
ignition:
type: integer
default: 63 # F6
start:
type: integer
default: 64 # F7
open_close:
type: integer
default: 74 # home
map_zoom_in_out:
type: integer
default: 77 # end
mode_select:
type: integer
default: 73 # insert
sub_monitor_mode_select:
type: integer
default: 76 # delete
zoom_in:
type: integer
default: 75 # Page Up
zoom_out:
type: integer
default: 78 # Page Down
fss:
type: integer
default: 9 # f
manipulator:
type: integer
default: 16 # m
line_color_change:
type: integer
default: 46 # =
washing:
type: integer
default: 45 # -
extinguisher:
type: integer
default: 8 # e
chaff:
type: integer
default: 6 # c
tank_detach:
type: integer
default: 23 # t
override:
type: integer
default: 18 # o
night_scope:
type: integer
default: 17 # n
func1:
type: integer
default: 58 # F1
func2:
type: integer
default: 59 # F2
func3:
type: integer
default: 60 # F3
main_weapon_control:
type: integer
default: 35 # 6
sub_weapon_control:
type: integer
default: 36 # 7
magazine_change:
type: integer
default: 21 # r
com1:
type: integer
default: 30 # 1
com2:
type: integer
default: 31 # 2
com3:
type: integer
default: 32 # 3
com4:
type: integer
default: 33 # 4
com5:
type: integer
default: 34 # 5
sight_change:
type: integer
default: 20 # q
filt_control_system:
type: integer
default: 65 # F8
oxygen_supply_system:
type: integer
default: 66 # F9
fuel_flow_rate:
type: integer
default: 67 # F10
buffer_material:
type: integer
default: 68 # F11
vt_location_measurement:
type: integer
default: 69 # F12
gear_up:
type: integer
default: 225 # lshift
gear_down:
type: integer
default: 224 # lctrl
tuner_left:
type: integer
default: 54 # <
tuner_right:
type: integer
default: 55 # >
aiming_up:
type: integer
default: 96 # numpad 8
aiming_down:
type: integer
default: 90 # numpad 2
aiming_left:
type: integer
default: 92 # numpad 4
aiming_right:
type: integer
default: 94 # numpad 6
sight_change_up:
type: integer
default: 82 # up
sight_change_down:
type: integer
default: 81 # down
sight_change_left:
type: integer
default: 80 # left
sight_change_right:
type: integer
default: 79 # right
rotation_left:
type: integer
default: 4 # a
rotation_right:
type: integer
default: 7 # d
left_pedal:
type: integer
default: 44 #space
right_pedal:
type: integer
default: 26 # w
middle_pedal:
type: integer
default: 22 # s

display:
quality:
Expand Down
Binary file added data/controller_mask_s.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added data/fight_stick_mask.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 4 additions & 1 deletion data/meson.build
Original file line number Diff line number Diff line change
@@ -1,12 +1,15 @@
pfiles = [
'sb_controller_mask.png',
'controller_mask.png',
'controller_mask_s.png',
'fight_stick_mask.png',
'xmu_mask.png',
'logo_sdf.png',
'xemu_64x64.png',
'abxy.ttf',
'Roboto-Medium.ttf',
'RobotoCondensed-Regular.ttf',
'font_awesome_6_1_1_solid.otf',
'font_awesome_6_1_1_solid.otf'
]

libpfile_targets = []
Expand Down
Binary file added data/sb_controller_mask.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions hw/xbox/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@ specific_ss.add(files(
'xbox.c',
'xbox_pci.c',
'xid.c',
'xid-gamepad.c',
'xid-arcade-stick.c',
'xid-steel-battalion.c'
))
subdir('nv2a')
subdir('mcpx')
Loading