Commit Graph

Select branches

Hide Pull Requests

Goal_Navigation

System_Statuses

map_intergration

master

system_statuses

video_testing

#1

#10

#11

#12

#13

#14

#15

#16

#2

#3

#4

#5

#5

#6

#7

#7

#8

#9

Mono Color

• d39862a74b Fixes to work with new controller and manipulate pitch. master Prathyoosha Chaya 2018-10-04 19:50:37 -07:00
• cc354a978d Added controller layout design files Corwin Perren 2018-08-23 01:10:59 -07:00
• 0a63c2b4de Update iris.md Nick McComb 2018-08-21 11:53:27 -07:00
• 421177a523 Switched to a new controller and renamed control system files to a better naming convention Corwin Perren 2018-08-12 16:23:03 -07:00
• a4f04eda7e Updated mining readouts for addition of science cam controls. Working science cam controls. Fixed missing soil probe transports. Corwin Perren 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. Corwin Perren 2018-08-11 07:12:06 -07:00
• 12ed32ef54 Minor changes to rdf and a low res mode for video. Corwin Perren 2018-08-10 13:03:08 -07:00
• c3a98cc0a7 Working readout for beacon frequency thanks to Dylan! Corwin Perren 2018-08-09 22:21:18 -07:00
• d9e8458797 Merge branch 'master' of https://github.com/OSURoboticsClub/Rover_2017_2018 Corwin Perren 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. Corwin Perren 2018-08-08 17:53:27 -07:00
• 55cf3565dc Update motor.md Nick McComb 2018-08-08 16:49:48 -07:00
• 9c11337571 Smart changeover from mining to gripper now works. Switching to bash console embedded in gui. Corwin Perren 2018-08-08 14:40:26 -07:00
• a79eae3440 Merge branch 'master' of https://github.com/OSURoboticsClub/Rover_2017_2018 Corwin Perren 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. Corwin Perren 2018-08-08 05:13:04 -07:00
• c3d1d49d47 Added pan-tilt to index Nick McComb 2018-08-07 19:11:27 -07:00
• 1d94af22ef Added pan-tilt docs Nick McComb 2018-08-07 19:04:45 -07:00
• 05b4c85ad2 Changed readouts for arm, added readouts for gripper w/modes and extra controls. GUI reorganization. Corwin Perren 2018-08-07 17:31:28 -07:00
• 82f02eef66 Merge branch 'master' of https://github.com/OSURoboticsClub/Rover_2017_2018 Corwin Perren 2018-08-07 05:19:06 -07:00
• 501b24e795 Gripper control works. Needs firmware tuning for limits and readouts on GUI Corwin Perren 2018-08-07 05:18:50 -07:00
• 0c2d7a9930 Final gripper firmware minus tuning Dylan Thrush 2018-08-07 01:23:54 -07:00
• dfd9bb3854 Fixed firmware fuckery Dylan Thrush 2018-08-07 00:46:34 -07:00
• f0ff4717b2 Merge branch 'master' of https://github.com/OSURoboticsClub/Rover_2017_2018 Corwin Perren 2018-08-07 00:41:44 -07:00
• 33fcb8bcd0 Seeing 15 reg on gripper! Corwin Perren 2018-08-07 00:41:40 -07:00
• 758cae0a95 Merge branch 'master' of https://github.com/OSURoboticsClub/Rover_2017_2018 Dylan Thrush 2018-08-07 00:28:35 -07:00
• 87037b0094 Revert "Updated gripper firmware" Dylan Thrush 2018-08-07 00:28:11 -07:00
• 57fe71fd76 Mainly controller and mapping changes. Added empty effectors control of gripper. Corwin Perren 2018-08-07 00:24:10 -07:00
• 8d2e28ae16 Merge branch 'master' of https://github.com/OSURoboticsClub/Rover_2017_2018 Dylan Thrush 2018-08-07 00:23:12 -07:00
• 1c994875aa Updated gripper firmware Dylan Thrush 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. Corwin Perren 2018-08-06 20:13:50 -07:00
• e688aff233 Lots o changes. Too tired to think Corwin Perren 2018-08-05 11:23:26 -07:00
• 91be05baff Wrong naming for rover_arm node Corwin Perren 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. Corwin Perren 2018-08-05 05:10:39 -07:00
• 5d7ac8f4dc Updated rover and ground station setups Corwin Perren 2018-08-04 18:52:47 -07:00
• ddd4d6b60a Relative and absoute work. Cal starting to work. Moving to rover for controller integration. Corwin Perren 2018-08-04 18:51:24 -07:00
• 7f80f44b96 Rover arm now moves one axis via topics. Close to having the rest moving tomorrow. Corwin Perren 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. Corwin Perren 2018-08-02 13:34:17 -07:00
• ce774c736a Merge branch 'master' of https://github.com/OSURoboticsClub/Rover_2017_2018 Corwin Perren 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 .! Corwin Perren 2018-08-02 00:55:44 -07:00
• bf48c6ac11 Initial moveit config and urdf export. Can do planning in RViz! Corwin Perren 2018-07-31 21:29:17 -07:00
• 6fd06840ec Permissions on effector control Corwin Perren 2018-07-29 21:53:41 -07:00
• e3ab41f1d4 New mining firmware merge conflict. Mine added. Corwin Perren 2018-07-29 21:48:10 -07:00
• 092318ec10 Mining system completegit add .! Corwin Perren 2018-07-29 21:46:10 -07:00
• 4606cb4873 Merge branch 'master' of https://github.com/OSURoboticsClub/Rover_2017_2018 Dylan Thrush 2018-07-29 00:03:05 -07:00
• f4114424b9 Updated mining firmware Dylan Thrush 2018-07-29 00:02:17 -07:00
• b79693c855 Added mining testing firmware Corwin Perren 2018-07-29 00:02:01 -07:00
• 5b33b80196 Merge branch 'master' of https://github.com/OSURoboticsClub/Rover_2017_2018 Dylan Thrush 2018-07-28 22:24:46 -07:00
• 6607e4bd77 Added IONI configs and mining firmware Dylan Thrush 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 Corwin Perren 2018-07-28 21:58:08 -07:00
• aa6f3f2d6f Fixed compass so it shows on startup again. Corwin Perren 2018-07-28 19:06:38 -07:00
• 6cd95b59cb Mapping color points with text workinggit add .git add . Corwin Perren 2018-07-28 18:51:12 -07:00
• ba07b6da02 Mapping dragging working correctly now. Still choppy. Corwin Perren 2018-07-28 15:20:51 -07:00
• 6ff6068759 Choppy panning and zooming working! Not the nicest, but it works. Corwin Perren 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. Corwin Perren 2018-07-27 21:25:24 -07:00
• 63454f22d1 Made it copy files instead of folder. Corwin Perren 2018-07-27 14:37:34 -07:00
• bb0afef84d Fixed git reset scripts Corwin Perren 2018-07-27 14:32:39 -07:00
• 2613d327ec Added git reset scripts so I stop deleting map caches for ground station. Corwin Perren 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. Corwin Perren 2018-07-21 20:45:59 -07:00
• 8c78d5729f Merge branch 'master' of https://github.com/OSURoboticsClub/Rover_2017_2018 Corwin Perren 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. Corwin Perren 2018-07-21 18:22:51 -07:00
• d6719e87f9 added gripper firmware Dylan Thrush 2018-07-21 16:31:23 -07:00
• 36ab117512 Merge branch 'master' of https://github.com/OSURoboticsClub/Rover_2017_2018 Dylan Thrush 2018-07-20 15:04:33 -07:00
• 0133f5624e updated ioni configs Dylan Thrush 2018-07-20 13:15:39 -07:00
• 5da9c8bd1d Merge branch 'master' of https://github.com/OSURoboticsClub/Rover_2017_2018 Corwin Perren 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. Corwin Perren 2018-07-19 18:42:55 -07:00
• 95e31cb417 added IONI configs Dylan Thrush 2018-07-19 15:28:28 -07:00
• 2eb4a0ad04 Update science.md granaa 2018-07-16 11:49:01 -07:00
• 8d82aa77d4 Add files via upload granaa 2018-07-16 11:44:52 -07:00
• 6235e6da28 Update science.md granaa 2018-07-16 11:44:15 -07:00
• 0a68b044f0 Update science.md granaa 2018-07-16 11:43:30 -07:00
• 79e30b446f Update science.md granaa 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! Corwin Perren 2018-07-15 22:35:50 -07:00
• 1b7f5437b9 Got pan/tilt and tower combo node done. Other misc changes. Corwin Perren 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. Corwin Perren 2018-07-14 16:19:18 -07:00
• 1110dce885 Ubiquiti radio statuses now working. Misc other items. Corwin Perren 2018-07-08 21:01:53 -07:00
• b9473eaf21 Merge branch 'master' of https://github.com/OSURoboticsClub/Rover_2017_2018 Corwin Perren 2018-07-07 13:53:53 -07:00
• d3a3a561e2 Initial odometry and localization working, though position grows without bound. It's a start though. Corwin Perren 2018-07-07 13:53:28 -07:00
• ddd4953495 Working on odometry. Got firmware and ros node separating out gps/imu data. Needs to get sent to the right topics, but hard part is done! Corwin Perren 2018-07-06 21:48:32 -07:00
• 83415591f0 Add files via upload Nick McComb 2018-07-06 15:39:24 -07:00
• ecd52aa8a4 Merge branch 'master' of https://github.com/OSURoboticsClub/Rover_2017_2018 Corwin Perren 2018-07-05 20:23:08 -07:00
• 9c848e8368 Added first version of tower firmware. Spits out GPS and IMU data on port RS485-1 and talks over modbus on RS585-2. Modbus side doesn't do anything atm. Corwin Perren 2018-07-05 20:22:51 -07:00
• 3649a34eda Update readme.md Nick McComb 2018-07-03 10:31:35 -07:00
• 0696755481 Add files via upload granaa 2018-07-02 13:34:37 -07:00
• 25fdc79f4f Add files via upload granaa 2018-07-02 13:08:53 -07:00
• 9f2c859ce4 Updated node ducmentation for tower alt and grasping Nick McComb 2018-06-30 15:15:21 -07:00
• 43b5ef0c3d Update tower.md Nick McComb 2018-06-30 15:08:52 -07:00
• 610ac76968 Added Tower Alt Documentation Nick McComb 2018-06-30 15:07:10 -07:00
• 8a83b6f140 Back to defaults after OMSI. IRIS fully working again. Corwin Perren 2018-06-29 17:26:31 -07:00
• 1a29881d5e Merge branch 'master' of https://github.com/OSURoboticsClub/Rover_2017_2018 Corwin Perren 2018-06-14 14:16:07 -07:00
• f132bb38d4 IRIS is back. Still driving on backups. Made modifications for OMSI. Corwin Perren 2018-06-14 14:15:51 -07:00
• 200f5aeea9 Added missing images for final report Corwin Perren 2018-06-12 15:53:18 -07:00
• f526c71b95 Added final report document Corwin Perren 2018-06-12 15:50:05 -07:00
• d7d9e31014 added initial grasper firmware Dylan Thrush 2018-06-05 09:13:49 -07:00
• be7c50a702 Added quickstart guide for ground station software Corwin Perren 2018-06-04 21:22:20 -07:00
• d89685a156 Added sender for tower pan/tilt control. Tested and works. Corwin Perren 2018-06-02 16:02:04 -07:00
• cc3f91b5ff Merge branch 'master' of https://github.com/OSURoboticsClub/Rover_2017_2018 Corwin Perren 2018-06-02 14:17:49 -07:00
• 03c9bc0617 Update iris.md Nick McComb 2018-05-31 21:34:09 -07:00
• 2cdb04f122 Update iris.md Nick McComb 2018-05-28 17:29:44 -07:00
• 897e0fa3d2 Finished firmware for tower pan/tilt node. Also made the ROS node for it. Just needs to be installed on Rover. Corwin Perren 2018-05-26 15:32:17 -07:00
• f24cb5eee0 Addded pan-tilt schematic Nick McComb 2018-05-19 16:52:30 -07:00
• fea235fc67 Merge branch 'master' of https://github.com/OSURoboticsClub/Rover_2017_2018 Corwin Perren 2018-05-17 21:47:17 -07:00