# HG changeset patch # User zegervdv # Date 1406740339 -7200 # Node ID dd76ef1174f1b5ab3aee89be35fc06db161f5c8c # Parent 5fd16ed8bb6dc7bfad15a7f98faa369c9e7d429a Add q as fzf - z mashup diff -r 5fd16ed8bb6d -r dd76ef1174f1 vim/sessions/quadcopter.vim --- a/vim/sessions/quadcopter.vim Sun Jul 27 23:15:54 2014 +0200 +++ b/vim/sessions/quadcopter.vim Wed Jul 30 19:12:19 2014 +0200 @@ -1,17 +1,19 @@ " ~/.dotfiles/vim/sessions/quadcopter.vim: " Vim session script. -" Created by session.vim 2.6.1 on 27 juli 2014 at 20:08:24. +" Created by session.vim 2.6.1 on 27 juli 2014 at 23:46:20. " Open this file in Vim and run :source % to restore your session. +set guioptions=egm +silent! set guifont=Inconsolata\ for\ Powerline:h12 if exists('g:syntax_on') != 1 | syntax on | endif if exists('g:did_load_filetypes') != 1 | filetype on | endif if exists('g:did_load_ftplugin') != 1 | filetype plugin on | endif if exists('g:did_indent_on') != 1 | filetype indent on | endif -if &background != 'light' - set background=light +if &background != 'dark' + set background=dark endif if !exists('g:colors_name') || g:colors_name != 'hybrid' | colorscheme hybrid | endif -call setqflist([{'lnum': 1217, 'col': 6, 'valid': 1, 'vcol': 0, 'nr': -1, 'type': '', 'pattern': '', 'filename': 'STM32F3-Discovery_FW_V1.1.0/Libraries/STM32F30x_StdPeriph_Driver/inc/stm32f30x_tim.h', 'text': 'void TIM_SetCompare1(TIM_TypeDef* TIMx, uint32_t Compare1); '}, {'lnum': 1275, 'col': 6, 'valid': 1, 'vcol': 0, 'nr': -1, 'type': '', 'pattern': '', 'filename': 'STM32F3-Discovery_FW_V1.1.0/Libraries/STM32F30x_StdPeriph_Driver/src/stm32f30x_tim.c', 'text': 'void TIM_SetCompare1(TIM_TypeDef* TIMx, uint32_t Compare1) '}]) +call setqflist([]) let SessionLoad = 1 if &cp | set nocp | endif let s:so_save = &so | let s:siso_save = &siso | set so=0 siso=0 @@ -22,122 +24,15 @@ let s:wipebuf = bufnr('%') endif set shortmess=aoO -badd +39 source/motors.c +badd +0 source/main.c +badd +13 source/motors.c badd +0 source/motors.h -badd +293 STM32F3-Discovery_FW_V1.1.0/Libraries/STM32F30x_StdPeriph_Driver/inc/stm32f30x_gpio.h -badd +67 STM32F3-Discovery_FW_V1.1.0/Libraries/STM32F30x_StdPeriph_Driver/inc/stm32f30x_tim.h -badd +43 source/Makefile -badd +1276 STM32F3-Discovery_FW_V1.1.0/Libraries/STM32F30x_StdPeriph_Driver/src/stm32f30x_tim.c -badd +0 source/main.c -badd +1 source/bluetooth.h -badd +1 source/bluetooth.c +badd +301 STM32F3-Discovery_FW_V1.1.0/Libraries/STM32F30x_StdPeriph_Driver/inc/stm32f30x_gpio.h +badd +454 STM32F3-Discovery_FW_V1.1.0/Libraries/STM32F30x_StdPeriph_Driver/inc/stm32f30x_rcc.h " argglobal silent! argdel * argadd . -edit source/motors.c -set splitbelow splitright -wincmd _ | wincmd | -vsplit -1wincmd h -wincmd w -set nosplitbelow -wincmd t -set winheight=1 winwidth=1 -exe 'vert 1resize ' . ((&columns * 73 + 73) / 147) -exe 'vert 2resize ' . ((&columns * 73 + 73) / 147) -" argglobal -setlocal fdm=syntax -setlocal fde=0 -setlocal fmr={{{,}}} -setlocal fdi=# -setlocal fdl=0 -setlocal fml=1 -setlocal fdn=20 -setlocal fen -7 -silent! normal! zo -let s:l = 39 - ((20 * winheight(0) + 20) / 41) -if s:l < 1 | let s:l = 1 | endif -exe s:l -normal! zt -39 -normal! 03| -lcd ~/Documents/projects/STM-Quadcopter -wincmd w -" argglobal -edit ~/Documents/projects/STM-Quadcopter/source/motors.h -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 = 41 - ((29 * winheight(0) + 20) / 41) -if s:l < 1 | let s:l = 1 | endif -exe s:l -normal! zt -41 -normal! 0 -lcd ~/Documents/projects/STM-Quadcopter -wincmd w -exe 'vert 1resize ' . ((&columns * 73 + 73) / 147) -exe 'vert 2resize ' . ((&columns * 73 + 73) / 147) -tabedit ~/Documents/projects/STM-Quadcopter/source/bluetooth.h -set splitbelow splitright -wincmd _ | wincmd | -vsplit -1wincmd h -wincmd w -set nosplitbelow -wincmd t -set winheight=1 winwidth=1 -exe 'vert 1resize ' . ((&columns * 73 + 73) / 147) -exe 'vert 2resize ' . ((&columns * 73 + 73) / 147) -" 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 = 1 - ((0 * winheight(0) + 20) / 41) -if s:l < 1 | let s:l = 1 | endif -exe s:l -normal! zt -1 -normal! 0 -lcd ~/Documents/projects/STM-Quadcopter -wincmd w -" argglobal -edit ~/Documents/projects/STM-Quadcopter/source/bluetooth.c -setlocal fdm=syntax -setlocal fde=0 -setlocal fmr={{{,}}} -setlocal fdi=# -setlocal fdl=0 -setlocal fml=1 -setlocal fdn=20 -setlocal fen -76 -silent! normal! zo -let s:l = 79 - ((78 * winheight(0) + 20) / 41) -if s:l < 1 | let s:l = 1 | endif -exe s:l -normal! zt -79 -normal! 0 -lcd ~/Documents/projects/STM-Quadcopter -wincmd w -2wincmd w -exe 'vert 1resize ' . ((&columns * 73 + 73) / 147) -exe 'vert 2resize ' . ((&columns * 73 + 73) / 147) -tabedit ~/Documents/projects/STM-Quadcopter/source/main.c +edit source/main.c set splitbelow splitright set nosplitbelow wincmd t @@ -151,22 +46,44 @@ setlocal fml=1 setlocal fdn=20 setlocal fen -20 -silent! normal! zo -let s:l = 9 - ((8 * winheight(0) + 20) / 41) +let s:l = 1 - ((0 * winheight(0) + 24) / 48) if s:l < 1 | let s:l = 1 | endif exe s:l normal! zt -9 -normal! 018| -lcd ~/Documents/projects/STM-Quadcopter -2wincmd w -tabedit ~/Documents/projects/STM-Quadcopter/source/Makefile +1 +normal! 01| +tabedit source/motors.c set splitbelow splitright +wincmd _ | wincmd | +vsplit +1wincmd h +wincmd w set nosplitbelow wincmd t set winheight=1 winwidth=1 +exe 'vert 1resize ' . ((&columns * 91 + 92) / 184) +exe 'vert 2resize ' . ((&columns * 92 + 92) / 184) " argglobal +setlocal fdm=syntax +setlocal fde=0 +setlocal fmr={{{,}}} +setlocal fdi=# +setlocal fdl=0 +setlocal fml=1 +setlocal fdn=20 +setlocal fen +7 +silent! normal! zo +let s:l = 22 - ((4 * winheight(0) + 24) / 48) +if s:l < 1 | let s:l = 1 | endif +exe s:l +normal! zt +22 +normal! 046| +lcd ~/Documents/Projects/STM-Quadrocopter +wincmd w +" argglobal +edit ~/Documents/Projects/STM-Quadrocopter/source/motors.h setlocal fdm=manual setlocal fde=0 setlocal fmr={{{,}}} @@ -176,20 +93,23 @@ setlocal fdn=20 setlocal fen silent! normal! zE -let s:l = 12 - ((5 * winheight(0) + 20) / 41) +let s:l = 28 - ((27 * winheight(0) + 24) / 48) if s:l < 1 | let s:l = 1 | endif exe s:l normal! zt -12 -normal! 014| -lcd ~/Documents/projects/STM-Quadcopter +28 +normal! 031| +lcd ~/Documents/Projects/STM-Quadrocopter +wincmd w 2wincmd w +exe 'vert 1resize ' . ((&columns * 91 + 92) / 184) +exe 'vert 2resize ' . ((&columns * 92 + 92) / 184) tabnext 2 if exists('s:wipebuf') " silent exe 'bwipe ' . s:wipebuf endif " unlet! s:wipebuf -set winheight=1 winwidth=20 shortmess=filnxtToOc +set winheight=1 winwidth=20 shortmess=filnxtToO let s:sx = expand(":p:r")."x.vim" if file_readable(s:sx) exe "source " . fnameescape(s:sx) diff -r 5fd16ed8bb6d -r dd76ef1174f1 vim/sessions/work.vim --- a/vim/sessions/work.vim Sun Jul 27 23:15:54 2014 +0200 +++ b/vim/sessions/work.vim Wed Jul 30 19:12:19 2014 +0200 @@ -1,6 +1,6 @@ " ~/.dotfiles/vim/sessions/work.vim: " Vim session script. -" Created by session.vim 2.6.1 on 25 juli 2014 at 18:09:07. +" Created by session.vim 2.6.1 on 30 juli 2014 at 18:12:10. " Open this file in Vim and run :source % to restore your session. set guioptions=egm @@ -13,7 +13,7 @@ set background=dark endif if !exists('g:colors_name') || g:colors_name != 'hybrid' | colorscheme hybrid | endif -call setqflist([{'lnum': 52, 'col': 5, 'valid': 1, 'vcol': 0, 'nr': -1, 'type': '', 'pattern': '', 'filename': 'source/main.c', 'text': ' USART_SendData(USART1, *str++);'}, {'lnum': 183, 'col': 9, 'valid': 1, 'vcol': 0, 'nr': -1, 'type': '', 'pattern': '', 'filename': 'source/main.c', 'text': ' USART_SendData(USART1, data[count]);'}, {'lnum': 534, 'col': 6, 'valid': 1, 'vcol': 0, 'nr': -1, 'type': '', 'pattern': '', 'filename': 'STM32F0-Discovery_FW_V1.0.0/Libraries/STM32F0xx_StdPeriph_Driver/inc/stm32f0xx_usart.h', 'text': 'void USART_SendData(USART_TypeDef* USARTx, uint16_t Data); '}, {'lnum': 864, 'col': 68, 'valid': 1, 'vcol': 0, 'nr': -1, 'type': '', 'pattern': '', 'filename': 'STM32F0-Discovery_FW_V1.0.0/Libraries/STM32F0xx_StdPeriph_Driver/src/stm32f0xx_usart.c', 'text': ' Whereas a write access to the USART_TDR can be done using USART_SendData() '}, {'lnum': 877, 'col': 6, 'valid': 1, 'vcol': 0, 'nr': -1, 'type': '', 'pattern': '', 'filename': 'STM32F0-Discovery_FW_V1.0.0/Libraries/STM32F0xx_StdPeriph_Driver/src/stm32f0xx_usart.c', 'text': 'void USART_SendData(USART_TypeDef* USARTx, uint16_t Data) '}, {'lnum': 1878, 'col': 48, 'valid': 1, 'vcol': 0, 'nr': -1, 'type': '', 'pattern': '', 'filename': 'STM32F0-Discovery_FW_V1.0.0/Libraries/STM32F0xx_StdPeriph_Driver/src/stm32f0xx_usart.c', 'text': ' * operation to USART_TDR register (USART_SendData()). '}, {'lnum': 1879, 'col': 73, 'valid': 1, 'vcol': 0, 'nr': -1, 'type': '', 'pattern': '', 'filename': 'STM32F0-Discovery_FW_V1.0.0/Libraries/STM32F0xx_StdPeriph_Driver/src/stm32f0xx_usart.c', 'text': ' * @note TXE flag is cleared by a write to the USART_TDR register (USART_SendData()) '}, {'lnum': 1980, 'col': 56, 'valid': 1, 'vcol': 0, 'nr': -1, 'type': '', 'pattern': '', 'filename': 'STM32F0-Discovery_FW_V1.0.0/Libraries/STM32F0xx_StdPeriph_Driver/src/stm32f0xx_usart.c', 'text': ' * a write operation to USART_TDR register (USART_SendData()). '}, {'lnum': 1982, 'col': 16, 'valid': 1, 'vcol': 0, 'nr': -1, 'type': '', 'pattern': '', 'filename': 'STM32F0-Discovery_FW_V1.0.0/Libraries/STM32F0xx_StdPeriph_Driver/src/stm32f0xx_usart.c', 'text': ' * (USART_SendData()) or by writing 1 to the TXFRQ in the register '}]) +call setqflist([{'lnum': 40, 'col': 5, 'valid': 1, 'vcol': 0, 'nr': -1, 'type': '', 'pattern': '', 'filename': 'source/main.c', 'text': ' USART_SendData(USART1, *str++);'}, {'lnum': 178, 'col': 9, 'valid': 1, 'vcol': 0, 'nr': -1, 'type': '', 'pattern': '', 'filename': 'source/main.c', 'text': ' USART_SendData(USART1, data[count]);'}, {'lnum': 534, 'col': 6, 'valid': 1, 'vcol': 0, 'nr': -1, 'type': '', 'pattern': '', 'filename': 'STM32F0-Discovery_FW_V1.0.0/Libraries/STM32F0xx_StdPeriph_Driver/inc/stm32f0xx_usart.h', 'text': 'void USART_SendData(USART_TypeDef* USARTx, uint16_t Data); '}, {'lnum': 864, 'col': 68, 'valid': 1, 'vcol': 0, 'nr': -1, 'type': '', 'pattern': '', 'filename': 'STM32F0-Discovery_FW_V1.0.0/Libraries/STM32F0xx_StdPeriph_Driver/src/stm32f0xx_usart.c', 'text': ' Whereas a write access to the USART_TDR can be done using USART_SendData() '}, {'lnum': 877, 'col': 6, 'valid': 1, 'vcol': 0, 'nr': -1, 'type': '', 'pattern': '', 'filename': 'STM32F0-Discovery_FW_V1.0.0/Libraries/STM32F0xx_StdPeriph_Driver/src/stm32f0xx_usart.c', 'text': 'void USART_SendData(USART_TypeDef* USARTx, uint16_t Data) '}, {'lnum': 1878, 'col': 48, 'valid': 1, 'vcol': 0, 'nr': -1, 'type': '', 'pattern': '', 'filename': 'STM32F0-Discovery_FW_V1.0.0/Libraries/STM32F0xx_StdPeriph_Driver/src/stm32f0xx_usart.c', 'text': ' * operation to USART_TDR register (USART_SendData()). '}, {'lnum': 1879, 'col': 73, 'valid': 1, 'vcol': 0, 'nr': -1, 'type': '', 'pattern': '', 'filename': 'STM32F0-Discovery_FW_V1.0.0/Libraries/STM32F0xx_StdPeriph_Driver/src/stm32f0xx_usart.c', 'text': ' * @note TXE flag is cleared by a write to the USART_TDR register (USART_SendData()) '}, {'lnum': 1980, 'col': 56, 'valid': 1, 'vcol': 0, 'nr': -1, 'type': '', 'pattern': '', 'filename': 'STM32F0-Discovery_FW_V1.0.0/Libraries/STM32F0xx_StdPeriph_Driver/src/stm32f0xx_usart.c', 'text': ' * a write operation to USART_TDR register (USART_SendData()). '}, {'lnum': 1982, 'col': 16, 'valid': 1, 'vcol': 0, 'nr': -1, 'type': '', 'pattern': '', 'filename': 'STM32F0-Discovery_FW_V1.0.0/Libraries/STM32F0xx_StdPeriph_Driver/src/stm32f0xx_usart.c', 'text': ' * (USART_SendData()) or by writing 1 to the TXFRQ in the register '}]) let SessionLoad = 1 if &cp | set nocp | endif let s:so_save = &so | let s:siso_save = &siso | set so=0 siso=0 @@ -24,21 +24,28 @@ let s:wipebuf = bufnr('%') endif set shortmess=aoO +badd +97 ~/.zshrc +badd +78 source/main.c +badd +405 STM32F0-Discovery_FW_V1.0.0/Libraries/STM32F0xx_StdPeriph_Driver/inc/stm32f0xx_usart.h +badd +901 STM32F0-Discovery_FW_V1.0.0/Libraries/STM32F0xx_StdPeriph_Driver/src/stm32f0xx_usart.c +badd +1 ~/Documents/Projects/STM-Quadrocopter/source/main.c +badd +22 ~/Documents/Projects/STM-Quadrocopter/source/motors.c +badd +28 ~/Documents/Projects/STM-Quadrocopter/source/motors.h +badd +301 ~/Documents/Projects/STM-Quadrocopter/STM32F3-Discovery_FW_V1.1.0/Libraries/STM32F30x_StdPeriph_Driver/inc/stm32f30x_gpio.h +badd +454 ~/Documents/Projects/STM-Quadrocopter/STM32F3-Discovery_FW_V1.1.0/Libraries/STM32F30x_StdPeriph_Driver/inc/stm32f30x_rcc.h badd +89 source/stm32f0_discovery.c badd +260 STM32F0-Discovery_FW_V1.0.0/Libraries/STM32F0xx_StdPeriph_Driver/inc/stm32f0xx_gpio.h badd +417 STM32F0-Discovery_FW_V1.0.0/Libraries/STM32F0xx_StdPeriph_Driver/src/stm32f0xx_gpio.c -badd +113 source/main.c badd +371 STM32F0-Discovery_FW_V1.0.0/Libraries/CMSIS/ST/STM32F0xx/Include/stm32f0xx.h badd +63 STM32F0-Discovery_FW_V1.0.0/Libraries/STM32F0xx_StdPeriph_Driver/inc/stm32f0xx_misc.h -badd +405 STM32F0-Discovery_FW_V1.0.0/Libraries/STM32F0xx_StdPeriph_Driver/inc/stm32f0xx_usart.h -badd +56 ~/Documents/UGent/Wifi-modules/config/config.py -badd +0 ~/Documents/UGent/Wifi-modules/controller -badd +32 ~/Documents/UGent/Wifi-modules/measurement +badd +55 ~/Documents/UGent/Wifi-modules/config/config.py +badd +1 ~/Documents/UGent/Wifi-modules/controller +badd +104 ~/Documents/UGent/Wifi-modules/measurement badd +31 ~/Documents/UGent/Wifi-modules/process_dlogs -badd +384 STM32F0-Discovery_FW_V1.0.0/Libraries/STM32F0xx_StdPeriph_Driver/inc/stm32f0xx_rcc.h -badd +901 STM32F0-Discovery_FW_V1.0.0/Libraries/STM32F0xx_StdPeriph_Driver/src/stm32f0xx_usart.c +badd +385 STM32F0-Discovery_FW_V1.0.0/Libraries/STM32F0xx_StdPeriph_Driver/inc/stm32f0xx_rcc.h badd +111 source/stm32f0_discovery.h -badd +0 source/Makefile +badd +1 source/Makefile +badd +1 ~/Documents/UGent/Wifi-modules/config/xbee_config.py " argglobal silent! argdel * argadd ~/Documents/UGent/Wifi-modules/controller @@ -62,46 +69,52 @@ setlocal fml=1 setlocal fdn=20 setlocal fen -18 -silent! normal! zo -19 -silent! normal! zo -32 +41 silent! normal! zo -38 -silent! normal! zo -40 -silent! normal! zo -45 +47 silent! normal! zo 49 silent! normal! zo -50 +54 +silent! normal! zo +58 silent! normal! zo -55 +59 +silent! normal! zo +185 silent! normal! zo -55 +196 +silent! normal! zo +197 silent! normal! zo -158 +235 silent! normal! zo -172 +240 +silent! normal! zo +241 silent! normal! zo -173 +64 +silent! normal! zo +191 silent! normal! zo -55 +202 silent! normal! zo -169 +203 silent! normal! zo -180 +241 +silent! normal! zo +246 silent! normal! zo -181 +247 silent! normal! zo -let s:l = 63 - ((4 * winheight(0) + 24) / 48) +270 +silent! normal! zo +let s:l = 45 - ((44 * winheight(0) + 24) / 49) if s:l < 1 | let s:l = 1 | endif exe s:l normal! zt -63 -normal! 05| +45 +normal! 0 lcd ~/Documents/UGent/Wifi-modules/controller wincmd w " argglobal @@ -115,7 +128,7 @@ setlocal fdn=20 setlocal fen silent! normal! zE -let s:l = 111 - ((23 * winheight(0) + 24) / 48) +let s:l = 111 - ((5 * winheight(0) + 24) / 49) if s:l < 1 | let s:l = 1 | endif exe s:l normal! zt @@ -140,14 +153,14 @@ setlocal fdn=20 setlocal fen silent! normal! zE -let s:l = 5 - ((4 * winheight(0) + 24) / 48) +let s:l = 57 - ((5 * winheight(0) + 24) / 49) if s:l < 1 | let s:l = 1 | endif exe s:l normal! zt -5 -normal! 0 +57 +normal! 034| lcd ~/Documents/UGent/Wifi-modules/controller -tabedit ~/Documents/UGent/Wifi-modules/config/config.py +tabedit ~/Documents/UGent/Wifi-modules/config/xbee_config.py set splitbelow splitright set nosplitbelow wincmd t @@ -162,12 +175,12 @@ setlocal fdn=20 setlocal fen silent! normal! zE -let s:l = 52 - ((4 * winheight(0) + 24) / 48) +let s:l = 74 - ((21 * winheight(0) + 24) / 49) if s:l < 1 | let s:l = 1 | endif exe s:l normal! zt -52 -normal! 039| +74 +normal! 06| lcd ~/Documents/UGent/Wifi-modules/controller tabedit ~/Documents/UGent/Wifi-modules/measurement set splitbelow splitright @@ -184,12 +197,34 @@ setlocal fdn=20 setlocal fen silent! normal! zE -let s:l = 52 - ((4 * winheight(0) + 24) / 48) +let s:l = 47 - ((44 * winheight(0) + 24) / 49) if s:l < 1 | let s:l = 1 | endif exe s:l normal! zt -52 -normal! 015| +47 +normal! 0 +lcd ~/Documents/UGent/Wifi-modules/controller +tabedit ~/Documents/UGent/Wifi-modules/process_dlogs +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 = 97 - ((39 * winheight(0) + 25) / 50) +if s:l < 1 | let s:l = 1 | endif +exe s:l +normal! zt +97 +normal! 017| lcd ~/Documents/UGent/Wifi-modules/controller tabnext 1 if exists('s:wipebuf') diff -r 5fd16ed8bb6d -r dd76ef1174f1 zshrc --- a/zshrc Sun Jul 27 23:15:54 2014 +0200 +++ b/zshrc Wed Jul 30 19:12:19 2014 +0200 @@ -88,4 +88,14 @@ [[ -f ~/.zshrc.local ]] && source ~/.zshrc.local +bindkey '\e[A' history-beginning-search-backward +bindkey '\e[B' history-beginning-search-forward + source ~/.fzf.zsh +q() { + if [[ -z "$*" ]]; then + cd "$(_z -l 2>&1 | sed -n 's/^[ 0-9.,]*//p' | fzf)" + else + _z "$@" + fi +}