I broke the gamepad and fixed it

pycrocart/PyCroCart.py

@@ -61,7 +61,7 @@ if __name__ == '__main__':
     app = QApplication(sys.argv)
 
     cf1 = CrazyflieProtoConnection()
-    uri = 'radio://0/80/2M/E7E7E7E7E7'
+    uri = 'radio://0/20/2M/E7E7E7E7E7'
     cf1.connect(uri)
     cf1.scf.cf.commander = uCartCommander.Commander(cf1.scf.cf)
 

pycrocart/SetpointMenu.py

@@ -173,13 +173,16 @@ class SetpointMenu(QWidget):
                     else:
                         self.setpoint_handler.setRateMode()
 
-            yaw = self.cap_max_value(yaw, 20, -20)
-            pitch = self.cap_max_value(pitch, 5, -5)
-            roll = self.cap_max_value(roll, 5, -5)
-
-            # If you are a flypi do this
-            thrust = thrust + 100
-            thrust = self.cap_max_value(thrust, 340, 240)
+            if self.gamepad_button.isChecked():
+                yaw = self.cap_max_value(yaw, 20, -20)
+                pitch = self.cap_max_value(pitch, 5, -5)
+                roll = self.cap_max_value(roll, 5, -5)
+
+                # If you are a flypi do this
+                thrust = thrust + 240
+                thrust = self.cap_max_value(thrust, 340, 240)
+                print("thrust")
+                print(thrust)
 
             # otherwise don't..... but I'm not changing that rn
 

pycrocart/logging_variables.json

@@ -2,12 +2,7 @@
     "group1":
     {
         "update_frequency_ms": 50,
-        "vars": ["ctrlStdnt.msrdPitchRate", "ctrlStdnt.dsirdPitchRate", "stateEstimate.roll", "stateEstimate.yaw", "ctrlStdnt.desiredPitch"]
-    },
-    "group2":
-    {
-	"update_frequency_ms": 50,
-        "vars": ["ctrlStdnt.cmd_thrust", "ctrlStdnt.cmd_roll", "ctrlStdnt.cmd_pitch", "stateEstimate.pitch", "ctrlStdnt.cmd_yaw"]
+        "vars": ["stateEstimate.roll", "stateEstimate.yaw", "stateEstimate.pitch"]
     },
     "group3":
     {