update version information and releasenotes to stable

See https://github.com/Doodle3D/WiFi-Box/issues/21

.settings/org.eclipse.koneki.ldt.prefs

@@ -0,0 +1,4 @@
+eclipse.preferences.version=1
+org.eclipse.dltk.coretasks.case_sensitive=true
+org.eclipse.dltk.coretasks.enabled=true
+org.eclipse.dltk.coretasks.tags=FIXME;HIGH,TODO;NORMAL,XXX;NORMAL,@fixme;HIGH,@todo;NORMAL,@warning;NORMAL

Makefile

@@ -66,6 +66,13 @@ define Build/Compile directives
 #	no compilation necessary (although possible with luac?)
 endef
 
+# This information is contained within the ipk file and (at least) used by
+# sysupgrade to determine which files to keep (see `opkg list-changed-conffiles`).
+define Package/wifibox/conffiles
+/etc/config/wifibox
+/etc/logrotate.d/wifibox.conf
+endef
+
 # The $(1) variable represents the root directory on the router running 
 # OpenWrt. The $(INSTALL_DIR) variable contains a command to prepare the install 
 # directory if it does not already exist.  Likewise $(INSTALL_BIN) contains the 
@@ -88,9 +95,16 @@ define Package/wifibox/install
 	#$(INSTALL_DIR) $(1)/etc
 	$(INSTALL_DIR) $(1)/etc/init.d
 	$(INSTALL_DIR) $(1)/etc/config
+	$(INSTALL_DIR) $(1)/etc/logrotate.d
+	$(INSTALL_DIR) $(1)/root/
+	$(INSTALL_DIR) $(1)/root/sketches
 	#$(INSTALL_DIR) $(1)/www
 	$(INSTALL_DIR) $(1)/www/cgi-bin
 	
+	#copy wps button script to procd folder
+	$(INSTALL_DIR) $(1)/etc/rc.button/
+	$(INSTALL_BIN) $(WIFIBOX_BASE_DIR)/script/wifi-switch-netconfig.sh $(1)/etc/rc.button/wps
+	
 ### create all files in /usr/share/lua/autowifi (autowifi)
 	
 	$(CP) $(WIFIBOX_BASE_DIR)/opkg.conf $(1)/$(TGT_LUA_DIR_SUFFIX)/
@@ -102,10 +116,19 @@ define Package/wifibox/install
 	
 	$(INSTALL_BIN) $(WIFIBOX_BASE_DIR)/script/d3d-updater.lua $(1)/$(TGT_LUA_DIR_SUFFIX)/script
 	$(LN) -s /$(TGT_LUA_DIR_SUFFIX)/script/d3d-updater.lua $(1)/bin/d3d-updater
+	$(CP) $(WIFIBOX_BASE_DIR)/script/loglite-filters.lua $(1)/root/
+	$(INSTALL_BIN) $(WIFIBOX_BASE_DIR)/script/loglite.lua $(1)/$(TGT_LUA_DIR_SUFFIX)/script
+	$(LN) -s /$(TGT_LUA_DIR_SUFFIX)/script/loglite.lua $(1)/bin/loglite
 	$(INSTALL_BIN) $(WIFIBOX_BASE_DIR)/script/wifibox_init $(1)/etc/init.d/wifibox
 	$(INSTALL_BIN) $(WIFIBOX_BASE_DIR)/script/dhcpcheck_init $(1)/etc/init.d/dhcpcheck
 	$(INSTALL_BIN) $(WIFIBOX_BASE_DIR)/script/d3dapi $(1)/$(TGT_LUA_DIR_SUFFIX)/script
+	$(LN) -s /$(TGT_LUA_DIR_SUFFIX)/script/d3dapi $(1)/bin/d3dapi
 	$(INSTALL_BIN) $(WIFIBOX_BASE_DIR)/script/signin.sh $(1)/$(TGT_LUA_DIR_SUFFIX)/script
+	$(CP) $(WIFIBOX_BASE_DIR)/script/logrotate-wifibox.conf $(1)/etc/logrotate.d/wifibox.conf
+	
+
+	$(INSTALL_BIN) $(WIFIBOX_BASE_DIR)/script/print-fetch.lua $(1)/$(TGT_LUA_DIR_SUFFIX)/script
+	$(LN) -s /$(TGT_LUA_DIR_SUFFIX)/script/print-fetch.lua $(1)/bin/print-fetch
 	
 	$(CP) $(WIFIBOX_BASE_DIR)/script/wifibox.uci.config $(1)/etc/config/wifibox  # copy base configuration to uci config dir
 	$(CP) $(WIFIBOX_BASE_DIR)/FIRMWARE-VERSION $(1)/etc/wifibox-version

NOTICE.txt

@@ -1,3 +1,5 @@
+Doodle3D overrides the 802.11 regulatory domain such that channels 12 and 13 can be used. In most countries this is desired and accepted behaviour, with the notable exception being the USA.
+
 Doodle3D uses the following external projects:
 
 Lua - Copyright (c) 1994–2013 Lua.org, PUC-Rio. - MIT license

README.md

@@ -3,6 +3,7 @@ WiFi box OpenWRT firmware package
 
 General documentation can be found on the wiki: <http://doodle3d.com/help/wiki>. Source code documentation can be generated, see below.
 
+
 Documentation
 -------------
 
@@ -10,3 +11,29 @@ The script 'doxify.sh' generates HTML documentation of the source code in the di
 Make sure the 'ldoc' program is installed on your machine and the LDOC variable in the script points there.
 
 On OSX, this can be accomplished by installing it through luarocks (run `sudo luarocks install ldoc`). Luarocks can be installed using [MacPorts](http://www.macports.org/). After installing that, the command would be `sudo port install luarocks`.
+
+Command line interface
+----------------------
+The Doodle3D API can be called using a terminal:
+
+```d3dapi p=/network/scan r=GET```
+
+Where the p parameter is the module you want to call and r is the method.
+Post request can be send using the same method:
+
+```d3dapi p=/printer/print r=POST```
+
+Parameters: TODO
+
+Debugging Lua
+-------------
+
+Syntax errors in Lua can lead to tricky issues since they might only surface when the faulty code is actually being run.
+
+One countermeasure for this is to use [pcall](http://www.lua.org/pil/8.4.html) instead of regular calls in many cases. To let the error 'happen' (which in turn gives information in the form of stack traces), tell the code to use regular calls by setting 'M.DEBUG_PCALLS' to 'true' in `conf_defaults.lua`.
+
+Additionally, when the pcall setting is not enough, a second way of debugging is to take uhttpd out of the loop and invoke the Lua code from command-line. To do this, set 'M.DEBUG_API' to 'true' in `conf_defaults.lua`. Then invoke the API using the command `d3dapi p=/mod/func r=POST` where `p=` is followed by the API path and `r=` followed by either 'GET' or 'POST'.
+
+Note that because stack traces are sent to `stderr`, this script redirects output streams to a separate log file: `/tmp/wifibox.stdout.log`; apart from these traces, the file should not contain any data.
+
+Finally, the `CGI` gateway of uhttpd also uses this script, so the API can also be used to obtain stack traces by calling it as `<wifibox-ip>/cgi-bin/d3dapi/<endpoint>` (note the extra `cgi-bin`).

ReleaseNotes.md

@@ -1,3 +1,177 @@
+Changelog
+
+# 0.11.0 (12 jul 2017)
+# 0.11.0-c (10 jul 2017)
+- fix: Also closing file descriptor after removing current print file (commit 550e151)
+
+# 0.11.0-b (6 jul 2017)
+- show id of current print in d3dapi/info/status when printing in 'fetch' mode.
+- code reuse and cleanup for control, kill and status
+
+# 0.11.0-a (23 jun 2017)
+- Added 'fetch' functionality to let the WiFi-Box print from a remote server. This enables the WiFi-Box to print large g-code files. (yeah!)
+- Added support for the Renkforce RF100 printer.
+- Changed 'default startcode' to prevent Ultimaker 2 series to bump into platform [#21](https://github.com/Doodle3D/WiFi-Box/issues/21) when Ultimaker (original) is selected.
+- Changed default nozzle temperature from 230 to 210 °C.
+- Fixed corrupted endcode for delta printers.
+- Changed default endcode to cooldown to 0 after print instead of cooling down to preheat temperature.
+
+# 0.10.12
+# 0.10.12-b (12 jan 2017)
+- Post install update to config for changes in 0.10.10 (fixes print3d logging)
+
+# 0.10.12-a (26 jul 2016)
+- Added Ultimaker Original Plus (Thanks Remco)
+- Added extra usb drivers
+
+# 0.10.11
+# 0.10.11-a (25 may 2016)
+- After pressing the reset button for about 4 seconds the WiFi-Box will go to access point mode. Useful for when you can't reach it.
+- Becomes access point when it can't connect to WiFi network.
+- Handles more clients by tweaking the uhttpd config.
+- Print3D isn't killed when there is no memory available.
+- New banner (shown after ssh login)
+- Ultimaker 2 type printers show status information on display.
+
+# 0.10.10 (11 may 2016)
+- Logging client version info to console.  
+- Logging less when printing to makerbot/wanhao
+- Logging API time info
+- Included version number file in logfiles
+- Fixed stopping while sending
+
+# 0.10.10-e (21 apr 2016)
+- Fixed Makerbot end gcode that prevented prints or stopping prints to finish.
+
+# 0.10.10-d (20 apr 2016)
+- Allow print part sequence numbers to be retrieved
+- Sequence numbers are send back when sending print parts
+- When WiFi-Box responds that print part was already received the client will send the next part.
+
+# 0.10.10-c (1 apr 2016)
+- Quicker log rotation
+
+# 0.10.10-b (21 mrt 2016)
+- Logrotation (making sure older logs are removed)
+- Improved logging.
+- Always log initial printer communication
+- loglite improvements, added readme
+
+# 0.10.10-a (24 feb 2016)
+- Max buffer size check: the WiFi-Box can now indicate through the API that its buffer is full and it won't accept new gcode.
+- Buffer information is communicated through the API so all clients can handle this properly. The Doodle3D client will stop sending and waits until it drops below 75%. It will check this every 30 seconds.
+- Improved progress indication: when sending a print the total number of lines can be added, causing the total lines reported through the API to be correct, instead of being approximated to be total lines in buffer, which keeps increasing while a print is still being sent.
+- When sending print parts, sequence numbers can be added which will be checked for correctness.
+- The stop button now stays enabled while still sending a print.
+- Made firmware log format consistent with print3d's.
+- Fixed local IP parsing pattern in firmware.
+- Improved log messages and log messages formatting.
+- Added loglite utility which enables filtering and coloring of logs.
+- Won't attempt sign-in when in access point mode.
+- More consistent error reporting from API.
+- API d3dapi/printer/print's 'first' parameter has been deprecated in favor of a more descriptive 'clear' parameter.
+- Support for CraftBot PLUS printer.
+
+# 0.10.9 (11 jan 2016)
+# 0.10.8 (11 jan 2016)
+# 0.10.8-b (7 jan 2016)
+Logging less by default, fixing some pretty serious memory issues, which could cause the WiFi-box to 'crash' while printing bigger files.
+Log level setting, enabling users to log more if they run into problems.
+For better adhesion we extruded even while traveling on the bottom layers, we now made it configurable and turned it off by default.  
+Fixed month display of releases in settings screen.
+
+# 0.10.8-a (11 nov 2015)
+Added ch341 and cp210x usb-serial drivers to diffconfig
+
+# 0.10.7 (21 aug 2015)
+Added ColiDo printer profiles
+
+# 0.10.6 (17 jun 2015)
+# 0.10.6-rc3 (17 jun 2015)
+# 0.10.6-rc2 (16 jun 2015)
+# 0.10.6-rc1 (16 jun 2015)
+This release sees several connectivity bugs resolved as we continue to look to
+create the most stable experience we can offer for Doodle3D users. A new
+addition that has been realized in that the filament thickness is now
+printer dependent. This is important for printers that use 1,75mm filament.
+When changing the printer type it switches automatically. Please contact us for
+better filament thickness defaults. For more details please review the notes below:
+
+General:
+- Updated OpenWRT (the operating system) to 14.07.
+- Fixed several big issues around connecting to printers.
+- Big files for Marlin based printers are processed faster.
+- Target temperature retrieval is improved.
+- Changed the Accesspoint's settings to the default because of startup issues (country: NL to US, channel: 11 to 1).
+- Improved 404 page.
+
+Additions
+- Filament thickness is now printer type dependent and automatically change when selecting a printer. (Please contact us for better filament thickness defaults.)
+
+Support for more 3D printers:
+- DoodleDream
+- 3Dison
+- LulzBot TAZ 4
+- Wanhao Duplicator 4
+- Ultimaker 2 Go
+
+Improvements for Makerbot based printers (like the Wanhao printer):
+- Prevent that the nozzle bumps into the bed when starting a new print.
+- Prevent that the nozzle moves though a print after printing.
+
+# 0.10.5-a (2 Feb 2015)
+- Removed gray lines where printer needs to 'travel' (move without printing)
+- Enabled traveling also for first couple of layers. This prevents straight lines crossing your print
+- Added url parameter l=1 which disables parts of the user interface. The 'Print' button 'saves' the sketch instead of sending it to the printer. This is useful for public events where a moderator needs to start prints instead of the user.
+- Fixed a small bug where the last sketch was skipped when pressing the previous button for the first time.
+- changed WordArt font to a self-made single line handwritting font. This font prints faster and is more playful.
+
+
+# 0.10.5
+- Added the PhotoGuide feature which is kind of a manual Scan & Trace. Use a photo as a background image and create your doodle on top of it.
+- Added support for the '3Dison plus' printer.
+- Added a File Manager for downloading, uploading and deleting sketches (can be opened via the Settings Panel)
+- Improved the way sketches are loaded
+- Fixed scrolling issue in Settings Panel
+
+# 0.10.4-photoguide3 (10th oct 2014)
+# 0.10.4-photoguide2 (9th oct 2014)
+# 0.10.4-photoguide (9th oct 2014)
+- Added the PhotoGuide feature which is kind of a manual Scan & Trace. Use a photo as a background image and create your doodle on top of it.
+- Added support for the '3Dison plus' printer.
+
+# 0.10.4 (28th may 2014)
+- Pulled  improvements by Ultimaker.
+- Fixed printing isues with gcode containing whitelines.
+- Added Builder3D to printer types
+- iOS captive portal fix
+
+# 0.10.3 (9th apr 2014)
+- Fixed Makerbot issue where printer driver didn't get past connecting state
+
+# 0.10.2-makerbotfix (27th mar 2014)
+- Fixed Makerbot issue where printer driver didn't get past connecting state
+
+Changelog
+# 0.10.2 (14th mar 2014)
+- Fixed connection issues to networks with multiple routers sharing the same ssid
+- Option to update to beta releases (Beta testers are welcome)
+- Substituted wifiboxid retrievable through info api
+- Added a "connecting" printer state where it found a printer but couldn't communicate yet. (Not yet implemented for Makerbot's)
+- When connecting takes to long, we display a warning that the user might have selected the wrong printer type (Not yet implemented for Makerbot's)
+- API's printer/state doesn't return an error anymore when a printer is just connected
+- Allowing WiFi channels 12 & 13
+- Fixed issue that control access wasn't properly reset after print
+- Fixed another issue where the box in access point wouldn't give ip addresses
+
+# 0.10.1 (12th feb 2014)
+- miniFactory support
+- Fixed most Makerbot display issues
+- Allowing wifi channels 12 and 13
+- Allow floats for retraction amount setting
+- Also preheating reconnected printer
+- Fixed network interface issues
+- added easter-eggs
 
 # 0.10.0 (20th jan 2014)
 - WordArt
@@ -12,7 +186,7 @@
 - Feedback on 'restore settings to default'-button
 - Reimplemented layout, lots of improvements
 - Re-enabled regular browser keyboard shortcuts
-- Faster click responses on iOS 
+- Faster click responses on iOS
 - magnifying glass on iOS is now prevented from showing up
 
 # 0.9.13 (23th dec 2013)

extra/license-headers/header-cstyle

@@ -1,7 +1,7 @@
 /*
  * This file is part of the Doodle3D project (http://doodle3d.com).
  *
- * Copyright (c) 2013, Doodle3D
+ * Copyright (c) 2013-2014, Doodle3D
  * This software is licensed under the terms of the GNU GPL v2 or later.
  * See file LICENSE.txt or visit http://www.gnu.org/licenses/gpl.html for full license details.
  */

extra/license-headers/header-lua

@@ -1,7 +1,7 @@
 --
 -- This file is part of the Doodle3D project (http://doodle3d.com).
 --
--- @copyright 2013, Doodle3D
+-- @copyright 2013-2014, Doodle3D
 -- @license This software is licensed under the terms of the GNU GPL v2 or later.
 -- See file LICENSE.txt or visit http://www.gnu.org/licenses/gpl.html for full license details.
 

extra/license-headers/header-sh

@@ -1,6 +1,6 @@
 # This file is part of the Doodle3D project (http://doodle3d.com).
 #
-# Copyright (c) 2013, Doodle3D
+# Copyright (c) 2013-2014, Doodle3D
 # This software is licensed under the terms of the GNU GPL v2 or later.
 # See file LICENSE.txt or visit http://www.gnu.org/licenses/gpl.html for full license details.
 

extra/openwrt-build/feeds.conf.template

@@ -0,0 +1,3 @@
+src-git packages git://git.openwrt.org/packages.git^e5f758e0729d094441aad849bbab4117b816567d
+# Edit the path below to point to the directory of the Doodle3D feed.
+src-link wifibox /Users/USERNAME/xxxFiles/doodle3d_feed_path

extra/openwrt-build/gen-feeds-conf.sh

@@ -0,0 +1,125 @@
+#!/bin/sh
+
+# This script generates a file feeds.conf and places it in the OpenWrt buildroot directory.
+# It deduces the location of your Doodle3D feed by looking at its own path and,
+# on OSX, tries to find the OpenWrt buildroot by looking for something mounted in a
+# directory containing the word 'openwrt'; specify the path with -p <path> if that fails.
+
+SYSNAME=`uname -s`
+WRT_PATH=
+FEED_PATH=
+PACKAGES_FEED_SHA5=e5f758e0729d094441aad849bbab4117b816567d
+
+nextIsWrtPath=0
+for arg in "$@"; do
+	if [ $nextIsWrtPath -eq 1 ]; then
+		WRT_PATH="$arg"
+		nextIsWrtPath=0
+		continue
+	fi
+
+	case "$arg" in
+	-p)
+		nextIsWrtPath=1
+		;;
+	-h)
+		echo "This script generates an OpenWrt feeds.conf file for building Doodle3D, it works automatically."
+		echo "If the wrt buildroot path cannot be determined, specify it using '-p <path>'."
+		echo "If you want the file contents to be shown instead of written out to a file, use '-c'."
+		exit 0
+		;;
+	*)
+		echo "! Error: unknown argument '$arg' found"
+		exit 1
+		;;
+	esac
+done
+if [ $nextIsWrtPath -eq 1 ]; then
+	echo "! Error: missing argument for -p option"
+	exit 1
+fi
+
+
+if [ "x$WRT_PATH" = "x" ]; then
+	if [ "x$SYSNAME" != "xDarwin" ]; then
+		echo "! Error: it looks like you are not using OSX, please specify the OpenWrt buildroot path with '-p <path>'."
+		exit 1
+
+	elif [ "x$SYSNAME" = "xDarwin" ]; then
+		mountPath=`mount | sed -n 's|^.* \([^ ]*[Oo][Pp][Ee][Nn][Ww][Rr][Tt][^ ]*\).*$|\1|p'`
+		if [ -z "$mountPath" ]; then
+			echo "! Error: could not find openwrt-like path in list of mount points."
+			echo "! Please mount the image an rerun, or specify the path using '-p <path>'."
+			exit 2
+		fi
+
+		# Looking for the word 'openwrt' in a README file in a direct subdir...is this a reasonable 'detect' approach?
+		for i in $(ls -d $mountPath/*/); do
+			dirname=${i%%/}
+			grep -sqi openwrt "$dirname/README"
+			if [ $? -eq 0 ]; then
+				WRT_PATH="$dirname"
+			fi
+		done
+
+		if [ -z "$WRT_PATH" ]; then
+			echo "! Error: could not find buildroot path in what looks like an OpenWrt image ('$mountPath'), please rerun with '-p <path>'."
+			exit 3
+		fi
+	fi
+fi
+
+
+echo "===== Doodle3D OpenWrt feeds.conf generator"
+echo "* Using OpenWrt buildroot path: '$WRT_PATH'"
+
+FEED_PATH="$0"
+FEED_PATH=`dirname "$FEED_PATH"` # Ok, so after this we've got a non-normalized path to the script dir
+FEED_PATH="$FEED_PATH/../../.." # go back to just outside the doodle3d-firmware repo, which should be the feed root
+
+echo "$FEED_PATH" | grep -sq "^\/"
+if [ $? -ne 0 ]; then FEED_PATH="`pwd`/$FEED_PATH"; fi
+
+#NOTE: and normalize the path...this method feels a bit fragile (spurious output, special user env conditions and whatnot)
+pushd "$FEED_PATH" > /dev/null 2>&1
+FEED_PATH="`pwd`"
+popd > /dev/null 2>&1
+
+echo "* Using Doodle3D feed path: '$FEED_PATH'"
+
+echo "$FEED_PATH" | grep -sq ' '
+if [ $? -eq 0 ]; then
+	echo "! Error: the feed path contains spaces, which OpenWrt cannot handle. Exiting..."
+	exit 4
+fi
+
+FILE_CONTENTS=$( cat << EOT
+src-git packages git://git.openwrt.org/packages.git^$PACKAGES_FEED_SHA5
+src-link wifibox $FEED_PATH
+EOT
+)
+
+echo "* Contents to be written:\n$FILE_CONTENTS\n"
+
+while true; do
+	read -p "? Proceed to write a new feeds.conf? " yn
+    case $yn in
+        [Yy]*) break;;
+        [Nn]*)
+			echo "* Ok, feeds.conf will not be generated. Exiting..."
+			exit 0;;
+		*) echo "! Please answer yes or no.";;
+    esac
+done
+
+OUT_PATH="$WRT_PATH/feeds.conf"
+BKP_PATH="$WRT_PATH/feeds.conf.d3dbkp"
+if [ -f "$OUT_PATH" ]; then
+	echo "* Backing up $OUT_PATH to $BKP_PATH"
+	cp "$OUT_PATH" "$BKP_PATH"
+fi
+
+echo "* Generating $OUT_PATH"
+echo "$FILE_CONTENTS" > "$OUT_PATH"
+
+exit 0

extra/openwrt-build/openwrt-diffconfig-extramini

@@ -1,7 +1,9 @@
 CONFIG_TARGET_ar71xx=y
 CONFIG_TARGET_ar71xx_generic=y
 CONFIG_TARGET_ar71xx_generic_TLMR3020=y
+CONFIG_ATH_USER_REGD=y
 # CONFIG_BUSYBOX_CONFIG_FEATURE_IPV6 is not set
+CONFIG_BUSYBOX_CONFIG_INOTIFYD=y
 CONFIG_DOODLE3D_CLIENT_MINIFY_JS=y
 # CONFIG_IPV6 is not set
 # CONFIG_KERNEL_DEBUG_INFO is not set
@@ -14,13 +16,16 @@ CONFIG_PACKAGE_doodle3d-client=y
 # CONFIG_PACKAGE_kmod-ipv6 is not set
 # CONFIG_PACKAGE_kmod-ppp is not set
 CONFIG_PACKAGE_kmod-usb-acm=y
+CONFIG_PACKAGE_kmod-usb-ohci=y
 CONFIG_PACKAGE_kmod-usb-serial=y
 CONFIG_PACKAGE_kmod-usb-serial-ftdi=y
 # CONFIG_PACKAGE_libip6tc is not set
 CONFIG_PACKAGE_libiwinfo=y
 CONFIG_PACKAGE_libiwinfo-lua=y
+CONFIG_PACKAGE_libpopt=y
 CONFIG_PACKAGE_liblua=y
 CONFIG_PACKAGE_libuci-lua=y
+CONFIG_PACKAGE_logrotate=y
 CONFIG_PACKAGE_lua=y
 CONFIG_PACKAGE_luafilesystem=y
 # CONFIG_PACKAGE_odhcp6c is not set

extra/openwrt-build/openwrt-diffconfig-mini

@@ -1,6 +1,7 @@
 CONFIG_TARGET_ar71xx=y
 CONFIG_TARGET_ar71xx_generic=y
 CONFIG_TARGET_ar71xx_generic_TLMR3020=y
+CONFIG_ATH_USER_REGD=y
 # CONFIG_BUSYBOX_CONFIG_FEATURE_IPV6 is not set
 CONFIG_DOODLE3D_CLIENT_MINIFY_JS=y
 # CONFIG_IPV6 is not set
@@ -19,8 +20,10 @@ CONFIG_PACKAGE_kmod-usb-serial-ftdi=y
 # CONFIG_PACKAGE_libip6tc is not set
 CONFIG_PACKAGE_libiwinfo=y
 CONFIG_PACKAGE_libiwinfo-lua=y
+CONFIG_PACKAGE_libpopt=y
 CONFIG_PACKAGE_liblua=y
 CONFIG_PACKAGE_libuci-lua=y
+CONFIG_PACKAGE_logrotate=y
 CONFIG_PACKAGE_lua=y
 CONFIG_PACKAGE_luafilesystem=y
 # CONFIG_PACKAGE_odhcp6c is not set

extra/openwrt-build/openwrt-diffconfig-regular

@@ -1,6 +1,7 @@
 CONFIG_TARGET_ar71xx=y
 CONFIG_TARGET_ar71xx_generic=y
 CONFIG_TARGET_ar71xx_generic_TLMR3020=y
+CONFIG_ATH_USER_REGD=y
 CONFIG_DOODLE3D_CLIENT_MINIFY_JS=y
 CONFIG_PACKAGE_doodle3d-client=y
 CONFIG_PACKAGE_kmod-usb-acm=y
@@ -8,8 +9,10 @@ CONFIG_PACKAGE_kmod-usb-serial=y
 CONFIG_PACKAGE_kmod-usb-serial-ftdi=y
 CONFIG_PACKAGE_libiwinfo=y
 CONFIG_PACKAGE_libiwinfo-lua=y
+CONFIG_PACKAGE_libpopt=y
 CONFIG_PACKAGE_liblua=y
 CONFIG_PACKAGE_libuci-lua=y
+CONFIG_PACKAGE_logrotate=y
 CONFIG_PACKAGE_lua=y
 CONFIG_PACKAGE_luafilesystem=y
 CONFIG_PACKAGE_print3d=y

extra/openwrt-supplement-files/root/.profile

@@ -1,2 +0,0 @@
-alias d='ls -la --color=auto'
-alias wopkg='/usr/share/lua/wifibox/opkg.conf'

extra/scripts/attach-license.lua

@@ -254,6 +254,8 @@ local function main()
 			else
 				print("error: file '" .. f .. "' has uncommitted changes in git, refusing to process")
 			end
+		elseif processType == false then
+			print("Skipping excluded file '" .. f .. "'")
 		end
 	end
 end

extra/scripts/create-wifibox-updates-dir.sh

@@ -1,188 +0,0 @@
-#!/bin/sh
-
-# NOTE: this script generates an index based on images found in the target directory.
-# So make sure it contains all images ever released (unless you want to actually remove them).
-# If this is not the case, first create a mirror of doodle3d.com/updates/images.
-
-#prevent being run as root (which is dangerous)
-if [ "$(id -u)" == "0" ]; then
-   echo "Don't run this script as root, it is potentially dangerous." 1>&2
-   exit 1
-fi
-
-
-# expects path of file to return the size of
-fileSize() {
-	stat -f %z ${1}
-}
-
-# expects arguments: version, devType, sysupgrade|factory
-# image name will be: '${IMAGE_BASENAME}-<version>-<devType>-<sysupgrade|factory>.bin'
-constructImageName() {
-	if [ $# -lt 3 ]; then echo "incorrect usage of constructImageName()"; exit 1; fi
-	echo "${IMAGE_BASENAME}-${1}-${2}-${3}.bin"
-}
-
-# expects arguments: basePath (where the files are), version, devType
-generateIndexEntry() {
-	if [ $# -lt 3 ]; then echo "incorrect usage of generateIndexEntry()"; exit 1; fi
-
-	sysupgrade_out_basename=`constructImageName ${2} ${3} sysupgrade`
-	factory_out_basename=`constructImageName ${2} ${3} factory`
-	sysupgrade_out_file=${1}/${sysupgrade_out_basename}
-	factory_out_file=${1}/${factory_out_basename}
-
-	sysupgrade_filesize=`fileSize ${sysupgrade_out_file}`
-	factory_filesize=`fileSize ${factory_out_file}`
-	sysupgrade_md5sum=`md5 -q ${sysupgrade_out_file}`
-	factory_md5sum=`md5 -q ${factory_out_file}`
-	echo "Version: ${2}" >> $IMG_INDEX_FILE
-	echo "Files: ${sysupgrade_out_basename}; ${factory_out_basename}" >> $IMG_INDEX_FILE
-	echo "FileSize: ${sysupgrade_filesize}; ${factory_filesize}" >> $IMG_INDEX_FILE
-	echo "MD5: ${sysupgrade_md5sum}; ${factory_md5sum}" >> $IMG_INDEX_FILE
-}
-
-
-OPENWRT_BASE=.
-PKG_SRC_DIR=$OPENWRT_BASE/bin/ar71xx/packages
-PKG_DEST_SUBPATH=updates
-MAKE_INDEX_SCRIPT=$OPENWRT_BASE/scripts/ipkg-make-index.sh
-INDEX_FILE=Packages
-INDEX_GZ_FILE=Packages.gz
-DEVICE_TYPES="tl-mr3020 tl-wr703"
-MAX_GOOD_IMAGE_SIZE=3500000
-IMAGE_BASENAME="doodle3d-wifibox"
-
-COMPRESS_RESULT=0
-PKG_DEST_BASE=.
-
-
-for arg in "$@"; do
-	case $arg in
-		-h)
-			echo "This script creates a directory with wifibox and ultifi ipk files found in the openWrt build environment."
-			echo "The feed dir is called $PKG_DEST_DIR and will be created in the current directory. (currently `pwd`)"
-			echo "If specified, the -z option also compresses the result for easier transfer to a webserver."
-			exit
-			;;
-		-z)
-			COMPRESS_RESULT=1
-			;;
-		-*)
-			echo "Unrecognized option '$arg'"
-			exit 1
-			;;
-		*)
-			PKG_DEST_BASE=$arg
-			;;
-	esac
-done
-
-grep "^This is the buildsystem for the OpenWrt Linux distribution\.$" README >/dev/null 2>&1
-if [ $? -ne 0 ]; then
-	echo "Please run this script from the Openwrt build root (on OSX this is probably an image mounted under /Volumes)."
-	exit 1
-fi
-
-
-#determine the wifibox root path
-my_rel_dir=`dirname $0`
-pushd "$my_rel_dir" > /dev/null
-WIFIBOX_DIR="`pwd`/../.."
-popd > /dev/null
-
-FW_VERSION=`cat $WIFIBOX_DIR/src/FIRMWARE-VERSION`
-echo "Compiling firmware update files for version ${FW_VERSION}"
-
-
-#setup paths
-PKG_DEST_DIR=$PKG_DEST_BASE/$PKG_DEST_SUBPATH
-PKG_FEED_DIR=$PKG_DEST_DIR/feed
-PKG_IMG_DIR=$PKG_DEST_DIR/images
-IMG_INDEX_FILE=$PKG_IMG_DIR/wifibox-image.index
-
-if [ ! -d $PKG_DEST_DIR ]; then mkdir -p $PKG_DEST_DIR; fi
-echo "Using $PKG_DEST_DIR as target directory"
-
-
-#clear directory and copy package files
-if [ ! -d $PKG_FEED_DIR ]; then mkdir $PKG_FEED_DIR; fi
-cp $PKG_SRC_DIR/wifibox*.ipk $PKG_FEED_DIR
-cp $PKG_SRC_DIR/doodle3d-client*.ipk $PKG_FEED_DIR
-cp $PKG_SRC_DIR/print3d*.ipk $PKG_FEED_DIR
-cp $PKG_SRC_DIR/ultifi*.ipk $PKG_FEED_DIR
-rm -f $PKG_FEED_DIR/$INDEX_FILE
-rm -f $PKG_FEED_DIR/$INDEX_GZ_FILE
-
-
-#copy and rename images
-if [ ! -d $PKG_IMG_DIR ]; then mkdir $PKG_IMG_DIR; fi
-rm -f $IMG_INDEX_FILE
-for devtype in $DEVICE_TYPES; do
-	IMG_SRC_PATH=$OPENWRT_BASE/bin/ar71xx
-	if [ -f $IMG_SRC_PATH/openwrt-ar71xx-generic-${devtype}-v1-squashfs-sysupgrade.bin ]; then
-		sysupgrade_name=$IMG_SRC_PATH/openwrt-ar71xx-generic-${devtype}-v1-squashfs-sysupgrade.bin
-		factory_name=$IMG_SRC_PATH/openwrt-ar71xx-generic-${devtype}-v1-squashfs-factory.bin
-		sysupgrade_size=`fileSize $sysupgrade_name`
-		factory_size=`fileSize $factory_name`
-
-		echo "Copying images for device '${devtype}' (sysupgrade size: ${sysupgrade_size}, factory size: ${factory_size})"
-		cp $sysupgrade_name $PKG_IMG_DIR/`constructImageName ${FW_VERSION} ${devtype} sysupgrade`
-		cp $factory_name $PKG_IMG_DIR/`constructImageName ${FW_VERSION} ${devtype} factory`
-
-		if [ $sysupgrade_size -gt $MAX_GOOD_IMAGE_SIZE ]; then
-			echo "WARNING: the sysupgrade image is larger than $MAX_GOOD_IMAGE_SIZE bytes, which probably means it will cause read/write problems when flashed to a device"
-		fi
-	fi
-done
-
-
-# ok this is ugly, but at least it generates a complete index (the loop assumes for each
-# sysupgrade image it finds, there is also a factory counterpart)
-for file in $PKG_IMG_DIR/${IMAGE_BASENAME}-*-sysupgrade.bin; do
-	basefile=`basename ${file}`
-	echo "Considering $basefile (${file})"
-	# sorry for the shell magic
-	devtype=${basefile:`expr ${#IMAGE_BASENAME} + 1`}
-	version=${devtype//-*}
-	devtype=${devtype#*-}
-	devtype=${devtype%-*}
-	generateIndexEntry $PKG_IMG_DIR $version $devtype >> $IMG_INDEX_FILE
-done
-
-
-# NOTE: the aliasing construct in the indexing script does not work (and even then, the md5 command defaults to a different output format), so we hack around it here.
-MD5_HACK_ENABLED=0
-which md5sum >/dev/null 2>&1
-if [ $? -eq 1 ]; then
-	MD5_HACK_ENABLED=1
-	TEMPBIN_DIR=/tmp/tempbin23QQDBR
-	mkdir $TEMPBIN_DIR
-
-	cat <<EOF > $TEMPBIN_DIR/md5sum
-`type -p md5` -q \$1
-EOF
-
-	chmod +x $TEMPBIN_DIR/md5sum
-	PATH=$PATH:$TEMPBIN_DIR
-fi
-
-#this cwd juggling is required to have the package indexer generate correct paths (i.e. no paths) in the Packages file
-OPENWRT_DIR=`pwd`
-pushd $PKG_FEED_DIR > /dev/null
-$OPENWRT_DIR/$MAKE_INDEX_SCRIPT . > $PKG_FEED_DIR/$INDEX_FILE
-popd > /dev/null
-
-if [ $MD5_HACK_ENABLED -eq 1 ]; then
-	rm $TEMPBIN_DIR/md5sum
-	rmdir $TEMPBIN_DIR
-fi
-
-gzip -c $PKG_FEED_DIR/$INDEX_FILE > $PKG_FEED_DIR/$INDEX_GZ_FILE
-
-
-if [ $COMPRESS_RESULT -eq 1 ]; then
-	cd $PKG_DEST_BASE
-	echo "Compressing generated package directory..."
-	tar czvf "doodle3d-wifibox-update-dist.tgz" $PKG_DEST_SUBPATH
-fi

extra/scripts/publish-wifibox-release.lua

@@ -0,0 +1,531 @@
+#!/usr/bin/env lua
+--#!/usr/bin/env lua -l strict
+
+-- This script creates a new release by copying openwrt image files and release notes to a local
+-- directory and updating the relevant index file with a new entry. This directory is
+-- then synchronized to the release repository online.
+--
+-- USAGE:
+-- The only dependency of this script are the penlight and luafilesystem libraries, which can be installed using
+-- LuaRocks (http://luarocks.org/) as follows:
+-- $ sudo luarocks install penlight
+-- If the penlight libary is not found you might need to add the following to /etc/launchd.conf
+-- setenv LUA_CPATH /opt/local/share/luarocks/lib/lua/5.2/?.so
+-- setenv LUA_PATH /opt/local/share/luarocks/share/lua/5.2/?.lua
+-- Reboot
+-- Also see: https://github.com/keplerproject/luarocks/wiki/Using-LuaRocks#rocks-trees-and-the-lua-libraries-path
+--
+-- Lua + Luarocks installation on Linux:
+--   $ sudo apt-get install lua5.2 liblua5.2-dev
+--   # Build Luarocks from source, configured for lua 5.2:
+--   $ wget http://luarocks.org/releases/luarocks-2.2.2.tar.gz
+--   $ tar zxpf luarocks-2.2.2.tar.gz
+--   $ cd luarocks-2.2.2
+--   $ ./configure --lua-version=5.2
+--   $ sudo make bootstrap
+-- This script will automatically locate the Doodle3D repo's.
+-- Index files are fetched from the online repository.
+-- For synchronizing, rsync must have passwordless SSH access to the server, for a
+-- guide, see: http://www.linuxproblem.org/art_9.html.
+-- The scrips expects a alias named 'doodle3d.com', you can add this editing the following file:
+-- .ssh/config
+-- and adding
+-- Host doodle3d.com
+--        User webmaster@doodle3d.com
+--        HostName ftp.greenhost.nl
+-- Some basic sanity checks are built in (unique version, updated release notes, 'clean' openwrt config)
+-- but lots others are still missing (mainly: clean git repo's, freshly built images).
+-- The script must be run from within the openwrt build root. So it's handy to create a symlink
+-- to this file. You could to something like from the build root:
+-- ln -s ~/wrt-wifibox-feed/doodle3d-firmware/extra/scripts/publish-wifibox-release.lua .
+-- Then you can start with:
+-- cd trunk ../publish-wifibox-release.lua
+-- Before anything is actually uploaded, you will be asked if that's really what you want to do.
+-- It might be wise to make a backup on the server before updating it, there's a script
+-- to do this on the server: '~/backup-updates-dir.sh'.
+--
+-- To play around with or improve on this script, use and modify the variables 'SERVER_HOST'
+-- and 'SERVER_PATH' below to point to your machine (assuming you have a webserver running there).
+-- Also uncomment and modify UPDATER_BASE_URL. You will have to init the local 'repo' with at
+-- least empty index files ('wifibox-image.index' and 'wifibox-image.beta.index'), or you
+-- could of course mirror the online repository.
+--
+-- TODO (in random order):
+-- * (feature) command-line arguments: overrides, verbosity, allow local mirroring, clear local cache dir, etc.
+-- * (feature) automatically create a backup of the online repo (there's already a script fir this, as mentioned above)
+-- * (feature) check whether git repo's are clean and on correct branch
+-- * (feature) allow local mirroring with a reverse rsync command and rebuilding the indexes
+--   - update manager 'cache' should then be enabled to prevent fetchIndexTable from downloading files
+-- * (feature) automatically (re)build openwrt to ensure it is up to date?
+-- * (feature) update package feed (requires a local mirror for the feed indexing script)
+--   - in this case sanity checks must also be run on package versions/revisions
+-- * (feature) automatically tag (and merge?) git commits?
+-- * (feature) execute as dry-run by default so changes can be reviewed?
+-- * (refactor) rename awkward vars/funcs regarding entries, versions and caches...
+-- * (refactor) replace function arguments 'includeBetas' with a set function like setUseCache to improve readability
+-- * (refactor) replace prints with D() function from update manager or other slightly smarter mechanisms?
+
+local function ERR(msg) print(msg) end
+
+local ok, pl = pcall(require, 'pl.import_into')
+if not ok then
+	ERR('This script requires the Penlight library')
+	os.exit(2)
+end
+pl = pl()
+local um --- update manager module, will be loaded later through @{loadUpdateManager}
+
+local ok, lfs = pcall(require, 'lfs')
+if not ok then
+	ERR('This script requires the LuaFileSystem library')
+	os.exit(2)
+end
+
+-----------------------------
+-- CONSTANTS AND VARIABLES --
+-----------------------------
+
+--local SERVER_HOST = 'localhost'
+--local SERVER_PATH = '~USERDIR/public_html/wifibox/updates'
+--local UPDATER_BASE_URL = 'http://localhost/~USERDIR/wifibox/updates'
+local SERVER_HOST = 'doodle3d.com'
+local SERVER_PATH = 'doodle3d.com/DEFAULT/updates'
+--- SERVER_HOST and SERVER_PATH are used by rsync to merge the local working directory
+-- back into the online repository (requires functioning public key SSH access).
+-- UPDATER_BASE_URL is used by the d3d-updater script to download the index files
+-- (over HTTP), it defaults to the doodle3d.com online repo so it should only be
+-- used for development purposes.
+
+local D3D_REPO_FIRMWARE_NAME = 'doodle3d-firmware'
+local D3D_REPO_CLIENT_NAME = 'doodle3d-client'
+local D3D_REPO_PRINT3D_NAME = 'print3d'
+local IMAGE_BASENAME = 'doodle3d-wifibox'
+local BACKUP_FILE_SUFFIX = 'bkp'
+local RELEASE_NOTES_FILE = "ReleaseNotes.md"
+local RSYNC_TIMEOUT = 20
+local MAX_VIABLE_IMAGE_SIZE = 3500000
+
+local deviceType = 'tl-mr3020' -- or 'tl-wr703'
+local lock = nil
+local paths = {}
+
+
+
+-----------------------
+-- UTILITY FUNCTIONS --
+-----------------------
+
+local function loadUpdateManager()
+	package.path = package.path .. ';' .. pl.path.join(paths.firmware, 'src') .. '/?.lua'
+	local argStash = arg
+	arg = nil
+	um = require('script.d3d-updater') -- arg must be nil for the update manager to load as module
+	arg = argStash
+end
+
+local function quit(ev)
+	if lock then lock:free() end
+	os.exit(ev or 0)
+end
+
+local function md5sum(file)
+	-- try OS X specific md5 utility
+	local rv,_,sum = pl.utils.executeex('md5 -q "' .. file .. '"')
+	if rv then
+		return rv and sum:sub(1, -2) or nil
+	end
+	-- try Linux md5sum utility
+	local rv,_,output = pl.utils.executeex('md5sum "' .. file .. '"')
+	local md5 = string.match(output, "[^%s]+")
+	return md5
+end
+
+local function getYesNo(question)
+	local answer
+	repeat
+		io.write(question)
+		io.flush()
+		answer = io.stdin:read('*line'):lower()
+	until answer == 'yes' or answer == 'y' or answer == 'no' or answer == 'n'
+
+	return (answer:sub(1, 1) == 'y') and true or false
+end
+
+local function detectRootPrivileges()
+	local rv,_,userId = pl.utils.executeex('id -u')
+	if not rv then return nil end
+
+	return tonumber(userId) == 0 and true or false
+end
+
+local function findInFile(needle, file)
+	local f = io.open(file, 'r')
+	if not f then return nil,"could not open file" end
+
+	local t = f:read('*all')
+	return not not t:find(needle, 1, true)
+end
+
+local function fileExists(path)
+    local attr = lfs.attributes (path)
+    return attr ~= nil
+end
+
+local function detectBuildroot()
+	if not fileExists("customfeeds") or not fileExists("bin") then
+		return false
+	else
+		return true
+	end
+end
+
+-- returns uri (file path) of the wifibox feed, nil if not found or nil+msg on error
+-- recognized feed names are 'wifibox' and 'doodle3d' (case-insensitive)
+local function getWifiboxFeedRoot(feedsFile)
+	local typ, nam, uri = nil, nil, nil
+	local lineNo = 1
+	local f = io.open(feedsFile, 'r')
+
+	if not f then return nil, "could not open '" .. feedsFile .. '"' end
+
+	for line in f:lines() do
+		typ, nam, uri = line:match('^([^%s]+)%s+([^%s]+)%s+([^%s]+)$')
+
+		if not (typ and nam and uri) then
+			f:close()
+			return uri or nil, "could not parse line " .. feedsFile .. "#" .. lineNo
+		end
+
+		local commented = (typ:find('#') == 1)
+		if not commented and (nam:lower() == 'wifibox' or nam:lower() == 'doodle3d') then
+			break
+		else
+			typ, nam, uri = nil, nil, nil
+		end
+
+		lineNo = lineNo + 1
+	end
+
+	if uri and not (typ == 'src-link' or typ == 'src-cpy') then return nil, "d3d feed has wrong type '" .. typ .. "', use 'src-link' or 'src-cpy'" end
+
+	f:close()
+	return uri
+end
+
+-- TODO: pass table to functions to fill in? if they all return either true or nil+msg, that could be used for display of ok/msg
+-- returns true on success, false on error, and displays meaningful messages
+--local function runCheck(msg, processFunc)
+--	io.write(msg .. "... ")
+--	return processFunc(--[[ hmm ]]--)
+--end
+
+local function runAction(actMsg, errMsg, ev, func)
+	io.write("* " .. actMsg .. "...")
+	local rv,err = func()
+	if not rv then
+		if err then print("Error: " .. errMsg .. " (" .. err .. ")")
+		else print("Error: " .. errMsg)
+		end
+		quit(ev)
+	else
+		print("ok")
+	end
+
+	return true
+end
+
+
+local function constructImageName(version, devType, sysupOrFactory)
+	return IMAGE_BASENAME .. '-' .. um.formatVersion(version) .. '-' .. devType .. '-' .. sysupOrFactory .. '.bin'
+end
+
+local function imageCachePath()
+	return pl.path.join(paths.cache, 'images')
+end
+
+local function ensureFilePresent(src, tgt)
+--	print("About to copy '" .. src .. "' => '" .. tgt .. "'")
+	local srcMd5, tgtMd5 = md5sum(src), md5sum(tgt)
+
+	if not srcMd5 then return nil,"source file does not exist" end
+	if tgtMd5 and srcMd5 ~= tgtMd5 then return nil,"target file already exists but is different from source file" end
+
+	if not tgtMd5 then
+		if not pl.file.copy(src, tgt, false) then return nil,"could not copy file" end
+	end
+
+	return true
+end
+
+
+
+--------------------
+-- MAIN FUNCTIONS --
+--------------------
+
+local function prepare()
+	local msg = nil
+
+	io.write("* Looking for Doodle3D feed path... ")
+	-- local d3dFeed,msg = getWifiboxFeedRoot('feeds.conf')
+	-- if d3dFeed then
+	-- 	print("found " .. d3dFeed)
+	-- else
+	-- 	if msg then print("not found: " .. msg) else print("not found.") end
+	-- 	return nil
+	-- end
+	local d3dFeed = "customfeeds"
+
+	paths.firmware = pl.path.join(d3dFeed, D3D_REPO_FIRMWARE_NAME)
+	paths.client = pl.path.join(d3dFeed, D3D_REPO_CLIENT_NAME)
+	paths.print3d = pl.path.join(d3dFeed, D3D_REPO_PRINT3D_NAME)
+
+	-- if empty, try to choose something sensible
+	if not paths.cache or paths.cache == '' then
+		--paths.cache = pl.app.appfile('')
+		paths.cache = '/tmp/d3d-release-dir'
+	end
+	io.write("* Attempting to use " .. paths.cache .. " as cache dir... ")
+	local rv,msg = pl.dir.makepath(paths.cache)
+	if not rv then
+		print("could not create path (" .. msg .. ").")
+		return nil
+	end
+
+	loadUpdateManager()
+
+	local rv,msg = pl.dir.makepath(imageCachePath())
+	if not rv then
+		print("could not create images dir (" .. msg .. ").")
+		return nil
+	end
+
+	lock,msg = lfs.lock_dir(paths.cache)
+	if not lock then
+		print("could not obtain directory lock (" .. msg .. ").")
+		return nil
+	else
+		print("ok")
+	end
+
+		-- initialize update manager script
+	um.setUseCache(false)
+	um.setVerbosity(1)
+	um.setCachePath(imageCachePath())
+	if type(UPDATER_BASE_URL) == 'string' and UPDATER_BASE_URL:len() > 0 then
+		print("* Using updater base URL: '" .. UPDATER_BASE_URL .. "'")
+		um.setBaseUrl(UPDATER_BASE_URL)
+	else
+		print("* Using updater base URL: d3d-updater default")
+	end
+
+	print("* Using rsync server remote: '" .. SERVER_HOST .. "/" .. SERVER_PATH .. "'")
+
+	return true
+end
+
+local function collectLocalInfo()
+	local info = {}
+
+	-- temporary fields required for copying image files
+	info.factoryImgPath = pl.path.join(paths.root, 'bin/ar71xx/openwrt-ar71xx-generic-' .. deviceType .. '-v1-squashfs-factory.bin')
+	info.sysupgradeImgPath = pl.path.join(paths.root, 'bin/ar71xx/openwrt-ar71xx-generic-' .. deviceType .. '-v1-squashfs-sysupgrade.bin')
+
+	info.version = um.parseVersion(pl.file.read(pl.path.join(paths.firmware, 'src/FIRMWARE-VERSION')))
+	if not info.version then return nil,"could not determine current firmware version" end
+
+	info.factoryFileSize = pl.path.getsize(info.factoryImgPath)
+	if not info.factoryFileSize then return nil,"could not determine size for factory image" end
+
+	info.sysupgradeFileSize = pl.path.getsize(info.sysupgradeImgPath)
+	if not info.sysupgradeFileSize then return nil,"could not determine size for sysupgrade image" end
+
+	info.factoryMD5 = md5sum(info.factoryImgPath)
+	info.sysupgradeMD5 = md5sum(info.sysupgradeImgPath)
+	if not info.factoryMD5 or not info.sysupgradeMD5 then return nil,"could not determine MD5 sum for image(s)" end
+
+	info.factoryFilename = constructImageName(info.version, deviceType, 'factory')
+	info.sysupgradeFilename = constructImageName(info.version, deviceType, 'sysupgrade')
+	info.timestamp = os.time()
+
+	return info
+end
+
+local function fetchVersionInfo()
+	local msg,stables,betas = nil,nil,nil
+
+	stables,msg = um.getAvailableVersions('stables')
+	if not stables then return nil,msg end
+
+	betas,msg = um.getAvailableVersions('betas')
+	if not betas then return nil,msg end
+
+	return stables, betas
+end
+
+local function generateIndex(newVersion, versionTable, isStable)
+	local indexFilename = isStable and um.IMAGE_STABLE_INDEX_FILE or um.IMAGE_BETA_INDEX_FILE
+	versionTable[#versionTable+1] = newVersion
+	local sortedVers = pl.List(versionTable)
+	sortedVers:sort(function(a, b)
+		return um.compareVersions(a.version, b.version, a.timestamp, b.timestamp) < 0
+	end)
+
+	local indexPath = pl.path.join(imageCachePath(), indexFilename)
+	local rv = pl.file.copy(indexPath, pl.path.join(paths.cache, indexFilename..'.'..BACKUP_FILE_SUFFIX))
+	if not rv then return nil,"could not backup index file" end
+
+	local idxFile = io.open(pl.path.join(imageCachePath(), indexFilename), 'w')
+	if not idxFile then return nil,"could not open index file for writing" end
+
+	sortedVers:foreach(function(el)
+		idxFile:write("Version: " .. um.formatVersion(el.version) .. "\n")
+		idxFile:write("Files: " .. el.sysupgradeFilename .. "; " .. el.factoryFilename .. "\n")
+		idxFile:write("FileSize: " .. el.sysupgradeFileSize .. "; " .. el.factoryFileSize .. "\n")
+		idxFile:write("MD5: " .. el.sysupgradeMD5 .. "; " .. el.factoryMD5 .. "\n")
+		if el.timestamp then idxFile:write("ReleaseDate: " .. um.formatDate(el.timestamp) .. "\n") end
+	end)
+
+	idxFile:close()
+	return 0
+end
+
+local function copyImages(newVersion)
+	local rv,msg
+	rv,msg = ensureFilePresent(newVersion.factoryImgPath, pl.path.join(imageCachePath(), newVersion.factoryFilename))
+	if not rv then return nil,msg end
+
+	rv,msg = ensureFilePresent(newVersion.sysupgradeImgPath, pl.path.join(imageCachePath(), newVersion.sysupgradeFilename))
+	if not rv then return nil,msg end
+
+	return true
+end
+
+local function copyReleaseNotes(newVersion)
+	local srcReleaseNotesPath = pl.path.join(paths.firmware, RELEASE_NOTES_FILE)
+	local tgtReleaseNotesPath = pl.path.join(imageCachePath(), RELEASE_NOTES_FILE)
+
+	if not findInFile(um.formatVersion(newVersion.version), srcReleaseNotesPath) then
+		return nil,"version not mentioned in release notes file"
+	end
+
+	if pl.path.isfile(tgtReleaseNotesPath) then
+		local rv = pl.file.copy(tgtReleaseNotesPath, tgtReleaseNotesPath..'.'..BACKUP_FILE_SUFFIX)
+		if not rv then return nil,"could not backup file" end
+	end
+
+	local rv = pl.file.copy(srcReleaseNotesPath, tgtReleaseNotesPath)
+	if not rv then return nil,"could not copy file" end
+
+	return true
+end
+
+-- TODO: the packages are not really used and the openwrt script to generate the
+-- package index requires all packages to be present so this has been skipped for now
+local function buildFeedDir()
+	local scriptPath = pl.path.join(paths.root, 'scripts/ipkg-make-index.sh')
+
+	return nil
+end
+
+local function uploadFiles()
+	local serverUrl = SERVER_HOST..':'..SERVER_PATH
+	-- rsync options are: recursive, preserve perms, symlinks and timestamps, be verbose and use compression
+	local cmd = "rsync -rpltvz -e ssh --progress --timeout=" .. RSYNC_TIMEOUT .. " --exclude '*.bkp' --exclude 'lockfile.lfs' " .. paths.cache .. "/* " .. serverUrl
+	print("Running command: '" .. cmd .. "'")
+	local rv,ev = um.compatexecute(cmd)
+	return rv and true or nil,("rsync failed, exit status: " .. ev)
+end
+
+local function main()
+	print("\nDoodle3D release script")
+	if detectRootPrivileges() then
+		print("Error: refusing to run script as root.")
+		quit(99)
+	end
+
+--	local opts = parseOptions(arg)
+--
+--	if opts['wrt-root'] then changedir(opts['wrt-root']) end
+--	if opts['cache-dir'] then paths.cache = opts['cache-dir'] end
+-- more options: clear cache, rebuild (download all and generate index from actual files), dry-run, force
+
+	io.write("* Checking if working directory is the Buildroot... ")
+	local isBuildroot = detectBuildroot()
+	if isBuildroot then
+		paths.root = pl.path.currentdir()
+		print("found " .. paths.root)
+	else
+		print("unrecognized directory, try changing directories or using -wrt-root")
+		return nil
+	end
+
+	if not prepare() then quit(1) end
+
+
+	local newVersion,msg = collectLocalInfo()
+	if not newVersion then
+		print("Error: could not collect local version information (" .. msg .. ")")
+		quit(3)
+	end
+
+	local stables,betas = fetchVersionInfo()
+	if not stables then
+		print("Error: could not get version information (" .. betas .. ")")
+		quit(1)
+	end
+
+	--TODO: if requested, fetch images and packages (i.e., mirror whole directory)
+
+--	pl.pretty.dump(newVersion)
+--	print("stables: "); pl.pretty.dump(stables)
+--	print("===========================");
+--	print("betas: "); pl.pretty.dump(betas)
+
+
+	print("\nRunning sanity checks")
+
+	runAction("Checking whether version is unique",
+			"firmware version " .. um.formatVersion(newVersion.version) .. " already exists", 3, function()
+		return not (um.findVersion(newVersion.version, nil, stables) or um.findVersion(newVersion.version, nil, betas)) and true or nil
+	end)
+
+	--TODO: check git repos (`git log -n 1 --pretty=format:%ct` gives commit date of last commit (not author date))
+
+	local isStable = (newVersion.version.suffix == nil)
+	print("\nRolling release for firmware version " .. um.formatVersion(newVersion.version) .. " (type: " .. (isStable and "stable" or "beta") .. ").")
+
+	if newVersion.sysupgradeFileSize > MAX_VIABLE_IMAGE_SIZE then
+		print("Error: sysupgrade image file is too large, it will not run well (max. size: " .. MAX_VIABLE_IMAGE_SIZE .. " bytes)")
+		quit(4)
+	end
+
+	runAction("Copying release notes", "failed", 5, function()
+		return copyReleaseNotes(newVersion)
+	end)
+
+	runAction("Generating new index file", "could not generate index", 5, function()
+		return generateIndex(newVersion, isStable and stables or betas, isStable)
+	end)
+
+	runAction("Copying image files", "could not generate index", 5, function()
+		return copyImages(newVersion)
+	end)
+
+	io.write("* Building package feed directory...")
+	print("skipped - not implemented")
+--	runAction("Building package feed directory", "failed", 5, buildFeedDir)
+
+	local answer = getYesNo("? Are you SURE you want to publish? (y/n) ")
+	if answer ~= true then
+		print("Did not get green light, quitting.")
+		quit(5)
+	end
+
+	runAction("About to sync files to server", "could not upload files", 6, uploadFiles)
+
+	print("Released version " .. um.formatVersion(newVersion.version) .. "!")
+	quit()
+end
+
+main()

extra/scripts/release-wifibox-updates-dir.sh

@@ -1,54 +0,0 @@
-#!/bin/sh
-
-# This script copies the packages feed & images directory to ~/Sites (e.g. for use with XAMPP or the like).
-# Using the -u option, it can also upload to doodle3d.com/updates (make sure ssh automatically uses the correct username, or change the rsync command below).
-# Modify WIFIBOX_BASE_DIR to point to your wifibox directory tree.
-
-WIFIBOX_BASE_DIR=~/Files/_devel/eclipse-workspace/wifibox
-DEST_DIR=~/Sites/wifibox
-UPDATES_DIR=updates
-BASE_URL=doodle3d.com
-
-OPTIONS=$DEST_DIR
-UPLOAD_FILES=0
-
-for arg in "$@"; do
-	case $arg in
-		-h)
-			echo "This script calls 'create-wifibox-updates-dir.sh' to generate feed/image directories in $DEST_DIR"
-			echo "Use '-z' to also create a compressed file containing the 'updates' directory."
-			echo "Used '-u' to also upload the directory to doodle3d.com/updates"
-			exit
-			;;
-		-z)
-			OPTIONS="$OPTIONS -z"
-			;;
-		-u)
-			UPLOAD_FILES=1
-			;;
-		*)
-			echo "Unrecognized option '$arg'"
-			exit 1
-			;;
-	esac
-done
-
-$WIFIBOX_BASE_DIR/extra/scripts/create-wifibox-updates-dir.sh $OPTIONS
-RETURN_VALUE=$?
-if [ $RETURN_VALUE -ne 0 ]; then
-	echo "create-wifibox-updates-dir.sh returned an error (${RETURN_VALUE}), exiting"
-	exit $RETURN_VALUE
-fi
-
-if [ $UPLOAD_FILES -eq 1 ]; then
-	#UPLOAD_PATH=$BASE_URL:public_html/updates
-	UPLOAD_PATH=$BASE_URL:doodle3d.com/DEFAULT/updates
-
-	cat <<-'EOM' > $DEST_DIR/$UPDATES_DIR/.htaccess
-	Options +Indexes
-EOM
-
-	echo "Uploading files to $UPLOAD_PATH (if you are asked for your password, please add an entry to your ~/.ssh/config and upload your public ssh key)"
-	#options are: recursive, preserve perms, symlinks and timestamps, be verbose and use compression
-	rsync -rpltvz -e ssh --progress $DEST_DIR/$UPDATES_DIR/.htaccess $DEST_DIR/$UPDATES_DIR/* $UPLOAD_PATH
-fi

license-spec.lua

@@ -1,6 +1,6 @@
 local M = {
 	BASE_PATH = 'src',
-	EXCLUDE_FILES = { 'src/util/JSON.lua', 'src/util/urlcode.lua' },
+	EXCLUDE_FILES = { 'src/util/JSON.lua', 'src/util/urlcode.lua', 'src/script/loglite%-filters.lua' },
 	PROCESS_FILES = {
 		['src/[^/]*%.lua'] = 'lua',
 		['src/network/[^/]*%.lua'] = 'lua',

post-install.sh

@@ -36,15 +36,18 @@ addFirewallNet() {
 ### Replace the banner with a custom one
 if [ ! -f $IPKG_INSTROOT/etc/banner.default ]; then
 	mv $IPKG_INSTROOT/etc/banner $IPKG_INSTROOT/etc/banner.default
-	cat <<-'EOM' > $IPKG_INSTROOT/etc/banner
-		........D o o d l e 3 D
-		.......________     _____  _____  v \$(PACKAGE_VERSION)
-		....../  /  /  |__ /  __/ /  - /___ __
-		...../  /  /  /--//  _|-//  --| . /v /
-		..../________/__//__/__//____/___/_^_\
-		...
-		..A cad in a box.
-		.
+	cat <<-\EOM > $IPKG_INSTROOT/etc/banner
+		,------.                   ,--.,--.       ,----. ,------.
+		|  .-.  \  ,---.  ,---.  ,-|  ||  | ,---. '.-.  ||  .-.  \
+		|  |  \  :| .-. || .-. |' .-. ||  || .-. :  .' < |  |  \  :
+		|  '--'  /' '-' '' '-' '\ `-' ||  |\   --./'-'  ||  '--'  /
+		`-------'  `---'  `---'  `---' `--' `----'`----' `-------'
+		__          ___ ______ _        ____
+		 \ \        / (_)  ____(_)      |  _ \
+		  \ \  /\  / / _| |__   _ ______| |_) | _____  __
+		   \ \/  \/ / | |  __| | |______|  _ < / _ \ \/ /
+		    \  /\  /  | | |    | |      | |_) | (_) >  <
+		     \/  \/   |_|_|    |_|      |____/ \___/_/\_\
 EOM
 fi
 
@@ -52,17 +55,22 @@ fi
 mkdir -p $IPKG_INSTROOT/root
 grep '^# DO NOT MODIFY.*wifibox package.$' $IPKG_INSTROOT/root/.profile >/dev/null 2>&1
 if [ $? -gt 0 ]; then
-		cat <<-EOM >> $IPKG_INSTROOT/root/.profile
-
+	cat <<-\EOM >> $IPKG_INSTROOT/root/.profile
 		# DO NOT MODIFY - this block of lines has been added by the wifibox package.
 		alias d='ls -la'
-		alias d3dapi='/usr/share/lua/wifibox/script/d3dapi'
 		alias encore='ulimit -c unlimited'
 		alias wopkg='opkg -f /usr/share/lua/wifibox/opkg.conf'
 
+		alias tailfw='loglite /tmp/wifibox.log firmware'
+		tailp3d() {
+		  logfile=/tmp/print3d-ttyACM0.log
+		  if [ $# -gt 0 ]; then logfile=$1; fi
+		  loglite "$logfile" print3d
+		}
+
 		loop() {
-			if [ \$# -lt 2 ]; then echo "Please supply a delay and a command."; return 1; fi
-			DELAY=\$1; shift; while true; do \$@; sleep \$DELAY; done
+		  if [ $# -lt 2 ]; then echo "Please supply a delay and a command."; return 1; fi
+		  DELAY=$1; shift; while true; do $@; sleep $DELAY; done
 		}
 EOM
 fi
@@ -70,38 +78,88 @@ fi
 #preserve saved sketches during firmware update
 echo "/root/sketches" >> $IPKG_INSTROOT/etc/sysupgrade.conf
 
+
+
 ### Finally make sure basic configuration is set correctly
 
-$IPKG_INSTROOT/etc/init.d/wifibox enable
-$IPKG_INSTROOT/etc/init.d/wifibox start
-$IPKG_INSTROOT/etc/init.d/dhcpcheck enable
+LOGROTATE_CRON_LINE="*/2 *   *   *   *   /usr/sbin/logrotate /etc/logrotate.conf"
 
 if [ -z "$IPKG_INSTROOT" ]; then
-	echo "Enabling wifi device..."
-	uci set wireless.@wifi-device[0].disabled=0; uci commit wireless; wifi
+	# No installation root, we are being installed on a live box so run uci commands directly.
+
+	echo "Enabling and configuring wifi device..."
+	uci set wireless.@wifi-device[0].disabled=0
+	uci delete wireless.radio0.channel
+	uci commit wireless; wifi
+
+	echo "Disabling default route and DNS server for lan network interface..."
+	uci set dhcp.lan.dhcp_option='3 6'
+	uci commit dhcp; /etc/init.d/dnsmasq reload
 
 	addFirewallNet
 
 	echo "Adding network interface 'wlan'..."
-	uci set network.wlan=interface; uci commit network; /etc/init.d/network reload
+	uci set network.wlan=interface
+	uci commit network; /etc/init.d/network reload
+
+	echo "Setting default wifibox log level..."
+	uci set wifibox.general.system_log_level='info'
+	uci -q delete wifibox.system.loglevel  # remove key used in older versions (<=0.10.8a) if it exists
+	uci commit wifibox
+
+	crontab -l 2> /dev/null | grep logrotate\.conf > /dev/null
+	if [ $? -ne 0 ]; then
+		# add line, method from http://askubuntu.com/a/58582
+		# Note: `crontab -l` will throw an error to stderr because the file does not exist, but that does not matter
+		(crontab -l 2> /dev/null; echo "$LOGROTATE_CRON_LINE" ) | crontab -
+	fi
 
 else
-	# Create a script to setup the system as wifibox, it will be deleted after it has been run, except if it returns > 0
+	# Create a script to setup the system as wifibox, it will be deleted after it has been run, except if it returns > 0.
+
 	cat <<-EOM >> $IPKG_INSTROOT/etc/uci-defaults/setup-wifibox.sh
 	uci set system.@system[0].hostname=wifibox
 	uci set system.@system[0].log_size=64
 	uci set network.lan.ipaddr=192.168.5.1
 	echo -e "beta\nbeta" | passwd root
 
+	# uhttpd config: https://wiki.openwrt.org/doc/uci/uhttpd#server_settings
 	uci set uhttpd.main.lua_handler='/usr/share/lua/wifibox/main.lua'
 	uci set uhttpd.main.lua_prefix='/d3dapi'
+	uci set uhttpd.main.max_requests='10'
 
 	uci set wireless.@wifi-device[0].disabled=0
+	uci delete wireless.radio0.channel
 	# TODO: add firewall net
 	uci set network.wlan=interface
+
+	uci set dhcp.lan.dhcp_option='3 6'
+
+	uci set wifibox.general.system_log_level='info'
+	uci -q delete wifibox.system.loglevel  # remove key used in older versions (<=0.10.8a) if it exists
+
+	# update wifibox's config for config changes in 0.10.10
+	uci set wifibox.system.log_path='/tmp'
+	uci set wifibox.system.api_log_filename='wifibox.log'
+	uci set wifibox.system.p3d_log_basename='print3d'
+
+	crontab -l 2> /dev/null | grep logrotate\.conf > /dev/null
+	if [ $? -ne 0 ]; then
+		# add line, method from http://askubuntu.com/a/58582
+		# Note: `crontab -l` will throw an error to stderr because the file does not exist, but that does not matter
+		(crontab -l 2> /dev/null; echo "$LOGROTATE_CRON_LINE" ) | crontab -
+	fi
+
+	exit 0
 EOM
 
 	echo "WARNING: WiFiBox network configuration can only be fully prepared when installing on real device"
 fi
 
+$IPKG_INSTROOT/etc/init.d/wifibox enable
+$IPKG_INSTROOT/etc/init.d/wifibox start
+$IPKG_INSTROOT/etc/init.d/dhcpcheck enable
+$IPKG_INSTROOT/etc/init.d/cron enable
+$IPKG_INSTROOT/etc/init.d/cron start
+
 exit 0

src/FIRMWARE-VERSION

@@ -1 +1 @@
-0.10.0
+0.11.0

src/conf_defaults.lua

@@ -19,7 +19,7 @@
 -- - _description_: A descriptive text usable by API clients
 -- - _min_, _max_, _regex_: optional constraints (min and max constrain value for numbers, or length for strings)
 -- - _isValid_: an optional function which should return true for valid values and false for invalid ones
--- - _subSection: optional: setting name of which current value is used as the uci section where this setting should be loaded from. Otherwise it's retrieved from the generic section. Setting subsection also means it will first try to get a default from subconf_defaults, if that doesn't exsist it will use the regular default  
+-- - _subSection: optional: setting name of which current value is used as the uci section where this setting should be loaded from. Otherwise it's retrieved from the generic section. Setting subsection also means it will first try to get a default from subconf_defaults, if that doesn't exsist it will use the regular default
 -- The configuration keys themselves document themselves rather well, hence they are not included in the generated documentation.
 --
 -- NOTE: the all-caps definitions should be changed into configuration keys, or moved to a better location.
@@ -36,6 +36,8 @@ M.DEBUG_PCALLS = false
 
 --- This constant enables debugging of the REST API from the command-line by emulating GET/POST requests.
 -- Specify the path and optionally the request method as follows: `d3dapi p=/mod/func r=POST`.
+-- Note that the command-line script redirects the output streams to '/tmp/wifibox.stdout.log',
+-- meaning that any stack traces can be found there.
 M.DEBUG_API = true
 
 --- If enabled, REST responses will contain 'module' and 'function' keys describing what was requested.
@@ -44,6 +46,22 @@ M.API_INCLUDE_ENDPOINT_INFO = false
 --- This base path is used in @{rest.response}. It includes any base path if necessary (e.g. 'localhost/~user').
 M.API_BASE_URL_PATH = 'doodle3d.com'
 
+M.system_log_level = {
+	default = 'info',
+	type = 'string',
+	description = 'Log level for firmware and print server',
+	isValid = function(value)
+		-- Note: level names mimic those in print3d
+		levelNames = { 'quiet', 'error', 'warning', 'info', 'verbose', 'bulk' }
+		for i,v in ipairs(levelNames) do
+			if value == v then
+				return true
+			end
+		end
+		return false, 'not one of '..table.concat(levelNames, ',')
+	end
+}
+
 M.network_ap_ssid = {
 	default = 'Doodle3D-%%MAC_ADDR_TAIL%%',
 	type = 'string',
@@ -104,8 +122,19 @@ M.printer_type = {
 M.printer_dimensions_x = {
 	default = 200,
 	default_delta_rostockmax = 0,
+	default__3Dison_plus = 227,
 	default_deltamaker = 0,
 	default_kossel = 0,
+	default_minifactory = 150,
+	default_lulzbot_taz_4 = 298,
+	default_ultimaker2go = 120,
+	default_renkforce_rf100 = 100,
+	default_doodle_dream = 120,
+	default_wanhao_duplicator4 = 210,
+	default_colido_2_0_plus = 230,
+	default_colido_x3045 = 300,
+	default_colido_compact = 130,
+	default_craftbot_plus = 250,
 	subSection = 'printer_type',
 	type = 'int',
 	description = '',
@@ -114,8 +143,18 @@ M.printer_dimensions_x = {
 M.printer_dimensions_y = {
 	default = 200,
 	default_delta_rostockmax = 0,
+	default__3Dison_plus = 148,
 	default_deltamaker = 0,
 	default_kossel = 0,
+	default_minifactory = 150,
+	default_lulzbot_taz_4 = 275,
+	default_ultimaker2go = 120,
+	default_renkforce_rf100 = 100,
+	default_doodle_dream = 120,
+	default_wanhao_duplicator4 = 140,
+	default_colido_2_0_plus = 150,
+	default_colido_x3045 = 300,
+	default_colido_compact = 130,
 	subSection = 'printer_type',
 	type = 'int',
 	description = '',
@@ -123,6 +162,17 @@ M.printer_dimensions_y = {
 }
 M.printer_dimensions_z = {
 	default = 200,
+	default_minifactory = 155,
+	default__3Dison_plus = 150,
+	default_lulzbot_taz_4 = 250,
+	default_ultimaker2go = 112,
+	default_renkforce_rf100 = 100,
+	default_doodle_dream = 80,
+	default_wanhao_duplicator4 = 140,
+	default_colido_2_0_plus = 140,
+	default_colido_x3045 = 450,
+	default_colido_compact = 115,
+	default_colido_diy = 170,
 	subSection = 'printer_type',
 	type = 'int',
 	description = '',
@@ -132,40 +182,70 @@ M.printer_heatedbed = {
 	default = false,
 	default_ultimaker2 = true,
 	default_makerbot_replicator2x = true,
+	default_minifactory = true,
+	default_lulzbot_taz_4 = true,
+	default_wanhao_duplicator4 = true,
+	default_colido_2_0_plus = true,
+	default_colido_m2020 = true,
+	default_colido_x3045 = true,
+	default_craftbot_plus = true,
+	default_ultimaker_original_plus = true,
 	subSection = 'printer_type',
 	type = 'bool',
 	description = 'Printer has heated bed',
 }
+M.printer_filamentThickness = {
+	default = 2.89,
+	default_doodle_dream = 1.75,
+	default_renkforce_rf100 = 1.75,
+	default_wanhao_duplicator4 = 1.75,
+	default_craftbot_plus = 1.75,
+	type = 'float',
+	description = '',
+	min = 0.0,
+	subSection = 'printer_type'
+}
 
-local default_makerbot_startcode = ";@printer {printerType}\nM136 (enable build)\nM73 P0\nG162 X Y F2000(home XY axes maximum)\nG161 Z F900(home Z axis minimum)\nG92 X0 Y0 Z-5 A0 B0 (set Z to -5)\nG1 Z0.0 F900(move Z to '0')\nG161 Z F100(home Z axis minimum)\nM132 X Y Z A B (Recall stored home offsets for XYZAB axis)\nG92 X152 Y72 Z0 A0 B0\nG1 X-112 Y-73 Z0.5 F3300.0 (move to front left 'zero' position)\nG92 X0 Y0 Z0.5 A0 B0\nG1 X0 Y0 Z0.5 F3300.0 (move to waiting position)\nG130 X20 Y20 A20 B20 (Lower stepper Vrefs while heating)\n{if heatedBed};M109 S{printingBedTemp} T0\n{if heatedBed}M140 S{printingBedTemp} T0\nM104 S{printingTemp} T0\n;M134 T0\nM135 T0\nM104 S{printingTemp} T0\nM133 T0\nG130 X127 Y127 A127 B127 (Set Stepper motor Vref to defaults)\nG1 F100 A10 ;extrude 10mm\nG92 A0 ;reset again\nG0 Z20"
+local default_makerbot_startcode = ';@printer {printerType}\nM136 (enable build)\nM73 P0 (Set build percentage to 0)\nG162 X Y F2000 (home XY axes to maximum)\nG161 Z F900 (home Z axis to minimum quick)\nG92 X0 Y0 Z0 A0 B0 (set axis positions to 0)\nG1 Z5.0 F900 (move Z axis down)\nG161 Z F100 (home Z axis to minimum more precise)\nG92 X0 Y0 Z0 A0 B0 (set axis positions to 0)\nG1 Z2.0 F900 (move Z axis to safety height)\nG1 X-264 Y-145 Z0 F3300.0 (move XY to start position)\nG92 X0 Y0 Z0 A0 B0 (set axis position to 0)\nG130 X20 Y20 A20 B20 (Lower stepper Vrefs while heating)\n{if heatedBed}M140 S{printingBedTemp} T0 (Set bed temp)\nM135 T0 (use first extruder)\nM104 S{printingTemp} T0 (set extruder temp)\nM133 T0 (Wait for extruder)\nG130 X127 Y127 A127 B127 (Set Stepper motor Vref to defaults)\nG1 F100 A10 (extrude 10mm)\nG92 A0 (reset extruder)\nG0 Z20 (move up, to lose filament)'
 local default_deltabot_startcode = ';Generated with Doodle3D (deltabot)\nM109 S{printingTemp} ;set target temperature\n{if heatedBed}M190 S{printingBedTemp} ;set target bed temperature\nG21 ;metric values\nG91 ;relative positioning\nM107 ;start with the fan off\nG28 ; move to home\nG92 E0 ;zero the extruded length\nG90 ;absolute positioning\nM117 Printing Doodle...   ;display message (20 characters to clear whole screen)'
+local default_ultimaker2_startcode = ';Generated with Doodle3D (ultimaker2)\nM10000\nM10000\nM10001 X8 Y28 SDoodle3D heat up...\nM109 S{printingTemp} ;set target temperature \n{if heatedBed}M190 S{printingBedTemp} ;set target bed temperature\nG21 ;metric values\nG90 ;absolute positioning\nM107 ;start with the fan off\nG28 ; home to endstops\nG1 Z15 F9000 ;move the platform down 15mm\nG92 E0 ;zero the extruded length\nG1 F200 E10 ;extrude 10mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 F9000\nM10000\nM10000\nM10001 X8 Y28 SDoodle3D printing...\n'
+local default_ultimaker_original_plus_startcode = ';Generated with Doodle3D (Ultimaker Original Plus)\n{if heatedBed}M190 S{printingBedTemp}\nM109 S{printingTemp}\nG21 ;metric values\nG91 ;relative positioning\nM107 ;start with the fan off\nG28 X0 Y0 ;move X/Y to min endstops\nG28 Z0 ;move Z to min endstops\nG1 Z15 F9000 ;move the platform down 15mm\nG92 E0 ;zero the extruded length\nG1 F200 E10 ;extrude 10mm of feed stock\nG92 E0 ;zero the extruded length again\nG92 E0 ;zero the extruded length again\nG1 F9000\nG90 ;absolute positioning\nM117 Printing Doodle...   ;display message (20 characters to clear whole screen)'
 M.printer_startcode = {
-	default = ';Generated with Doodle3D (default)\nM109 S{printingTemp} ;set target temperature \n{if heatedBed}M190 S{printingBedTemp} ;set target bed temperature\nG21 ;metric values\nG91 ;relative positioning\nM107 ;start with the fan off\nG28 X0 Y0 ;move X/Y to min endstops\nG28 Z0 ;move Z to min endstops\nG1 Z15 F9000 ;move the platform down 15mm\nG92 E0 ;zero the extruded length\nG1 F200 E10 ;extrude 10mm of feed stock\nG92 E0 ;zero the extruded length again\nG92 E0 ;zero the extruded length again\nG1 F9000\nG90 ;absolute positioning\nM117 Printing Doodle...   ;display message (20 characters to clear whole screen)',
-	default_ultimaker2 = ';Generated with Doodle3D (ultimaker2)\nM109 S{printingTemp} ;set target temperature \nM190 S{printingBedTemp} ;set target bed temperature\nG21 ;metric values\nG90 ;absolute positioning\nM107 ;start with the fan off\nG28 ; home to endstops\nG1 Z15 F9000 ;move the platform down 15mm\nG92 E0 ;zero the extruded length\nG1 F200 E10 ;extrude 10mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 F9000\nM117 Printing Doodle...   ;display message (20 characters to clear whole screen)\n',
+	default = ';Generated with Doodle3D (default)\nM109 S{printingTemp} ;set target temperature \n{if heatedBed}M190 S{printingBedTemp} ;set target bed temperature\nG21 ;metric values\nM107 ;start with the fan off\nG28 X0 Y0 ;move X/Y to min endstops\nG28 Z0 ;move Z to min endstops\nG1 Z15 F9000 ;move the platform down 15mm\nG92 E0 ;zero the extruded length\nG91 ;relative positioning\nG1 F200 E10 ;extrude 10mm of feed stock\nG92 E0 ;zero the extruded length again\nG92 E0 ;zero the extruded length again\nG1 F9000\nG90 ;absolute positioning\nM117 Printing Doodle...   ;display message (20 characters to clear whole screen)',
+	default_ultimaker2 = default_ultimaker2_startcode,
+	default_ultimaker2go = default_ultimaker2_startcode,
+	default__3Dison_plus = ';@printer {printerType}\nM136 (enable build)\nM73 P0\nG21\nG90\nM103\n;M109 S50 T0\nM140 S50 T0\nM104 S{printingTemp} T0\n;M134 T0\nM135 T0\nM104 S{printingTemp} T0\nG162 X Y F2000(home XY axes maximum)\nG161 Z F900(home Z axis minimum)\nG92 X113.5 Y74 Z-5 A0 B0 (set Z to -5)\nG1 Z0.0 F900(move Z to 0)\nG161 Z F100(home Z axis minimum)\nM132 X Y Z A B (Recall stored home offsets for XYZAB axis)\nG1 Z50 F3300\nG130 X20 Y20 A20 B20 (Lower stepper Vrefs while heating)\nM133 T0\nM6 T0\nG130 X127 Y127 A127 B127 (Set Stepper motor Vref to defaults)\nG0 Z0.2 F3000\nG1 Z0 F100 A10 ;extrude 10mm\nG92 X227 Y148 Z0 A0 ;reset again\nG1 X227 Y148 Z0',
 	default_makerbot_generic = default_makerbot_startcode,
 	default_makerbot_replicator2 = default_makerbot_startcode,
 	default_makerbot_replicator2x = default_makerbot_startcode,
 	default_makerbot_thingomatic = default_makerbot_startcode,
+	default_wanhao_duplicator4 = default_makerbot_startcode,
 	default_delta_rostockmax = default_deltabot_startcode,
 	default_deltamaker = default_deltabot_startcode,
 	default_kossel = default_deltabot_startcode,
+	default_ultimaker_original_plus = default_ultimaker_original_plus_startcode,
 	type = 'string',
 	subSection = 'printer_type',
 	description = ''
 }
 
-local default_makerbot_endcode = 'M73 P100\nG92 A0 B0 ;reset extruder position to prevent retraction\nM18 A B(Turn off A and B Steppers)\nG1 Z155 F900\nG162 X Y F2000\nM18 X Y Z(Turn off steppers after a build)\n{if heatedBed}M140 S{preheatBedTemp} T0\nM104 S{preheatTemp} T0\nM73 P100 (end  build progress )\nM70 P5 (We <3 Making Things!)\nM72 P1  ( Play Ta-Da song )\nM137 (build end notification)'
-local default_deltabot_endcode = 'M107 ;fan offG91 ;relative positioningG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressureG1 Z+0.5 E-5 X-20 Y-20 F9000 ;move Z up a bit and retract filament even moreG28 ;move to homeM84 ;disable axes / steppersG90 ;absolute positioningM109 S0 ; hot end off{if heatedBed}M140 S{preheatBedTemp}M117 Done                 ;display message (20 characters to clear whole screen)'
+local default_makerbot_endcode = 'G92 A0 B0 ;reset extruder position to prevent retraction\nM18 A B(Turn off A and B Steppers)\nG162 Z F900\nG162 X Y F2000\nM18 X Y Z(Turn off steppers after a build)\n{if heatedBed}M140 S0 T0\nM104 S0 T0\nM72 P1  ( Play Ta-Da song )\nM137 (build end notification)'
+local default_deltabot_endcode = 'M107 ;fan off\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+0.5 E-5 X-20 Y-20 F9000 ;move Z up a bit and retract filament even more\nG28 ;move to home\nM84 ;disable axes / steppers\nG90 ;absolute positioning\nM109 S0 ; hot end off\n{if heatedBed}M140 S0\nM117 Done                 ;display message (20 characters to clear whole screen)'
+local default_ultimaker2_endcode = 'M10000\nM10000\nM10001 X20 Y28 SDoodle3D done!\nM107 ;fan off\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+5.5 E-5 X-20 Y-20 F9000 ;move Z up a bit and retract filament even more\nG28 ;home the printer\nM84 ;disable axes / steppers\nG90 ;absolute positioning\nM104 S0\n{if heatedBed}M140 S0\n'
 M.printer_endcode = {
-	default = 'M107 ;fan off\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+0.5 E-5 X-20 Y-20 F9000 ;move Z up a bit and retract filament even more\nG28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way\nM84 ;disable axes / steppers\nG90 ;absolute positioning\nM104 S{preheatTemp}\n{if heatedBed}M140 S{preheatBedTemp}\nM117 Done                 ;display message (20 characters to clear whole screen)',
-	default_ultimaker2 = 'M107 ;fan off\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+5.5 E-5 X-20 Y-20 F9000 ;move Z up a bit and retract filament even more\nG28 ;home the printer\nM84 ;disable axes / steppers\nG90 ;absolute positioning\nM104 S{preheatTemp}\nM140 S{preheatBedTemp}\nM117 Done                 ;display message (20 characters to clear whole screen)',
+	default = 'M107 ;fan off\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+0.5 E-5 X-20 Y-20 F9000 ;move Z up a bit and retract filament even more\nG28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way\nM84 ;disable axes / steppers\nG90 ;absolute positioning\nM104 S0\n{if heatedBed}M140 S0\nM117 Done                 ;display message (20 characters to clear whole screen)',
+	default_ultimaker2 = default_ultimaker2_endcode,
+	default_ultimaker2go = default_ultimaker2_endcode,
+	default__3Dison_plus = 'M73 P100\nG92 A0 B0 ;reset extruder position to prevent retraction\nM18 A B(Turn off A and B Steppers)\nG1 Z155 F900\nG162 X Y F2000\nM18 X Y Z(Turn off steppers after a build)\nM140 S0 T0\nM104 S0 T0\nM73 P100 (end build progress )\nM72 P1 ( Play Ta-Da song )\nM137 (build end notification)\n',
 	default_makerbot_generic = default_makerbot_endcode,
 	default_makerbot_replicator2 = default_makerbot_endcode,
 	default_makerbot_replicator2x = default_makerbot_endcode,
 	default_makerbot_thingomatic = default_makerbot_endcode,
+	default_wanhao_duplicator4 = default_makerbot_endcode,
 	default_delta_rostockmax = default_deltabot_endcode,
 	default_deltamaker = default_deltabot_endcode,
 	default_kossel = default_deltabot_endcode,
+	default_craftbot_plus = 'M107 ;fan off\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+0.5 E-5 X-20 Y-20 F9000 ;move Z up a bit and retract filament even more\nG28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way\nM84 ;disable axes / steppers\nG90 ;absolute positioning\nM109 S0\n{if heatedBed}M140 S0\nM117 Done                 ;display message (20 characters to clear whole screen)',
 	type = 'string',
 	subSection = 'printer_type',
 	description = ''
@@ -182,7 +262,7 @@ M.printer_baudrate = {
 }
 
 M.printer_temperature = {
-	default = 230,
+	default = 210,
 	type = 'int',
 	description = 'printing temperature',
 	min = 0
@@ -223,13 +303,6 @@ M.printer_travelSpeed = {
 	min = 0
 }
 
-M.printer_filamentThickness = {
-	default = 2.89,
-	type = 'float',
-	description = '',
-	min = 0.0
-}
-
 M.printer_useSubLayers = {
 	default = true,
 	type = 'bool',
@@ -254,20 +327,26 @@ M.printer_bottomFlowRate = {
   description = 'Multiplication factor for filament flow rate in first few layers'
 }
 
-M.printer_heatup_enabled = {
+M.printer_bottomEnableTraveling = {
 	default = true,
 	type = 'bool',
+	description = 'Enable traveling on bottom layers, disabling this might improve adhesion on some printers'
+}
+
+M.printer_heatup_enabled = {
+	default = false,
+	type = 'bool',
 	description = ''
 }
 
 M.printer_heatup_temperature = {
-	default = 180,
+	default = 0,
 	type = 'int',
 	description = ''
 }
 
 M.printer_heatup_bed_temperature = {
-	default = 70,
+	default = 0,
 	type = 'int',
 	description = ''
 }
@@ -294,7 +373,7 @@ M.printer_retraction_minDistance = {
 
 M.printer_retraction_amount = {
 	default = 3,
-	type = 'int',
+	type = 'float',
 	description = '',
 	min = 0
 }
@@ -331,4 +410,22 @@ M.doodle3d_tour_enabled = {
 	description = 'Show tour to new users'
 }
 
+M.doodle3d_update_includeBetas = {
+	default = false,
+	type = 'bool',
+	description = 'Include beta releases when updating'
+}
+
+M.doodle3d_update_baseUrl = {
+	default = 'http://doodle3d.com/updates',
+	type = 'string',
+	description = ''
+}
+
+M.gcode_server = {
+	default = 'http://gcodeserver.doodle3d.com',
+	type = 'string',
+	description =''
+}
+
 return M

src/main.lua

@@ -22,6 +22,8 @@ local netconf = require('network.netconfig')
 local RequestClass = require('rest.request')
 local ResponseClass = require('rest.response')
 local Signin = require('network.signin')
+local osUtils = require('os_utils')
+
 
 -- NOTE: the updater module 'detects' command-line invocation by existence of 'arg', so we have to make sure it is not defined.
 argStash = arg
@@ -30,6 +32,7 @@ local updater = require('script.d3d-updater')
 arg = argStash
 
 local postData = nil
+local MOD_ABBR = "ENTR"
 
 
 --- Switches to wifi client mode or to access point mode based on availability of known wifi networks.
@@ -48,18 +51,19 @@ local function setupAutoWifiMode()
 
 	local wifiState = wifi.getDeviceState()
 	local netName, netMode = wifiState.ssid, wifiState.mode
+	log:info(MOD_ABBR, "current wifi name: " .. (netName or "<nil>") .. ", mode: " .. netMode)
 
 	local apSsid = wifi.getSubstitutedSsid(settings.get('network.ap.ssid'))
-	local apMode = (apSsid == netName) and netMode == 'ap'
+	local apMode = (apSsid == netName) and (netMode == 'ap')
+	log:info(MOD_ABBR, "ssid of self: " .. apSsid)
 
 	local scanList,msg = wifi.getScanInfo()
-	local knownSsids = wifi.getConfigs()
-
 	if not scanList then
 		return nil, "autowifi: could not scan wifi networks (" .. msg .. ")"
 	end
 
-	log:info("current wifi name: " .. (netName or "<nil>") .. ", mode: " .. netMode .. ", ssid of self: " .. apSsid)
+	local knownSsids = wifi.getConfigs()
+	-- log:info(MOD_ABBR, "current wifi name: " .. (netName or "<nil>") .. ", mode: " .. netMode .. ", ssid of self: " .. apSsid)
 	local visNet, knownNet = {}, {}
 	for _,sn in ipairs(scanList) do
 		table.insert(visNet, sn.ssid)
@@ -67,11 +71,20 @@ local function setupAutoWifiMode()
 	for _,kn in ipairs(knownSsids) do
 		table.insert(knownNet, kn.ssid .. "/" .. kn.mode)
 	end
-	log:info("visible networks: " .. table.concat(visNet, ", "))
-	log:info("known networks: " .. table.concat(knownNet, ", "))
+	log:info(MOD_ABBR, "visible networks: " .. table.concat(visNet, ", "))
+	log:info(MOD_ABBR, "known networks: " .. table.concat(knownNet, ", "))
 
 	-- if the currently active network is client mode and is also visible, do nothing since it will connect automatically further along the boot process
 	if netMode == 'sta' and netName ~= nil and netName ~= "" and findSsidInList(scanList, netName) then
+		-- signin to connect.doodle3d.com
+		local success, output = Signin.signin()
+		if success then
+				log:info(MOD_ABBR, "Signed in")
+		else 
+			log:info(MOD_ABBR, "Signing in failed")
+		end
+		-- report we are connected after signin attempt
+		netconf.setStatus(netconf.CONNECTED,"Connected");
 		return true, "autowifi: no action - existing configuration found for currently wifi visible network (" .. netName .. ")"
 	end
 
@@ -80,27 +93,28 @@ local function setupAutoWifiMode()
 	local connectWith = nil
 	for _,kn in ipairs(knownSsids) do
     	if kn.mode == 'ap' and kn.ssid == apSsid then break end
-		if findSsidInList(scanList, kn.ssid) then
+		if findSsidInList(scanList, kn.ssid) and kn.mode == 'sta' then
 			connectWith = kn.ssid
 			break
 		end
 	end
 
 	if connectWith then
-		local rv,msg = netconf.associateSsid(connectWith,nil,nil,true)
+		local rv,msg = netconf.associateSsid(connectWith,nil,nil)
 		if rv then
 			return true, "autowifi: associated -- client mode with ssid '" .. connectWith .. "'"
 		else
 			return nil, "autowifi: could not associate with ssid '" .. connectWith .. "' (" .. msg .. ")"
 		end
 	elseif netMode ~= 'ap' or netName ~= apSsid then
-		local rv,msg = netconf.setupAccessPoint(apSsid,true)
+		local rv,msg = netconf.setupAccessPoint(apSsid)
 		if rv then
 			return true, "autowifi: configured as access point with ssid '" .. apSsid .. "'"
 		else
 			return nil, "autowifi: failed to configure as access point with ssid '" .. apSsid .. "' (" .. msg .. ")"
 		end
 	else
+		netconf.setStatus(netconf.CREATED,"Access point created");
 		return true, "autowifi: no action - no known networks found, already in access point mode"
 	end
 
@@ -108,36 +122,57 @@ local function setupAutoWifiMode()
 end
 
 --- Initializes the logging system to use the file and level defined in the system settings.
--- The settings used are `logfile` and `loglevel`. The former may either be a
--- reular file path, or `<stdout>` or `<stderr>`.
+-- The settings used are `log_path`, `api_log_filename` from the system section and
+-- `system_log_level` from the general section. The filename may either be a regular filename
+-- (with an absolute log_path), or `<stdout>` or `<stderr>`.
+-- TODO: also support backticks (see Logger.cpp in print3d)--
 -- @see util.settings.getSystemKey
 -- @treturn bool True on success, false on error.
 local function setupLogger()
 	local logStream = io.stderr -- use stderr as hard-coded default target
-	local logLevel = log.LEVEL.debug -- use debug logging as hard-coded default level
+	local logLevel = log.LEVEL.verbose -- use verbose logging as hard-coded default level
 
-	local logTargetSetting = settings.getSystemKey('logfile')
-	local logLevelSetting = settings.getSystemKey('loglevel')
+	local logPathSetting = settings.getSystemKey('log_path')
+	local logTargetSetting = settings.getSystemKey('api_log_filename')
+	local logLevelSetting = settings.get('system_log_level')
 	local logTargetError, logLevelError = nil, nil
 
 	if type(logTargetSetting) == 'string' then
-		local specialTarget = logTargetSetting:match('^<(.*)>$')
-		if specialTarget then
-			if specialTarget == 'stdout' then logStream = io.stdout
-			elseif specialTarget == 'stderr' then logStream = io.stderr
+		local streamTarget = logTargetSetting:match('^<(.*)>$')
+		local popenTarget = logTargetSetting:match('^`(.*)`$')
+		if streamTarget then
+			if streamTarget:lower() == 'stdout' then logStream = io.stdout
+			elseif streamTarget:lower() == 'stderr' then logStream = io.stderr
 			end
-		elseif logTargetSetting:sub(1, 1) == '/' then
-			local f,msg = io.open(logTargetSetting, 'a+')
+		elseif popenTarget then
+			local f,msg = io.popen(popenTarget, 'w')
 
 			if f then logStream = f
 			else logTargetError = msg
 			end
+		elseif logPathSetting:sub(1, 1) == '/' then
+			local path = logPathSetting .. '/' .. logTargetSetting
+			local f,msg = io.open(path, 'a+')
+
+			if f then
+				logStream = f
+				log:setLogFilePath(path)
+			else
+				logTargetError = msg
+			end
+		else
+			logTargetError = "log file path is not absolute"
 		end
 	else
 		-- if uci config not available, fallback to /tmp/wifibox.log
-		local f,msg = io.open('/tmp/wifibox.log', 'a+')
-		if f then logStream = f
-		else logTargetError = msg
+		local path = '/tmp/wifibox.log'
+		local f,msg = io.open(path, 'a+')
+
+		if f then
+			logStream = f
+			log:setLogFilePath(path)
+		else
+			logTargetError = msg
 		end
 	end
 
@@ -157,12 +192,12 @@ local function setupLogger()
 
 	local rv = true
 	if logTargetError then
-		log:error("could not open logfile '" .. logTargetSetting .. "', using stderr as fallback (" .. logTargetError .. ")")
+		log:error(MOD_ABBR, "could not open logfile '" .. logPathSetting .. '/' .. logTargetSetting .. "', using stderr as fallback (" .. logTargetError .. ")")
 		rv = false
 	end
 
 	if logLevelError then
-		log:error("uci config specifies invalid log level '" .. logLevelSetting .. "', using debug level as fallback")
+		log:error(MOD_ABBR, "uci config specifies invalid log level '" .. logLevelSetting .. "', using verbose level as fallback")
 		rv = false
 	end
 
@@ -173,17 +208,6 @@ end
 -- The logger is set up, any POST data is read and several other subsystems are initialized.
 -- @tparam table environment The 'shell' environment containing all CGI variables. Note that @{cmdmain} simulates this.
 local function init(environment)
-	setupLogger()
-
-	local dbgText = ""
-	if confDefaults.DEBUG_API and confDefaults.DEBUG_PCALLS then dbgText = "pcall+api"
-	elseif confDefaults.DEBUG_API then dbgText = "api"
-	elseif confDefaults.DEBUG_PCALL then dbgText = "pcall"
-	end
-
-	if dbgText ~= "" then dbgText = " (" .. dbgText .. " debugging)" end
-	log:info("=======rest api" .. dbgText .. "=======")
-
 	if (environment['REQUEST_METHOD'] == 'POST') then
 		local n = tonumber(environment['CONTENT_LENGTH'])
 		postData = io.read(n)
@@ -206,50 +230,47 @@ local function main(environment)
 	local rq = RequestClass.new(environment, postData, confDefaults.DEBUG_API)
 
 	if rq:getRequestMethod() == 'CMDLINE' and rq:get('autowifi') ~= nil then
-	
+
 		local version = updater.formatVersion(updater.getCurrentVersion());
-		log:info("Doodle3D version: "..util.dump(version))
-	
-		log:info("running in autowifi mode")
+		log:info(MOD_ABBR, "Doodle3D version: "..util.dump(version))
+
+		log:info(MOD_ABBR, "Running in autowifi mode")
 		local rv,msg = setupAutoWifiMode()
 
 		if rv then
-			log:info("autowifi setup done (" .. msg .. ")")
+			log:info(MOD_ABBR, "Autowifi setup done (" .. msg .. ")")
 		else
-			log:error("autowifi setup failed (" .. msg .. ")")
+			log:error(MOD_ABBR, "Autowifi setup failed (" .. msg .. ")")
 		end
 	elseif rq:getRequestMethod() == 'CMDLINE' and rq:get('signin') ~= nil then
-		log:info("running in signin mode")
+		log:info(MOD_ABBR, "Running in signin mode")
 
-		local ds = wifi.getDeviceState()
-		log:info("  ds.mode: "..util.dump(ds.mode))
-		if ds.mode == "sta" then
-			log:info("  attempting signin")
-			local success,msg = Signin.signin()
-			if success then
-		  		log:info("Signin successful")
-			else
-				log:info("Signin failed: "..util.dump(msg))
-			end
+		log:info(MOD_ABBR, "  attempting signin")
+		local success,msg = Signin.signin()
+		if success then
+	  		log:info(MOD_ABBR, "Signin successful")
+		else
+			log:warning(MOD_ABBR, "Signin failed: "..util.dump(msg))
 		end
 	elseif rq:getRequestMethod() ~= 'CMDLINE' or confDefaults.DEBUG_API then
-	--	log:info("received request of type " .. rq:getRequestMethod() .. " for " .. (rq:getRequestedApiModule() or "<unknown>")
-	--			.. "/" .. (rq:getRealApiFunctionName() or "<unknown>") .. " with arguments: " .. util.dump(rq:getAll()))
-		log:info("received request of type " .. rq:getRequestMethod() .. " for " .. (rq:getRequestedApiModule() or "<unknown>")
-				.. "/" .. (rq:getRealApiFunctionName() or "<unknown>"))
+		-- Note: the commented log message will print too many data if it's for instance dumping a gcode add request
+		--logMessage = "received request of type " .. rq:getRequestMethod() .. " for " .. (rq:getRequestedApiModule() or "<unknown>")
+		--		.. "/" .. (rq:getRealApiFunctionName() or "<unknown>") .. " with arguments: " .. util.dump(rq:getAll())
+		logMessage = rq:getRequestMethod() .. " request for " .. (rq:getRequestedApiModule() or "<unknown>")
+				.. "/" .. (rq:getRealApiFunctionName() or "<unknown>")
 		if rq:getRequestMethod() ~= 'CMDLINE' then
-			log:info("remote IP/port: " .. rq:getRemoteHost() .. "/" .. rq:getRemotePort())
-			--log:debug("user agent: " .. rq:getUserAgent())
+			logMessage = logMessage .. " (remote IP/port: " .. rq:getRemoteHost() .. "/" .. rq:getRemotePort() .. ")"
+			--logMessage = logMessage .. " (user agent: " .. rq:getUserAgent() .. ")"
 		end
+		log:info(MOD_ABBR, logMessage)
 
 		local response, err = rq:handle()
 
-		if err ~= nil then log:error(err) end
+		if err ~= nil then log:error(MOD_ABBR, err) end
 		response:send()
-
-    	response:executePostResponseQueue()
+		response:executePostResponseQueue()
 	else
-		log:info("Nothing to do...bye.\n")
+		log:info(MOD_ABBR, "Nothing to do...bye.\n")
 	end
 end
 
@@ -262,6 +283,22 @@ end
 -- @tparam table env The CGI environment table.
 -- @treturn number A Z+ return value suitable to return from wrapper script. Note that this value is ignored by uhttpd-mod-lua.
 function handle_request(env)
+	local function constructDebugText()
+		local dbgText = ""
+		if confDefaults.DEBUG_API and confDefaults.DEBUG_PCALLS then dbgText = "pcall+api"
+		elseif confDefaults.DEBUG_API then dbgText = "api"
+		elseif confDefaults.DEBUG_PCALL then dbgText = "pcall"
+		end
+		if dbgText ~= "" then dbgText = " (" .. dbgText .. " debugging)" end
+		return dbgText
+	end
+
+	setupLogger()
+
+	local pid = osUtils.getPID()
+	local beginSecs, beginUSecs = osUtils.getTime()
+
+	log:verbose(MOD_ABBR, "START-RQ with PID=" .. pid .. constructDebugText())
 	local s, msg = init(env)
 
 	if s == false then
@@ -270,11 +307,13 @@ function handle_request(env)
 
 		resp:setError("initialization failed" .. errSuffix)
 		resp:send()
-		log:error("initialization failed" .. errSuffix) --NOTE: this assumes the logger has been initialized properly, despite init() having failed
+		log:error(MOD_ABBR, "Initialization failed" .. errSuffix)
 
 		return 1
 	else
 		main(env)
+		local elapsed,msg = osUtils.getElapsedTime(beginSecs, beginUSecs)
+		log:bulk(MOD_ABBR, "END-RQ with PID=" .. pid .. " completed in " .. elapsed .. " msec")
 		return 0
 	end
 end

src/network/netconfig.lua

@@ -18,6 +18,8 @@ local reconf = {}
 local wifi
 local reloadSilent
 
+local MOD_ABBR = "NTCF"
+
 M.WWW_CAPTIVE_PATH = '/usr/share/lua/wifibox/www'
 M.WWW_CAPTIVE_INDICATOR = '/www/.wifibox-inplace'
 M.WWW_RENAME_NAME = '/www-regular'
@@ -25,9 +27,9 @@ M.WWW_RENAME_NAME = '/www-regular'
 M.CONNECTING_FAILED = -1
 M.NOT_CONNECTED 	= 0
 M.CONNECTING 		= 1
-M.CONNECTED 		= 2 
-M.CREATING 			= 3 
-M.CREATED 			= 4 
+M.CONNECTED 		= 2
+M.CREATING 			= 3
+M.CREATED 			= 4
 
 local function reloadBit(dlist, itemname)
 	if dlist[itemname] == nil then dlist[itemname] = '' end
@@ -54,19 +56,18 @@ end
 
 --- Switch configuration between AP and station modes
 -- @param table	components	a table with components as keys with operations as values (add or remove)
--- @param boolean	boot	If true, the components have to start instead of reloaded (only needed on boot)
 -- Valid components (each with add and rm operation) are: apnet, staticaddr, dhcppool, wwwredir, dnsredir, wwwcaptive, natreflect.
 -- and additionally: wifiiface/add, network/reload
-function M.switchConfiguration(components,boot)
+function M.switchConfiguration(components)
 	local dirtyList = {} -- laundry list, add config/script name as key with value c (commit), r (reload) or b (both)
 
 	for k,v in pairs(components) do
 		local fname = k .. '_' .. v
 		if type(reconf[fname]) == 'function' then
-			log:debug("reconfiguring component '" .. k .. "' (" .. v .. ")")
+			log:verbose(MOD_ABBR, "reconfiguring component '" .. k .. "' (" .. v .. ")")
 			reconf[fname](dirtyList)
 		else
-			log:warn("unknown component or action '" .. fname .. "' skipped")
+			log:warning(MOD_ABBR, "unknown component or action '" .. fname .. "' skipped")
 		end
 	end
 
@@ -75,27 +76,25 @@ function M.switchConfiguration(components,boot)
 		if v == 'c' or v == 'b' then M.commitComponent(k) end
 	end
 	for k,v in pairs(dirtyList) do
-		if v == 'r' or v == 'b' then M.reloadComponent(k, silent, boot) end
+		if v == 'r' or v == 'b' then M.reloadComponent(k, silent) end
 	end
 end
 
 function M.commitComponent(c)
-	log:info("committing component '" .. c .. "'")
+	log:verbose(MOD_ABBR, "committing component '" .. c .. "'")
 	uci:commit(c)
 end
 
-function M.reloadComponent(c, silent, boot)
-	log:info("reloading component '" .. c .. "'") 
+function M.reloadComponent(c, silent)
+	log:verbose(MOD_ABBR, "reloading component '" .. c .. "'")
 	local command = 'reload'
-	-- if booting, the services have to be started before they can be reloaded
-	if boot then command = 'start' end 
 	local cmd = '/etc/init.d/' .. c .. ' '..command
-	if silent ~= nil and silent then 
+	if silent ~= nil and silent then
 		cmd = cmd .. ' &> /dev/null'
 		os.execute(cmd)
 	else
 		rv = utils.captureCommandOutput(cmd)
-		log:debug("  result reloading component '" .. c .. "' (cmd: '"..cmd.."'): \n"..utils.dump(rv))
+		log:verbose(MOD_ABBR, "  result reloading component '" .. c .. "' (cmd: '"..cmd.."'): \n"..utils.dump(rv))
 	end
 end
 
@@ -150,7 +149,7 @@ function reconf.apnet_rm(dirtyList)
 	uci:foreach('wireless', 'wifi-iface', function(s)
 		if s.ssid == wifi.getSubstitutedSsid(settings.get('network.ap.ssid')) then sname = s['.name']; return false end
 	end)
-	if sname == nil then return log:info("AP network configuration does not exist, nothing to remove") end
+	if sname == nil then return log:info(MOD_ABBR, "AP network configuration does not exist, nothing to remove") end
 	uci:delete('wireless', sname)
 	reloadBit(dirtyList, 'network'); commitBit(dirtyList, 'wireless')
 end
@@ -215,15 +214,15 @@ end
 function reconf.dnsredir_add(dirtyList)
 	local redirText = '/#/' .. settings.get('network.ap.address')
 	local sname = utils.getUciSectionName('dhcp', 'dnsmasq')
-	if sname == nil then return log:error("dhcp config does not contain a dnsmasq section") end
-	if uci:get('dhcp', sname, 'address') ~= nil then return log:debug("DNS address redirection already in place, not re-adding", false) end
+	if sname == nil then return log:error(MOD_ABBR, "dhcp config does not contain a dnsmasq section") end
+	if uci:get('dhcp', sname, 'address') ~= nil then return log:info(MOD_ABBR, "DNS address redirection already in place, not re-adding", false) end
 
 	uci:set('dhcp', sname, 'address', {redirText})
 	commitBit(dirtyList, 'dhcp'); reloadBit(dirtyList, 'dnsmasq')
 end
 function reconf.dnsredir_rm(dirtyList)
 	local sname = utils.getUciSectionName('dhcp', 'dnsmasq')
-	if sname == nil then return log:error("dhcp config does not contain a dnsmasq section") end
+	if sname == nil then return log:error(MOD_ABBR, "dhcp config does not contain a dnsmasq section") end
 
 	uci:delete('dhcp', sname, 'address')
 	commitBit(dirtyList, 'dhcp'); reloadBit(dirtyList, 'dnsmasq')
@@ -233,21 +232,21 @@ end
 --TODO: handle os.rename() return values (nil+msg on error)
 function reconf.wwwcaptive_add(dirtyList)
 	if utils.exists(M.WWW_CAPTIVE_INDICATOR) then
-		return log:debug("WWW captive directory already in place, not redoing", false)
+		return log:info(MOD_ABBR, "WWW captive directory already in place, not redoing", false)
 	end
 	local rv,reason = os.rename('/www', M.WWW_RENAME_NAME)
 	if rv == true then
 		utils.symlink(M.WWW_CAPTIVE_PATH, '/www')
 		return true
 	else
-		return log:error("Could not rename /www to " .. M.WWW_RENAME_NAME .. "(" .. reason .. ")")
+		return log:error(MOD_ABBR, "Could not rename /www to " .. M.WWW_RENAME_NAME .. "(" .. reason .. ")")
 	end
 end
 function reconf.wwwcaptive_rm(dirtyList)
-	if not utils.exists(M.WWW_CAPTIVE_INDICATOR) then return log:debug("WWW captive directory not in place, not undoing", false) end
+	if not utils.exists(M.WWW_CAPTIVE_INDICATOR) then return log:info(MOD_ABBR, "WWW captive directory not in place, not undoing", false) end
 	os.remove('/www')
 	if os.rename(M.WWW_RENAME_NAME, '/www') ~= true then
-		return log:error("Could not rename " .. M.WWW_RENAME_NAME .. " to /www")
+		return log:error(MOD_ABBR, "Could not rename " .. M.WWW_RENAME_NAME .. " to /www")
 	end
 	return true
 end
@@ -275,40 +274,38 @@ end
 -- Note: this function might belong in the wlanconfig module but that would introduce
 -- a circular dependency, easiest solution is to place the function here.
 -- @tparam string ssid The SSID to use for the access point.
--- @tparam boolean boot If true, the components have to start instead of reloaded (only needed on boot)
 -- @return True on success or nil+msg on error.
-function M.setupAccessPoint(ssid,boot)
+function M.setupAccessPoint(ssid)
 	M.setStatus(M.CREATING,"Creating access point '"..ssid.."'...");
-	boot = boot or false
-	--boot = false
-	if boot then log:info("  boot mode") end
-	
-	-- add access point configuration 
-	M.switchConfiguration({apnet="add_noreload"},boot)
+
+	-- add access point configuration
+	M.switchConfiguration({apnet="add_noreload"})
 	wifi.activateConfig(ssid)
 	-- NOTE: dnsmasq must be reloaded after network or it will be unable to serve IP addresses
-	M.switchConfiguration({ wifiiface="add", network="reload", staticaddr="add", dhcppool="add_noreload", wwwredir="add", dnsredir="add" },boot)
-	M.switchConfiguration({dhcp="reload"},boot)
-	
+	M.switchConfiguration({ wifiiface="add", network="reload", staticaddr="add", dhcppool="add_noreload", wwwredir="add", dnsredir="add" })
+	M.switchConfiguration({dhcp="reload"})
+
 	M.setStatus(M.CREATED,"Access point created");
-	
+
 	local ds = wifi.getDeviceState()
-	--log:info("  network/status: ")
-	log:info("    ssid: ".. utils.dump(ds.ssid))
-	--[[log:info("    bssid: ".. utils.dump(ds.bssid))
-	log:info("    channel: ".. utils.dump(ds.channel))
-	log:info("    mode: ".. utils.dump(ds.mode))
-	log:info("    encryption: ".. utils.dump(ds.encryption))
-	log:info("    quality: ".. utils.dump(ds.quality))
-	log:info("    quality_max: ".. utils.dump(ds.quality_max))
-	log:info("    txpower: ".. utils.dump(ds.txpower))
-	log:info("    signal: ".. utils.dump(ds.signal))
-	log:info("    noise: ".. utils.dump(ds.noise))
-	log:info("    raw: ".. utils.dump(ds))
-	
+	--log:info(MOD_ABBR, "  network/status: ")
+	log:info(MOD_ABBR, "    ssid: ".. utils.dump(ds.ssid))
+	--[[
+	log:info(MOD_ABBR, "    bssid: ".. utils.dump(ds.bssid))
+	log:info(MOD_ABBR, "    channel: ".. utils.dump(ds.channel))
+	log:info(MOD_ABBR, "    mode: ".. utils.dump(ds.mode))
+	log:info(MOD_ABBR, "    encryption: ".. utils.dump(ds.encryption))
+	log:info(MOD_ABBR, "    quality: ".. utils.dump(ds.quality))
+	log:info(MOD_ABBR, "    quality_max: ".. utils.dump(ds.quality_max))
+	log:info(MOD_ABBR, "    txpower: ".. utils.dump(ds.txpower))
+	log:info(MOD_ABBR, "    signal: ".. utils.dump(ds.signal))
+	log:info(MOD_ABBR, "    noise: ".. utils.dump(ds.noise))
+	log:info(MOD_ABBR, "    raw: ".. utils.dump(ds))
+
 	local localip = wifi.getLocalIP()
-	log:info("    localip: "..utils.dump(localip))]]--
-			
+	log:info(MOD_ABBR, "    localip: "..utils.dump(localip))
+	--]]
+
 	return true
 end
 
@@ -318,14 +315,14 @@ end
 -- @tparam string ssid The SSID to use for the access point.
 -- @return True on success or nil+msg on error.
 function M.enableAccessPoint(ssid)
-	log:debug("enableAccessPoint ssid: ".. utils.dump(ssid))
-	
+	log:info(MOD_ABBR, "enableAccessPoint ssid: ".. utils.dump(ssid))
+
 	M.switchConfiguration{apnet="add_noreload"}
 	wifi.activateConfig(ssid)
-	
+
 	local ds = wifi.getDeviceState()
-	log:debug("    ssid: ".. utils.dump(ds.ssid))
-			
+	log:info(MOD_ABBR, "    deviceState.ssid: ".. utils.dump(ds.ssid))
+
 	return true
 end
 
@@ -335,13 +332,11 @@ end
 -- @tparam string ssid The SSID to associate with.
 -- @tparam string passphrase The passphrase (if any) to use, may be left out if a UCI configuration exists.
 -- @tparam boolean recreate If true, a new UCI configuration based on scan data will always be created, otherwise an attempt will be made to use an existing configuration.
--- @tparam boolean boot If true, the components have to start instead of reloaded (only needed on boot)
 -- @return True on success or nil+msg on error.
-function M.associateSsid(ssid, passphrase, recreate, boot)
-	log:info("netconfig:associateSsid: "..(ssid or "<nil>")..", "..(recreate or "<nil>"))
-	if boot then log:info("  boot mode") end 
+function M.associateSsid(ssid, passphrase, recreate)
+	log:info(MOD_ABBR, "netconfig:associateSsid: "..(ssid or "<nil>")..", "..(recreate or "<nil>"))
 	M.setStatus(M.CONNECTING,"Connecting...");
-	
+
 	-- see if previously configured network for given ssid exists
 	local cfg = nil
 	for _, net in ipairs(wifi.getConfigs()) do
@@ -350,12 +345,16 @@ function M.associateSsid(ssid, passphrase, recreate, boot)
 			break
 		end
 	end
-	
+
 	-- if not, or if newly created configuration is requested, create a new configuration
 	if cfg == nil or recreate ~= nil then
-		local scanResult = wifi.getScanInfo(ssid)
+		local scanResult, msg = wifi.getScanInfo(ssid)
 		if scanResult ~= nil then
 			wifi.createConfigFromScanInfo(scanResult, passphrase)
+		elseif scanResult == false then
+			--check for error
+			M.setStatus(M.CONNECTING_FAILED,msg);
+			return nil,msg
 		else
 			--check for error
 			local msg = "Wireless network "..ssid.." is not available"
@@ -369,28 +368,48 @@ function M.associateSsid(ssid, passphrase, recreate, boot)
 	--M.switchConfiguration{ wifiiface="add", apnet="rm", staticaddr="rm", dhcppool="rm", wwwredir="rm", dnsredir="rm", wwwcaptive="rm", wireless="reload" }
 	--M.switchConfiguration{ wifiiface="add", apnet="rm", staticaddr="rm", dhcppool="rm", wwwredir="rm", dnsredir="rm", wireless="reload" }
   	--M.switchConfiguration{ wifiiface="add", staticaddr="rm", dhcppool="rm", wwwredir="rm", dnsredir="rm", wireless="reload" }
-  	M.switchConfiguration({ wifiiface="add", staticaddr="rm", dhcppool="rm", wwwredir="rm", dnsredir="rm" },boot)
+  	M.switchConfiguration({ wifiiface="add", staticaddr="rm", dhcppool="rm", wwwredir="rm", dnsredir="rm" })
 
-	-- check if we are actually associated
-  	local status = wifi.getDeviceState()
-	if not status.ssid or status.ssid ~= ssid then
-		local msg = "Could not associate with network (incorrect password?)"
-		M.setStatus(M.CONNECTING_FAILED,msg);
-		return nil,msg
+	-- we check if we get a ssid and ip in max 5 seconds
+	-- if not there is probably a issue
+	local attemptInterval = 1
+	local maxAttempts = 5
+	local attempt = 0
+	local nextAttemptTime = os.time()
+	while true do
+		if os.time() > nextAttemptTime then
+			log:verbose(MOD_ABBR, "associated check "..utils.dump(attempt).."/"..utils.dump(maxAttempts))
+			if wifi.getLocalIP() ~= nil and wifi.getDeviceState().ssid == ssid then
+				break
+			else
+				attempt = attempt+1
+				if attempt >= maxAttempts then
+					-- still no correct ssid; fail
+					local msg = "Could not associate with network (incorrect password?)"
+					M.setStatus(M.CONNECTING_FAILED,msg);
+					return false, msg
+				else
+					nextAttemptTime = os.time() + attemptInterval
+				end
+			end
+		end
 	end
-	
-	M.setStatus(M.CONNECTED,"Connected");
-	
+	log:info(MOD_ABBR, "Network associated")
+
 	-- signin to connect.doodle3d.com
 	local success, output = signin.signin()
 	if success then
-  		log:info("Signed in")
-	else 
-		log:info("Signing in failed")
+  		log:info(MOD_ABBR, "Signed in")
+	else
+		log:info(MOD_ABBR, "Signing in failed")
 	end
 
+	-- report we are connected after signin attempt
+	M.setStatus(M.CONNECTED,"Connected");
+
 	return true
 end
+
 --- Disassociate wlan device as client from all SSID's.
 -- Note: this function might belong in the wlanconfig module but that would introduce
 -- a circular dependency, easiest solution is to place the function here.
@@ -398,30 +417,28 @@ end
 function M.disassociate()
 
 	M.setStatus(M.NOT_CONNECTED,"Not connected");
-	
+
 	wifi.activateConfig()
 	return wifi.restart()
 end
 
 function M.getStatus()
-	log:info("network:getStatus")
+	log:verbose(MOD_ABBR, "network:getStatus")
 	local file, error = io.open('/tmp/networkstatus.txt','r')
 	if file == nil then
-		--log:error("Util:Access:Can't read controller file. Error: "..error)
+		--log:error(MOD_ABBR, "Util:Access:Can't read controller file. Error: "..error)
 		return "",""
 	else
 		local status = file:read('*a')
-		--log:info("  status: "..utils.dump(status))
 		file:close()
 		local code, msg = string.match(status, '([^|]+)|+(.*)')
-		--log:info("  code: "..utils.dump(code))
-		--log:info("  msg: "..utils.dump(msg))
+		log:verbose(MOD_ABBR, "  raw status: "..utils.dump(status).." (code: "..utils.dump(code)..", msg: "..utils.dump(msg)..")")
 		return code,msg
 	end
 end
 
 function M.setStatus(code,msg)
-	log:info("network:setStatus: "..code.." | "..msg)
+	log:info(MOD_ABBR, "network:setStatus: "..code.." | "..msg)
 	local file = io.open('/tmp/networkstatus.txt','w')
 	file:write(code.."|"..msg)
 	file:flush()

src/network/signin.lua

@@ -20,6 +20,7 @@ local status = require('util.status')
 local M = {}
 
 local STATUS_FILE = "signinstatus"
+local MOD_ABBR = "NTSI"
 
 local IDLE_STATUS 			= 1
 local SIGNING_IN_STATUS 	= 2
@@ -27,55 +28,61 @@ local SIGNING_IN_STATUS 	= 2
 --- Signin to connect.doodle3d.com server
 --
 function M.signin()
-
-	--log:debug("signin:signin");
+	log:verbose(MOD_ABBR, "signin:signin");
 
 	local code, msg = M.getStatus()
-	--log:debug("  status: "..utils.dump(code).." "..utils.dump(msg));
+	--log:verbose(MOD_ABBR, "  status: "..utils.dump(code).." "..utils.dump(msg));
 
 	-- if we are already signin in, skip
 	if(code == SIGNING_IN_STATUS) then
-		log:debug("  skipping signin")
+		log:verbose(MOD_ABBR, "  already signing in, skipping")
+		return
+	end
+
+	local ds = wifi.getDeviceState()
+	log:verbose(MOD_ABBR, "  wifi deviceState.mode: "..utils.dump(ds.mode))
+	if ds.mode ~= "sta" then
+		log:verbose(MOD_ABBR, "  wifi not in station mode, skipping signin")
 		return
 	end
 
 	M.setStatus(SIGNING_IN_STATUS,"signing in")
 
 	local baseurl = "http://connect.doodle3d.com/api/signin.php"
-	
+
 	local attemptInterval = 1
 	local maxAttempts = 20
 	local attempt = 0
-	
+
 	local nextAttemptTime = os.time()
-	
+
 	local localip = ""
 	local signinResponse = ""
 	while true do
 		if os.time() > nextAttemptTime then
-			log:debug("signin attempt "..utils.dump(attempt).."/"..utils.dump(maxAttempts))
+			log:verbose(MOD_ABBR, "  signin attempt "..utils.dump(attempt).."/"..utils.dump(maxAttempts))
 			local signedin = false
 			local localip = wifi.getLocalIP();
-			--log:debug("  localip: "..utils.dump(localip))
+			--log:verbose(MOD_ABBR, "  localip: "..utils.dump(localip))
 			if localip ~= nil then
-				
+
 				local wifiboxid = wifi.getSubstitutedSsid(settings.get('network.cl.wifiboxid'))
 				wifiboxid = urlcode.escape(wifiboxid)
-			
+
 				local cmd = "wget -q -T 2 -t 1 -O - "..baseurl.."?wifiboxid="..wifiboxid.."\\&localip="..localip;
 				signinResponse = utils.captureCommandOutput(cmd);
-				log:debug("  signin response: \n"..utils.dump(signinResponse))
+				log:verbose(MOD_ABBR, "  signin response: \n"..utils.dump(signinResponse))
 				local success = signinResponse:match('"status":"success"')
-				log:debug("  success: "..utils.dump(success))
+				log:verbose(MOD_ABBR, "  success: "..utils.dump(success))
 				if success ~= nil then
 					signedin = true
 				else
-					log:warn("signin failed request failed (response: "..utils.dump(signinResponse)..")")
+					log:warning(MOD_ABBR, "signin failed, request failed (response: "..utils.dump(signinResponse)..")")
 				end
-			else 
-				log:warn("signin failed no local ip found (attempt: "..utils.dump(attempt).."/"..utils.dump(maxAttempts)..")")
+			else
+				log:warning(MOD_ABBR, "signin failed, no local ip found (attempt: "..utils.dump(attempt).."/"..utils.dump(maxAttempts)..")")
 			end
-			
+
 			if signedin then
 				break
 			else
@@ -90,7 +97,7 @@ function M.signin()
 			end
 		end
 	end
-	
+
 	M.setStatus(IDLE_STATUS,"idle")
 	return string.len(signinResponse) > 0, signinResponse
 end
@@ -100,7 +107,7 @@ function M.getStatus()
 end
 
 function M.setStatus(code,msg)
-	log:info("signin:setStatus: "..code.." | "..msg)
+	log:verbose(MOD_ABBR, "signin:setStatus: " .. code .. " (" .. msg .. ")")
 	status.set(STATUS_FILE,code,msg);
 end
 

src/network/wlanconfig.lua

@@ -13,6 +13,8 @@ local iwinfo = require('iwinfo')
 
 local M = {}
 
+local MOD_ABBR = "NTWL"
+
 -- NOTE: fallback device 'radio0' is required because sometimes the wlan0 device disappears
 M.DFL_DEVICE = 'wlan0'
 M.DFL_DEVICE_FALLBACK = 'radio0'
@@ -25,14 +27,14 @@ local deviceName, deviceApi
 local cachedApSsid, baseApSsid = nil, nil
 
 function M.getSubstitutedSsid(unformattedSsid)
+	log:verbose(MOD_ABBR, "getSubstitutedSsid unformattedSsid:'" .. (unformattedSsid or "nil") .. "' baseApSsid:'" .. (baseApSsid or "nil") .. "' cachedApSsid:'" .. (cachedApSsid or "nil"))
 	if unformattedSsid == baseApSsid and cachedApSsid ~= nil then return cachedApSsid end
 	if not unformattedSsid or type(unformattedSsid) ~= 'string' then return nil end
 
 	local macTail = M.getMacAddress():sub(7)
-
+	log:verbose(MOD_ABBR, "  macTail:'" .. macTail)
 	baseApSsid = unformattedSsid
 	cachedApSsid = unformattedSsid:gsub('%%%%MAC_ADDR_TAIL%%%%', macTail)
-
 	return cachedApSsid
 end
 
@@ -75,7 +77,7 @@ function M.init(device)
 		deviceName = M.DFL_DEVICE_FALLBACK
 		deviceApi = iwinfo.type(deviceName)
 
-		log:info("wireless device '" .. devInitial .. "' not found, trying fallback '" .. deviceName .. "'")
+		log:info(MOD_ABBR, "wireless device '" .. devInitial .. "' not found, trying fallback '" .. deviceName .. "'")
 
 		if not deviceApi then
 			return false, "No such wireless device: '" .. devInitial .. "' (and fallback '" .. deviceName .. "' does not exist either)"
@@ -107,7 +109,9 @@ end
 --returns the wireless device's MAC address (as string, without colons)
 --(lua numbers on openWrt seem to be 32bit so they cannot represent a MAC address as one number)
 function M.getMacAddress()
+	log:verbose(MOD_ABBR, "getMacAddress")
 	local macText = utils.readFile('/sys/class/net/' .. deviceName .. '/address')
+	log:verbose(MOD_ABBR, "  macText: '" .. (macText or "nil") .. "'")
 	local out = ''
 
 	-- Hack to prevent failure in case the MAC address could not be obtained.
@@ -124,9 +128,10 @@ end
 --returns the wireless local ip address
 function M.getLocalIP()
 	local ifconfig, rv = utils.captureCommandOutput("ifconfig wlan0");
-	--log:debug("  ifconfig: \n"..utils.dump(ifconfig));
-	local localip = ifconfig:match('inet addr:([%d\.]+)')
-	return localip;
+	log:bulk(MOD_ABBR, "  ifconfig: \n"..utils.dump(ifconfig));
+
+	local localip = ifconfig:match('inet addr:([%d%.]+)')
+	return localip
 end
 
 function M.getDeviceName()
@@ -137,9 +142,10 @@ end
 -- @param ssid	return data for given SSID or for all networks if SSID not given
 -- @return data for all or requested network; false+error on failure or nil when requested network not found
 function M.getScanInfo(ssid)
-
 	local iw = iwinfo[deviceApi]
+	log:info(MOD_ABBR, "start wifi scan")
 	local sr = iw.scanlist(deviceName)
+	log:info(MOD_ABBR, "wifi scan done")
 	local si, se
 
 	if ssid == nil then
@@ -171,12 +177,13 @@ end
 function M.removeConfig(ssid)
 	local rv = false
 	uci:foreach('wireless', 'wifi-iface', function(s)
+		log:verbose(MOD_ABBR, utils.dump(s.ssid).."\n "..utils.dump(s))
 		if s.ssid == ssid then
-			uci:delete('wireless', s['.name'])
-			rv = true
-			return false
+			log:verbose(MOD_ABBR, "deleting faulty ssid: "..utils.dump(s['.name']))
+			rv = uci:delete('wireless', s['.name'])
 		end
 	end)
+	uci:save('wireless')
 	uci:commit('wireless')
 	return rv
 end
@@ -184,12 +191,12 @@ end
 --- Activate wireless section for given SSID and disable all others
 -- @param ssid	SSID of config to enable, or nil to disable all network configs
 function M.activateConfig(ssid)
-	--log:info("wlanconfig.activateConfig: "..ssid);
+	log:verbose(MOD_ABBR, "wlanconfig.activateConfig: "..ssid);
 
 	-- make sure only one is enabled
 	uci:foreach('wireless', 'wifi-iface', function(s)
 		local disabled = s.ssid ~= ssid and '1' or '0'
-		--log:info("    "..utils.dump(s.ssid).." disable: "..utils.dump(disabled))
+		log:verbose(MOD_ABBR, "  ssid: "..utils.dump(s.ssid).." disabled: "..utils.dump(disabled))
 		uci:set('wireless', s['.name'], 'disabled', disabled)
 	end)
 
@@ -207,11 +214,14 @@ function M.activateConfig(ssid)
 			return false
 		end
 	end)
-	--[[log:info("  result:");
+
+	--[[
+	log:verbose(MOD_ABBR, "  wifi reorder result:");
 	uci:foreach('wireless', 'wifi-iface', function(s)
 		local disabled = s.ssid ~= ssid and '1' or '0'
-		log:info("    "..utils.dump(s.ssid).." disable: "..utils.dump(disabled))
-	end)]]--
+		log:verbose(MOD_ABBR, "    ssid: "..utils.dump(s.ssid).." disabled: "..utils.dump(disabled))
+	end)
+	--]]
 
 	uci:commit('wireless')
 end
@@ -229,7 +239,7 @@ function M.createConfigFromScanInfo(info, passphrase, disabled)
 		network = M.NET,
 		device = 'radio0',
 		ssid = info.ssid,
-		bssid = info.bssid,
+		--bssid = info.bssid,
 		encryption = M.mapEncryptionType(info.encryption),
 		mode = mode,
 	}
@@ -237,8 +247,9 @@ function M.createConfigFromScanInfo(info, passphrase, disabled)
 	apconfig.disabled = disabled ~= nil and disabled and 1 or 0
 
 	uci:foreach('wireless', 'wifi-iface', function(s)
-		if s.bssid == info.bssid then
-			log:debug("removing old wireless config for net '" .. s.ssid .. "(bssid: " .. s.bssid .. ")'")
+		--if s.bssid == info.bssid then
+		if s.ssid == info.ssid then
+			log:verbose(MOD_ABBR, "removing old wireless config for net '" .. s.ssid .. "'")
 			uci:delete('wireless', s['.name'])
 --			return false --keep looking, just in case multiple entries with this bssid exist
 		end

src/rest/api/api_config.lua

@@ -15,12 +15,12 @@ local wifi = require('network.wlanconfig')
 local accessManager = require('util.access')
 local printerAPI = require('rest.api.api_printer')
 
+local MOD_ABBR = "ACFG"
 
 local M = {
 	isApi = true
 }
 
-
 -- TODO: this function is also defined in 2 other places, combine them (and avoid require loops)
 local function operationsAccessOrFail(request, response)
 	if not accessManager.hasControl(request.remoteAddress) then
@@ -56,8 +56,10 @@ function M._global_GET(request, response)
 	end
 end
 
+-- returns substituted_wifiboxid (since version 0.10.2)
+-- returns substituted_ssid (since version 0.9.1)
 function M._global_POST(request, response)
-	--log:info("API:config:set")
+	log:verbose(MOD_ABBR, "API:config(set)")
 
 	if not operationsAccessOrFail(request, response) then return end
 
@@ -65,14 +67,14 @@ function M._global_POST(request, response)
 
 	local validation = {}
 	for k,v in pairs(request:getAll()) do
-		--log:info("  "..k..": "..v);
+		log:verbose(MOD_ABBR, "  about to set '"..k.."' -> '"..v.."'");
 		local r,m = settings.set(k, v, true)
 
 		if r then
 			validation[k] = "ok"
 		elseif r == false then
 			validation[k] = "could not save setting ('" .. m .. "')"
-			log:info("  m: "..utils.dump(m))
+			log:info(MOD_ABBR, "  failed to set '"..k.."' ("..utils.dump(m)..")")
 		elseif r == nil then
 			settings.commit()
 			response:setError(m)
@@ -84,6 +86,9 @@ function M._global_POST(request, response)
 
 	local substitutedSsid = wifi.getSubstitutedSsid(settings.get('network.ap.ssid'))
 	response:addData("substituted_ssid",substitutedSsid)
+
+	local substitutedWiFiBoxID = wifi.getSubstitutedSsid(settings.get('network.cl.wifiboxid'))
+	response:addData("substituted_wifiboxid",substitutedWiFiBoxID)
 end
 
 function M.all_GET(request, response)
@@ -106,18 +111,20 @@ end
 -- and printer.type is set to 'ultimaker' then
 -- only the printer.startcode under the ultimaker subsection is removed.
 function M.reset_POST(request, response)
-	--log:info("API:reset");
+	--log:verbose(MOD_ABBR, "API:config/reset")
 	if not operationsAccessOrFail(request, response) then return end
 	response:setSuccess()
 
 	for k,v in pairs(request:getAll()) do
-		--log:info("  "..k..": "..v);
+		--log:info(MOD_ABBR, "  "..k..": "..v);
 		local r,m = settings.reset(k);
 		if r ~= nil then
 			response:addData(k, "ok")
+			log:verbose(MOD_ABBR, "  reset " .. k)
 		else
 			response:addData(k, "could not reset key ('" .. m .. "')")
 			response:setError(m)
+			log:verbose(MOD_ABBR, "  could not reset key " .. k .. "(" .. m .. ")")
 			return
 		end
 	end

src/rest/api/api_info.lua

@@ -14,12 +14,21 @@ local printDriver = require('print3d')
 local printerUtils = require('util.printer')
 local printerAPI = require('rest.api.api_printer')
 local wifi = require('network.wlanconfig')
+local settings = require('util.settings')
+
+local MOD_ABBR = "AINF"
 
 local TMP_DIR = '/tmp'
 local LOG_COLLECT_DIRNAME = 'wifibox-logs'
 local LOG_COLLECT_DIR = TMP_DIR .. '/' .. LOG_COLLECT_DIRNAME
-local WIFIBOX_LOG_FILENAME = 'wifibox.log'
-local WIFIBOX_LOG_FILE = TMP_DIR .. '/' .. WIFIBOX_LOG_FILENAME
+local DEFAULT_WIFIBOX_LOG_FILENAME = 'wifibox.log'
+local DEFAULT_WIFIBOX_LOG_FILE = TMP_DIR .. '/' .. DEFAULT_WIFIBOX_LOG_FILENAME
+local WIFIBOX_STDOUT_LOG_FILENAME = 'wifibox.stdout.log'
+local WIFIBOX_STDOUT_LOG_FILE = TMP_DIR .. '/' .. WIFIBOX_STDOUT_LOG_FILENAME
+local WIFIBOX_VERSION_FILENAME = 'wifibox-version'
+local WIFIBOX_VERSION_FILE = '/etc/' .. WIFIBOX_VERSION_FILENAME
+local ROTATED_LOGS_DIRNAME = 'wifibox-rotated'
+local ROTATED_LOGS_DIR = TMP_DIR .. '/' .. ROTATED_LOGS_DIRNAME
 
 local SYSLOG_FILENAME = 'syslog'
 local PROCESS_LIST_FILENAME = 'processes'
@@ -33,7 +42,7 @@ local USB_DIRTREE_COMMAND = "ls -R /sys/devices/platform/ehci-platform/usb1 | gr
 local USB_DIRTREE_FILENAME = 'sys_devices_platform_ehci-platform_usb1.tree'
 
 local PRINT3D_BASEPATH = '/tmp'
-local PRINT3D_LOG_FILENAME_PREFIX = 'print3d-'
+local PRINT3D_LOG_FILENAME_PREFIX = 'print3d.'
 local PRINT3D_LOG_FILENAME_SUFFIX = '.log'
 local LOG_COLLECT_ARCHIVE_FILENAME = LOG_COLLECT_DIRNAME .. '.tgz'
 local LOG_COLLECT_ARCHIVE_FILE = TMP_DIR .. '/' .. LOG_COLLECT_ARCHIVE_FILENAME
@@ -46,8 +55,13 @@ local M = {
 	isApi = true
 }
 
+-- returns wifiboxid (since version 0.10.2)
 function M._global(request, response)
 	response:setSuccess()
+
+	local wifiboxid = wifi.getSubstitutedSsid(settings.get('network.cl.wifiboxid'))
+	response:addData('wifiboxid', wifiboxid)
+
 end
 
 -- TODO: redirect stdout+stderr; handle errors
@@ -57,11 +71,34 @@ function M.logfiles(request, response)
 	rv,msg = lfs.mkdir(LOG_COLLECT_DIR)
 	rv,msg = lfs.chdir(TMP_DIR)
 
+	local wifiboxLogFilePath = log:getLogFilePath()
+	local wifiboxLogFileName = wifiboxLogFilePath and wifiboxLogFilePath:match('.*/(.*)')
+
 
 	--[[ create temporary files ]]--
 
-	-- copy wifibox API-script log
-	rv,sig,code = redirectedExecute('cp ' .. WIFIBOX_LOG_FILE .. ' ' .. LOG_COLLECT_DIR)
+	-- copy wifibox API-script (firmware) log
+	lfs.link(wifiboxLogFilePath, LOG_COLLECT_DIR .. '/' .. wifiboxLogFileName)
+
+	-- copy d3dapi script stdout/stderr (fallback) log
+	lfs.link(WIFIBOX_STDOUT_LOG_FILE, LOG_COLLECT_DIR .. '/' .. WIFIBOX_STDOUT_LOG_FILENAME)
+
+	-- collect and copy print3d server logs
+	for file in lfs.dir(PRINT3D_BASEPATH) do
+		if file:find(PRINT3D_LOG_FILENAME_PREFIX) == 1 and file:find(PRINT3D_LOG_FILENAME_SUFFIX) ~= nil then
+			local srcLogFile = PRINT3D_BASEPATH .. '/' .. file
+			local tgtLogFile = LOG_COLLECT_DIR .. '/' .. file
+			lfs.link(srcLogFile, tgtLogFile)
+		end
+	end
+
+	-- copy rotated firmware and print3d logs
+	rv,msg = lfs.mkdir(LOG_COLLECT_DIR .. '/' .. ROTATED_LOGS_DIRNAME)
+	for file in lfs.dir(ROTATED_LOGS_DIR) do
+		local srcLogFile = ROTATED_LOGS_DIR .. '/' .. file
+		local tgtLogFile = LOG_COLLECT_DIR .. '/' .. ROTATED_LOGS_DIRNAME .. '/' .. file
+		lfs.link(srcLogFile, tgtLogFile)
+	end
 
 	-- capture syslog
 	rv,sig,code = os.execute('logread > ' .. LOG_COLLECT_DIR .. '/' .. SYSLOG_FILENAME)
@@ -81,7 +118,10 @@ function M.logfiles(request, response)
 	-- list directory structure for primary USB controller
 	rv,sig,code = os.execute(USB_DIRTREE_COMMAND .. ' > ' .. LOG_COLLECT_DIR .. '/' .. USB_DIRTREE_FILENAME)
 
+	rv,sig,code = redirectedExecute('cp ' .. WIFIBOX_VERSION_FILE .. ' ' .. LOG_COLLECT_DIR)
+
 	-- copy relevant openwrt configuration files
+	-- Note: we cannot link them because that would require the link to span over filesystems
 	rv,msg = lfs.mkdir(LOG_COLLECT_DIR .. '/config')
 	for _,v in pairs(UCI_CONFIG_FILES_TO_SAVE) do
 		local srcFile = '/etc/config/' .. v
@@ -89,19 +129,12 @@ function M.logfiles(request, response)
 		if v ~= 'wireless' then
 			rv,sig,code = redirectedExecute('cp ' .. srcFile .. ' ' .. tgtFile)
 		else
+			-- replace WiFi passwords with '...'
 			rv,sig,code = os.execute("sed \"s/option key '.*'/option key '...'/g\" " .. srcFile .. " > " .. tgtFile)
 		end
 	end
 
-	-- collect and copy print3d server logs
-	for file in lfs.dir(PRINT3D_BASEPATH) do
-		if file:find(PRINT3D_LOG_FILENAME_PREFIX) == 1 and file:find(PRINT3D_LOG_FILENAME_SUFFIX) ~= nil then
-			local srcLogFile = PRINT3D_BASEPATH .. '/' .. file
-			local tgtLogFile = LOG_COLLECT_DIR .. '/' .. file
-			rv,sig,code = redirectedExecute('cp ' .. srcLogFile .. ' ' .. tgtLogFile)
-			end
-		end
-
+	-- create tar.gz archive of the files/data we collected
 	rv,sig,code = redirectedExecute('tar czf ' .. LOG_COLLECT_ARCHIVE_FILE .. ' ' .. LOG_COLLECT_DIRNAME) --returns 0 success, 1 error
 
 
@@ -127,13 +160,19 @@ function M.logfiles(request, response)
 	rv,sig,code = redirectedExecute('rm ' .. LOG_COLLECT_DIR .. '/config/*')
 	rv,msg = lfs.rmdir(LOG_COLLECT_DIR .. '/config')
 
+	-- Note: this assumes the rotated logs directory does not contain subdirectories
+	rv,sig,code = redirectedExecute('rm ' .. LOG_COLLECT_DIR .. '/' .. ROTATED_LOGS_DIRNAME .. '/*')
+	rv,msg = lfs.rmdir(LOG_COLLECT_DIR .. '/' .. ROTATED_LOGS_DIRNAME)
+
+	rv,sig,code = redirectedExecute('rm ' .. LOG_COLLECT_DIR .. '/' .. WIFIBOX_VERSION_FILENAME)
 	rv,sig,code = redirectedExecute('rm ' .. LOG_COLLECT_DIR .. '/' .. USB_DIRTREE_FILENAME)
 	rv,sig,code = redirectedExecute('rm ' .. LOG_COLLECT_DIR .. '/' .. DISKFREE_FILENAME)
 	rv,sig,code = redirectedExecute('rm ' .. LOG_COLLECT_DIR .. '/' .. MOUNTS_FILENAME)
 	rv,sig,code = redirectedExecute('rm ' .. LOG_COLLECT_DIR .. '/' .. MEMINFO_FILENAME)
 	rv,sig,code = redirectedExecute('rm ' .. LOG_COLLECT_DIR .. '/' .. PROCESS_LIST_FILENAME)
 	rv,sig,code = redirectedExecute('rm ' .. LOG_COLLECT_DIR .. '/' .. SYSLOG_FILENAME)
-	rv,sig,code = redirectedExecute('rm ' .. LOG_COLLECT_DIR .. '/' .. WIFIBOX_LOG_FILENAME)
+	rv,sig,code = redirectedExecute('rm ' .. LOG_COLLECT_DIR .. '/' .. WIFIBOX_STDOUT_LOG_FILENAME)
+	rv,sig,code = redirectedExecute('rm ' .. LOG_COLLECT_DIR .. '/' .. wifiboxLogFileName)
 
 	rv,msg = lfs.rmdir(LOG_COLLECT_DIR)
 
@@ -141,44 +180,24 @@ function M.logfiles(request, response)
 end
 
 function M.access(request, response)
-	--log:info("  remoteAddress: |"..utils.dump(request.remoteAddress).."|");
-	--log:info("  controller: |"..utils.dump(accessManager.getController()).."|");
-
-	-- when there is a controller we check if the printer is idle,
-	-- if so, it should be done printing and we can clear the controller
-	if accessManager.getController() ~= "" then
-		local argId = request:get("id")
-		local printer,msg = printerUtils.createPrinterOrFail(argId, response)
-		local rv,msg = printer:getState()
-		if rv then
-			response:setSuccess()
-			if(state == "idle") then -- TODO: define in constants somewhere
-				accessManager.setController("") -- clear controller
-			end
-		else
-			response:setError(msg)
-			return false
-		end
-	end
+	--log:info(MOD_ABBR, "  remoteAddress: |"..utils.dump(request.remoteAddress).."|");
+	--log:info(MOD_ABBR, "  controller: |"..utils.dump(accessManager.getController()).."|");
 
 	local hasControl = accessManager.hasControl(request.remoteAddress)
+	-- if hasControl then log:info(MOD_ABBR, "  hasControl: true")
+	-- else log:info(MOD_ABBR, "  hasControl: false") end
 	response:setSuccess()
-
 	response:addData('has_control', hasControl)
 
-	return true
+	return
 end
 
 function M.status(request, response)
 
-	local ds = wifi.getDeviceState()
-	log:debug("  ssid: "..utils.dump(ds.ssid))
-	
-	local rv
-	rv, state = printerAPI.state(request, response)
+	local rv, state = printerAPI.state(request, response)
 	if(rv == false) then return end
-	
-	if(state ~= "disconnected") then
+
+	if state ~= "disconnected" and state ~= "connecting" then
 		rv = printerAPI.temperature(request, response)
 		if(rv == false) then return end
 		rv = printerAPI.progress(request, response)
@@ -186,7 +205,6 @@ function M.status(request, response)
 		rv = M.access(request, response)
 		if(rv == false) then return end
 	end
-	response:addData('v', 10)
 end
 
 return M

src/rest/api/api_network.lua

@@ -16,6 +16,8 @@ local signin = require('network.signin')
 local accessManager = require('util.access')
 local printerAPI = require('rest.api.api_printer')
 
+local MOD_ABBR = "ANET"
+
 local M = {
 	isApi = true
 }
@@ -147,11 +149,16 @@ function M.associate_POST(request, response)
 
 	response:setSuccess("wlan is trying to associate")
 
-	local rv,msg = netconf.associateSsid(argSsid, argPhrase, argRecreate,false)
+	local rv,msg = netconf.associateSsid(argSsid, argPhrase, argRecreate)
 	if rv then
-		log:info("associated to wifi: "..utils.dump(argSsid))
+		log:info(MOD_ABBR, "associated to wifi: "..utils.dump(argSsid))
 	else
-		log:info("failed to associate to wifi: "..utils.dump(argSsid).." ("..utils.dump(msg)..")")
+		log:info(MOD_ABBR, "failed to associate to wifi: "..utils.dump(argSsid).." ("..utils.dump(msg)..")")
+		wifi.removeConfig(argSsid)
+		local backupssid = wifi.getSubstitutedSsid(settings.get('network.ap.ssid'))
+		netconf.setupAccessPoint(backupssid)
+		netconf.enableAccessPoint(backupssid)
+		wifi.removeConfig(argSsid)
 	end
 
 end
@@ -201,24 +208,32 @@ function M.remove_POST(request, response)
 end
 
 function M.signin(request, response)
-	log:info("API:Network:signin")
 	local success, output = signin.signin()
 	if success then
-  		log:info("API:Network:signed in")
+  		log:info(MOD_ABBR, "signed in")
   		response:setSuccess("API:Network:signed in")
   		response:addData("response", output)
 	else
-		log:info("API:Network:Signing in failed")
+		log:warning(MOD_ABBR, "signing in failed")
 		response:setError("Signing in failed")
 	end
 end
 
 function M.alive(request, response)
 	response:setSuccess("alive")
-	
-	local ds = wifi.getDeviceState()
-	log:debug("  ssid: "..utils.dump(ds.ssid))
-	
+end
+
+function M.reset_POST(request, response)
+	response:setSuccess("Resetting networks")
+
+	log:info(MOD_ABBR, "Resetting networks")
+	for _, net in ipairs(wifi.getConfigs()) do
+		wifi.removeConfig(net.ssid)
+	end
+
+	local ssid = wifi.getSubstitutedSsid(settings.get('network.ap.ssid'))
+	netconf.setupAccessPoint(ssid)
+	netconf.enableAccessPoint(ssid)
 end
 
 return M

src/rest/api/api_printer.lua

@@ -5,15 +5,17 @@
 -- @license This software is licensed under the terms of the GNU GPL v2 or later.
 -- See file LICENSE.txt or visit http://www.gnu.org/licenses/gpl.html for full license details.
 
+-- TODO: return errors like in print_POST (error message in a 'msg' key instead of directly in the response) if this does not break API compatibility
 
 local lfs = require('lfs')
 local log = require('util.logger')
 local utils = require('util.utils')
 local settings = require('util.settings')
-local printDriver = require('print3d')
 local printerUtils = require('util.printer')
 local accessManager = require('util.access')
 
+local MOD_ABBR = "APRN"
+
 local M = {
 	isApi = true
 }
@@ -27,7 +29,7 @@ end
 function M.temperature(request, response)
 	local argId = request:get("id")
 	local printer,msg = printerUtils.createPrinterOrFail(argId, response)
-	if not printer then return false end
+	if not printer or not printer:hasSocket() then return end
 
 	local temperatures,msg = printer:getTemperatures()
 
@@ -38,37 +40,78 @@ function M.temperature(request, response)
 		response:addData('hotend_target', temperatures.hotend_target)
 		response:addData('bed', temperatures.bed)
 		response:addData('bed_target', temperatures.bed_target)
+	elseif temperatures == false then
+		response:addData('status', msg)
+		response:setFail("could not get temperature information (" .. msg .. ")")
 	else
 		response:setError(msg)
-		return false;
+	end
+end
+
+local function setCurrentPrint(id)
+	local cpfileName = "/tmp/current-print"
+	if id == nil then
+		io.popen('rm ' .. cpfileName):close()
+		return true
 	end
 
-	return true;
+	local cpfile = io.open(cpfileName, 'w+')
+	if cpfile == nil then
+		return false
+	end
+	cpfile:write(id)
+	cpfile:close()
+	return true
+end
+
+local function getCurrentPrint()
+	local idfile = io.open('/tmp/current-print')
+	if idfile ~= nil then
+		return idfile:read('*a')
+	end
+end
+
+local function stopFetch()
+	log:verbose(MOD_ABBR, "stopping print-fetch and removing start/endgcode")
+        io.popen("killall print-fetch"):close()
+	io.popen("rm /tmp/startcode /tmp/endcode"):close()
+	setCurrentPrint(nil)
 end
 
 function M.progress(request, response)
 	local argId = request:get("id")
 	local printer,msg = printerUtils.createPrinterOrFail(argId, response)
-	if not printer then return false end
+	if not printer or not printer:hasSocket() then return end
 
 	-- NOTE: despite their names, `currentLine` is still the error indicator and `bufferedLines` the message in such case.
-	local currentLine,bufferedLines,totalLines = printer:getProgress()
+	local currentLine,bufferedLines,totalLines,bufferSize,maxBufferSize,seqNumber,seqTotal = printer:getProgress()
+
+	local printId = getCurrentPrint()
+
 
 	response:addData('id', argId)
+	if printId ~= nil then
+		response:addData('current_print', printId)
+	end
 	if currentLine then
 		response:setSuccess()
 		response:addData('current_line', currentLine)
 		response:addData('buffered_lines', bufferedLines)
 		response:addData('total_lines', totalLines)
+		response:addData('buffer_size', bufferSize)
+		response:addData('max_buffer_size', maxBufferSize)
+		response:addData('seq_number', seqNumber)
+		response:addData('seq_total', seqTotal)
+	elseif progress == false then
+		response:addData('status', bufferedLines)
+		response:setFail("could not get progress information (" .. bufferedLines .. ")")
 	else
 		response:setError(bufferedLines)
-		return false
 	end
-
-	return true;
 end
 
--- NOTE: onlyReturnState is optional and prevents response from being modified
+-- Note: onlyReturnState is optional and prevents response from being modified, used when calling from within other api call
+-- Note: unlike regular API-functions, this one returns either true+state or false
 function M.state(request, response, onlyReturnState)
 	local argId = request:get("id")
 	if not onlyReturnState then response:addData('id', argId) end
@@ -81,6 +124,14 @@ function M.state(request, response, onlyReturnState)
 			response:addData('state', printerState)
 		end
 		return true, printerState
+	elseif not printer:hasSocket() then
+		-- while dev is present but no server is running yet, return 'fake' connecting state
+		local printerState = "connecting"
+		if not onlyReturnState then
+			response:setSuccess()
+			response:addData('state', printerState)
+		end
+		return true, printerState
 	else
 		local rv,msg = printer:getState()
 		if rv then
@@ -89,25 +140,24 @@ function M.state(request, response, onlyReturnState)
 				response:addData('state', rv)
 			end
 			return true, rv
-		else
+		else -- Note: do not differentiate between false and nil here, false should never be returned
 			if not onlyReturnState then response:setError(msg) end
 			return false
 		end
 	end
-	return true
+
+	--this point cannot be reached, no return necessary
 end
 
 -- retrieve a list of 3D printers currently supported
 function M.listall(request, response)
 	response:setSuccess()
 	response:addData('printers', printerUtils.supportedPrinters())
-	return true
 end
 
 
 
 function M.heatup_POST(request, response)
-
 	if not accessManager.hasControl(request.remoteAddress) then
 		response:setFail("No control access")
 		return
@@ -115,21 +165,23 @@ function M.heatup_POST(request, response)
 
 	local argId = request:get("id")
 	local printer,msg = printerUtils.createPrinterOrFail(argId, response)
-	if not printer then return false end
+	if not printer or not printer:hasSocket() then return false end
 
 	local temperature = settings.get('printer.heatup.temperature')
 	local rv,msg = printer:heatup(temperature)
 
 	response:addData('id', argId)
-	if rv then response:setSuccess()
-	else response:setFail(msg)
+	if rv then
+		response:setSuccess()
+	elseif rv == false then
+		response:addData('status', msg)
+		response:setFail("could not start heatup (" .. msg .. ")")
+	else
+		response:setError(msg)
 	end
 end
 
 function M.stop_POST(request, response)
-
-	log:info("API:printer/stop")
-
 	if not accessManager.hasControl(request.remoteAddress) then
 		response:setFail("No control access")
 		return
@@ -138,45 +190,149 @@ function M.stop_POST(request, response)
 	local argId = request:get("id")
 	local argGcode = request:get("gcode")
 	local printer,msg = printerUtils.createPrinterOrFail(argId, response)
-	if not printer then return end
-	
+	if not printer or not printer:hasSocket() then return end
+
+	stopFetch()
+
 	if(argGcode == nil) then
 		argGcode = ""
 	end
 	local rv,msg = printer:stopPrint(argGcode)
 
+
 	response:addData('id', argId)
-	if rv then response:setSuccess()
-	else response:setError(msg)
+	if rv then
+		response:setSuccess()
+	elseif rv == false then
+		response:addData('status', msg)
+		response:setFail("could not stop print (" .. msg .. ")")
+	else
+		response:setError(msg)
 	end
 end
 
---accepts: first(bool) (chunks will be concatenated but output file will be cleared first if this argument is true)
---accepts: start(bool) (only when this argument is true will printing be started)
-function M.print_POST(request, response)
+-- Used only in print_POST(); not nested for performance reasons
+local function addSequenceNumbering(printer, response)
+	-- NOTE: despite their names, `currentLine` is still the error indicator and `bufferedLines` the message in such case.
+	local currentLine,bufferedLines,totalLines,bufferSize,maxBufferSize,seqNumber,seqTotal = printer:getProgress()
+	if currentLine then
+		response:addData('seq_number', seqNumber)
+		response:addData('seq_total', seqTotal)
+	--else
+		--Note: getProgress failure is ignored (unlikely to happen if the other calls work, and also not really fatal here).
+		--      Alternatively, we could still add the fields with a special value (NaN is not supported by json, so perhaps -2?)
+	end
+end
 
-	local controllerIP = accessManager.getController()
-	local hasControl = false
-	if controllerIP == "" then
+function M.fetch_POST(request, response)
+	if not accessManager.hasControl(request.remoteAddress) then
+		response:setFail("No control access")
+		return
+	else
 		accessManager.setController(request.remoteAddress)
-		hasControl = true
-	elseif controllerIP == request.remoteAddress then
-		hasControl = true
 	end
 
-	log:info("  hasControl: "..utils.dump(hasControl))
-	if not hasControl then
-		response:setFail("No control access")
+	local printer,msg = printerUtils.createPrinterOrFail(argId, response)
+	if not printer or not printer:hasSocket() then return end
+
+	local state = printer:getState()
+	if state ~= "idle" then
+		response:setFail("printer is not idle")
 		return
 	end
 
+	log:verbose(MOD_ABBR, "  clearing all gcode for " .. printer:getId())
+	stopFetch()
+	local rv,msg = printer:clearGcode()
+
+	if rv == false then
+		response:addData('status', msg)
+		response:setFail("could not clear gcode (" .. msg .. ")")
+	elseif rv == nil then
+		response:setError(msg)
+		return
+	end
+
+	local gcodeFiles = " "
+	local startCode = request:get("start_code")
+	if startCode ~= nil then
+		gcodeFiles = gcodeFiles .. '/tmp/startcode '
+		local startCodeFile = io.open('/tmp/startcode', 'w+')
+                if startCodeFile == nil then
+                        response:setError("could not open startCode file for writing")
+                        return
+                end
+                startCodeFile:write(startCode)
+	end
+
+	local endCode = request:get("end_code")
+	if endCode ~= nil then
+		gcodeFiles = gcodeFiles .. '/tmp/endcode '
+		local endCodeFile = io.open('/tmp/endcode', 'w+')
+                if endCodeFile == nil then
+                        response:setError("could not open endcode file for writing")
+                        return
+                end
+                endCodeFile:write(endCode)
+	end
+
+	local socket = printer:getId()
+	if socket == nil then
+		response:setError("no socket found")
+		return
+	end
+	local gcodeServer = settings.get('gcode.server')
+	if gcodeServer == nil then
+		response:setError("no gcode server configured")
+		return
+	end
+	local id = request:get("id")
+	if id == nil then
+		response:setError("no id supplied")
+		return
+	end
+	setCurrentPrint(id)
+
+	log:info(MOD_ABBR, "  starting fetch print. id: " .. id .. " server: " .. gcodeServer)
+	io.popen("print-fetch " .. socket .. " " .. gcodeServer .. " " .. id .. gcodeFiles)
+
+	response:setSuccess()
+end
+
+--requires: gcode(string) (the gcode to be appended)
+--accepts: id(string) (the printer ID to append to)
+--accepts: clear(bool) (chunks will be concatenated but output file will be cleared first if this argument is true)
+--accepts: first(deprecated) (an alias for 'clear')
+--accepts: start(bool) (only when this argument is true will printing be started)
+--accepts: total_lines(int) (the total number of lines that is going to be sent, will be used only for reporting progress)
+--accepts: seq_number(int) (sequence number of the chunk, must be given until clear() after given once, and incremented each time)
+--accepts: seq_total(int) (total number of gcode chunks to be appended, must be given until clear() after given once, and stay the same)
+--returns: when the gcode buffer cannot accept the gcode, or the IPC transaction fails,
+--         a fail with a (formal, i.e., parseable) status argument will be returned;
+--         additionally, current sequence number and total will be returned (both are -1 if they have not been set)
+function M.print_POST(request, response)
+	if not accessManager.hasControl(request.remoteAddress) then
+		response:setFail("No control access")
+		return
+	else
+		accessManager.setController(request.remoteAddress)
+	end
 	local argId = request:get("id")
 	local argGcode = request:get("gcode")
-	local argIsFirst = utils.toboolean(request:get("first"))
+	local argClear = utils.toboolean(request:get("clear"))
+	local argIsFirst = utils.toboolean(request:get("first"))  -- deprecated
 	local argStart = utils.toboolean(request:get("start"))
+	local argTotalLines = request:get("total_lines") or -1
+	local argSeqNumber = request:get("seq_number") or -1
+	local argSeqTotal = request:get("seq_total") or -1
+	local remoteHost = request:getRemoteHost()
+	
+	log:info(MOD_ABBR, "print chunk metadata: total_lines=" .. argTotalLines .. ", seq_number=" .. argSeqNumber .. ", seq_total=" .. argSeqTotal)
 
 	local printer,msg = printerUtils.createPrinterOrFail(argId, response)
-	if not printer then return end
+	if not printer or not printer:hasSocket() then return end
+
+	stopFetch()
 
 	response:addData('id', argId)
 
@@ -185,12 +341,15 @@ function M.print_POST(request, response)
 		return
 	end
 
-	if argIsFirst == true then
-		log:debug("clearing all gcode for " .. printer:getId())
+	if argClear == true or argIsFirst == true then
+		log:verbose(MOD_ABBR, "  clearing all gcode for " .. printer:getId())
 		response:addData('gcode_clear',true)
 		local rv,msg = printer:clearGcode()
 
-		if not rv then
+		if rv == false then
+			response:addData('status', msg)
+			response:setFail("could not clear gcode (" .. msg .. ")")
+		elseif rv == nil then
 			response:setError(msg)
 			return
 		end
@@ -198,14 +357,20 @@ function M.print_POST(request, response)
 
 	local rv,msg
 
-	-- TODO: return errors with a separate argument like here in the rest of the code (this is how we designed the API right?)
-	rv,msg = printer:appendGcode(argGcode)
+	rv,msg = printer:appendGcode(argGcode, argTotalLines, { seq_number = argSeqNumber, seq_total = argSeqTotal, source = remoteHost })
 	if rv then
+		addSequenceNumbering(printer, response)
 		--NOTE: this does not report the number of lines, but only the block which has just been added
 		response:addData('gcode_append',argGcode:len())
+	elseif rv == false then
+		addSequenceNumbering(printer, response)
+		response:addData('status', msg)
+		response:setFail("could not add gcode (" .. msg .. ")")
+		return
 	else
-		response:setError("could not add gcode")
+		addSequenceNumbering(printer, response)
 		response:addData('msg', msg)
+		response:setError("could not add gcode (" .. msg .. ")")
 		return
 	end
 
@@ -215,9 +380,14 @@ function M.print_POST(request, response)
 		if rv then
 			response:setSuccess()
 			response:addData('gcode_print',true)
+		elseif rv == false then
+			response:addData('status', msg)
+			response:setFail("could not send gcode (" .. msg .. ")")
+			return
 		else
-			response:setError("could not send gcode")
 			response:addData('msg', msg)
+			response:setError("could not send gcode (" .. msg .. ")")
+			return
 		end
 	else
 		response:setSuccess()

src/rest/api/api_sketch.lua

@@ -16,6 +16,8 @@ local lfs = require('lfs')
 local log = require('util.logger')
 local utils = require('util.utils')
 
+local MOD_ABBR = "ASKE"
+
 local M = {
 	isApi = true,
 	SKETCH_DIR = '/root/sketches',
@@ -29,7 +31,7 @@ local SKETCH_FILE_EXTENSION = 'svg'
 -- creates sketch directory, and sets response to error state on failure
 local function createSketchDirectory()
 	if os.execute('mkdir -p ' .. M.SKETCH_DIR) ~= 0 then
-		log:error("Error: could not create sketch directory '" .. M.SKETCH_DIR .. "'")
+		log:error(MOD_ABBR, "could not create sketch directory '" .. M.SKETCH_DIR .. "'")
 		response:setError("could not create sketch directory")
 		return false
 	end
@@ -133,7 +135,7 @@ function M._global_POST(request, response)
 	local sketchIdx = listSize > 0 and sketches[listSize] + 1 or 1
 	local sketchFile = M.SKETCH_DIR .. '/' .. constructSketchFilename(sketchIdx)
 
-	log:debug("saving sketch #" .. sketchIdx .. " (" .. argData:len() .. " bytes)")
+	log:verbose(MOD_ABBR, "saving sketch #" .. sketchIdx .. " (" .. argData:len() .. " bytes)")
 	local saveFile,msg = io.open(sketchFile, 'w')
 
 	if not saveFile then
@@ -169,4 +171,56 @@ function M.clear_POST(request, response)
 	end
 end
 
+-- remove single sketch
+-- function M.delete_POST(request, response)
+-- 	local argId = tonumber(request:get("id")) --to number will raise exception in case of illegal input
+-- 	local filename = M.SKETCH_DIR .. '/' .. constructSketchFilename(argId)
+-- 	local rv = os.execute("rm -f " .. filename)
+-- 	if rv == 0 then response:setSuccess()
+-- 	else response:setFail("could not remove " .. filename)
+-- 	end
+-- end
+
+-- recreate directory sequence by renaming files
+function M.index_POST(request, response)
+	local list = {}
+	local index = 1
+	for item in lfs.dir(M.SKETCH_DIR) do
+		if item ~= '.' and item ~= '..' then
+			local idx = item:match('^(%d+)\.'..SKETCH_FILE_EXTENSION..'$')
+			if idx and idx:len() == NUMBER_PAD_WIDTH then
+				local src = M.SKETCH_DIR .. '/' .. item
+				local dst = M.SKETCH_DIR .. '/' .. constructSketchFilename(index)
+				
+				if src ~= dst then
+					table.insert(list, src .. ' ' .. dst)
+					local rv = os.execute("mv " .. src .. ' ' .. dst)
+				end
+
+				index = index + 1
+				
+			end
+		end
+	end
+
+	response:addData('list',list)
+	response:setSuccess()
+end
+
+-- list files by fileID (not by index)
+function M.list_GET(request, response)
+	response:addData("list",createSketchList())
+	response:setSuccess()
+end
+
+-- remove single sketch by fileID (not by index)
+function M.delete_POST(request, response)
+	local argId = tonumber(request:get("id")) --to number will raise exception in case of illegal input
+	local filename = M.SKETCH_DIR .. '/' .. constructSketchFilename(argId)
+	local rv = os.execute("rm -f " .. filename)
+	if rv == 0 then response:setSuccess()
+	else response:setFail("could not remove " .. filename)
+	end
+end
+
 return M

src/rest/api/api_update.lua

@@ -10,6 +10,8 @@ local wifi = require('network.wlanconfig')
 local netconf = require('network.netconfig')
 local settings = require('util.settings')
 
+local MOD_ABBR = "AUPD"
+
 -- NOTE: the updater module 'detects' command-line invocation by existence of 'arg', so we have to make sure it is not defined.
 argStash = arg
 arg = nil
@@ -47,11 +49,13 @@ end
 
 
 function M.status(request, response)
+	local includeBetas = settings.get('doodle3d.update.includeBetas')
+	local baseUrl = settings.get('doodle3d.update.baseUrl')
 	updater.setLogger(log)
+	updater.setBaseUrl(baseUrl)
 	updater.setUseCache(false)
-	local success,status,msg = updater.getStatus()
+	local success,status,msg = updater.getStatus(includeBetas)
 
-	--response:addData('current_version', status.currentVersion)
 	response:addData('current_version', updater.formatVersion(status.currentVersion))
 
 	response:addData('state_code', status.stateCode)
@@ -62,10 +66,12 @@ function M.status(request, response)
 		return
 	end
 
-	local canUpdate = updater.compareVersions(status.newestVersion, status.currentVersion) > 0
+	local canUpdate = updater.compareVersions(status.newestVersion, status.currentVersion, status.newestReleaseTimestamp, status.currentReleaseTimestamp) > 0
+	if (status.currentVersion.suffix ~= nil) and not includeBetas then canUpdate = true end -- always allow downgrade from beta to stable if !includeBetas
 
-	--response:addData('newest_version', status.newestVersion)
 	response:addData('newest_version', updater.formatVersion(status.newestVersion))
+	if status.currentReleaseTimestamp then response:addData('current_release_date', updater.formatDate(status.currentReleaseTimestamp)) end
+	if status.newestReleaseTimestamp then response:addData('newest_release_date', updater.formatDate(status.newestReleaseTimestamp)) end
 	response:addData('can_update', canUpdate)
 
 	if status.progress then response:addData('progress', status.progress) end
@@ -87,14 +93,17 @@ function M.download_POST(request, response)
 	-- block access to prevent potential issues with printing (e.g. out of memory)
 	if not operationsAccessOrFail(request, response) then return end
 
+	local includeBetas = settings.get('doodle3d.update.includeBetas')
+	local baseUrl = settings.get('doodle3d.update.baseUrl')
 	updater.setLogger(log)
+	updater.setBaseUrl(baseUrl)
 
 	updater.setState(updater.STATE.DOWNLOADING,"")
 
 	local vEnt, rv, msg
 
 	if not argVersion then
-		local success,status,msg = updater.getStatus()
+		local success,status,msg = updater.getStatus(includeBetas)
 		if not success then
 			updater.setState(updater.STATE.DOWNLOAD_FAILED, msg)
 			response:setFail(msg)
@@ -124,7 +133,7 @@ function M.download_POST(request, response)
 		end
 	end
 
-	vEnt,msg = updater.findVersion(argVersion)
+	vEnt,msg = updater.findVersion(argVersion, includeBetas)
 	if vEnt == nil then
 		updater.setState(updater.STATE.DOWNLOAD_FAILED, "error searching version index (" .. msg .. ")")
 		response:setFail("error searching version index (" .. msg .. ")")
@@ -151,11 +160,14 @@ end
 function M.install_POST(request, response)
 	local argVersion = request:get("version")
 	local argNoRetain = request:get("no_retain")
-	log:info("API:update/install (noRetain: "..utils.dump(argNoRetain)..")")
+	log:info(MOD_ABBR, "API:update/install (noRetain: "..utils.dump(argNoRetain)..")")
 	local noRetain = argNoRetain == 'true'
-	
+
 	if not operationsAccessOrFail(request, response) then return end
-	
+
+	local includeBetas = settings.get('doodle3d.update.includeBetas')
+	local baseUrl = settings.get('doodle3d.update.baseUrl')
+	updater.setBaseUrl(baseUrl)
 	updater.setLogger(log)
 	updater.setState(updater.STATE.INSTALLING,"")
 
@@ -163,7 +175,7 @@ function M.install_POST(request, response)
 	--local rv,msg = netconf.enableAccessPoint(ssid)
 
 	if not argVersion then
-		local success,status,msg = updater.getStatus()
+		local success,status,msg = updater.getStatus(includeBetas)
 		if not success then
 			updater.setState(updater.STATE.INSTALL_FAILED, msg)
 			response:setFail(msg)
@@ -173,7 +185,7 @@ function M.install_POST(request, response)
 		end
 	end
 
-	vEnt,msg = updater.findVersion(argVersion)
+	vEnt,msg = updater.findVersion(argVersion, includeBetas)
 	if vEnt == nil then
 		updater.setState(updater.STATE.INSTALL_FAILED, "error searching version index (" .. msg .. ")")
 		response:setFail("error searching version index (" .. msg .. ")")

src/rest/request.lua

@@ -167,7 +167,8 @@ setmetatable(M, {
 })
 
 --This function initializes itself using various environment variables, the arg array and the given postData
---NOTE: if debugging is enabled, commandline arguments 'm' and 'f' override requested module and function
+--NOTE: if debugging is enabled, commandline argument 'p' (path) overrides requested module and function and
+--      'r' (rqType) overrides request method
 function M.new(environment, postData, debugEnabled)
 	local self = setmetatable({}, M)
 
@@ -180,6 +181,10 @@ function M.new(environment, postData, debugEnabled)
 		self.remoteAddress = environment['REMOTE_ADDR']
 	else
 		self.requestMethod = 'CMDLINE'
+		self.remoteHost = "cmdline"
+		self.remotePort = "0"
+		self.userAgent = "shell"
+		self.remoteAddress = "0.0.0.0"
 	end
 
 	self.cmdLineArgs = kvTableFromArray(arg)

src/rest/response.lua

@@ -15,11 +15,12 @@ local settings = require('util.settings')
 local defaults = require('conf_defaults')
 local utils = require('util.utils')
 local log = require('util.logger')
-  
+
 local M = {}
 M.__index = M
 
 local REQUEST_ID_ARGUMENT = 'rq_id'
+local MOD_ABBR = "HRSP"
 
 M.httpStatusCode, M.httpStatusText, M.contentType = nil, nil, nil
 M.binaryData, M.binarySavename = nil, nil
@@ -46,7 +47,7 @@ function M.new(requestObject)
 	local self = setmetatable({}, M)
 	self.body = { status = nil, data = {} }
 	self:setHttpStatus(200, 'OK')
-	self:setContentType('text/plain;charset=UTF-8')
+	self:setContentType('application/json;charset=UTF-8')
 	--self:setContentType('application/json;charset=UTF-8')
 
 	-- A queue for functions to be executed when the response has been given.
@@ -129,11 +130,11 @@ function M:addPostResponseFunction(fn)
   table.insert(self.postResponseQueue, fn)
 end
 
---- Call all function on the post-response queue, see @{M:addPostResponseFunction} for details and a side-note.
+--- Call all functions on the post-response queue, see @{M:addPostResponseFunction} for details and a side-note.
 function M:executePostResponseQueue()
-  --log:info("Response:executePostResponseQueue: " .. utils.dump(self.postResponseQueue))
+	if #self.postResponseQueue > 0 then log:verbose(MOD_ABBR, "Response:executePostResponseQueue: " .. utils.dump(self.postResponseQueue)) end
 
-  for i,fn in ipairs(self.postResponseQueue) do fn() end
+	for i,fn in ipairs(self.postResponseQueue) do fn() end
 end
 
 --- Returns an API url pointing to @{conf_defaults.API_BASE_URL_PATH}, which is quite useless.
@@ -152,7 +153,7 @@ function M:serializeAsJson()
 	return JSON:encode(self.body)
 end
 
---- Writes HTTP headers, followed by an HTTP body containing JSON data to stdout.
+--- Writes HTTP headers to stdout, followed by an HTTP body containing either JSON data or a file attachment.
 function M:send()
 	printHeaderLine("Status", self.httpStatusCode .. " " .. self.httpStatusText)
 	printHeaderLine("Content-Type", self.contentType)
@@ -167,10 +168,10 @@ function M:send()
 		io.write("\r\n")
 		io.write(self.binaryData)
 	end
-	
-	if self.body.status ~= "success" then 
-		log:debug("Response:"..utils.dump(self.body.status).." ("..utils.dump(self.body.msg)..")")
-	end 
+
+	if self.body.status ~= "success" then
+		log:warning(MOD_ABBR, "Response status: "..utils.dump(self.body.status).." ("..utils.dump(self.body.msg)..")")
+	end
 end
 
 --- Sets the response object to return binary data instead of JSON as its body.

src/script/README-loglite.md

@@ -0,0 +1,92 @@
+## Loglite
+
+The loglite script allows coloring and filtering of log files by specifying certain patterns and associating directives to them. These mainly specify colors but additionally, (non-)matched lines can be deleted from output and also all output lines can be numbered.
+
+
+### Usage
+
+The script can follow an existing log file (comparable to `tail -f`), or it can follow its standard input. A file to follow is always specified as the first argument and a filter set name as the second (use '-' as file name to read from standard input). Details on filter sets can be found below. If no filter set is mentioned on the command-line, the script will attempt to use one named 'default'.
+
+* Example following an existing log file using a filter set named 'example':   
+`./loglite.lua print3d.log example`.
+* Example using standard input, to filter/view a whole log file, with a filter set named 'serial' (note the '-' as file name):  
+`cat print3d-ttyACM0.log | ./loglite.lua - serial`
+* Example using standard input, to capture both output streams from `print3d`, with a filter set named 'example' (note the '-' as file name):  
+`./print3d -V 2>&1 | ./loglite.lua - example`.
+
+#### On WiFi-Box
+Loglite is already installed since version 0.10.10 as `loglite`.  
+Check `/root/.profile` for handy aliases like `tailfw` and `tailp3d`.
+
+### Filter sets
+
+The script looks for filter sets in the file '$HOME/loglite-filters.lua'. It looks like this:
+
+``` lua
+local M = {}
+
+M.default = {
+	['options'] = { mode = 'keep', count = 'none' },
+	['patterns'] = {
+		['%(error%)'] = 'red',
+		['%(warning%)'] = 'yellow',
+		['%(bulk%)'] = 'bold,black'
+	}
+}
+
+M.specialization = {
+	['parent'] = 'default',
+	['options'] = { mode = 'delete' }
+	['patterns'] = {
+		['setState%(%)'] = 'bblue,_nodelete'
+	}
+}
+
+return M
+```
+
+Here, the declaration and returning of `M` is required for the loglite script to be able to cleanly import the file. In `M.default`, 'default' is the name of a filter set being defined (similar for 'specialization'). Definitions can contain three so-called keys: 'parent' specifies a filter set to inherit from in order to reduce code duplication, 'options' and 'patterns' are described below.
+
+Inheritance can be used to set new keys or to override keys from the parent set. Previously set keys cannot be removed, but they can be set to a non-existing directive (e.g., Lua's 'false' keyword) to achieve the same effect. Note that directives in inheriting sets are currently not combined with previous ones, so for instance overriding `['test'] = 'red, _delete'` with `['test'] = 'blue'` will result in only the directive 'blue' to be applied.
+
+#### Options
+
+Two options are currently available:
+
+* `mode`, which specifies whether to keep log lines (`keep`, the default) or to drop them (`delete`). For specific lines this can then be overridden, see 'Patterns' below.
+* `count`, which can be set to `all` to prefix log lines with a counter, or `none` (default) to leave them as is.
+
+#### Patterns
+
+Pattern specifications are patterns as used in Lua: [Lua documentation on patterns](http://www.lua.org/pil/20.2.html).
+The following directives can be associated with a pattern:
+
+* A foreground color, one of: black, red, green, yellow, blue, magenta, cyan or white.
+* A background color, like foreground colors but prefixed with 'b'.
+* `bold`, which usually has the effect of rendering a bright variant of the foreground color (note that `bold,black` renders as dark gray).
+* `reverse` will reverse fore- and background colors.
+* Also available are `blink` and `underscore` but they do currently not work in all terminal programs or might need to be enabled in the preferences.
+* `_delete` or `_nodelete` to override the active mode specified in the 'options' above.
+
+Directives can be combined with ',' (e.g.: `'red,_nodelete'`). Finally, in any filter set, pattern rules are matched from top to bottom, the last one encountered overriding any previous conflicting directive.
+
+### Installation
+Note: Loglite is already installed on the WiFi-Box since version 0.10.10.
+
+Install Lua. See:  
+http://lua-users.org/wiki/LuaBinaries  
+It's tested in Lua 5.1 and Lua 5.2.
+
+Loglite will check for a `loglite-filters.lua` file in your home directory. It's recommended to create a symbolic link to the latest version.
+On OS X / Linux:
+```
+cd
+ln -s [absolute path to file]/loglite-filters.lua loglite-filters.lua
+```
+
+It's recommended to create a symbolic link in one of your PATH directories (`echo $PATH`) to the loglite.lua file. This allows you to run `loglite` from any directory.
+On OS X / Linux:
+```
+cd /usr/local/bin
+ln -s [absolute path to file]/loglite.lua loglite.lua
+```

src/script/collect-code.sh

@@ -1,34 +0,0 @@
-#!/bin/sh
-
-BASE_NAME=d3d-wifibox-backup
-SRC_PATHS="/etc /root /www/ /usr/share/lua"
-TEMP_DIR=/tmp
-TGT_FILE=$BASE_NAME.tar.gz
-
-if [ -e /www-external ]; then
-	echo "ERROR: switch back /www-regular to /www before running this script"
-	exit 1
-fi
-
-cd $TEMP_DIR
-if [ $? != 0 ]; then
-	echo "ERROR: could not cd to temporary directory ($TEMP_DIR)"
-	exit 2
-fi
-
-TGT_DIR=$TEMP_DIR/$BASE_NAME
-rm -rf $TGT_DIR
-mkdir -p $TGT_DIR
-
-for path in $SRC_PATHS; do
-	echo "copying $path -> $TGT_DIR..."
-	cp -a $path $TGT_DIR
-done
-
-echo "compressing $TGT_DIR into $BASE_NAME.tar.gz..."
-tar czf $BASE_NAME.tar.gz $BASE_NAME
-
-echo "removing staging dir..."
-rm -rf $TGT_DIR
-
-echo "done."

src/script/d3d-updater.lua

@@ -10,12 +10,12 @@
 --- This script provides an interface to upgrade or downgrade the Doodle3D wifibox.
 -- It can both be used as a standalone command-line tool and as a Lua library.
 
--- TODO/NOTES:
+-- TODO/NOTES: (from old script)
 -- add to status: validImage: none|<version> (can use checkValidImage for this)
 -- any more TODO's across this file?
 -- max 1 image tegelijk (moet api doen), en rekening houden met printbuffer (printen blokkeren?)
 
--- MAYBE/LATER:
+-- MAYBE/LATER: (from old script)
 -- add API calls to retrieve a list of all versions with their info (i.e., the result of getAvailableVersions)
 -- wget: add provision (in verbose mode?) to use '-v' instead of '-q' and disable output redirection
 -- document index file format (Version first, then in any order: Files: sysup; factory, FileSize: sysup; factory, MD5: sysup; factory, ChangelogStart:, ..., ChangelogEnd:)
@@ -24,6 +24,8 @@
 -- note: take care not to print any text in module functions, as this breaks http responses
 -- change representation of sysupgrade/factory info in versionInfo? (and also in image index?) <- create api call to get all info on all versions?
 
+local MOD_ABBR = "UPDA"
+
 local M = {}
 
 --- Possible states the updater can be in, they are stored in @{STATE_FILE}.
@@ -44,27 +46,30 @@ M.STATE_NAMES = {
 	[M.STATE.INSTALLING] = 'installing', [M.STATE.INSTALLED] = 'installed', [M.STATE.INSTALL_FAILED] = 'install_failed'
 }
 
---- The base URL to use for finding update files.
--- This URL will usually contain both an OpenWRT feed directory and an `images`-directory.
--- This script uses only the latter, and expects to find the file @{IMAGE_INDEX_FILE} there.
+--- The default base URL to use for finding update files.
+-- This URL will usually contain both an OpenWRT feed directory and an `images` directory.
+-- This script uses only the latter, and expects to find the files @{IMAGE_STABLE_INDEX_FILE} and @{IMAGE_BETA_INDEX_FILE} there.
 M.DEFAULT_BASE_URL = 'http://doodle3d.com/updates'
---M.DEFAULT_BASE_URL = 'http://localhost/~USERNAME/wifibox/updates'
 
---- The index file containing metadata on update images.
-M.IMAGE_INDEX_FILE = 'wifibox-image.index'
+--- The index file containing metadata on stable update images.
+M.IMAGE_STABLE_INDEX_FILE = 'wifibox-image.index'
+
+--- The index file containing metadata on beta update images.
+M.IMAGE_BETA_INDEX_FILE = 'wifibox-image.beta.index'
 
 --- Path to the updater cache.
-M.CACHE_PATH = '/tmp/d3d-updater'
+M.DEFAULT_CACHE_PATH = '/tmp/d3d-updater'
 
---- Name of the file to store current state in, this file resides in @{CACHE_PATH}.
+--- Name of the file to store current state in, this file resides in @{cachePath}.
 M.STATE_FILE = 'update-state'
 
 M.WGET_OPTIONS = "-q -t 1 -T 30"
 --M.WGET_OPTIONS = "-v -t 1 -T 30"
 
-local verbosity = 0 -- set by parseCommandlineArguments()
+local verbosity = 0 -- set by parseCommandlineArguments() or @{setVerbosity}
 local log = nil -- wifibox API can use M.setLogger to enable this module to use its logger
-local useCache = true -- default, can be overwritten using M.setUseCache()
+local useCache = false -- default, can be overwritten using @{setUseCache}
+local cachePath = M.DEFAULT_CACHE_PATH -- default, can be change using @{setCachePath}
 local baseUrl = M.DEFAULT_BASE_URL -- default, can be overwritten by M.setBaseUrl()
 
 
@@ -79,15 +84,15 @@ local baseUrl = M.DEFAULT_BASE_URL -- default, can be overwritten by M.setBaseUr
 -- @string msg The message to log.
 local function P(lvl, msg)
 	if log then
-		if lvl == -1 then log:debug(msg)
-		elseif lvl == 0 or lvl == 1 then log:info(msg)
+		if lvl == -1 then log:verbose(MOD_ABBR, msg)
+		elseif lvl == 0 or lvl == 1 then log:info(MOD_ABBR, msg)
 		end
 	else
 		if (-lvl <= verbosity) then print(msg) end
 	end
 end
 
---- Log a debug message, this function wraps @{P}.
+--- Log a debug/verbose message, this function wraps @{P}.
 -- The message will be logged with level -1 and be prefixed with '(DBG)'.
 -- @string msg The message to log.
 local function D(msg) P(-1, (log and msg or "(DBG) " .. msg)) end
@@ -96,12 +101,12 @@ local function D(msg) P(-1, (log and msg or "(DBG) " .. msg)) end
 -- Messages will be written to [stderr](http://www.cplusplus.com/reference/cstdio/stderr/), or logged using the logger set with @{setLogger}.
 -- @string msg The message to log.
 local function E(msg)
-	if log then log:error(msg)
+	if log then log:error(MOD_ABBR, msg)
 	else io.stderr:write(msg .. '\n')
 	end
 end
 
---- Splits the return status from `os.execute`, which consists of two bytes.
+--- Splits the return status from `os.execute` (only Lua <= 5.1), which consists of two bytes.
 --
 -- `os.execute` internally calls [system](http://linux.die.net/man/3/system),
 -- which usually returns the command exit status as high byte (see [WEXITSTATUS](http://linux.die.net/man/2/wait)).
@@ -120,11 +125,12 @@ end
 -- @number exitStatus An exit status from wget.
 -- @treturn string|number Either the status followed by a description, or a message indicating the call was interrupted, or just the status if it was not recognized.
 local function wgetStatusToString(exitStatus)
-	local wgetStatus,systemStatus = splitExitStatus(exitStatus)
+--	local wgetStatus,systemStatus = splitExitStatus(exitStatus)
+	local wgetStatus = exitStatus
 
-	if systemStatus ~= 0 then
-		return "interrupted:" .. systemStatus
-	end
+--	if systemStatus ~= 0 then
+--		return "interrupted: " .. systemStatus
+--	end
 
 	-- adapted from man(1) wget on OSX
 	local statusTexts = {
@@ -149,8 +155,9 @@ end
 -- @return bool|nil True, or nil on error.
 -- @return ?string A message in case of error.
 local function createCacheDirectory()
-	if os.execute('mkdir -p ' .. M.CACHE_PATH) ~= 0 then
-		return nil,"Error: could not create cache directory '" .. M.CACHE_PATH .. "'"
+	local _,rv = M.compatexecute('mkdir -p ' .. cachePath)
+	if rv ~= 0 then
+		return nil,"Error: could not create cache directory '" .. cachePath .. "'"
 	end
 	return true
 end
@@ -159,7 +166,7 @@ end
 -- @treturn STATE The current state code (@{STATE}.NONE if no state has been set).
 -- @treturn string The current state message (empty string if no state has been set).
 local function getState()
-	local file,msg = io.open(M.CACHE_PATH .. '/' .. M.STATE_FILE, 'r')
+	local file,msg = io.open(cachePath .. '/' .. M.STATE_FILE, 'r')
 	if not file then return M.STATE.NONE,"" end
 
 	local state = file:read('*a')
@@ -179,7 +186,7 @@ end
 
 --- Read the contents of a file.
 --
--- TODO: this file has been copied from @{util.utils}.lua and should be merged again.
+-- TODO: this file has been copied from @{util.utils}.lua and should be merged back.
 -- @string filePath The file to read.
 -- @bool trimResult Whether or not to trim the read data.
 -- @treturn bool|nil True, or nil on error.
@@ -201,7 +208,7 @@ end
 
 --- Reports whether or not a file exists.
 --
--- TODO: this file has been copied from @{util.utils}.lua and should be merged again.
+-- TODO: this file has been copied from @{util.utils}.lua and should be merged back.
 -- @string file The file to report about.
 -- @treturn bool True if the file exists, false otherwise.
 local function exists(file)
@@ -216,7 +223,7 @@ end
 
 --- Reports the size of a file or file handle.
 --
--- TODO: this file has been copied from @{util.utils}.lua and should be merged again.
+-- TODO: this file has been copied from @{util.utils}.lua and should be merged back.
 -- @param file A file path or open file handle.
 -- @treturn number Size of the file.
 local function fileSize(file)
@@ -241,8 +248,9 @@ end
 -- @bool dryRun Only log a message if true, otherwise run the command and log a message.
 -- @treturn number Exit status of of command or -1 if dryRun is true.
 local function runCommand(command, dryRun)
-	D("about to run: '" .. command .. "'")
-	return (not dryRun) and os.execute(command) or -1
+	--D("about to run: '" .. command .. "'")
+	if dryRun then return -1 end
+	return M.compatexecute(command)
 end
 
 --- Removes a file.
@@ -260,6 +268,7 @@ end
 local function downloadFile(url, saveDir, filename)
 	if not saveDir or saveDir:len() == 0 then return nil, "saveDir must be non-empty" end
 	local outArg = (filename:len() > 0) and (' -O' .. filename) or ''
+	D("Downloading file '" .. url .. "'")
 	if filename:len() > 0 then
 		return runCommand('wget ' .. M.WGET_OPTIONS .. ' -O ' .. saveDir .. '/' .. filename .. ' ' .. url .. ' 2> /dev/null')
 	else
@@ -269,38 +278,39 @@ end
 
 --- Parses command-line arguments and returns a table containing information distilled from them.
 -- @tparam table arglist A table in the same form as the [arg table](http://www.lua.org/pil/1.4.html) created by Lua.
+-- @tparam table defaults A table with defaults settings (actually the basis for the returned table)
 -- @treturn table|nil A table containing information on what to do, or nil if invalid arguments were specified.
 -- @treturn ?string Descriptive message on error.
-local function parseCommandlineArguments(arglist)
-	local result = { verbosity = 0, baseUrl = M.DEFAULT_BASE_URL, action = nil }
+local function parseCommandlineArguments(arglist, defaults)
 	local nextIsVersion, nextIsUrl = false, false
 	for index,argument in ipairs(arglist) do
 		if nextIsVersion then
-			result.version = argument; nextIsVersion = false
+			defaults.version = argument; nextIsVersion = false
 		elseif nextIsUrl then
-			result.baseUrl = argument; nextIsUrl = false
+			defaults.baseUrl = argument; nextIsUrl = false
 		else
-			if argument == '-h' then result.action = 'showHelp'
-			elseif argument == '-q' then result.verbosity = -1
-			elseif argument == '-V' then result.verbosity = 1
-			elseif argument == '-c' then result.useCache = true
-			elseif argument == '-C' then result.useCache = false
+			if argument == '-h' then defaults.action = 'showHelp'
+			elseif argument == '-q' then defaults.verbosity = -1
+			elseif argument == '-V' then defaults.verbosity = 1
+			elseif argument == '-c' then defaults.useCache = true
+			elseif argument == '-C' then defaults.useCache = false
 			elseif argument == '-u' then nextIsUrl = true
-			elseif argument == '-v' then result.action = 'showCurrentVersion'
-			elseif argument == '-s' then result.action = 'showStatus'
-			elseif argument == '-l' then result.action = 'showAvailableVersions'
-			elseif argument == '-i' then result.action = 'showVersionInfo'; nextIsVersion = true
-			elseif argument == '-d' then result.action = 'imageDownload'; nextIsVersion = true
-			elseif argument == '-f' then result.action = 'imageInstall'; nextIsVersion = true
-			elseif argument == '-r' then result.action = 'clear'
+			elseif argument == '-b' then defaults.includeBetas = true
+			elseif argument == '-v' then defaults.action = 'showCurrentVersion'
+			elseif argument == '-s' then defaults.action = 'showStatus'
+			elseif argument == '-l' then defaults.action = 'showAvailableVersions'
+			elseif argument == '-i' then defaults.action = 'showVersionInfo'; nextIsVersion = true
+			elseif argument == '-d' then defaults.action = 'imageDownload'; nextIsVersion = true
+			elseif argument == '-f' then defaults.action = 'imageInstall'; nextIsVersion = true
+			elseif argument == '-r' then defaults.action = 'clear'
 			else return nil,"unrecognized argument '" .. argument .. "'"
 			end
 		end
 	end
 
-	if result.version then
-		result.version = M.parseVersion(result.version)
-		if not result.version then
+	if defaults.version then
+		defaults.version = M.parseVersion(defaults.version)
+		if not defaults.version then
 			return nil,"error parsing specified version"
 		end
 	end
@@ -308,7 +318,23 @@ local function parseCommandlineArguments(arglist)
 	if nextIsVersion then return nil, "missing required version argument" end
 	if nextIsUrl then return nil, "missing required URL argument" end
 
-	return result
+	return defaults
+end
+
+--- Determines if the system is OpenWrt or not by checking if `/etc/openwrt_release` exists.
+-- @treturn bool True if the OS is OpenWrt.
+local function isOpenWrt()
+	local flag = nil
+	return function()
+		if flag == nil then
+			local relFile = io.open('/etc/openwrt_release', 'r')
+			flag = not not relFile
+			if relFile then relFile:close() end
+			return flag
+		else
+			return flag
+		end
+	end
 end
 
 --- Returns the [MD5](http://en.wikipedia.org/wiki/MD5) hash for a given file.
@@ -317,10 +343,23 @@ end
 -- @string filepath The path of which to calculate the MD5-sum.
 -- @treturn nil
 local function md5sum(filepath)
-	return nil
-	-- TODO [osx: md5 -q <file>], [linux: ?]
-end
+	local sfile
 
+	if not isOpenWrt() then
+		sfile = io.popen('md5 -q "' .. filepath .. '"')
+	else
+		sfile = io.popen('md5sum "' .. filepath .. '" 2>/dev/null', 'r')
+	end
+
+	local sum = sfile:read('*all')
+	sfile:close()
+
+	if not sum then return nil,"could not obtain MD5 sum" end
+
+	sum = sum:match('[%da-fA-F]+')
+
+	return sum
+end
 
 
 
@@ -328,6 +367,31 @@ end
 -- MODULE FUNCTIONS --
 ----------------------
 
+local compatlua51 = _VERSION == 'Lua 5.1'
+
+--- execute a shell command. Taken from penlight library.
+-- This is a compatibility function that returns the same for Lua 5.1 and Lua 5.2
+-- @param cmd a shell command
+-- @return true if successful
+-- @return actual return code
+function M.compatexecute(cmd)
+	local res1,res2,res3 = os.execute(cmd)
+	if compatlua51 then
+		local cmd, sys = splitExitStatus(res1)
+		return (res1 == 0) and true,cmd or nil,cmd
+	else
+		return res1, res3
+	end
+end
+
+--- Set verbosity (log level) that determines which messages do get logged and which do not.
+-- @tparam number level The level to set, between -1 and 1.
+function M.setVerbosity(level)
+	if level and level >= -1 and level <= 1 then
+		verbosity = level
+	end
+end
+
 --- Enables use of the given @{util.logger} object, otherwise `stdout`/`stderr` will be used.
 -- @tparam util.logger logger The logger to log future messages to.
 function M.setLogger(logger)
@@ -348,16 +412,23 @@ function M.setBaseUrl(url)
 	baseUrl = url
 end
 
+--- Sets the filesystem path to use as cache for downloaded index and image files.
+-- @string path The path to use, use nil to restore default @{DEFAULT_CACHE_PATH}.
+function M.setCachePath(path)
+	cachePath = path or M.DEFAULT_CACHE_PATH
+end
+
 --- Returns a table with information about current update status of the wifibox.
 --
 -- The result table will contain at least the current version, current state code and text.
 -- If the box has internet access, it will also include the newest version available.
 -- If an image is currently being downloaded, progress information will also be included.
 --
+-- @tparam bool[opt] withBetas Consider beta releases when looking for newest version.
 -- @treturn bool True if status has been determined fully, false if not.
 -- @treturn table The result table.
 -- @treturn ?string Descriptive message in case the result table is not complete.
-function M.getStatus()
+function M.getStatus(withBetas)
 	if not baseUrl then baseUrl = M.DEFAULT_BASE_URL end
 	local unknownVersion = { major = 0, minor = 0, patch = 0 }
 	local result = {}
@@ -366,18 +437,39 @@ function M.getStatus()
 	result.stateCode, result.stateText = getState()
 	result.stateCode = tonumber(result.stateCode)
 
-	local verTable,msg = M.getAvailableVersions()
+	local verTable,msg = M.getAvailableVersions(withBetas and 'both' or 'stables')
 	if not verTable then
-		D("could not obtain available versions (" .. msg .. ")")
-		-- TODO: set an error state in result to signify we probably do not have internet access?
+		D("error: could not obtain available versions (" .. msg .. ")")
 		return false, result, msg
 	end
 
+	-- NOTE: to look up the current version we need a table containing all versions
+	local allVersionsTable,msg
+	if not withBetas then
+		allVersionsTable,msg = M.getAvailableVersions('both')
+		if not allVersionsTable then
+			D("error: could not obtain available versions including betas (" .. msg .. ")")
+			return false, result, msg
+		end
+	else
+		allVersionsTable = verTable
+	end
+
+
 	local newest = verTable and verTable[#verTable]
 	result.newestVersion = newest and newest.version or unknownVersion
+	result.newestReleaseTimestamp = newest and newest.timestamp
+
+	-- look up timestamp of current version
+	local cEnt = M.findVersion(result.currentVersion, nil, allVersionsTable)
+	if cEnt then
+		result.currentReleaseTimestamp = cEnt.timestamp
+	else
+		D("warning: could not find current wifibox version in release indexes")
+	end
 
 	if result.stateCode == M.STATE.DOWNLOADING then
-		result.progress = fileSize(M.CACHE_PATH .. '/' .. newest.sysupgradeFilename)
+		result.progress = fileSize(cachePath .. '/' .. newest.sysupgradeFilename)
 		if not result.progress then result.progress = 0 end -- in case the file does not exist yet (which yields nil)
 		result.imageSize = newest.sysupgradeFileSize
 	end
@@ -387,55 +479,107 @@ end
 
 --- Turns a plain-text version as returned by @{formatVersion} into a table.
 -- @tparam string|table versionText The version string to parse, if it is already a table, it is returned as-is.
--- @treturn table A parse version.
+-- @treturn table A parsed version or nil on incorrect argument.
 function M.parseVersion(versionText)
+	if not versionText then return nil end
 	if type(versionText) == 'table' then return versionText end
 	if not versionText or versionText:len() == 0 then return nil end
 
-	local major,minor,patch = versionText:match("^%s*(%d+)%.(%d+)%.(%d+)%s*$")
-	if not major or not minor or not patch then return nil end
+	local major,minor,patch,suffix = versionText:match("^%s*(%d+)%.(%d+)%.(%d+)(-?%w*)%s*$")
+	if not major or not minor or not patch then return nil end -- suffix not required
 
-	return { ['major'] = major, ['minor'] = minor, ['patch'] = patch }
+	if type(suffix) == 'string' and suffix:len() > 0 then
+		if suffix:sub(1, 1) ~= '-' then return nil end
+		suffix = suffix:sub(2)
+	else
+		suffix = nil
+	end
+
+	return { ['major'] = major, ['minor'] = minor, ['patch'] = patch, ['suffix'] = suffix }
 end
 
 --- Formats a version as returned by @{parseVersion}.
 -- @tparam table|string version The version to format, if it is already a string, that will be returned unmodified.
--- @treturn string A formatted version.
+-- @treturn string A formatted version or nil on incorrect argument.
 function M.formatVersion(version)
+	if not version then return nil end
 	if type(version) == 'string' then return version end
-	return version.major .. "." .. version.minor .. "." .. version.patch
+
+	local ver = version.major .. "." .. version.minor .. "." .. version.patch
+	if version.suffix then ver = ver .. '-' .. version.suffix end
+
+	return ver
 end
 
---- Compares two versions.
+--- Compares two versions. Note that the second return value must be used for equality testing.
+-- If given, the timestamps have higher priority than the versions. Suffixes are ignored.
 -- @tparam table versionA A version as returned by @{parseVersion}.
 -- @tparam table versionB A version as returned by @{parseVersion}.
--- @treturn number -1 if versionA is smaller than versionB, 0 if versions are equal or 1 if versionA is larger than versionB.
-function M.compareVersions(versionA, versionB)
+-- @param timestampA[opt] A timestamp as returned by @{parseDate}.
+-- @param timestampB[opt] A timestamp as returned by @{parseDate}.
+-- @treturn number -1 if versionA/timestampA is smaller/older than versionB/timestampB, 0 if versions are equal (or undecided) or 1 if A is larger/newer than B.
+-- @treturn bool True if versions are really equal (first return value can be 0 if everything but the suffix is equal)
+function M.compareVersions(versionA, versionB, timestampA, timestampB)
 	if type(versionA) ~= 'table' or type(versionB) ~= 'table' then return nil end
-	local diff = versionA.major - versionB.major
-	if diff == 0 then diff = versionA.minor - versionB.minor end
-	if diff == 0 then diff = versionA.patch - versionB.patch end
-	return diff > 0 and 1 or (diff < 0 and -1 or 0)
+
+	local diff = 0
+	if timestampA and timestampB then diff = timestampA - timestampB end
+	if diff == 0 then
+		diff = versionA.major - versionB.major
+		if diff == 0 then diff = versionA.minor - versionB.minor end
+		if diff == 0 then diff = versionA.patch - versionB.patch end
+	end
+
+	local result = diff > 0 and 1 or (diff < 0 and -1 or 0)
+	local reallyEqual = (diff == 0) and (versionA.suffix == versionB.suffix)
+
+	return result, (reallyEqual and true or false)
+end
+
+--- Checks if versions are exactly equal.
+-- It returns the second return value of @{compareVersions} and accepts the same arguments.
+-- @treturn bool True if versions are equal, false otherwise.
+function M.versionsEqual(versionA, versionB, timestampA, timestampB)
+	return select(2, M.compareVersions(versionA, versionB, timestampA, timestampB))
 end
 
 --- Returns information on a version if it can be found in a collection of versions as returned by @{getAvailableVersions}.
 -- @tparam table version The version to look for.
+-- @tparam bool[opt] withBetas If verTable is not given, download versions including beta releases
 -- @tparam table[opt] verTable A table containing a collection of versions, if not passed in, it will be obtained using @{getAvailableVersions}.
+-- @param timestamp[opt] Specific timestamp to look for.
 -- @treturn table|nil Version information table found in the collection, or nil on error or if not found.
 -- @treturn string Descriptive message in case of error or if the version could not be found.
-function M.findVersion(version, verTable)
+function M.findVersion(version, withBetas, verTable, timestamp)
 	local msg = nil
 	version = M.parseVersion(version)
-	if not verTable then verTable,msg = M.getAvailableVersions() end
+	if not verTable then verTable,msg = M.getAvailableVersions(withBetas and 'both' or 'stables') end
 
 	if not verTable then return nil,msg end
 
 	for _,ent in pairs(verTable) do
-		if M.compareVersions(ent.version, version) == 0 then return ent end
+		if M.versionsEqual(ent.version, version, ent.timestamp, timestamp) == true then return ent end
 	end
 	return nil,"no such version"
 end
 
+--- Turns a date of the format 'yyyymmdd' into a timestamp as returned by os.time.
+-- @tparam string dateText The date to parse.
+-- @return A timestamp or nil if the argument does not have correct format.
+function M.parseDate(dateText)
+	if type(dateText) ~= 'string' or dateText:len() ~= 8 or dateText:find('[^%d]') ~= nil then return nil end
+
+	return os.time({ year = dateText:sub(1, 4), month = dateText:sub(5, 6), day = dateText:sub(7,8) })
+end
+
+--- Formats a timestamp as returned by os.time to a date of the form 'yyyymmdd'.
+-- @param timestamp The timestamp to format.
+-- @return A formatted date or nil if the argument is nil.
+function M.formatDate(timestamp)
+	if not timestamp then return nil end
+	return os.date('%Y%m%d', timestamp)
+end
+
 --- Creates an image file name based on given properties.
 -- The generated name has the following form: `doodle3d-wifibox-<version>-<deviceType>-<'factory'|'sysupgrade'>.bin`.
 -- @tparam table|string version The version of the image.
@@ -449,7 +593,7 @@ function M.constructImageFilename(version, devType, isFactory)
 	return 'doodle3d-wifibox-' .. M.formatVersion(v) .. '-' .. dt .. '-' .. sf .. '.bin'
 end
 
---- Checks whether a valid image file is present in @{CACHE_PATH} for the given image properties.
+--- Checks whether a valid image file is present in @{cachePath} for the given image properties.
 -- The versionEntry table will be augmented with an `isValid` key.
 --
 -- NOTE: currently, this function only checks the image exists and has the correct size.
@@ -459,12 +603,20 @@ end
 -- @string[opt] devType Image device type, see @{constructImageFilename}.
 -- @bool[opt] isFactory Image type, see @{constructImageFilename}.
 -- @treturn bool True if a valid image is present, false otherwise.
+-- @treturn string|nil Reason for being invalid if first return value is false.
 function M.checkValidImage(versionEntry, devType, isFactory)
 	local filename = M.constructImageFilename(versionEntry.version, devType, isFactory)
-	--return versionEntry.md5 == md5sum(M.CACHE_PATH .. '/' .. filename)
-	local size = fileSize(M.CACHE_PATH .. '/' .. filename)
-	versionEntry.isValid = versionEntry.sysupgradeFileSize == size
-	return versionEntry.isValid
+
+	local entSize = isFactory and versionEntry.factoryFileSize or versionEntry.sysupgradeFileSize
+	local entMd5 = isFactory and versionEntry.factoryMd5 or versionEntry.sysupgradeMD5
+
+	versionEntry.isValid = entMd5 == md5sum(cachePath .. '/' .. filename)
+	if not versionEntry.isValid then return false,"incorrect MD5 checksum" end
+
+	versionEntry.isValid = entSize == fileSize(cachePath .. '/' .. filename)
+	if not versionEntry.isValid then return false,"incorrect file size" end
+
+	return true
 end
 
 --- Returns the current wifibox version text, extracted from `/etc/wifibox-version`.
@@ -482,18 +634,14 @@ function M.getCurrentVersion()
 end
 
 --- Returns an indexed and sorted table containing version information tables.
--- The information is obtained from the either cached or downloaded image index (@{IMAGE_INDEX_FILE}).
--- @treturn table A table with a collection of version information tables.
-function M.getAvailableVersions()
+-- The information is obtained from the either cached or downloaded image index file.
+local function fetchIndexTable(indexFile, cachePath)
 	if not baseUrl then baseUrl = M.DEFAULT_BASE_URL end
-	local indexFilename = M.CACHE_PATH .. '/' .. M.IMAGE_INDEX_FILE
-
-	local ccRv,ccMsg = createCacheDirectory()
-	if not ccRv then return nil,ccMsg end
+	local indexFilename = cachePath .. '/' .. indexFile
 
 	if not useCache or not exists(indexFilename) then
-		local rv = downloadFile(baseUrl .. '/images/' .. M.IMAGE_INDEX_FILE, M.CACHE_PATH, M.IMAGE_INDEX_FILE)
-		if rv ~= 0 then return nil,"could not download image index file (" .. wgetStatusToString(rv) .. ")" end
+		local rv1,rv2 = downloadFile(baseUrl .. '/images/' .. indexFile, cachePath, indexFile)
+		if not rv1 then return nil,"could not download image index file (" .. wgetStatusToString(rv2) .. ")" end
 	end
 
 	local status,idxLines = pcall(io.lines, indexFilename)
@@ -505,7 +653,7 @@ function M.getAvailableVersions()
 	for line in idxLines do
 		local k,v = line:match('^(.-):(.*)$')
 		k,v = trim(k), trim(v)
-		if not log then D("#" .. lineno .. ": considering '" .. line .. "' (" .. (k or '<nil>') .. " / " .. (v or '<nil>') .. ")") end
+		--if not log then D("#" .. lineno .. ": considering '" .. line .. "' (" .. (k or '<nil>') .. " / " .. (v or '<nil>') .. ")") end
 		if not changelogMode and (not k or not v) then return nil,"incorrectly formatted line in index file (line " .. lineno .. ")" end
 
 		if k == 'ChangelogEnd' then
@@ -537,6 +685,13 @@ function M.getAvailableVersions()
 				sSum,fSum = trim(sSum), trim(fSum)
 				if sSum then entry.sysupgradeMD5 = sSum end
 				if fSum then entry.factoryMD5 = fSum end
+			elseif k == 'ReleaseDate' then
+				local ts = M.parseDate(v)
+				if not ts then
+					P(0, "ignoring incorrectly formatted ReleaseDate field (line " .. lineno .. ")")
+				else
+					entry.timestamp = ts
+				end
 			else
 				P(-1, "ignoring unrecognized field in index file '" .. k .. "' (line " .. lineno .. ")")
 			end
@@ -553,6 +708,36 @@ function M.getAvailableVersions()
 	return result
 end
 
+--- Returns an indexed and sorted table containing version information tables.
+-- The information is obtained from the either cached or downloaded image index (@{IMAGE_STABLE_INDEX_FILE}).
+-- @tparam which[opt] Which type of versions to fetch, either 'stables' (default), 'betas' or both.
+-- @treturn table A table with a collection of version information tables.
+function M.getAvailableVersions(which)
+	local ccRv,ccMsg = createCacheDirectory()
+	if not ccRv then return nil,ccMsg end
+
+	local verTable, msg = {}, nil
+
+	if which == 'stables' or which == 'both' then
+		verTable,msg = fetchIndexTable(M.IMAGE_STABLE_INDEX_FILE, cachePath)
+		if not verTable then return nil,msg end
+	end
+
+	if which == 'betas' or which == 'both' then
+		local betas,msg = fetchIndexTable(M.IMAGE_BETA_INDEX_FILE, cachePath)
+		if not betas then return nil,msg end
+
+		for k,v in pairs(betas) do verTable[k] = v end
+	end
+
+	table.sort(verTable, function(a, b)
+		return M.compareVersions(a.version, b.version, a.timestamp, b.timestamp) < 0
+	end)
+
+
+	return verTable
+end
+
 --- Attempts to download an image file with the requested properties.
 -- @tparam table versionEntry A version information table.
 -- @string[opt] devType Image device type, see @{constructImageFilename}.
@@ -574,25 +759,26 @@ function M.downloadImageFile(versionEntry, devType, isFactory)
 		if versionEntry.isValid == false then doDownload = true end
 	end
 
-	local rv = 0
+	local rv1,rv2 = 0,0
 	if doDownload then
 		M.setState(M.STATE.DOWNLOADING, "Downloading image (" .. filename .. ")")
-		rv = downloadFile(baseUrl .. '/images/' .. filename, M.CACHE_PATH, filename)
+		rv1,rv2 = downloadFile(baseUrl .. '/images/' .. filename, cachePath, filename)
 	end
 
-	if rv == 0 then
-		if M.checkValidImage(versionEntry, devType, isFactory) then
+	if rv1 then
+		local valid,msg = M.checkValidImage(versionEntry, devType, isFactory)
+		if valid then
 			M.setState(M.STATE.IMAGE_READY, "Image downloaded, ready to install (image name: " .. filename .. ")")
 			return true
 		else
-			removeFile(M.CACHE_PATH .. '/' .. filename)
-			local ws = "Image download failed (invalid image)"
+			removeFile(cachePath .. '/' .. filename)
+			local ws = "Image download failed (invalid image: " .. msg .. ")"
 			M.setState(M.STATE.DOWNLOAD_FAILED, ws)
 			return nil,ws
 		end
 	else
-		local ws = wgetStatusToString(rv)
-		removeFile(M.CACHE_PATH .. '/' .. filename)
+		local ws = wgetStatusToString(rv2)
+		removeFile(cachePath .. '/' .. filename)
 		M.setState(M.STATE.DOWNLOAD_FAILED, "Image download failed (wget error: " .. ws .. ")")
 		return nil,ws
 	end
@@ -608,10 +794,10 @@ end
 -- @treturn bool|nil True on success (with the 'exception' as noted above) or nil on error.
 -- @treturn ?string|number (optional) Descriptive message or sysupgrade exit status on error.
 function M.flashImageVersion(versionEntry, noRetain, devType, isFactory)
-	log:info("flashImageVersion")
+	if log then log:info(MOD_ABBR, "flashImageVersion") end
 	local imgName = M.constructImageFilename(versionEntry.version, devType, isFactory)
 	local cmd = noRetain and 'sysupgrade -n ' or 'sysupgrade '
-	cmd = cmd .. M.CACHE_PATH .. '/' .. imgName
+	cmd = cmd .. cachePath .. '/' .. imgName
 
 	local ccRv,ccMsg = createCacheDirectory()
 	if not ccRv then return nil,ccMsg end
@@ -634,22 +820,30 @@ function M.flashImageVersion(versionEntry, noRetain, devType, isFactory)
 	return (rv == 0) and true or nil,rv
 end
 
---- Clears '*.bin' in the @{CACHE_PATH} directory.
+--- Clears '*.bin' and both index files in the @{cachePath} directory.
 -- @treturn bool|nil True on success, or nil on error.
 -- @treturn ?string Descriptive message on error.
 function M.clear()
 	local ccRv,ccMsg = createCacheDirectory()
 	if not ccRv then return nil,ccMsg end
 
-	D("Removing " .. M.CACHE_PATH .. "/doodle3d-wifibox-*.bin")
+	D("Removing " .. cachePath .. "/doodle3d-wifibox-*.bin")
 	M.setState(M.STATE.NONE, "")
-	local rv = os.execute('rm -f ' .. M.CACHE_PATH .. '/doodle3d-wifibox-*.bin')
-	return (rv == 0) and true or nil,"could not remove image files"
+	local success = true
+	local rv = M.compatexecute('rm -f ' .. cachePath .. '/doodle3d-wifibox-*.bin')
+	success = success and (rv == 0)
+	local rv = M.compatexecute('rm -f ' .. cachePath .. '/' .. M.IMAGE_STABLE_INDEX_FILE)
+	success = success and (rv == 0)
+	local rv = M.compatexecute('rm -f ' .. cachePath .. '/' .. M.IMAGE_BETA_INDEX_FILE)
+	success = success and (rv == 0)
+
+	--return success,"could not delete all files"
+	return true
 end
 
 --- Set updater state.
 --
--- NOTE: make sure the cache directory  @{CACHE_PATH} exists before calling this function or it will fail.
+-- NOTE: make sure the cache directory  @{cachePath} exists before calling this function or it will fail.
 --
 -- NOTE: this function _can_ fail but this is not expected to happen so the return value is mostly ignored for now.
 --
@@ -659,7 +853,7 @@ end
 function M.setState(code, msg)
 	local s = code .. '|' .. msg
 	D("set update state: " .. M.STATE_NAMES[code] .. " ('" .. s .. "')")
-	local file,msg = io.open(M.CACHE_PATH .. '/' .. M.STATE_FILE, 'w')
+	local file,msg = io.open(cachePath .. '/' .. M.STATE_FILE, 'w')
 
 	if not file then
 		E("error: could not open state file for writing (" .. msg .. ")")
@@ -682,7 +876,15 @@ end
 -- so this file can also be used as a library.
 -- Command-line arguments are expected to be present in the global `arg` variable.
 local function main()
-	local argTable,msg = parseCommandlineArguments(arg)
+	-- NOTE: this require must be local to functions which are only executed on the wifibox (i.e., where we have uci)
+	package.path = package.path .. ';/usr/share/lua/wifibox/?.lua'
+	local settings = require('util.settings')
+
+	local defaults = { verbosity = 0, baseUrl = M.DEFAULT_BASE_URL, includeBetas = false, action = nil }
+	local confBaseUrl = settings.get('doodle3d.update.baseUrl')
+	if confBaseUrl and confBaseUrl:len() > 0 then defaults.baseUrl = confBaseUrl end
+
+	local argTable,msg = parseCommandlineArguments(arg, defaults)
 
 	if not argTable then
 		E("error interpreting command-line arguments, try '-h' for help (".. msg ..")")
@@ -690,7 +892,9 @@ local function main()
 	end
 
 	verbosity = argTable.verbosity
+	includeBetas = argTable.includeBetas
 	if argTable.useCache ~= nil then useCache = argTable.useCache end
+	if argTable.baseUrl ~= nil then baseUrl = argTable.baseUrl end
 
 	P(0, "Doodle3D Wifibox firmware updater")
 	local cacheCreated,msg = createCacheDirectory()
@@ -699,13 +903,16 @@ local function main()
 		os.exit(1)
 	end
 
+	P(0, (includeBetas and "Considering" or "Not considering") .. " beta releases.")
+
 	if argTable.action == 'showHelp' then
 		P(1, "\t-h\t\tShow this help message")
 		P(1, "\t-q\t\tquiet mode")
 		P(1, "\t-V\t\tverbose mode")
 		P(1, "\t-c\t\tUse cache as much as possible")
-		P(1, "\t-C\t\tDo not use the cache")
+		P(1, "\t-C\t\tDo not use the cache (default)")
 		P(1, "\t-u <base_url>\tUse specified base URL (default: " .. M.DEFAULT_BASE_URL .. ")")
+		P(1, "\t-b\t\tInclude beta releases")
 		P(1, "\t-v\t\tShow current image version")
 		P(1, "\t-s\t\tShow current update status")
 		P(1, "\t-l\t\tShow list of available image versions (and which one has been downloaded, if any)")
@@ -723,7 +930,7 @@ local function main()
 		P(1, "version: " .. M.formatVersion(v))
 
 	elseif argTable.action == 'showStatus' then
-		local status = M.getStatus()
+		local success,status,msg = M.getStatus(includeBetas)
 		P(0, "Current update status:")
 		P(1, "  currentVersion:\t" .. (M.formatVersion(status.currentVersion) or '?'))
 		P(1, "  newestVersion:\t" .. (M.formatVersion(status.newestVersion) or '?'))
@@ -740,7 +947,7 @@ local function main()
 		end
 
 	elseif argTable.action == 'showAvailableVersions' then
-		local verTable,msg = M.getAvailableVersions()
+		local verTable,msg = M.getAvailableVersions(includeBetas and 'both' or 'stables')
 		if not verTable then
 			E("error collecting version information (" .. msg .. ")")
 			os.exit(2)
@@ -750,7 +957,7 @@ local function main()
 		for _,ent in ipairs(verTable) do P(1, M.formatVersion(ent.version)) end
 
 	elseif argTable.action == 'showVersionInfo' then
-		local vEnt,msg = M.findVersion(argTable.version)
+		local vEnt,msg = M.findVersion(argTable.version, includeBetas)
 
 		if vEnt then
 			P(0, "Information on version:")
@@ -761,6 +968,7 @@ local function main()
 			P(1, "  factoryFilename:\t" .. (vEnt.factoryFilename or '-'))
 			P(1, "  factoryFileSize:\t" .. (vEnt.factoryFileSize or '-'))
 			P(1, "  factoryMD5:\t\t" .. (vEnt.factoryMD5 or '-'))
+			P(1, "  releaseDate:\t\t" .. (vEnt.timestamp and M.formatDate(vEnt.timestamp) or '-'))
 			if vEnt.changelog then
 				P(1, "\n--- Changelog ---\n" .. vEnt.changelog .. '---')
 			else
@@ -775,7 +983,7 @@ local function main()
 		end
 
 	elseif argTable.action == 'imageDownload' then
-		local vEnt,msg = M.findVersion(argTable.version)
+		local vEnt,msg = M.findVersion(argTable.version, includeBetas)
 		if vEnt == false then
 			P(1, "no such version")
 			os.exit(4)
@@ -797,7 +1005,7 @@ local function main()
 
 	elseif argTable.action == 'imageInstall' then
 		local vEnt, msg = nil, nil
-		vEnt,msg = M.findVersion(argTable.version)
+		vEnt,msg = M.findVersion(argTable.version, includeBetas)
 		if vEnt == false then
 			P(1, "no such version")
 			os.exit(4)

src/script/d3dapi

@@ -10,15 +10,16 @@
 
 LUA=lua
 SCRIPT_PATH=/usr/share/lua/wifibox
-LOG_FILE=/tmp/wifibox.log
+LOG_FILE=/tmp/wifibox.stdout.log
 
 cd $SCRIPT_PATH
-echo "CGI invocation" >> $LOG_FILE
+#echo "CGI invocation" >> $LOG_FILE
 #strace -o /tmp/trace-$$.log -ff $LUA ./cmdmain.lua $@ 2>> $LOG_FILE
 $LUA ./cmdmain.lua $@ 2>> $LOG_FILE
 
 exit $?
 
+
 # Code below is for debugging incoming CGI data
 read -n $CONTENT_LENGTH POSTDATA
 echo -e "Content-type: text/plain\r\n\r\n"

src/script/loglite-filters.lua

@@ -0,0 +1,63 @@
+local M = {}
+
+M.default = {
+	['options'] = { mode = 'keep', count = 'none' },
+	['patterns'] = {
+		['%(error%)'] = 'red',
+		['%(warning%)'] = 'yellow',
+		['%(bulk%)'] = 'gray',
+		['setState%(%)'] = 'bblue'
+	}
+}
+
+-- filter rules for firmware log (/tmp/wifibox.log)
+M.firmware = {
+	['parent'] = 'default',
+	['patterns'] = {
+		['START%-RQ'] = 'bblue',
+		['END%-RQ'] = 'blue'
+	}
+}
+
+-- filter rules for print3d log (/tmp/print3d-*.log)
+M.print3d = {
+	['parent'] = 'default',
+	['patterns'] = {
+		['Print 3D server'] = 'byellow',
+		['sendCode%(%)'] = 'green',
+		['readCode%(%)'] = 'blue',
+		['readResponseCode%(%)'] = 'blue'
+	}
+}
+
+-- filter rules for serial communcation of print3d
+M.serial = {
+	['options'] = { mode = 'delete', count = 'none' },
+	['patterns'] = {
+		['Print 3D server'] = 'byellow,_nodelete',
+		['sendCode%(%)'] = 'green,_nodelete',
+		['readCode%(%)'] = 'blue,_nodelete',
+		['readResponseCode%(%)'] = 'blue,_nodelete',
+		['setState%(%)'] = 'bblue,_nodelete',
+		['%[ABSD%]'] = 'gray,_nodelete', -- 0.10.10
+		['%[ABD%]'] = 'gray,_nodelete', -- 0.10.9
+		['%(info%)'] = 'gray,_nodelete' -- 0.10.10
+	}
+}
+
+
+M.test = {  -- TEST set
+	['options'] = { mode = 'keep', count = 'all' },
+	['patterns'] = {
+		['%(info%)'] = 'yellow'
+	}
+}
+
+M.printstart = {
+	['options'] = { mode = 'delete' },
+	['patterns'] = {
+		['print started'] = '_uppercase,bwhite'
+	}
+}
+
+return M

src/script/loglite.lua

@@ -0,0 +1,275 @@
+#!/usr/bin/env lua
+
+--[[
+For documentation on this script, see README-loglite.md.
+
+Ideas for improvement:
+* add more directives like uppercase, prefix/suffix?
+* create separate package for this script: a) since it is useful for any log file, b) this file is getting somewhat long
+* for broader terminal support: detect `tput` and use it if available (http://wiki.bash-hackers.org/scripting/terminalcodes)
+* pre-split keyword lists for efficiency instead of redoing this at every new line?
+
+FIXME:
+* with deleteMode enabled, multiple matches and _nodelete in a later match, previous directives are ignored
+]]--
+
+
+--[[========================================================================]]--
+
+--Note: overview of ANSI escape codes: http://ascii-table.com/ansi-escape-sequences.php (support varies per terminal/termtype)
+local ANSI_COLORS = {
+	['bold'] = 1,
+	['underscore'] = 4,
+	['blink'] = 5, -- on osx/iterm2, this has to be enabled in preferences
+	['reverse'] = 7,
+	['black'] = 30,
+	['red'] = 31,
+	['green'] = 32,
+	['yellow'] = 33,
+	['blue'] = 34,
+	['magenta'] = 35,
+	['cyan'] = 36,
+	['white'] = 37,
+	['bblack'] = 40,
+	['bred'] = 41,
+	['bgreen'] = 42,
+	['byellow'] = 43,
+	['bblue'] = 44,
+	['bmagenta'] = 45,
+	['bcyan'] = 46,
+	['bwhite'] = 47
+}
+
+local ESCAPE_STR = string.char(27) .. "["
+local RESET_CODE = ESCAPE_STR .. "m"
+
+local DFL_FILTERSET_FILE = "loglite-filters.lua"
+
+
+
+--[[========================================================================]]--
+
+--- Stringifies the given object.
+-- From util/utils.lua
+-- Note that self-referencing objects will cause an endless loop with the current implementation.
+-- @param o The object to convert.
+-- @treturn string Stringified version of o.
+local function dump(o)
+	if type(o) == 'table' then
+		local s = '{ '
+		for k,v in pairs(o) do
+			if type(k) ~= 'number' then k = '"'..k..'"' end
+			s = s .. '['..k..'] = ' .. dump(v) .. ','
+		end
+		return s .. '} '
+	else
+		return tostring(o)
+	end
+end
+
+--- Splits a string on a given divider character.
+-- From util/utils.lua
+-- @string[opt=':'] div The divider character to use.
+-- @return An array containing the resultant substrings.
+-- @usage local str = "a,b,c"; local parts = str:split(',')
+function string:split(div)
+	local div, pos, arr = div or ':', 0, {}
+	for st,sp in function() return self:find(div, pos, true) end do
+		table.insert(arr, self:sub(pos, st - 1))
+		pos = sp + 1
+	end
+	table.insert(arr, self:sub(pos))
+	return arr
+end
+
+--- Determines if filename exists and can be opened for reading.
+-- From http://stackoverflow.com/a/4991602
+-- @string filename The file to test.
+-- @return True if the file exists and is readable, false otherwise.
+function fileExists(filename)
+   local f = io.open(filename, "r")
+   if f ~= nil then io.close(f) return true else return false end
+end
+
+--- Converts keys of a table into a string.
+-- Adapted from http://stackoverflow.com/a/12674376.
+-- @string tbl A key/value table.
+-- @string[opt=','] sep Separator to use between items.
+-- @boolean[opt=false] sort Whether or not to sort the resulting list.
+-- @return A string with all keys from the given table.
+local function keysToString(tbl, sep, sort)
+	local sep, sort = sep or ',', sort or false
+	local keyset, n = {}, 0
+	for k,_ in pairs(tbl) do
+		n = n + 1
+		keyset[n] = k
+	end
+	if sort then table.sort(keyset) end
+	return table.concat(keyset, sep)
+end
+
+--- Merge two tables recursively (i.e., subtables also get merged).
+-- from: http://stackoverflow.com/a/1283608
+-- @table t1 Table to merge into.
+-- @table t2 Table to merge into t1.
+-- @return The combined table (actually t1).
+function mergeTables(t1, t2)
+	for k,v in pairs(t2) do
+		if type(v) == "table" then
+			if type(t1[k] or false) == "table" then
+				mergeTables(t1[k] or {}, t2[k] or {})
+			else
+				t1[k] = v
+			end
+		else
+			t1[k] = v
+		end
+	end
+	return t1
+end
+
+local function hasValue(t, needle)
+	for k,v in pairs(t) do
+		if needle == v then return k end
+	end
+	return nil
+end
+
+local function makeAnsiCode(key)
+	if not ANSI_COLORS[key] then return nil end
+	return ESCAPE_STR .. ANSI_COLORS[key] .. 'm'
+end
+
+
+
+--[[========================================================================]]--
+
+local function tailStream(stream, filterSet)
+	patterns = filterSet and filterSet.patterns or {}
+	options = filterSet and filterSet.options or { ['mode'] = 'keep' }
+	local c = 0
+
+	for line in stream:lines() do
+		--c = c + 1 -- Note: this would also count deleted lines
+		local embellished = line
+		local keepLine = (options.mode == 'keep')
+		local keepLineOverridden = false
+
+		-- look for a pattern matching this line
+		for p,c in pairs(patterns) do
+			if line:match(p) then
+				-- print("[DEBUG] +matched rule '" .. p .. "'/'" .. c .. "' against '" .. line .. "'")
+				local kws = c:split(',')
+
+				if hasValue(kws, '_delete') then keepLine = false; keepLineOverridden = true
+				elseif hasValue(kws, '_nodelete') then keepLine = true; keepLineOverridden = true
+				end
+
+				if keepLine then
+					-- first collect formatting sequences
+					local fmt = ''
+					for _,kw in ipairs(kws) do
+						local code = makeAnsiCode(kw)
+						if code then fmt = fmt .. code end
+					end
+
+					-- then wrap the line in formatting, if any
+					if fmt:len() > 0 then embellished = fmt .. embellished .. RESET_CODE end
+				else
+					-- Note: break out of loop and stop processing when line should be deleted _if_ the default has been overridden to do so
+					if keepLineOverridden then
+						embellished = nil
+						break
+					end
+				end
+
+				--break -- Note: don't break, allow multiple matches per line, e.g. to mix and match fg and bg colors
+			end
+		end
+
+		if embellished and keepLine then
+			c = c + 1
+
+			if options.count == 'all' then print(c, embellished)
+			else print(embellished) end
+		else
+			-- print("[DEBUG] -skipped '"..line.."'")
+		end
+
+		--c = line:match 'truncated' and 0 or c -- from tail on stderr apparently
+	end
+end
+
+--TODO: could be extended to look for multiple filenames in multiple paths
+local function readConfigFile(filename, searchPath)
+	fullPath = searchPath .. '/' .. filename
+	if not fileExists(fullPath) then
+		--print("[DEBUG] config file '" .. fullPath .. "' not found")
+		return nil
+	end
+
+	--print("[DEBUG] using config file '" .. fullPath .. "'")
+	-- require does not accept full paths? also, pcall does not help with dofile
+	return dofile(fullPath)
+end
+
+--- Load filter set with given name from configSets, with inheritance as specified.
+local function readFilterSet(configSets, setName)
+	local result = {}
+	for k,_ in pairs(configSets) do
+		if k == setName then
+			parent = configSets[setName]['parent']
+			if parent ~= nil then
+				--print("[DEBUG] recursing for filter set '" .. parent .. "' from config")
+				result = mergeTables(result, readFilterSet(configSets, parent))
+			end
+			--print("[DEBUG] using/merging filter set '" .. setName .. "' from config")
+			result = mergeTables(result, configSets[setName])
+			break
+		end
+	end
+	return result
+end
+
+--NOTE: if command-line options get any more complex, switch to a lightweight
+--      getopt like this one? https://attractivechaos.wordpress.com/2011/04/07/getopt-for-lua/
+local function main()
+	-- handle command-line arguments
+	local showHelp, followFile, filterSetName = false, nil, 'default'
+	if #arg > 0 and arg[1] == "-h" or arg[1] == "--help" then
+		showHelp = true
+	else
+		if #arg > 0 and arg[1] ~= '-' then followFile = arg[1] end
+		if #arg > 1 then filterSetName = arg[2] end
+	end
+
+	-- read filter set file if available
+	local configSets = readConfigFile(DFL_FILTERSET_FILE, os.getenv('HOME')) or {}
+	local filterSet = readFilterSet(configSets, filterSetName)
+	-- print("[DEBUG] final filter set for '" .. filterSetName .. "' from config: " .. dump(filterSet))
+
+	-- if requested, display help and exit
+	if showHelp and showHelp == true then
+		print("Usage: loglite.lua [file-to-tail] [filter-set]")
+		print("  If no arguments are supplied, or if the first one is `-', stdin is used as input.")
+		print("  If no filter set is supplied, a set named `default' will be looked for.")
+		print("  Filter sets can be defined in a file `loglite-filters.lua' in your home directory.")
+		print()
+		print("  Available filter sets in " .. os.getenv('HOME') .. "/" .. DFL_FILTERSET_FILE .. ": " .. keysToString(configSets, ', ', true))
+		os.exit(0)
+	end
+
+
+	-------------------------
+
+	--print("[DEBUG] following file: '" .. (followFile and followFile or "<stdin>") .. "', with filter set '" .. filterSetName .. "'.")
+
+	--Info on tailing a file: https://stackoverflow.com/questions/17363973/how-can-i-tail-f-a-log-filetruncate-aware-in-lua
+	--local tailin = io.popen('tail -F '..(...)..' 2>&1', 'r')
+	local tailin = followFile and io.popen('tail -f ' .. followFile, 'r') or io.stdin
+
+	pcall(tailStream, tailin, filterSet) -- Note: protected call to suppress interrupt error thrown by lines iterator
+end
+
+main()
+os.exit(0)

src/script/logrotate-wifibox.conf

@@ -0,0 +1,36 @@
+# Doodle3D logrotate configuration
+
+compress
+su
+create
+
+/tmp/wifibox.log /tmp/print3d-*.log {
+	rotate 2
+	size 1000k
+	missingok
+	olddir /tmp/wifibox-rotated
+
+	# as alternative to copytruncate (which *might* miss lines) we could implement
+	# SIGUSR1 in print3d and firmware to reopen their logs
+	copytruncate  # 'create' is ignored with copytruncate, as the file stays in place
+
+	prerotate
+		FIRST_N_LINES=500
+		PRINT3D_LOGHEAD_FILE=print3d-loghead
+		WIFIBOX_LOGHEAD_FILE=wifibox-loghead
+		ROTATED_FILES_PATH=/tmp/wifibox-rotated
+
+		#Note: by looking at creation date of the print3d socket and comparing against that
+		#      of print3d-loghead we could detect a server restart (e.g. due to reconnected printer)
+
+		echo "$1" | grep -q "print3d-.*\.log"
+		if [ $? -eq 0 -a ! -f "$ROTATED_FILES_PATH/$PRINT3D_LOGHEAD_FILE" ]; then
+			head -q -n$FIRST_N_LINES "$1" > "$ROTATED_FILES_PATH/$PRINT3D_LOGHEAD_FILE"
+		fi
+
+		echo "$1" | grep -q "wifibox.log"
+		if [ $? -eq 0 -a ! -f "$ROTATED_FILES_PATH/$WIFIBOX_LOGHEAD_FILE" ]; then
+			head -q -n$FIRST_N_LINES "$1" > "$ROTATED_FILES_PATH/$WIFIBOX_LOGHEAD_FILE"
+		fi
+	endscript
+}

src/script/print-fetch.lua

@@ -0,0 +1,112 @@
+#!/usr/bin/lua
+
+local function log(message)
+        os.execute("logger " .. message)
+        print(message)
+end
+
+if (table.getn(arg) == 0) then
+        print("Usage: ./print-fetch {printerSocket} {gcodeServerURL} {id} [startGcode] [endGCode]")
+        return
+end
+
+log("starting gcode fetch program")
+
+package.cpath = package.cpath .. '/usr/lib/lua/?.so'
+JSON = (loadfile "/usr/share/lua/wifibox/util/JSON.lua")()
+
+local p3d = require("print3d")
+
+local printer = p3d.getPrinter(arg[1])
+if printer == nil then
+        log("error connecting to printer")
+        return
+end
+
+local gcodeServer = arg[2]
+
+local finished = false
+
+local id = arg[3]
+
+log("gcode file id: " .. id)
+log("gcode server: " .. gcodeServer)
+
+local info = JSON:decode(io.popen("wget -qO - " .. gcodeServer .. "/info/" .. id):read("*a"))
+
+if info == nil then
+        log("could not retrieve file info")
+        return
+end
+
+local current_line = 0
+local total_lines = tonumber(info["lines"])
+local started = false
+
+log("total lines: " .. total_lines)
+
+local startCode = nil
+local endCode = nil
+
+function countlines(file)
+        return tonumber(io.popen("wc -l < " .. file):read('*a'))
+end
+
+function readGCodeArg(argi)
+        local gcodeFile = arg[argi]
+        return io.open(gcodeFile):read('*a')
+end
+
+if table.getn(arg) >= 5 then
+        startCode = readGCodeArg(4)
+        endCode = readGCodeArg(5)
+end
+
+if startCode ~= nil then
+        log("appending start gcode")
+        printer:appendGcode(startCode)
+end
+
+while(not finished)
+do
+        local f = io.popen("wget -qO - " .. gcodeServer .. "/fetch/" .. id .. "/" .. current_line)
+        local line = f:read()
+        while line ~= nil do
+                printer:appendGcode(line, total_lines, { seq_number = -1, seq_total = -1, source = id })
+                current_line = current_line + 1
+                line = f:read()
+        end
+
+        if not started then
+                started = true
+                print("send print start command")
+                printer:startPrint()
+        end
+
+        if current_line >= total_lines then
+                log("finished fetching gcode")
+                if endCode ~= nil then
+                        log("appending end gcode")
+                        printer:appendGcode(endCode, total_lines, { seq_number = -1, seq_total = -1, source = id })
+                end
+                finished = true
+                break
+        end
+
+
+        local accepts_new_gcode = false
+
+        while (not accepts_new_gcode)
+        do
+                local current,buffer,total,bufferSize,maxBufferSize = printer:getProgress()
+                local percentageBufferSize = bufferSize / maxBufferSize
+
+                if percentageBufferSize < 0.8 then
+                        print("buffer below 80% capacity, sending new gcode")
+                        accepts_new_gcode = true
+                else
+                        print("buffer above 80% capacity")
+                        os.execute("sleep 10")
+                end
+        end
+end

src/script/wifi-switch-netconfig.sh

@@ -0,0 +1,12 @@
+#!/bin/sh
+
+[ "${ACTION}" = "released" ] || exit 0
+
+. /lib/functions.sh
+
+logger "$BUTTON pressed for $SEEN seconds"
+if [ "$SEEN" -gt 4 ]
+then
+  logger "Resetting Wireless"
+  d3dapi p=/network/reset r=POST
+fi

src/script/wifibox.uci.config

@@ -1,6 +1,13 @@
 config settings 'system'
-        option logfile '/tmp/wifibox.log'
-        option loglevel 'debug'
+		#In addition to regular text, api_log_filename and p3d_log_basename may also be
+		#a stream enclose in angle brackets (e.g. '<stderr>') or
+		#a command to send output to in back quotes (e.g. '`ssh USER@HOST "cat > /tmp/test.log"`').
+		#Note that using an SSH tunnel without public key auth will need interaction
+
+        option log_path '/tmp'
+        option api_log_filename 'wifibox.log'
+        option p3d_log_basename 'print3d'
 
 config settings 'general'
 	option printer_type 'ultimaker'
+        option gcode_server 'http://gcodeserver.doodle3d.com'

src/script/wifibox_init

@@ -6,19 +6,22 @@
 # See file LICENSE.txt or visit http://www.gnu.org/licenses/gpl.html for full license details.
 
 # start after networking
-START=22
+#START=22
+START=61
 
 LOGGER="logger -t autowifi -p 6"
 
 boot() {
-	sleep 1
+	sleep 5
 
 	$LOGGER "Invoking Doodle3D WiFi box network auto-initialization..."
 	/usr/share/lua/wifibox/script/d3dapi autowifi
 	
-  $LOGGER "Start signing in..."
-  /usr/share/lua/wifibox/script/signin.sh > /dev/null 2> /dev/null &
+	$LOGGER "Start signing in..."
+	/usr/share/lua/wifibox/script/signin.sh > /dev/null 2> /dev/null &
 	
+	mkdir -p /var/lib  # required by logrotate for logrotate.status
+	mkdir -p /tmp/wifibox-rotated  # this is where rotated wifibox logs are placed
 }
 
 start() {

src/util/access.lua

@@ -8,18 +8,42 @@
 
 local log = require('util.logger')
 local utils = require('util.utils')
+local printerUtils = require('util.printer')
+
+local MOD_ABBR = "UACS"
 
 local M = {}
 
 function M.hasControl(ip)
 	local controllerIP = M.getController()
-	return (controllerIP == "" or (controllerIP ~= "" and controllerIP == ip))
+
+	-- no controller stored? we have control
+	if controllerIP == "" then return true end;
+
+	-- controller stored is same as our (requesting) ip? we have control
+	if(controllerIP == ip) then return true end;
+
+	-- no printer connected? we have control
+	local printer,msg = printerUtils.createPrinterOrFail()
+	if not printer or not printer:hasSocket() then
+		M.setController("") -- clear the controller
+		return true
+	end
+
+	-- printer is idle (done printing)? we have control
+	local state = printer:getState()
+	if state == "idle" then -- TODO: define in constants somewhere
+		M.setController("") -- clear controller
+		return true
+	end
+
+	return false
 end
 
 function M.getController()
 	local file, error = io.open('/tmp/controller.txt','r')
 	if file == nil then
-		--log:error("Util:Access:Can't read controller file. Error: "..error)
+		--log:error(MOD_ABBR, "Util:Access: Can't read controller file. Error: "..error)
 		return ""
 	else
 		controllerIP = file:read('*a')

src/util/logger.lua

@@ -13,36 +13,51 @@ local utils = require('util.utils')
 
 local M = {}
 
-local logLevel, logVerbose, logStream
+local logLevel, logVerboseFmt, logStream
+local logFilePath = nil -- only used for reference
 
---- Available log levels
+local LONGEST_LEVEL_NAME = -1
+
+--- Available log levels (starting at 1)
 -- @table LEVEL
 M.LEVEL = {
-	'debug', -- for debug messages
-	'info', -- for informational messages
-	'warn', -- for warnings (something is wrong/fishy but not neccesarily problematic)
-	'error', -- for recoverable errors
-	'fatal' -- for unrecoverable errors
+	'quiet',		-- not used for logging, only for setting levels
+	'error',		-- fatal or non-fatal error condition
+	'warning',	-- possibly troublesome situation
+	'info',			-- information about what the application is doing
+	'verbose',	-- extra trail information on what the application is doing
+	'bulk'			-- debug information (in large amounts)
 }
 
--- M.LEVEL already has idx=>name entries, now create name=>idx entries
+
+--[[== module initialization code ==]]--
+
+-- M.LEVEL already has idx=>name entries, now create name=>idx entries so it can be indexed both ways, and init LONGEST_LEVEL_NAME
 for i,v in ipairs(M.LEVEL) do
 	M.LEVEL[v] = i
+	if v:len() > LONGEST_LEVEL_NAME then LONGEST_LEVEL_NAME = v:len() end
 end
 
 
-local function log(level, msg, verbose)
-	if level >= logLevel then
-		local now = os.date('%m-%d %H:%M:%S')
+--[[================================]]--
+
+
+local function log(level, module, msg, verboseFmt)
+	if level <= logLevel then
+		local now = os.date('%d-%m %H:%M:%S')
 		local i = debug.getinfo(3) --the stack frame just above the logger call
-		local v = verbose
-		if v == nil then v = logVerbose end
+		local v = verboseFmt
+		if v == nil then v = logVerboseFmt end
 		local name = i.name or "(nil)"
 		local vVal = 'nil'
 		local m = (type(msg) == 'string') and msg or utils.dump(msg)
+		if module == nil then module = "LUA " end
 
-		if v then logStream:write(now .. " (" .. M.LEVEL[level] .. ")     " .. m .. "  [" .. name .. "@" .. i.short_src .. ":" .. i.linedefined .. "]\n")
-		else logStream:write(now .. " (" .. M.LEVEL[level] .. ")     " .. m .. "\n") end
+		local levelName = M.LEVEL[level]
+		local padding = string.rep(' ', LONGEST_LEVEL_NAME - levelName:len())
+
+		if v then logStream:write(now .. " [" .. module .. "] (" .. levelName .. ")" .. padding .. ": " .. m .. "  [" .. name .. "@" .. i.short_src .. ":" .. i.linedefined .. "]\n")
+		else logStream:write(now .. " [" .. module .. "] (" .. levelName .. ")" .. padding .. ": " .. m .. "\n") end
 
 		logStream:flush()
 	end
@@ -51,11 +66,16 @@ end
 
 --- Initializes the logger.
 -- @tparam @{util.logger.LEVEL} level Minimum level of messages to log.
--- @tparam bool verbose Write verbose log messages (include file/line inforomation).
-function M:init(level, verbose)
-	logLevel = level or M.LEVEL.warn
-	logVerbose = verbose or false
-	logStream = stream or io.stdout
+-- @tparam bool verbose Write verbose log messages (include file/line information).
+function M:init(level, verboseFmt)
+	logLevel = level or M.LEVEL.warning
+	logVerboseFmt = verboseFmt or false
+	--logStream = stream or io.stdout
+end
+
+function M:setLevel(level, verboseFmt)
+	logLevel = level or M.LEVEL.warning
+	logVerboseFmt = verboseFmt or false
 end
 
 -- pass nil as stream to reset to stdout
@@ -63,10 +83,21 @@ function M:setStream(stream)
 	logStream = stream or io.stdout
 end
 
-function M:debug(msg, verbose) log(M.LEVEL.debug, msg, verbose); return true end
-function M:info(msg, verbose) log(M.LEVEL.info, msg, verbose); return true end
-function M:warn(msg, verbose) log(M.LEVEL.warn, msg, verbose); return true end
-function M:error(msg, verbose) log(M.LEVEL.error, msg, verbose); return false end
-function M:fatal(msg, verbose) log(M.LEVEL.fatal, msg, verbose); return false end
+function M:getLevel()
+	return logLevel, logVerboseFmt
+end
+
+function M:getStream()
+	return logStream
+end
+
+function M:setLogFilePath(path) logFilePath = path end
+function M:getLogFilePath() return logFilePath end
+
+function M:error(module, msg, verboseFmt) log(M.LEVEL.error, module, msg, verboseFmt); return false end
+function M:warning(module, msg, verboseFmt) log(M.LEVEL.warning, module, msg, verboseFmt); return true end
+function M:info(module, msg, verboseFmt) log(M.LEVEL.info, module, msg, verboseFmt); return true end
+function M:verbose(module, msg, verboseFmt) log(M.LEVEL.verbose, module, msg, verboseFmt); return true end
+function M:bulk(module, msg, verboseFmt) log(M.LEVEL.bulk, module, msg, verboseFmt); return true end
 
 return M

src/util/printer.lua

@@ -10,13 +10,18 @@ local log = require('util.logger')
 local utils = require('util.utils')
 local printDriver = require('print3d')
 
+local MOD_ABBR = "UPRN"
+
 local SUPPORTED_PRINTERS = {
 	rigidbot = "Rigidbot",
 	ultimaker = "Ultimaker",
-	ultimaker2 = "Ultimaker2",
+	ultimaker2 = "Ultimaker 2",
+	ultimaker2go = "Ultimaker 2 Go",
+	ultimaker_original_plus = "Ultimaker Original Plus",
 	makerbot_replicator2 = "MakerBot Replicator2",
 	makerbot_replicator2x = "MakerBot Replicator2x",
 	makerbot_thingomatic = "MakerBot Thing-o-matic",
+	wanhao_duplicator4 = "Wanhao Duplicator 4",
 	printrbot = "Printrbot",
 	bukobot = "Bukobot",
 	cartesio = "Cartesio",
@@ -29,6 +34,7 @@ local SUPPORTED_PRINTERS = {
 	kossel = "Kossel",
 	leapfrog_creatr = "LeapFrog Creatr",
 	lulzbot_aO_101 = "LulzBot AO-101",
+	lulzbot_taz_4 = "LulzBot TAZ 4",
 	makergear_m2 = "MakerGear M2",
 	makergear_prusa = "MakerGear Prusa",
 	makibox = "Makibox",
@@ -44,8 +50,21 @@ local SUPPORTED_PRINTERS = {
 	shapercube = "ShaperCube",
 	tantillus = "Tantillus",
 	vision_3d_printer = "Vision 3D Printer",
+	minifactory = "miniFactory",
+	builder3d = "Builder 3D",
+	bigbuilder3d = "Big Builder 3D",
+	mamba3d = "Mamba3D",
+	_3Dison_plus = "3Dison plus",
 	marlin_generic = "Generic Marlin Printer",
-    makerbot_generic = "Generic Makerbot Printer"
+	makerbot_generic = "Generic Makerbot Printer",
+	doodle_dream = "Doodle Dream",
+	colido_2_0_plus = "ColiDo 2.0 Plus",
+	colido_m2020 = "ColiDo M2020",
+	colido_x3045 = "ColiDo X3045",
+	colido_compact = "ColiDo Compact",
+	colido_diy = "ColiDo DIY",
+	craftbot_plus = "CraftBot PLUS",
+	renkforce_rf100 = "Renkforce RF100"
 }
 local SUPPORTED_BAUDRATES = {
 	["115200"] = "115200 bps",
@@ -67,8 +86,8 @@ end
 --returns a printer instance or nil (and sets error state on response in the latter case)
 function M.createPrinterOrFail(deviceId, response)
 
-	--log:debug("API:printer:createPrinterOrFail: "..utils.dump(deviceId))
-	local msg,printer = nil, nil
+	--log:info(MOD_ABBR, "API:printer:createPrinterOrFail: "..utils.dump(deviceId))
+	local rv,msg,printer = nil, nil, nil
 
 	if deviceId == nil or deviceId == "" then
 		printer,msg = printDriver.getPrinter()
@@ -77,11 +96,25 @@ function M.createPrinterOrFail(deviceId, response)
 	end
 
 	if not printer then
-		response:setError("could not open printer driver (" .. msg .. ")")
-		response:addData('id', deviceId)
+		if response ~= nil then
+			response:setError("could not open printer driver (" .. msg .. ")")
+			response:addData('id', deviceId)
+		end
 		return nil
 	end
 
+	-- only log these log setup errors, do not let them prevent further request handling
+
+	rv,msg = printer:setLocalLogStream(log:getStream())
+	if not rv then
+		log:error(MOD_ABBR, "could not set log stream in Lua binding (" .. msg .. ")")
+	end
+
+	rv,msg = printer:setLocalLogLevel(log:getLevel())
+	if not rv then
+		log:error(MOD_ABBR, "could not set log level '" .. log:getLevel() .. "' in Lua binding (" .. msg .. ")")
+	end
+
 	return printer
 end
 

src/util/settings.lua

@@ -19,6 +19,8 @@ local baseconfig = require('conf_defaults')
 local utils = require('util.utils')
 local log = require('util.logger')
 
+local MOD_ABBR = "USET"
+
 local M = {}
 
 --- UCI config name (i.e., file under `/etc/config`)
@@ -97,7 +99,7 @@ end
 
 --- Reports whether a value is valid given the constraints specified in a base table.
 -- @p value The value to test.
--- @tab baseTable The base table to use constraint data from (min,max,regex).
+-- @tab baseTable The base table to use constraint data from (min,max,regex,isValid).
 -- @treturn bool Returns true if the value is valid, false if it is not.
 local function isValid(value, baseTable)
 	local varType, min, max, regex, isValid = baseTable.type, baseTable.min, baseTable.max, baseTable.regex, baseTable.isValid
@@ -159,24 +161,29 @@ end]]--
 -- @return The associated value, beware (!) that this may be boolean false for keys of 'bool' type, or nil if the key could not be read because of a UCI error.
 -- @treturn string Message in case of error.
 function M.get(key)
-	--log:info("settings:get: "..utils.dump(key))
+	--log:info(MOD_ABBR, "settings:get: "..utils.dump(key))
 	key = replaceDots(key)
+	
+	-- retrieve settings's base settings from conf_defaults.lua
 	local base = getBaseKeyTable(key)
-
 	if not base then return nil,ERR_NO_SUCH_KEY end
 
+	-- check which uci section to read. 
+	-- By default it will read from the general section, but if a base setting contains a subSection it will check that subSection
 	local section = UCI_CONFIG_SECTION;
 	if base.subSection ~= nil then
 		section = M.get(base.subSection)
 	end
-
+	
+	-- get setting from uci 
 	local uciV,msg = uci:get(UCI_CONFIG_NAME, section, key)
 	if not uciV and msg ~= nil then
 		local errorMSG = "Issue reading setting '"..utils.dump(key).."': "..utils.dump(msg);
-		log:info(errorMSG)
+		log:warning(MOD_ABBR, errorMSG)
 		return nil, errorMSG;
 	end
-
+	
+	-- convert uci value into proper lua value 
 	local uciV = fromUciValue(uciV, base.type)
 	if uciV ~= nil then
 		-- returning value from uci
@@ -238,31 +245,22 @@ end
 -- @p[opt=nil] noCommit If true, do not commit the uci configuration; this is more efficient when setting multiple values
 -- @treturn bool|nil True if everything went well, false if validation error, nil in case of error.
 -- @treturn ?string Error message in case first return value is nil (invalid key).
-<<<<<<< HEAD
-function M.set(key, value)
-=======
 function M.set(key, value, noCommit)
->>>>>>> develop
-	log:info("settings:set: "..utils.dump(key).." to: "..utils.dump(value))
+	--log:info(MOD_ABBR, "settings:set: "..utils.dump(key).." to: "..utils.dump(value))
 	key = replaceDots(key)
 
 	local r = utils.create(UCI_CONFIG_FILE)
 	local rv, msg = uci:set(UCI_CONFIG_NAME, UCI_CONFIG_SECTION, UCI_CONFIG_TYPE)
 	if not rv and msg ~= nil then
 		local errorMSG = "Issue creating section '"..utils.dump(UCI_CONFIG_SECTION).."': "..utils.dump(msg);
-		log:info(errorMSG)
+		log:warning(MOD_ABBR, errorMSG)
 		return nil, errorMSG;
 	end
 
 	local base = getBaseKeyTable(key)
-<<<<<<< HEAD
-	if not base then return nil,ERR_NO_SUCH_KEY end
-	
-=======
 	if not base then return false,ERR_NO_SUCH_KEY end
 
->>>>>>> develop
-	--log:info("  base.type: "..utils.dump(base.type))
+	--log:info(MOD_ABBR, "  base.type: "..utils.dump(base.type))
 	if base.type == 'bool' then
 		if value ~= "" then
 			value = utils.toboolean(value)
@@ -275,7 +273,7 @@ function M.set(key, value, noCommit)
 			return false,"Value isn't a valid int or float"
 		end
 	end
-	
+
 	local valid,m = isValid(value, base)
 	if not valid then
 		return false,m
@@ -287,7 +285,7 @@ function M.set(key, value, noCommit)
 		local rv, msg = uci:set(UCI_CONFIG_NAME, section, UCI_CONFIG_TYPE)
 		if not rv and msg ~= nil then
 			local errorMSG = "Issue getting subsection '"..utils.dump(base.subSection).."': "..utils.dump(msg);
-			log:info(errorMSG)
+			log:warning(MOD_ABBR, errorMSG)
 			return nil, errorMSG;
 		end
 	end
@@ -296,14 +294,14 @@ function M.set(key, value, noCommit)
 		local rv, msg = uci:set(UCI_CONFIG_NAME, section, key, toUciValue(value, base.type))
 		if not rv and msg ~= nil then
 			local errorMSG = "Issue setting setting '"..utils.dump(key).."' in section '"..utils.dump(section).."': "..utils.dump(msg);
-			log:info(errorMSG)
+			log:warning(MOD_ABBR, errorMSG)
 			return nil, errorMSG;
 		end
 	else
 		local rv, msg = uci:delete(UCI_CONFIG_NAME, section, key)
 		if not rv and msg ~= nil then
 			local errorMSG = "Issue deleting setting '"..utils.dump(key).."' in section '"..utils.dump(section).."': "..utils.dump(msg);
-			log:info(errorMSG)
+			log:warning(MOD_ABBR, errorMSG)
 			return nil, errorMSG;
 		end
 	end
@@ -322,55 +320,35 @@ end
 -- @string key The key to set.
 -- @treturn bool|nil True if everything went well, nil in case of error.
 function M.resetAll()
-	log:info("settings:resetAll")
+	log:info(MOD_ABBR, "settings:resetAll")
 
-<<<<<<< HEAD
-	-- delete all uci sections but system
-	local allSections = uci:get_all(UCI_CONFIG_NAME)
-	for key,value in pairs(allSections) do 
-		if key ~= "system" and not key:match('^[A-Z_]*$') then --TEMP: skip 'constants', which should be moved anyway
-			
-			uci:delete(UCI_CONFIG_NAME,key)
-		end 
-	end
-	
-	-- reset all to defaults
-	for k,_ in pairs(baseconfig) do
-		if not k:match('^[A-Z_]*$') then --TEMP: skip 'constants', which should be moved anyway
-			M.reset(k)
-		end
-	end
-	
-	uci:commit(UCI_CONFIG_NAME)
-=======
 	-- find all sections
 	local allSections, msg = uci:get_all(UCI_CONFIG_NAME)
 	if not allSections and msg ~= nil then
 		local errorMSG = "Issue reading all settings: "..utils.dump(msg);
-		log:info(errorMSG)
+		log:warning(MOD_ABBR, errorMSG)
 		return nil, errorMSG;
 	end
-	
+
 	-- delete all uci sections but system
 	for key,value in pairs(allSections) do
 		if key ~= "system" and not key:match('^[A-Z_]*$') then --TEMP: skip 'constants', which should be moved anyway
 			local rv, msg = uci:delete(UCI_CONFIG_NAME,key)
 			if not rv and msg ~= nil then
 				local errorMSG = "Issue deleting setting '"..utils.dump(key).."': "..utils.dump(msg);
-				log:info(errorMSG)
+				log:warning(MOD_ABBR, errorMSG)
 				return nil, errorMSG;
 			end
 		end
 	end
-	
+
 	-- reset all to defaults
 	for k,_ in pairs(baseconfig) do
 		if not k:match('^[A-Z_]*$') then --TEMP: skip 'constants', which should be moved anyway
 			M.reset(k,true)
 		end
 	end
->>>>>>> develop
-	
+
 	M.commit()
 	return true
 end
@@ -379,15 +357,9 @@ end
 -- @string key The key to reset.
 -- @p[opt=nil] noCommit If true, do not commit the uci configuration; this is more efficient when resetting multiple values
 -- @treturn bool|nil True if everything went well, nil in case of error.
-<<<<<<< HEAD
-function M.reset(key)
-	log:info("settings:reset: "..utils.dump(key))
-	
-=======
 function M.reset(key, noCommit)
-	log:info("settings:reset: "..utils.dump(key))
+	log:info(MOD_ABBR, "settings:reset: "..utils.dump(key))
 
->>>>>>> develop
 	-- delete
 	key = replaceDots(key)
 	local base = getBaseKeyTable(key)
@@ -395,22 +367,13 @@ function M.reset(key, noCommit)
 	local section = UCI_CONFIG_SECTION;
 	if base.subSection ~= nil then
 		section = M.get(base.subSection)
-<<<<<<< HEAD
 	end
-	uci:delete(UCI_CONFIG_NAME, section, key)
-	
-	-- reuse get logic to retrieve default and set it.
-	M.set(key,M.get(key))
-	
-	uci:commit(UCI_CONFIG_NAME)
-=======
-	end 
 	local rv, msg = uci:delete(UCI_CONFIG_NAME, section, key)
-	-- we can't respond to errors in general here because when a key isn't found 
+	-- we can't respond to errors in general here because when a key isn't found
 	--   (which always happens when reset is used in resetall) it will also generate a error
 	--if not rv and msg ~= nil then
 	--	local errorMSG = "Issue deleting setting '"..utils.dump(key).."' in section '"..section.."': "..utils.dump(msg);
-	--	log:info(errorMSG)
+	--	log:warning(MOD_ABBR, errorMSG)
 	--	return nil, errorMSG;
 	--end
 
@@ -418,7 +381,6 @@ function M.reset(key, noCommit)
 	M.set(key,M.get(key),true)
 
 	if noCommit ~= true then uci:commit(UCI_CONFIG_NAME) end
->>>>>>> develop
 	return true
 end
 

src/util/status.lua

@@ -9,13 +9,15 @@
 local log = require('util.logger')
 local utils = require('util.utils')
 
+local MOD_ABBR = "USTS"
+
 local M = {}
 
 local FOLDER = "/tmp/"
 local FILE_PREFIX = "d3d-"
 local FILE_EXTENSION = ".txt"
 
-function getPath(fileName) 
+function getPath(fileName)
 	return FOLDER..FILE_PREFIX..fileName..FILE_EXTENSION
 end
 
@@ -23,7 +25,7 @@ function M.get(fileName)
 	local path = getPath(fileName)
 	local file, error = io.open(path,'r')
 	if file == nil then
-		--log:error("Util:Access:Can't read controller file. Error: "..error)
+		--log:warning(MOD_ABBR, "Util:Access:Can't read controller file. Error: "..error)
 		return "",""
 	else
 		local status = file:read('*a')
@@ -35,7 +37,7 @@ function M.get(fileName)
 end
 
 function M.set(fileName,code,msg)
-	--log:info("setStatus: "..code.." | "..msg)
+	--log:info(MOD_ABBR, "setStatus: "..code.." | "..msg)
 	local path = getPath(fileName)
 	local file = io.open(path,'w')
 	file:write(code.."|"..msg)

test/test-d3d-updater.lua

@@ -0,0 +1,58 @@
+-- This script contains a number of impromptu tests to check version comparisons, kept around in case real unit tests will be created one day.
+argStash = arg
+arg = nil
+local upd = require('d3d-updater')
+arg = argStash
+
+local function dump(o)
+	if type(o) == 'table' then
+		local s = '{ '
+		for k,v in pairs(o) do
+			if type(k) ~= 'number' then k = '"'..k..'"' end
+			s = s .. '['..k..'] = ' .. dump(v) .. ','
+		end
+		return s .. '} '
+	else
+		return tostring(o)
+	end
+end
+
+local input = '19990213'
+local ts = upd.parseDate(input)
+print("parse " .. input .. ": " .. ts)
+print("format " .. ts .. ": " .. upd.formatDate(ts))
+
+local vertex1 = '0.2.3'
+local vertab1 = upd.parseVersion(vertex1)
+print("parse " .. vertex1 .. ": " .. dump(vertab1))
+print("formatted: " .. upd.formatVersion(vertab1))
+
+local vertex2 = '0.2.3-text'
+local vertab2 = upd.parseVersion(vertex2)
+print("parse " .. vertex2 .. ": " .. dump(vertab2))
+print("formatted: " .. upd.formatVersion(vertab2))
+
+local vA, vB = upd.parseVersion("1.4.5-alpha"), upd.parseVersion("1.4.4-rc1")
+local tsA, tsB = 100000, 100005
+
+local cmp1,cmp2 = upd.compareVersions(vA, vB)
+print("vA <=> vB: " .. cmp1 .. " / " .. dump(cmp2))
+cmp1,cmp2 = upd.compareVersions(vA, vB, tsA, tsB)
+print("vA/tsA <=> vB/tsB: " .. cmp1 .. " / " .. dump(cmp2))
+cmp1,cmp2 = upd.compareVersions(vB, vA, tsA, tsB)
+print("vB/tsA <=> vA/tsB: " .. cmp1 .. " / " .. dump(cmp2))
+cmp1,cmp2 = upd.compareVersions(vA, vB, tsB, tsA)
+print("vA/tsB <=> vB/tsA: " .. cmp1 .. " / " .. dump(cmp2))
+
+local vWithout,vWith = upd.parseVersion('1.2.3'), upd.parseVersion('1.2.3-sfx')
+--print("vWithout: " .. dump(vWithout) .. "; vWith: " .. dump(vWith))
+cmp1,cmp2 = upd.compareVersions(vWithout, vWithout)
+print("1.2.3 <=> 1.2.3: " .. cmp1 .. " / " .. dump(cmp2))
+cmp1,cmp2 = upd.compareVersions(vWithout, vWith)
+print("1.2.3 <=> 1.2.3-sfx: " .. cmp1 .. " / " .. dump(cmp2))
+cmp1,cmp2 = upd.compareVersions(vWith, vWith)
+print("1.2.3-sfx <=> 1.2.3-sfx: " .. cmp1 .. " / " .. dump(cmp2))
+
+print("nn equal? " .. dump(upd.versionsEqual(vWithout, vWithout)))
+print("ny equal? " .. dump(upd.versionsEqual(vWithout, vWith)))
+print("yy equal? " .. dump(upd.versionsEqual(vWith, vWith)))