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

Update ARUW's version of modm to the latest #4

Merged
merged 136 commits into from
Sep 24, 2020

Conversation

MatthewMArnold
Copy link

Update ARUW's develop to the latest version of modm.

luxarf and others added 30 commits April 14, 2020 10:01
Particularly prevent inclusion of module `:io` only for formatting
functions!
As I understood the spec (and as Wikipedia states), “in the Remote
Frame there is no Data Field. The DLC field indicates the data length
of the requested message (not the transmitted one)”.
I was not able to receive messages from a CAN2USB. The mutex was already
added but newer used.
It turned out that running from debugger the stack pointer might be wrong
(initialized to the value of the system flash).
SCons also adds the directory of every SConscript to the Python path, so
there is no need to explicitly add it again.
strongly-typed and others added 26 commits September 12, 2020 08:14
Fixes STM32L1 define/header selection
It was accidentally removed in 4332c14
when excluding files from “portable”.
@WasabiFan
Copy link
Member

Looks good to me, feel free to go ahead. Two notes on that:

  • I can't recall how GH handles fast-forward merges, but make sure this is merged as a fast-forward (with no merge commit). This could also be done via the command line.
  • After merging this, you'll need to integrate the changes into aruw-master. Preferably via rebase (check out aruw-master and git rebase develop). Note that one of our two commits should disappear and you may have conflicts on the other after their recent Windows compatibility changes.

Obviously, make sure you test it at some point 😄

@MatthewMArnold MatthewMArnold merged commit 7c96d9f into uw-advanced-robotics:develop Sep 24, 2020
@salkinium
Copy link

Also please tell me about any more Windows issues, we've recently added a Windows CI, and I was able to fix most of the issues from modm-io#310, but not all.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.