diff --git a/pack/plugins/opt/direnv.vim b/pack/plugins/opt/direnv.vim new file mode 160000 index 0000000..ab2a7e0 --- /dev/null +++ b/pack/plugins/opt/direnv.vim @@ -0,0 +1 @@ +Subproject commit ab2a7e08dd630060cd81d7946739ac7442a4f269 diff --git a/vimfiles.stefan/plugin/toptica.vim b/vimfiles.stefan/plugin/toptica.vim index 0eaeba7..5efe81e 100644 --- a/vimfiles.stefan/plugin/toptica.vim +++ b/vimfiles.stefan/plugin/toptica.vim @@ -80,56 +80,19 @@ 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 filereadable(cmakefile) - for line in readfile(cmakefile) - if match(line, 'NEW_COMPILER:BOOL=OFF') >= 0 - return 'old' - elseif match(line, 'NEW_COMPILER:BOOL=ON') >= 0 - return 'new' - endif - endfor + if exists('g:ProjectBuildDir') + let cmakefile = g:ProjectBuildDir . '/CMakeCache.txt' + if filereadable(cmakefile) + for line in readfile(cmakefile) + if match(line, 'NEW_COMPILER:BOOL=OFF') >= 0 + return 'old' + elseif match(line, 'NEW_COMPILER:BOOL=ON') >= 0 + return 'new' + endif + endfor + endif endif return 0 endfunction @@ -152,13 +115,11 @@ function! s:ProjectSet(project_type, project_base_dir) let g:DeviceIP = 'dlc_pro__040083' let g:DebugRemote = v:true if (g:project_type == 'dlcpro-new') - " call s:set_oselas_gcc() let g:ProjectBuildDir = s:ProjectSrcDir.'/.build/dlcpro-new' - 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 = 'arm-v7a-linux-gnueabihf-gdb' else - " call s:set_oselas_gcc4() let g:ProjectBuildDir = s:ProjectSrcDir.'/.build/dlcpro' - " let g:termdebugger = 'arm-v7a-linux-gnueabihf-gdb' + 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') @@ -260,8 +221,8 @@ function! s:ProjectSet(project_type, project_base_dir) 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() - 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' + " 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:DebugRemote = v:true elseif (g:project_type == 'topmode-old') let s:Program = '/topmode' @@ -749,7 +710,9 @@ function! s:DeviceDebug(attach) endif call asyncrun#quickfix_toggle(10, 1) execute 'AsyncRun -mode=async @ '.gdb_server_cmd - sleep 5 + if g:project_type != 'pfd' " FIXME + sleep 5 + endif autocmd User TermdebugStopPost execute 'AsyncStop' if exists('s:gdb_connect_script') " autocmd User TermdebugStartPost call term_sendkeys('',"cd .build/dlcpro-new\nsource ".s:gdb_connect_script."\n") diff --git a/vimfiles.stefan/vimrc b/vimfiles.stefan/vimrc index 28c3ddf..898eb26 100644 --- a/vimfiles.stefan/vimrc +++ b/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 " +" let g:DoxygenToolkit_authorName = 'Stefan Liebl ' 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