[scripts] fix picture_snap.sh

apertus-open-source-cinema · Nov 23, 2019 · d24024d · d24024d
1 parent ae979c9
commit d24024d
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 3 deletions.
diff --git a/makefiles/in_chroot/requirements_pacman.txt b/makefiles/in_chroot/requirements_pacman.txt
@@ -16,6 +16,9 @@ devmem
 i2c-tools
 cmake
 bc
+## axiom-picture-snap.sh
+dcraw
+imagemagick
 # control daemon uses ninja now
 ninja
 
@@ -41,3 +44,9 @@ mlocate
 stress
 screen
 minicom
+
+# wifi utilities
+iw
+wpa_supplicant
+networkmanager
+dnsmasq
diff --git a/software/axiom-control-daemon b/software/axiom-control-daemon
diff --git a/software/scripts/picture_snap.sh b/software/scripts/picture_snap.sh
@@ -4,6 +4,7 @@
 #
 cd $(dirname $(realpath $0))    # change into script dir
 
+. ./cmv.func
 
 PARAMS=$1
 IMAGENAME=`date +%Y%m%d_%H%M%S`
@@ -14,6 +15,7 @@ echo /opt/picture-snap/$IMAGENAME/$IMAGENAME.raw12
 fil_reg 15 0
 
 #capture frame
+../sensor_tools/snap/snap -e $PARAMS -2 -r -b > /dev/null
 ../sensor_tools/snap/snap -e $PARAMS -2 -r -b > /opt/picture-snap/$IMAGENAME/$IMAGENAME.raw12
 
 echo "raw12 written"
@@ -22,7 +24,7 @@ echo "raw12 written"
 fil_reg 15 0x01000100
 
 #convert to DNG
-./raw2dng /opt/picture-snap/$IMAGENAME/$IMAGENAME.raw12 --swap-lines 
+raw2dng /opt/picture-snap/$IMAGENAME/$IMAGENAME.raw12 --swap-lines
 
 echo "DNG written"
 
@@ -36,7 +38,7 @@ convert /opt/picture-snap/$IMAGENAME/$IMAGENAME.ppm /opt/picture-snap/$IMAGENAME
 
 echo "JPG written"
 
-md5sum /root/darkframe-x1.pgm >  /opt/picture-snap/$IMAGENAME/$IMAGENAME.meta
+# md5sum /root/darkframe-x1.pgm >  /opt/picture-snap/$IMAGENAME/$IMAGENAME.meta
 
 
 echo "all done!"
+3 −6		.circleci/config.yml
+1 −0		API_WS/CMakeLists.txt
+2 −2		API_WS/WSServer.cpp
+28 −25		Adapter/CMV12000Adapter.cpp
+4 −11		Adapter/CMV12000Adapter.h
+5 −5		Adapter/IDaemonModule.h
+4 −14		Adapter/MemoryAdapter.h
+2 −3		Adapter/MemoryAdapterDummy.h
+2 −1		CLI/CMakeLists.txt
+10 −32		CLI/Main.cpp
+6 −6		CMakeLists.txt
+59 −96		Daemon/Daemon.cpp
+7 −17		Daemon/Daemon.h
+1 −4		Daemon/Main.cpp
+0 −26		Daemon/description.json
+0 −21		Log/DefaultLogger.cpp
+0 −20		Log/DefaultLogger.h
+2 −15		Log/ILogger.h
+20 −0		Log/JournalLogger.h
+0 −62		Log/Logger.cpp
+0 −35		Log/Logger.h
+9 −1		UnitTests/CMakeLists.txt
+6 −3		systemd/axiom.service
+9 −0		systemd/axiom.socket
+3 −1		systemd/install_daemon.sh