Dylan Thrush
|
758cae0a95
|
Merge branch 'master' of https://github.com/OSURoboticsClub/Rover_2017_2018
|
2018-08-07 00:28:35 -07:00 |
|
Dylan Thrush
|
87037b0094
|
Revert "Updated gripper firmware"
This reverts commit 1c994875aa.
|
2018-08-07 00:28:11 -07:00 |
|
|
|
57fe71fd76
|
Mainly controller and mapping changes. Added empty effectors control of gripper.
|
2018-08-07 00:24:10 -07:00 |
|
Dylan Thrush
|
8d2e28ae16
|
Merge branch 'master' of https://github.com/OSURoboticsClub/Rover_2017_2018
|
2018-08-07 00:23:12 -07:00 |
|
Dylan Thrush
|
1c994875aa
|
Updated gripper firmware
untested, but done
|
2018-08-07 00:22:09 -07:00 |
|
|
|
5e65f9dfdd
|
Control changes. Joystick and spacenav sucked. Switched to regular controllers. Added readout for xbox controller mode.
|
2018-08-06 20:13:50 -07:00 |
|
|
|
e688aff233
|
Lots o changes. Too tired to think
|
2018-08-05 11:23:26 -07:00 |
|
|
|
91be05baff
|
Wrong naming for rover_arm node
|
2018-08-05 05:13:04 -07:00 |
|
|
|
44da64cb32
|
Rover arm pretty much working! Still some minor changes needed probably, but very happy with it. Lots of misc changes.
|
2018-08-05 05:10:39 -07:00 |
|
|
|
5d7ac8f4dc
|
Updated rover and ground station setups
|
2018-08-04 18:52:47 -07:00 |
|
|
|
ddd4d6b60a
|
Relative and absoute work. Cal starting to work. Moving to rover for controller integration.
|
2018-08-04 18:51:24 -07:00 |
|
|
|
7f80f44b96
|
Rover arm now moves one axis via topics. Close to having the rest moving tomorrow.
|
2018-08-04 01:28:21 -07:00 |
|
|
|
d62fdd45b3
|
Changed settings for base and shoulder ionis so they maintin absolute position through reboots. Tested and working.
|
2018-08-02 13:34:17 -07:00 |
|
|
|
ce774c736a
|
Merge branch 'master' of https://github.com/OSURoboticsClub/Rover_2017_2018
|
2018-08-02 00:56:02 -07:00 |
|
|
|
047c04ca41
|
Started adding in xbox controller to gui. Thinking of scrapping spacenav mouse. It kinda sucks. Also, three axes moving on the arm! Time to make an action client for moveitgit add .git add .!
|
2018-08-02 00:55:44 -07:00 |
|
|
|
bf48c6ac11
|
Initial moveit config and urdf export. Can do planning in RViz!
|
2018-07-31 21:29:17 -07:00 |
|
|
|
6fd06840ec
|
Permissions on effector control
|
2018-07-29 21:53:41 -07:00 |
|
|
|
e3ab41f1d4
|
New mining firmware merge conflict. Mine added.
|
2018-07-29 21:48:10 -07:00 |
|
|
|
092318ec10
|
Mining system completegit add .!
|
2018-07-29 21:46:10 -07:00 |
|
Dylan Thrush
|
4606cb4873
|
Merge branch 'master' of https://github.com/OSURoboticsClub/Rover_2017_2018
|
2018-07-29 00:03:05 -07:00 |
|
Dylan Thrush
|
f4114424b9
|
Updated mining firmware
|
2018-07-29 00:02:17 -07:00 |
|
|
|
b79693c855
|
Added mining testing firmware
|
2018-07-29 00:02:01 -07:00 |
|
Dylan Thrush
|
5b33b80196
|
Merge branch 'master' of https://github.com/OSURoboticsClub/Rover_2017_2018
|
2018-07-28 22:24:46 -07:00 |
|
Dylan Thrush
|
6607e4bd77
|
Added IONI configs and mining firmware
|
2018-07-28 22:20:13 -07:00 |
|
|
|
ae8cffeb6e
|
Working on adding bash console to a widget. Added low battery and critical battery warnings as we almost killed a rover battery from undervoltagegit statusgit statusgit status
|
2018-07-28 21:58:08 -07:00 |
|
|
|
aa6f3f2d6f
|
Fixed compass so it shows on startup again.
|
2018-07-28 19:06:38 -07:00 |
|
|
|
6cd95b59cb
|
Mapping color points with text workinggit add .git add .
|
2018-07-28 18:51:12 -07:00 |
|
|
|
ba07b6da02
|
Mapping dragging working correctly now. Still choppy.
|
2018-07-28 15:20:51 -07:00 |
|
|
|
6ff6068759
|
Choppy panning and zooming working! Not the nicest, but it works.
|
2018-07-28 15:11:32 -07:00 |
|
|
|
9d3969f9e4
|
Got farther with mapping, heading indication, and firmware with cal for IMU. Need to figure out which direction IMU is in for ROS to work right.
|
2018-07-27 21:25:24 -07:00 |
|
|
|
63454f22d1
|
Made it copy files instead of folder.
|
2018-07-27 14:37:34 -07:00 |
|
|
|
bb0afef84d
|
Fixed git reset scripts
|
2018-07-27 14:32:39 -07:00 |
|
|
|
2613d327ec
|
Added git reset scripts so I stop deleting map caches for ground station.
|
2018-07-27 13:41:21 -07:00 |
|
|
|
71cff19b77
|
Started working on mapping waypoints and thinking about zoom/pan. Added watchdog for odometry. Fixed watchdog for IRIS. Changed voltage warning for rover, was too low. Added neat loading image for mapping on launch.
|
2018-07-21 20:45:59 -07:00 |
|
|
|
8c78d5729f
|
Merge branch 'master' of https://github.com/OSURoboticsClub/Rover_2017_2018
|
2018-07-21 18:23:05 -07:00 |
|
|
|
c657048ccf
|
Map now shows coordinates and tiny rover in middle. Going to try to debug IRIS issues.
|
2018-07-21 18:22:51 -07:00 |
|
Dylan Thrush
|
d6719e87f9
|
added gripper firmware
|
2018-07-21 16:31:23 -07:00 |
|
Dylan Thrush
|
36ab117512
|
Merge branch 'master' of https://github.com/OSURoboticsClub/Rover_2017_2018
|
2018-07-20 15:04:33 -07:00 |
|
Dylan Thrush
|
0133f5624e
|
updated ioni configs
|
2018-07-20 13:15:39 -07:00 |
|
|
|
5da9c8bd1d
|
Merge branch 'master' of https://github.com/OSURoboticsClub/Rover_2017_2018
|
2018-07-19 18:43:06 -07:00 |
|
|
|
39a7d482de
|
Pan/tilt now works for both tower and chassis. Intelligently controllable and centerable using joystick. Added some error handling for map stuff. New firmware for chassis node.
|
2018-07-19 18:42:55 -07:00 |
|
Dylan Thrush
|
95e31cb417
|
added IONI configs
|
2018-07-19 15:28:28 -07:00 |
|
granaa
|
2eb4a0ad04
|
Update science.md
|
2018-07-16 11:49:01 -07:00 |
|
granaa
|
8d82aa77d4
|
Add files via upload
|
2018-07-16 11:44:52 -07:00 |
|
granaa
|
6235e6da28
|
Update science.md
|
2018-07-16 11:44:15 -07:00 |
|
granaa
|
0a68b044f0
|
Update science.md
|
2018-07-16 11:43:30 -07:00 |
|
granaa
|
79e30b446f
|
Update science.md
|
2018-07-16 10:25:32 -07:00 |
|
|
|
a573f72c1c
|
Got more statuses working, mainly GPS. Played with odom a bit more. Map now shows live GPS location!
|
2018-07-15 22:35:50 -07:00 |
|
|
|
1b7f5437b9
|
Got pan/tilt and tower combo node done. Other misc changes.
|
2018-07-14 20:54:50 -07:00 |
|
|
|
de93764849
|
Pan/tilt now working from ground station with working tower on rover. Need to integreate tower node on modbus bus for that node, but overall working.
|
2018-07-14 16:19:18 -07:00 |
|