Skip to content

Commit 48cc2fe

Browse files
authored
Merge pull request #776 from bitcraze/Aris/supervisor_updates
Migrated platform commands to supervisor
2 parents 79caa7c + 6687bf0 commit 48cc2fe

3 files changed

Lines changed: 7 additions & 7 deletions

File tree

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ classifiers = [
3737
requires-python = ">= 3.10"
3838

3939
dependencies = [
40-
"cflib~=0.1.31",
40+
"cflib @ git+https://github.com/bitcraze/crazyflie-lib-python.git@153248591ec26f2206d4c029a174f10c8aaaedda",
4141
"setuptools",
4242
"appdirs~=1.4.0",
4343
"pyzmq~=26.0",

src/cfclient/ui/main.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -564,7 +564,7 @@ def _emergency_stop(self):
564564
if (self.uiState == UIState.CONNECTED):
565565
# Send both emergency stop and disarm
566566
# TODO krri Disarm?
567-
self.cf.loc.send_emergency_stop()
567+
self.cf.supervisor.send_emergency_stop()
568568

569569
def _update_battery(self, timestamp, data, logconf):
570570
self.batteryBar.setValue(int(data["pm.vbat"] * 1000))

src/cfclient/ui/tabs/FlightTab.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -609,21 +609,21 @@ def emergencyStopStringWithText(self, text):
609609
def updateEmergencyStop(self, emergencyStop):
610610
if emergencyStop:
611611
self.setMotorLabelsEnabled(False)
612-
self._helper.cf.loc.send_emergency_stop()
612+
self._helper.cf.supervisor.send_emergency_stop()
613613
# TODO krri disarm?
614614
else:
615615
self.setMotorLabelsEnabled(True)
616616

617617
def updateArm(self, from_controller=False):
618618
if self._is_flying() and not from_controller:
619-
self._helper.cf.loc.send_emergency_stop()
619+
self._helper.cf.supervisor.send_emergency_stop()
620620
elif self._is_crashed():
621-
self._helper.cf.platform.send_crash_recovery_request()
621+
self._helper.cf.supervisor.send_crash_recovery_request()
622622
elif self._is_armed():
623-
self._helper.cf.platform.send_arming_request(False)
623+
self._helper.cf.supervisor.send_arming_request(False)
624624
elif self._can_arm():
625625
self.armButton.setStyleSheet("background-color: orange")
626-
self._helper.cf.platform.send_arming_request(True)
626+
self._helper.cf.supervisor.send_arming_request(True)
627627

628628
def flightmodeChange(self, item):
629629
Config().set("flightmode", str(self.flightModeCombo.itemText(item)))

0 commit comments

Comments
 (0)