diff --git a/buildroot-external/configs/rpi3_64-gui_defconfig b/buildroot-external/configs/rpi3_64-gui_defconfig index 777e9a60..ca016af4 100644 --- a/buildroot-external/configs/rpi3_64-gui_defconfig +++ b/buildroot-external/configs/rpi3_64-gui_defconfig @@ -354,7 +354,6 @@ BR2_PACKAGE_PYTHON_ARROW=y BR2_PACKAGE_PYTHON_AUTOBAHN=y BR2_PACKAGE_PYTHON_CHERRYPY=y BR2_PACKAGE_PYTHON_COLORAMA=y -BR2_PACKAGE_PYTHON_COLORZERO=y BR2_PACKAGE_PYTHON_CONFIGSHELL_FB=y BR2_PACKAGE_PYTHON_DAEMONIZE=y BR2_PACKAGE_PYTHON_DBUS_NEXT=y @@ -365,6 +364,7 @@ BR2_PACKAGE_PYTHON_FLASK_JSONRPC=y BR2_PACKAGE_PYTHON_FLASK_LOGIN=y BR2_PACKAGE_PYTHON_FLASK_SQLALCHEMY=y BR2_PACKAGE_PYTHON_FLATBUFFERS=y +BR2_PACKAGE_PYTHON_GPIOZERO=y BR2_PACKAGE_PYTHON_HUMANIZE=y BR2_PACKAGE_PYTHON_JSON_SCHEMA_VALIDATOR=y BR2_PACKAGE_PYTHON_JSONMODELS=y @@ -381,7 +381,6 @@ BR2_PACKAGE_PYTHON_PIP=y BR2_PACKAGE_PYTHON_PSUTIL=y BR2_PACKAGE_PYTHON_PYJWT=y BR2_PACKAGE_PYTHON_PYUDEV=y -BR2_PACKAGE_PYTHON_RPI_GPIO=y BR2_PACKAGE_PYTHON_RPI_WS281X=y BR2_PACKAGE_PYTHON_SDNOTIFY=y BR2_PACKAGE_PYTHON_SERIAL=y diff --git a/buildroot-external/configs/rpi4_64-gui_defconfig b/buildroot-external/configs/rpi4_64-gui_defconfig index fad7bc27..5de423ac 100644 --- a/buildroot-external/configs/rpi4_64-gui_defconfig +++ b/buildroot-external/configs/rpi4_64-gui_defconfig @@ -354,7 +354,6 @@ BR2_PACKAGE_PYTHON_ARROW=y BR2_PACKAGE_PYTHON_AUTOBAHN=y BR2_PACKAGE_PYTHON_CHERRYPY=y BR2_PACKAGE_PYTHON_COLORAMA=y -BR2_PACKAGE_PYTHON_COLORZERO=y BR2_PACKAGE_PYTHON_CONFIGSHELL_FB=y BR2_PACKAGE_PYTHON_DAEMONIZE=y BR2_PACKAGE_PYTHON_DBUS_NEXT=y @@ -365,6 +364,7 @@ BR2_PACKAGE_PYTHON_FLASK_JSONRPC=y BR2_PACKAGE_PYTHON_FLASK_LOGIN=y BR2_PACKAGE_PYTHON_FLASK_SQLALCHEMY=y BR2_PACKAGE_PYTHON_FLATBUFFERS=y +BR2_PACKAGE_PYTHON_GPIOZERO=y BR2_PACKAGE_PYTHON_HUMANIZE=y BR2_PACKAGE_PYTHON_JSON_SCHEMA_VALIDATOR=y BR2_PACKAGE_PYTHON_JSONMODELS=y @@ -381,7 +381,6 @@ BR2_PACKAGE_PYTHON_PIP=y BR2_PACKAGE_PYTHON_PSUTIL=y BR2_PACKAGE_PYTHON_PYJWT=y BR2_PACKAGE_PYTHON_PYUDEV=y -BR2_PACKAGE_PYTHON_RPI_GPIO=y BR2_PACKAGE_PYTHON_RPI_WS281X=y BR2_PACKAGE_PYTHON_SDNOTIFY=y BR2_PACKAGE_PYTHON_SERIAL=y diff --git a/buildroot-external/rootfs-overlay/etc/mycroft/mycroft.conf b/buildroot-external/rootfs-overlay/etc/mycroft/mycroft.conf index 3d7187cf..edb87dd2 100644 --- a/buildroot-external/rootfs-overlay/etc/mycroft/mycroft.conf +++ b/buildroot-external/rootfs-overlay/etc/mycroft/mycroft.conf @@ -1,9 +1,18 @@ { - "ready_settings": ["setup", "skills"], + "ready_settings": ["pairing", "skills", "internet"], "confirm_listening": true, "play_wav_cmdline": "paplay %1", "play_mp3_cmdline": "mpg123 %1", "ipc_path": "/dev/shm/mycroft/ipc/", + "network_tests": { + "ip_url": "https://api.ipify.org", + "dns_primary": "1.1.1.1", + "dns_secondary": "8.8.8.8", + "web_url": "http://nmcheck.gnome.org/check_network_status.txt", + "web_url_secondary": "https://checkonline.home-assistant.io/online.txt", + "captive_portal_url": "http://nmcheck.gnome.org/check_network_status.txt", + "captive_portal_text": "NetworkManager is online" + }, "gui": { "extension": "smartspeaker", "idle_display_skill": "skill-ovos-homescreen.openvoiceos" @@ -55,5 +64,5 @@ } } }, - "log_level": "INFO" + "log_level": "DEBUG" } diff --git a/buildroot-external/rootfs-overlay/usr/lib/systemd/user/mycroft-audio.service b/buildroot-external/rootfs-overlay/usr/lib/systemd/user/mycroft-audio.service index 4ed990d5..df8eb618 100644 --- a/buildroot-external/rootfs-overlay/usr/lib/systemd/user/mycroft-audio.service +++ b/buildroot-external/rootfs-overlay/usr/lib/systemd/user/mycroft-audio.service @@ -8,7 +8,8 @@ After=pulseaudio.service [Service] Type=notify ExecStart=/usr/libexec/mycroft-systemd-audio -StandardOutput=null +StandardOutput=append:/var/log/mycroft/audio.log +StandardError=append:/var/log/mycroft/audio.error.log TimeoutStartSec=1m TimeoutStopSec=1m Restart=on-failure diff --git a/buildroot-external/rootfs-overlay/usr/lib/systemd/user/mycroft-enclosure-gui.service b/buildroot-external/rootfs-overlay/usr/lib/systemd/user/mycroft-enclosure-gui.service index 4b27f889..e5e0a5bc 100644 --- a/buildroot-external/rootfs-overlay/usr/lib/systemd/user/mycroft-enclosure-gui.service +++ b/buildroot-external/rootfs-overlay/usr/lib/systemd/user/mycroft-enclosure-gui.service @@ -8,7 +8,8 @@ After=pulseaudio.service [Service] Type=notify ExecStart=/usr/libexec/mycroft-systemd-gui -StandardOutput=null +StandardOutput=append:/var/log/mycroft/enclosure.log +StandardError=append:/var/log/mycroft/enclosure.error.log TimeoutStartSec=1m TimeoutStopSec=1m Restart=on-failure diff --git a/buildroot-external/rootfs-overlay/usr/lib/systemd/user/mycroft-messagebus.service b/buildroot-external/rootfs-overlay/usr/lib/systemd/user/mycroft-messagebus.service index db4a0009..b7e1a3ca 100644 --- a/buildroot-external/rootfs-overlay/usr/lib/systemd/user/mycroft-messagebus.service +++ b/buildroot-external/rootfs-overlay/usr/lib/systemd/user/mycroft-messagebus.service @@ -6,7 +6,8 @@ After=mycroft.service [Service] Type=notify ExecStart=/usr/libexec/mycroft-systemd-messagebus -StandardOutput=null +StandardOutput=append:/var/log/mycroft/messagebus.log +StandardError=append:/var/log/mycroft/messagebus.error.log TimeoutStartSec=1m TimeoutStopSec=1m Restart=on-failure diff --git a/buildroot-external/rootfs-overlay/usr/lib/systemd/user/mycroft-phal.service b/buildroot-external/rootfs-overlay/usr/lib/systemd/user/mycroft-phal.service index 6c80c8c4..22629612 100644 --- a/buildroot-external/rootfs-overlay/usr/lib/systemd/user/mycroft-phal.service +++ b/buildroot-external/rootfs-overlay/usr/lib/systemd/user/mycroft-phal.service @@ -8,7 +8,8 @@ After=pulseaudio.service [Service] Type=notify ExecStart=/usr/libexec/mycroft-systemd-phal -StandardOutput=null +StandardOutput=append:/var/log/mycroft/phal.log +StandardError=append:/var/log/mycroft/phal.error.log TimeoutStartSec=1m TimeoutStopSec=1m Restart=on-failure diff --git a/buildroot-external/rootfs-overlay/usr/lib/systemd/user/mycroft-skills.service b/buildroot-external/rootfs-overlay/usr/lib/systemd/user/mycroft-skills.service index 5bca329a..ae7c17bb 100644 --- a/buildroot-external/rootfs-overlay/usr/lib/systemd/user/mycroft-skills.service +++ b/buildroot-external/rootfs-overlay/usr/lib/systemd/user/mycroft-skills.service @@ -8,7 +8,8 @@ After=pulseaudio.service [Service] Type=notify ExecStart=/usr/libexec/mycroft-systemd-skills -StandardOutput=null +StandardOutput=append:/var/log/mycroft/skills.log +StandardError=append:/var/log/mycroft/skills.error.log TimeoutStartSec=10m TimeoutStopSec=1m Restart=on-failure diff --git a/buildroot-external/rootfs-overlay/usr/lib/systemd/user/mycroft-voice.service b/buildroot-external/rootfs-overlay/usr/lib/systemd/user/mycroft-voice.service index 473beb36..9fd27214 100644 --- a/buildroot-external/rootfs-overlay/usr/lib/systemd/user/mycroft-voice.service +++ b/buildroot-external/rootfs-overlay/usr/lib/systemd/user/mycroft-voice.service @@ -8,7 +8,8 @@ After=pulseaudio.service [Service] Type=notify ExecStart=/usr/libexec/mycroft-systemd-voice -StandardOutput=null +StandardOutput=append:/var/log/mycroft/voice.log +StandardError=append:/var/log/mycroft/voice.error.log TimeoutStartSec=1m TimeoutStopSec=1m Restart=on-failure