From 421a4cb9a23ce0edfacb3751717c8c0e562873e4 Mon Sep 17 00:00:00 2001 From: jet Date: Sat, 25 Feb 2017 17:04:50 -0500 Subject: [PATCH 01/11] jet's y-axis is backwards --- firmware/src/config.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/firmware/src/config.h b/firmware/src/config.h index 1854da9..dc6c07e 100644 --- a/firmware/src/config.h +++ b/firmware/src/config.h @@ -52,7 +52,9 @@ #define CONFIG_INVERT_Z_AXIS 0 // 0 is regular, 1 inverts the y direction #else #define CONFIG_INVERT_X_AXIS 0 // 0 is regular, 1 inverts the y direction - #define CONFIG_INVERT_Y_AXIS 1 // 0 is regular, 1 inverts the y direction +// #define CONFIG_INVERT_Y_AXIS 1 // 0 is regular, 1 inverts the y direction +// jet's lasersaur is backwards + #define CONFIG_INVERT_Y_AXIS 0 // 0 is regular, 1 inverts the y direction #define CONFIG_INVERT_Z_AXIS 1 // 0 is regular, 1 inverts the y direction #endif From 3794e25c30b1f88b9a2b928fa05bb8e59006a69f Mon Sep 17 00:00:00 2001 From: jet Date: Sat, 17 Jun 2017 14:56:38 -0400 Subject: [PATCH 02/11] turn off CONFIG_BEAMDYNAMICS --- backend/config.py | 2 +- firmware/src/config.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/backend/config.py b/backend/config.py index 63caec5..0491260 100644 --- a/backend/config.py +++ b/backend/config.py @@ -26,7 +26,7 @@ conf = { 'appname': 'driveboardapp', - 'version': '17.02-beta', + 'version': '17.02-beta-jet-hw', 'company_name': 'com.nortd.labs', 'network_host': '', # '' for all nics 'network_port': 4444, diff --git a/firmware/src/config.h b/firmware/src/config.h index dc6c07e..bc5aff6 100644 --- a/firmware/src/config.h +++ b/firmware/src/config.h @@ -29,7 +29,7 @@ #define ENABLE_LASER_INTERLOCKS // enable/disable all interlocks // #define DRIVEBOARD_USB // configure IO pins for DriveboardUSB // #define STATIC_PWM_FREQ 5000 // only works with LASER_PWM_BIT == 5 -#define CONFIG_BEAMDYNAMICS // adjust intensity during accel/decel +// #define CONFIG_BEAMDYNAMICS // adjust intensity during accel/decel #define CONFIG_BEAMDYNAMICS_START 0.05 // 0-1.0, offset after which to apply #define CONFIG_BEAMDYNAMICS_EVERY 8 // freq as multiples of steps impulses From 52fc346eac39b0e1f4ca5a521c8bf824ae88923b Mon Sep 17 00:00:00 2001 From: jet Date: Sat, 17 Jun 2017 15:15:16 -0400 Subject: [PATCH 03/11] set version to -jet --- backend/config.py | 1 + 1 file changed, 1 insertion(+) diff --git a/backend/config.py b/backend/config.py index dc73e91..851c616 100644 --- a/backend/config.py +++ b/backend/config.py @@ -26,6 +26,7 @@ conf = { 'appname': 'driveboardapp', + 'version': '17.04-beta-jet', 'company_name': 'com.nortd.labs', 'network_host': '', # '' for all nics 'network_port': 4444, From 92e52c92ed426a9f0c4d6ba77db7ff10f6b905dc Mon Sep 17 00:00:00 2001 From: jet Date: Mon, 10 Jul 2017 16:23:53 -0400 Subject: [PATCH 04/11] update for jet's firmware --- firmware/src/config.driveboard1403.h | 3 +- firmware/src/config.driveboard1403sync.h | 3 +- firmware/src/config.h | 188 +---------------------- 3 files changed, 6 insertions(+), 188 deletions(-) diff --git a/firmware/src/config.driveboard1403.h b/firmware/src/config.driveboard1403.h index 94aac9e..eeeb57c 100644 --- a/firmware/src/config.driveboard1403.h +++ b/firmware/src/config.driveboard1403.h @@ -55,7 +55,8 @@ #define CONFIG_Y_ORIGIN_OFFSET 5.0 // mm, y-offset of table origin from physical home #define CONFIG_Z_ORIGIN_OFFSET 0.0 // mm, z-offset of table origin from physical home #define CONFIG_INVERT_X_AXIS 0 // 0 is regular, 1 inverts the y direction -#define CONFIG_INVERT_Y_AXIS 1 // 0 is regular, 1 inverts the y direction +// jet's y-axis is backwards +#define CONFIG_INVERT_Y_AXIS 0 // 0 is regular, 1 inverts the y direction #define CONFIG_INVERT_Z_AXIS 1 // 0 is regular, 1 inverts the y direction diff --git a/firmware/src/config.driveboard1403sync.h b/firmware/src/config.driveboard1403sync.h index f3e6d85..3289f6d 100644 --- a/firmware/src/config.driveboard1403sync.h +++ b/firmware/src/config.driveboard1403sync.h @@ -55,7 +55,8 @@ #define CONFIG_Y_ORIGIN_OFFSET 5.0 // mm, y-offset of table origin from physical home #define CONFIG_Z_ORIGIN_OFFSET 0.0 // mm, z-offset of table origin from physical home #define CONFIG_INVERT_X_AXIS 0 // 0 is regular, 1 inverts the y direction -#define CONFIG_INVERT_Y_AXIS 1 // 0 is regular, 1 inverts the y direction +// jet's y-axis is backwards +#define CONFIG_INVERT_Y_AXIS 0 // 0 is regular, 1 inverts the y direction #define CONFIG_INVERT_Z_AXIS 1 // 0 is regular, 1 inverts the y direction diff --git a/firmware/src/config.h b/firmware/src/config.h index 3196079..767fc06 100644 --- a/firmware/src/config.h +++ b/firmware/src/config.h @@ -1,187 +1,3 @@ - Copyright (c) 2009-2011 Simen Svale Skogsrud - Copyright (c) 2011 Sungeun K. Jeon - Copyright (c) 2011-2016 Stefan Hechenberger - - DriveboardFirmware is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - DriveboardFirmware is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. -*/ - -#ifndef config_h -#define config_h - -#include -#include - -#define VERSION 1702 // int or float -#define BAUD_RATE 57600 -// #define ENABLE_3AXES // enable/disable 3-axis mode (vs 2-axis) -#define ENABLE_LASER_INTERLOCKS // enable/disable all interlocks -// #define DRIVEBOARD_USB // configure IO pins for DriveboardUSB -// #define STATIC_PWM_FREQ 5000 // only works with LASER_PWM_BIT == 5 -// #define CONFIG_BEAMDYNAMICS // adjust intensity during accel/decel -#define CONFIG_BEAMDYNAMICS_START 0.05 // 0-1.0, offset after which to apply -#define CONFIG_BEAMDYNAMICS_EVERY 8 // freq as multiples of steps impulses - - -#define CONFIG_X_STEPS_PER_MM 88.88888888 //microsteps/mm -#define CONFIG_Y_STEPS_PER_MM 90.90909090 //microsteps/mm -#define CONFIG_Z_STEPS_PER_MM 33.33333333 //microsteps/mm -#define CONFIG_PULSE_MICROSECONDS 5 -#define CONFIG_FEEDRATE 8000.0 // in millimeters per minute -#define CONFIG_SEEKRATE 8000.0 -#define CONFIG_HOMINGRATE 600 // ms/pulse -#define CONFIG_ACCELERATION 1800000.0 // mm/min^2, typically 1000000-8000000, divide by (60*60) to get mm/sec^2 -#define CONFIG_JUNCTION_DEVIATION 0.006 // mm -#define CONFIG_X_ORIGIN_OFFSET 5.0 // mm, x-offset of table origin from physical home -#define CONFIG_Y_ORIGIN_OFFSET 5.0 // mm, y-offset of table origin from physical home -#define CONFIG_Z_ORIGIN_OFFSET 0.0 // mm, z-offset of table origin from physical home -#ifdef DRIVEBOARD_USB - #define CONFIG_INVERT_X_AXIS 1 // 0 is regular, 1 inverts the y direction - #define CONFIG_INVERT_Y_AXIS 0 // 0 is regular, 1 inverts the y direction - #define CONFIG_INVERT_Z_AXIS 0 // 0 is regular, 1 inverts the y direction -#else - #define CONFIG_INVERT_X_AXIS 0 // 0 is regular, 1 inverts the y direction -// #define CONFIG_INVERT_Y_AXIS 1 // 0 is regular, 1 inverts the y direction -// jet's lasersaur is backwards - #define CONFIG_INVERT_Y_AXIS 0 // 0 is regular, 1 inverts the y direction - #define CONFIG_INVERT_Z_AXIS 1 // 0 is regular, 1 inverts the y direction -#endif - - - -#define SENSE_DDR DDRD -#define SENSE_PORT PORTD -#define SENSE_PIN PIND -#define CHILLER_BIT 3 // Arduino: 3 -#ifdef DRIVEBOARD_USB - #define DOOR1_BIT 2 // Arduino: 2 - #define DOOR2_BIT 7 // Arduino: 7 -#else - #define DOOR_BIT 2 // Arduino: 2 -#endif - -#define ASSIST_DDR DDRD -#define ASSIST_PORT PORTD -#define AIR_ASSIST_BIT 4 // Arduino: 4 -#ifdef DRIVEBOARD_USB - #define LASER_PWM_BIT 5 // Arduino: 5 - #define AUX_ASSIST_BIT 6 // Arduino: 6 -#else - #define LASER_PWM_BIT 6 // Arduino: 6 - #define AUX_ASSIST_BIT 5 // Arduino: 5 -#endif - -#define LIMIT_DDR DDRC -#define LIMIT_PORT PORTC -#define LIMIT_PIN PINC -#define X1_LIMIT_BIT 0 // Arduino: A0 -#define X2_LIMIT_BIT 1 // Arduino: A1 -#define Y1_LIMIT_BIT 2 // Arduino: A2 -#define Y2_LIMIT_BIT 3 // Arduino: A3 -#define Z1_LIMIT_BIT 4 // Arduino: A4 -#define Z2_LIMIT_BIT 5 // Arduino: A5 - - -#define STEPPING_DDR DDRB -#define STEPPING_PORT PORTB -#define X_STEP_BIT 0 // Arduino: 8 -#define Y_STEP_BIT 1 // Arduino: 9 -#define Z_STEP_BIT 2 // Arduino: 10 -#define X_DIRECTION_BIT 3 // Arduino: 11 -#define Y_DIRECTION_BIT 4 // Arduino: 12 -#define Z_DIRECTION_BIT 5 // Arduino: 13 - - -#ifdef DRIVEBOARD_USB - #define SENSE_MASK ((1< (b)) ? (a) : (b)) -#define min(a,b) (((a) < (b)) ? (a) : (b)) - - -#endif - - - -// bit math -// see: http://www.arduino.cc/playground/Code/BitMath -// see: http://graphics.stanford.edu/~seander/bithacks.html -// -// y = (x >> n) & 1; // n=0..15. stores nth bit of x in y. y becomes 0 or 1. -// -// x &= ~(1 << n); // forces nth bit of x to be 0. all other bits left alone. -// -// x &= (1<<(n+1))-1; // leaves alone the lowest n bits of x; all higher bits set to 0. -// -// x |= (1 << n); // forces nth bit of x to be 1. all other bits left alone. -// -// x ^= (1 << n); // toggles nth bit of x. all other bits left alone. -// -// x = ~x; // toggles ALL the bits in x. +// config.h is copied in dynamically by the build script from config.*.h +// The build script builds firmwares for all config.*.h files. From ba9ab715be01f8dd4cc47c53b1597e8d5ef265b6 Mon Sep 17 00:00:00 2001 From: "J. Eric Townsend (jet)" Date: Sat, 11 Nov 2017 00:23:37 +0000 Subject: [PATCH 05/11] upgrade install and init.d scripts to ubuntu 16 --- scripts/downgrade_to_lasaurapp.sh | 5 ++- scripts/driveboardapp.sh | 34 +++++++++++++--- scripts/install_packages.sh | 4 ++ scripts/lasaurapp.sh | 63 ++++++++++++++++++++++++++--- scripts/upgrade_to_driveboardapp.sh | 2 +- 5 files changed, 96 insertions(+), 12 deletions(-) diff --git a/scripts/downgrade_to_lasaurapp.sh b/scripts/downgrade_to_lasaurapp.sh index 2c2c2f3..49683b5 100755 --- a/scripts/downgrade_to_lasaurapp.sh +++ b/scripts/downgrade_to_lasaurapp.sh @@ -1,8 +1,11 @@ - +#!/bin/sh echo "Switching from DriveboardApp to LasaurApp ..." update-rc.d -f driveboardapp.sh remove + +cp /root/driveboardapp/scripts/lasaurapp.sh /etc/init.d/lasaurapp.sh +chmod 755 /etc/init.d/lasaurapp.sh update-rc.d lasaurapp.sh defaults echo "Done!" diff --git a/scripts/driveboardapp.sh b/scripts/driveboardapp.sh index 336a9e0..c5c99f4 100644 --- a/scripts/driveboardapp.sh +++ b/scripts/driveboardapp.sh @@ -1,10 +1,34 @@ -#!/bin/bash +#!/bin/sh +# kFreeBSD do not accept scripts as interpreters, using #!/bin/sh and sourcing. +if [ true != "$INIT_D_SCRIPT_SOURCED" ] ; then + set "$0" "$@"; INIT_D_SCRIPT_SOURCED=true . /lib/init/init-d-script +fi +### BEGIN INIT INFO +# Provides: Driveboardapp +# Required-Start: $remote_fs $syslog +# Required-Stop: $remote_fs $syslog +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: current Lasersaur software +# Description: version 17.04 +# +### END INIT INFO + +# Author: Stefan Hechenberger +# +# Please remove the "Author" lines above and replace them +# with your own name if you copy and modify this script. + +DESC="Lasersaur Server" +DAEMON="/root/driveboardapp/backend/app.py" + + +# original documentation # place in: /etc/init.d/driveboardapp.sh # make executable: sudo chmod 755 /etc/init.d/driveboardapp.sh # activate with: sudo update-rc.d driveboardapp.sh defaults # deactivate with: sudo update-rc.d -f driveboardapp.sh remove -LASAURAPP="/root/driveboardapp/backend/app.py" LASAURPROC="driveboardapp\/backend\/app\.py" case "$1" in @@ -12,7 +36,7 @@ case "$1" in echo "Starting driveboardapp ..." echo -n "at " date - /usr/bin/python $LASAURAPP + /usr/bin/python $DAEMON ;; stop) @@ -25,7 +49,7 @@ case "$1" in echo "Stopping driveboardapp ..." ps ax | awk "/$LASAURPROC/ "'{ system("kill " $1) }' echo "Starting driveboardapp ..." - /usr/bin/python $LASAURAPP + /usr/bin/python $DAEMON ;; debug) @@ -33,7 +57,7 @@ case "$1" in echo "Stopping driveboardapp ..." ps ax | awk "/$LASAURPROC/ "'{ system("kill " $1) }' echo "Starting driveboardapp with --debug ..." - /usr/bin/python $LASAURAPP --debug + /usr/bin/python $DAEMON --debug ;; *) diff --git a/scripts/install_packages.sh b/scripts/install_packages.sh index b182bf3..1730063 100755 --- a/scripts/install_packages.sh +++ b/scripts/install_packages.sh @@ -6,4 +6,8 @@ mv /etc/apt/sources.list /etc/apt/sources.list.old cp /root/driveboardapp/scripts/sources.list /etc/apt/sources.list apt-get update apt-get install python-imaging + +echo "installing dxfgrabber" +pip install dxfgrabber + echo "Done!" diff --git a/scripts/lasaurapp.sh b/scripts/lasaurapp.sh index f80e634..e743531 100644 --- a/scripts/lasaurapp.sh +++ b/scripts/lasaurapp.sh @@ -1,11 +1,64 @@ -#!/bin/bash +#!/bin/sh +# kFreeBSD do not accept scripts as interpreters, using #!/bin/sh and sourcing. +if [ true != "$INIT_D_SCRIPT_SOURCED" ] ; then + set "$0" "$@"; INIT_D_SCRIPT_SOURCED=true . /lib/init/init-d-script +fi +### BEGIN INIT INFO +# Provides: LasaurApp +# Required-Start: $remote_fs $syslog +# Required-Stop: $remote_fs $syslog +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: original Lasersaur software, deprecated +# Description: Control the lasersaur software through version +# 15.00 +### END INIT INFO + +# Author: Stefan Hechenberger +# +# Please remove the "Author" lines above and replace them +# with your own name if you copy and modify this script. + +DESC="LasaurApp Server" +DAEMON="/usr/bin/python /root/LasaurApp/backend/app.py -p --beaglebone" + +# original documentation # place in: /etc/init.d/lasaurapp.sh # make executable: sudo chmod 755 /etc/init.d/lasaurapp.sh # activate with: sudo update-rc.d lasaurapp.sh defaults # deactivate with: sudo update-rc.d -f lasaurapp.sh remove -if test "$1" = "start" -then +LASAURAPP="/root/LasaurApp/backend/app.py" +LASAURPROC="LasaurApp\/backend\/app\.py" + +case "$1" in + start) echo "Starting LasaurApp ..." - /usr/bin/python /root/LasaurApp/backend/app.py -p --beaglebone -fi + /usr/bin/python $LASAURAPP -p --beaglebone + ;; + + stop) + echo "Stopping LasaurApp ..." + ps ax | awk "/$LASAURPROC/ "'{ system("kill " $1) }' + ;; + + restart) + echo "Restarting LasaurApp ..." + echo "Stopping LasaurApp ..." + ps ax | awk "/$LASAURPROC/ "'{ system("kill " $1) }' + echo "Starting LasaurApp ..." + /usr/bin/python $LASAURAPP -p --beaglebone + ;; + + debug) + echo "Restarting LasaurApp in debug mode..." + echo "Stopping LasaurApp ..." + ps ax | awk "/$LASAURPROC/ "'{ system("kill " $1) }' + echo "Starting LasaurApp ..." + /usr/bin/python $LASAURAPP -p --beaglebone --debug + ;; + + *) + echo "Usage: /etc/init.d/lasersaur {start|stop|restart|debug}" >&2 + exit 1 +esac diff --git a/scripts/upgrade_to_driveboardapp.sh b/scripts/upgrade_to_driveboardapp.sh index 0f8f2d2..f9ab0f0 100755 --- a/scripts/upgrade_to_driveboardapp.sh +++ b/scripts/upgrade_to_driveboardapp.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh echo "Switching from LasaurApp to DriveboardApp ..." From 691c34f9940348d478c645eacdbc9fbc1805464b Mon Sep 17 00:00:00 2001 From: Stefan Hechenberger Date: Mon, 18 Sep 2017 15:01:39 +0200 Subject: [PATCH 06/11] Update api_low.md --- docs/api_low.md | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/docs/api_low.md b/docs/api_low.md index 579315a..22ff244 100644 --- a/docs/api_low.md +++ b/docs/api_low.md @@ -54,10 +54,8 @@ unstop() air_on() air_off() -aux1_on() -aux1_off() -aux2_on() -aux2_off() +aux_on() +aux_off() set_offset_table() set_offset_custom() From 41e164fde7eb780e886eb50c6fa3289538e987d7 Mon Sep 17 00:00:00 2001 From: Stefan Hechenberger Date: Tue, 3 Oct 2017 11:36:33 +0200 Subject: [PATCH 07/11] Update configure.md --- docs/configure.md | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/docs/configure.md b/docs/configure.md index 17d74ff..8d5189d 100644 --- a/docs/configure.md +++ b/docs/configure.md @@ -25,7 +25,6 @@ To reset any entry to the default do something like this: Firmware Configuration ---------------------- +Custom firmwares can be created by adding special `config.xxxx.h` files in the `firmware/src` directory. For example `config.driveboardusb.h` is the configuration file for the Driveboard Element. When you click 'Rebuild Firmware' the backend will then build one firmware for every config file in the `src` directory. -The main configuration file for the firmware is [config.h](../firmware/src/config.h) and an alternative configuration can be created by adding a *config.user.h* file. This file has to be complete and is typically the *config.h* with some modifications. The main reason this is done like this is to prevent your changes being overwritten when you update the software with a `git pull`. - -Any updates or changes to the firmware are not automatically loaded onto the Driveboard. For this use the *Flash from source* feature in the user interface. After flashing it's recommended to restart the Driveboard. For your own sanity you should also change the `define VERSION` entry in *config.user.h* and make sure this number is reflected in the *About* dialog of the user interface. +To flash a custom firmware open `/flash/xxxx` with your browser. Alternatively you can configure this custom firmware as your new default by opening `/config/firmware/xxxx`. Then a click on 'Flash Firmware' will use this newly configured firmware from now on. From 8adb6e2dc4b29b93fbb7c813d839c8752c945f16 Mon Sep 17 00:00:00 2001 From: "J. Eric Townsend (jet)" Date: Sun, 3 Dec 2017 13:56:25 -0500 Subject: [PATCH 08/11] remove my customizations --- backend/config.py | 2 +- firmware/src/config.driveboard1403.h | 3 +-- firmware/src/config.driveboard1403sync.h | 3 +-- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/backend/config.py b/backend/config.py index 851c616..5e12aa2 100644 --- a/backend/config.py +++ b/backend/config.py @@ -26,7 +26,7 @@ conf = { 'appname': 'driveboardapp', - 'version': '17.04-beta-jet', + 'version': '17.04-beta', 'company_name': 'com.nortd.labs', 'network_host': '', # '' for all nics 'network_port': 4444, diff --git a/firmware/src/config.driveboard1403.h b/firmware/src/config.driveboard1403.h index eeeb57c..94aac9e 100644 --- a/firmware/src/config.driveboard1403.h +++ b/firmware/src/config.driveboard1403.h @@ -55,8 +55,7 @@ #define CONFIG_Y_ORIGIN_OFFSET 5.0 // mm, y-offset of table origin from physical home #define CONFIG_Z_ORIGIN_OFFSET 0.0 // mm, z-offset of table origin from physical home #define CONFIG_INVERT_X_AXIS 0 // 0 is regular, 1 inverts the y direction -// jet's y-axis is backwards -#define CONFIG_INVERT_Y_AXIS 0 // 0 is regular, 1 inverts the y direction +#define CONFIG_INVERT_Y_AXIS 1 // 0 is regular, 1 inverts the y direction #define CONFIG_INVERT_Z_AXIS 1 // 0 is regular, 1 inverts the y direction diff --git a/firmware/src/config.driveboard1403sync.h b/firmware/src/config.driveboard1403sync.h index 3289f6d..f3e6d85 100644 --- a/firmware/src/config.driveboard1403sync.h +++ b/firmware/src/config.driveboard1403sync.h @@ -55,8 +55,7 @@ #define CONFIG_Y_ORIGIN_OFFSET 5.0 // mm, y-offset of table origin from physical home #define CONFIG_Z_ORIGIN_OFFSET 0.0 // mm, z-offset of table origin from physical home #define CONFIG_INVERT_X_AXIS 0 // 0 is regular, 1 inverts the y direction -// jet's y-axis is backwards -#define CONFIG_INVERT_Y_AXIS 0 // 0 is regular, 1 inverts the y direction +#define CONFIG_INVERT_Y_AXIS 1 // 0 is regular, 1 inverts the y direction #define CONFIG_INVERT_Z_AXIS 1 // 0 is regular, 1 inverts the y direction From dc3e1a9475a42e87a2944195293e3d70c1dec71e Mon Sep 17 00:00:00 2001 From: Stefan Hechenberger Date: Mon, 18 Sep 2017 15:01:39 +0200 Subject: [PATCH 09/11] Update api_low.md --- docs/api_low.md | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/docs/api_low.md b/docs/api_low.md index 579315a..22ff244 100644 --- a/docs/api_low.md +++ b/docs/api_low.md @@ -54,10 +54,8 @@ unstop() air_on() air_off() -aux1_on() -aux1_off() -aux2_on() -aux2_off() +aux_on() +aux_off() set_offset_table() set_offset_custom() From 59f17f5044314f17a10f62bc978613889c75f404 Mon Sep 17 00:00:00 2001 From: Stefan Hechenberger Date: Tue, 3 Oct 2017 11:36:33 +0200 Subject: [PATCH 10/11] Update configure.md --- docs/configure.md | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/docs/configure.md b/docs/configure.md index 17d74ff..8d5189d 100644 --- a/docs/configure.md +++ b/docs/configure.md @@ -25,7 +25,6 @@ To reset any entry to the default do something like this: Firmware Configuration ---------------------- +Custom firmwares can be created by adding special `config.xxxx.h` files in the `firmware/src` directory. For example `config.driveboardusb.h` is the configuration file for the Driveboard Element. When you click 'Rebuild Firmware' the backend will then build one firmware for every config file in the `src` directory. -The main configuration file for the firmware is [config.h](../firmware/src/config.h) and an alternative configuration can be created by adding a *config.user.h* file. This file has to be complete and is typically the *config.h* with some modifications. The main reason this is done like this is to prevent your changes being overwritten when you update the software with a `git pull`. - -Any updates or changes to the firmware are not automatically loaded onto the Driveboard. For this use the *Flash from source* feature in the user interface. After flashing it's recommended to restart the Driveboard. For your own sanity you should also change the `define VERSION` entry in *config.user.h* and make sure this number is reflected in the *About* dialog of the user interface. +To flash a custom firmware open `/flash/xxxx` with your browser. Alternatively you can configure this custom firmware as your new default by opening `/config/firmware/xxxx`. Then a click on 'Flash Firmware' will use this newly configured firmware from now on. From cda48f1f0876226336f5542c5f4bf49a88cd5272 Mon Sep 17 00:00:00 2001 From: "J. Eric Townsend (jet)" Date: Sun, 3 Dec 2017 15:03:17 -0500 Subject: [PATCH 11/11] add readme for ubuntu 16 --- README-UBUNTU-16.txt | 47 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 README-UBUNTU-16.txt diff --git a/README-UBUNTU-16.txt b/README-UBUNTU-16.txt new file mode 100644 index 0000000..56285ae --- /dev/null +++ b/README-UBUNTU-16.txt @@ -0,0 +1,47 @@ +jet@allartburns.org +3 Dec 2017 + + +Two options + +1) just install Ubuntu-16 on a fresh SD card and run the install script + +2) run the wrong way in traffic and upgrade your existing build + +Part the First, Update Ubuntu via SSH (not for the faint of heart) +These are the steps I took. When I tried a similar set of steps on my +dev machine they failed for all sorts of wobbly reasons. On my "real" +lasersaur it just worked: + +apt-get update +apt-get upgrade +apt-get dist-upgrade # probalby not needed +apt-get install update-manager-core +screen -S upgrade +# +# IMPORTANT: It's possible you have too many packages installed +# and don't have room for the upgrader to download the next release. +# Be ready to apt remove a lot of stuff you can reinstall after the +# upgrade. I had to remove emacs, gcc, g++, x11 (how did that get +# installed?) then do autoclean to make room for the upgrade. +# +do-release-upgrade +# now ssh in to the new port from another terminal and reattach to +# the screen service to maintain the conneciton after the stock +# sshd is restarted +screen -x upgrade +# then when it's all done: +shutdown -r now + + +Part the Second, Update driveboardapp: + +switch to my repo: +https://github.com/allartburns/driveboardapp +checkout branch "ubuntu-16" +then re-install + +cd /root/driveboardapp/scripts +./upgrade_to_driveboardapp.sh +shutdown -r now +