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

[DRAFT] AMK Motors (the car will move soon) #137

Draft
wants to merge 36 commits into
base: master
Choose a base branch
from
Draft

[DRAFT] AMK Motors (the car will move soon) #137

Show file tree
Hide file tree
Changes from 33 commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
ee7b4c9
it does not work :(
ColexDev Sep 19, 2024
0a47414
Messing with motors, it will compile now, just some odd W5500 error?
ColexDev Sep 22, 2024
7e1a7d2
not sure about pgn, but found default msg period in the datasheet
ColexDev Sep 22, 2024
3c32825
Setting up CAN, I think I got the signals figured out in the json?
ColexDev Sep 27, 2024
f031a10
CAN is going well, maybe not :)
ColexDev Sep 27, 2024
8d69ad1
outlined steps for turning on and off motors
ColexDev Oct 11, 2024
fe85dc7
This datasheet sucks
ColexDev Oct 12, 2024
0c92262
Either our CAN setup is not good for these motors, or I am dumb
ColexDev Oct 12, 2024
130723a
we love state machines
ColexDev Oct 13, 2024
aa8fb80
too easy
ColexDev Oct 13, 2024
8c37d04
deinit state machine basics are setup
ColexDev Oct 14, 2024
114d546
Trying to figure out more about these motors
ColexDev Oct 14, 2024
7b33e27
Added logic in switch statements. Also we need to move to torque cont…
ColexDev Oct 19, 2024
4c416f0
Starting to add messages from my notes into the can config
ColexDev Oct 26, 2024
8cfcb8c
Added all free signals to the config, need to change the init and dei…
ColexDev Oct 28, 2024
06097c0
Just thinking about how to implement the actual torque stuff and turn…
ColexDev Oct 28, 2024
d92e969
hoping to get state machine stuff finished soon so I can move into mo…
ColexDev Oct 29, 2024
a61d8f4
State machines are sort of done
ColexDev Oct 30, 2024
cf63093
Starting to get data into struct, I should have it nicer but I think …
ColexDev Oct 30, 2024
7dc3c04
Just some notes and small changes, still figuring some stuff out
ColexDev Oct 30, 2024
76748c7
formatting fix plus got rid of state that was unncessary
ColexDev Oct 30, 2024
7679500
Finally got AMK building in, calling stuff in car.c now. Not sure if …
ColexDev Nov 1, 2024
099e108
Oops, forgot to commit cmakelists
ColexDev Nov 1, 2024
9275557
I still have no idea what to do with these torque limits, maybe what …
ColexDev Nov 1, 2024
7e581a4
pushing correct scaling, they can deal with it on TV and Dash, unless…
ColexDev Nov 3, 2024
08896c3
Starting error stuff
ColexDev Nov 4, 2024
c09aaf2
Modified pinouts for Main MCU 25
ColexDev Nov 4, 2024
6143182
Mix of removing UART and some testing stuff
ColexDev Nov 15, 2024
c264034
not too much rn
ColexDev Nov 17, 2024
dea5733
Some additions based on the meeting we had with UIUC
ColexDev Nov 17, 2024
7dbb3a2
Adding error handling stuff, no idea if its gonna work. Just like eve…
ColexDev Nov 17, 2024
b82f602
Motors are in the car struct
ColexDev Nov 17, 2024
3a8ad12
Don't even know why that was there
ColexDev Nov 17, 2024
6b379f7
Some review stuff
ColexDev Nov 21, 2024
c41eb3a
trying to do can2 but cannable isn't working?
ColexDev Dec 6, 2024
b29289a
Why isn't this working??
ColexDev Dec 10, 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
3 changes: 2 additions & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,8 @@ add_subdirectory(common/common_defs)
add_subdirectory(common/log)
add_subdirectory(common/faults)
add_subdirectory(common/daq)
add_subdirectory(common/plettenberg)
# add_subdirectory(common/plettenberg)
ColexDev marked this conversation as resolved.
Show resolved Hide resolved
add_subdirectory(common/amk)
add_subdirectory(common/modules/wheel_speeds)
add_subdirectory(common/modules/Wiznet)

Expand Down
13 changes: 13 additions & 0 deletions common/amk/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
set(TARGET_NAME AMK)
add_library(${TARGET_NAME})

# Find all .c sources in project
#file(GLOB_RECURSE glob_sources "*.c")
target_sources(${TARGET_NAME} PRIVATE "amk.c")

# Find directories for '#include'
# For libraries, these directories are all referenced to the top level firmware directory, CMAKE_SOURCE_DIR
target_include_directories(${TARGET_NAME} PUBLIC ${CMAKE_SOURCE_DIR})

target_link_libraries(${TARGET_NAME} "QUEUE;common_defs;PHAL_F407")

Loading