Merge branch 'master' into master

Author: Dhrams

.dir-locals.el

@@ -2,14 +2,15 @@
   (org . (
           ;; Set custom org-mode headline tags
           (setq org-todo-keywords '(
-                                    (type  "Vi-TODO"
-                                           "Dharsh-TODO"
-                                           "ASK-Trey"
+
+                                    (type  "Vi-TODO" 
+                                           "Dharsh-TODO" 
+                                           "ASK-Trey" 
+                                           
+                                           "Vi-CURRENT(!)" 
+                                           "Dharsh-CURRENT(!)" 
 
-                                           "Vi-CURRENT(!)"
-                                           "Dharsh-CURRENT(!)"
-          
-                                           "|"
+                                           "|" 
 
                                            "Vi-Owner(!)"
                                            "Dharsh-Owner(!)")
@@ -34,4 +35,4 @@
           )
          )
   )
-)
+)

index.org

@@ -1,15 +1,14 @@
 #+TITLE: Pyrant Documentation
 #+AUTHOR: Dharshan Rammohan & Vishakh Kumar
 
-#+TODO: Vi-TODO Dharsh-TODO ASK-Trey | Vi-Owner Dharsh-Owner
 
-* Custom org-mode features for this file
-Vi uses spacemacs a lot and railroaded Dharsh into using it so that he could organize things in org-mode.
 
-Main feature added is to create custom TODO types to assign work to people. 
+* Custom org-mode features for this file
+Mainly to put custom TODO types so that everyone can use them.
 
 #+NAME: startup
 #+BEGIN_SRC emacs-lisp :tangle .dir-locals.el :noweb yes :results silent
+
 (
   (org . (
           <<set_org_todo_keywords>>
@@ -19,47 +18,45 @@ Main feature added is to create custom TODO types to assign work to people.
 )
 #+END_SRC
 
-
 ** Set custom Org-mode headline tags
 #+NAME: set_org_todo_keywords
 #+BEGIN_SRC emacs-lisp
-  ;; Set custom org-mode headline tags
-  (setq org-todo-keywords '(
-                            (type  "Vi-TODO"
-                                   "Dharsh-TODO"
-                                   "ASK-Trey"
-
-                                   "Vi-CURRENT(!)"
-                                   "Dharsh-CURRENT(!)"
-
-                                   "|"
-
-                                   "Vi-Owner(!)"
-                                   "Dharsh-Owner(!)")
-                           )
-  )
+;; Set custom org-mode headline tags
+(setq org-todo-keywords '(
+                          (type  "Vi-TODO" 
+                                 "Dharsh-TODO" 
+                                 "ASK-Trey" 
+                                 
+                                 "Vi-CURRENT(!)" 
+                                 "Dharsh-CURRENT(!)" 
+
+                                 "|" 
+
+                                 "Vi-Owner(!)"
+                                 "Dharsh-Owner(!)")
+                         )
+)
 #+END_SRC
 
 ** Set colors for headline tags
-#+NAME: set_org_keyword_faces
 #+BEGIN_SRC emacs-lisp :results silent
-  ;; Set colors for headline tags
-  (setq org-todo-keyword-faces
-        '(
-          ;; Todo Items
-          ("Vi-TODO"         . (:foreground "white" :background "blue"                   )  )
-          ("Dharsh-TODO"     . (:foreground "black" :background "yellow"                 )  )
-          ("ASK-Trey"        . (:foreground "red"                           :weight bold )  )
-
-          ;; In-progress Items
-          ("Vi-CURRENT"      . (:foreground "blue"  :background "black"     :weight bold )  )
-          ("Dharsh-CURRENT"  . (:foreground "blue"  :background "black"     :weight bold )  )
-
-          ;; Finished items that are owned by
-          ("Vi-Owner"        . (:foreground "Green"                         :weight bold )  )
-          ("Dharsh-Owner"    . (:foreground "Green"                         :weight bold )  )
-          )
-  )
+;; Set colors for headline tags
+(setq org-todo-keyword-faces
+      '(
+        ;; Todo Items
+        ("Vi-TODO"         . (:foreground "white" :background "blue"                   )  ) 
+        ("Dharsh-TODO"     . (:foreground "black" :background "yellow"                 )  )
+        ("ASK-Trey"        . (:foreground "red"                           :weight bold )  )
+
+        ;; In-progress Items
+        ("Vi-CURRENT"      . (:foreground "blue"  :background "black"     :weight bold )  ) 
+        ("Dharsh-CURRENT"  . (:foreground "blue"  :background "black"     :weight bold )  )
+
+        ;; Finished items that are owned by
+        ("Vi-Owner"        . (:foreground "Green"                         :weight bold )  )
+        ("Dharsh-Owner"    . (:foreground "Green"                         :weight bold )  )
+        )
+)
 #+END_SRC
 
 
@@ -89,8 +86,6 @@ Measure motor shaft thickness and update inventory. When propellors arrive, chec
 
 When Vi goes to Microcenter next time, he will measure the motor shaft thickness and check for propellors that fit (along with a list of costs.) This will serve as the backup option should the propellors from Amazon be inadequete.
 
-
-
 1) Motor Shaft is bigger but just a bit too big.
   Use a drill bit that fits the width of the propellor cavity. Borrow one from the woodshop and use the drill press.
 
@@ -110,11 +105,13 @@ When Vi goes to Microcenter next time, he will measure the motor shaft thickness
 *** Vi-Owner Added RASPlib library
 *** Vi-Owner Implemented feedback-input comparator
 *** Vi-Owner mux-ed and demux-d input and made subsystem
-*** Dharsh-Owner Integrate Motor controllers
-n**** Dharsh-TODO Add .c files to Matlab
-**** Dharsh-Owner Add motor controller blocks to a subsystem and define input/output
+
+*** Dharsh-OWNER Integrate Motor controllers
+**** Dharsh-TODO Add .c files to Matlab
+**** Dharsh-TODO Add motor controller blocks to a subsystem and define input/output
       Note: Making this a seperate subsystem will make it easier to switch to a hexacopter motor control.
-**** Dharsh-Owner Make a PID subsystem that accepts position based input.
+**** ASK-Trey Make a PID subsystem that accepts position based input.
+
 *** Vi-TODO Building process
 **** Vi-TODO Build c files and avr to arduino mini.
 **** Vi-TODO Document in a bash script for easy use.
@@ -126,6 +123,7 @@ n**** Dharsh-TODO Add .c files to Matlab
 *** Dharsh-Owner Implement gyrometer, accelerometer & magnetometer PID controller
     Note: Philip (IEEE) mentioned that it would take far too long for the drones to come to a stop and hover and would not be appropiate for a swarm of controller
     Recommends switching to a position based PID controller
+
 **** Dharsh-Owner Implement position based controller in Simulink
       Note: Pretend that the Raspberry Pi is sending signals but actually use the keyboard for mocking.
 *** ASK-TreyTune the PID controllers for the drones
@@ -198,7 +196,6 @@ Note: Also make sure it looks great.
 **** Vi-TODO Invention studio
 ***** 3D print house casing for motors instead of using plywood.
 
-
 * Inventory
 
 |----------+------------------------------+---------+---------+--------------------------------------|