stefan/vimsuite
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

toptica improvements

Browse Source
This commit is contained in:
Stefan Liebl 2025-02-04 15:32:23 +01:00
parent c5125878b4
commit c21c8f8c9d
1 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
vimfiles.stefan/plugin/toptica.vim
View File

@ -118,11 +118,7 @@ function! s:ProjectSet(project_type, project_base_dir)
else else
let s:firware_file_name = 'DLCpro-archive.fw' let s:firware_file_name = 'DLCpro-archive.fw'
endif endif
" if (g:project_type == 'dlcpro-new') let g:termdebugger = 'arm-none-eabi-gdb'
let g:termdebugger = 'arm-v7a-linux-gnueabihf-gdb' " FIXME: get from ???
" else
" let g:termdebugger = 'arm-cortexa8-linux-gnueabi-gdb' " FIXME: get from ???
" endif
let s:gdb_connect_script = g:ProjectBuildDir.'/gdbinit' let s:gdb_connect_script = g:ProjectBuildDir.'/gdbinit'
command! DlcProGuiStart execute("!~/dlcpro/pc-gui/start-gui&") command! DlcProGuiStart execute("!~/dlcpro/pc-gui/start-gui&")
elseif ((g:project_type == 'dlcpro-tui') || (g:project_type == 'dlcpro-tui-simulator')) elseif ((g:project_type == 'dlcpro-tui') || (g:project_type == 'dlcpro-tui-simulator'))
@ -171,7 +167,7 @@ function! s:ProjectSet(project_type, project_base_dir)
let g:ProjectBuildDir = s:ProjectSrcDir.'/.build/' let g:ProjectBuildDir = s:ProjectSrcDir.'/.build/'
let g:DeviceIP = 'topmode_stefan' let g:DeviceIP = 'topmode_stefan'
let g:DebugRemote = v:true let g:DebugRemote = v:true
let g:termdebugger = 'arm-v7a-linux-gnueabihf-gdb' " FIXME: get from ??? let g:termdebugger = 'arm-none-eabi-gdb'
let s:gdb_connect_script = g:ProjectBuildDir.'/gdbinit' let s:gdb_connect_script = g:ProjectBuildDir.'/gdbinit'
let s:firware_file_name = 'TopMode-CHARM-Control-1.5.4-dev.fw' let s:firware_file_name = 'TopMode-CHARM-Control-1.5.4-dev.fw'
command! TopmodeGuiStart execute("!~/topmode/pc-gui/start-gui&") command! TopmodeGuiStart execute("!~/topmode/pc-gui/start-gui&")
@ -319,18 +315,15 @@ function! s:Make(args, async_mode)
let options = system(s:invoke.' --complete -- '.task.' -') let options = system(s:invoke.' --complete -- '.task.' -')
" Add --project if necessary " Add --project if necessary
" if '--project' =~ options && '--project' !~ l:args if options =~ '--project' && a:args !~ '--project'
if options =~ '--project' && '--project' !~ l:args
let l:args .= ' --project='.g:project_type let l:args .= ' --project='.g:project_type
endif endif
" Add --device-ip if necessary " Add --device-ip if necessary
" if '--device-ip' =~ options && '--device-ip' !~ l:args if options =~ '--device-ip' && l:args !~ '--device-ip'
if options =~ '--device-ip' && '--device-ip' !~ l:args
let l:args .= ' --device-ip='.g:DeviceIP let l:args .= ' --device-ip='.g:DeviceIP
endif endif
" Add --build-type=Debug " Add --build-type=Debug
" if '--build-type' =~ options && '--build-type' !~ l:args if options =~ '--build-type' && l:args !~ '--build-type'
if options =~ '--build-type' && '--build-type' !~ l:args
let l:args .= ' --build-type=Debug' let l:args .= ' --build-type=Debug'
endif endif
@ -421,6 +414,8 @@ let g:DlcproRegtest_smoke = 1
let g:DlcproRegtest_fw_update = 0 let g:DlcproRegtest_fw_update = 0
let g:DlcproRegtest_marks = 'usb, usbstick, si, si1, servo_control, eom, cavity, cell_spectroscopy, falc, pfd, smc' let g:DlcproRegtest_marks = 'usb, usbstick, si, si1, servo_control, eom, cavity, cell_spectroscopy, falc, pfd, smc'
let g:TopmodeRegtest_smoke = 0
function! s:DlcproRegtest(device_ip, laser1_type, marks, tests) function! s:DlcproRegtest(device_ip, laser1_type, marks, tests)
execute "wa" execute "wa"
@ -455,15 +450,15 @@ function! s:DlcproRegtest(device_ip, laser1_type, marks, tests)
execute "terminal ++shell " . regtest_cmd execute "terminal ++shell " . regtest_cmd
endfunction endfunction
command -nargs=? -complete=file TopmodeRegtest call s:TopmodeRegtest('topmode_stefan', '', '<args>') command -nargs=? -complete=file TopmodeRegtest call s:TopmodeRegtest('', '<args>')
function! s:TopmodeRegtest(device_ip, marks, tests) function! s:TopmodeRegtest(marks, tests)
execute "wa" execute "wa"
let regtest_cmd = 'time' let regtest_cmd = 'time'
\.' '.s:invoke \.' '.s:invoke
\.' -e' \.' -e'
\.' regtest' \.' regtest'
\.' --device-ip='.a:device_ip \.' --device-ip='.g:DeviceIP
" \.' --do-fw-update' " \.' --do-fw-update'
" \.' --smoke' " \.' --smoke'
@ -474,7 +469,7 @@ function! s:TopmodeRegtest(device_ip, marks, tests)
if g:DlcproRegtest_fw_update == 1 if g:DlcproRegtest_fw_update == 1
let regtest_cmd .= ' --do-fw-update' let regtest_cmd .= ' --do-fw-update'
endif endif
if g:DlcproRegtest_smoke == 1 if g:TopmodeRegtest_smoke == 1
let regtest_cmd .= ' --smoke' let regtest_cmd .= ' --smoke'
endif endif
let regtest_cmd .= ' --marks="'.a:marks.'"' let regtest_cmd .= ' --marks="'.a:marks.'"'