UI: Device emulation #1478

faha223 · 2023-07-15T00:35:26Z

Added functionality to emulate an Xbox Controller S or a Steel Battalion controller in addition to the existing emulated Xbox controller

hw: SBC uses a different endpoint address for output

…mu-project-master

…to device_emulation

…vice_emulation

…emulation

…emoved the ability to mount XMUs to the Steel Battalion controller's internal hub as it no longer exists.

Florin9doi · 2023-12-31T09:15:15Z

hw/xbox/xid-steel-battalion.c

+typedef struct XIDSteelBattalionOutputReport {
+    uint8_t     report_id;
+    uint8_t     length;
+    uint8_t     CockpitHatch_EmergencyEject;


Suggested change

uint8_t CockpitHatch_EmergencyEject;

uint8_t EmergencyEject : 4;

uint8_t CockpitHatch : 4;

uint8_t Ignition : 4;

uint8_t Start : 4;

....

I've never seen this syntax before, but it looks like it could be really useful. Thanks!

Florin9doi · 2023-12-31T09:20:00Z

hw/xbox/xid-steel-battalion.c

+
+static void print_xid_steel_battalion_output_data(XIDSteelBattalionOutputReport *state)
+{
+    print_steel_battalion_leds("Cockpit Hatch", "Emergency Eject", state->CockpitHatch_EmergencyEject);


Suggested change

print_steel_battalion_leds("Cockpit Hatch", "Emergency Eject", state->CockpitHatch_EmergencyEject);

fprintf(stderr, "%s: %d\n", "Emergency Eject", state->EmergencyEject);

fprintf(stderr, "%s: %d\n", "Cockpit Hatch", state->CockpitHatch);

fprintf(stderr, "%s: %d\n", "Ignition", state->Ignition);

fprintf(stderr, "%s: %d\n", "Start", state->Start);

....

…ld members. This makes accessing individual LED brightness values easier

carlosgamer23 · 2024-03-09T22:26:27Z

The emulator could make it easier by having its own frontend, something close to PCSX2, so we can organize the games and put our own covers on them. Have you also thought about creating a compression format for the isos? Something like Dolphin did with RVZ, so that it is supported by Xemu (maybe a compression format called .xe ? Haha 😅)

build: Update arm64 target, handle target/arch independent pkg names

faha223 · 2024-05-11T20:18:34Z

I'm thinking I should maybe add light gun to this

Florin9doi · 2024-06-11T14:02:10Z

ui/xui/main-menu.cc

+            DRIVER_LIGHT_GUN_DISPLAY_NAME
+        };
+        bool is_selected = false;
+        for (int i = 0; i < 5; i++) {


Suggested change

for (int i = 0; i < 5; i++) {

for (int i = 0; i < ARRAY_SIZE(driver_display_names); i++) {

I like this suggestion, but implementing it as-is causes the build to fail because the ARRAY_SIZE macro uses the struct keyword after all is resolved.

I'm going to play around with this and see if I can come up with a good solution

ui/xui/main-menu.cc

… using viewport coordiantes for the mouse, which allows for accurate calculation of the X and Y inputs in the lightgun

MasonT8198 · 2025-01-27T04:07:34Z

This looks great!

MasonT8198 · 2025-01-27T04:09:12Z

ui/xui/input-manager.cc

@@ -51,38 +53,61 @@ void InputManager::Update()

    // Prevent controller events from going to the guest if they are being used
    // to navigate the HUD
-    xemu_input_set_test_mode(controller_focus_capture); // FIXME: Rename 'test mode'
+    xemu_input_set_test_mode(
+        controller_focus_capture); // FIXME: Rename 'test mode'


Nit: why adjust the spacing

MasonT8198 · 2025-01-27T04:09:35Z

ui/xui/input-manager.cc


    // Combine all controller states to allow any controller to navigate
    m_buttons = 0;
-    int16_t axis[CONTROLLER_AXIS__COUNT] = {0};
+    int16_t axis[CONTROLLER_AXIS__COUNT] = { 0 };


nit: spacing

MasonT8198 · 2025-01-27T04:09:48Z

ui/xemu-input.h

@@ -125,7 +228,8 @@ bool xemu_input_bind_xmu(int player_index, int peripheral_port_index,
                         const char *filename, bool is_rebind);
 void xemu_input_rebind_xmu(int port);
 void xemu_input_unbind_xmu(int player_index, int peripheral_port_index);
-int xemu_input_get_controller_default_bind_port(ControllerState *state, int start);
+int xemu_input_get_controller_default_bind_port(ControllerState *state,


nit: spacing

MasonT8198 · 2025-01-27T04:10:11Z

ui/xemu-input.h

    // Input state
    uint16_t buttons;
    int16_t  axis[CONTROLLER_AXIS__COUNT];

-    // Rendering state hacked on here for convenience but needs to be moved (FIXME)
+    // Rendering state hacked on here for convenience but needs to be moved
+    // (FIXME)


Nit: Spacing

MasonT8198 · 2025-01-27T04:10:42Z

ui/xui/input-manager.cc

        m_mouse_moved = true;
        m_last_mouse_pos = current_mouse_pos;
        m_navigating_with_controller = false;
    }

-    // If mouse capturing is enabled (we are in a dialog), ensure the UI is alive
+    // If mouse capturing is enabled (we are in a dialog), ensure the UI is
+    // alive


Nit: Spacing

MasonT8198 · 2025-01-27T04:11:52Z

There are also some merge conflicts to be resolved however they don't seem super major, just a note, otherwise, great work!

faha223 · 2025-01-27T12:34:52Z

I'm closing this PR as it has been replaced by 4 smaller PRs that, when combined, accomplish the same thing

faha223 and others added 11 commits December 19, 2022 15:49

Added support for emulating other controllers

e0f0566

Fixed a bug

b6fa2bb

Added Display Names for Device Drivers

68146cf

Fixed something that wasn't supposed to get checked in

0310b34

hw: SBC uses a different endpoint address for output

30df0bf

hw: Use USB vendor IDs to differentiate controller types

042472d

hw: Don't need to dereference device description

25167be

hw: manually initialize usb descriptor

d206b79

Merge pull request #17 from Quantx/device_emulation

d62cd8b

hw: SBC uses a different endpoint address for output

Merge branch 'master' of https://github.com/xemu-project/xemu into xe…

9a242b3

…mu-project-master

Merge branch 'xemu-project-master' into device_emulation

3157cd7

antangelo mentioned this pull request Aug 7, 2023

ui: Support changing controller/keyboard mappings #1516

Open

faha223 added 8 commits August 20, 2023 19:36

Merge branch 'master' into device_emulation

4247ad1

Added the ability to simulate an arcade stick

59762db

Merge branch 'device_emulation' of https://github.com/faha223/xemu in…

8fad58a

…to device_emulation

Removed some unused variables

3b8dc3d

save the bound drivers to the config

51db87a

UI Adjustments and bug fixes

1bb87df

Minor UI tweaks

44a1fdb

Fixed the tuner dial int the Input UI

9dface8

faha223 changed the title ~~Device emulation~~ UI: Device emulation Sep 23, 2023

faha223 added 8 commits September 27, 2023 18:09

Formatting and some refactoring

89f7e41

reverted some changes that are no longer needed

7872805

More refactoring and renaming

ae564a9

Commented out a call to usb_packet_copy

9c58dae

fleshed out the XIDSteelBattalionOutputReport

b213ee9

Merge branch 'master' of https://github.com/xemu-project/xemu into de…

d077774

…vice_emulation

Merge branch 'master' of https://github.com/faha223/xemu into device_…

76b29ae

…emulation

Changed the Steel Battalion controller to not have an internal hub. R…

0699999

…emoved the ability to mount XMUs to the Steel Battalion controller's internal hub as it no longer exists.

Florin9doi reviewed Dec 31, 2023

View reviewed changes

faha223 added 3 commits January 4, 2024 08:38

Changed the XIDSteelBattalionOutputReport to take advantage of Bitfie…

a650059

…ld members. This makes accessing individual LED brightness values easier

Ran clang format on this branch

8d38d40

fixed what the last commit broke

fdbb600

faha223 added 2 commits March 9, 2024 21:14

Merge pull request #24 from xemu-project/master

98aa18b

build: Update arm64 target, handle target/arch independent pkg names

Merge branch 'master' into device_emulation

0036637

Added support for simulating a light gun using the mouse and keyboard

2eb8859

Florin9doi reviewed Jun 11, 2024

View reviewed changes

faha223 added 5 commits June 11, 2024 23:50

Fixed some bugs that were introduced in the last commit

4cebfca

Merge branch 'master' into device_emulation

9f38015

Merge branch 'xemu-project:master' into device_emulation

e7df683

Finished the final touches on Lightgun emulation. It's now capable of…

d611f0a

… using viewport coordiantes for the mouse, which allows for accurate calculation of the X and Y inputs in the lightgun

Ran clang-format on all of the files changed or added by this PR

a3b41c0

faha223 marked this pull request as ready for review September 20, 2024 21:48

MasonT8198 suggested changes Jan 27, 2025

View reviewed changes

faha223 closed this Jan 27, 2025

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

UI: Device emulation #1478

UI: Device emulation #1478

faha223 commented Jul 15, 2023

Florin9doi Dec 31, 2023

faha223 Jan 3, 2024

Florin9doi Dec 31, 2023

carlosgamer23 commented Mar 9, 2024

faha223 commented May 11, 2024

Florin9doi Jun 11, 2024

faha223 Jun 11, 2024

MasonT8198 commented Jan 27, 2025

MasonT8198 Jan 27, 2025

MasonT8198 Jan 27, 2025

MasonT8198 Jan 27, 2025

MasonT8198 Jan 27, 2025

MasonT8198 Jan 27, 2025

MasonT8198 commented Jan 27, 2025 •

edited

Loading

faha223 commented Jan 27, 2025

-    uint8_t     CockpitHatch_EmergencyEject;
+    uint8_t     EmergencyEject : 4;
+    uint8_t     CockpitHatch : 4;
+    uint8_t     Ignition : 4;
+    uint8_t     Start : 4;
+    ....

-    print_steel_battalion_leds("Cockpit Hatch", "Emergency Eject", state->CockpitHatch_EmergencyEject);
+    fprintf(stderr, "%s: %d\n", "Emergency Eject", state->EmergencyEject);
+    fprintf(stderr, "%s: %d\n", "Cockpit Hatch", state->CockpitHatch);
+    fprintf(stderr, "%s: %d\n", "Ignition", state->Ignition);
+    fprintf(stderr, "%s: %d\n", "Start", state->Start);
+    ....

	for (int i = 0; i < 5; i++) {
	for (int i = 0; i < ARRAY_SIZE(driver_display_names); i++) {

UI: Device emulation #1478

UI: Device emulation #1478

Conversation

faha223 commented Jul 15, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

carlosgamer23 commented Mar 9, 2024

faha223 commented May 11, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

MasonT8198 commented Jan 27, 2025

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

MasonT8198 commented Jan 27, 2025 • edited Loading

faha223 commented Jan 27, 2025

MasonT8198 commented Jan 27, 2025 •

edited

Loading