Wireless Access Point Setup

mheidt · June 7, 2020, 6:47pm

I wouldn’t do it like that.
I would support partial files.
If you introduce new fields, we have to diff the files every time. Although we only want to set a handful of fields.

I would make the changes in the env file itself.
In the end of the file would check for the bootfile, which doesn’t have to be the complete file. Run it and delete it.

jofemodo · June 7, 2020, 9:38pm

As i explained above, it’s not perfect, but it works right now. I would improve the “feature” for parsing and merging with the system’s config file.

mheidt · June 8, 2020, 12:18pm

@jofemodo
I would suggest the following.
In config-on-boot (I didn’t see your changes, when I fixed something else today, btw.)

UPDATE_SYS_FLAG_FILE="/zynthian_update_sys"

if [ -z "$ZYNTHIAN_CONFIG_DIR" ]; then
        echo "running /zynthian/config/zynthian_envars.sh"
        source /zynthian/config/zynthian_envars.sh
fi

BOOT_CONFIG_FILE="/boot/initial_zynthian_envars.sh"
TEMP_CONFIG_FILE="zynthian_envars.sh.tmp"
DEST_CONFIG_FILE="$ZYNTHIAN_CONFIG_DIR/zynthian_envars.sh"
if [ -f $BOOT_CONFIG_FILE ]; then
        cat $BOOT_CONFIG_FILE $DEST_CONFIG_FILE | awk -F'[=]' '{ if (a[$1]++ == 0 || $1!~/^export/ ) print $0 ; }' | awk -F'[#]' '{ if (a[$2]++ == 0 || !$2 ) print $0 ; }' > $TEMP_CONFIG_FILE
        mv $TEMP_CONFIG_FILE $DEST_CONFIG_FILE
        rm $BOOT_CONFIG_FILE
        touch $UPDATE_SYS_FLAG_FILE
fi

# If flag-file does exist, call update_zynthian_sys.sh ...
if [ -f $UPDATE_SYS_FLAG_FILE ]; then
        echo "running update_zynthian.sys.sh after boot"
        $ZYNTHIAN_SYS_DIR/scripts/update_zynthian_sys.sh
        rm -f "$UPDATE_SYS_FLAG_FILE"
fi

You have to scroll to see the awk command.
The initial_zynthian_envars.sh needs to have the same header/comments, so that the result contains them as well in the beginning.
Therefore we should deliver a sample file containing the values of the latest kit. (maybe with a “template” in the name and a comment that it has to be renamed.

jofemodo · June 8, 2020, 10:16pm

Hi @mheidt!

It doesn’t work with a copy of the config file. Simply copy your envars file to the boot directory as “initial_zynthian_envars.sh” and boot and run the config-on-boot.sh script …

… the merged result file is not OK ;-(

I think the best option is to use the already existing and well tested zynconf functions (python) to manipulate the config file:

github.com

zynthian/zynthian-ui/blob/fa7b46333dbe94d82a8c8d6efed2b0f743d98429/zynconf/zynthian_config.py#L145


		fpath=os.environ.get("ZYNTHIAN_SCRIPT_MIDI_PROFILE",
			os.environ.get("ZYNTHIAN_MY_DATA_DIR", "/zynthian/zynthian-my-data") + "/midi-profiles/default.sh")
	if not os.path.isfile(fpath):
		#Try to copy from default template
		default_src= "%s/config/default_midi_profile.sh" % os.getenv('ZYNTHIAN_SYS_DIR',"/zynthian/zynthian-sys")
		copyfile(default_src, fpath)

	return fpath


def load_config(set_env=True, fpath=None):
	if not fpath:
		fpath=get_config_fpath()

	# Get config file content
	with open(fpath) as f:
		lines = f.readlines()

	# Load config varnames
	varnames=[]
	pattern=re.compile("^export ([^\s]*?)=")

github.com

zynthian/zynthian-ui/blob/fa7b46333dbe94d82a8c8d6efed2b0f743d98429/zynconf/zynthian_config.py#L184


				val=res.group(2)
				config[vn]=val
				logging.debug("CONFIG VAR: %s=%s" % (vn,val))
				# Set local environment
				if set_env:
					os.environ[vn]=val

	return config


def save_config(config, update_sys=False, fpath=None):
	if not fpath:
		fpath = get_config_fpath()

	# Get config file content
	with open(fpath) as f:
		lines = f.readlines()

	# Find and replace lines to update
	updated = []
	add_row = 0

I will implement it ASAP, but if you are in a hurry, feel free to go forward with it …
The webconf source code is plenty of examples of how to use the zynconf functions.

Regards,

mheidt · June 8, 2020, 10:34pm

prerequisite for my solution is, that you only consider the static export statements.
I would have separated the static from the dynamic part anyways.
That’s why I haven’t called it /boot/zynthian_envars.sh to not mislead ppl to use the dynamic script.

But I can wait for your solution.

jofemodo · June 9, 2020, 1:31am

It’s ready:

I hope you didn’t await too much

Resuming, @zynthianers:

Your zynthian’s configuration can be updated on boot by simply putting a “zynthian_envars.sh” file on the “/boot” directory, that is easily mountable on all systems (windows, max & linux).
You can put a full config file (i.e. a zynthian_envars.sh backup) or update a bunch of parameters, like:

export ZYNTHIAN_UI_SWITCH_BOLD_MS="200"
export ZYNTHIAN_UI_SWITCH_LONG_MS="600"
export ZYNTHIAN_UI_SHOW_CPU_STATUS="1"

Of course:

A backup is done on “/zynthian/config/zynthian_envars_backup.sh” before updating the config
The “/boot/zynthian_envars.sh” file is deleted after updating the config

I hope this little new feature will help to ease zynthian configuration process.

Enjoy!

P.S: A wiki entry should be added … some volunteer in da house?

mheidt · June 9, 2020, 5:27am

why did you remove this?

if [ -z “$ZYNTHIAN_CONFIG_DIR” ]; then
echo “running /zynthian/config/zynthian_envars.sh”
source /zynthian/config/zynthian_envars.sh
fi

This is needed for

github.com/zynthian/zynthian-sys

Audio Injector Config needs Webconf config edit to 'activate' card.

opened 12:01PM - 15 Jul 19 UTC

closed 10:33PM - 30 Jul 20 UTC

wyleu

**Describe the bug** Audio Injector needs Webconf config edit to 'activate' car…d. When installing an Audio Injector card installation the card will not activate until a small edit ( addition of a space into the admin sections seems to work) **To Reproduce** Install Audio Injector Card 1. Install zynthian software. 2. Select audio hardware (Custom/Audio select Audio Injector Card) 3. Reboot machine 4. Login in to zynthian 5. Run alsa Mixer 6. Tab To Capture 7. Select Capture L - R 8. close alsamixer 9. Reboot. 10. No Audio output ( Audio Test) 11. Select audio hardware (Custom/Audio select Audio Injector Card) 12. Edit custom settings 13. Add space 14. Save 15. Reboot 16 Audio Output confirmed (Audio Test) **Expected behavior** An Audio INjector Card should play Audio Test upon installation **Screenshots** Not at the moment :-) **Setup:** - Not available. **Additional context** Been a little dance required for audio injector for a while now. This processs does NOT confirm Audio input.

mheidt · June 9, 2020, 5:34am

Did you test partial files?
I will have the first 4 blocks in my file only and expect the algorithm to fill the rest.
This is important, because the hardware-dependent part will be created once and be used the next years although we introduce new fields later.

jofemodo · June 9, 2020, 9:34pm

It shouldn’t be needed. I included the $ZYNTHIAN_CONFIG_DIR envar in the service file.

Of course. I’ve explained this in my post above:

jofemodo:

You can put a full config file (i.e. a zynthian_envars.sh backup) or update a bunch of parameters, like:
export ZYNTHIAN_UI_SWITCH_BOLD_MS="200"
export ZYNTHIAN_UI_SWITCH_LONG_MS="600"
export ZYNTHIAN_UI_SHOW_CPU_STATUS="1"

Regards,

mheidt · June 9, 2020, 9:35pm

ZYNTHIAN_CONFIG_DIR was empty. I debugged it.
See what I wrote in the github issue

mheidt · June 9, 2020, 9:38pm

why are you calling exit, when the file in boot is taken?
Isn’t the update_sys not needed?
Especially to correct the AudioInjector amixer settings?

jofemodo · June 9, 2020, 9:40pm

I fixed this problem yesterday, adding the envar to the service file.

Regards,

mheidt · June 9, 2020, 9:42pm

ok.
It’s worth a trial then.
Nevertheless I don’t understand, how the complete envars are set when I put a file in /boot, that only contains 3 export statements

jofemodo · June 9, 2020, 9:42pm

update_envars.py (that uses the zynconf library) call zynthian_update_sys.sh after saving the config file, so no need to call it twice.

jofemodo · June 9, 2020, 9:44pm

Check this out:

github.com

zynthian/zynthian-sys/blob/master/sbin/update_envars.py

#!/usr/bin/python3
# -*- coding: utf-8 -*-
#********************************************************************
# ZYNTHIAN PROJECT: update_envars.py
# 
# Update $ZYNTHIAN_CONFIG_DIR/zynthian_envars.sh with the 
# file given as first argument 
# 
# Copyright (C) 2015-2020 Fernando Moyano <jofemodo@zynthian.org>
#
#********************************************************************
# 
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License as
# published by the Free Software Foundation; either version 2 of
# the License, or any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

This file has been truncated. show original

It uses the zynconf library, same as the webconf.

Regards,

mheidt · June 9, 2020, 9:45pm

Yes, I overlooked, that the 3rd parameter of save is empty

jofemodo · June 9, 2020, 9:46pm

Didn’t you test it yet???

mheidt · June 9, 2020, 9:47pm

Of course not.
I didn’t know about " adding the envar to the service file."

jofemodo · June 9, 2020, 9:47pm

It must be empty for this case …

mheidt · June 10, 2020, 9:07am

Yep, it works.
Now we(@jofemodo) could implement the fallback.
When you use a false config (wrong kit like “CUSTOM” instead of “Custom”) you will see the error screen. (at least if you have a customized V2)
In this case we could cp the backup to /zynthian/config and reboot