Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
241 commits
Select commit Hold shift + click to select a range
de7c0ac
Added SAM4S example project. Modularization of functions will be added
Jimgrind Jan 7, 2022
3dd3316
Added prelim Battery Characterization NO PWM or UART yet
granaa Jan 22, 2022
7a52d41
Fixed USB and working on TC
granaa Jan 29, 2022
dab91ae
Everything working except current feedback and maybe PWM
granaa Jan 30, 2022
7ba0008
Final Characterization code and logging script
granaa Jan 31, 2022
5ec7706
made python logging optional
granaa Feb 3, 2022
c78bdd3
initial modbus firmware project
hakkilab Feb 3, 2022
52b613e
created modbus development project and removed old testing project
hakkilab Feb 3, 2022
f75d651
made file structure and some initialization
granaa Feb 3, 2022
265cebf
recover BCB project
granaa Feb 4, 2022
ec03d00
First draft of init, .h files, and IRQ
granaa Feb 4, 2022
6ec0853
added slave id to modbus_init() and register translation offsets to m…
hakkilab Feb 4, 2022
596414d
added more read/write function codes and constants for calcuating num…
hakkilab Feb 5, 2022
052f3f1
Add functions to convert a stream of uint8_t to float, uint16_t, char…
kurtjd Feb 8, 2022
f86daab
ignore this
granaa Feb 9, 2022
a859e63
I don't know what this change is
granaa Feb 9, 2022
65af0dc
developed CRC and started modbus_update
granaa Feb 9, 2022
94770c2
developed CRC and started modbus_update and fixed compilation errors
granaa Feb 9, 2022
705b358
Merge branch 'SAM4S_firmware' into SAM4S_firmware
hakkilab Feb 11, 2022
c63d01c
Merge pull request #4 from kurtjd/SAM4S_firmware
hakkilab Feb 11, 2022
6b63ab4
bug fixes, added float to bytes func, and finished first draft of upd…
hakkilab Feb 12, 2022
29d3896
added pop packet function
granaa Feb 12, 2022
1f8c828
added read and write handlers
hakkilab Feb 12, 2022
8609fd5
added in missing data to read response packet
hakkilab Feb 12, 2022
95eb1b7
fixed use of sizeof on pointers, incorrect bitwise and, erroneously d…
hakkilab Feb 13, 2022
696af0f
added under voltage protection to characterization code
granaa Feb 18, 2022
032fa81
stupid .atsuo files
granaa Feb 18, 2022
04a6abf
first characterization complete
granaa Feb 19, 2022
b8f2776
finalized first draft of modbus comms. Does not handle overflows perf…
granaa Feb 19, 2022
3cafceb
changed CRC to return uint16 and using static to return byte arrays
hakkilab Feb 19, 2022
e43cd8d
working gitignore
pchaya Feb 19, 2022
e9b0274
Change master expected slave address in response
pchaya Feb 19, 2022
d5555ac
added testing script for modbus
hakkilab Feb 19, 2022
68b7d83
Begining of modbus testing, UART still not working
granaa Feb 19, 2022
21b5de5
resolving git issues
granaa Feb 19, 2022
9dc4f8d
1A characterization
granaa Feb 23, 2022
f723e19
Fix several bugs
kurtjd Feb 24, 2022
84c135b
Merge pull request #6 from kurtjd/SAM4S_firmware
hakkilab Feb 24, 2022
a305b3f
Batery characterization Completegit add --all!
granaa Feb 25, 2022
f38661f
First succesful packet responce! won't respond to more than one
granaa Feb 25, 2022
35abc82
Modbus working, does not handle any edge cases
granaa Feb 25, 2022
ceb96d4
First fully functional implementation of modbus
granaa Feb 26, 2022
d57694b
Added battery monitering system project
granaa Mar 8, 2022
c19e0c0
sleep still not working
granaa Mar 12, 2022
174bbe3
Fixed packet structure to match minimalmodbus and
hakkilab Mar 12, 2022
67abd39
fixed off by one issues with read handler and
hakkilab Mar 12, 2022
1261fa4
removed packet timeout code
hakkilab Mar 12, 2022
23c0d63
Changed tx pin to be for ATSAM4S4B and
hakkilab Mar 12, 2022
d7e89e3
updated modbus test for number of registers fix
hakkilab Mar 13, 2022
7364c1d
Added initial minimalmodbus testing script
hakkilab Mar 13, 2022
87a26c8
System Verification Demo
granaa Mar 14, 2022
4f6bee3
Merge branch 'SAM4S_firmware' of github.com:OSURoboticsClub/Rover_202…
granaa Mar 14, 2022
7d1c864
First implementation of custom modbus master
hakkilab Apr 9, 2022
dd414ef
Added handling for exceeding data byte count limit
hakkilab Apr 9, 2022
7b89ef8
Initial teensy port of modbus library
hakkilab Apr 16, 2022
416eb61
Untested Analog Func, half Protec Func
granaa Apr 20, 2022
eb92fb7
forgot to add main.c
granaa Apr 20, 2022
76db7cb
most things working except flash
granaa Apr 25, 2022
b3cb7b2
final bms v1
granaa May 3, 2022
417c3c2
Removed hardware details from modbus library
hakkilab May 7, 2022
637b1e8
final battery code, needs modbus update
granaa May 14, 2022
fc24b5b
Merge branch 'SAM4S_firmware' of github.com:OSURoboticsClub/Rover_202…
hakkilab May 21, 2022
6ce9dff
Bug fixes for modbus protocol
hakkilab May 21, 2022
9eac832
Updated teensy version of modbus library
hakkilab May 21, 2022
96582c5
Funtional motor node example for teensy and
hakkilab May 21, 2022
1f54c6c
write packet num data bytes check bug fix
hakkilab May 21, 2022
2ea8e81
semicolon bug fix
hakkilab May 21, 2022
f9c005d
Add software serial support
kurtjd May 21, 2022
77f9895
Working timeout for Teensy, untested timeout for Atmel
kurtjd Jun 3, 2022
4571632
Merge pull request #8 from kurtjd/patch-1
hakkilab Jun 10, 2022
d6e1d56
Updated atmel modbus project with timeout code
hakkilab Jun 10, 2022
a8a7501
SAM4S Tower port now has working comms and GPS
kurtjd Jul 26, 2022
490c58c
Have basic stepper motor library with PWM working
kurtjd Jul 27, 2022
1630e14
Add basic servo library
kurtjd Jul 30, 2022
ab43eb9
Update main.c
kurtjd Aug 6, 2022
6306871
Change science mech dir pin back to PA6
kurtjd Aug 6, 2022
99e87ad
Complete rework. First Draft of final version.
granaa Aug 8, 2022
d3b21cc
sam4s tower pan tilt functional servo code
hakkilab Aug 12, 2022
c3ce87d
chassis pan tilt firmware
hakkilab Aug 12, 2022
3de8e21
in progress science mech rework (non-functional)
hakkilab Aug 12, 2022
e97a54c
Fixed stepper position for scimech
hakkilab Aug 13, 2022
880a594
Nuke it. Start over!
kurtjd Nov 12, 2022
e243104
Create base directory structure
kurtjd Nov 12, 2022
35f0fa5
Add sam4s modbus interface
kurtjd Nov 12, 2022
1f9491d
Added msgs for rover_control package
hakkilab Nov 12, 2022
f6bd856
Initial modbus refactor
kurtjd Nov 13, 2022
115ba3e
Setup SAM4S tower pan tilt project
kurtjd Nov 13, 2022
c052077
Setup SAM4S mining project
kurtjd Nov 13, 2022
d247550
Setup SAM4S chassis-pantilt project
kurtjd Nov 13, 2022
69f45b3
Setup SAM4S bms project
kurtjd Nov 13, 2022
371b02b
Setup SAM4S battery characterization project
kurtjd Nov 13, 2022
ddf75a6
Rename port to modbus_interface
kurtjd Nov 17, 2022
f6c4e6e
Rename portWrite to serial_write
kurtjd Nov 17, 2022
db81ae1
Rename portSetup to modbus_init
kurtjd Nov 17, 2022
46b3de1
Rename modbus_update_wr to modbus_update
kurtjd Nov 17, 2022
aaf55d6
Rename millis_wr to get_elapsed_ms
kurtjd Nov 17, 2022
86d4c2c
Rename communicationGood to modbus_comm_good
kurtjd Nov 17, 2022
51c25c5
Add pragma weak to UART handlers
kurtjd Nov 17, 2022
59a9f85
Rearrange defines in modbus slave header
kurtjd Nov 17, 2022
573ab28
Rename sam4s_nodes to sam4s
kurtjd Nov 17, 2022
a0a5438
Add GPS lib to tower
kurtjd Nov 17, 2022
c50ee4b
Add LED libs to tower
kurtjd Nov 17, 2022
a8db466
Add servo lib to tower pan tilt
kurtjd Nov 17, 2022
8bf974f
Add mining main
kurtjd Nov 17, 2022
0e78e00
Add stepper library to mining
kurtjd Nov 17, 2022
6bd73aa
Add main to chassis pan tilt
kurtjd Nov 17, 2022
2cea815
Add servo library to chassis pan tilt
kurtjd Nov 17, 2022
c3faf16
Add bms files
kurtjd Nov 17, 2022
bf35f0a
Add battery characterization files
kurtjd Nov 17, 2022
f0e60b7
Add modbus master test scripts
kurtjd Nov 17, 2022
5c1e324
Update teensy modbus interface
kurtjd Nov 17, 2022
219377a
Add Teensy motor_driver
kurtjd Nov 17, 2022
4d071f0
Add Teensy tower pan tilt
kurtjd Nov 17, 2022
5ded01c
Add Teensy #include <Adafruit_VEML6070.h>
kurtjd Nov 17, 2022
8362e72
Add Teensy chassis pan tilt
kurtjd Nov 17, 2022
80029c6
Add Teensy freq testing
kurtjd Nov 17, 2022
eba62f6
Add Teensy grasping and effector
kurtjd Nov 17, 2022
e29d873
Add Teensy gripper
kurtjd Nov 17, 2022
6de8132
Add Teensy iris
kurtjd Nov 17, 2022
69d1919
Add Teensy mining
kurtjd Nov 17, 2022
c2597c9
Add Teensy rdf
kurtjd Nov 17, 2022
d8a233e
Add Teensy scale_tester
kurtjd Nov 17, 2022
ab5e05f
Add Teensy temp
kurtjd Nov 17, 2022
f538024
Add Teensy tower
kurtjd Nov 17, 2022
7354286
Add Teensy libraries
kurtjd Nov 17, 2022
b4da509
Replace backslash with forward slash platformio lib path
kurtjd Nov 17, 2022
c881c29
drive control first pass completed
hakkilab Nov 19, 2022
e48ef3b
first test of drive_coordinator
Nov 19, 2022
47a1522
added status interface package
hakkilab Dec 3, 2022
67864ec
converted drive control run logic to callbacks
hakkilab Dec 3, 2022
de5ce91
Added status and odometry base packages
hakkilab Dec 3, 2022
6107a13
updated control launch and fixed drive params
hakkilab Dec 3, 2022
5a3059b
added updated dockerfile
hakkilab Dec 3, 2022
7f8b13c
updated odometry package
hakkilab Dec 4, 2022
0bb3798
added missing nmea msg package
hakkilab Dec 4, 2022
8a8dd15
Add modbus master library
kurtjd Dec 4, 2022
9c9e7ad
Fix UART handler bugs
kurtjd Dec 4, 2022
34af6d2
Merge pull request #3 from kurtjd/firmware_overhaul
hakkilab Dec 3, 2022
2b71cfb
first pass drive_coordinator
Jan 14, 2023
f2c184b
message
HenryDalrymple53 Jan 14, 2023
2757277
Factor out stepper library
kurtjd Jan 15, 2023
204cdd0
Factor out servo library
kurtjd Jan 15, 2023
3ce4ddc
Just some minor tweaks
kurtjd Jan 17, 2023
dbba1de
Clean up some science mech code
kurtjd Jan 17, 2023
32b7f7c
Minor tweaks to servo library
kurtjd Jan 17, 2023
4d1102e
Replace test pwm channels with original
kurtjd Jan 21, 2023
ff5f2b6
Handle no packet response
kurtjd Jan 21, 2023
c28066e
Clean up modbus_master
kurtjd Jan 21, 2023
36252fa
Finalize modbus master and add good test script
kurtjd Jan 22, 2023
4ba6ebb
integrated updated iris_controller
hakkilab Jan 28, 2023
4d45ec1
added upgraded effectors control code
hakkilab Jan 28, 2023
5342d9f
Merge pull request #8 from kurtjd/modbus_master_improve
hakkilab Jan 28, 2023
990f33c
Merge pull request #7 from kurtjd/motor_libs
hakkilab Jan 28, 2023
0989ec1
Merge branch 'ros_upgrade_pr_merge' into ros_upgrade
hakkilab Jan 28, 2023
589f1c6
Merge pull request #6 from HenryDalrymple53/ros_upgrade
hakkilab Jan 28, 2023
4791a5b
revert ros1 tower pan tilt code
hakkilab Jan 28, 2023
5c8707e
refactored while loop to timer - tower pantilt
hakkilab Jan 28, 2023
a7a6f97
Merge branch 'ros_upgrade_pr_merge' into ros_upgrade
hakkilab Jan 28, 2023
380713d
Merge pull request #5 from AlexPetty1/ros_upgrade
hakkilab Jan 28, 2023
3a04825
Turns out a lot of logic depends on saving msgs
hakkilab Jan 28, 2023
9e076e5
ros2 drive coordinator updated
hakkilab Jan 28, 2023
baeb904
Updated ros2 chassis pantilt
hakkilab Jan 28, 2023
b90074e
updated launch and setup files
hakkilab Jan 28, 2023
44ac0d9
small edits to control nodes
hakkilab Jan 28, 2023
2759f31
updated odometry with main_loop
hakkilab Jan 28, 2023
3c97e0f
first pass statuses package done
hakkilab Jan 28, 2023
060b462
status launch added
hakkilab Jan 28, 2023
b8109c0
Delete outdated Teensy firmware files
kurtjd Feb 6, 2023
91ea2ef
Delete outdated SAM4S firmware files
kurtjd Feb 6, 2023
3900711
Re-add watchdog timer disable to boards
kurtjd Feb 6, 2023
7ce28cd
Perform some cleanup of modbus slave library
kurtjd Feb 6, 2023
dd7a7fb
Fix modbus timeout timer
kurtjd Feb 6, 2023
f675069
Fix all compiler warnings from projects (except BMS because that's a …
kurtjd Feb 6, 2023
5b1ca70
Updated teensy iris modbus
reefstarnes Feb 11, 2023
c929cfe
Updated tnsy gripper firmware & libraries
reefstarnes Feb 11, 2023
5a7dda6
deleted duplicate libraries which are now in src and include node paths
reefstarnes Feb 11, 2023
d5c5e21
camera cpp upgrade basic package structure
hakkilab Feb 25, 2023
6e4f244
Make modbus timeout optional so projects can include to choose it if …
kurtjd Mar 6, 2023
2d5e969
Allow rx enable pin to be set independently
kurtjd Mar 8, 2023
fac4d33
Merge pull request #9 from kurtjd/SAM4S_firmware
hakkilab Mar 10, 2023
a5f094f
Merge pull request #11 from kurtjd/modbus_sleep_update
hakkilab Mar 10, 2023
e4f908f
Merge pull request #10 from reefstarnes/teensy_new_modbus
hakkilab Mar 10, 2023
5edc82a
remove ROS Master checker from groundstation
kira-the-engineer Apr 1, 2023
6dd2747
Merge branch 'ros_upgrade' of github.com:OSURoboticsClub/Rover_2022_2…
kira-the-engineer Apr 1, 2023
14e0c22
Upgraded cmake/package files to ros 2. First pass of updating drive c…
kira-the-engineer Apr 1, 2023
4a1ef5b
change args to none
kira-the-engineer Apr 8, 2023
a28b721
Added files from standalone tracking algo UI and merged widget into m…
kira-the-engineer Apr 13, 2023
5471306
drive control updates - working on rover
hakkilab Apr 15, 2023
355b0d6
Merge branch 'ros_upgrade' of github.com:OSURoboticsClub/Rover_2022_2…
hakkilab Apr 15, 2023
3ab9ea4
add and update docker configs
hakkilab Apr 15, 2023
6b35dc9
fixed drive delay - queue size issue
hakkilab Apr 15, 2023
8bc7569
fixed other queue size issues
hakkilab Apr 15, 2023
838e72f
TODO: Figure out solution for infinite spin blocking UI shutdown
kira-the-engineer Apr 18, 2023
7c2befc
Merge local updates to groundstation into upstream
kira-the-engineer Apr 18, 2023
e9d8f71
Added single screen functionality- investigating issues with X11
kira-the-engineer Apr 22, 2023
3424743
update tracking coordinator to fit with groundstation structure
kira-the-engineer Apr 22, 2023
433b279
Debug control for groundstation
kira-the-engineer Apr 29, 2023
fe5a1b8
SHE DRIVES GAMERS
kira-the-engineer May 6, 2023
dd21f27
fixed iris data type error
hakkilab May 6, 2023
4cc5f78
Merge branch 'ros_upgrade' of github.com:OSURoboticsClub/Rover_2022_2…
hakkilab May 6, 2023
cbd5822
ROS2 Upgrades
matthewjd24 May 13, 2023
0a0d859
Changed rclpy.create_subscription to self.nodename.create_sub
matthewjd24 May 20, 2023
747757e
Update video coordinator
kira-the-engineer May 20, 2023
9d106b1
Merge branch 'ros_upgrade' to groundstation local
kira-the-engineer May 20, 2023
ffef313
Troubleshooting tracking UI
kira-the-engineer May 20, 2023
69ae1db
Merge pull request #12 from matthewjd24/ros_upgrade
kira-the-engineer May 20, 2023
deb5be3
Upgrade EffectorsAndArmControlSender and a line in RoverVideoReceiver
matthewjd24 May 20, 2023
eb8f28d
still working on debugging tracking UI
kira-the-engineer May 23, 2023
7bcb696
upgraded camera code
hakkilab Jun 3, 2023
303ee8a
More UI testing- good news it lags the entire groundstation!!
kira-the-engineer Jun 9, 2023
57e9e45
Merge branch 'ros_upgrade' of github.com:OSURoboticsClub/Rover_2022_2…
kira-the-engineer Jun 9, 2023
5a93d02
fix camera split issues
kira-the-engineer Jun 10, 2023
f2ec192
fix reversed motor after bogey rework
hakkilab Jun 10, 2023
439b3e7
Merge pull request #13 from matthewjd24/ros_upgrade
kira-the-engineer Jun 10, 2023
3195001
Merge branch 'ros_upgrade' of https://github.com/OSURoboticsClub/Rove…
hakkilab Jun 10, 2023
51842e0
fixed camera topics
hakkilab Jun 10, 2023
20b2f40
Using scuffed executor code to resolve error with camera threading. C…
kira-the-engineer Jun 24, 2023
83d8e1a
Cameras are working! we were missing a forward slash...
kira-the-engineer Jun 24, 2023
056135c
Test out status systems. Need to figure out how to forward jetson sys…
kira-the-engineer Jun 29, 2023
5954597
Testing out switching to a socket binded to localhost for tracking UI…
kira-the-engineer Jul 5, 2023
7c499cf
Update files that have been tested so far to have better compatibility
kira-the-engineer Jul 17, 2023
309bc14
Fix controller issues- pan and tilt now works from groundstation
kira-the-engineer Jul 19, 2023
3aa52d1
"switch effectors control sender on groundstation to single threaded …
kira-the-engineer Jul 24, 2023
1e4ce38
The tracking UI finally works!
kira-the-engineer Jul 24, 2023
cb1db38
"More work on capstone stuff, angle is slightly more accurate, add fi…
kira-the-engineer Jul 26, 2023
9e7e2c8
Messing around with different ways to find the azimuth
kira-the-engineer Jul 31, 2023
2df18f9
Start work on top level launch file (Kira)
hakkilab Aug 2, 2023
d68935b
camera control running
hakkilab Aug 7, 2023
76cdf90
main launch added
hakkilab Aug 7, 2023
350427e
fixed left side drive inversion
hakkilab Aug 7, 2023
c47414e
added arm code
hakkilab Aug 11, 2023
140c4f1
push groundstation updates
kira-the-engineer Aug 12, 2023
dbbe2ef
Start effectors changes
kira-the-engineer Aug 12, 2023
25fc3c9
added initial scimech/gripper code
hakkilab Aug 12, 2023
dfe9044
Merge branch 'ros_upgrade' of https://github.com/OSURoboticsClub/Rove…
hakkilab Aug 12, 2023
2caf30f
got linear control finished
kira-the-engineer Aug 12, 2023
63727df
Merge branch 'ros_upgrade' of github.com:OSURoboticsClub/Rover_2022_2…
kira-the-engineer Aug 12, 2023
cb378ae
finish writing controls code (needs testing..)
kira-the-engineer Aug 12, 2023
699ec9e
final code changes from competition
hakkilab Aug 13, 2023
fb69dd7
Merge branch 'ros_upgrade' of https://github.com/OSURoboticsClub/Rove…
hakkilab Sep 24, 2023
7e879c7
Merge remote-tracking branch 'origin/SAM4S_firmware' into 23_24_merge
HenryDalrymple53 Oct 8, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
9 changes: 9 additions & 0 deletions software/.gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,10 @@
.idea
<<<<<<< HEAD

build
install
log
__pycache__
=======
.atsuo
>>>>>>> origin/SAM4S_firmware
16 changes: 16 additions & 0 deletions software/Dockerfile.dev
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
FROM osrf/ros:foxy-desktop

RUN apt-get update && apt-get install -y \
ros-foxy-image-common ros-foxy-image-pipeline ros-foxy-image-transport-plugins \
ros-foxy-laser-geometry ros-foxy-perception-pcl ros-foxy-vision-opencv ros-foxy-ros-ign \
ros-foxy-nmea-msgs xauth nano socat xxd pip

RUN pip install numpy pyserial pynmea2 minimalmodbus

RUN /bin/bash -c 'echo "source /opt/ros/foxy/setup.bash" >> ~/.bashrc'

RUN ssh-keygen -t ed25519 -f ~/.ssh/id_ed25519 -N '' <<< y

ENV DISPLAY=host.docker.internal:0.0

CMD ["bash"]
22 changes: 22 additions & 0 deletions software/Dockerfile.rover
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
FROM --platform=linux/arm64 ros:foxy

RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \
ros-foxy-angles ros-foxy-composition ros-foxy-depthimage-to-laserscan \
ros-foxy-image-tools ros-foxy-joy ros-foxy-lifecycle ros-foxy-pcl-conversions \
ros-foxy-pendulum-control ros-foxy-pendulum-msgs ros-foxy-rqt-common-plugins \
ros-foxy-rviz2 ros-foxy-rviz-default-plugins ros-foxy-teleop-twist-joy \
ros-foxy-teleop-twist-keyboard ros-foxy-tlsf ros-foxy-tlsf-cpp ros-foxy-topic-monitor \
ros-foxy-image-common ros-foxy-image-pipeline ros-foxy-image-transport-plugins \
ros-foxy-laser-geometry ros-foxy-perception-pcl ros-foxy-vision-opencv ros-foxy-ros-ign \
ros-foxy-nmea-msgs nano socat xxd pip \
&& apt-get clean && rm -rf /var/lib/apt/lists/*

RUN pip install numpy pyserial pynmea2 minimalmodbus

RUN /bin/bash -c 'echo "source /opt/ros/foxy/setup.bash" >> ~/.bashrc'

RUN git clone https://github.com/OSURoboticsClub/Rover_2022_2023.git

ENTRYPOINT []

CMD ["bash"]
226 changes: 0 additions & 226 deletions software/firmware/MR1819_science/MR1819_science.ino

This file was deleted.

Loading