Skip to content

Commit eb27b85

Browse files
committed
Merge branch 'master' of https://github.com/grokkingStuff/pyrant
Commiting differences for pull request. (Also, Vi wrote great commit messages!)
2 parents d1b58f9 + 0cdaabb commit eb27b85

File tree

3 files changed

+70
-63
lines changed

3 files changed

+70
-63
lines changed

.dir-locals.el

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
(
2+
(org . (
3+
;; Set custom org-mode headline tags
4+
(setq org-todo-keywords '(
5+
(type "Vi-TODO"
6+
"Dharsh-TODO"
7+
"ASK-Trey"
8+
9+
"Vi-CURRENT(!)"
10+
"Dharsh-CURRENT(!)"
11+
12+
"|"
13+
14+
"Vi-Owner(!)"
15+
"Dharsh-Owner(!)")
16+
)
17+
)
18+
19+
)
20+
)
21+
)

Drone/untitled.slx

-22.1 KB
Binary file not shown.

Drone/inventorylist.org renamed to index.org

Lines changed: 49 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -1,81 +1,67 @@
1-
21
#+TITLE: Pyrant Documentation
32
#+AUTHOR: Dharshan Rammohan & Vishakh Kumar
43

5-
# Local Variables:
6-
# eval: (esf/execute-startup-block)
7-
# End:
8-
9-
104

11-
#+CALL: (esf/execute-startup-block)
5+
* Custom org-mode features for this file
6+
Mainly to put custom TODO types so that everyone can use them.
127

13-
** Custom org-mode features for this file
148
#+NAME: startup
15-
#+BEGIN_LISP :noweb yes
16-
(defun esf/execute-startup-block ()
17-
18-
<<set_org_todo_keywords>>
19-
<<set_org_keyword_faces>>
9+
#+BEGIN_SRC emacs-lisp :tangle .dir-locals.el :noweb yes :results silent
10+
11+
(
12+
(org . (
13+
<<set_org_todo_keywords>>
14+
<<set_org_keyword_faces>>
15+
)
16+
)
2017
)
21-
#+END_LISP
22-
23-
#+RESULTS: startup
24-
: esf/execute-startup-block
25-
26-
*** Set custom Org-mode headline tags
27-
#+NAME: set_org_todo_keywords
28-
#+BEGIN_SRC emacs-lisp
29-
;; Set custom org-mode headline tags
30-
(setq org-todo-keywords '(
31-
(type "Vi-TODO"
32-
"Dharsh-TODO"
33-
"ASK-Trey"
18+
#+END_SRC
19+
20+
** Set custom Org-mode headline tags
21+
#+NAME: set_org_todo_keywords
22+
#+BEGIN_SRC emacs-lisp
23+
;; Set custom org-mode headline tags
24+
(setq org-todo-keywords '(
25+
(type "Vi-TODO"
26+
"Dharsh-TODO"
27+
"ASK-Trey"
3428

35-
"Vi-CURRENT(!)"
36-
"Dharsh-CURRENT(!)"
37-
38-
"|"
39-
40-
"Vi-Owner(!)"
41-
"Dharsh-Owner(!)")
42-
)
43-
)
44-
#+END_SRC
45-
46-
#+RESULTS: set_org_todo_keywords
47-
| type | Vi-TODO | Dharsh-TODO | ASK-Trey | Vi-CURRENT(!) | Dharsh-CURRENT(!) | | | Vi-Owner(!) | Dharsh-Owner(!) |
48-
49-
*** Set colors for headline tags
50-
#+NAME: set_org_keyword_faces
51-
#+BEGIN_SRC emacs-lisp
52-
;; Set colors for headline tags
53-
(setq org-todo-keyword-faces
54-
'(
55-
56-
;; Todo Items
57-
("Vi-TODO" . (:foreground "white" :background "blue" ) )
58-
("Dharsh-TODO" . (:foreground "black" :background "yellow" ) )
59-
("ASK-Trey" . (:foreground "red" :weight bold ) )
60-
61-
;; In-progress Items
62-
("Vi-CURRENT" . (:foreground "blue" :background "black" :weight bold ) )
63-
("Dharsh-CURRENT" . (:foreground "blue" :background "black" :weight bold ) )
64-
65-
;; Finished items that are owned by
66-
("Vi-Owner" . (:foreground "Green" :weight bold ) )
67-
("Dharsh-Owner" . (:foreground "Green" :weight bold ) )
29+
"Vi-CURRENT(!)"
30+
"Dharsh-CURRENT(!)"
6831

69-
)
70-
)
71-
#+END_SRC
32+
"|"
7233

34+
"Vi-Owner(!)"
35+
"Dharsh-Owner(!)")
36+
)
37+
)
38+
#+END_SRC
39+
40+
** Set colors for headline tags
41+
#+BEGIN_SRC emacs-lisp :results silent
42+
;; Set colors for headline tags
43+
(setq org-todo-keyword-faces
44+
'(
45+
;; Todo Items
46+
("Vi-TODO" . (:foreground "white" :background "blue" ) )
47+
("Dharsh-TODO" . (:foreground "black" :background "yellow" ) )
48+
("ASK-Trey" . (:foreground "red" :weight bold ) )
49+
50+
;; In-progress Items
51+
("Vi-CURRENT" . (:foreground "blue" :background "black" :weight bold ) )
52+
("Dharsh-CURRENT" . (:foreground "blue" :background "black" :weight bold ) )
53+
54+
;; Finished items that are owned by
55+
("Vi-Owner" . (:foreground "Green" :weight bold ) )
56+
("Dharsh-Owner" . (:foreground "Green" :weight bold ) )
57+
)
58+
)
59+
#+END_SRC
7360

7461

7562
* Tasks
7663

7764
** Hardware
78-
7965
*** Vi-TODO Flight Logic Controller
8066
**** Vi-TODO Connect the arduino pins to raspberry pi pins for SPI interface
8167
**** Vi-TODO Arduino

0 commit comments

Comments
 (0)