Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 19 additions & 15 deletions autoload/arduino.vim
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,9 @@ function! arduino#InitializeConfig() abort
if !exists('g:arduino_use_slime')
let g:arduino_use_slime = 0
endif
if !exists('g:arduino_use_vimux') || !exists('$TMUX')
let g:arduino_use_vimux = 0
endif

if !exists('g:arduino_run_headless')
let g:arduino_run_headless = executable('Xvfb') == 1
Expand All @@ -81,6 +84,16 @@ function! arduino#InitializeConfig() abort
call arduino#ReloadBoards()
endfunction

function! arduino#RunCmd(cmd) abort
if g:arduino_use_slime
call slime#send(a:cmd . "\r")
elseif g:arduino_use_vimux
call VimuxRunCommand(a:cmd)
else
exe s:TERM . a:cmd
endif
endfunction

" Boards and programmer definitions {{{1
function! arduino#ReloadBoards() abort
" TODO in the future if we're using arduino-cli we shouldn't have to do this,
Expand Down Expand Up @@ -517,11 +530,8 @@ function! arduino#Verify() abort
else
let cmd = arduino#GetArduinoCommand("--verify")
endif
if g:arduino_use_slime
call slime#send(cmd."\r")
else
exe s:TERM . cmd
endif

call arduino#RunCmd(cmd)
return v:shell_error
endfunction

Expand All @@ -536,22 +546,16 @@ function! arduino#Upload() abort
endif
let cmd = arduino#GetArduinoCommand(cmd_options)
endif
if g:arduino_use_slime
call slime#send(cmd."\r")
else
exe s:TERM . cmd
endif

call arduino#RunCmd(cmd)
return v:shell_error
endfunction

function! arduino#Serial() abort
let cmd = arduino#GetSerialCmd()
if empty(cmd) | return | endif
if g:arduino_use_slime
call slime#send(cmd."\r")
else
exe s:TERM . cmd
endif

call arduino#RunCmd(cmd)
endfunction

function! arduino#UploadAndSerial() abort
Expand Down