From c21c8f8c9d1448c136566fbbd1e0925e9a34125a Mon Sep 17 00:00:00 2001
From: Stefan Liebl <S.Liebl@gmx.de>
Date: Tue, 4 Feb 2025 15:32:23 +0100
Subject: [PATCH] toptica improvements

---
 vimfiles.stefan/plugin/toptica.vim | 27 +++++++++++----------------
 1 file changed, 11 insertions(+), 16 deletions(-)

diff --git a/vimfiles.stefan/plugin/toptica.vim b/vimfiles.stefan/plugin/toptica.vim
index 09d6ed8..c4b2bb3 100644
--- a/vimfiles.stefan/plugin/toptica.vim
+++ b/vimfiles.stefan/plugin/toptica.vim
@@ -118,11 +118,7 @@ function! s:ProjectSet(project_type, project_base_dir)
         else
             let s:firware_file_name = 'DLCpro-archive.fw'
         endif
-        " if (g:project_type == 'dlcpro-new')
-            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 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'))
@@ -171,7 +167,7 @@ function! s:ProjectSet(project_type, project_base_dir)
         let g:ProjectBuildDir = s:ProjectSrcDir.'/.build/'
         let g:DeviceIP = 'topmode_stefan'
         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:firware_file_name = 'TopMode-CHARM-Control-1.5.4-dev.fw'
         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.' -')
 
     " Add --project if necessary
-    " if '--project' =~ options && '--project' !~ l:args
-    if options =~ '--project' && '--project' !~ l:args
+    if options =~ '--project' && a:args !~ '--project'
         let l:args .= ' --project='.g:project_type
     endif
     " Add --device-ip if necessary
-    " if '--device-ip' =~ options && '--device-ip' !~ l:args
-    if options =~ '--device-ip' && '--device-ip' !~ l:args
+    if options =~ '--device-ip' && l:args !~ '--device-ip'
         let l:args .= ' --device-ip='.g:DeviceIP
     endif
     " Add --build-type=Debug
-    " if '--build-type' =~ options && '--build-type' !~ l:args
-    if options =~ '--build-type' && '--build-type' !~ l:args
+    if options =~ '--build-type' && l:args !~ '--build-type'
         let l:args .= ' --build-type=Debug'
     endif
 
@@ -421,6 +414,8 @@ let g:DlcproRegtest_smoke = 1
 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:TopmodeRegtest_smoke = 0
+
 function! s:DlcproRegtest(device_ip, laser1_type, marks, tests)
     execute "wa"
 
@@ -455,15 +450,15 @@ function! s:DlcproRegtest(device_ip, laser1_type, marks, tests)
     execute "terminal ++shell " . regtest_cmd
 endfunction
 
-command -nargs=? -complete=file TopmodeRegtest call s:TopmodeRegtest('topmode_stefan', '', '<args>')
-function! s:TopmodeRegtest(device_ip, marks, tests)
+command -nargs=? -complete=file TopmodeRegtest call s:TopmodeRegtest('', '<args>')
+function! s:TopmodeRegtest(marks, tests)
     execute "wa"
 
     let regtest_cmd = 'time'
                 \.' '.s:invoke
                 \.' -e'
                 \.' regtest'
-                \.' --device-ip='.a:device_ip
+                \.' --device-ip='.g:DeviceIP
                 " \.' --do-fw-update'
                 " \.' --smoke'
 
@@ -474,7 +469,7 @@ function! s:TopmodeRegtest(device_ip, marks, tests)
     if g:DlcproRegtest_fw_update == 1
         let regtest_cmd .= ' --do-fw-update'
     endif
-    if g:DlcproRegtest_smoke == 1
+    if g:TopmodeRegtest_smoke == 1
         let regtest_cmd .= ' --smoke'
     endif
     let regtest_cmd .= ' --marks="'.a:marks.'"'