MycroftAI
/
mycroft-core
mirror of https://github.com/MycroftAI/mycroft-core.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix merge issue

feature/mark-2-boot
Michael Hansen 2021-12-31 12:39:55 -05:00
parent abab1e9bda
commit d9872c232e
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
mycroft/client/enclosure/mark2/interface.py
View File

@ -187,7 +187,6 @@ class EnclosureMark2(Enclosure):
self.temperatureMonitorThread.start() self.temperatureMonitorThread.start()
self.hardware.leds.set_leds( self.hardware.leds.set_leds(
[ [
self.hardware.palette.BLACK, self.hardware.palette.BLACK,
self.hardware.palette.BLACK, self.hardware.palette.BLACK,
@ -211,7 +210,8 @@ class EnclosureMark2(Enclosure):
if self.hardware.switches.SW_MUTE == 1: if self.hardware.switches.SW_MUTE == 1:
mute_led_color = self.hardware.palette.RED mute_led_color = self.hardware.palette.RED
self.hardware.leds._set_led_with_brightness(self.mute_led, mute_led_color, 1.0 self.hardware.leds._set_led_with_brightness(
self.mute_led, mute_led_color, 1.0
) )
self.default_caps = EnclosureCapabilities() self.default_caps = EnclosureCapabilities()
@ -316,9 +316,7 @@ class EnclosureMark2(Enclosure):
# TODO duck it anyway using set vol # TODO duck it anyway using set vol
# LOG.warning("Mark2 volume duck deprecated! use volume set instead.") # LOG.warning("Mark2 volume duck deprecated! use volume set instead.")
# TODO make configurable 'duck_vol' # TODO make configurable 'duck_vol'
# self.hardware.hardware_volume.set_volume( # self.hardware.hardware_volume.set_volume(float(0.1))
float(0.1)
)
# Use amixer in volume skill to avoid AGC issue. # Use amixer in volume skill to avoid AGC issue.
pass pass
@ -350,7 +348,8 @@ class EnclosureMark2(Enclosure):
self.current_volume = self.current_volume / 10 self.current_volume = self.current_volume / 10
LOG.info(f"Current volume {self.current_volume}") LOG.info(f"Current volume {self.current_volume}")
self.bus.emit( self.bus.emit(
message.response(data={"percent": self.current_volume, "muted": False} message.response(
data={"percent": self.current_volume, "muted": False}
) )
) )