aboutsummaryrefslogtreecommitdiff
path: root/parrot_zik
diff options
context:
space:
mode:
authorm0sia <m0sia@m0sia.ru>2016-09-29 17:23:09 -0500
committerGitHub <noreply@github.com>2016-09-29 17:23:09 -0500
commit584ee9d17d5d5bc0d0b85874e9047b0a0a843a38 (patch)
tree80f01676afed22f51ee0da1823b45e2398e55f03 /parrot_zik
parentd588e452632aa520b33bccd88e012fbc6ce126e5 (diff)
parent6de3b100d572ae3679665d85c83d6f02ff175233 (diff)
downloadpyParrotZikTCP-584ee9d17d5d5bc0d0b85874e9047b0a0a843a38.tar.xz
pyParrotZikTCP-584ee9d17d5d5bc0d0b85874e9047b0a0a843a38.zip
Merge pull request #16 from moimadmax/master
Typo Noise Calcelation -> Cancelation
Diffstat (limited to 'parrot_zik')
-rw-r--r--parrot_zik/bluetooth_paired_devices.py3
-rw-r--r--parrot_zik/interface/version2.py6
2 files changed, 5 insertions, 4 deletions
diff --git a/parrot_zik/bluetooth_paired_devices.py b/parrot_zik/bluetooth_paired_devices.py
index 905819f..ba9ac9d 100644
--- a/parrot_zik/bluetooth_paired_devices.py
+++ b/parrot_zik/bluetooth_paired_devices.py
@@ -126,7 +126,8 @@ def connect():
name="Parrot RFcomm service", addr=mac)
else:
uuids = ["0ef0f502-f0ee-46c9-986c-54ed027807fb",
- "8B6814D3-6CE7-4498-9700-9312C1711F63"]
+ "8B6814D3-6CE7-4498-9700-9312C1711F63",
+ "8B6814D3-6CE7-4498-9700-9312C1711F64"]
service_matches = []
for uuid in uuids:
try:
diff --git a/parrot_zik/interface/version2.py b/parrot_zik/interface/version2.py
index e6076ed..e3ad474 100644
--- a/parrot_zik/interface/version2.py
+++ b/parrot_zik/interface/version2.py
@@ -21,7 +21,7 @@ class ParrotZikVersion2Interface(ParrotZikBaseInterface):
self.noise_cancelation.set_submenu(self.noise_cancelation_submenu)
self.noise_control_cancelation_max = MenuItem(
- "Max Calcelation", functools.partial(
+ "Max Cancelation", functools.partial(
self.toggle_noise_cancelation,
NoiseControlTypes.NOISE_CONTROL_MAX), checkitem=True)
self.noise_control_cancelation_on = MenuItem(
@@ -209,10 +209,10 @@ class ParrotZikVersion2Interface(ParrotZikBaseInterface):
for angle, menu_item in angle_to_menuitem_map:
menu_item.set_active(angle == active_angle)
- def toggle_noise_cancelation(self, noise_calcelation, widget):
+ def toggle_noise_cancelation(self, noise_cancelation, widget):
try:
if not self.noise_cancelation_dirty:
- self.parrot.noise_control = noise_calcelation
+ self.parrot.noise_control = noise_cancelation
self.noise_cancelation_dirty = True
self._read_noise_cancelation()
self.noise_cancelation_dirty = False