caperren/osurc_mars_rover_2017_2018
1
0
Fork 0
mirror of https://github.com/OSURoboticsClub/Rover_2017_2018.git synced 2025-11-08 10:11:14 +00:00
Code Issues Packages Projects Releases Wiki Activity
440 Commits 6 Branches 0 Tags
1ada4b392a528c8c41215c3c89a5083f642ad695
Commit Graph

440 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chris Pham
36b1fa6431 add connect 2018-03-17 15:44:51 -07:00
Chris Pham
b0b7d05fce added a 't' and fake values for adding from gps 2018-03-17 15:43:54 -07:00
Chris Pham
fd94901f7d Merge branch 'master' of https://github.com/OSURoboticsClub/Rover_2017_2018 2018-03-17 15:35:38 -07:00
Chris Pham
98d40c34e0 Change disable type 2018-03-17 15:35:29 -07:00
Corwin Perren
df75949dd1 Added landmark names so things don't break 2018-03-17 15:33:19 -07:00
Corwin Perren
00f826d5e8 Added osurclogo 2018-03-17 15:30:31 -07:00
Corwin Perren
87741b2505 Merge branch 'master' of https://github.com/OSURoboticsClub/Rover_2017_2018 2018-03-17 15:29:30 -07:00
Corwin Perren
744169267f Fixed clock element name 2018-03-17 15:26:51 -07:00
Chris Pham
113a3f1f0b Merge branch 'master' of https://github.com/OSURoboticsClub/Rover_2017_2018 2018-03-17 15:06:38 -07:00
Chris Pham
adfa4bfe9a Corrected signal and emitter, and then changed emit value into floats 2018-03-17 15:06:36 -07:00
Corwin Perren
42ab7914c0 Merge branch 'master' of https://github.com/OSURoboticsClub/Rover_2017_2018 2018-03-17 14:50:33 -07:00
Corwin Perren
e53dda16c2 Added osurc logo to the gui. 2018-03-17 14:50:20 -07:00
Chris Pham
a8e12d184b Starting qthread for WaypointCoordinator and disables 2018-03-17 14:48:03 -07:00
Chris Pham
87bffcff0b Changed UI label references 2018-03-17 14:36:23 -07:00
Chris Pham
3575fd7869 On click, should change input values now 2018-03-17 14:33:38 -07:00
Chris Pham
2c564c6ad4 Merge branch 'master' of https://github.com/OSURoboticsClub/Rover_2017_2018 2018-03-17 14:25:41 -07:00
Chris Pham
4b31146d0e Start settingup buttons 2018-03-17 14:25:38 -07:00
Corwin Perren
328c523d36 Merge branch 'master' of https://github.com/OSURoboticsClub/Rover_2017_2018 2018-03-17 14:25:12 -07:00
Corwin Perren
af23375b5e Updated gui element names. Fixed layout for right screen speed and imu area. 2018-03-17 14:24:43 -07:00
Chris Pham
9dc8bf4b7a click handers for qtable 2018-03-17 14:22:00 -07:00
Chris Pham
25cce55bf3 creating interface glue for waypoints 2018-03-17 12:47:06 -07:00
Corwin Perren
5f5fb8c1b5 Updated strings for status updates. Added settingssystems package and ubiquiti settings file. Allows for setting of the ubiquiti 2.4GHz channel from the GUI. Connected and working. 2018-03-15 23:46:05 -07:00
Corwin Perren
a88f5a6c58 Added keyfile copy. Tried to keep map from updating too much. Modified left screen UI. Split TCP topoics out to own senders/receivers. 2018-03-15 16:33:03 -07:00
Corwin Perren
b79d6ea8f1 Merge branch 'master' of https://github.com/OSURoboticsClub/Rover_2017_2018 2018-03-15 15:34:26 -07:00
Corwin Perren
3dd67cb982 Hard limited jetson statuses to once every five seconds. 2018-03-15 15:34:14 -07:00
Corwin Perren
566b436735 Ken fixed statuses. Chris got map indicator working. 2018-03-15 15:31:30 -07:00
Chris Pham
b52407a527 access data of QtTableItem 2018-03-15 12:17:15 -07:00
Chris Pham
cd6b3c5c03 change access method for QtTable 2018-03-15 12:15:05 -07:00
Chris Pham
c037758688 Element Logger 2018-03-15 12:11:26 -07:00
Chris Pham
0903aa65cc Change to float 2018-03-15 12:07:47 -07:00
Chris Pham
da514fa249 Merge branch 'master' of https://github.com/OSURoboticsClub/Rover_2017_2018 2018-03-15 12:04:09 -07:00
Chris Pham
cc859ef6e6 removed self.lat/long, waiting for GPS 2018-03-15 12:04:05 -07:00
Corwin Perren
9c1e2d801c Merge branch 'master' of https://github.com/OSURoboticsClub/Rover_2017_2018 2018-03-15 11:54:24 -07:00
Corwin Perren
594c5f4ecc Waypoint element padding changes. 2018-03-15 11:54:20 -07:00
Chris Pham
56373dfde2 Merge branch 'master' of https://github.com/OSURoboticsClub/Rover_2017_2018 2018-03-15 11:46:10 -07:00
Chris Pham
be3985c25d change map zoom 2018-03-15 11:46:06 -07:00
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
07666e9f4d Merge pull request #14 from captntuttle/master 
take out unused vars
 2018-03-15 11:29:13 -07:00
Ken Steinfeldt
ffef2711e9 take out unused vars 2018-03-15 11:28:34 -07:00
Ken Steinfeldt
0f34a54709 Merge pull request #13 from captntuttle/master 
fixes weird ui merge garbage
 2018-03-15 11:26:22 -07:00
Ken Steinfeldt
0e184fee3d fixes weird ui merge garbage 2018-03-15 11:25:46 -07:00
Corwin Perren
e973afa46c Fixed merge conflict on left_screen. 2018-03-15 11:14:00 -07:00
Corwin Perren
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