Commit Graph

545 Commits

Author SHA1 Message Date
a4f04eda7e Updated mining readouts for addition of science cam controls. Working science cam controls. Fixed missing soil probe transports. 2018-08-12 01:25:20 -07:00
03cdd2e3a6 Got point and shoot control working. Needs zooming. Backup scale node added. Lots of random things, super tired. 2018-08-11 07:12:06 -07:00
12ed32ef54 Minor changes to rdf and a low res mode for video. 2018-08-10 13:03:08 -07:00
c3a98cc0a7 Working readout for beacon frequency thanks to Dylan! 2018-08-09 22:21:18 -07:00
d9e8458797 Merge branch 'master' of https://github.com/OSURoboticsClub/Rover_2017_2018 2018-08-08 17:54:18 -07:00
2316418b92 Equipment servicing now working and integrated. Will have to have the ip changed after we know what it is. 2018-08-08 17:53:27 -07:00
Nick McComb
55cf3565dc Update motor.md 2018-08-08 16:49:48 -07:00
9c11337571 Smart changeover from mining to gripper now works. Switching to bash console embedded in gui. 2018-08-08 14:40:26 -07:00
a79eae3440 Merge branch 'master' of https://github.com/OSURoboticsClub/Rover_2017_2018 2018-08-08 05:13:15 -07:00
97cd60325d Gripper control changed a bit, needs more work. Readouts for soil probe on gui, finished soil/rdf node. 2018-08-08 05:13:04 -07:00
Nick McComb
c3d1d49d47 Added pan-tilt to index 2018-08-07 19:11:27 -07:00
Nick McComb
1d94af22ef Added pan-tilt docs 2018-08-07 19:04:45 -07:00
05b4c85ad2 Changed readouts for arm, added readouts for gripper w/modes and extra controls. GUI reorganization. 2018-08-07 17:31:28 -07:00
82f02eef66 Merge branch 'master' of https://github.com/OSURoboticsClub/Rover_2017_2018 2018-08-07 05:19:06 -07:00
501b24e795 Gripper control works. Needs firmware tuning for limits and readouts on GUI 2018-08-07 05:18:50 -07:00
Dylan Thrush
0c2d7a9930 Final gripper firmware minus tuning 2018-08-07 01:23:54 -07:00
Dylan Thrush
dfd9bb3854 Fixed firmware fuckery 2018-08-07 00:46:34 -07:00
f0ff4717b2 Merge branch 'master' of https://github.com/OSURoboticsClub/Rover_2017_2018 2018-08-07 00:41:44 -07:00
33fcb8bcd0 Seeing 15 reg on gripper! 2018-08-07 00:41:40 -07:00
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