Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

merge develop into Fix-audiohat-gpio #1125

Merged
merged 20 commits into from
Oct 29, 2020
Merged

merge develop into Fix-audiohat-gpio #1125

merged 20 commits into from
Oct 29, 2020

Commits on Oct 23, 2020

  1. Play startup sound with correct startup volume

    Modified startup-scripts.sh to execute mpg123 with the configured startup volume from global.conf.
    The configured volume from global.conf was ignored when playing the startup sound (always played at 100%, which can be extremely loud for kids).
    Now the configured volume is converted into the correct volume value for mpg123 (100% volume converts into 32768).
    Toqqi committed Oct 23, 2020
    Configuration menu
    Copy the full SHA
    41b53a5 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #1113 from Toqqi/develop

    Play startup sound with correct startup volume
    s-martin committed Oct 23, 2020
    Configuration menu
    Copy the full SHA
    1f638fe View commit details
    Browse the repository at this point in the history
  3. Fix Samba WINS configuration #1106

    Signed-off-by: s-martin <saimen54@hotmail.com>
    s-martin committed Oct 23, 2020
    Configuration menu
    Copy the full SHA
    bf70f4f View commit details
    Browse the repository at this point in the history
  4. remove accidential commits

    Signed-off-by: s-martin <saimen54@hotmail.com>
    s-martin committed Oct 23, 2020
    Configuration menu
    Copy the full SHA
    e002966 View commit details
    Browse the repository at this point in the history
  5. remove accidential commits

    Signed-off-by: s-martin <saimen54@hotmail.com>
    s-martin committed Oct 23, 2020
    Configuration menu
    Copy the full SHA
    5748603 View commit details
    Browse the repository at this point in the history
  6. For issue #1096:

    * don't version the used gpio_settings.ini file in git
    * follow Phoniebox conventions for settings files and store it in misc/sampleconfigs
    * Improve documentation
    s-martin committed Oct 23, 2020
    Configuration menu
    Copy the full SHA
    a62a86d View commit details
    Browse the repository at this point in the history
  7. Added customizable poweroff command

    Adds an option to configure the poweroff command executed when
    triggering a shutdown. Poweroff command to use is read from file
    `settings/Poweroff_Command`, default `sudo poweroff`.
    
    Scenario:
    a) You are powering you Pi via an extension board, e.g. MoPi 2,
    that cannot detect a regular poweroff and stays powered-on itself. Via a
    customizable poweroff command you can trigger the extension board to
    power off the Pi in the prefered way which finally also turns-off the
    extension board.
    b) You like to add some extras, e.g. LED illumination, on power off. A
    customizable poweroff command allows the "user" a nice hook for whatever
    stuff he likes to add before the actual power off :-)
    miohna committed Oct 23, 2020
    Configuration menu
    Copy the full SHA
    7168b21 View commit details
    Browse the repository at this point in the history
  8. (maint) Minor typo

    miohna committed Oct 23, 2020
    Configuration menu
    Copy the full SHA
    1e2dc96 View commit details
    Browse the repository at this point in the history
  9. Merge pull request #1115 from s-martin/fix-samba-wins

    Fix Samba WINS configuration
    s-martin committed Oct 23, 2020
    Configuration menu
    Copy the full SHA
    7e47f9f View commit details
    Browse the repository at this point in the history

Commits on Oct 25, 2020

  1. Merge pull request #1119 from miohna/typos/develop/writeGlobalConfig

    (maint) Minor typo
    s-martin committed Oct 25, 2020
    Configuration menu
    Copy the full SHA
    d0065b7 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #13 from MiczFlor/develop

    update branch to 2.2rc1
    princemaxwell committed Oct 25, 2020
    Configuration menu
    Copy the full SHA
    3692ae6 View commit details
    Browse the repository at this point in the history
  3. Install netcat - fixes #1120

    s-martin committed Oct 25, 2020
    Configuration menu
    Copy the full SHA
    b9b2146 View commit details
    Browse the repository at this point in the history
  4. Update test for #1120

    s-martin committed Oct 25, 2020
    Configuration menu
    Copy the full SHA
    dcb9d9b View commit details
    Browse the repository at this point in the history
  5. Update inc.settingsFolderSpecific.sh

    if the folder.conf has SHUFFLE=ON, shuffle is executed while loading the playlist.
    i don't know, why inc.settingsFolderSpecific.sh is executing shuffle again?!?!?
    my opinion is, that it is not needed, because the playlist is alread shuffled.
    For that reason and for testing i uncomment line 53. If everthing is ok, the IF clause could be removed completely.
    princemaxwell committed Oct 25, 2020
    Configuration menu
    Copy the full SHA
    a6d492a View commit details
    Browse the repository at this point in the history
  6. Update inc.loadedPlaylist.php

    added global + ignore to replace all ";" in the artist, if more than one occurs
    princemaxwell committed Oct 25, 2020
    Configuration menu
    Copy the full SHA
    2bbdefd View commit details
    Browse the repository at this point in the history

Commits on Oct 26, 2020

  1. Configuration menu
    Copy the full SHA
    a485409 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #1123 from s-martin/update-installscript-hotspot

    Update the install script for hotspot to the 2.1 changes
    s-martin committed Oct 26, 2020
    Configuration menu
    Copy the full SHA
    b3299b1 View commit details
    Browse the repository at this point in the history

Commits on Oct 27, 2020

  1. Merge pull request #1121 from princemaxwell/develop2.2rc1

    Commenting out unnecessary shuffle for testing purposes
    MiczFlor committed Oct 27, 2020
    Configuration menu
    Copy the full SHA
    3f2d693 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #1118 from miohna/feature/develop/customizablePowe…

    …roffCommand
    
    Added customizable poweroff command
    MiczFlor committed Oct 27, 2020
    Configuration menu
    Copy the full SHA
    00b25df View commit details
    Browse the repository at this point in the history
  3. Merge pull request #1116 from s-martin/fix-gipo-setttings-paths

    Fix gpio_settings.ini paths
    MiczFlor committed Oct 27, 2020
    Configuration menu
    Copy the full SHA
    c04bb05 View commit details
    Browse the repository at this point in the history