From d760ba62ccd4ce99b4884fa006e7433312f83309 Mon Sep 17 00:00:00 2001
From: stuckatmarine <mwd467@mun.ca>
Date: Sun, 3 Nov 2019 19:44:58 -0330
Subject: [PATCH 1/7] move pi setup commands to Dockerfile to get caching

---
 .../SetupScriptPlusDockerfile/Dockerfile      |  19 ++++++++++++++++--
 .../SetupScriptPlusDockerfile/README.md       |  13 +++++-------
 .../SetupScriptPlusDockerfile/a.out           | Bin 0 -> 8596 bytes
 .../{piSetup.sh => clangSetup.sh}             |  18 -----------------
 .../SetupScriptPlusDockerfile/helloTest.sh    |   5 +++++
 .../testCompile.sh.bak                        |   5 +++++
 .../SetupScriptPlusDockerfile/test_main.cpp   |   2 +-
 7 files changed, 33 insertions(+), 29 deletions(-)
 create mode 100644 OnPod/FlightComputer/SetupScriptPlusDockerfile/a.out
 rename OnPod/FlightComputer/SetupScriptPlusDockerfile/{piSetup.sh => clangSetup.sh} (64%)
 create mode 100644 OnPod/FlightComputer/SetupScriptPlusDockerfile/helloTest.sh
 create mode 100644 OnPod/FlightComputer/SetupScriptPlusDockerfile/testCompile.sh.bak

diff --git a/OnPod/FlightComputer/SetupScriptPlusDockerfile/Dockerfile b/OnPod/FlightComputer/SetupScriptPlusDockerfile/Dockerfile
index 2d1d0cb..63a4684 100644
--- a/OnPod/FlightComputer/SetupScriptPlusDockerfile/Dockerfile
+++ b/OnPod/FlightComputer/SetupScriptPlusDockerfile/Dockerfile
@@ -1,5 +1,20 @@
 FROM raspbian/stretch:latest
 
-COPY piSetup.sh .
+RUN sudo apt update -y && \
+        sudo apt upgrade -y
 
-RUN ./piSetup.sh
+RUN sudo apt-get install -y \
+        git \
+        make \
+        curl \
+        xz-utils \
+        libstdc++6-4.6-dev
+
+COPY clangSetup.sh /home
+COPY helloTest.sh /home
+RUN sed -i.bak 's/\r$//' /home/clangSetup.sh && \
+        ./home/clangSetup.sh && \
+        sed -i.bak 's/\r$//' /home/helloTest.sh && \
+        ./home/helloTest.sh
+
+#RUN echo 'alias helloTest="clang++ /home/data/SetupScriptPlusDockerfile/test_main.cpp; ./home/data/SetupScriptPlusDockerfile/a.out"' >> ~/.bashrc
diff --git a/OnPod/FlightComputer/SetupScriptPlusDockerfile/README.md b/OnPod/FlightComputer/SetupScriptPlusDockerfile/README.md
index 1d64e7c..474e575 100644
--- a/OnPod/FlightComputer/SetupScriptPlusDockerfile/README.md
+++ b/OnPod/FlightComputer/SetupScriptPlusDockerfile/README.md
@@ -3,13 +3,12 @@ install docker // differes per platform, google it
 
 cd into folder with Dockerfile
 
-`docker build -t pi_fc:v1 .` 
+`docker build -t pi_fc:vb .` 
 
-`docker run -it -v path-to-FlightComputer-Dir:/home/data pi_fc:v1 /bin/bash` 
+`docker run -it -v /c/hyperloop/comp5-software/OnPod/FlightComputer:/home/data pi_fc:vd --entrypoint /bin/bash helloTest` 
   
 // path-to-FlightComputer-Dir = /c/hyperloop/comp5-software/OnPod/FlightComputer on my windows machine
   
-
 # General docker cmds
 `docker images -a` // list images 
 
@@ -17,14 +16,12 @@ cd into folder with Dockerfile
 
 `docker run -it pi_fc:v1 bin/bash` // run container and open a bash terminal 
   
-
 # Fix for script interpreter error // doz2unix equivalent for pi
-`sed -i.bak 's/\r$//' piSetup.sh`
+`sed -i.bak 's/\r$//' fileToFix.sh`
 
 # Remote SSH setup
-turn on ssh via gui 
+`sudo systemctl enable ssh`
+`sudo systemctl start ssh`
 
 `ifconfig` // to get ip address
-
 Default: user=pi password=raspberry
-
diff --git a/OnPod/FlightComputer/SetupScriptPlusDockerfile/a.out b/OnPod/FlightComputer/SetupScriptPlusDockerfile/a.out
new file mode 100644
index 0000000000000000000000000000000000000000..3081e0aee834929028f310ba739f7aaba3996ae6
GIT binary patch
literal 8596
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
P#Wfr_AL~JAwcdXL%vEVR

literal 0
HcmV?d00001

diff --git a/OnPod/FlightComputer/SetupScriptPlusDockerfile/piSetup.sh b/OnPod/FlightComputer/SetupScriptPlusDockerfile/clangSetup.sh
similarity index 64%
rename from OnPod/FlightComputer/SetupScriptPlusDockerfile/piSetup.sh
rename to OnPod/FlightComputer/SetupScriptPlusDockerfile/clangSetup.sh
index 050f4c5..7f10ff4 100644
--- a/OnPod/FlightComputer/SetupScriptPlusDockerfile/piSetup.sh
+++ b/OnPod/FlightComputer/SetupScriptPlusDockerfile/clangSetup.sh
@@ -1,16 +1,4 @@
 #!/bin/bash
-# PI setup script
-echo 'Starting pi setup script'
-
-sudo apt update -y
-sudo apt upgrade -y
-
-sudo apt-get install -y \
-    git \
-    make \
-    curl \
-    xz-utils
-
 # clang++ setup
 cd ~
 wget http://releases.llvm.org/9.0.0/clang+llvm-9.0.0-armv7a-linux-gnueabihf.tar.xz
@@ -22,9 +10,3 @@ echo 'export PATH=/usr/local/clang_9.0.0/bin:$PATH' >> .bashrc
 echo 'export LD_LIBRARY_PATH=/usr/local/clang_9.0.0/lib:$LD_LIBRARY_PATH' >> .bashrc
 . .bashrc
 clang++ --version
-# end clang setup
-
-sudo systemctl enable ssh
-sudo systemctl start ssh
-
-echo 'Done pi setup script'
diff --git a/OnPod/FlightComputer/SetupScriptPlusDockerfile/helloTest.sh b/OnPod/FlightComputer/SetupScriptPlusDockerfile/helloTest.sh
new file mode 100644
index 0000000..d96b41f
--- /dev/null
+++ b/OnPod/FlightComputer/SetupScriptPlusDockerfile/helloTest.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+## custom aliases
+# test c++ compilation
+clang++ /home/data/SetupScriptPlusDockerfile/test_main.cpp
+./home/data/SetupScriptPlusDockerfile/a.out
diff --git a/OnPod/FlightComputer/SetupScriptPlusDockerfile/testCompile.sh.bak b/OnPod/FlightComputer/SetupScriptPlusDockerfile/testCompile.sh.bak
new file mode 100644
index 0000000..c28a643
--- /dev/null
+++ b/OnPod/FlightComputer/SetupScriptPlusDockerfile/testCompile.sh.bak
@@ -0,0 +1,5 @@
+#!/bin/bash
+# test c++ compilation
+cd /home/data/SetupScriptPlusDockerfile
+clang++ test_main.cpp
+./a.out
diff --git a/OnPod/FlightComputer/SetupScriptPlusDockerfile/test_main.cpp b/OnPod/FlightComputer/SetupScriptPlusDockerfile/test_main.cpp
index 0ede7c3..841d811 100644
--- a/OnPod/FlightComputer/SetupScriptPlusDockerfile/test_main.cpp
+++ b/OnPod/FlightComputer/SetupScriptPlusDockerfile/test_main.cpp
@@ -2,7 +2,7 @@
 
 int main()
 {
-    std::cout << "Hello Paradigm\n";
+    std::cout << "\n---- Hello Paradigm!!! ----\n\n";
 
     return 0;
 }

From 3e9c2135d999dc47e43b8549fe4db8a0a02439fd Mon Sep 17 00:00:00 2001
From: stuckatmarine <mwd467@mun.ca>
Date: Sat, 16 Nov 2019 15:44:30 -0330
Subject: [PATCH 2/7] clang install cached, helloTest.sh added to /usr/loca/bin

---
 .../SetupScriptPlusDockerfile/Dockerfile       | 18 ++++++++++++------
 .../SetupScriptPlusDockerfile/README.md        |  7 ++++---
 .../SetupScriptPlusDockerfile/helloTest.sh     |  4 +++-
 3 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/OnPod/FlightComputer/SetupScriptPlusDockerfile/Dockerfile b/OnPod/FlightComputer/SetupScriptPlusDockerfile/Dockerfile
index 63a4684..015df53 100644
--- a/OnPod/FlightComputer/SetupScriptPlusDockerfile/Dockerfile
+++ b/OnPod/FlightComputer/SetupScriptPlusDockerfile/Dockerfile
@@ -11,10 +11,16 @@ RUN sudo apt-get install -y \
         libstdc++6-4.6-dev
 
 COPY clangSetup.sh /home
-COPY helloTest.sh /home
-RUN sed -i.bak 's/\r$//' /home/clangSetup.sh && \
-        ./home/clangSetup.sh && \
-        sed -i.bak 's/\r$//' /home/helloTest.sh && \
-        ./home/helloTest.sh
+RUN cd ~ && \
+        wget http://releases.llvm.org/9.0.0/clang+llvm-9.0.0-armv7a-linux-gnueabihf.tar.xz && \
+        tar -xvf clang+llvm-9.0.0-armv7a-linux-gnueabihf.tar.xz && \
+        rm clang+llvm-9.0.0-armv7a-linux-gnueabihf.tar.xz && \
+        mv clang+llvm-9.0.0-armv7a-linux-gnueabihf clang_9.0.0 && \
+        sudo mv clang_9.0.0 /usr/local && \
+        echo 'export PATH=/usr/local/clang_9.0.0/bin:$PATH' >> ~/.bashrc && \
+        echo 'export LD_LIBRARY_PATH=/usr/local/clang_9.0.0/lib:$LD_LIBRARY_PATH' >> ~/.bashrc && \
+        . ~/.bashrc && \
+        clang++ --version 
 
-#RUN echo 'alias helloTest="clang++ /home/data/SetupScriptPlusDockerfile/test_main.cpp; ./home/data/SetupScriptPlusDockerfile/a.out"' >> ~/.bashrc
+COPY helloTest.sh /usr/local/bin/ 
+RUN sed -i.bak 's/\r$//' /usr/local/bin/helloTest.sh
diff --git a/OnPod/FlightComputer/SetupScriptPlusDockerfile/README.md b/OnPod/FlightComputer/SetupScriptPlusDockerfile/README.md
index 474e575..33ac3c9 100644
--- a/OnPod/FlightComputer/SetupScriptPlusDockerfile/README.md
+++ b/OnPod/FlightComputer/SetupScriptPlusDockerfile/README.md
@@ -3,11 +3,12 @@ install docker // differes per platform, google it
 
 cd into folder with Dockerfile
 
-`docker build -t pi_fc:vb .` 
+`docker build -t pi_fc:v1 .` 
 
-`docker run -it -v /c/hyperloop/comp5-software/OnPod/FlightComputer:/home/data pi_fc:vd --entrypoint /bin/bash helloTest` 
+`docker run -it -v <path-to-flight-computer-dir>:/home/data --entrypoint /bin/bash pi_fc:v1` 
   
-// path-to-FlightComputer-Dir = /c/hyperloop/comp5-software/OnPod/FlightComputer on my windows machine
+// my windows machine
+// `docker run -it -v /c/hyperloop/comp5-software/OnPod/FlightComputer:/home/data --entrypoint /bin/bash pi_fc:v1` 
   
 # General docker cmds
 `docker images -a` // list images 
diff --git a/OnPod/FlightComputer/SetupScriptPlusDockerfile/helloTest.sh b/OnPod/FlightComputer/SetupScriptPlusDockerfile/helloTest.sh
index d96b41f..2912ec2 100644
--- a/OnPod/FlightComputer/SetupScriptPlusDockerfile/helloTest.sh
+++ b/OnPod/FlightComputer/SetupScriptPlusDockerfile/helloTest.sh
@@ -1,5 +1,7 @@
 #!/bin/bash
 ## custom aliases
 # test c++ compilation
+. ~/.bashrc
+cd ~
 clang++ /home/data/SetupScriptPlusDockerfile/test_main.cpp
-./home/data/SetupScriptPlusDockerfile/a.out
+./a.out

From f9999efc99888c25a246866587ab0a6f986ca2f6 Mon Sep 17 00:00:00 2001
From: stuckatmarine <mwd467@mun.ca>
Date: Sat, 16 Nov 2019 15:45:12 -0330
Subject: [PATCH 3/7] old a.out and .bak files removed, README updated with new
 run command

---
 OnPod/FlightComputer/SetupScriptPlusDockerfile/README.md | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/OnPod/FlightComputer/SetupScriptPlusDockerfile/README.md b/OnPod/FlightComputer/SetupScriptPlusDockerfile/README.md
index 33ac3c9..e6ea026 100644
--- a/OnPod/FlightComputer/SetupScriptPlusDockerfile/README.md
+++ b/OnPod/FlightComputer/SetupScriptPlusDockerfile/README.md
@@ -5,11 +5,13 @@ cd into folder with Dockerfile
 
 `docker build -t pi_fc:v1 .` 
 
-`docker run -it -v <path-to-flight-computer-dir>:/home/data --entrypoint /bin/bash pi_fc:v1` 
+`docker run -it -v <path-to-flight-computer-dir>:/home/data --entrypoint helloTest.sh pi_fc:v1` 
   
 // my windows machine
-// `docker run -it -v /c/hyperloop/comp5-software/OnPod/FlightComputer:/home/data --entrypoint /bin/bash pi_fc:v1` 
-  
+// `docker run -it -v /c/hyperloop/comp5-software/OnPod/FlightComputer:/home/data --entrypoint helloTest.sh  pi_fc:v1`
+// to run with bash shell open
+// `docker run -it -v /c/hyperloop/comp5-software/OnPod/FlightComputer:/home/data --entrypoint /bin/bash  pi_fc:v1`
+
 # General docker cmds
 `docker images -a` // list images 
 

From b492b066bcec5bdc80bf21ed2a20c3cd051e73e3 Mon Sep 17 00:00:00 2001
From: stuckatmarine <mwd467@mun.ca>
Date: Sat, 16 Nov 2019 16:38:33 -0330
Subject: [PATCH 4/7] add chmod +x to helloTest.sh

---
 OnPod/FlightComputer/SetupScriptPlusDockerfile/Dockerfile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/OnPod/FlightComputer/SetupScriptPlusDockerfile/Dockerfile b/OnPod/FlightComputer/SetupScriptPlusDockerfile/Dockerfile
index 015df53..fabd643 100644
--- a/OnPod/FlightComputer/SetupScriptPlusDockerfile/Dockerfile
+++ b/OnPod/FlightComputer/SetupScriptPlusDockerfile/Dockerfile
@@ -23,4 +23,5 @@ RUN cd ~ && \
         clang++ --version 
 
 COPY helloTest.sh /usr/local/bin/ 
-RUN sed -i.bak 's/\r$//' /usr/local/bin/helloTest.sh
+RUN sed -i.bak 's/\r$//' /usr/local/bin/helloTest.sh && \
+        chmod +X /usr/local/bin/helloTest.sh

From c6ed65702f40e1eb80826d0d1b32a5dc15a36fa0 Mon Sep 17 00:00:00 2001
From: stuckatmarine <mwd467@mun.ca>
Date: Sat, 23 Nov 2019 12:25:44 -0330
Subject: [PATCH 5/7] vs code taskrunner and FC compiling added

---
 OnPod/FlightComputer/.vscode/tasks.json       |  34 ++++++++++++++++++
 OnPod/FlightComputer/README.md                |  11 ++++++
 .../SetupScriptPlusDockerfile/a.out           | Bin 8596 -> 0 bytes
 .../testCompile.sh.bak                        |   5 ---
 4 files changed, 45 insertions(+), 5 deletions(-)
 create mode 100644 OnPod/FlightComputer/.vscode/tasks.json
 create mode 100644 OnPod/FlightComputer/README.md
 delete mode 100644 OnPod/FlightComputer/SetupScriptPlusDockerfile/a.out
 delete mode 100644 OnPod/FlightComputer/SetupScriptPlusDockerfile/testCompile.sh.bak

diff --git a/OnPod/FlightComputer/.vscode/tasks.json b/OnPod/FlightComputer/.vscode/tasks.json
new file mode 100644
index 0000000..d6ae241
--- /dev/null
+++ b/OnPod/FlightComputer/.vscode/tasks.json
@@ -0,0 +1,34 @@
+{
+    // See https://go.microsoft.com/fwlink/?LinkId=733558
+    // for the documentation about the tasks.json format
+    "version": "2.0.0",
+    "tasks": [
+        {
+            "label": "echoTest",
+            "type": "shell",
+            "command": "echo 'Hello taskrunner test good.'",
+            "group": {
+                "kind": "build",
+                "isDefault": true
+            }
+        },
+        {
+            "label": "build FC Image",
+            "type": "shell",
+            "command": "docker build -t pi_fc:v1 SetupScriptPlusDockerfile/.",
+            "group": {
+                "kind": "build",
+                "isDefault": true
+            }
+        },
+        {
+            "label": "compile and run FC HelloWorld",
+            "type": "shell",
+            "command": "docker run -it -v /c/hyperloop/comp5-software/OnPod/FlightComputer:/home/data --entrypoint helloTest.sh  pi_fc:v1",
+            "group": {
+                "kind": "build",
+                "isDefault": true
+            }
+        }
+    ]
+}
diff --git a/OnPod/FlightComputer/README.md b/OnPod/FlightComputer/README.md
new file mode 100644
index 0000000..7e484ea
--- /dev/null
+++ b/OnPod/FlightComputer/README.md
@@ -0,0 +1,11 @@
+# Flight Computer devlopment
+- Ensure DOcker is installed and running on your machine
+## Taskrunner setup for VsCode
+- install VsCode `Tasks' extension by actboy168
+- open comp5-software\OnPod\FlightComputer folder with VsCode
+- replace .vscode/tasks.json line 28 `compile and run RC HelloWorld` -> `/c/hyperloop/comp5-software/OnPod/FlightComputer` with your path
+- Try task buttons in blue taskbar at bottom of VsCode window:
+    `echoTest` // should print `Hello taskrunner test good.`
+    `build FC Image` // should build FC image `pi_fc:v1`
+    `compile and run RC HellowWorld` // should print `---- Hello Paradigm!!! ----`
+
diff --git a/OnPod/FlightComputer/SetupScriptPlusDockerfile/a.out b/OnPod/FlightComputer/SetupScriptPlusDockerfile/a.out
deleted file mode 100644
index 3081e0aee834929028f310ba739f7aaba3996ae6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8596
zcmeHMZ)hCH6`$3e?6WL6vMt+6>ZI$&2{!hvPSM$M{<KKeA6tp+xRxB$ep&DRk+jME
z<95%HAP`ehn$QHBrll#R)j`@~XrV6TLq6C=&^n|k1Vd7nd?}LUqfS#(1=7T!kn8U^
zv!krf4uq0VMGw83_vXEMGxPTCXx`gr21kYr!w?#p#127js@V`pv{$y`Cn}ng!W3&D
zyGz_jd1-!?5c8`Hi6&Ht(EuTmW0TM%nixQA4&)KEW8lXyFY$KpM2<(dL^J_qi0Ep_
zfE-ULb*`=>Hc1>o$2^epQr?8$>yTfEoEU?QNV#5P349526HW9Jwd|WUKLhqA;P`gn
zQOLvdcfuA?ufHqjrn+*Oc+M?UrsGaIKQ&=_MXQGfsY4r37Y7a>!><tZ2iHs>y%yL4
zTmw{lR^wveIW7!b6I>(5b1ac_&>m&aW433V#69ezE$Y5<>95zGzPA3hYwz{%>Ug=e
z|Ml128L<w3{iB_Oe;I-J2KZ`-GeMsZ@f$#MFB(h`a+5&^<$nukHsr4~@K1u@*WM&v
zK)YUaiWeK?A2je4@G-<Df%XJ^?fIGXu3dETUSZpl`C`HLe5dT&wy+;LVIR#-x}Kjc
z_vakX%X-58_NbrphDZJG?(~#Xw*9i>`rdGQaPTPldQy((rtPBVm$OcOI6Y<$j_$FK
zJero{lIdc_2X%PV-{%%R8_L<_aKZHlx(83(s=uH8SYuu-57cBjZF}Upu~;YTq+GjF
zc*-qg>~yJQm&ysMr<J;sDwZ*wot}1V$Ini?WGD_cn0MTQIMCm3_gH(xfsx_;{o~`H
zlZv+Q10{h^KZ2NO!Y|th;>ZxcMK7P92|RZ148krdB0+#rPEyPLoj*YMMa0^W{GC9K
zMs&Dt8>4PZAm4#!x(UI^XWN0GYel;m0ocwK%jsZ?0PSQ8%UjtZ;7zs|x1B9sf>>|-
zy>AHde(dD=tI_#*EjmA2TQ`4dKDPAx+5i{x`l-w9Z@zGO;6LYTntnJ$Cqwk^5WPJ_
zZw=8Mqz}g5Ydc$Ah+RB%`GPPOn?&#8wR-*i*e0=PwD&GX#fvpVR2MF^Lk2!!qBVOL
z7ofBDVs$}0cmArj@jm(_f3~_P=Bta*_Mcs8Gph?x6MGTyTKn8=EjkykwTjtVYht!`
z3HpBmp2gYP0X)JM{T=3PEs{7j-(<e@cbq_rch$R$x9atOjI<aymEl+D2=nb4WrkUe
z2=fok&{_B+{Aj{9{U{QrAs=0YFJn?apnIT4|9*(GQbK6|;N^bz1%8;@tbFha_th>I
zMc@m)@1+Bnr&L`yczm{Y@W^a!)$vpF%}0R8hvtow)rF?h)rIFVcE~xqu=Kt2G0|IH
zG<u)C98LV_${P43)?Qs$4c~H2QStb~$MyOh(7XB^4)CXe+!Oc0_41@|i37}o*<7w@
z9&yS}#+}S>+qTVQcMIYt`Dy)`lh6M2<Vmy)&Fyu?kE0DjRc?9ZXT<|69$4|fiU(Fa
zu;PLLKM!0%&M*#q14!Vn#$N_B@5Aily|xutjT!=%TJb9GV9ZaMZ+-<W^RPRBOW;*{
zta7f?$R+>%X}x$6Ev~v^uE~%&SUXzgbK78?xgGD+n}7sdb<x3_Iqu594&Zv=7T^@-
zCq0f<=UN-VbN)~3_2PA0*6V0#V+rkLeR&7}MS=OThTmYG&qJ-l7753L=8l1E%5@56
z(%Ne!<9l|MOK$g0#ffyzDNLFtvSrUL7R(2%gq1LNO!<E4!LF`J*N;~`3%RjVE?UL%
zWS3to=8%ZFg{~*Eg(uyD7x&U-x8!>kbj=Jhvee#`Gm*NlyXS%Kp6>gT52UjxC)1P7
zB=+sSFG2bJsl7Wz-$PiNOsIs>4YIlK=ppmO{bE(i>b{t<rl}>;YOFUlL^m28#wKG+
zq|><FxT9&S@ipUKKJ}Y{wFv^VB?4;&1ZGeKK5qhZDgvK7AtEzyK32^$8dN;6jmW4F
zLO-vF%*s)(2%cX=K4JCTl|Cy0DjpQiXj1X1ct(|w&rb1-Uc^!m>k%2nDvp&L#Sy?c
z#5ExzZj&wRIf@Um`qi3e6sq`Fa+!I{_*XomQV5+tL}V1J`iqhW(T+G*{AStiUgjC?
zDpzD1K^-6r5&8Cg))T?or&gx=qT+-4BOvwjVIF!2JZo4A+63iSgZ=RhB>!@QT>C@7
zAC&9$@ohY!49Q>4NBh4BjsHoAZ-T!$el8@ZKF<>cYvuZQt|(Y1eicw`wEZ&;`mcrb
zS<liy{eOYc&s$*r56Lg<w~0@{^ZetJ<@z>b`~~=*W(@fI9uOQq5Xc{Dus;M|KVM{|
za({{7`O!bzpFUeT|0wh|ul+F}@`npKb5l;k`ROm7rwTTTX$UlLh>g-d&u|58Viu(4
zwf)x6erb>AwSo=e*U;BIPgBY{zk*KjrZ$ZZ?SJOp3e@vF6XLmF=IC19=r7tA!TZA#
z{Ss9Jo~JtH+Mn>exB|K6>EAGLJxh@5v)aIak59mB|F9C)g01NNk-w8$3-)J-&2m2d
ze(U&OT3)|;ALf>M761PX`H%bM{{{uE(%!icPx)Mk@4@`ZVE%T*M<<R*{XUuCAB3Fm
z8!J=m@xBd%XS_ZPegop?F!(o?$9Iay!RvTi-?T*(U{Ak48^k)1ZqP4+*TB;%(;(l9
z@%nt=d?y?9_h75~ecgcn+807{6ZYN>@wEQ|_;4LF2K%4wzf;z<^#19OX6T3acXxw+
z7kCY{KL(!hcpNm>n*q=GqyNbJ4f;Q9;C~n5O^lfX9}C_md75`sys|7@qdwV%nsrdU
zo-9;YqMVxO!aw>h%L@K(rI0TB-BwX-&xq}g_)^TdFqd|6Is2)s^Q1jd_;RckxJbuJ
z@CP;610#>^?;EjguadHdZ9nVzHp{9Os<E=<JF?HV-J**cuPnq)+mpFs%E{R$P&$^q
z*th3bCMGPDi0w!EkJ=-{qhqW++nJ(P&iKW$XFHW?kuK&-xvZbfSbO&FOWaz?o`7N7
zDVLoYJ6rI}Gh(9b<g<3BlF!dzNQje5xIs0Wn}~B=R&f-nLr41#4cdc;2jqgdx_}<|
z*5STG!~Ia9^0I}@jUBR%zU-sNhK5E5$Lz7b{Ud|eUpC|Tj<AOxLp3_%7VL_b%?MeN
zwz2Gta)DR0r<_72mxbY!=LG^;*zWC>C2Lux{vV6-fr+5%eamWpsCeEup{(XNn2?KH
z{(N9_i>lZjtUvI`&0hdm>2I_pOZ925q5>r--IM17hQV8v|6wC2=-*W8zhV6iA3APc
z5I;%WxFBJ9GkM=hq4mqEozj$Bz$cQDunI*#YxV6Pj{DA}u<-g@Q;s(!tjtUSgH`L7
zl_a>~-@w?Am9shOE25P1g~b>X7QSHMSMJ>^7iIKVxTIV7u#uS-R(487wo+Fisnj+7
zL>ks%*~z<U%vyvsWd)HXEWBEIye>l8bbP<;rYd-!aoT+`U~b3%a6H=8w@LL~QjgaE
z{q9DG{^rIzC%+|{S_v)BWWpXGZ~nB$T;VkIdV@YRQjfY!Rz5=hMm^>b7e7aj`3-OS
z)MIYJe~)KD^E)4gNPE2B^#gg_Q;#|59EfdH2tbpMf@l6nJ?0{pF^D&Fm941pl#K(K
zZ<1z?avgfdL33WtqxU-rnwg3mgS)^u1YD1{M?L1QB_Q?o1DWGaLBQOXdYoVD&4A`w
zIS>CAS0PZD4LShSBltkAr}9_Wl@j$sJ>oM!t;f4=2PUj)X9PNE#CJn_ykoqI1#sOO
z^t|6k2ZwXNyvv+}-rZUWt=4-9H1tZ}LCZVXJoHS^Z9sz7`#ETBPu>*~WLg&1I|GIp
z9DUC_AHPL6u8-qh1v0av9`A}v&}+0ueh$casmD9$hqus!NL&D7=~7R9TgSW@$UXvX
zaUE{~wLKZ62!h?{(?C7q+d!?yyU}jwHSU9B-UYIs>*F0O3BA*xHRv(?)=YbeKtR18
zYo$O&IX<A#R!NKg3_adEHBg7Zmd{p0jA<~Q32Q#bfZPLy%2?*wG{lg;)<PZH9*2jz
P#Wfr_AL~JAwcdXL%vEVR

diff --git a/OnPod/FlightComputer/SetupScriptPlusDockerfile/testCompile.sh.bak b/OnPod/FlightComputer/SetupScriptPlusDockerfile/testCompile.sh.bak
deleted file mode 100644
index c28a643..0000000
--- a/OnPod/FlightComputer/SetupScriptPlusDockerfile/testCompile.sh.bak
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-# test c++ compilation
-cd /home/data/SetupScriptPlusDockerfile
-clang++ test_main.cpp
-./a.out

From 667a6b44b54e6f820fce632282eccda7f5149bcb Mon Sep 17 00:00:00 2001
From: stuckatmarine <mwd467@mun.ca>
Date: Sat, 23 Nov 2019 12:30:19 -0330
Subject: [PATCH 6/7] clarify path to be replaced in readme for compiling

---
 OnPod/FlightComputer/README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/OnPod/FlightComputer/README.md b/OnPod/FlightComputer/README.md
index 7e484ea..30f53c2 100644
--- a/OnPod/FlightComputer/README.md
+++ b/OnPod/FlightComputer/README.md
@@ -1,9 +1,9 @@
 # Flight Computer devlopment
-- Ensure DOcker is installed and running on your machine
+- Ensure Docker is installed and running on your machine
 ## Taskrunner setup for VsCode
 - install VsCode `Tasks' extension by actboy168
 - open comp5-software\OnPod\FlightComputer folder with VsCode
-- replace .vscode/tasks.json line 28 `compile and run RC HelloWorld` -> `/c/hyperloop/comp5-software/OnPod/FlightComputer` with your path
+- replace the folder bath in .vscode/tasks.json line 28 command:`compile and run RC HelloWorld`, with your path. replace this -> `/c/hyperloop/comp5-software/OnPod/FlightComputer` 
 - Try task buttons in blue taskbar at bottom of VsCode window:
     `echoTest` // should print `Hello taskrunner test good.`
     `build FC Image` // should build FC image `pi_fc:v1`

From 2984d0169714f4701710194e85ff9c0cd6b9ae37 Mon Sep 17 00:00:00 2001
From: stuckatmarine <mwd467@mun.ca>
Date: Sat, 23 Nov 2019 16:31:56 -0330
Subject: [PATCH 7/7] fix -x error in hello script chmod

---
 OnPod/FlightComputer/SetupScriptPlusDockerfile/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OnPod/FlightComputer/SetupScriptPlusDockerfile/Dockerfile b/OnPod/FlightComputer/SetupScriptPlusDockerfile/Dockerfile
index fabd643..6cdd7e3 100644
--- a/OnPod/FlightComputer/SetupScriptPlusDockerfile/Dockerfile
+++ b/OnPod/FlightComputer/SetupScriptPlusDockerfile/Dockerfile
@@ -24,4 +24,4 @@ RUN cd ~ && \
 
 COPY helloTest.sh /usr/local/bin/ 
 RUN sed -i.bak 's/\r$//' /usr/local/bin/helloTest.sh && \
-        chmod +X /usr/local/bin/helloTest.sh
+        chmod +x /usr/local/bin/helloTest.sh