Commit Graph

135 Commits

Author SHA1 Message Date
05b4c85ad2 Changed readouts for arm, added readouts for gripper w/modes and extra controls. GUI reorganization. 2018-08-07 17:31:28 -07:00
501b24e795 Gripper control works. Needs firmware tuning for limits and readouts on GUI 2018-08-07 05:18:50 -07:00
57fe71fd76 Mainly controller and mapping changes. Added empty effectors control of gripper. 2018-08-07 00:24:10 -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
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
7f80f44b96 Rover arm now moves one axis via topics. Close to having the rest moving tomorrow. 2018-08-04 01:28:21 -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
092318ec10 Mining system completegit add .! 2018-07-29 21:46:10 -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
bb0afef84d Fixed git reset scripts 2018-07-27 14:32:39 -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
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
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
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
1110dce885 Ubiquiti radio statuses now working. Misc other items. 2018-07-08 21:01:53 -07:00
d89685a156 Added sender for tower pan/tilt control. Tested and works. 2018-06-02 16:02:04 -07:00
23035c11ba Changed code so rover can run without FrSky for EXPO 2018-05-17 21:46:59 -07:00
Chris Pham
4daf40a229 Changed UI file to allow 180 from 90 and abs numbers 2018-04-14 14:08:54 -07:00
Ken Steinfeldt
307b978fb9 Merge pull request #16 from captntuttle/master
timer right-left click
2018-04-12 13:04:08 -07:00
Ken Steinfeldt
324b9b8987 timer right-left click 2018-04-12 12:39:52 -07:00
Chris Pham
d9e5b403d7 Swap East/West for DMS 2018-04-12 12:22:25 -07:00
Chris Pham
9d25778631 Merge branch 'master' of https://github.com/OSURoboticsClub/Rover_2017_2018 2018-04-12 12:21:16 -07:00
Chris Pham
e8ddedcf42 Set DMS cardinality 2018-04-12 12:21:13 -07:00
58295c6adb Merge branch 'master' of https://github.com/OSURoboticsClub/Rover_2017_2018 2018-04-12 12:08:30 -07:00
cf95a46c7d Spacenav mouse now broadcasts states for use with gui. 2018-04-12 12:08:13 -07:00
Chris Pham
af7b48f19a Fixed DMS issues, needed to fix int cast 2018-04-12 12:08:06 -07:00
Chris Pham
1507c11f47 Correct mispelling on longitude_second_label 2018-04-12 11:28:58 -07:00
Chris Pham
30f518c34f DMS for longitude added 2018-04-12 11:26:42 -07:00
Chris Pham
d4dd599378 cast lat_min to float 2018-04-12 11:24:01 -07:00
Chris Pham
443cc5dd83 DMS convert to var and int/float issues 2018-04-12 11:22:17 -07:00
9c69967be1 Merge branch 'master' of https://github.com/OSURoboticsClub/Rover_2017_2018 2018-04-12 11:15:27 -07:00
368401176b Added error handling for missing radio. More spacenav changes, testing nav launch file. 2018-04-12 11:15:24 -07:00
Chris Pham
7f82627135 Implementing DMS for Latitude 2018-04-12 11:10:36 -07:00
068b936541 Updated motor node issues. Fixed waypoints coordinator name so ground station launches. 2018-03-24 15:30:27 -07:00
85a2a7b066 Merge branch 'master' of https://github.com/OSURoboticsClub/Rover_2017_2018 2018-03-17 20:32:24 -07:00
a0e8d9eb71 Refactored JoystickSystems to InputSystems. Added base of spacenav control sender. Currently gets events and stores them. 2018-03-17 20:32:13 -07:00
Chris Pham
70eba06a4b Included a checker to prevent any inputs if the fields are empty 2018-03-17 20:28:17 -07:00
Chris Pham
8ccd4c7d21 Applied Landmark Buttons 2018-03-17 20:10:57 -07:00
Chris Pham
790b84b140 Supposed nav list buttons working 2018-03-17 19:44:12 -07:00
Chris Pham
886058fa9b add str conversion 2018-03-17 16:36:13 -07:00
339f346fdf Fixed OSURC logo, modified leftui. 2018-03-17 16:34:01 -07:00
Chris Pham
c2297d8107 changed from QtGUI to QtWidgets 2018-03-17 16:06:08 -07:00