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.

Sign up for GitHub

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

Jump to bottom

Dimos Init #1065

Merged
merged 42 commits into from
Nov 11, 2023
Merged

Dimos Init #1065

merged 42 commits into from
Nov 11, 2023

Conversation

Lucien950
Copy link
Contributor

@Lucien950 Lucien950 commented Nov 2, 2023 •
edited
Loading

Summary

First implementation of Dimos, as per spec'd by SW-39.

TODO Once merged, send message to software channel on slack that DPLATFORM=firmware and DTARGET is old DPLATFORM

  • Use -DPLATFORM to specify the platform you are building to, whether firmware or dimos
  • Use -DTARGET to specify the target you are building to, between dev, test, deploy in dimos, and arm and x86 in firmware.

Changelist

  • Dimos QT Build
  • JSONCAN integration
  • Try to move project to lower files (move things out of the top level)
  • CMake better OS condition
  • Refactor matrix upwards

Testing Done

  • Local testing on Windows, Mac, Linux
  • Testing on CI servers

Checklist

Please change [ ] to [x] when you are ready.

  • I have read and followed the code conventions detailed in README.md (This will save time for both you and the reviewer!).
  • If this pull request is longer then 500 lines, I have provided explicit justification in the summary above explaining why I cannot break this up into multiple pull requests (Small PR's are faster and less painful for everyone involved!).

@Lucien950 Lucien950 added the DIM [OS] Driver Interface Module (Critical and Auxillary) label Nov 2, 2023
@Lucien950 Lucien950 marked this pull request as ready for review November 2, 2023 22:54
peterjinweigu
peterjinweigu approved these changes Nov 4, 2023
View reviewed changes
Copy link
Contributor

@peterjinweigu peterjinweigu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

FANTASTIC! works on apples

@Lucien950 Lucien950 force-pushed the edwinZ/init-dimos branch 2 times, most recently from 6609b44 to e76632c Compare November 6, 2023 08:53
@Lucien950 Lucien950 added the Build System/DevEx Anything that affects Build System, IDE Integration, Github Actions, Code Deployment label Nov 7, 2023
@Lucien950
Copy link
Contributor Author

@gtaharaedmonds we need to change the required CI names again 😭

gtaharaedmonds
gtaharaedmonds requested changes Nov 8, 2023
View reviewed changes
Copy link
Contributor

@gtaharaedmonds gtaharaedmonds left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

mostly nitpicky things, this looks great
hyped to get started on this project in earnest

.github/actions/push_release/action.yml Outdated Show resolved Hide resolved
CMakeLists.txt Outdated Show resolved Hide resolved
CMakeLists.txt Outdated Show resolved Hide resolved
scripts/code_generation/jsoncan/src/json_parsing/json_can_parsing.py Outdated Show resolved Hide resolved
software/dimos/cmake/jsoncan.cmake Outdated Show resolved Hide resolved
software/dimos/src/io/can.cpp Show resolved Hide resolved
software/dimos/src/io/can.cpp Outdated Show resolved Hide resolved
software/dimos/src/io/can.cpp Outdated Show resolved Hide resolved
software/dimos/src/ui/main.cpp Outdated Show resolved Hide resolved
software/dimos/src/dev_io/can.cpp Outdated Show resolved Hide resolved
@Lucien950 Lucien950 merged commit 1764c77 into master Nov 11, 2023
@Lucien950 Lucien950 deleted the edwinZ/init-dimos branch November 11, 2023 00:40
AmirTajaddodi pushed a commit that referenced this pull request Nov 18, 2023
@Lucien950 @AmirTajaddodi
Dimos Init (#1065)
ce05208 
### Summary
First implementation of Dimos, as per spec'd by
[SW-39](https://ubcformulaelectric.atlassian.net/browse/SW-39).

### TODO Once merged, send message to software channel on slack that
`DPLATFORM=firmware` and `DTARGET` is old `DPLATFORM`
- Use -DPLATFORM to specify the platform you are building to, whether
`firmware` or `dimos`
- Use -DTARGET to specify the target you are building to, between `dev`,
`test`, `deploy` in dimos, and `arm` and `x86` in firmware.

### Changelist 
- [x] Dimos QT Build
- [x] JSONCAN integration
- [x] Try to move project to lower files (move things out of the top
level)
- [x] CMake better OS condition
- [x] Refactor matrix upwards

### Testing Done
- Local testing on Windows, Mac, Linux
- Testing on CI servers

### Checklist
*Please change `[ ]` to `[x]` when you are ready.*
- [x] I have read and followed the code conventions detailed in
[README.md](../README.md) (*This will save time for both you and the
reviewer!*).
- [x] If this pull request is longer then **500** lines, I have provided
*explicit* justification in the summary above explaining why I *cannot*
break this up into multiple pull requests (*Small PR's are faster and
less painful for everyone involved!*).


[SW-39]:
https://ubcformulaelectric.atlassian.net/browse/SW-39?atlOrigin=eyJpIjoiNWRkNTljNzYxNjVmNDY3MDlhMDU5Y2ZhYzA5YTRkZjUiLCJwIjoiZ2l0aHViLWNvbS1KU1cifQ
lehroatic pushed a commit that referenced this pull request Nov 22, 2023
@Lucien950 @lehroatic
Dimos Init (#1065)
d61e460 
### Summary
First implementation of Dimos, as per spec'd by
[SW-39](https://ubcformulaelectric.atlassian.net/browse/SW-39).

### TODO Once merged, send message to software channel on slack that
`DPLATFORM=firmware` and `DTARGET` is old `DPLATFORM`
- Use -DPLATFORM to specify the platform you are building to, whether
`firmware` or `dimos`
- Use -DTARGET to specify the target you are building to, between `dev`,
`test`, `deploy` in dimos, and `arm` and `x86` in firmware.

### Changelist 
- [x] Dimos QT Build
- [x] JSONCAN integration
- [x] Try to move project to lower files (move things out of the top
level)
- [x] CMake better OS condition
- [x] Refactor matrix upwards

### Testing Done
- Local testing on Windows, Mac, Linux
- Testing on CI servers

### Checklist
*Please change `[ ]` to `[x]` when you are ready.*
- [x] I have read and followed the code conventions detailed in
[README.md](../README.md) (*This will save time for both you and the
reviewer!*).
- [x] If this pull request is longer then **500** lines, I have provided
*explicit* justification in the summary above explaining why I *cannot*
break this up into multiple pull requests (*Small PR's are faster and
less painful for everyone involved!*).


[SW-39]:
https://ubcformulaelectric.atlassian.net/browse/SW-39?atlOrigin=eyJpIjoiNWRkNTljNzYxNjVmNDY3MDlhMDU5Y2ZhYzA5YTRkZjUiLCJwIjoiZ2l0aHViLWNvbS1KU1cifQ
lehroatic added a commit that referenced this pull request Nov 22, 2023
@lehroatic
Dimos Init (#1065)
b0c6b6d 
### Summary
First implementation of Dimos, as per spec'd by
[SW-39](https://ubcformulaelectric.atlassian.net/browse/SW-39).

### TODO Once merged, send message to software channel on slack that
`DPLATFORM=firmware` and `DTARGET` is old `DPLATFORM`
- Use -DPLATFORM to specify the platform you are building to, whether
`firmware` or `dimos`
- Use -DTARGET to specify the target you are building to, between `dev`,
`test`, `deploy` in dimos, and `arm` and `x86` in firmware.

### Changelist
- [x] Dimos QT Build
- [x] JSONCAN integration
- [x] Try to move project to lower files (move things out of the top
level)
- [x] CMake better OS condition
- [x] Refactor matrix upwards

### Testing Done
- Local testing on Windows, Mac, Linux
- Testing on CI servers

### Checklist
*Please change `[ ]` to `[x]` when you are ready.*
- [x] I have read and followed the code conventions detailed in
[README.md](../README.md) (*This will save time for both you and the
reviewer!*).
- [x] If this pull request is longer then **500** lines, I have provided
*explicit* justification in the summary above explaining why I *cannot*
break this up into multiple pull requests (*Small PR's are faster and
less painful for everyone involved!*).

[SW-39]:
https://ubcformulaelectric.atlassian.net/browse/SW-39?atlOrigin=eyJpIjoiNWRkNTljNzYxNjVmNDY3MDlhMDU5Y2ZhYzA5YTRkZjUiLCJwIjoiZ2l0aHViLWNvbS1KU1cifQ
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@gtaharaedmonds gtaharaedmonds gtaharaedmonds approved these changes

@peterjinweigu peterjinweigu Awaiting requested review from peterjinweigu

Assignees

@Lucien950 Lucien950

@peterjinweigu peterjinweigu

Labels
Build System/DevEx Anything that affects Build System, IDE Integration, Github Actions, Code Deployment DIM [OS] Driver Interface Module (Critical and Auxillary)
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@Lucien950 @gtaharaedmonds @peterjinweigu