diff --git a/software/ros_packages/ground_station/src/Resources/Ui/left_screen.ui b/software/ros_packages/ground_station/src/Resources/Ui/left_screen.ui index c43eaea..ac1d018 100644 --- a/software/ros_packages/ground_station/src/Resources/Ui/left_screen.ui +++ b/software/ros_packages/ground_station/src/Resources/Ui/left_screen.ui @@ -68,401 +68,530 @@ - - - - - 0 - 0 - - - - - 0 - 0 - - - - - 9999999 - 9999999 - - - - - 10 - 75 - true - - - - false - - - QLabel{ - color: #868685; -} - - - Main Nav Cam Connected - - - Qt::AlignCenter - - - - - - - - 0 - 0 - - - - - 0 - 0 - - - - - 9999999 - 9999999 - - - - - 10 - 75 - true - - - - QLabel{ - color: #868685; -} - - - QFrame::NoFrame - - - ZED Connected - - - Qt::AlignCenter - - - - - - - - 0 - 0 - - - - - 0 - 0 - - - - - 9999999 - 9999999 - - - - - 10 - 75 - true - - - - QLabel{ - color: #868685; -} - - - QFrame::NoFrame - - - Rover Connected - - - Qt::AlignCenter - - - - - - - - 0 - 0 - - - - - 0 - 0 - - - - - 9999999 - 9999999 - - - - - 0 - 0 - - - - - 10 - 75 - true - - - - QLabel{ - color: #868685; -} - - - FrSky Connected - - - Qt::AlignCenter - - - - - - - - 0 - 0 - - - - - 0 - 0 - - - - - 9999999 - 9999999 - - - - - 10 - 75 - true - - - - QLabel{ - color: #868685; -} - - - QFrame::NoFrame - - - Chassis Cam Connected - - - Qt::AlignCenter - - - - - - - - 0 - 0 - - - - - 0 - 0 - - - - - 9999999 - 9999999 - - - - - 10 - 75 - true - - - - false - - - QLabel{ - color: #868685; -} - - - Undercarriage Cam Connected - - - Qt::AlignCenter - - - - - - - - 0 - 0 - - - - - 0 - 0 - - - - - 9999999 - 9999999 - - - - - 10 - 75 - true - - - - false - - - QLabel{ - color: #868685; -} - - - 3D Nav Mouse Connected - - - Qt::AlignCenter - - - - - - - - 0 - 0 - - - - - 0 - 0 - - - - - 9999999 - 9999999 - - - - - 0 - 0 - - - - - 10 - 75 - true - - - - QLabel{ - color: #868685; -} - - - Bogie Group 1 Connected - - - Qt::AlignCenter - - - - - - - - 0 - 0 - - - - - 0 - 0 - - - - - 9999999 - 9999999 - - - - - 0 - 0 - - - - - 10 - 75 - true - - - - QLabel{ - color: #868685; -} - - - Bogie Group 2 Connected - - - Qt::AlignCenter - - + + 0 + + + 0 + + + + + 0 + + + + + + 0 + 0 + + + + + 0 + 0 + + + + + 9999999 + 9999999 + + + + + 10 + 75 + true + + + + background-color:darkgreen; + + + QFrame::NoFrame + + + Left Bogie +Connected + + + Qt::AlignCenter + + + + + + + + 0 + 0 + + + + + 0 + 0 + + + + + 9999999 + 9999999 + + + + + 0 + 0 + + + + + 10 + 75 + true + + + + background-color:darkgreen; + + + FrSky +Connected + + + Qt::AlignCenter + + + + + + + + 0 + 0 + + + + + 0 + 0 + + + + + 9999999 + 9999999 + + + + + 10 + 75 + true + + + + false + + + background-color:darkgreen; + + + Right Bogie +Connected + + + Qt::AlignCenter + + + + + + + + 0 + 0 + + + + + 0 + 0 + + + + + 9999999 + 9999999 + + + + + 10 + 75 + true + + + + false + + + background-color:darkgreen; + + + GPS +Fix + + + Qt::AlignCenter + + + + + + + + 0 + 0 + + + + + 0 + 0 + + + + + 9999999 + 9999999 + + + + + 10 + 75 + true + + + + background-color:darkgreen; + + + QFrame::NoFrame + + + Logitech Joystick +Connected + + + Qt::AlignCenter + + + + + + + + 0 + 0 + + + + + 0 + 0 + + + + + 9999999 + 9999999 + + + + + 10 + 75 + true + + + + background-color:darkgreen; + + + QFrame::NoFrame + + + Rear Bogie +Connected + + + Qt::AlignCenter + + + + + + + + 0 + 0 + + + + + 0 + 0 + + + + + 9999999 + 9999999 + + + + + 10 + 75 + true + + + + background-color:darkgreen; + + + QFrame::NoFrame + + + Rover +Connected + + + Qt::AlignCenter + + + + + + + + 0 + 0 + + + + + 0 + 0 + + + + + 9999999 + 9999999 + + + + + 10 + 75 + true + + + + false + + + background-color:darkgreen; + + + 3D Nav Mouse +Connected + + + Qt::AlignCenter + + + + + + + + 0 + 0 + + + + + 0 + 0 + + + + + 9999999 + 9999999 + + + + + 10 + 75 + true + + + + background-color:darkred; + + + QFrame::NoFrame + + + ZED Connected + + + Qt::AlignCenter + + + + + + + + 0 + 0 + + + + + 0 + 0 + + + + + 9999999 + 9999999 + + + + + 10 + 75 + true + + + + background-color:darkgreen; + + + QFrame::NoFrame + + + Main Nav Camera +Connected + + + Qt::AlignCenter + + + + + + + + 0 + 0 + + + + + 0 + 0 + + + + + 9999999 + 9999999 + + + + + 0 + 0 + + + + + 10 + 75 + true + + + + background-color:darkgreen; + + + Chassis Camera +Connected + + + Qt::AlignCenter + + + + + + + + 0 + 0 + + + + + 0 + 0 + + + + + 9999999 + 9999999 + + + + + 0 + 0 + + + + + 10 + 75 + true + + + + background-color:darkgreen; + + + Undercarriage Camera +Connected + + + Qt::AlignCenter + + + + @@ -490,15 +619,68 @@ 0 - - - Autonomy - - - Recording + ROSBAG Recording + + + + + Camera Recording + + + + + + + Start + + + + + + + Control Recording + + + + + + + Navigation Recording + + + + + + + Statuses Recording + + + + + + + Start + + + + + + + Start + + + + + + + Start + + + + @@ -571,6 +753,75 @@ 0 + + + + + + + 12 + 75 + true + + + + Manual Waypoint Entry + + + + + + + + + Lattitude + + + + + + + + + + Longitude + + + + + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + 18 + 75 + true + + + + ENABLE AUTONOMY + + + + + diff --git a/software/ros_packages/ground_station/src/Resources/Ui/right_screen.ui b/software/ros_packages/ground_station/src/Resources/Ui/right_screen.ui index de7a2c0..44a668e 100644 --- a/software/ros_packages/ground_station/src/Resources/Ui/right_screen.ui +++ b/software/ros_packages/ground_station/src/Resources/Ui/right_screen.ui @@ -75,6 +75,9 @@ 720 + + background-color:black; +