Skip to content

Commit 19738cd

Browse files
xnkevinnguyenxnkevinnguyen
authored
Merge branch 'dev' into users/t-xunguy/slider-refactor
2 parents d2d47e3 + 5eca6b4 commit 19738cd

1 file changed

Lines changed: 105 additions & 42 deletions

File tree

‎src/clue/adafruit_clue.py‎

Lines changed: 105 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,7 @@
5656
https://github.com/adafruit/Adafruit_CircuitPython_NeoPixel
5757
"""
5858

59-
from common.telemetry_events import TelemetryEvent
60-
from common.telemetry import telemetry_py
61-
from common import utils
59+
import common
6260
from base_circuitpython import base_cp_constants as CONSTANTS
6361
import neopixel
6462
import time
@@ -247,7 +245,9 @@ def button_a(self):
247245
if clue.button_a:
248246
print("Button A pressed")
249247
"""
250-
telemetry_py.send_telemetry(TelemetryEvent.CLUE_API_BUTTON_A)
248+
common.telemetry.telemetry_py.send_telemetry(
249+
common.telemetry_events.TelemetryEvent.CLUE_API_BUTTON_A
250+
)
251251
return self.__state[CONSTANTS.CLUE_STATE.BUTTON_A]
252252

253253
@property
@@ -261,7 +261,9 @@ def button_b(self):
261261
if clue.button_b:
262262
print("Button B pressed")
263263
"""
264-
telemetry_py.send_telemetry(TelemetryEvent.CLUE_API_BUTTON_B)
264+
common.telemetry.telemetry_py.send_telemetry(
265+
common.telemetry_events.TelemetryEvent.CLUE_API_BUTTON_B
266+
)
265267
return self.__state[CONSTANTS.CLUE_STATE.BUTTON_B]
266268

267269
@property
@@ -273,7 +275,9 @@ def were_pressed(self):
273275
while True:
274276
print(clue.were_pressed)
275277
"""
276-
telemetry_py.send_telemetry(TelemetryEvent.CLUE_API_WERE_PRESSED)
278+
common.telemetry.telemetry_py.send_telemetry(
279+
common.telemetry_events.TelemetryEvent.CLUE_API_WERE_PRESSED
280+
)
277281
ret = self.__state[CONSTANTS.CLUE_STATE.PRESSED_BUTTONS].copy()
278282
self.__state[CONSTANTS.CLUE_STATE.PRESSED_BUTTONS].clear()
279283
return ret
@@ -288,7 +292,9 @@ def acceleration(self):
288292
while True:
289293
print("Accel: {:.2f} {:.2f} {:.2f}".format(*clue.acceleration))
290294
"""
291-
telemetry_py.send_telemetry(TelemetryEvent.CLUE_API_ACCELERATION)
295+
common.telemetry.telemetry_py.send_telemetry(
296+
common.telemetry_events.TelemetryEvent.CLUE_API_ACCELERATION
297+
)
292298
return (
293299
self.__state[CONSTANTS.CLUE_STATE.MOTION_X],
294300
self.__state[CONSTANTS.CLUE_STATE.MOTION_Y],
@@ -307,7 +313,9 @@ def shake(self, shake_threshold=30, avg_count=10, total_delay=0.1):
307313
:param total_delay: The total time in seconds it takes to obtain avg_count
308314
readings from acceleration. (Default 0.1)
309315
"""
310-
telemetry_py.send_telemetry(TelemetryEvent.CLUE_API_SHAKE)
316+
common.telemetry.telemetry_py.send_telemetry(
317+
common.telemetry_events.TelemetryEvent.CLUE_API_SHAKE
318+
)
311319
is_shaken = self.__state[CONSTANTS.CLUE_STATE.GESTURE] == CONSTANTS.SHAKE
312320
return is_shaken
313321

@@ -322,7 +330,9 @@ def color(self):
322330
while True:
323331
print("Color: R: {} G: {} B: {} C: {}".format(*clue.color))
324332
"""
325-
telemetry_py.send_telemetry(TelemetryEvent.CLUE_API_COLOR)
333+
common.telemetry.telemetry_py.send_telemetry(
334+
common.telemetry_events.TelemetryEvent.CLUE_API_COLOR
335+
)
326336
return (
327337
self.__state[CONSTANTS.CLUE_STATE.LIGHT_R],
328338
self.__state[CONSTANTS.CLUE_STATE.LIGHT_G],
@@ -339,7 +349,9 @@ def temperature(self):
339349
from adafruit_clue import clue
340350
print("Temperature: {:.1f}C".format(clue.temperature))
341351
"""
342-
telemetry_py.send_telemetry(TelemetryEvent.CLUE_API_TEMPERATURE)
352+
common.telemetry.telemetry_py.send_telemetry(
353+
common.telemetry_events.TelemetryEvent.CLUE_API_TEMPERATURE
354+
)
343355
return self.__state[CONSTANTS.CLUE_STATE.TEMPERATURE]
344356

345357
@property
@@ -352,7 +364,9 @@ def magnetic(self):
352364
while True:
353365
print("Magnetic: {:.3f} {:.3f} {:.3f}".format(*clue.magnetic))
354366
"""
355-
telemetry_py.send_telemetry(TelemetryEvent.CLUE_API_MAGNETIC)
367+
common.telemetry.telemetry_py.send_telemetry(
368+
common.telemetry_events.TelemetryEvent.CLUE_API_MAGNETIC
369+
)
356370
return (
357371
self.__state[CONSTANTS.CLUE_STATE.MAGNET_X],
358372
self.__state[CONSTANTS.CLUE_STATE.MAGNET_Y],
@@ -370,7 +384,9 @@ def proximity(self):
370384
while True:
371385
print("Proximity: {}".format(clue.proximity))
372386
"""
373-
telemetry_py.send_telemetry(TelemetryEvent.CLUE_API_PROXIMITY)
387+
common.telemetry.telemetry_py.send_telemetry(
388+
common.telemetry_events.TelemetryEvent.CLUE_API_PROXIMITY
389+
)
374390
return self.__state[CONSTANTS.CLUE_STATE.PROXIMITY]
375391

376392
@property
@@ -379,7 +395,9 @@ def gyro(self):
379395
This example prints the values. Try moving the board to see how the printed values change.
380396
print("Gyro: {:.2f} {:.2f} {:.2f}".format(*clue.gyro))
381397
"""
382-
telemetry_py.send_telemetry(TelemetryEvent.CLUE_API_GYRO)
398+
common.telemetry.telemetry_py.send_telemetry(
399+
common.telemetry_events.TelemetryEvent.CLUE_API_GYRO
400+
)
383401
return (
384402
self.__state[CONSTANTS.CLUE_STATE.GYRO_X],
385403
self.__state[CONSTANTS.CLUE_STATE.GYRO_Y],
@@ -398,7 +416,9 @@ def gesture(self):
398416
while True:
399417
print("Gesture: {}".format(clue.gesture))
400418
"""
401-
telemetry_py.send_telemetry(TelemetryEvent.CLUE_API_GESTURE)
419+
common.telemetry.telemetry_py.send_telemetry(
420+
common.telemetry_events.TelemetryEvent.CLUE_API_GESTURE
421+
)
402422
gesture_mapping = {"": 0, "up": 1, "down": 2, "left": 3, "right": 4}
403423
return gesture_mapping.get(self.__state[CONSTANTS.CLUE_STATE.GESTURE], 0)
404424

@@ -412,7 +432,9 @@ def humidity(self):
412432
while True:
413433
print("Humidity: {:.1f}%".format(clue.humidity))
414434
"""
415-
telemetry_py.send_telemetry(TelemetryEvent.CLUE_API_HUMIDITY)
435+
common.telemetry.telemetry_py.send_telemetry(
436+
common.telemetry_events.TelemetryEvent.CLUE_API_HUMIDITY
437+
)
416438
return self.__state[CONSTANTS.CLUE_STATE.HUMIDITY]
417439

418440
@property
@@ -424,7 +446,9 @@ def pressure(self):
424446
from adafruit_clue import clue
425447
print("Pressure: {:.3f}hPa".format(clue.pressure))
426448
"""
427-
telemetry_py.send_telemetry(TelemetryEvent.CLUE_API_PRESSURE)
449+
common.telemetry.telemetry_py.send_telemetry(
450+
common.telemetry_events.TelemetryEvent.CLUE_API_PRESSURE
451+
)
428452
return self.__state[CONSTANTS.CLUE_STATE.PRESSURE]
429453

430454
@property
@@ -450,7 +474,9 @@ def altitude(self):
450474
POWER_CONSTANT,
451475
)
452476
)
453-
telemetry_py.send_telemetry(TelemetryEvent.CLUE_API_ALTITUDE)
477+
common.telemetry.telemetry_py.send_telemetry(
478+
common.telemetry_events.TelemetryEvent.CLUE_API_ALTITUDE
479+
)
454480
return altitude
455481

456482
@property
@@ -464,12 +490,16 @@ def sea_level_pressure(self):
464490
clue.sea_level_pressure = 1015
465491
print("Pressure: {:.3f}hPa".format(clue.pressure))
466492
"""
467-
telemetry_py.send_telemetry(TelemetryEvent.CLUE_API_SEA_LEVEL_PRESSURE)
493+
common.telemetry.telemetry_py.send_telemetry(
494+
common.telemetry_events.TelemetryEvent.CLUE_API_SEA_LEVEL_PRESSURE
495+
)
468496
return self.__state[CONSTANTS.CLUE_STATE.SEA_LEVEL_PRESSURE]
469497

470498
@sea_level_pressure.setter
471499
def sea_level_pressure(self, value):
472-
telemetry_py.send_telemetry(TelemetryEvent.CLUE_API_SEA_LEVEL_PRESSURE)
500+
common.telemetry.telemetry_py.send_telemetry(
501+
common.telemetry_events.TelemetryEvent.CLUE_API_SEA_LEVEL_PRESSURE
502+
)
473503
self.__state[CONSTANTS.CLUE_STATE.SEA_LEVEL_PRESSURE] = value
474504

475505
@property
@@ -482,7 +512,9 @@ def pixel(self):
482512
while True:
483513
clue.pixel.fill((255, 0, 255))
484514
"""
485-
telemetry_py.send_telemetry(TelemetryEvent.CLUE_API_PIXEL)
515+
common.telemetry.telemetry_py.send_telemetry(
516+
common.telemetry_events.TelemetryEvent.CLUE_API_PIXEL
517+
)
486518
return self.__state[CONSTANTS.CLUE_STATE.PIXEL]
487519

488520
@property
@@ -500,8 +532,10 @@ def touch_0(self):
500532
if clue.touch_0:
501533
print("Touched pad 0")
502534
"""
503-
telemetry_py.send_telemetry(TelemetryEvent.CLUE_API_TOUCH)
504-
utils.print_for_unimplemented_functions("touch_0")
535+
common.telemetry.telemetry_py.send_telemetry(
536+
common.telemetry_events.TelemetryEvent.CLUE_API_TOUCH
537+
)
538+
common.utils.print_for_unimplemented_functions("touch_0")
505539

506540
@property
507541
def touch_1(self):
@@ -518,8 +552,10 @@ def touch_1(self):
518552
if clue.touch_1:
519553
print("Touched pad 1")
520554
"""
521-
telemetry_py.send_telemetry(TelemetryEvent.CLUE_API_TOUCH)
522-
utils.print_for_unimplemented_functions("touch_1")
555+
common.telemetry.telemetry_py.send_telemetry(
556+
common.telemetry_events.TelemetryEvent.CLUE_API_TOUCH
557+
)
558+
common.utils.print_for_unimplemented_functions("touch_1")
523559

524560
@property
525561
def touch_2(self):
@@ -536,8 +572,10 @@ def touch_2(self):
536572
if clue.touch_2:
537573
print("Touched pad 2")
538574
"""
539-
telemetry_py.send_telemetry(TelemetryEvent.CLUE_API_TOUCH)
540-
utils.print_for_unimplemented_functions("touch_2")
575+
common.telemetry.telemetry_py.send_telemetry(
576+
common.telemetry_events.TelemetryEvent.CLUE_API_TOUCH
577+
)
578+
common.utils.print_for_unimplemented_functions("touch_2")
541579

542580
@property
543581
def white_leds(self):
@@ -550,12 +588,16 @@ def white_leds(self):
550588
from adafruit_clue import clue
551589
clue.white_leds = True
552590
"""
553-
telemetry_py.send_telemetry(TelemetryEvent.CLUE_API_WHITE_LEDS)
591+
common.telemetry.telemetry_py.send_telemetry(
592+
common.telemetry_events.TelemetryEvent.CLUE_API_WHITE_LEDS
593+
)
554594
return self.__state[CONSTANTS.CLUE_STATE.WHITE_LEDS]
555595

556596
@white_leds.setter
557597
def white_leds(self, value):
558-
telemetry_py.send_telemetry(TelemetryEvent.CLUE_API_WHITE_LEDS)
598+
common.telemetry.telemetry_py.send_telemetry(
599+
common.telemetry_events.TelemetryEvent.CLUE_API_WHITE_LEDS
600+
)
559601
self.__set_leds(CONSTANTS.CLUE_STATE.WHITE_LEDS, value)
560602

561603
@property
@@ -569,12 +611,16 @@ def red_led(self):
569611
from adafruit_clue import clue
570612
clue.red_led = True
571613
"""
572-
telemetry_py.send_telemetry(TelemetryEvent.CLUE_API_RED_LED)
614+
common.telemetry.telemetry_py.send_telemetry(
615+
common.telemetry_events.TelemetryEvent.CLUE_API_RED_LED
616+
)
573617
return self.__state[CONSTANTS.CLUE_STATE.RED_LED]
574618

575619
@red_led.setter
576620
def red_led(self, value):
577-
telemetry_py.send_telemetry(TelemetryEvent.CLUE_API_RED_LED)
621+
common.telemetry.telemetry_py.send_telemetry(
622+
common.telemetry_events.TelemetryEvent.CLUE_API_RED_LED
623+
)
578624
self.__set_leds(CONSTANTS.CLUE_STATE.RED_LED, value)
579625

580626
def play_tone(self, frequency, duration):
@@ -591,8 +637,10 @@ def play_tone(self, frequency, duration):
591637
from adafruit_clue import clue
592638
clue.play_tone(880, 1)
593639
"""
594-
telemetry_py.send_telemetry(TelemetryEvent.CLUE_API_SOUND)
595-
utils.print_for_unimplemented_functions(Clue.play_tone.__name__)
640+
common.telemetry.telemetry_py.send_telemetry(
641+
common.telemetry_events.TelemetryEvent.CLUE_API_SOUND
642+
)
643+
common.utils.print_for_unimplemented_functions(Clue.play_tone.__name__)
596644

597645
def start_tone(self, frequency):
598646
""" Not Implemented!
@@ -614,8 +662,10 @@ def start_tone(self, frequency):
614662
else:
615663
clue.stop_tone()
616664
"""
617-
telemetry_py.send_telemetry(TelemetryEvent.CLUE_API_SOUND)
618-
utils.print_for_unimplemented_functions(Clue.start_tone.__name__)
665+
common.telemetry.telemetry_py.send_telemetry(
666+
common.telemetry_events.TelemetryEvent.CLUE_API_SOUND
667+
)
668+
common.utils.print_for_unimplemented_functions(Clue.start_tone.__name__)
619669

620670
def stop_tone(self):
621671
""" Not Implemented!
@@ -635,8 +685,10 @@ def stop_tone(self):
635685
else:
636686
clue.stop_tone()
637687
"""
638-
telemetry_py.send_telemetry(TelemetryEvent.CLUE_API_SOUND)
639-
utils.print_for_unimplemented_functions(Clue.stop_tone.__name__)
688+
common.telemetry.telemetry_py.send_telemetry(
689+
common.telemetry_events.TelemetryEvent.CLUE_API_SOUND
690+
)
691+
common.utils.print_for_unimplemented_functions(Clue.stop_tone.__name__)
640692

641693
@property
642694
def sound_level(self):
@@ -651,8 +703,10 @@ def sound_level(self):
651703
while True:
652704
print(clue.sound_level)
653705
"""
654-
telemetry_py.send_telemetry(TelemetryEvent.CLUE_API_SOUND)
655-
utils.print_for_unimplemented_functions("sound_level")
706+
common.telemetry.telemetry_py.send_telemetry(
707+
common.telemetry_events.TelemetryEvent.CLUE_API_SOUND
708+
)
709+
common.utils.print_for_unimplemented_functions("sound_level")
656710

657711
def loud_sound(self, sound_threshold=200):
658712
"""Not Implemented!
@@ -684,8 +738,10 @@ def loud_sound(self, sound_threshold=200):
684738
else:
685739
clue.pixel.fill(0)
686740
"""
687-
telemetry_py.send_telemetry(TelemetryEvent.CLUE_API_SOUND)
688-
utils.print_for_unimplemented_functions(Clue.loud_sound.__name__)
741+
common.telemetry.telemetry_py.send_telemetry(
742+
common.telemetry_events.TelemetryEvent.CLUE_API_SOUND
743+
)
744+
common.utils.print_for_unimplemented_functions(Clue.loud_sound.__name__)
689745

690746
@staticmethod
691747
def simple_text_display(
@@ -745,7 +801,9 @@ def simple_text_display(
745801
clue_data[2].text = "Magnetic: {:.3f} {:.3f} {:.3f}".format(*clue.magnetic)
746802
clue_data.show()
747803
"""
748-
telemetry_py.send_telemetry(TelemetryEvent.CLUE_API_TEXT_DISPLAY)
804+
common.telemetry.telemetry_py.send_telemetry(
805+
common.telemetry_events.TelemetryEvent.CLUE_API_TEXT_DISPLAY
806+
)
749807
return _ClueSimpleTextDisplay(
750808
title=title,
751809
title_color=title_color,
@@ -775,7 +833,12 @@ def __set_leds(self, led, value):
775833
value = bool(value)
776834
self.__state[led] = value
777835
sendable_json = {led: value}
778-
utils.send_to_simulator(sendable_json, CONSTANTS.CLUE)
836+
if common.utils.debug_mode:
837+
common.debugger_communication_client.debug_send_to_simulator(
838+
sendable_json, CONSTANTS.CLUE
839+
)
840+
else:
841+
common.utils.send_to_simulator(sendable_json, CONSTANTS.CLUE)
779842

780843

781844
clue = Clue() # pylint: disable=invalid-name

0 commit comments

Comments
 (0)