changeset 69:ce5c457bde68

Update plugins
author zegervdv <zegervdv@me.com>
date Thu, 26 Jun 2014 18:27:57 +0200
parents f0f6338cbec8
children f16da34ed479
files .hgsubstate vim/sessions/quadcopter.vim vimrc
diffstat 3 files changed, 122 insertions(+), 70 deletions(-) [+]
line wrap: on
line diff
--- a/.hgsubstate	Wed Jun 25 15:43:33 2014 +0200
+++ b/.hgsubstate	Thu Jun 26 18:27:57 2014 +0200
@@ -15,7 +15,7 @@
 320bb97cb4688a2c1954f6f84be81bfa855b6425 vim/bundle/emmet
 38541f3dbe53f0431a9181561c3b609d58b92d06 vim/bundle/endwise
 c856e5d649b9f87590aff66a84b930fce5793431 vim/bundle/eunuch
-fb5661211dc632b03a49a19bdbdc2cbf6d691f56 vim/bundle/fugitive
+7fb703534a27f73edc0867f9eacd48dd6da944e2 vim/bundle/fugitive
 41c1d979faeb7addfacfed22639f51e915c7fa7f vim/bundle/git
 3975ac871565115e3769dc69c06bc88ddc1369af vim/bundle/gundo
 81b7e5584f69340eec92088efda893d959d6df3a vim/bundle/hybrid
@@ -27,7 +27,7 @@
 dd936527b5b5097a98b5d0a147425e0883948bfd vim/bundle/neocomplete
 318c9fb417e0e425cebead41a7dc283a4d2106be vim/bundle/neosnippet
 5571cf0c8f05204fafceb5aeafe2716ce91737cc vim/bundle/neosnippet-snippets
-b0bb781fc73ef40365e4c996a16f04368d64fc9d vim/bundle/nerdtree
+8b48413155832c6fd860636eada0e3b5ab74da07 vim/bundle/nerdtree
 e00fe1a76b43c3f20036a63eedb9423d5f0a1124 vim/bundle/rails
 dd922269dd9ea4fea6d44a0eebdc95e0ff224d37 vim/bundle/rake
 79a33164cade37f922cc1e2a16eaca3533aa0274 vim/bundle/rbenv
@@ -44,7 +44,7 @@
 ab79acbccd6a5e9a54fb523cf76ea5c30d904006 vim/bundle/syntastic
 60f25648814f0695eeb6c1040d97adca93c4e0bb vim/bundle/tabular
 59c9b7ce1cc70ac2c7bd3c858e80c89f17b42cc9 vim/bundle/tagbar
-30ddfbd21877210e2d09a473165697958a28d623 vim/bundle/tcomment
+014c8e5d3d47c53b316d31cb0a4c64f556f0d5b0 vim/bundle/tcomment
 f9ba6df8838be0fcf8fb763459bfac35c5df2e78 vim/bundle/textmanip
 573c71fe6d60d090e7a23f13f1852395ec2ff6bc vim/bundle/tlib
 7bfdda29120dbab0787c966dd35db025305675e1 vim/bundle/tomdoc
--- a/vim/sessions/quadcopter.vim	Wed Jun 25 15:43:33 2014 +0200
+++ b/vim/sessions/quadcopter.vim	Thu Jun 26 18:27:57 2014 +0200
@@ -1,6 +1,6 @@
 " ~/.dotfiles/vim/sessions/quadcopter.vim:
 " Vim session script.
-" Created by session.vim 2.4.11 on 23 juni 2014 at 12:32:25.
+" Created by session.vim 2.4.14 on 26 juni 2014 at 18:27:48.
 " Open this file in Vim and run :source % to restore your session.
 
 set guioptions=egm
@@ -24,23 +24,27 @@
   let s:wipebuf = bufnr('%')
 endif
 set shortmess=aoO
-badd +40 source/main.c
+badd +45 source/sensors.c
+badd +27 source/main.c
 badd +81 source/bluetooth.c
 badd +44 Makefile
-badd +19 source/Makefile
+badd +54 source/Makefile
 badd +55 STM32F3-Discovery_FW_V1.1.0/Libraries/STM32F30x_StdPeriph_Driver/inc/stm32f30x_dma.h
-badd +1 STM32F3-Discovery_FW_V1.1.0/Libraries/STM32F30x_StdPeriph_Driver/src/stm32f30x_dma.c
+badd +442 STM32F3-Discovery_FW_V1.1.0/Libraries/STM32F30x_StdPeriph_Driver/src/stm32f30x_dma.c
 badd +1 STM32F3-Discovery_FW_V1.1.0/Utilities/STM32F3_Discovery/stm32f3_discovery.c
 badd +39 STM32F3-Discovery_FW_V1.1.0/Utilities/STM32F3_Discovery/stm32f3_discovery_l3gd20.h
-badd +1 source/sensors.c
 badd +13 source/sensors.h
 badd +1 STM32F3-Discovery_FW_V1.1.0/Utilities/STM32F3_Discovery/stm32f3_discovery.h
 badd +457 STM32F3-Discovery_FW_V1.1.0/Utilities/STM32F3_Discovery/stm32f3_discovery_l3gd20.c
-badd +0 ./
-badd +0 source/bluetooth.h
+badd +1 ~/Documents/projects/STM-Quadcopter
+badd +1 source/bluetooth.h
+badd +1 source/sensor_data.h
+badd +1 debug/read_sensors.c
+badd +1 debug/Makefile
+badd +0 STM32F3-Discovery_FW_V1.1.0/Utilities/STM32F3_Discovery/stm32f3_discovery_lsm303dlhc.h
 " argglobal
 silent! argdel *
-argadd ./
+argadd ~/Documents/projects/STM-Quadcopter
 edit source/main.c
 set splitbelow splitright
 wincmd _ | wincmd |
@@ -55,9 +59,9 @@
 wincmd t
 set winheight=1 winwidth=1
 exe 'vert 1resize ' . ((&columns * 93 + 93) / 187)
-exe '2resize ' . ((&lines * 33 + 34) / 68)
+exe '2resize ' . ((&lines * 35 + 35) / 70)
 exe 'vert 2resize ' . ((&columns * 93 + 93) / 187)
-exe '3resize ' . ((&lines * 32 + 34) / 68)
+exe '3resize ' . ((&lines * 32 + 35) / 70)
 exe 'vert 3resize ' . ((&columns * 93 + 93) / 187)
 " argglobal
 setlocal fdm=syntax
@@ -68,19 +72,17 @@
 setlocal fml=1
 setlocal fdn=20
 setlocal fen
-14
+17
 silent! normal! zo
-26
+31
 silent! normal! zo
-36
+54
 silent! normal! zo
-49
-silent! normal! zo
-let s:l = 36 - ((35 * winheight(0) + 33) / 66)
+let s:l = 49 - ((33 * winheight(0) + 34) / 68)
 if s:l < 1 | let s:l = 1 | endif
 exe s:l
 normal! zt
-36
+49
 normal! 0
 wincmd w
 " argglobal
@@ -93,24 +95,22 @@
 setlocal fml=1
 setlocal fdn=20
 setlocal fen
-14
-normal! zc
 55
 normal! zc
 72
 normal! zc
 80
 silent! normal! zo
-94
+97
 normal! zc
-105
+108
 silent! normal! zo
-let s:l = 85 - ((72 * winheight(0) + 16) / 33)
+let s:l = 91 - ((47 * winheight(0) + 17) / 35)
 if s:l < 1 | let s:l = 1 | endif
 exe s:l
 normal! zt
-85
-normal! 05|
+91
+normal! 018|
 wincmd w
 " argglobal
 edit source/bluetooth.h
@@ -123,18 +123,17 @@
 setlocal fdn=20
 setlocal fen
 silent! normal! zE
-let s:l = 46 - ((7 * winheight(0) + 16) / 32)
+let s:l = 28 - ((2 * winheight(0) + 16) / 32)
 if s:l < 1 | let s:l = 1 | endif
 exe s:l
 normal! zt
-46
+28
 normal! 0
 wincmd w
-3wincmd w
 exe 'vert 1resize ' . ((&columns * 93 + 93) / 187)
-exe '2resize ' . ((&lines * 33 + 34) / 68)
+exe '2resize ' . ((&lines * 35 + 35) / 70)
 exe 'vert 2resize ' . ((&columns * 93 + 93) / 187)
-exe '3resize ' . ((&lines * 32 + 34) / 68)
+exe '3resize ' . ((&lines * 32 + 35) / 70)
 exe 'vert 3resize ' . ((&columns * 93 + 93) / 187)
 tabedit source/sensors.c
 set splitbelow splitright
@@ -150,9 +149,9 @@
 wincmd t
 set winheight=1 winwidth=1
 exe 'vert 1resize ' . ((&columns * 93 + 93) / 187)
-exe '2resize ' . ((&lines * 21 + 34) / 68)
+exe '2resize ' . ((&lines * 21 + 35) / 70)
 exe 'vert 2resize ' . ((&columns * 93 + 93) / 187)
-exe '3resize ' . ((&lines * 44 + 34) / 68)
+exe '3resize ' . ((&lines * 46 + 35) / 70)
 exe 'vert 3resize ' . ((&columns * 93 + 93) / 187)
 " argglobal
 setlocal fdm=syntax
@@ -163,11 +162,17 @@
 setlocal fml=1
 setlocal fdn=20
 setlocal fen
-let s:l = 21 - ((20 * winheight(0) + 33) / 66)
+61
+silent! normal! zo
+64
+silent! normal! zo
+61
+normal! zc
+let s:l = 42 - ((41 * winheight(0) + 34) / 68)
 if s:l < 1 | let s:l = 1 | endif
 exe s:l
 normal! zt
-21
+42
 normal! 01|
 wincmd w
 " argglobal
@@ -181,12 +186,12 @@
 setlocal fdn=20
 setlocal fen
 silent! normal! zE
-let s:l = 13 - ((4 * winheight(0) + 10) / 21)
+let s:l = 63 - ((20 * winheight(0) + 10) / 21)
 if s:l < 1 | let s:l = 1 | endif
 exe s:l
 normal! zt
-13
-normal! 027|
+63
+normal! 039|
 wincmd w
 " argglobal
 edit source/main.c
@@ -198,24 +203,74 @@
 setlocal fml=1
 setlocal fdn=20
 setlocal fen
-14
+17
+silent! normal! zo
+31
 silent! normal! zo
-26
+54
 silent! normal! zo
-let s:l = 26 - ((19 * winheight(0) + 22) / 44)
+let s:l = 43 - ((22 * winheight(0) + 23) / 46)
 if s:l < 1 | let s:l = 1 | endif
 exe s:l
 normal! zt
-26
-normal! 012|
+43
+normal! 033|
 wincmd w
-3wincmd w
 exe 'vert 1resize ' . ((&columns * 93 + 93) / 187)
-exe '2resize ' . ((&lines * 21 + 34) / 68)
+exe '2resize ' . ((&lines * 21 + 35) / 70)
 exe 'vert 2resize ' . ((&columns * 93 + 93) / 187)
-exe '3resize ' . ((&lines * 44 + 34) / 68)
+exe '3resize ' . ((&lines * 46 + 35) / 70)
 exe 'vert 3resize ' . ((&columns * 93 + 93) / 187)
-tabedit STM32F3-Discovery_FW_V1.1.0/Libraries/STM32F30x_StdPeriph_Driver/inc/stm32f30x_dma.h
+tabedit debug/read_sensors.c
+set splitbelow splitright
+set nosplitbelow
+wincmd t
+set winheight=1 winwidth=1
+" argglobal
+setlocal fdm=syntax
+setlocal fde=0
+setlocal fmr={{{,}}}
+setlocal fdi=#
+setlocal fdl=0
+setlocal fml=1
+setlocal fdn=20
+setlocal fen
+11
+silent! normal! zo
+65
+silent! normal! zo
+71
+silent! normal! zo
+79
+silent! normal! zo
+let s:l = 76 - ((59 * winheight(0) + 34) / 68)
+if s:l < 1 | let s:l = 1 | endif
+exe s:l
+normal! zt
+76
+normal! 015|
+tabedit source/sensor_data.h
+set splitbelow splitright
+set nosplitbelow
+wincmd t
+set winheight=1 winwidth=1
+" argglobal
+setlocal fdm=manual
+setlocal fde=0
+setlocal fmr={{{,}}}
+setlocal fdi=#
+setlocal fdl=0
+setlocal fml=1
+setlocal fdn=20
+setlocal fen
+silent! normal! zE
+let s:l = 10 - ((9 * winheight(0) + 34) / 68)
+if s:l < 1 | let s:l = 1 | endif
+exe s:l
+normal! zt
+10
+normal! 0
+tabedit source/Makefile
 set splitbelow splitright
 wincmd _ | wincmd |
 vsplit
@@ -236,16 +291,16 @@
 setlocal fdn=20
 setlocal fen
 silent! normal! zE
-let s:l = 55 - ((4 * winheight(0) + 33) / 66)
+let s:l = 25 - ((23 * winheight(0) + 34) / 68)
 if s:l < 1 | let s:l = 1 | endif
 exe s:l
 normal! zt
-55
-normal! 091|
+25
+normal! 017|
 wincmd w
 " argglobal
-edit STM32F3-Discovery_FW_V1.1.0/Libraries/STM32F30x_StdPeriph_Driver/src/stm32f30x_dma.c
-setlocal fdm=syntax
+edit debug/Makefile
+setlocal fdm=manual
 setlocal fde=0
 setlocal fmr={{{,}}}
 setlocal fdi=#
@@ -253,21 +308,17 @@
 setlocal fml=1
 setlocal fdn=20
 setlocal fen
-350
-silent! normal! zo
-417
-silent! normal! zo
-let s:l = 481 - ((49 * winheight(0) + 33) / 66)
+silent! normal! zE
+let s:l = 22 - ((21 * winheight(0) + 34) / 68)
 if s:l < 1 | let s:l = 1 | endif
 exe s:l
 normal! zt
-481
-normal! 019|
+22
+normal! 09|
 wincmd w
-3wincmd w
 exe 'vert 1resize ' . ((&columns * 93 + 93) / 187)
 exe 'vert 2resize ' . ((&columns * 93 + 93) / 187)
-tabedit source/Makefile
+tabedit STM32F3-Discovery_FW_V1.1.0/Utilities/STM32F3_Discovery/stm32f3_discovery_lsm303dlhc.h
 set splitbelow splitright
 set nosplitbelow
 wincmd t
@@ -282,14 +333,13 @@
 setlocal fdn=20
 setlocal fen
 silent! normal! zE
-let s:l = 54 - ((53 * winheight(0) + 33) / 66)
+let s:l = 478 - ((33 * winheight(0) + 34) / 68)
 if s:l < 1 | let s:l = 1 | endif
 exe s:l
 normal! zt
-54
+478
 normal! 0
-3wincmd w
-tabnext 1
+tabnext 3
 if exists('s:wipebuf')
 "   silent exe 'bwipe ' . s:wipebuf
 endif
@@ -305,8 +355,8 @@
 " Everything down here is generated by vim-session (not supported
 " by :mksession out of the box).
 
-tabnext 1
-3wincmd w
+1wincmd w
+tabnext 3
 if exists('s:wipebuf')
   if empty(bufname(s:wipebuf))
 if !getbufvar(s:wipebuf, '&modified')
--- a/vimrc	Wed Jun 25 15:43:33 2014 +0200
+++ b/vimrc	Thu Jun 26 18:27:57 2014 +0200
@@ -290,8 +290,8 @@
   let g:neocomplete#force_omni_input_patterns = {}
 endif
 let g:neocomplete#force_overwrite_completefunc = 1
-let g:neocomplete#force_omni_input_patterns.c =
-      \ '[^.[:digit:] *\t]\%(\.\|->\)\w*'
+" let g:neocomplete#force_omni_input_patterns.c =
+      " \ '[^.[:digit:] *\t]\%(\.\|->\)\w*'
 let g:neocomplete#force_omni_input_patterns.cpp =
       \ '[^.[:digit:] *\t]\%(\.\|->\)\w*\|\h\w*::\w*'
 let g:neocomplete#force_omni_input_patterns.objc =
@@ -300,8 +300,10 @@
       \ '[^.[:digit:] *\t]\%(\.\|->\)\w*\|\h\w*::\w*'
 let g:clang_complete_auto = 0
 let g:clang_auto_select = 0
+let g:clang_debug = 1
 "let g:clang_use_library = 1
 let s:clang_library_path='/Library/Developer/CommandLineTools/usr/lib'
+
 if isdirectory(s:clang_library_path)
     let g:clang_library_path=s:clang_library_path
 endif