summaryrefslogtreecommitdiff
path: root/cont
diff options
context:
space:
mode:
authorHaoran S. Diao <0@hairydiode.xyz>2019-01-24 14:14:35 -0500
committerHaoran S. Diao <0@hairydiode.xyz>2019-01-24 14:14:35 -0500
commit66138630f58b54b577807a21cf80a551d6bbf433 (patch)
tree2ebab451b9cba1a688046bec5e0ed4a92e0ff788 /cont
parent7fbc5a886723ca8f7547ba80bf8da07417fefc5c (diff)
added workflow page
Diffstat (limited to 'cont')
-rw-r--r--cont/csc-workflow.html74
1 files changed, 74 insertions, 0 deletions
diff --git a/cont/csc-workflow.html b/cont/csc-workflow.html
new file mode 100644
index 0000000..3f27411
--- /dev/null
+++ b/cont/csc-workflow.html
@@ -0,0 +1,74 @@
+<!--
+123456789-223456789-323456789-423456789-523456789-623456789-723456789-8234567890
+一二三四-->[TITLE] [DATE]
+--------------------------------------------------------------------------------
+[SETTITLE]Control Systems Club Project Workflow
+[SETDATE]1-24-2019
+
+First, create an ssh key. Intructions below:
+<a href="https://www.digitalocean.com/community/tutorials/how-to-set-up-ssh-keys--2">SSH Generation Tutorial</a>
+Email me "~/.ssh/id_rsa.pub", I will give you permission to the SSH server and
+to the production environment.
+
+In the meantime, clone the code repository from our server "ryugyong" at
+public IP 157.230.168.203.
+
+To do this, run the command
+
+git clone ssh@157.230.168.203:csc-code
+
+This will clone a repository named "csc-code"
+
+1. Go into the repository, and checkout to the development branch. Use:
+
+git checkout $branch
+
+where $branch could be:
+ arduinp-devel
+ frontend-devel
+ backend-devel
+ controller-devel
+
+2. Make the changes you want to make, and commit them.
+
+git commit $file
+
+where file is the file you have changed, if it is new run
+
+git add $file
+
+3. Afterwards, ask for a code review from me or somebody else.
+
+if the code passes review, I will merge it with master.
+
+4. Put the code into production
+
+To put these changes into production on the server, ssh into ryugyong with
+
+ ssh root@157.230.168.203
+ cd ~/csc-code
+ git pull
+ cd backend; make
+ ./backend
+
+To put these changes into production on the control computer, physically go to
+the control computer and run:
+
+ cd ~/csc-code
+ git pull
+ cd controller; make
+ ./controller
+
+To put these changes into production on the arduino, Take the arduino to your
+computer.
+
+ git checkout master
+ git pull
+
+ Run Arduino IDE and flash the code onto the Arduino
+
+ git checkout $branch
+
+5. GOTO 1
+
+