From 893450051989fc6bf44a0098c1fa7fa024b6b113 Mon Sep 17 00:00:00 2001 From: Alex Burr Date: Thu, 14 Dec 2017 09:55:09 +0000 Subject: [PATCH 1/6] Add s3 repo mirror. --- WHITELIST | 1 + 1 file changed, 1 insertion(+) diff --git a/WHITELIST b/WHITELIST index cac1545..e88c150 100644 --- a/WHITELIST +++ b/WHITELIST @@ -15,6 +15,7 @@ raspbian.org raspberrypi.org raspbian.mirror.uk.sargasso.net pypi.python.org +repo-mirror.kano.me.s3.amazonaws.com # Feedback form docs.google.com From 1b00513a8792b2a78636d839cae7d18d81af7c7b Mon Sep 17 00:00:00 2001 From: Alex Burr Date: Thu, 14 Dec 2017 12:37:02 +0000 Subject: [PATCH 2/6] Add zendesk to whitelist. --- WHITELIST | 3 +++ debian/changelog | 1 + 2 files changed, 4 insertions(+) diff --git a/WHITELIST b/WHITELIST index e88c150..2693618 100644 --- a/WHITELIST +++ b/WHITELIST @@ -10,6 +10,9 @@ kano.me amazonaws.com cloudinary.com +#help centre +kano.zendesk.com + # Updater raspbian.org raspberrypi.org diff --git a/debian/changelog b/debian/changelog index 660fe97..cafe477 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,7 @@ kano-settings (4.0.4-0) unstable; urgency=low * Added sentinel file on /boot partition to use custom config.txt settings * Write /boot/cpuid.txt * Ensure that the LightDM configuration exists on boot and regenerate if needed + * Add kano zendesk to the parental control whitelist. -- Team Kano Tue, 5 Dec 2017 17:22:00 +0100 From 9dd296a500f108460dc79233c362fb5b81790bad Mon Sep 17 00:00:00 2001 From: Radu Jipa Date: Mon, 18 Dec 2017 15:23:12 +0000 Subject: [PATCH 3/6] Fixed long delay when going into the Notifications menu The issue here was that every time when you accesssed the Notifications menu there was a long delay (up to 10s or more) due to the UI retrying for D-Bus ifaces for PiHat and LED Speaker. --- debian/changelog | 7 +++++++ kano_settings/set_notifications.py | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index cafe477..9ffc0b5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +kano-settings (4.0.5-0) unstable; urgency=low + + * Changes for Kano OS 3.15.0: + * Fixed long delay when going into the Notifications menu + + -- Team Kano Mon, 18 Dec 2017 15:22:00 +0100 + kano-settings (4.0.4-0) unstable; urgency=low * Changes for Kano OS 3.14.0: diff --git a/kano_settings/set_notifications.py b/kano_settings/set_notifications.py index fa6ae1d..948ee57 100644 --- a/kano_settings/set_notifications.py +++ b/kano_settings/set_notifications.py @@ -61,11 +61,11 @@ def _add_led_speaker_checkbox(self): from kano_peripherals.pi_hat.driver.high_level import \ get_pihat_interface - speaker_led_api = get_speakerleds_interface() + speaker_led_api = get_speakerleds_interface(retry_count=0) if speaker_led_api: # can be None is_led_speaker_plugged = speaker_led_api.detect() - pi_hat_api = get_pihat_interface() + pi_hat_api = get_pihat_interface(retry_count=0) if pi_hat_api: # can be None is_pi_hat_plugged = pi_hat_api.detect() From 7aeb24b387e3391c7e5fa2db0483717f6e7aefd9 Mon Sep 17 00:00:00 2001 From: Radu Jipa Date: Tue, 19 Dec 2017 15:58:51 +0000 Subject: [PATCH 4/6] Disabled hdmi_drive config option when going into Safe Mode Disabling this option will help CK17 kits to more effectively troubleshoot screen related issues. --- debian/changelog | 3 ++- kano_settings/system/display.py | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 9ffc0b5..8e96d04 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,8 +2,9 @@ kano-settings (4.0.5-0) unstable; urgency=low * Changes for Kano OS 3.15.0: * Fixed long delay when going into the Notifications menu + * Disabled hdmi_drive config option when going into Safe Mode - -- Team Kano Mon, 18 Dec 2017 15:22:00 +0100 + -- Team Kano Tue, 19 Dec 2017 15:59:00 +0100 kano-settings (4.0.4-0) unstable; urgency=low diff --git a/kano_settings/system/display.py b/kano_settings/system/display.py index 6d3867e..4d9a4a5 100755 --- a/kano_settings/system/display.py +++ b/kano_settings/system/display.py @@ -297,6 +297,9 @@ def set_safeboot_mode(): set_screen_value('hdmi_group', 2) set_screen_value('hdmi_mode', 16) + set_screen_value('hdmi_drive', None) + set_config_value('hdmi_drive', None) + set_screen_value('disable_overscan', 1) set_screen_value('overscan_left', 0) set_screen_value('overscan_right', 0) From 7bc901b44320d5cf9a63bfd2b02e10cb658bbac4 Mon Sep 17 00:00:00 2001 From: Radu Jipa Date: Tue, 19 Dec 2017 18:29:48 +0000 Subject: [PATCH 5/6] Add splash animation for Kano Settings app --- bin/kano-settings | 14 +++++++------- debian/changelog | 3 ++- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/bin/kano-settings b/bin/kano-settings index 0cd5c0c..f05d0b6 100755 --- a/bin/kano-settings +++ b/bin/kano-settings @@ -1,15 +1,15 @@ -#!/usr/bin/env python +#!/usr/bin/kano-splash loader-animation /usr/bin/env python # kano-settings # -# Copyright (C) 2014-2015 Kano Computing Ltd. +# Copyright (C) 2014-2017 Kano Computing Ltd. # License: http://www.gnu.org/licenses/gpl-2.0.txt GNU GPL v2 # # Kano Settings executable -# + """ - launches the application Terminal Quest at different points in the story +Kano Settings is a simple application to change configurations on Raspberry Pi and Kano OS Usage: kano-settings [--plug=] [--id=|--label=|] [--onescreen] @@ -20,9 +20,9 @@ Options: -l, --label= Launch on the right screen based on the label -i, --id= Launch on the right screen based on the number -o, --onescreen Close kano-settings after launching one application - """ + import os import sys import docopt @@ -61,8 +61,8 @@ def main(plug=False, socket_id=0, screen_id=None, screen_label=None, if __name__ == "__main__": - - if os.environ['LOGNAME'] != 'root': + if os.environ.get('LOGNAME', '') != 'root': + os.system("kano-stop-splash") exit("Error: Settings must be executed with root privileges") args = docopt.docopt(__doc__) diff --git a/debian/changelog b/debian/changelog index 8e96d04..096713a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,8 +3,9 @@ kano-settings (4.0.5-0) unstable; urgency=low * Changes for Kano OS 3.15.0: * Fixed long delay when going into the Notifications menu * Disabled hdmi_drive config option when going into Safe Mode + * Add splash animation for Settings app - -- Team Kano Tue, 19 Dec 2017 15:59:00 +0100 + -- Team Kano Tue, 19 Dec 2017 18:28:00 +0100 kano-settings (4.0.4-0) unstable; urgency=low From d7b66c84afcb258e0e7f074ccdd7807d81cc7154 Mon Sep 17 00:00:00 2001 From: Alex Burr Date: Thu, 4 Jan 2018 15:44:37 +0000 Subject: [PATCH 6/6] Make safe mode use the preferred mode of the screen. --- kano_settings/system/display.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/kano_settings/system/display.py b/kano_settings/system/display.py index 4d9a4a5..718a968 100755 --- a/kano_settings/system/display.py +++ b/kano_settings/system/display.py @@ -294,8 +294,11 @@ def set_safeboot_mode(): set_screen_value('hdmi_force_hotplug', 1) set_screen_value('config_hdmi_boost', 4) - set_screen_value('hdmi_group', 2) - set_screen_value('hdmi_mode', 16) + set_config_value('hdmi_group', None) + set_config_value('hdmi_mode', None) + + set_screen_value('hdmi_group', None) + set_screen_value('hdmi_mode', None) set_screen_value('hdmi_drive', None) set_config_value('hdmi_drive', None)