invoke improvements for toptica

pack/plugins/opt/direnv.vim

@@ -0,0 +1 @@
+Subproject commit ab2a7e08dd630060cd81d7946739ac7442a4f269

vimfiles.stefan/plugin/toptica.vim

@@ -1,7 +1,9 @@
-command -nargs=1 -complete=dir DlcPro call s:ProjectSet('dlcpro', '<args>')
+command -nargs=1 -complete=dir DlcPro call s:ProjectSet('dlcpro-new', '<args>')
-command -nargs=1 -complete=dir DlcProOld call s:ProjectSet('dlcpro-old', '<args>')
+command -nargs=1 -complete=dir DlcProOld call s:ProjectSet('dlcpro', '<args>')
+command -nargs=1 -complete=dir DlcProOldOld call s:ProjectSet('dlcpro-old', '<args>')
 command -nargs=1 -complete=dir DlcProShg call s:ProjectSet('shg', '<args>')
 command -nargs=1 -complete=dir DlcProGui call s:ProjectSet('dlcpro-gui', '<args>')
+command -nargs=1 -complete=dir DlcProGuiOld call s:ProjectSet('dlcpro-gui-old', '<args>')
 command -nargs=1 -complete=dir DlcProTui call s:ProjectSet('dlcpro-tui', '<args>')
 command -nargs=1 -complete=dir DlcProTuiSimulator call s:ProjectSet('dlcpro-tui-simulator', '<args>')
 command -nargs=1 -complete=dir DlcProCan call s:ProjectSet('dlcpro-can', '<args>')
@@ -39,9 +41,9 @@ function! s:ProjectSet(project_type, project_base_dir)
         endif
     else
         " defaults
-        if (g:project_type == 'dlcpro')
+        if (g:project_type == 'dlcpro-new')
             let s:ProjectBaseDir = '/home/stefan/dlcpro/firmware'
-        elseif (g:project_type == 'dlcpro-old')
+        elseif (g:project_type == 'dlcpro')
             let s:ProjectBaseDir = '/home/stefan/dlcpro/firmware'
         elseif (g:project_type == 'dlcpro-tui')
             let s:ProjectBaseDir = '/home/stefan/dlcpro/firmware'
@@ -78,55 +80,20 @@ function! s:ProjectSet(project_type, project_base_dir)
 
     let g:ProjectSrcDirRel = 'src'
     let s:ProjectSrcDir = s:ProjectBaseDir.'/'.g:ProjectSrcDirRel
-    let g:ProjectBuildDir = s:ProjectBaseDir.'/build'
-
-    let s:oselas_gcc4_lastname = 'arm-cortexa8-linux-gnueabi'
-    let s:oselas_gcc4_root = '/opt/OSELAS.Toolchain-2012.12.1/'.s:oselas_gcc4_lastname.'/'.
-                \'gcc-4.7.3-glibc-2.16.0-binutils-2.22-kernel-3.6-sanitized/'
-    let s:oselas_gcc_lastname = 'arm-v7a-linux-gnueabihf'
-    let s:oselas_gcc_root = '/opt/OSELAS.Toolchain-2022.10.2/'.s:oselas_gcc_lastname.'/'.
-                \'gcc-12.3.1-glibc-2.33-binutils-2.39-kernel-5.4-sanitized/'
-
-    function! s:set_oselas_gcc4()
-        if s:use_invoke
-            let g:new_compiler = v:false
-        else
-            let g:GccRoot = s:oselas_gcc4_root
-            " let g:termdebugger = s:oselas_gcc4_root . 'bin/'.s:oselas_gcc4_lastname.'-gdb'
-            let g:termdebugger = s:oselas_gcc_root . 'bin/'.s:oselas_gcc_lastname.'-gdb'
-            let g:oselas_gcc_solib_paths = s:oselas_gcc4_root.'/'.s:oselas_gcc4_lastname.'/lib/'.':'.
-                        \ s:oselas_gcc4_root.'/sysroot-'.s:oselas_gcc4_lastname.'/lib/'.':'.
-                        \ s:oselas_gcc4_root.'/sysroot-'.s:oselas_gcc4_lastname.'/usr/lib/'
-            " let $PATH = s:oselas_gcc4_root.'/sysroot-'.s:oselas_gcc4_lastname.'/usr/include'.':'.s:path_orig
-            let g:analyser = s:oselas_gcc_root . 'bin/'.s:oselas_gcc_lastname.'-gcc'
-            let g:dnew_compiler = ' -DNEW_COMPILER=OFF'
-        endif
-    endfunction
-
-    function! s:set_oselas_gcc()
-        if s:use_invoke
-            let g:new_compiler = v:true
-        else
-            let g:GccRoot = s:oselas_gcc_root
-            let g:termdebugger = s:oselas_gcc_root . 'bin/'.s:oselas_gcc_lastname.'-gdb'
-            let g:oselas_gcc_solib_paths =  s:oselas_gcc_root.'/'.s:oselas_gcc_lastname.'/lib/'.':'.
-                        \ s:oselas_gcc_root.'/sysroot-'.s:oselas_gcc_lastname.'/lib/'.':'.
-                        \ s:oselas_gcc_root.'/sysroot-'.s:oselas_gcc_lastname.'/usr/lib/'
-            " let $PATH = s:oselas_gcc_root.'/sysroot-'.s:oselas_gcc_lastname.'/usr/include'.':'.s:path_orig
-            let g:analyser = s:oselas_gcc4_root . 'bin/'.s:oselas_gcc4_lastname.'-gcc'
-            let g:dnew_compiler = ' -DNEW_COMPILER=ON'
-        endif
-    endfunction
 
     function! g:Compiler_version()
-        let cmakefile = g:ProjectBuildDir . '/CMakeCache.txt'
+        if exists('g:ProjectBuildDir')
-        for line in readfile(cmakefile)
+            let cmakefile = g:ProjectBuildDir . '/CMakeCache.txt'
-            if match(line, 'NEW_COMPILER:BOOL=OFF') >= 0
+            if filereadable(cmakefile)
-                return 'old'
+                for line in readfile(cmakefile)
-            elseif match(line, 'NEW_COMPILER:BOOL=ON') >= 0
+                    if match(line, 'NEW_COMPILER:BOOL=OFF') >= 0
-                return 'new'
+                        return 'old'
+                    elseif match(line, 'NEW_COMPILER:BOOL=ON') >= 0
+                        return 'new'
+                    endif
+                endfor
             endif
-        endfor
+        endif
         return 0
     endfunction
 
@@ -134,20 +101,27 @@ function! s:ProjectSet(project_type, project_base_dir)
     execute 'cd '.s:ProjectSrcDir
     execute 'set path-=./**'
     execute 'set path+=' .  s:ProjectSrcDir.'/**'
-    execute 'set path+=' .  g:ProjectBuildDir.'/**'
+    " execute 'set path+=' .  g:ProjectBuildDir.'/**'
-    let s:jlink_path = '/home/stefan/opt/SEGGER/JLink_Linux_V796k_x86_64'
 
     let s:use_invoke = v:false
+    let s:invoke_tasks = ''
 
-    if (g:project_type == 'dlcpro')
+    if (g:project_type == 'dlcpro-new') || (g:project_type == 'dlcpro')
         let s:use_invoke = v:true
+        let s:invoke_tasks = ' -c ~/tools/invoke/'.g:project_type.'/tasks'
         set wildignore-=**/firmware/src/device-control/**
         set wildignore+=**/shg-firmware/**
-        set titlestring=%<%t\ (%{expand('%:p:h')})%=project:\ %{g:project_type}\ \ \ \ compiler:\ %{Compiler_version()}
+        set titlestring=%<%t\ (%{expand('%:p:h')})%=project:\ %{g:project_type}\ \ \ \ compiler:\ %{g:Compiler_version()}
         let g:DeviceIP = 'dlc_pro__040083'
-        call s:set_oselas_gcc()
-        let g:termdebugger = '/opt/OSELAS.Toolchain-2022.10.2/arm-v7a-linux-gnueabihf/gcc-12.3.1-glibc-2.33-binutils-2.39-kernel-5.4-sanitized/bin/arm-v7a-linux-gnueabihf-gdb'
         let g:DebugRemote = v:true
+        if (g:project_type == 'dlcpro-new')
+            let g:ProjectBuildDir = s:ProjectSrcDir.'/.build/dlcpro-new'
+            let g:termdebugger = 'arm-v7a-linux-gnueabihf-gdb'
+        else
+            let g:ProjectBuildDir = s:ProjectSrcDir.'/.build/dlcpro'
+            let g:termdebugger = 'arm-cortexa8-linux-gnueabi-gdb'
+        endif
+        let s:gdb_connect_script = g:ProjectBuildDir.'/gdb-connect.txt'
         command! DlcproEmissionOn call s:DlcproEmission('1')
         command! DlcproEmissionOff call s:DlcproEmission('0')
         command! DlcproShutup call s:DlcproShutup()
@@ -157,7 +131,7 @@ function! s:ProjectSet(project_type, project_base_dir)
         let g:ProgramRemote = '/opt/app/bin/device-control'
         set wildignore-=**/firmware/src/device-control/**
         set wildignore+=**/shg-firmware/**
-        set titlestring=%<%t\ (%{expand('%:p:h')})%=compiler:\ %{Compiler_version()}
+        set titlestring=%<%t\ (%{expand('%:p:h')})%=compiler:\ %{g:Compiler_version()}
         let s:makegoals = ['artifacts-firmware', 'artifacts-docu', 'artifacts', 'device-control', 'user-interface', 'doxygen', 'fw-updates', 'shg-firmware', 'can-updater', 'specalyser', 'docu-ul0', 'code-generation', 'dependency-graphs', 'decof', 'decof-sdk', 'clean', 'distclean', 'help', 'jamplayer', 'dlcpro-slot']
         let s:makeprg = 'make'
         let g:DeviceIP = 'dlc_pro__040083'
@@ -227,6 +201,16 @@ function! s:ProjectSet(project_type, project_base_dir)
         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 s:use_invoke = v:true
+        let s:invoke_tasks = ' -c ~/tools/invoke/'.g:project_type.'/tasks'
+        let g:ProjectBuildDir = s:ProjectSrcDir.'/.build' " FIXME (for DeviceDebug)
+        let s:Program = '/TOPAS_DLC_pro'
+        let s:Elffile = s:Program
+        " let s:makegoals = []
+        " let s:makeprg = 'make'
+        let g:termdebugger = 'gdb'
+        let g:DebugRemote = v:false
+    elseif (g:project_type == 'dlcpro-gui-old')
         let s:Program = '/TOPAS_DLC_pro'
         let s:Elffile = s:Program
         let s:makegoals = []
@@ -235,9 +219,10 @@ function! s:ProjectSet(project_type, project_base_dir)
         let g:DebugRemote = v:false
     elseif (g:project_type == 'topmode')
         let s:use_invoke = v:true
+        let s:invoke_tasks = ' -c ~/tools/invoke/'.g:project_type.'/tasks'
         let g:DeviceIP = 'topmode_stefan'
-        call s:set_oselas_gcc4()
+        " call s:set_oselas_gcc4()
-        let g:termdebugger = '/opt/OSELAS.Toolchain-2022.10.2/arm-v7a-linux-gnueabihf/gcc-12.3.1-glibc-2.33-binutils-2.39-kernel-5.4-sanitized/bin/arm-v7a-linux-gnueabihf-gdb'
+        " let g:termdebugger = '/opt/OSELAS.Toolchain-2022.10.2/arm-v7a-linux-gnueabihf/gcc-12.3.1-glibc-2.33-binutils-2.39-kernel-5.4-sanitized/bin/arm-v7a-linux-gnueabihf-gdb'
         let g:DebugRemote = v:true
     elseif (g:project_type == 'topmode-old')
         let s:Program = '/topmode'
@@ -248,13 +233,12 @@ function! s:ProjectSet(project_type, project_base_dir)
         let g:DeviceIP = 'topmode_stefan'
         let g:DebugRemote = v:true
         let g:GdbPort = '2345'
-        let g:GccRoot = s:oselas_gcc4_root
         let g:SshOpts = ""
         let g:SshOpts2 = ""
         call s:set_oselas_gcc4()
     elseif (g:project_type == 'topmode-gui')
         let s:use_invoke = v:true
-        let g:new_compiler = v:false
+        let s:invoke_tasks = ' -c ~/tools/invoke/'.g:project_type.'/tasks'
         let g:DebugRemote = v:false
     elseif (g:project_type == 'topmode-gui-old')
         let s:Program = '/TOPAS_Topmode'
@@ -270,9 +254,7 @@ function! s:ProjectSet(project_type, project_base_dir)
         let s:makeprg = 'cmake --build . --target'
         let g:DebugRemote = v:true
         let g:GdbPort = '2331'
-        let g:GccRoot = '/opt/gcc-arm-none-eabi-8-2019-q3-update'
+        let g:termdebugger = 'arm-none-eabi-gdb'
-        let g:termdebugger = g:GccRoot.'/bin/arm-none-eabi-gdb'
-        let $PATH = g:GccRoot.'/bin'.':'.s:path_orig
     elseif (g:project_type == 'servoboard')
         let s:Program = '/servo-board-image.bin'
         let s:Elffile = '/application/servo-board.elf'
@@ -280,9 +262,8 @@ function! s:ProjectSet(project_type, project_base_dir)
         let s:makeprg = 'cmake --build . --target'
         let g:DebugRemote = v:true
         let g:GdbPort = '2331'
-        let g:GccRoot = '/home/stefan/opt/gcc/gcc-arm-none-eabi-8-2019-q3-update'
+        " let g:GccRoot = '/home/stefan/opt/gcc/gcc-arm-none-eabi-8-2019-q3-update'
-        let g:termdebugger = g:GccRoot.'/bin/arm-none-eabi-gdb'
+        let g:termdebugger = 'arm-none-eabi-gdb'
-        let $PATH = g:GccRoot.'/bin'.':'.s:path_orig
     elseif (g:project_type == 'dl-motor')
         let s:Program = '/dl-motor-image.bin'
         let s:Elffile = '/application/dl-motor.elf'
@@ -290,9 +271,8 @@ function! s:ProjectSet(project_type, project_base_dir)
         let s:makeprg = 'cmake --build . --target'
         let g:DebugRemote = v:true
         let g:GdbPort = '2331'
-        let g:GccRoot = '/home/stefan/opt/gcc/gcc-arm-none-eabi-9-2020-q2-update'
+        " let g:GccRoot = '/home/stefan/opt/gcc/gcc-arm-none-eabi-9-2020-q2-update'
-        let g:termdebugger = g:GccRoot.'/bin/arm-none-eabi-gdb'
+        let g:termdebugger = 'arm-none-eabi-gdb'
-        let $PATH = g:GccRoot.'/bin'.':'.s:path_orig
     elseif (g:project_type == 'pfd')
         let s:use_invoke = v:true
         let g:ProjectBuildDir = s:ProjectSrcDir.'/.build/target/firmware/Debug'
@@ -302,9 +282,9 @@ function! s:ProjectSet(project_type, project_base_dir)
         let s:makeprg = 'invoke -e build'
         let g:DebugRemote = v:true
         let g:GdbPort = '2331'
-        let g:GccRoot = '/home/stefan/opt/gcc/gcc-arm-none-eabi-10.3-2021.10'
+        " let g:GccRoot = '/home/stefan/opt/gcc/gcc-arm-none-eabi-10.3-2021.10'
-        let g:termdebugger = g:GccRoot.'/bin/arm-none-eabi-gdb'
+        let g:termdebugger = 'arm-none-eabi-gdb'
-        let $PATH = g:GccRoot.'/bin'.':'.s:jlink_path.':'.s:path_orig
+        let s:gdb_connect_script = g:ProjectBuildDir.'/gdb-connect.txt'
     elseif (g:project_type == 'operation-panel-f1')
         let g:stm32_target = 'STM32F10X'
         let s:Program = '/firmware/operation_panel_'.g:stm32_target.'.bin'
@@ -313,10 +293,9 @@ function! s:ProjectSet(project_type, project_base_dir)
         let s:makeprg = 'cmake --build . --target'
         let g:DebugRemote = v:true
         let g:GdbPort = '3333'
-        let g:GccRoot = '/home/stefan/opt/gcc/gcc-arm-none-eabi-9-2020-q2-update'
+        " let g:GccRoot = '/home/stefan/opt/gcc/gcc-arm-none-eabi-9-2020-q2-update'
-        let g:termdebugger = g:GccRoot.'/bin/arm-none-eabi-gdb'
+        let g:termdebugger = 'arm-none-eabi-gdb'
         let s:stm_cfg = 'stm32f1x'
-        let $PATH = g:GccRoot.'/bin'.':'.s:path_orig
     elseif (g:project_type == 'operation-panel-f4')
         let g:stm32_target = 'STM32F4XX'
         let s:Program = '/firmware/operation_panel_'.g:stm32_target.'.bin'
@@ -325,10 +304,9 @@ function! s:ProjectSet(project_type, project_base_dir)
         let s:makeprg = 'cmake --build . --target'
         let g:DebugRemote = v:true
         let g:GdbPort = '3333'
-        let g:GccRoot = '/home/stefan/opt/gcc/gcc-arm-none-eabi-9-2020-q2-update'
+        " let g:GccRoot = '/home/stefan/opt/gcc/gcc-arm-none-eabi-9-2020-q2-update'
-        let g:termdebugger = g:GccRoot.'/bin/arm-none-eabi-gdb'
+        let g:termdebugger = 'arm-none-eabi-gdb'
         let s:stm_cfg = 'stm32f4x'
-        let $PATH = g:GccRoot.'/bin'.':'.s:path_orig
     elseif (g:project_type == 'decof')
         let s:makegoals = ['all']
         let s:makeprg = 'cmake --build . --target'
@@ -382,11 +360,8 @@ function! s:ProjectSet(project_type, project_base_dir)
 
     function! s:DeviceFirmwareUpdate()
         if s:use_invoke
-            let l:options = ' --project=dlcpro'
+            let l:options = ' --project='.g:project_type
-            if g:new_compiler
+            execute '!invoke '.s:invoke_tasks.' -e flash-and-run --target-ip '.g:DeviceIP.l:options
-                let l:options .= ' --new-compiler'
-            endif
-            execute "!invoke -e flash-and-run --target-ip ".g:DeviceIP.l:options
         elseif (g:project_type == 'dlcpro-can')
             call s:DeviceUpdateProgramLinux()
         elseif ((g:project_type == 'digifalc') || (g:project_type == 'servoboard') || (g:project_type == 'dl-motor') || (g:project_type == 'pfd'))
@@ -427,7 +402,7 @@ function! GetAllMakeCompletions(ArgLead, CmdLine, CursorPos)
     if s:use_invoke
         let CmdList = split(a:CmdLine)
         let makegoals = []
-        let makegoals += split(system('invoke -c ~/tools/invoke/'.g:project_type.'/tasks --complete --'))
+        let makegoals += split(system('invoke '.s:invoke_tasks.' --complete --'))
         if len(CmdList) > 1
             let last_goal = CmdList[-1]
             if a:ArgLead[0] == '-' || a:ArgLead == '' && last_goal[0] == '-'
@@ -439,11 +414,11 @@ function! GetAllMakeCompletions(ArgLead, CmdLine, CursorPos)
             endif
             " Expand option
             if count(makegoals, last_goal) > 0
-                let makegoals += split(system('invoke -c ~/tools/invoke/'.g:project_type.'/tasks --complete -- '.last_goal.' -'))
+                let makegoals += split(system('invoke '.s:invoke_tasks.' --complete -- '.last_goal.' -'))
             endif
             if exists('last_opt')
                 " Expand values of option
-                let helptext = systemlist('invoke -c ~/tools/invoke/'.g:project_type.'/tasks '.last_goal.' --help')
+                let helptext = systemlist('invoke '.s:invoke_tasks.' '.last_goal.' --help')
                 let i = match(helptext, last_opt)
                 if i > 0
                     let values = []
@@ -467,13 +442,20 @@ endfunction
 function! s:Make(args, async_mode)
     call asyncrun#quickfix_toggle(10, 1)
     if s:use_invoke
-        " let l:makeprg = 'invoke -e build --project '.g:project_type
+        let l:makeprg = 'invoke '.s:invoke_tasks.' -e'
-        let l:makeprg = 'invoke -c ~/tools/invoke/'.g:project_type.'/tasks -e build'
+        let l:args = a:args
-        if g:new_compiler
+        " echom 'l:args1:'.l:args.':'
-            let l:makeprg .= ' --new-compiler'
+        if l:args == ''
+            let l:args = 'build' " default
         endif
+        if '\<build\>' =~ l:args && '--project' !~ l:args
+            if g:project_type != 'pfd' " FIXME
+                let l:args .= ' --project='.g:project_type
+            endif
+        endif
+        " echom 'l:args2:'.l:args.':'
         let &makeprg = l:makeprg
-        execute 'AsyncRun -mode='.a:async_mode.' -save=2 -program=make @ '.a:args
+        execute 'AsyncRun -mode='.a:async_mode.' -save=2 -program=make @ '.l:args
     else
         let &makeprg = s:makeprg
         execute 'AsyncRun -mode='.a:async_mode.' -save=2 -program=make -cwd='.g:ProjectBuildDir. ' @ '.a:args
@@ -506,13 +488,8 @@ endfunction
 function! s:Cmake(options, async_mode)
     if s:use_invoke
         let l:options = a:options.' --project '.g:project_type
-        if g:new_compiler
-            let l:options .= ' --new-compiler'
-        else
-            let l:options .= ' --no-new-compiler'
-        endif
         execute '!echo "invoke cmake '.l:options.'"'
-        execute 'AsyncRun -mode='.a:async_mode.' -save=2 @ invoke -c ~/tools/invoke/'.g:project_type.'/tasks -e cmake '.l:options
+        execute 'AsyncRun -mode='.a:async_mode.' -save=2 @ invoke '.s:invoke_tasks.' -e cmake '.l:options
     else
         if !isdirectory(g:ProjectBuildDir)
             call mkdir(g:ProjectBuildDir)
@@ -636,11 +613,11 @@ function! s:DlcproShutup()
 endfunction
 
 function! s:JLinkFlashProgram()
-    call term_start(s:ProjectSrcDir.'/flash_firmware.py -j '.s:jlink_path.'/JLinkExe -a 0x8000000 '.g:Program)
+    call term_start(s:ProjectSrcDir.'/flash_firmware.py -j JLinkExe -a 0x8000000 '.g:Program)
 endfunction
 
 function! g:JLinkSWOviewer()
-    let cmd = s:jlink_path.'/JLinkSWOViewerCLExe -device STM32H743ZI -itmmask 0xffffffff -swofreq 450000'
+    let cmd = '/JLinkSWOViewerCLExe -device STM32H743ZI -itmmask 0xffffffff -swofreq 450000'
     call asyncrun#quickfix_toggle(10, 1)
     execute 'AsyncRun -mode=async @ ' . cmd
 endfunction
@@ -665,12 +642,12 @@ endfunction
 function! s:DeviceStartGdbServer()
     if (g:project_type == 'pfd')
         call system('killall --quiet JLinkGDBServer')
-        call s:Call_and_log('invoke -c ~/tools/invoke/'.g:project_type.'/tasks -e jlink&')
+        call s:Call_and_log('invoke '.s:invoke_tasks.' -e jlink&')
         autocmd User TermdebugStopPost call system('killall --quiet JLinkGDBServer')
         sleep 1
     elseif ((g:project_type == 'digifalc') || (g:project_type == 'servoboard') || (g:project_type == 'dl-motor'))
         call s:Call_and_log('pkill --full JLinkGDBServer')
-        call s:Call_and_log(s:jlink_path.'/JLinkGDBServer -if SWD -device STM32H743ZI &')
+        call s:Call_and_log('JLinkGDBServer -if SWD -device STM32H743ZI &')
     elseif ((g:project_type == 'operation-panel-f1') || (g:project_type == 'operation-panel-f4'))
         call s:Call_and_log('pkill --full openocd')
         call s:Call_and_log('openocd -f interface/stlink.cfg -f target/'.s:stm_cfg.'.cfg &')
@@ -726,16 +703,47 @@ let g:DlcproBasePath = "/jenkins/workspace/pro--firmware_release_1.9.0-DCESJ5C5R
 function! s:DeviceDebug(attach)
     if s:use_invoke
         if g:DebugRemote
-            execute "!invoke -c ~/tools/invoke/'.g:project_type.'/tasks -e gdb-server --target-ip=".g:DeviceIP
+            if 'dlcpro' =~ g:project_type
+                " call s:Call_and_log('pkill --full gdbserver')
+                " call s:Call_and_log('ssh -o RemoteCommand=none '.g:SshOpts.' root@'.g:DeviceIP.' "killall -q -9 gdbserver start-dc.sh '.fnamemodify(g:ProgramRemote, ':t').'"')
+                " call s:Call_and_log('ssh -o RemoteCommand=none '.g:SshOpts.' -L localhost:'.g:GdbPort.':localhost:'.g:GdbPort.' "root@'.g:DeviceIP.'" '.g:SshOpts2.' gdbserver --multi localhost:'.g:GdbPort.' &')
+                call s:Call_and_log('ssh -o RemoteCommand=none '.g:SshOpts.' root@'.g:DeviceIP.' "killall -q gdbserver start-dc.sh '.fnamemodify(g:ProgramRemote, ':t').'"')
+                sleep 2
+                call s:Call_and_log('ssh -o RemoteCommand=none '.g:SshOpts.' root@'.g:DeviceIP.' "killall -q -9 gdbserver start-dc.sh '.fnamemodify(g:ProgramRemote, ':t').'"')
+            endif
             autocmd! User TermdebugStartPre
             autocmd! User TermdebugStartPost
             autocmd! User TermdebugStopPost
-            autocmd User TermdebugStartPost call term_sendkeys('',"cd  .build/dlcpro-new\nsource ../../gdb-connect.txt\n")
+            let gdb_server_cmd = 'invoke '.s:invoke_tasks.' -e gdb-server'
-            autocmd User TermdebugStopPost call system('pkill --full gdbserver')
+            if exists('g:DeviceIP')
+                let gdb_server_cmd .= ' --target-ip='.g:DeviceIP
+            endif
+            if g:project_type != 'pfd' " FIXME
+                let gdb_server_cmd .= ' --project='.g:project_type
+            endif
+            if v:true
+                call system(gdb_server_cmd.'&')
+            else
+                call asyncrun#quickfix_toggle(3, 1)
+                execute 'AsyncRun '.gdb_server_cmd
+                autocmd User TermdebugStopPost execute 'AsyncStop'
+            endif
+            if g:project_type != 'pfd' " FIXME
+                sleep 5
+            endif
+            if exists('s:gdb_connect_script')
+                autocmd User TermdebugStartPost call term_sendkeys('',"source ".s:gdb_connect_script."\n")
+            endif
+            Termdebug
+            call s:SendToDebugger('set confirm off')
+            " Close Program window
+            execute '2hide'
+        else
+            call s:StartDebugger(g:Elffile, a:attach)
+            call s:SendToDebugger('file '.g:Elffile)
+            call s:SendToDebugger('break main')
+            call s:SendToDebugger('run')
         endif
-        Termdebug
-        " Close Program window
-        execute '2hide'
     else
         if (a:attach == 0)
     "        let r = s:DeviceFirmwareUpdate()

vimfiles.stefan/vimrc

@@ -26,6 +26,7 @@ packadd! asyncrun
 "packadd! conque
 "packadd! diffchar
 packadd! dirdiff
+packadd! direnv.vim
 packadd! DoxygenToolkit
 packadd! flake8
 packadd! flog
@@ -275,12 +276,12 @@ set completeopt+=menuone
 " --------------
 " DoxygenToolkit
 " --------------
-let g:DoxygenToolkit_authorName         = "Stefan Liebl <Stefan.Liebl@toptica.com>"
+" let g:DoxygenToolkit_authorName         = 'Stefan Liebl <Stefan.Liebl@toptica.com>'
 let g:DoxygenToolkit_compactOneLineDoc  = "yes"
 let g:DoxygenToolkit_compactDoc         = "yes"
 " Replace version by copyright ...
 let g:DoxygenToolkit_versionTag         = "@copyright "
-let g:DoxygenToolkit_versionString      = "(c) 2020-2023 TOPTICA Photonics AG"
+let g:DoxygenToolkit_versionString      = "Copyright TOPTICA Photonics AG"
 
 " -----
 " netrw