Get project settings from invoke
This commit is contained in:
parent
5dc7e1713d
commit
409da47ad9
@ -5,7 +5,6 @@ command -nargs=? -complete=dir DlcProGui call s:ProjectSet('dlcpro-gui', '<args>
|
||||
command -nargs=? -complete=dir DlcProTui call s:ProjectSet('dlcpro-tui', '<args>')
|
||||
command -nargs=? -complete=dir DlcProTuiSimulator call s:ProjectSet('dlcpro-tui-simulator', '<args>')
|
||||
command -nargs=? -complete=dir DlcProCan call s:ProjectSet('dlcpro-can', '<args>')
|
||||
command -nargs=? -complete=dir DlcProSpecalyser call s:ProjectSet('dlcpro-specalyser', '<args>')
|
||||
command -nargs=? -complete=dir Topmode call s:ProjectSet('topmode', '<args>')
|
||||
command -nargs=? -complete=dir TopmodeGui call s:ProjectSet('topmode-gui', '<args>')
|
||||
command -nargs=? -complete=dir DigiFalc call s:ProjectSet('digifalc', '<args>')
|
||||
@ -47,8 +46,6 @@ function! s:ProjectSet(project_type, project_base_dir)
|
||||
let s:ProjectBaseDir = '/home/stefan/dlcpro/firmware.tui-simulator'
|
||||
elseif (g:project_type == 'dlcpro-can')
|
||||
let s:ProjectBaseDir = '/home/stefan/dlcpro/firmware'
|
||||
elseif (g:project_type == 'dlcpro-specalyser')
|
||||
let s:ProjectBaseDir = '/home/stefan/dlcpro/firmware'
|
||||
elseif (g:project_type == 'shg')
|
||||
let s:ProjectBaseDir = '/home/stefan/dlcpro/shg-firmware'
|
||||
elseif (g:project_type == 'dlcpro-gui')
|
||||
@ -81,124 +78,6 @@ function! s:ProjectSet(project_type, project_base_dir)
|
||||
execute 'set path-=./**'
|
||||
execute 'set path+=' . s:ProjectSrcDir.'/**'
|
||||
|
||||
if (count(['pfd', 'tiny'], g:project_type) > 0)
|
||||
let g:ProjectBuildDir = s:ProjectSrcDir.'/.build/target/firmware/Debug'
|
||||
let g:DebugRemote = v:true
|
||||
let g:termdebugger = 'arm-none-eabi-gdb'
|
||||
let s:gdb_connect_script = g:ProjectBuildDir.'/gdbinit'
|
||||
elseif (count(['dlcpro', 'dlcpro-new'], g:project_type) > 0)
|
||||
set wildignore-=**/firmware/src/device-control/**
|
||||
set wildignore+=**/shg-firmware/**
|
||||
set titlestring=%<%t\ (%{expand('%:p:h')})%=project:\ %{g:project_type}\ \ \ \ compiler:\ %{g:Compiler_version()}
|
||||
let g:DeviceIP = 'dlc_pro__040083'
|
||||
let g:DebugRemote = v:true
|
||||
let g:ProjectBuildDir = s:ProjectSrcDir.'/.build/'.g:project_type
|
||||
if (g:project_type == 'dlcpro-new')
|
||||
let s:firware_file_name = 'DLCpro-archive-SSW7.fw'
|
||||
else
|
||||
let s:firware_file_name = 'DLCpro-archive.fw'
|
||||
endif
|
||||
let s:firmware_file = g:ProjectBuildDir.'/artifacts/'.s:firware_file_name
|
||||
let g:DeviceType = 'TApro'
|
||||
let g:PowerswitchIP = 'elab-stefan'
|
||||
let g:Powerplug = '1'
|
||||
let g:termdebugger = 'arm-none-eabi-gdb'
|
||||
let s:gdb_connect_script = g:ProjectBuildDir.'/gdbinit'
|
||||
command! DlcProGuiStart execute("!~/dlcpro/pc-gui/start-gui&")
|
||||
elseif ((g:project_type == 'dlcpro-tui') || (g:project_type == 'dlcpro-tui-simulator'))
|
||||
let s:Program = '/user-interface/src/user-interface'
|
||||
let s:Elffile = s:Program
|
||||
let g:ProgramRemote = '/opt/app/bin/user-interface'
|
||||
set wildignore-=**/firmware/src/device-control/**
|
||||
set wildignore+=**/shg-firmware/**
|
||||
let g:DeviceIP = 'dlc_pro__040083'
|
||||
let g:DebugRemote = v:true
|
||||
elseif (g:project_type == 'dlcpro-can')
|
||||
let s:Program = '/canopen/can-updater'
|
||||
let s:Elffile = s:Program
|
||||
let g:ProgramRemote = '/opt/app/bin/can-updater'
|
||||
set wildignore-=**/firmware/src/device-control/**
|
||||
set wildignore+=**/shg-firmware/**
|
||||
let g:DeviceIP = 'dlc_pro__040083'
|
||||
let g:DebugRemote = v:true
|
||||
elseif (g:project_type == 'dlcpro-specalyser')
|
||||
let s:Program = '/specalyser/specalyser'
|
||||
let s:Elffile = s:Program
|
||||
let g:ProgramRemote = '/opt/app/bin/specalyser'
|
||||
set wildignore-=**/firmware/src/device-control/**
|
||||
set wildignore+=**/shg-firmware/**
|
||||
let g:DeviceIP = 'dlc_pro__040083'
|
||||
let g:DebugRemote = v:true
|
||||
elseif (g:project_type == 'shg')
|
||||
let s:Program = '/shg-firmware/device-control/device-control-shg'
|
||||
let s:Elffile = s:Program
|
||||
let g:ProgramRemote = '/opt/app/bin/device-control-shg'
|
||||
set wildignore-=**/shg-firmware/**
|
||||
set wildignore+=**/firmware/src/device-control/**
|
||||
let g:DeviceIP = 'dlc_pro__040083'
|
||||
let g:DebugRemote = v:true
|
||||
" let g:GdbPort = '6666'
|
||||
" let g:SshOpts = '-o ForwardAgent=yes -o ProxyCommand="ssh -o RemoteCommand=none -q -W shg:22 root@%h" -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -o LogLevel=ERROR'
|
||||
" let g:SshOpts2 = "-L localhost:1998:localhost:1998 -L localhost:1999:localhost:1999"
|
||||
elseif (g:project_type == 'dlcpro-gui')
|
||||
let g:ProjectBuildDir = s:ProjectSrcDir.'/.build' " FIXME (for DeviceDebug)
|
||||
let s:Program = '/TOPAS_DLC_pro'
|
||||
let s:Elffile = s:Program
|
||||
let g:termdebugger = 'gdb'
|
||||
let g:DebugRemote = v:false
|
||||
command! DlcProGuiStart execute("!~/dlcpro/pc-gui/start-gui&")
|
||||
elseif (g:project_type == 'topmode')
|
||||
let g:ProjectBuildDir = s:ProjectSrcDir.'/.build/'
|
||||
let g:DeviceIP = 'topmode_stefan'
|
||||
let g:DebugRemote = v:true
|
||||
let g:termdebugger = 'arm-none-eabi-gdb'
|
||||
let s:gdb_connect_script = g:ProjectBuildDir.'/gdbinit'
|
||||
let s:firware_file_name = 'TopMode-CHARM-Control-1.5.4-dev.fw'
|
||||
let s:firmware_file = g:ProjectBuildDir.'/artifacts/'.s:firware_file_name
|
||||
command! TopmodeGuiStart execute("!~/topmode/pc-gui/start-gui&")
|
||||
elseif (g:project_type == 'topmode-gui')
|
||||
let g:DebugRemote = v:false
|
||||
command! TopmodeGuiStart execute("!~/topmode/pc-gui/start-gui&")
|
||||
elseif (g:project_type == 'digifalc')
|
||||
let s:Program = '/digifalc-image.bin'
|
||||
let s:Elffile = '/application/digifalc.elf'
|
||||
let g:DebugRemote = v:true
|
||||
let g:termdebugger = 'arm-none-eabi-gdb'
|
||||
elseif (g:project_type == 'servoboard')
|
||||
let s:Program = '/servo-board-image.bin'
|
||||
let s:Elffile = '/application/servo-board.elf'
|
||||
let g:DebugRemote = v:true
|
||||
let g:termdebugger = 'arm-none-eabi-gdb'
|
||||
elseif (g:project_type == 'dl-motor')
|
||||
let s:Program = '/dl-motor-image.bin'
|
||||
let s:Elffile = '/application/dl-motor.elf'
|
||||
let g:DebugRemote = v:true
|
||||
let g:termdebugger = 'arm-none-eabi-gdb'
|
||||
elseif (g:project_type == 'operation-panel-f1')
|
||||
let g:stm32_target = 'STM32F10X'
|
||||
let s:Program = '/firmware/operation_panel_'.g:stm32_target.'.bin'
|
||||
let s:Elffile = '/firmware/operation_panel_'.g:stm32_target.'.elf'
|
||||
" let s:makegoals = ['artifacts']
|
||||
let g:DebugRemote = v:true
|
||||
" let g:GdbPort = '3333'
|
||||
let g:termdebugger = 'arm-none-eabi-gdb'
|
||||
" let s:stm_cfg = 'stm32f1x'
|
||||
elseif (g:project_type == 'operation-panel-f4')
|
||||
let g:stm32_target = 'STM32F4XX'
|
||||
let s:Program = '/firmware/operation_panel_'.g:stm32_target.'.bin'
|
||||
let s:Elffile = '/firmware/operation_panel_'.g:stm32_target.'.elf'
|
||||
" let s:makegoals = ['artifacts']
|
||||
let g:DebugRemote = v:true
|
||||
" let g:GdbPort = '3333'
|
||||
let g:termdebugger = 'arm-none-eabi-gdb'
|
||||
" let s:stm_cfg = 'stm32f4x'
|
||||
elseif (g:project_type == 'decof')
|
||||
" let s:makegoals = ['all']
|
||||
let g:DebugRemote = v:false
|
||||
else
|
||||
echo "no project"
|
||||
endif
|
||||
|
||||
" Settings for invoke development
|
||||
let s:invoke = 'invoke'
|
||||
let s:tasks_file_dev = '/home/stefan/tools/invoke/'.g:project_type.'/tasks.py'
|
||||
@ -210,15 +89,163 @@ function! s:ProjectSet(project_type, project_base_dir)
|
||||
echoerr 'tasks.py not found'
|
||||
endif
|
||||
|
||||
|
||||
" ====
|
||||
" Make
|
||||
" ====
|
||||
|
||||
function! s:getDefaultforOption(option_name)
|
||||
if a:option_name == '--project'
|
||||
return g:project_type
|
||||
elseif a:option_name == '--device-ip'
|
||||
return g:DeviceIP
|
||||
elseif a:option_name == '--build-type'
|
||||
return g:BuildType
|
||||
elseif a:option_name == '--version-file'
|
||||
return g:ProjectBuildDir.'/artifacts/VERSION'
|
||||
elseif a:option_name == '--laser1-type'
|
||||
return g:DeviceType
|
||||
elseif a:option_name == '--powerswitch-ip'
|
||||
return g:PowerswitchIP
|
||||
elseif a:option_name == '--powerplug'
|
||||
return g:Powerplug
|
||||
else
|
||||
return ""
|
||||
endif
|
||||
endfunction
|
||||
|
||||
" Add default value for all given options, if not already set
|
||||
function! s:SetDefaults(commandline)
|
||||
|
||||
let commandline = a:commandline
|
||||
let task = split(commandline)[0]
|
||||
let l:tasks = system(s:invoke.' --list')
|
||||
|
||||
if l:tasks =~ task
|
||||
let l:options_allowed = system(s:invoke.' --complete -- '.task.' -')
|
||||
for option in split(l:options_allowed)
|
||||
let value = s:getDefaultforOption(option)
|
||||
if value != '' && commandline !~ option
|
||||
let commandline .= ' '.option.'='.value
|
||||
endif
|
||||
endfor
|
||||
endif
|
||||
|
||||
return commandline
|
||||
endfunction
|
||||
|
||||
function! s:Make(args, async_mode)
|
||||
" Add defaults for options
|
||||
let l:options = s:SetDefaults(a:args)
|
||||
|
||||
if (a:async_mode == 'sync')
|
||||
" Synchronous execution with returned output
|
||||
let l:output = trim(system(s:invoke.' -e '.l:options))
|
||||
if l:output =~ 'No idea'
|
||||
return ''
|
||||
else
|
||||
return l:output
|
||||
endif
|
||||
elseif (a:async_mode == 'background')
|
||||
" Asynchronous execution in background
|
||||
call system(s:invoke.' -e '.l:options.'&')
|
||||
else
|
||||
call asyncrun#quickfix_toggle(10, 1)
|
||||
let &makeprg = s:invoke.' -e'
|
||||
execute 'AsyncRun -mode='.a:async_mode.' -save=2 -program=make @ '.l:options
|
||||
endif
|
||||
endfunction
|
||||
|
||||
" Tab-completion is done with plugin vim-bash-completion
|
||||
let $BASH_COMPLETION_DIR = '/home/stefan/.invoke'
|
||||
let invoke_completion_file = $BASH_COMPLETION_DIR.'/bash_completion'
|
||||
if !filereadable(invoke_completion_file)
|
||||
call system('invoke --print-completion-script bash > '.invoke_completion_file)
|
||||
endif
|
||||
function! GetAllMakeCompletions(ArgLead, CmdLine, CursorPos)
|
||||
let l:words = split(a:CmdLine)
|
||||
let l:words[0] = 'invoke'
|
||||
let l:command = join(l:words)
|
||||
return bash#complete(l:command)
|
||||
endfunction
|
||||
|
||||
" Get some configurations from the project
|
||||
" ----------------------------------------
|
||||
let l:tasks = s:Make('--list', 'sync')
|
||||
let g:DebugRemote = l:targets =~ 'gdb-server'
|
||||
|
||||
let g:ProjectBuildDir = s:Make('build-dir', 'sync')
|
||||
let g:Elffile = s:Make('elf-file', 'sync')
|
||||
|
||||
let l:is_arm = s:Make('is-arm', 'sync')
|
||||
let g:termdebug_config = {}
|
||||
if l:is_arm =~ 'True'
|
||||
if g:project_type == 'topmode'
|
||||
" Old topmode needs old gdb
|
||||
let g:termdebug_config['command'] = '/opt/OSELAS.Toolchain-2020.08.0/arm-v7a-linux-gnueabihf/gcc-10.2.1-clang-10.0.1-glibc-2.32-binutils-2.35-kernel-5.8-sanitized/bin/arm-v7a-linux-gnueabihf-gdb'
|
||||
else
|
||||
let g:termdebug_config['command'] = 'arm-none-eabi-gdb'
|
||||
else
|
||||
let g:termdebug_config['command'] = 'gdb'
|
||||
endif
|
||||
|
||||
if (count(['dlcpro', 'dlcpro-new'], g:project_type) > 0)
|
||||
set wildignore-=**/firmware/src/device-control/**
|
||||
set wildignore+=**/shg-firmware/**
|
||||
set titlestring=%<%t\ (%{expand('%:p:h')})%=project:\ %{g:project_type}\ \ \ \ compiler:\ %{g:Compiler_version()}
|
||||
let g:DeviceIP = 'dlc_pro__040083'
|
||||
let g:DeviceType = 'TApro'
|
||||
let g:PowerswitchIP = 'elab-stefan'
|
||||
let g:Powerplug = '1'
|
||||
command! DlcProGuiStart execute("!~/dlcpro/pc-gui/start-gui&")
|
||||
elseif ((g:project_type == 'dlcpro-tui') || (g:project_type == 'dlcpro-tui-simulator'))
|
||||
" let s:Program = '/user-interface/src/user-interface'
|
||||
" let s:Elffile = s:Program
|
||||
" let g:ProgramRemote = '/opt/app/bin/user-interface'
|
||||
set wildignore-=**/firmware/src/device-control/**
|
||||
set wildignore+=**/shg-firmware/**
|
||||
let g:DeviceIP = 'dlc_pro__040083'
|
||||
elseif (g:project_type == 'dlcpro-can')
|
||||
" let s:Program = '/canopen/can-updater'
|
||||
" let s:Elffile = s:Program
|
||||
" let g:ProgramRemote = '/opt/app/bin/can-updater'
|
||||
set wildignore-=**/firmware/src/device-control/**
|
||||
set wildignore+=**/shg-firmware/**
|
||||
let g:DeviceIP = 'dlc_pro__040083'
|
||||
elseif (g:project_type == 'shg')
|
||||
" let s:Program = '/shg-firmware/device-control/device-control-shg'
|
||||
" let s:Elffile = s:Program
|
||||
" let g:ProgramRemote = '/opt/app/bin/device-control-shg'
|
||||
set wildignore-=**/shg-firmware/**
|
||||
set wildignore+=**/firmware/src/device-control/**
|
||||
let g:DeviceIP = 'dlc_pro__040083'
|
||||
" let g:DebugRemote = v:true
|
||||
" let g:GdbPort = '6666'
|
||||
" let g:SshOpts = '-o ForwardAgent=yes -o ProxyCommand="ssh -o RemoteCommand=none -q -W shg:22 root@%h" -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -o LogLevel=ERROR'
|
||||
" let g:SshOpts2 = "-L localhost:1998:localhost:1998 -L localhost:1999:localhost:1999"
|
||||
elseif (g:project_type == 'dlcpro-gui')
|
||||
command! DlcProGuiStart execute("!~/dlcpro/pc-gui/start-gui&")
|
||||
elseif (g:project_type == 'topmode')
|
||||
let g:DeviceIP = 'topmode_stefan'
|
||||
let g:PowerswitchIP = 'elab-stefan'
|
||||
let g:Powerplug = '3'
|
||||
command! TopmodeGuiStart execute("!~/topmode/pc-gui/start-gui&")
|
||||
elseif (g:project_type == 'topmode-gui')
|
||||
command! TopmodeGuiStart execute("!~/topmode/pc-gui/start-gui&")
|
||||
elseif (g:project_type == 'operation-panel-f1')
|
||||
let g:stm32_target = 'STM32F10X'
|
||||
elseif (g:project_type == 'operation-panel-f4')
|
||||
let g:stm32_target = 'STM32F4XX'
|
||||
endif
|
||||
|
||||
" python tags
|
||||
execute "set tags+=" . s:ProjectBaseDir . '/tags'
|
||||
|
||||
" compiler
|
||||
if exists("s:Program")
|
||||
let g:Program = g:ProjectBuildDir.s:Program
|
||||
let g:Elffile = g:ProjectBuildDir.s:Elffile
|
||||
endif
|
||||
endfunction
|
||||
" if exists("s:Program")
|
||||
" " let g:Program = g:ProjectBuildDir.s:Program
|
||||
" let g:Elffile = g:ProjectBuildDir.s:Elffile
|
||||
" endif
|
||||
|
||||
" =============
|
||||
" Some settings
|
||||
@ -255,76 +282,6 @@ augroup QuickfixStatus
|
||||
\ statusline=%t\ [%{g:asyncrun_status}]\ %{exists('w:quickfix_title')?\ '\ '.w:quickfix_title\ :\ ''}\ %=%-15(%l,%c%V%)\ %P
|
||||
augroup END
|
||||
|
||||
|
||||
" ====
|
||||
" Make
|
||||
" ====
|
||||
|
||||
function! s:getDefaultforOption(option_name)
|
||||
if a:option_name == '--project'
|
||||
return g:project_type
|
||||
elseif a:option_name == '--device-ip'
|
||||
return g:DeviceIP
|
||||
elseif a:option_name == '--build-type'
|
||||
return g:BuildType
|
||||
elseif a:option_name == '--firmware-file'
|
||||
return s:firmware_file
|
||||
elseif a:option_name == '--version-file'
|
||||
return g:ProjectBuildDir.'/artifacts/VERSION'
|
||||
elseif a:option_name == '--laser1-type'
|
||||
return g:DeviceType
|
||||
elseif a:option_name == '--powerswitch-ip'
|
||||
return g:PowerswitchIP
|
||||
elseif a:option_name == '--powerplug'
|
||||
return g:Powerplug
|
||||
elseif a:option_name == '--firmware-file'
|
||||
return s:firmware_file
|
||||
else
|
||||
return ""
|
||||
endif
|
||||
endfunction
|
||||
|
||||
" Add default value for all given options, if not already set
|
||||
function! s:SetDefaults(commandline)
|
||||
|
||||
let commandline = a:commandline
|
||||
let task = split(commandline)[0]
|
||||
let l:options_allowed = system(s:invoke.' --complete -- '.task.' -')
|
||||
for option in split(l:options_allowed)
|
||||
let value = s:getDefaultforOption(option)
|
||||
if value != '' && commandline !~ option
|
||||
let commandline .= ' '.option.'='.value
|
||||
endif
|
||||
endfor
|
||||
return commandline
|
||||
endfunction
|
||||
|
||||
function! s:Make(args, async_mode)
|
||||
" Add defaults for options
|
||||
let l:options = s:SetDefaults(a:args)
|
||||
|
||||
if (a:async_mode == 'background')
|
||||
call system(s:invoke.' -e '.l:options.'&')
|
||||
else
|
||||
call asyncrun#quickfix_toggle(10, 1)
|
||||
let &makeprg = s:invoke.' -e'
|
||||
execute 'AsyncRun -mode='.a:async_mode.' -save=2 -program=make @ '.l:options
|
||||
endif
|
||||
endfunction
|
||||
|
||||
" Tab-completion is done with plugin vim-bash-completion
|
||||
let $BASH_COMPLETION_DIR = '/home/stefan/.invoke'
|
||||
let invoke_completion_file = $BASH_COMPLETION_DIR.'/bash_completion'
|
||||
if !filereadable(invoke_completion_file)
|
||||
call system('invoke --print-completion-script bash > '.invoke_completion_file)
|
||||
endif
|
||||
function! GetAllMakeCompletions(ArgLead, CmdLine, CursorPos)
|
||||
let l:words = split(a:CmdLine)
|
||||
let l:words[0] = 'invoke'
|
||||
let l:command = join(l:words)
|
||||
return bash#complete(l:command)
|
||||
endfunction
|
||||
|
||||
function! s:DeviceFirmwareUpdate()
|
||||
call s:Make('kill', 'bang')
|
||||
call s:Make('flash', 'bang')
|
||||
@ -362,8 +319,12 @@ function! s:DeviceDebug(attach)
|
||||
autocmd! User TermdebugStopPost
|
||||
call s:Make('gdb-server', 'background')
|
||||
sleep 2
|
||||
if exists('s:gdb_connect_script')
|
||||
let s:gdb_connect_script = g:ProjectBuildDir.'/gdbinit'
|
||||
if file_readable(s:gdb_connect_script)
|
||||
echom 'Liebl1'
|
||||
autocmd User TermdebugStartPost call term_sendkeys('',"source ".s:gdb_connect_script."\n")
|
||||
else
|
||||
echom 'Liebl2'
|
||||
endif
|
||||
Termdebug
|
||||
call s:SendToDebugger('set confirm off')
|
||||
@ -380,7 +341,7 @@ endfunction
|
||||
" ------
|
||||
" Pandoc
|
||||
" ------
|
||||
command TopticaBeamer execute('!pandoc -s -t beamer -H toptica-style.tex -o %:r.pdf %')
|
||||
command! TopticaBeamer execute('!pandoc -s -t beamer -H toptica-style.tex -o %:r.pdf %')
|
||||
|
||||
" -----------------
|
||||
" Jenkins validator
|
||||
@ -414,3 +375,4 @@ function! s:Jenkins_linter(jenkinsfile)
|
||||
endif
|
||||
echo l:out
|
||||
endfunction
|
||||
endfunction
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user