rixty/OpenVoiceOS
1
1
Fork 0
mirror of https://github.com/OpenVoiceOS/OpenVoiceOS synced 2025-06-05 22:19:21 +02:00
Code Issues Releases Wiki Activity

MycroftOS: Remove framebuffer screen from enclosure skill.

Browse Source 
- This make testing the splash easier.
This commit is contained in:
Peter Steenbergen
2020-04-20 13:54:24 +02:00
parent 441c69fd06
commit 22c8c79444
1 changed files with 22 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroftos-enclosure-skill/__init__.py
View File

@ -169,19 +169,19 @@ class MycroftOS(MycroftSkill):
def on_handler_audio_start(self, message): def on_handler_audio_start(self, message):
self.speaking = True self.speaking = True
#framebuffer speaking visual #framebuffer speaking visual
os.system('fbv -f -d 1 /opt/mycroft/skills/mycroftos-enclosure-skill/ui/speaking.png > /dev/null 2>&1') #os.system('fbv -f -d 1 /opt/mycroft/skills/mycroftos-enclosure-skill/ui/speaking.png > /dev/null 2>&1')
def on_handler_audio_end(self, message): def on_handler_audio_end(self, message):
self.speaking = False self.speaking = False
#framebuffer background #framebuffer background
os.system('fbv -f -d 1 /opt/mycroft/skills/mycroftos-enclosure-skill/ui/background.png > /dev/null 2>&1') #os.system('fbv -f -d 1 /opt/mycroft/skills/mycroftos-enclosure-skill/ui/background.png > /dev/null 2>&1')
def on_handler_started(self, message): def on_handler_started(self, message):
handler = message.data.get('handler', '') handler = message.data.get('handler', '')
if self._skip_handler(handler): if self._skip_handler(handler):
return return
#framebuffer thinking visual #framebuffer thinking visual
os.system('fbv -f -d 1 /opt/mycroft/skills/mycroftos-enclosure-skill/ui/thinking.png > /dev/null 2>&1') #os.system('fbv -f -d 1 /opt/mycroft/skills/mycroftos-enclosure-skill/ui/thinking.png > /dev/null 2>&1')
def on_handler_complete(self, message): def on_handler_complete(self, message):
handler = message.data.get('handler', '') handler = message.data.get('handler', '')
@ -192,7 +192,7 @@ class MycroftOS(MycroftSkill):
# turn off the framebuffer # turn off the framebuffer
if not self.speaking: if not self.speaking:
#framebuffer background #framebuffer background
os.system('fbv -f -d 1 /opt/mycroft/skills/mycroftos-enclosure-skill/ui/background.png > /dev/null 2>&1') #os.system('fbv -f -d 1 /opt/mycroft/skills/mycroftos-enclosure-skill/ui/background.png > /dev/null 2>&1')
def _skip_handler(self, handler): def _skip_handler(self, handler):
#Ignoring handlers from this skill #Ignoring handlers from this skill
@ -200,15 +200,15 @@ class MycroftOS(MycroftSkill):
def handle_listener_started(self, message): def handle_listener_started(self, message):
#framebuffer listen visual #framebuffer listen visual
os.system('fbv -f -d 1 /opt/mycroft/skills/mycroftos-enclosure-skill/ui/listen.png > /dev/null 2>&1') #os.system('fbv -f -d 1 /opt/mycroft/skills/mycroftos-enclosure-skill/ui/listen.png > /dev/null 2>&1')
def handle_listener_ended(self, message): def handle_listener_ended(self, message):
#framebuffer background #framebuffer background
os.system('fbv -f -d 1 /opt/mycroft/skills/mycroftos-enclosure-skill/ui/background.png > /dev/null 2>&1') #os.system('fbv -f -d 1 /opt/mycroft/skills/mycroftos-enclosure-skill/ui/background.png > /dev/null 2>&1')
def handle_failed_stt(self, message): def handle_failed_stt(self, message):
#framebuffer background #framebuffer background
os.system('fbv -f -d 1 /opt/mycroft/skills/mycroftos-enclosure-skill/ui/background.png > /dev/null 2>&1') #os.system('fbv -f -d 1 /opt/mycroft/skills/mycroftos-enclosure-skill/ui/background.png > /dev/null 2>&1')
# Device is fully started # Device is fully started
@ -216,7 +216,7 @@ class MycroftOS(MycroftSkill):
"""Triggered after skills are initialized.""" """Triggered after skills are initialized."""
self.loading = False self.loading = False
if is_paired(): if is_paired():
os.system('fbv -f -d 1 /opt/mycroft/skills/mycroftos-enclosure-skill/ui/background.png > /dev/null 2>&1') #os.system('fbv -f -d 1 /opt/mycroft/skills/mycroftos-enclosure-skill/ui/background.png > /dev/null 2>&1')
self.speak_dialog('finished.booting') self.speak_dialog('finished.booting')
@ -233,20 +233,26 @@ class MycroftOS(MycroftSkill):
# System services # System services
def enable_ssh(self): def enable_ssh(self):
os.system('sudo systemctl enable sshd.service')
os.system('sudo systemctl start sshd.service')
self.settings['sshd'] = True self.settings['sshd'] = True
self.sshd_enabled = True if !os.path.isfile('/etc/systemd/system/multi-user.target.wants/sshd.service'):
self.sshd_started = True # Service not yet enabled
os.system('sudo systemctl enable sshd.service')
self.speak_dialog('EnabledSSH') self.speak_dialog('EnabledSSH')
if os.system('sudo systemctl is-active --quiet sshd.service') != 0:
# Service not currently running
os.system('sudo systemctl start sshd.service')
def disable_ssh(self): def disable_ssh(self):
os.system('sudo systemctl disable sshd.service')
os.system('sudo systemctl stop sshd.service')
self.settings['sshd'] = False self.settings['sshd'] = False
if os.path.isfile('/etc/systemd/system/multi-user.target.wants/sshd.service'):
# Service is enabled
os.system('sudo systemctl disable sshd.service')
self.speak_dialog('DisabledSSH')
os.system('sudo systemctl stop sshd.service')
self.sshd_enabled = False self.sshd_enabled = False
self.sshd_started = True self.sshd_started = True
self.speak_dialog('DisabledSSH')
def enable_airplay(self): def enable_airplay(self):
os.system('sudo systemctl enable shairport-sync.service') os.system('sudo systemctl enable shairport-sync.service')