Feature: feature-fix-flatpak-env-and-config-usage (#298)

Makefile

@@ -1053,3 +1053,34 @@ run-black-check:
 .PHONY: run-black
 run-black:
 	black --verbose .
+
+
+.PHONY: reinstall-deps
+reinstall-deps:
+	pip install --force-reinstall -r requirements.txt
+
+.PHONY: install-deps-all
+reinstall-deps-all:
+	pip install --force-reinstall -r requirements.txt; \
+	pip install --force-reinstall -r requirements-dev.txt; \
+
+.PHONY: install-deps-osx
+install-deps-osx:
+	env ARCHFLAGS="-arch x86_64" LDFLAGS="-L/usr/local/opt/openssl/lib" CFLAGS="-I/usr/local/opt/openssl/include" pip install -r requirements.txt
+
+.PHONY: install-deps-all-osx
+install-deps-all-osx:
+	env ARCHFLAGS="-arch x86_64" LDFLAGS="-L/usr/local/opt/openssl/lib" CFLAGS="-I/usr/local/opt/openssl/include" pip install -r requirements.txt; \
+	env ARCHFLAGS="-arch x86_64" LDFLAGS="-L/usr/local/opt/openssl/lib" CFLAGS="-I/usr/local/opt/openssl/include" pip install -r requirements_dev.txt; \
+
+
+
+# NOTE: This assumes that all of your repos live in the same workspace!
+# link_roles:
+# 	# add aliases for dotfiles
+# 	@for file in $(shell find $(CURDIR)/.. -name "*ansible-role*" -type d -print); do \
+# 		echo $$file; \
+# 		f=$$(basename $$file); \
+# 		ln -sfn $$file $(CURDIR)/roles/$f; \
+# 	done; \
+# 	ls -lta $(CURDIR)/roles/; \

hacking/flatpak/enter-env

@@ -3,13 +3,13 @@
 SCARLETT_DIR=$(realpath $(dirname $0)/../../)
 
 function generate_path_and_completion_calls {
-  echo "export PATH=$SCARLETT_DIR/bin/:/app/bin/:/usr/bin/:\$PATH"
+  echo "export PATH=$SCARLETT_DIR/bin:/app/bin:/usr/bin:\$PATH"
 }
 
 RCFILE=$SCARLETT_DIR/.bashrc
 cp ~/.bashrc $RCFILE
 
-echo "export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/app/lib/" >> $RCFILE
+echo "export LD_LIBRARY_PATH=\$LD_LIBRARY_PATH:/app/lib/" >> $RCFILE
 echo "export PS1=[scarlettOS]\ \$PS1" >> $RCFILE
 generate_path_and_completion_calls >> $RCFILE
 

requirements_dev.in

@@ -58,3 +58,4 @@ yapf
 
 # Update packages in a requirements.txt file to latest versions.
 pur
+rope

scarlett_os/common/configure/default.yaml

@@ -6,14 +6,32 @@
 latitude: 40.7056308
 longitude: -73.9780034
 
+# pocketsphinx config options source: https://github.com/cmusphinx/pocketsphinx/blob/1fdc9ccb637836d45d40956e745477a2bd3b470a/doc/pocketsphinx_continuous.1
 pocketsphinx:
     hmm: /home/pi/.virtualenvs/scarlett_os/share/pocketsphinx/model/en-us/en-us
     lm: /home/pi/dev/bossjones-github/scarlett_os/static/speech/lm/1473.lm
     dict: /home/pi/dev/bossjones-github/scarlett_os/static/speech/dict/1473.dic
+    # Silence word transition probability
     silprob: 0.1
-    wip: 1e-4
-    bestpath: 0
+    # ********************************************************
+    # FIXME: ????? THIS IS THE ORIG VALUE, do we need too set it back? 8/5/2018 # wip: 1e-4
+    # Enable Graph Search | Boolean. Default: true
+    # ********************************************************
+    # Word insertion penalty
+    wip: 0.0001
     device: plughw:CARD=Device,DEV=0
+    # ********************************************************
+    # FIXME: ????? THIS IS THE ORIG VALUE, do we need too set it back? 8/5/2018 # bestpath: 0
+    # Enable Graph Search | Boolean. Default: true
+    # ********************************************************
+    bestpath: True
+    # Enable Flat Lexicon Search | Default: true
+    fwdflat: True
+    # Evaluate acoustic model every N frames |  Integer. Range: 1 - 10 Default: 1
+    dsratio: 1
+    # Maximum number of HMMs searched per frame | Integer. Range: 1 - 100000 Default: 30000
+    maxhmmpf: 3000
+
 
 # Impacts weather/sunrise data
 elevation: 665