Commit Graph

49 Commits

Author SHA1 Message Date
Ken Steinfeldt
1353defa0c Merge pull request #15 from captntuttle/master
bug fix
2018-03-15 11:32:51 -07:00
Ken Steinfeldt
c9e9129783 bug fix 2018-03-15 11:32:05 -07:00
Chris Pham
e9082d42ee Merge branch 'master' of https://github.com/OSURoboticsClub/Rover_2017_2018 2018-03-15 11:29:56 -07:00
Chris Pham
0353145c3b don't use landmark_list yet 2018-03-15 11:29:52 -07:00
Ken Steinfeldt
ffef2711e9 take out unused vars 2018-03-15 11:28:34 -07:00
Ken Steinfeldt
0e184fee3d fixes weird ui merge garbage 2018-03-15 11:25:46 -07:00
e973afa46c Fixed merge conflict on left_screen. 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. 2018-03-15 11:11:10 -07:00
Ken Steinfeldt
4223d1f3c8 Merge pull request #12 from captntuttle/master
color change
2018-03-15 11:10:30 -07:00
Ken Steinfeldt
f33292a992 color change 2018-03-15 11:09:44 -07:00
Ken Steinfeldt
f68cb5f69c Merge pull request #11 from captntuttle/master
Fills out statuses and changes over to signals/slots
2018-03-15 11:00:27 -07:00
Chris Pham
83c281917c changed signal returncall 2018-03-15 10:55:43 -07:00
Chris Pham
102cdf0c77 Updated new location, _get_table return less, change update_overlay 2018-03-15 10:53:34 -07:00
Ken Steinfeldt
d2e1b7e224 add emmc and gpu temp to outputs 2018-03-15 10:38:48 -07:00
Ken Steinfeldt
1c7646d07d change current outputs to signals/slots 2018-03-15 10:06:43 -07:00
Chris Pham
fdffd0d3e4 Created square indicator for ez of rotation 2018-03-15 09:44:49 -07:00
Chris Pham
eaaaf6f7f9 Generate current location marker changed and fit PIP8 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. 2018-03-13 23:38:00 -07:00
3a1089973d fix flicker bug -start 2018-03-13 19:20:08 -07:00
7737c42a15 steinfek - fix losing background color on alert 2018-03-13 18:59:35 -07:00
a256c7d231 Integrated system_statuses with main launcher. 2018-03-13 18:43:09 -07:00
Ken Steinfeldt
595a51a0d7 Merge pull request #10 from captntuttle/master
SensorCore
2018-03-13 18:18:55 -07:00
Ken Steinfeldt
f48384f143 add update request publisher 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)... 2018-03-13 17:59:59 -07:00
Ken Steinfeldt
4b57b53231 fix ui name (ram) error 2018-03-13 17:54:32 -07:00
Ken Steinfeldt
e13c3b0f49 actually hook up ram this time 2018-03-13 17:53:25 -07:00
Ken Steinfeldt
42ed37071a hook-up clock, cpu and ram % 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. 2018-03-13 14:52:18 -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. 2018-03-13 14:43:01 -07:00
Ken Steinfeldt
8d200cdfc7 rename ui elements, fill in StatusCore 2018-03-13 11:52:49 -07:00
6a78b2e041 Added silly spinny compass. It's the framwwork for later. 2018-03-08 23:39:08 -08:00
db955dd489 Joystick camera cycling and disabling fully working! 2018-03-08 22:43:58 -08:00
a98bb79b97 Added in Chris' working mapping code. Fixed some joystick camera selection code. 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 2018-03-08 16:41:16 -08:00
Ken Steinfeldt
10750a7a5f small amount of cleanup for some missed changes 2018-03-08 16:03:31 -08:00
Ken Steinfeldt
3eac5910d2 StatusCore init 2018-03-08 15:42:18 -08:00
Ken Steinfeldt
d9bcbebe01 clock and timer elements 2018-03-08 15:24:20 -08:00
Ken Steinfeldt
c6dadb2b96 Merge remote-tracking branch 'upstream/master' 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! 2018-03-07 00:01:50 -08:00
381eccf4b3 Added full end effector transports. 2018-03-06 17:13:18 -08:00
8b83e84677 Some more modifications to drive sender so things are a little smoother. Works well now. Changed update rates for control systems. 2018-03-04 16:27:24 -08:00
0b64840ea4 Added compass back. Beginning of better changes for drive_control. 2018-03-03 19:55:35 -08:00
2a37f6fe2e Added watchdog for drive coordinator. Removed background from compass. Tuned some stuff on ground station drive sender. 2018-03-01 19:50:45 -08:00
6d9ed5d438 Fixed some gui elements. Added pause / speed control to remote drive. 2018-03-01 17:14:34 -08:00
Ken Steinfeldt
00f7e0875d adds time, not connected 2018-03-01 14:33:12 -08:00
e29e88a81d Updated UI Files 2018-02-27 22:46:59 -08:00
Chris Pham
e054dc9aae Merge branch 'master' of https://github.com/OSURoboticsClub/Rover_2017_2018 2018-02-27 22:35:40 -08:00
230f64f4a3 Major changes. Refactored. Drive now arbitrates between FrSky and ground station. 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. 2018-02-27 18:38:55 -08:00