Max/djhackersdev_bemanitools
1
0
Fork 0
Code Issues 72 Pull Requests 15 Actions Packages Projects Releases 20 Wiki Activity

Add light support for Gen 4 SMX pads - [closed] #117

New Issue
Closed
opened 2019-12-09 00:27:12 +03:00 by icex2 · 15 comments
icex2 commented 2019-12-09 00:27:12 +03:00 (Migrated from github.com)
Copy Link
Copy Source

In GitLab by @SpaceLionDC on Dec 8, 2019, 22:27

Merges master -> master

This merge request fixes the bug described by issue 41. The fix here is simply to update from the deprecated SMX_SetLights API to the newer SMX_SetLights2 API which adds support for the light arrays available on the Gen 4 pads while still maintaining backwards compatibility with previous generations.

Consumers will need to get the latest SMX.dll which can be acquired from https://data.stepmaniax.com/docs/SMXConfigInstaller-2019-10-14-01.exe

I've personally tested this with my Gen 4 pads using Win 10 with the latest game that takes advantage of bemanitools and have confirmed that all 8 cardinal panel lights work as expected. I am in the process of trying to find some Gen 1 - 3 users to help me validate that this does not cause any regressions for those users.

In GitLab by @SpaceLionDC on Dec 8, 2019, 22:27 _Merges master -> master_ This merge request fixes the bug described by [issue 41](https://dev.s-ul.eu/djhackers/bemanitools/issues/41). The fix here is simply to update from the deprecated SMX_SetLights API to the newer SMX_SetLights2 API which adds support for the light arrays available on the Gen 4 pads while still maintaining backwards compatibility with previous generations. Consumers will need to get the latest SMX.dll which can be acquired from https://data.stepmaniax.com/docs/SMXConfigInstaller-2019-10-14-01.exe I've personally tested this with my Gen 4 pads using Win 10 with the latest game that takes advantage of bemanitools and have confirmed that all 8 cardinal panel lights work as expected. I am in the process of trying to find some Gen 1 - 3 users to help me validate that this does not cause any regressions for those users.
icex2 commented 2019-12-09 00:29:35 +03:00 (Migrated from github.com)
Copy Link
Copy Source

In GitLab by @SpaceLionDC on Dec 8, 2019, 22:29

As mentioned in the description I still need to find some volunteers who have the older pads. A built version of the ddrio-smx.dll and latest SMX.dll are here https://drive.google.com/drive/folders/1zdgt43OvKWPziAX7DDxzHxou-t5R5feg

In GitLab by @SpaceLionDC on Dec 8, 2019, 22:29 As mentioned in the description I still need to find some volunteers who have the older pads. A built version of the ddrio-smx.dll and latest SMX.dll are here https://drive.google.com/drive/folders/1zdgt43OvKWPziAX7DDxzHxou-t5R5feg
icex2 commented 2019-12-09 02:40:22 +03:00 (Migrated from github.com)
Copy Link
Copy Source

Great. I will also reach out to a few people I know that might help us find some testers with the required hardware.

Great. I will also reach out to a few people I know that might help us find some testers with the required hardware.
icex2 commented 2020-03-21 05:23:18 +03:00 (Migrated from github.com)
Copy Link
Copy Source

In GitLab by @Androopy on Mar 21, 2020, 03:23

Resurrecting to say: I've built the changes and tested with a Gen 2 pad. All is well. :)

In GitLab by @Androopy on Mar 21, 2020, 03:23 Resurrecting to say: I've built the changes and tested with a Gen 2 pad. All is well. :)
icex2 commented 2020-03-22 22:12:15 +03:00 (Migrated from github.com)
Copy Link
Copy Source

Couldn't get ahold of anyone else to test this, unfortunately. With Gen 4 pads tested by @SpaceLionDC and Gen 2 pads tested by @Androopy (really appreciated btw), can we take this as tested and working?

FYI @SpaceLionDC: Could you rebase your branch onto master to allow this to be merged with a fast-forward merge?

Couldn't get ahold of anyone else to test this, unfortunately. With Gen 4 pads tested by @SpaceLionDC and Gen 2 pads tested by @Androopy (really appreciated btw), can we take this as tested and working? FYI @SpaceLionDC: Could you rebase your branch onto master to allow this to be merged with a fast-forward merge?
icex2 commented 2020-03-22 22:44:41 +03:00 (Migrated from github.com)
Copy Link
Copy Source

In GitLab by @SpaceLionDC on Mar 22, 2020, 20:44

added 23 commits

Compare with previous version

In GitLab by @SpaceLionDC on Mar 22, 2020, 20:44 added 23 commits <ul><li>f0b74606...56a80c78 - 21 commits from branch <code>djhackers:master</code></li><li>0b70ced8 - Add light support for SMX gen 4 pads</li><li>73474551 - Merge branch &#39;master&#39; of https://dev.s-ul.eu/SpaceLionDC/bemanitools</li></ul> [Compare with previous version](/djhackers/bemanitools/-/merge_requests/16/diffs?diff_id=1169&start_sha=f0b74606bd79721a09246510be31531f3d764d4a)
icex2 commented 2020-03-22 22:47:51 +03:00 (Migrated from github.com)
Copy Link
Copy Source

In GitLab by @SpaceLionDC on Mar 22, 2020, 20:47

Should be good to go now!

In GitLab by @SpaceLionDC on Mar 22, 2020, 20:47 Should be good to go now!
icex2 commented 2020-03-22 22:49:15 +03:00 (Migrated from github.com)
Copy Link
Copy Source

Something seems to be off: "Merge failed: Rebase failed. Please rebase locally. Please try again."
I noted that you added a merge commit to the history now. Did you encounter any issues with rebasing onto master?

Something seems to be off: "Merge failed: Rebase failed. Please rebase locally. Please try again." I noted that you added a merge commit to the history now. Did you encounter any issues with rebasing onto master?
icex2 commented 2020-03-22 22:51:50 +03:00 (Migrated from github.com)
Copy Link
Copy Source

In GitLab by @SpaceLionDC on Mar 22, 2020, 20:51

Hmm. The rebase button on the GitLab web interface didn't work for me, so I did it via the commandline which looked like it executed successfully.

In GitLab by @SpaceLionDC on Mar 22, 2020, 20:51 Hmm. The rebase button on the GitLab web interface didn't work for me, so I did it via the commandline which looked like it executed successfully.
icex2 commented 2020-03-22 22:53:47 +03:00 (Migrated from github.com)
Copy Link
Copy Source

Did you do this on your "SpaceLionDC:master" branch? Switch to that and do a git rebase djhackers_master where "djhackers_master" may be replaced with whatever name you have given to the upstream branch on your local repo.

Did you do this on your "SpaceLionDC:master" branch? Switch to that and do a `git rebase djhackers_master` where "djhackers_master" may be replaced with whatever name you have given to the upstream branch on your local repo.
icex2 commented 2020-03-22 23:00:08 +03:00 (Migrated from github.com)
Copy Link
Copy Source

In GitLab by @SpaceLionDC on Mar 22, 2020, 21:00

Yeah here were the commands I ran just to be sure :

Running the rebase command again I get :

First, rewinding head to replay your work on top of it...
Applying: Add light support for SMX gen 4 pads
Applying: Add light support for SMX gen 4 pads
Using index info to reconstruct a base tree...
M src/imports/SMX.h
M src/imports/import_32_indep_SMX.def
M src/main/ddrio-smx/ddrio.c
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.

In GitLab by @SpaceLionDC on Mar 22, 2020, 21:00 Yeah here were the commands I ran just to be sure : * git remote add upstream https://dev.s-ul.eu/djhackers/bemanitools.git * git fetch upstream * git checkout master * git rebase upstream/master Running the rebase command again I get : First, rewinding head to replay your work on top of it... Applying: Add light support for SMX gen 4 pads Applying: Add light support for SMX gen 4 pads Using index info to reconstruct a base tree... M src/imports/SMX.h M src/imports/import_32_indep_SMX.def M src/main/ddrio-smx/ddrio.c Falling back to patching base and 3-way merge... No changes -- Patch already applied.
icex2 commented 2020-03-22 23:01:28 +03:00 (Migrated from github.com)
Copy Link
Copy Source

In GitLab by @SpaceLionDC on Mar 22, 2020, 21:01

added 2 commits

Compare with previous version

In GitLab by @SpaceLionDC on Mar 22, 2020, 21:01 added 2 commits <ul><li>ed9e0659 - Add light support for SMX gen 4 pads</li><li>31ae3101 - Merge branch &#39;master&#39; of https://dev.s-ul.eu/SpaceLionDC/bemanitools</li></ul> [Compare with previous version](/djhackers/bemanitools/-/merge_requests/16/diffs?diff_id=1170&start_sha=73474551538312b3b30c5e2359878dca812cd8e7)
icex2 commented 2020-03-22 23:20:44 +03:00 (Migrated from github.com)
Copy Link
Copy Source

I assume it's better to just cherry pick that one commit on top of upstream/master. Let me try to fix that for you: https://dev.s-ul.eu/djhackers/bemanitools/-/tree/smx-gen4-support
I have picked the very first "Add light support for SMX gen 4 pads" commit of the three that are avilable on your branch. The other two look identical to me and the merge commits are empty.
Please check and let me know if that's good to go before I merge it manually.

I assume it's better to just cherry pick that one commit on top of upstream/master. Let me try to fix that for you: https://dev.s-ul.eu/djhackers/bemanitools/-/tree/smx-gen4-support I have picked the very first "Add light support for SMX gen 4 pads" commit of the three that are avilable on your branch. The other two look identical to me and the merge commits are empty. Please check and let me know if that's good to go before I merge it manually.
icex2 commented 2020-03-22 23:23:45 +03:00 (Migrated from github.com)
Copy Link
Copy Source

In GitLab by @SpaceLionDC on Mar 22, 2020, 21:23

Yep that looks good! Thank you!

In GitLab by @SpaceLionDC on Mar 22, 2020, 21:23 Yep that looks good! Thank you!
icex2 commented 2020-03-22 23:26:44 +03:00 (Migrated from github.com)
Copy Link
Copy Source

Great, merged into master: https://dev.s-ul.eu/djhackers/bemanitools/-/commit/d76b7b6c9d8395a4088b218e062a3088efb6c071

Thanks for your contribution and following up on this.

Great, merged into master: https://dev.s-ul.eu/djhackers/bemanitools/-/commit/d76b7b6c9d8395a4088b218e062a3088efb6c071 Thanks for your contribution and following up on this.
icex2 commented 2020-03-22 23:26:47 +03:00 (Migrated from github.com)
Copy Link
Copy Source

closed

closed
Sign in to join this conversation.
No Branch/Tag Specified
Branches Tags
Labels
Clear labels
acio
bio2
bst
bug
Something isn't working
 ddr
documentation
Improvements or additions to documentation
 duplicate
This issue or pull request already exists
 enhancement
New feature or request
 ezusb
feature
gitlab merge request
good first issue
Good for newcomers
 has attachment
help wanted
Extra attention is needed
 high priority
iidx
invalid
This doesn't seem right
 jb
low priority
museca
popn
question
Further information is requested
 sdvx
tech debt
wontfix
This will not be worked on
No labels gitlab merge request
Milestone
No items
No Milestone
Projects
Clear projects
No projects
Assignees
Clear assignees
Max
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: Max/djhackersdev_bemanitools#117