Feature profiles tab

.gitignore

@@ -1,24 +1,43 @@
-.gdbinit
-.vs
-.vscode
 build
+calculate-ctm.txt
 class-template.txt
+cleaned.txt
 copy-to-usb-stick.sh
 deps-junk-1.txt
 deps-junk-2.txt
 deps-junk-3.txt
+display-args.func
+dlp4710/set-projector-power
+dlp4710/set-projector-power.o
 do-it.sh
+fresh-pkg-list.txt
+.gdbinit
 gpg/gpg-agent.conf
 gpg/openpgp-revocs.d
 gpg/private-keys-v1.d
 gpg/random_seed
+images/focus-image.png
+images/white-field.png
+installer
+install-overlap.txt
+listcomp.pl
+listfilter.pl
 model-library
+mountmon/build
 mountmon/.gdbinit
-mountmon/.qmake.stash
 mountmon/Makefile
-mountmon/build
+mountmon/.qmake.stash
 newConfigureUbuntuAndInstallLightField.sh
 out
 packaging
+rpi4_packages-overlap.txt
+rpi4_packages-to-install.txt
+src/version.h
 superclean.sh
+ubuntu-cosmic-18.10-packages.txt
+usb-driver/dlpc350_api.o
+usb-driver/dlpc350_usb.o
+usb-driver/main.o
 usb-driver/set-projector-power
+.vs
+.vscode

CMakeLists.txt

@@ -19,7 +19,7 @@ set (PROJECT_VERSION "${LF_VERSION_MAJOR}.${LF_VERSION_MINOR}.${LF_VERSION_PATCH
 
 if(WIN32)
 # Set the Qt5 path
-set(Qt5_DIR "F:\\\\Qt\\\\5.13.1\\\\msvc2017_64\\\\lib\\\\cmake\\\\Qt5")
+set(Qt5_DIR "F:\\\\Qt\\\\5.14.0\\\\msvc2017_64\\\\lib\\\\cmake\\\\Qt5")
 endif(WIN32)
 
 project(lf)
@@ -50,8 +50,11 @@ src/mesh.cpp
 src/pngdisplayer.cpp
 src/preparetab.cpp
 src/printmanager.cpp
+src/printprofile.cpp
+src/printprofilemanager.cpp
 src/printtab.cpp
 src/processrunner.cpp
+src/profilestab.cpp
 src/shepherd.cpp
 src/signalhandler.cpp
 src/statustab.cpp
@@ -93,8 +96,12 @@ src/pngdisplayer.h
 src/preparetab.h
 src/printjob.h
 src/printmanager.h
+src/printprofile.h
+src/printprofilemanager.h
+src/printpumpingparameters.h
 src/printtab.h
 src/processrunner.h
+src/profilestab.h
 src/shepherd.h
 src/signalhandler.h
 src/statustab.h

change-version-number.sh

@@ -1,68 +1,119 @@
 #!/bin/bash
+# shellcheck disable=SC2164
 
-function blue-bar () {
-    echo -e "\r\x1B[1;37;44m$*\x1B[K\x1B[0m" 1>&2
-}
+LIGHTFIELD_ROOT="${PWD}"
 
-function red-bar () {
-    echo -e "\r\x1B[1;33;41m$*\x1B[K\x1B[0m" 1>&2
-}
+#########################################################
+##                                                     ##
+##     No user-serviceable parts below this point.     ##
+##                                                     ##
+#########################################################
 
-function error-trap () {
-    red-bar Failed\!
+function usage () {
+    cat 1>&2 <<HERE
+Usage: $(basename "$0") [-t <release-train>] <a.b.c[.d]>
+Changes the LightField version in all the relevant places in the source.
+
+  -t <release-train>   Sets the release train. Default: ${DEFAULT_RELEASE_TRAIN}
+                       Available release trains:
+                       base      LightField with DLPC350 support
+                       dlpc4710  LightField with DLP4710 support
+  <a.b.c[.d]>          Version number. If the fourth element is omitted,
+                       it defaults to 0.
+HERE
     exit 1
 }
 
-if [ -z "$1" ]
+# shellcheck disable=SC1090
+source "${LIGHTFIELD_ROOT}/shared-stuff.sh"
+
+ARGS=$(getopt -n 'change-version-number.sh' -o 't:' -- "${@}")
+# shellcheck disable=SC2181
+if [ ${?} -ne 0 ]
 then
-    red-bar 'Usage: change-version-number.sh <a.b.c[.d]>'
-    exit 1
+    usage
 fi
+eval set -- "$ARGS"
+
+while [ -n "${1}" ]
+do
+    case "${1}" in
+        '-t')
+            RELEASE_TRAIN="${2}"
+            shift
+        ;;
+
+        '--')
+            shift
+            break
+        ;;
+    esac
+    shift
+done
 
-VER=( $(IFS="."; echo $1) )
-if [ "${#VER[@]}" -lt 3 ]
+if [ -z "${1}" ]
 then
-    red-bar 'Too few components to version number -- must be at least three.'
-    exit 1
-elif [ "${#VER[@]}" -eq 3 ]
+    red-bar 'No version number given.'
+    usage
+elif [ -n "${2}" ]
 then
-    VER[3]=0
-elif [ "${#VER[@]}" -gt 4 ]
+    red-bar 'Too many arguments given.'
+    usage
+else
+    VERSION="${1}"
+fi
+
+mapfile -t -d. VER < <(echo -n "${VERSION}")
+COUNT=${#VER[@]}
+
+if [ "${COUNT}" -lt 3 ]
 then
-    red-bar 'Too many components to version number -- must be at most four.'
-    exit 1
+    red-bar 'Too few components in version number -- must be at least three.'
+    usage
+elif [ "${COUNT}" -gt 4 ]
+then
+    red-bar 'Too many components in version number -- must be at most four.'
+    usage
+fi
+
+if [ "${COUNT}" -eq 3 ]
+then
+    VER[3]=0
 fi
+
 STRINGVER="${VER[0]}.${VER[1]}.${VER[2]}.${VER[3]}"
 
-LIGHTFIELD_ROOT="/home/lumen/Volumetric/LightField"
-LIGHTFIELD_SRC="${LIGHTFIELD_ROOT}/src"
+if [ -z "${RELEASE_TRAIN}" ]
+then
+    RELEASE_TRAIN=base
+fi
+
+#cat <<HERE
+#ARCHITECTURE:  ${ARCHITECTURE}
+#RELEASE_TRAIN: ${RELEASE_TRAIN}
+#VERSION:       ${VERSION}
+#STRINGVER:     ${STRINGVER}
+#HERE
 
-cd "${LIGHTFIELD_SRC}"
+cd "${LIGHTFIELD_ROOT}/src"
 
 blue-bar 'Generating src/version.h from src/version.h.in'
 
-sed                                                                                                             \
-    -e s/@@LIGHTFIELD_VERSION_STRING@@/${STRINGVER}/g                                                           \
-    -e  s/@@LIGHTFIELD_VERSION_MAJOR@@/${VER[0]}/g                                                              \
-    -e  s/@@LIGHTFIELD_VERSION_MINOR@@/${VER[1]}/g                                                              \
-    -e  s/@@LIGHTFIELD_VERSION_TEENY@@/${VER[2]}/g                                                              \
-    -e  s/@@LIGHTFIELD_VERSION_BUILD@@/${VER[3]}/g                                                              \
-    < "version.h.in"                                                                                            \
-    > "version.h"
+cp version.h.in version.h
+
+apply-atsign-substitution VERSION_STRING "${STRINGVER}"     version.h
+apply-atsign-substitution VERSION_MAJOR  "${VER[0]}"        version.h
+apply-atsign-substitution VERSION_MINOR  "${VER[1]}"        version.h
+apply-atsign-substitution VERSION_TEENY  "${VER[2]}"        version.h
+apply-atsign-substitution VERSION_BUILD  "${VER[3]}"        version.h
+apply-atsign-substitution RELEASE_TRAIN  "${RELEASE_TRAIN}" version.h
 
 cd "${LIGHTFIELD_ROOT}"
 
 blue-bar 'Updating build and packaging scripts'
-perl                                                                                                            \
-    -lpi                                                                                                        \
-    -e "s/^\s*VERSION=\\d+\\.\\d+\\.\\d+(?:\\.\\d+)?\s*$/VERSION=${STRINGVER}/g;"                               \
-    install-lightfield.sh                                                                                       \
-    make-deb-package.sh                                                                                         \
-    make-upgrade-kit.sh                                                                                         \
-    unpack-kit-manually.sh
-
-perl                                                                                                            \
-    -lpi                                                                                                        \
-    -e "s/lightfield-(debug|release)_\\d+\\.\\d+\\.\\d+(?:\\.\\d+)?_amd64/lightfield-\$1_${STRINGVER}_amd64/g;" \
-    debian/lightfield-debug.postinst                                                                            \
-    debian/lightfield-release.postinst
+
+apply-assignment-substitution ARCHITECTURE  "${ARCHITECTURE}"  shared-stuff.sh
+apply-assignment-substitution RELEASE_TRAIN "${RELEASE_TRAIN}" shared-stuff.sh
+apply-assignment-substitution VERSION       "${STRINGVER}"     shared-stuff.sh
+
+blue-bar 'Done!'

debian/changelog

@@ -1,3 +1,9 @@
+lightfield (1.0.11.0) stable; urgency=medium
+
+  * New: Support for DLP4710 projector.
+
+ -- LightField packager <[email protected]>  Thu, 09 Jan 2020 17:18:06 -0800
+
 lightfield (1.0.10.0) stable; urgency=medium
 
   * Fixed: LightField will now notice a USB stick that was connected before it starts.

debian/debug-control → debian/control.in

@@ -12,13 +12,14 @@ Homepage: https://github.com/VolumetricBio/LightField
 Vcs-Browser: https://github.com/VolumetricBio/LightField
 Vcs-Git: https://github.com/VolumetricBio/LightField.git
 
-Package: lightfield-debug
+Package: lightfield@@RELEASE_TRAIN@@-@@BUILDTYPE@@
 Architecture: any
-Breaks: lightfield-release
-Conflicts: lightfield-release
-Replaces: lightfield-release
+Provides: lightfield-@@BUILDTYPE@@
+Breaks: lightfield-@@ANTIBUILDTYPE@@
+Conflicts: lightfield-@@ANTIBUILDTYPE@@
+Replaces: lightfield-@@ANTIBUILDTYPE@@
 Depends:
- lightfield-common (= ${binary:Version}),
+ lightfield-common@@RELEASE_TRAIN@@ (= ${binary:Version}),
  ${shlibs:Depends},
  ${misc:Depends},
  libhidapi-libusb0 (>> 0.8),
@@ -34,9 +35,10 @@ Recommends:
  fonts-font-awesome (>= 5.0.10)
 Description: Printer software for Volumetric's Lumen X 3D printer - debug version
 
-Package: lightfield-common
+Package: lightfield-common@@RELEASE_TRAIN@@
 Architecture: all
 Multi-Arch: foreign
+Provides: lightfield-common
 Depends:
  ${misc:Depends},
  python3 (>= 3.6),

debian/lightfield-common-dlp4710.install

@@ -0,0 +1,13 @@
+files/etc/apt/trusted.gpg.d/volumetric-keyring.gpg             etc/apt/trusted.gpg.d
+files/etc/sudoers.d/lumen-lightfield                           etc/sudoers.d
+files/home/lumen/.bash_profile                                 home/lumen
+files/home/lumen/.real_bash_profile                            home/lumen
+files/home/lumen/.gnupg/pubring.gpg                            home/lumen/.gnupg
+files/home/lumen/.gnupg/pubring.kbx                            home/lumen/.gnupg
+files/home/lumen/.gnupg/trustdb.gpg                            home/lumen/.gnupg
+files/lib/udev/rules.d/90-dlp4710.rules                        lib/udev/rules.d
+files/usr/share/lightfield/libexec/reset-lumen-arduino-port    usr/share/lightfield/libexec
+files/usr/share/lightfield/libexec/reset-lumen-projector-port  usr/share/lightfield/libexec
+files/usr/share/lightfield/libexec/printrun/*                  usr/share/lightfield/libexec/printrun
+files/usr/share/lightfield/libexec/stdio-shepherd/*            usr/share/lightfield/libexec/stdio-shepherd
+files/usr/share/X11/xorg.conf.d/99-waveshare.conf              usr/share/X11/xorg.conf.d

debian/lightfield-common.postinst

@@ -17,8 +17,6 @@
 # for details, see https://www.debian.org/doc/debian-policy/ or
 # the debian-policy package
 
-
-#echo "+ lightfield-common.postinst: args are $*" 1>&2
 case "$1" in
     configure)
         mkdir -p                                               \

debian/lightfield-common.postrm

@@ -1,5 +1,5 @@
 #!/bin/sh
-# postrm script for lightfield-debug
+# postrm script for lightfield-common
 #
 # see: dh_installdeb(1)
 #
@@ -18,8 +18,6 @@
 # for details, see https://www.debian.org/doc/debian-policy/ or
 # the debian-policy package
 
-
-#echo "+ lightfield-debug.postrm: args are $*" 1>&2
 case "$1" in
     remove)
         rm /etc/apt/sources.list.d/volumetric-lightfield.list 2>/dev/null

debian/lightfield-common.preinst

@@ -1,5 +1,5 @@
 #!/bin/sh
-# preinst script for lightfield-debug
+# preinst script for lightfield-common
 #
 # see: dh_installdeb(1)
 #
@@ -13,8 +13,6 @@
 # for details, see https://www.debian.org/doc/debian-policy/ or
 # the debian-policy package
 
-
-#echo "+ lightfield-debug.preinst: args are $*" 1>&2
 case "$1" in
     install)
         rm /etc/sudoers.d/lumen-lightfield 2>/dev/null