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

• e9082d42ee Merge branch 'master' of https://github.com/OSURoboticsClub/Rover_2017_2018 Chris Pham 2018-03-15 11:29:56 -07:00
• 0353145c3b don't use landmark_list yet Chris Pham 2018-03-15 11:29:52 -07:00
• 07666e9f4d Merge pull request #14 from captntuttle/master Ken Steinfeldt 2018-03-15 11:29:13 -07:00
• ffef2711e9 take out unused vars Ken Steinfeldt 2018-03-15 11:28:34 -07:00
• 0f34a54709 Merge pull request #13 from captntuttle/master Ken Steinfeldt 2018-03-15 11:26:22 -07:00
• 0e184fee3d fixes weird ui merge garbage Ken Steinfeldt 2018-03-15 11:25:46 -07:00
• e973afa46c Fixed merge conflict on left_screen. Corwin Perren 2018-03-15 11:14:00 -07:00
• 30afe7c5b0 Updated gui elements for IMU pitch and roll. Also updated left screen tab widget and lat/lon editing. Corwin Perren 2018-03-15 11:11:10 -07:00
• 4223d1f3c8 Merge pull request #12 from captntuttle/master Ken Steinfeldt 2018-03-15 11:10:30 -07:00
• f33292a992 color change Ken Steinfeldt 2018-03-15 11:09:44 -07:00
• f68cb5f69c Merge pull request #11 from captntuttle/master Ken Steinfeldt 2018-03-15 11:00:27 -07:00
• 83c281917c changed signal returncall Chris Pham 2018-03-15 10:55:43 -07:00
• 102cdf0c77 Updated new location, _get_table return less, change update_overlay Chris Pham 2018-03-15 10:53:34 -07:00
• d2e1b7e224 add emmc and gpu temp to outputs Ken Steinfeldt 2018-03-15 10:38:48 -07:00
• 1c7646d07d change current outputs to signals/slots Ken Steinfeldt 2018-03-15 10:06:43 -07:00
• fdffd0d3e4 Created square indicator for ez of rotation Chris Pham 2018-03-15 09:44:49 -07:00
• eaaaf6f7f9 Generate current location marker changed and fit PIP8 Chris Pham 2018-03-15 09:16:00 -07:00
• 4e7c0fc4e3 Got channels changing on the m2 radios over ssh with testing script. Adjusted some speed things for compass and arm. Corwin Perren 2018-03-13 23:38:00 -07:00
• 3a1089973d fix flicker bug -start Corwin Perren 2018-03-13 19:20:08 -07:00
• 7737c42a15 steinfek - fix losing background color on alert Corwin Perren 2018-03-13 18:59:35 -07:00
• a256c7d231 Integrated system_statuses with main launcher. Corwin Perren 2018-03-13 18:43:09 -07:00
• 595a51a0d7 Merge pull request #10 from captntuttle/master Ken Steinfeldt 2018-03-13 18:18:55 -07:00
• f48384f143 add update request publisher Ken Steinfeldt 2018-03-13 18:17:13 -07:00
• 3242f2d866 Added dummy movement for arm position. Changed rover_drive and iris_controller to handle full dropouts of the usb device (hopefully)... Corwin Perren 2018-03-13 17:59:59 -07:00
• 4b57b53231 fix ui name (ram) error Ken Steinfeldt 2018-03-13 17:54:32 -07:00
• e13c3b0f49 actually hook up ram this time Ken Steinfeldt 2018-03-13 17:53:25 -07:00
• 42ed37071a hook-up clock, cpu and ram % Ken Steinfeldt 2018-03-13 17:49:01 -07:00
• f9560e17d6 Made compass update heading and next goal with same value for now. Randomized speed. Just to show that things are working. Corwin Perren 2018-03-13 14:52:18 -07:00
• 5dc774b135 Merge branch 'master' of https://github.com/OSURoboticsClub/Rover_2017_2018 Corwin Perren 2018-03-13 14:43:11 -07:00
• 42a92fc7bb Compass now responds to heading (when we get one) and moves nicely and smoothly on the GUI. Made a new compass image as the old one was bad. Corwin Perren 2018-03-13 14:43:01 -07:00
• 8d200cdfc7 rename ui elements, fill in StatusCore Ken Steinfeldt 2018-03-13 11:52:49 -07:00
• adf41760bc Update grasp.md Dylan Thrush 2018-03-12 20:33:44 -07:00
• 4f456fbb3f Update grasp.md Dylan Thrush 2018-03-12 20:32:27 -07:00
• 2e5d3785ac Update grasp.md Dylan Thrush 2018-03-12 20:11:07 -07:00
• 7cd889d5b4 Update grasp.md Dylan Thrush 2018-03-12 15:50:42 -07:00
• e165d9f275 Create arm_breakout_1 Dylan Thrush 2018-03-11 22:43:47 -07:00
• a312799c61 Update grasp.md Dylan Thrush 2018-03-11 22:43:01 -07:00
• 7e62e728b5 Added schematic and step for grasp Dylan Thrush 2018-03-10 20:48:59 -08:00
• e261bc8bbf Update and rename grasping.md to grasp.md Dylan Thrush 2018-03-10 20:47:03 -08:00
• 691aa5519d Create grasping.md Dylan Thrush 2018-03-10 19:12:36 -08:00
• 6a78b2e041 Added silly spinny compass. It's the framwwork for later. Corwin Perren 2018-03-08 23:39:08 -08:00
• db955dd489 Joystick camera cycling and disabling fully working! Corwin Perren 2018-03-08 22:43:58 -08:00
• a98bb79b97 Added in Chris' working mapping code. Fixed some joystick camera selection code. Corwin Perren 2018-03-08 21:29:28 -08:00
• c9c2d29942 Renamed drive sender to joystick sender. Added qt broadcast of button presses for camera control. Added receiver to control gui elements. Need to be tested Corwin Perren 2018-03-08 16:41:16 -08:00
• 10750a7a5f small amount of cleanup for some missed changes Ken Steinfeldt 2018-03-08 16:03:31 -08:00
• 3eac5910d2 StatusCore init Ken Steinfeldt 2018-03-08 15:42:18 -08:00
• d9bcbebe01 clock and timer elements Ken Steinfeldt 2018-03-08 15:24:20 -08:00
• d292c7f3bb Merge remote-tracking branch 'upstream/master' Ken Steinfeldt 2018-03-08 15:04:36 -08:00
• 4a55fb2649 Got rover status messgaes sending to rover. Ground station can also request and update. Corwin Perren 2018-03-08 15:03:26 -08:00
• c6dadb2b96 Merge remote-tracking branch 'upstream/master' Ken Steinfeldt 2018-03-08 14:02:49 -08:00
• 69c4cc6c71 Finished re-write of ground station videoreceiver and videocoordinator to handle new nimbo udp sending, and working auto quality adjustmentgit status! Corwin Perren 2018-03-07 00:01:50 -08:00
• 381eccf4b3 Added full end effector transports. Corwin Perren 2018-03-06 17:13:18 -08:00
• 503b86f41f Added rover_camera to ground station packages. Corwin Perren 2018-03-06 15:51:01 -08:00
• 7845870e16 Fixed merge conflict. Corwin Perren 2018-03-06 15:49:19 -08:00
• 3301082078 Rewrote rover_camera to accept topic enabling and disabling of image broadcast. Also added rtsp streaming. Corwin Perren 2018-03-06 15:34:12 -08:00
• c47d4e2903 Started rewrite of rover_camera so we can view rtsp streams and control which streams are enabled. Changed senders / receivers for new camera. Corwin Perren 2018-03-04 19:59:07 -08:00
• 8b83e84677 Some more modifications to drive sender so things are a little smoother. Works well now. Changed update rates for control systems. Corwin Perren 2018-03-04 16:27:24 -08:00
• add93b6b7f Actually published the status. Changed names so they match the bogie. Corwin Perren 2018-03-03 20:41:10 -08:00
• 628efbb1c5 Added status data from rover_drive nodes. Corwin Perren 2018-03-03 20:36:24 -08:00
• 21f9a66f58 Merge branch 'master' of https://github.com/OSURoboticsClub/Rover_2017_2018 Corwin Perren 2018-03-03 19:58:24 -08:00
• 0b64840ea4 Added compass back. Beginning of better changes for drive_control. Corwin Perren 2018-03-03 19:55:35 -08:00
• 575c5bc935 Added FrSKy controller rover_status check MatthewTaylor24 2018-03-03 19:19:47 -08:00
• f7bb745e49 Added boolean for iris controller connected. Updated iris node to set state. Corwin Perren 2018-03-03 18:49:59 -08:00
• 5336c754be Merge branch 'master' of https://github.com/OSURoboticsClub/Rover_2017_2018 MatthewTaylor24 2018-03-03 18:28:11 -08:00
• 8b66bdfba8 Adding system statuses to base level of master MatthewTaylor24 2018-03-03 18:27:11 -08:00
• 8cd438de9a Removed extra systemctl stop command that killed the script before the jstson could shut down. Corwin Perren 2018-03-03 18:11:28 -08:00
• 997a3e99ea Removed cameras from auto power off as apparently they don't disappear on poweroff Corwin Perren 2018-03-03 17:56:06 -08:00
• b585eaab50 Added extra line to poweroff to kill scripts first. Corwin Perren 2018-03-03 17:42:59 -08:00
• ce10e9e802 Added auto startup and poweroff scripts. Corwin Perren 2018-03-03 17:21:38 -08:00
• a7297d50cf Added rover status to rover_setup. Corwin Perren 2018-03-03 16:14:39 -08:00
• 68d4353cf6 Added rover_status package. Corwin Perren 2018-03-03 16:12:35 -08:00
• 5d772f2d5c Added auto_poweroff monitor. Testing now. Corwin Perren 2018-03-03 14:53:46 -08:00
• 2a37f6fe2e Added watchdog for drive coordinator. Removed background from compass. Tuned some stuff on ground station drive sender. Corwin Perren 2018-03-01 19:50:45 -08:00
• 6d9ed5d438 Fixed some gui elements. Added pause / speed control to remote drive. Corwin Perren 2018-03-01 17:14:34 -08:00
• 00f7e0875d adds time, not connected Ken Steinfeldt 2018-03-01 14:33:12 -08:00
• e29e88a81d Updated UI Files Corwin Perren 2018-02-27 22:46:59 -08:00
• e054dc9aae Merge branch 'master' of https://github.com/OSURoboticsClub/Rover_2017_2018 Chris Pham 2018-02-27 22:35:40 -08:00
• 230f64f4a3 Major changes. Refactored. Drive now arbitrates between FrSky and ground station. Corwin Perren 2018-02-27 21:47:23 -08:00
• 934dd3eeb4 MAJOR refactor of software layout. Needed as ground station and rover both need access to shared packages. Corwin Perren 2018-02-27 18:38:55 -08:00
• ff7a587f80 Added pycharm files to gitignore. Started control coordinator refactore for multiple inputs. Last commit before made layout refactor Corwin Perren 2018-02-27 17:39:58 -08:00
• b0258bc100 Fixed too large value for UINT16. Round two... Corwin Perren 2018-02-26 23:16:47 -08:00
• 5e2400dfde Fixed too large value for UINT16 Corwin Perren 2018-02-26 23:14:09 -08:00
• 2f19732b37 Fixed math on one line. Corwin Perren 2018-02-26 23:08:50 -08:00
• b358919221 Simple change to keep values in range for now. Corwin Perren 2018-02-26 23:07:06 -08:00
• 8cc7048b9e Added receiver/sender for drive from ground station. Corwin Perren 2018-02-26 22:54:00 -08:00
• 92d67222a1 Merge branch 'master' of https://github.com/OSURoboticsClub/Rover_2017_2018 Corwin Perren 2018-02-26 22:49:08 -08:00
• 46809c3a39 Inverted axes and set default values Corwin Perren 2018-02-26 22:48:55 -08:00
• 91780ffed1 Made divisor a float Corwin Perren 2018-02-26 22:46:49 -08:00
• 960f5e3778 Merge branch 'master' of https://github.com/OSURoboticsClub/Rover_2017_2018 Corwin Perren 2018-02-26 22:45:38 -08:00
• 8c96c8e0a9 Added missing 's' Corwin Perren 2018-02-26 22:45:31 -08:00
• 23fb4cdb09 Merge branch 'master' of https://github.com/OSURoboticsClub/Rover_2017_2018 Corwin Perren 2018-02-26 22:44:30 -08:00
• 8861cd20ca Added sending drive commands via ROS topic Corwin Perren 2018-02-26 22:44:14 -08:00
• b91b05adaa Merge branch 'master' of https://github.com/OSURoboticsClub/Rover_2017_2018 Corwin Perren 2018-02-26 22:31:09 -08:00
• 3b8572a665 Printing axis data. Corwin Perren 2018-02-26 22:30:42 -08:00
• 20dc332c06 Merge branch 'master' of https://github.com/OSURoboticsClub/Rover_2017_2018 Corwin Perren 2018-02-26 22:08:21 -08:00
• 18c135a853 Added initial drive sender for ground station Corwin Perren 2018-02-26 22:07:34 -08:00
• 0d33eadcc5 Merge branch 'master' of https://github.com/OSURoboticsClub/Rover_2017_2018 Corwin Perren 2018-02-26 21:29:26 -08:00
• ff1d45f880 Removed dynamic reconfigure for now. Corwin Perren 2018-02-26 21:29:04 -08:00
• 9470708708 Merge branch 'master' of https://github.com/OSURoboticsClub/Rover_2017_2018 Corwin Perren 2018-02-26 21:20:38 -08:00
• e7040f3150 Trying receiver with ground station Corwin Perren 2018-02-26 21:19:11 -08:00