Merge remote-tracking branch 'origin/master'

This commit is contained in:
Stefan Liebl 2024-02-06 18:50:00 +01:00
commit 13a6bdb7bb
23 changed files with 131 additions and 1810 deletions

5
.gitmodules vendored
View File

@ -14,10 +14,6 @@
path = pack/fugitive/opt/fugitive path = pack/fugitive/opt/fugitive
url = https://github.com/tpope/vim-fugitive url = https://github.com/tpope/vim-fugitive
ignore = untracked ignore = untracked
[submodule "pack/gitv/opt/gitv"]
path = pack/gitv/opt/gitv
url = https://github.com/gregsexton/gitv
ignore = untracked
[submodule "pack/gundo/opt/gundo"] [submodule "pack/gundo/opt/gundo"]
path = pack/gundo/opt/gundo path = pack/gundo/opt/gundo
url = https://github.com/sjl/gundo.vim url = https://github.com/sjl/gundo.vim
@ -110,3 +106,4 @@
[submodule "pack/vim-clang-format/opt/vim-clang-format"] [submodule "pack/vim-clang-format/opt/vim-clang-format"]
path = pack/vim-clang-format/opt/vim-clang-format path = pack/vim-clang-format/opt/vim-clang-format
url = https://github.com/rhysd/vim-clang-format.git url = https://github.com/rhysd/vim-clang-format.git
ignore = untracked

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

@ -0,0 +1 @@
Subproject commit 845abb56dcd3f12afa6eb47684ef5ba3055802b8

@ -1 +1 @@
Subproject commit 845d35b84c5c51f631d8bfa4afe3edc126102ba9 Subproject commit 1465951fd6bb68e4d8cd239739cd12f3b6600aba

View File

@ -1,4 +1,4 @@
" Stefans c-file plugin for bmsk " Stefans c-file plugin
" abbreviations " abbreviations
"iabbrev if if ()<left> "iabbrev if if ()<left>
@ -23,14 +23,12 @@ setlocal expandtab
setlocal cindent setlocal cindent
let &l:shiftwidth = s:tabwidth let &l:shiftwidth = s:tabwidth
if (g:os == 'linux')
setlocal tags+=/usr/include/tags setlocal tags+=/usr/include/tags
setlocal tags+=/usr/X11/include/tags setlocal tags+=/usr/X11/include/tags
setlocal tags+=/usr/src/include/linux/tags setlocal tags+=/usr/src/include/linux/tags
" filesearching " filesearching
" setlocal path=.,/usr/include/** " setlocal path=.,/usr/include/**
endif
setlocal suffixesadd=.h setlocal suffixesadd=.h
" commenting " commenting

View File

@ -2,12 +2,13 @@
" Only for testing " Only for testing
function Flog_echo_command(command, ...) function Flog_echo_command(command, ...)
echom flog#format_command(a:command) echom flog#Format(a:command)
endfunction endfunction
nnoremap <buffer> <silent> rb :call flog#run_command('Git reset %h', 1, 1)<CR> setlocal nospell
nnoremap <buffer> <silent> rbh :call flog#run_command('Git reset --hard %h', 1, 1)<CR>
nnoremap <buffer> <silent> cp :call flog#run_command('Git cherry-pick %h', 1, 1)<CR> nnoremap <buffer> <silent> rb :call flog#Exec(flog#Format('Git reset %h'))<CR>
vnoremap <buffer> <silent> cp :<C-U>call flog#run_command("Git cherry-pick %(h'>)^..%(h'<)", 1, 1)<CR> nnoremap <buffer> <silent> rbh :call flog#Exec(flog#Format('Git reset --hard %h'))<CR>
"vnoremap <buffer> <silent> cp :<C-U>call Flog_echo_command("Git cherry-pick %(h'>)^..%(h'<)", 1, 1)<CR>
nnoremap <buffer> <silent> cp :call flog#Exec(flog#Format('Git cherry-pick %h'))<CR>
vnoremap <buffer> <silent> cp :<C-U>call flog#Exec(flog#Format("Git cherry-pick %(h'>)^..%(h'<)")<CR>

View File

@ -1,4 +1,4 @@
" Stefans c-file plugin for bmsk " Stefans pascal-file plugin
" set syntax highlighting " set syntax highlighting
setlocal syntax=pascal setlocal syntax=pascal

View File

@ -106,3 +106,7 @@ hi netrwMarkFile gui=bo
" Termdebug " Termdebug
hi debugPC guibg=darkgreen hi debugPC guibg=darkgreen
hi debugBreakpoint guibg=red hi debugBreakpoint guibg=red
" Spell
hi clear Spellad
hi SpellBad cterm=underline ctermbg=DarkRed gui=undercurl

View File

@ -1,41 +0,0 @@
" Vim compiler file
" Compiler: lint
" Maintainer: Stefan Liebl
" Last Change: 13.06.2002
"if exists('current_compiler')
" finish
"endif
"let current_compiler = 'bcc'
let &makeprg = PathJoin(GetBmskDir() . ', lint_bmsk.bat') . ' ' . GetDfilesDir() . ' $*'
"set shellpipe=>
"let &shellpipe = '| e:\\tools\\gnu\\shutils\\bin\\tee.exe'
"let &shellpipe = '| e:\\tools\\gnu\\shutils\\bin\\tee.exe ' . make_log . ' | e:\\tools\\gnu\\shutils\\bin\\tee.exe'
set shellpipe=
let &makeef = PathJoin(GetBmskDir() . ', lint_bmsk.txt')
set errorformat=
set errorformat+=%f\ %l:\ %trror\ %n\ %m
set errorformat+=%f\ %l:\ %tarning\ %n\ %m
set errorformat+=%f\ %l:\ %tnfo\ %n\ %m
set errorformat+=%f\ %l:\ %tote\ %n\ %m
let biosdirs = ''
let biosdirs = biosdirs . ' ' . PathJoin(bmsk_bios . ', adc')
let biosdirs = biosdirs . ' ' . PathJoin(bmsk_bios . ', dio')
"let biosdirs = biosdirs . ' ' . PathJoin(bmsk_bios . ', edc16lib')
let biosdirs = biosdirs . ' ' . PathJoin(bmsk_bios . ', pm')
"let biosdirs = biosdirs . ' ' . PathJoin(bmsk_bios . ', stflprg')
let biosdirs = biosdirs . ' ' . PathJoin(bmsk_bios . ', target')
let biosdirs = biosdirs . ' ' . PathJoin(bmsk_bios . ', tio')
"let biosdirs = biosdirs . ' ' . PathJoin(bmsk_bios . ', tpu_bms')
let biosdirs = biosdirs . ' ' . PathJoin(bmsk_bios . ', tpu_lib_export')
let biosdirs = biosdirs . ' ' . PathJoin(bmsk_bios . ', uhwe')
" user functions
"command! -nargs=* Compile execute ':wa | cd ' . GetBmskDir() . ' | make! %:p'
command! -nargs=* Compile wa | execute('cd ' . GetBmskDir()) | make! <args> %:p
command! -nargs=* Make wa | execute('cd ' . GetBmskDir()) | make! <args> %:p:h
command! -nargs=* MakeBios execute ':wa | cd ' . GetBmskDir() . ' | make! <args> ' . biosdirs

View File

@ -1,24 +0,0 @@
" Vim compiler file
" Compiler: borland turbo C compiler
" Maintainer: Stefan Liebl
" Last Change: 08.07.2003
"if exists('current_compiler')
" finish
"endif
"let current_compiler = 'tc'
let &l:makeprg = 'u:\daten\priv\c_files\tcc.bat $*'
setlocal shellpipe=>
"let &makeef = bmskdir . '\lint_bmsk.txt'
setlocal errorformat=
setlocal errorformat+=%trror\ %f\ %l:\ %m
setlocal errorformat+=%tarning\ %f\ %l:\ %m
" user functions
"command! -nargs=0 Compile execute ':wa | make! %:p'
command! -nargs=0 Make execute 'wa | make %:p'
command! -nargs=0 Run execute '!c:\temp\turbo-c\' . expand('%:t:r') . '.exe'

View File

@ -1,216 +0,0 @@
*bmsk.txt* Funktinen fuer das Arbeiten mit BMSK-Projekten
|BMSK.1| Auswählen des Projektes
|BMSK.2| Einstellungen
|BMSK.3| Compilieren
|BMSK.4| Arbeiten mit Files
|BMSK.5| Tags
|BMSK.6| Grep
|BMSK.7| DAMOS-Tools
==============================================================================
*BMSK.1* Auswählen des Projektes *BMSK*
Ein BMSK-Projekt bezieht sich nicht auf eine VIM-Session, sondern nur auf den
Build-Prozess des BMSK-Projektes. Mit dem Auswählen eines Projektes werden nur
die Pfade für|:Bmsk|,|:checkpath|,|:find|,|gf|... gesetzt.
Das Verwenden von Sessions empfielt sich zusätzlich (siehe|VimSuite|).
*:SetBmskProject*
:SetBmskProject [Pfad] Setzen der Einstellungen für ein BMSK-Projekt
Dieser Befehl sollte nur noch für alte Projekte verwendet werden, die noch
keine project.vim Datei enthalten.
Mit dem Befehl|:SetBmskProject|können alle Einstellungen für ein
BMSK-Projekt vorgenommen werden. Es wird in das Verzeichnis .../bmsk
gewechselt und alle Tools werden mit dem neuen Pfad ausgeführt. Ausserdem wird
das passende Tag-File und die richtige|cscope|-Datenbasis verwendet.
Als Pfad muss das Verzeichnis angegeben werden, in dem das make_fsw.bat liegt.
Wenn der Pfad weggelassen wird, so kommt ein Datei-Auswahl-Dialog.
Mit der Tab-Erweiterung (siehe|cmdline-completion|) werden alle Projekte im
aktuellen|bmskWA|-Pfad angezeigt, sowie alle Projekte, die in|projects.txt|
angegeben sind.
*projects.txt*
In der Datei|projects.txt|im Verzeichnis .../vim können die Pfade von
Projekten angegeben werden, die bei dem Befehl|:SetBmskProject|mit der
Tab-Erweiterung oder im Menü ausgewählt werden können. Dabei ist in jeder
Zeile der Datei das Verzeichnis des Makefiles anzugeben.
*:SetBmskWA* *bmskWA*
:SetBmskWA {Pfad} Setzen des Pfades, in dem die BMSK-Projekte liegen
Mit dem Befehl|:SetBmskWA|wird der Pfad gesetzt, in dem die
Tab-Erweiterung des Befehls|:SetBmskProject|nach Projekten sucht.
==============================================================================
*BMSK.2* Einstellungen
*:SetMuster*
:SetMuster [Muster] Einstellen des Hardware-Standes
Für Muster können alle Mustervarianten angegeben werden
*:SetEgas*
:SetEgas [Variante] Einstellen der Egas-Variante
Für Variante können alle Egas-Varianten angegeben werden
*:SetMotorvariante*
:SetMotorvariante [Variante] Einstellen der Motorvariante
Für Variante kann K25, K40, K46 oder K71 angegeben werden
*:SetSWStand*
:SetSWStand [Stand] Einstellen des Software-Stands
Für Stand kann Test, Entwickler oder Serie angegeben werden.
*:SetXlint*
:SetXlint [Hexwert] Einstellen der Bmsk-Lint-Options
Für Hexwert kann z.B. 0x115 angegeben werden. Siehe dazu die
HTML-Dokumentation
==============================================================================
*BMSK.3* Compilieren
*:Make*
:Make Compilieren des BMSK-Projektes
Alle gängigen Optionen können über die Tab-Erweiterung ausgewählt werden.
*:Lint*
:Lint Überprüfen der Software mit FlexLint
Dieser Befehl kann auch über 'Bmsk lint file=%:p' erreicht werden
*:MakeDoku*
:MakeDoku Erzeugen einer Doku im BMSK-Projekt
Es wird|Bmsk|ein der Fehlerparser aus der|LaTeX-Suite|verwendet. Dadurch sind
auch normale LaTeX-Warnings zu sehen. Diese müssen jedoch nicht alle beseitigt
werden.
Alle gängigen Optionen können über die Tab-Erweiterung ausgewählt werden.
Wird der Befehl ohne Parameter aufgerufen, so wird die Funktion interaktiv
abgefragt.
==============================================================================
*BMSK.4* Arbeiten mit Files
Um Files schnell zu finden sind alle relevanten Pfade in die Variable|'path'|
eingetragen. Dadurch kann mit:
|:find|{filename}
ein File geöffnet werden, ohne den Pfad anzugeben.
Wenn sich der Cursor auf einem Filenamen befindet (z.B. #include "module.c")
so kann man mit
|gf|
direkt in das File springen.
Jedes File, das schon einmal geladen war ist in der|buffer-list|enthalten.
Es kann über das Menü oder mit
|:b|{filename}
geöffnet werden. Dabei ist ausserdem die Tab-Erweiterung aktiv.
*:BuffersUpdate* *Buffers*
:BuffersUpdate Aktualisieren aller Dateien eines BMSK-Projekts
Mit dem Befehl|:BuffersUpdate|werden alle Dateien eines BMSK-Projekts als
Buffer in Vim geladen. Diese können dann z.B. mit einer Session gespeichert
werden.
Mit dem integrierten File-Explorer kann auch gearbeitet werden:|:Explore|
*:COPYoutput*
:COPYoutput Product-Files auf Austauschlaufwerk kopieren
Mit diesem Befehl werden die Files im Product-Verzeichnis auf das
Austauschlaufwerk kopiert. Das Ziel ist in der Variablen Austausch und
myAustausch gespeichert. Diese müssen im File _vimrc richtig gesetzt werden.
*:RENAMEoutput*
:RENAMEoutput Product-Files umbenennen
Mit diesem Befehl werden die Files im Product-Verzeichnis umbenannt. Die als
Argument übergebene Erweiterung wird nach dem Programmstandsnamen vor dem
Punkt eingefügt.
Beispiel: >
:RENAMEoutput _test01
Dadurch werden die Files folgendermassen umbenannt:
115BXXXX.daf -> 115BXXXX_test01.daf
770115XE.a2l -> 770115XE_test01.a2l
770115XE.dcm -> 770115XE_test01.dcm
770115XE.elf -> 770115XE_test01.elf
770115XE.map -> 770115XE_test01.map
770115XE.paf -> 770115XE_test01.paf
770115XE.s19 -> 770115XE_test01.s19
*:CopyProgrammstand*
:CopyProgrammstand alle Product-Files auf Server ausliefern
Mit diesem Befehl werden die Files in allen Product-Verzeichnissen in die
Auslieferstrucktur in einem Verzeichnis kopiert, das über einen
File-Open-Dialog gewählt werden kann.
==============================================================================
*BMSK.5* Tags
Die BMS-K arbeitet mit zwei unterschiedlichen Datenbanken:
|ctags| und |cscope|.
*:BMSK-ctags*
Die Datenbank von ctags erfasst alle Tags in DAMOS und Python-Files. Sie
werden mit >
Bmsk ctags
und >
Bmsk ptags
erzeugt. Zu einem Tag kann mit der Taste <TAB> gesprungen werden. Zurück kommt
man mit <BS>. Zu den DAMOS-Files gehören kgs- und osp-Files, d.h. es kann auch
zu Umrechnungsformeln, Codesyntaxen, usw. gesprungen werden.
*:BMSK-cscope*
Die Datenbank von cscope erfasst alle Tags in c-, h- und d-Files. Sie werden
mit >
Bmsk cscope
erzeugt. Zu einem Tag kann mit der Taste <CR> gesprungen werden. Zurück kommt
man mit <BS>.|Cscope|bietet viele weitere Möglichkeiten.
==============================================================================
*BMSK.6* Grep
Die Funktion zur Suche mit einem externen|grepprg|wird zugunsten der internen
Variante|:vimgrep|nicht unterstützt. In der Regel kann der einfache Befehl
*:GrepBmsk*
:GrepBmsk [pattern]
verwendet werden. Es unterstützt Regular expressions und findet mehrere
Treffer in einer Zeile, die mit <CTRL-n> durchlaufen werden können. Gesucht
wird in allen c-, h- und kgs-Files unterhalb von bmsk/sw
Alternativ gibt es den Befehl|:Grep|aus der|VimSuite|.
==============================================================================
*BMSK.7* DAMOS-Tools
Siehe eigene Dokumentation zu|damos|
==============================================================================
vim:tw=78:ts=8:ft=help:norl:

View File

@ -1,28 +0,0 @@
*ccm.txt* Funktinen fuer das Arbeiten mit Synergy/CM
Um mit dem Konfigurations-Management-Tool Synergy/CM (CCM) zu arbeiten muss
das Tool gestartet und die richtige Default-Task ausgewählt sein. Dann können
die folgenden Befehle aus einem Buffer heraus ausgeführt werden:
==============================================================================
*ccm* *CCM* *Synergy* *Synergy/CM* *CM/Synergy*
*:CCMcheckout*
:CCMcheckout [comment] Auschecken eines Files in CCM
*:CCMcheckpoint*
:CCMcheckpoint [comment] Einchecken eines Files als checkpoint
*:CCMchangeable*
:CCMchangeable Zeigt an, ob der user ein working objekt vom aktuellen File hat
*:CCMdiff*
:CCMdiff Zeigt die Änderungen gegenüber der Vorgänger-Version
*:CCMobject*
:CCMobject Gibt den kompletten objectname aus
*:CCMhistory*
:CCMhistory Öffnet den History-View für das aktuelle File

View File

@ -1,11 +0,0 @@
" ===========================================================================
" File: dos.vim
" Author: Stefan Liebl (S.Liebl@gmx.de)
" Description: sources mswin.vim if the os is mswin
" ===========================================================================
if (g:os == 'dos')
runtime mswin.vim
behave mswin
endif

View File

@ -14,6 +14,10 @@ command -nargs=1 -complete=dir OperationPanelF4 call s:ProjectSet('operation-pan
command -nargs=1 -complete=dir DeCoF call s:ProjectSet('decof', '<args>') command -nargs=1 -complete=dir DeCoF call s:ProjectSet('decof', '<args>')
command DeviceFirmwareUpdate call s:DeviceFirmwareUpdate() command DeviceFirmwareUpdate call s:DeviceFirmwareUpdate()
command -nargs=? -complete=file JenkinsLinter call s:Jenkins_linter('<args>') command -nargs=? -complete=file JenkinsLinter call s:Jenkins_linter('<args>')
command SetOselasGcc4 call s:set_oselas_gcc4()
command SetOselasGcc11 call s:set_oselas_gcc()
let s:path_orig = $PATH
function s:ProjectSet(project_type, project_base_dir) function s:ProjectSet(project_type, project_base_dir)
let g:project_type = a:project_type let g:project_type = a:project_type
@ -61,14 +65,41 @@ function s:ProjectSet(project_type, project_base_dir)
let s:ProjectSrcDir = s:ProjectBaseDir.'/'.g:ProjectSrcDirRel let s:ProjectSrcDir = s:ProjectBaseDir.'/'.g:ProjectSrcDirRel
let g:ProjectBuildDir = s:ProjectBaseDir.'/build' 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-2021.07.0/'.s:oselas_gcc_lastname.'/'.
\'gcc-11.1.1-clang-12.0.0-glibc-2.33-binutils-2.36.1-kernel-5.12.4-sanitized/'
function! s:set_oselas_gcc4()
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:new_compiler = ' -DNEW_COMPILER=OFF'
endfunction
function! s:set_oselas_gcc()
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:new_compiler = ' -DNEW_COMPILER=ON'
endfunction
" vim path " vim path
execute 'cd '.s:ProjectSrcDir execute 'cd '.s:ProjectSrcDir
execute 'set path-=./**' execute 'set path-=./**'
execute 'set path+=' . s:ProjectSrcDir.'/**' execute 'set path+=' . s:ProjectSrcDir.'/**'
execute 'set path+=' . g:ProjectBuildDir.'/**' execute 'set path+=' . g:ProjectBuildDir.'/**'
let s:oselas_include = '/sysroot-arm-cortexa8-linux-gnueabi/usr/include'
let s:oselas_gdb_4 = '/opt/OSELAS.Toolchain-2012.12.1/arm-cortexa8-linux-gnueabi/gcc-4.7.3-glibc-2.16.0-binutils-2.22-kernel-3.6-sanitized/bin/arm-cortexa8-linux-gnueabi-gdb'
let s:oselas_gdb = '/opt/OSELAS.Toolchain-2021.07.0/arm-v7a-linux-gnueabihf/gcc-11.1.1-clang-12.0.0-glibc-2.33-binutils-2.36.1-kernel-5.12.4-sanitized/bin/arm-v7a-linux-gnueabihf-gdb'
let s:jlink_path = '/home/stefan/opt/SEGGER/JLink_Linux_V654a_x86_64' let s:jlink_path = '/home/stefan/opt/SEGGER/JLink_Linux_V654a_x86_64'
if (g:project_type == 'dlcpro') if (g:project_type == 'dlcpro')
@ -79,18 +110,15 @@ function s:ProjectSet(project_type, project_base_dir)
set wildignore+=**/shg-firmware/** set wildignore+=**/shg-firmware/**
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: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 s:makeprg = 'make'
let g:DeviceIP = 'DLC_PRO__040083' let g:DeviceIP = 'dlc_pro__040083'
let g:DebugRemote = v:true let g:DebugRemote = v:true
let g:GdbPort = '2345' let g:GdbPort = '2345'
let g:GccRoot = "/opt/OSELAS.Toolchain-2012.12.1/arm-cortexa8-linux-gnueabi/gcc-4.7.3-glibc-2.16.0-binutils-2.22-kernel-3.6-sanitized"
let g:termdebugger = s:oselas_gdb
let g:SshOpts = "" let g:SshOpts = ""
let g:SshOpts2 = "" let g:SshOpts2 = ""
execute 'set path+=' . g:GccRoot . s:oselas_include call s:set_oselas_gcc()
command DlcproEmissionOn call s:DlcproEmission('1') command DlcproEmissionOn call s:DlcproEmission('1')
command DlcproEmissionOff call s:DlcproEmission('0') command DlcproEmissionOff call s:DlcproEmission('0')
command DlcproShutup call s:DlcproShutup() command DlcproShutup call s:DlcproShutup()
" let g:ycm_clangd_args = ['--all-scopes-completion', '--header-insertion=iwyu', '--suggest-missing-includes', '--enable-config', '-isystem '.g:GccRoot . s:oselas_include]
elseif (g:project_type == 'dlcpro-tui') elseif (g:project_type == 'dlcpro-tui')
let s:Program = '/user-interface/src/user-interface' let s:Program = '/user-interface/src/user-interface'
let s:Elffile = s:Program let s:Elffile = s:Program
@ -99,15 +127,14 @@ function s:ProjectSet(project_type, project_base_dir)
set wildignore+=**/shg-firmware/** set wildignore+=**/shg-firmware/**
let s:makegoals = ['artifacts-firmware', 'artifacts', 'device-control', 'user-interface', 'doxygen', 'fw-updates', 'shg-firmware', 'can-updater', 'specalyser', 'docu-ul0', 'code-generation', 'dependency-graphs', 'clean', 'distclean', 'help', 'jamplayer', 'dlcpro-slot'] let s:makegoals = ['artifacts-firmware', 'artifacts', 'device-control', 'user-interface', 'doxygen', 'fw-updates', 'shg-firmware', 'can-updater', 'specalyser', 'docu-ul0', 'code-generation', 'dependency-graphs', 'clean', 'distclean', 'help', 'jamplayer', 'dlcpro-slot']
let s:makeprg = 'make' let s:makeprg = 'make'
let g:DeviceIP = 'DLC_PRO__040083' let g:DeviceIP = 'dlc_pro__040083'
let g:DebugRemote = v:true let g:DebugRemote = v:true
let g:GdbPort = '2345' let g:GdbPort = '2345'
let g:GccRoot = "/opt/OSELAS.Toolchain-2012.12.1/arm-cortexa8-linux-gnueabi/gcc-4.7.3-glibc-2.16.0-binutils-2.22-kernel-3.6-sanitized"
let g:termdebugger = s:oselas_gdb
let g:SshOpts = "" let g:SshOpts = ""
let g:SshOpts2 = "" let g:SshOpts2 = ""
execute 'set path+=' . g:GccRoot . s:oselas_include call s:set_oselas_gcc4()
command DlcproTuiStart execute('!cd user-interface/src && ../../../build/user-interface/src/user-interface&') " command DlcproTuiStart execute('!cd user-interface/src && ../../../build/user-interface/src/user-interface&')
command DlcProTuiStart call s:DlcproTuiStart()
elseif (g:project_type == 'dlcpro-can') elseif (g:project_type == 'dlcpro-can')
let s:Program = '/canopen/can-updater' let s:Program = '/canopen/can-updater'
let s:Elffile = s:Program let s:Elffile = s:Program
@ -116,15 +143,12 @@ function s:ProjectSet(project_type, project_base_dir)
set wildignore+=**/shg-firmware/** set wildignore+=**/shg-firmware/**
let s:makegoals = [] let s:makegoals = []
let s:makeprg = 'make' let s:makeprg = 'make'
let g:DeviceIP = 'DLC_PRO__040083' let g:DeviceIP = 'dlc_pro__040083'
let g:DebugRemote = v:true let g:DebugRemote = v:true
let g:GdbPort = '2345' let g:GdbPort = '2345'
let g:GccRoot = "/opt/OSELAS.Toolchain-2012.12.1/arm-cortexa8-linux-gnueabi/gcc-4.7.3-glibc-2.16.0-binutils-2.22-kernel-3.6-sanitized"
let g:termdebugger = s:oselas_gdb
let g:SshOpts = "" let g:SshOpts = ""
let g:SshOpts2 = "" let g:SshOpts2 = ""
execute 'set path+=' . g:GccRoot . s:oselas_include call s:set_oselas_gcc4()
" let g:ycm_clangd_args = ['-I'.g:GccRoot . s:oselas_include]
elseif (g:project_type == 'dlcpro-specalyser') elseif (g:project_type == 'dlcpro-specalyser')
let s:Program = '/specalyser/specalyser' let s:Program = '/specalyser/specalyser'
let s:Elffile = s:Program let s:Elffile = s:Program
@ -133,15 +157,12 @@ function s:ProjectSet(project_type, project_base_dir)
set wildignore+=**/shg-firmware/** set wildignore+=**/shg-firmware/**
let s:makegoals = [] let s:makegoals = []
let s:makeprg = 'make' let s:makeprg = 'make'
let g:DeviceIP = 'DLC_PRO__040083' let g:DeviceIP = 'dlc_pro__040083'
let g:DebugRemote = v:true let g:DebugRemote = v:true
let g:GdbPort = '2345' let g:GdbPort = '2345'
let g:GccRoot = "/opt/OSELAS.Toolchain-2012.12.1/arm-cortexa8-linux-gnueabi/gcc-4.7.3-glibc-2.16.0-binutils-2.22-kernel-3.6-sanitized"
let g:termdebugger = s:oselas_gdb
let g:SshOpts = "" let g:SshOpts = ""
let g:SshOpts2 = "" let g:SshOpts2 = ""
execute 'set path+=' . g:GccRoot . s:oselas_include call s:set_oselas_gcc4()
" let g:ycm_clangd_args = ['-I'.g:GccRoot . s:oselas_include]
elseif (g:project_type == 'shg') elseif (g:project_type == 'shg')
let s:Program = '/shg-firmware/device-control/device-control-shg' let s:Program = '/shg-firmware/device-control/device-control-shg'
let s:Elffile = s:Program let s:Elffile = s:Program
@ -150,15 +171,11 @@ function s:ProjectSet(project_type, project_base_dir)
set wildignore+=**/firmware/src/device-control/** set wildignore+=**/firmware/src/device-control/**
let s:makegoals = ['artifacts-firmware', 'artifacts', 'device-control', 'user-interface', 'doxygen', 'fw-updates', 'shg-firmware', 'can-updater', 'specalyser', 'docu-ul0', 'code-generation', 'dependency-graphs', 'clean', 'distclean', 'help', 'jamplayer', 'dlcpro-slot'] let s:makegoals = ['artifacts-firmware', 'artifacts', 'device-control', 'user-interface', 'doxygen', 'fw-updates', 'shg-firmware', 'can-updater', 'specalyser', 'docu-ul0', 'code-generation', 'dependency-graphs', 'clean', 'distclean', 'help', 'jamplayer', 'dlcpro-slot']
let s:makeprg = 'make' let s:makeprg = 'make'
let g:DeviceIP = 'DLC_PRO__040083' let g:DeviceIP = 'dlc_pro__040083'
let g:DebugRemote = v:true let g:DebugRemote = v:true
let g:GdbPort = '6666' let g:GdbPort = '6666'
let g:GccRoot = "/opt/OSELAS.Toolchain-2012.12.1/arm-cortexa8-linux-gnueabi/gcc-4.7.3-glibc-2.16.0-binutils-2.22-kernel-3.6-sanitized"
let g:termdebugger = s:oselas_gdb
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: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" let g:SshOpts2 = "-L localhost:1998:localhost:1998 -L localhost:1999:localhost:1999"
execute 'set path+=' . g:GccRoot . s:oselas_include
" let g:ycm_clangd_args = ['-I'.g:GccRoot . s:oselas_include]
elseif (g:project_type == 'dlcpro-gui') elseif (g:project_type == 'dlcpro-gui')
let s:Program = '/TOPAS_DLC_pro' let s:Program = '/TOPAS_DLC_pro'
let s:Elffile = s:Program let s:Elffile = s:Program
@ -175,13 +192,10 @@ function s:ProjectSet(project_type, project_base_dir)
let g:DeviceIP = 'topmode_stefan' let g:DeviceIP = 'topmode_stefan'
let g:DebugRemote = v:true let g:DebugRemote = v:true
let g:GdbPort = '2345' let g:GdbPort = '2345'
let g:GccRoot = "/opt/OSELAS.Toolchain-2011.11.3/arm-cortexa8-linux-gnueabi/gcc-4.6.2-glibc-2.14.1-binutils-2.21.1a-kernel-2.6.39-sanitized" let g:GccRoot = s:oselas_gcc4_root
let g:termdebugger = s:oselas_gdb
let g:SshOpts = "" let g:SshOpts = ""
let g:SshOpts2 = "" let g:SshOpts2 = ""
execute 'set path+=' . g:GccRoot . s:oselas_include call s:set_oselas_gcc4()
let $PATH = $PATH.':'.g:GccRoot.'/bin'
" let g:ycm_clangd_args = ['-I'.g:GccRoot . s:oselas_include]
elseif (g:project_type == 'topmode-gui') elseif (g:project_type == 'topmode-gui')
let s:Program = '/TOPAS_Topmode' let s:Program = '/TOPAS_Topmode'
let s:Elffile = s:Program let s:Elffile = s:Program
@ -198,7 +212,7 @@ function s:ProjectSet(project_type, project_base_dir)
let g:GdbPort = '2331' let g:GdbPort = '2331'
let g:GccRoot = '/opt/gcc-arm-none-eabi-8-2019-q3-update' let g:GccRoot = '/opt/gcc-arm-none-eabi-8-2019-q3-update'
let g:termdebugger = g:GccRoot.'/bin/arm-none-eabi-gdb' let g:termdebugger = g:GccRoot.'/bin/arm-none-eabi-gdb'
let $PATH = $PATH.':'.g:GccRoot.'/bin' let $PATH = g:GccRoot.'/bin'.':'.s:path_orig
elseif (g:project_type == 'servoboard') elseif (g:project_type == 'servoboard')
let s:Program = '/servo-board-image.bin' let s:Program = '/servo-board-image.bin'
let s:Elffile = '/application/servo-board.elf' let s:Elffile = '/application/servo-board.elf'
@ -208,7 +222,7 @@ function s:ProjectSet(project_type, project_base_dir)
let g:GdbPort = '2331' 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 = g:GccRoot.'/bin/arm-none-eabi-gdb'
let $PATH = g:GccRoot.'/bin'.':'.$PATH let $PATH = g:GccRoot.'/bin'.':'.s:path_orig
elseif (g:project_type == 'dl-motor') elseif (g:project_type == 'dl-motor')
let s:Program = '/dl-motor-image.bin' let s:Program = '/dl-motor-image.bin'
let s:Elffile = '/application/dl-motor.elf' let s:Elffile = '/application/dl-motor.elf'
@ -218,7 +232,7 @@ function s:ProjectSet(project_type, project_base_dir)
let g:GdbPort = '2331' 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 = g:GccRoot.'/bin/arm-none-eabi-gdb'
let $PATH = g:GccRoot.'/bin'.':'.$PATH let $PATH = g:GccRoot.'/bin'.':'.s:path_orig
elseif (g:project_type == 'operation-panel-f1') elseif (g:project_type == 'operation-panel-f1')
let g:stm32_target = 'STM32F10X' let g:stm32_target = 'STM32F10X'
let s:Program = '/firmware/operation_panel_'.g:stm32_target.'.bin' let s:Program = '/firmware/operation_panel_'.g:stm32_target.'.bin'
@ -230,7 +244,7 @@ function s:ProjectSet(project_type, project_base_dir)
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 = g:GccRoot.'/bin/arm-none-eabi-gdb'
let s:stm_cfg = 'stm32f1x' let s:stm_cfg = 'stm32f1x'
let $PATH = g:GccRoot.'/bin'.':'.$PATH let $PATH = g:GccRoot.'/bin'.':'.s:path_orig
elseif (g:project_type == 'operation-panel-f4') elseif (g:project_type == 'operation-panel-f4')
let g:stm32_target = 'STM32F4XX' let g:stm32_target = 'STM32F4XX'
let s:Program = '/firmware/operation_panel_'.g:stm32_target.'.bin' let s:Program = '/firmware/operation_panel_'.g:stm32_target.'.bin'
@ -242,7 +256,7 @@ function s:ProjectSet(project_type, project_base_dir)
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 = g:GccRoot.'/bin/arm-none-eabi-gdb'
let s:stm_cfg = 'stm32f4x' let s:stm_cfg = 'stm32f4x'
let $PATH = g:GccRoot.'/bin'.':'.$PATH let $PATH = g:GccRoot.'/bin'.':'.s:path_orig
elseif (g:project_type == 'decof') elseif (g:project_type == 'decof')
let s:makegoals = ['all'] let s:makegoals = ['all']
let s:makeprg = 'cmake --build . --target' let s:makeprg = 'cmake --build . --target'
@ -382,6 +396,7 @@ function s:Cmake(options, async_mode)
if (g:project_type == 'dlcpro') if (g:project_type == 'dlcpro')
let args .= " -DCMAKE_TOOLCHAIN_FILE=../".g:ProjectSrcDirRel."/Toolchain-target.cmake" let args .= " -DCMAKE_TOOLCHAIN_FILE=../".g:ProjectSrcDirRel."/Toolchain-target.cmake"
let args .= " -DBUILD_TARGET=target" let args .= " -DBUILD_TARGET=target"
let args .= g:new_compiler
elseif (g:project_type == 'dlcpro-tui') elseif (g:project_type == 'dlcpro-tui')
let args .= " -DBUILD_TARGET=simulation" let args .= " -DBUILD_TARGET=simulation"
let args .= " -DQT5_INSTALL_PATH=/usr/lib/x86_64-linux-gnu/qt5" let args .= " -DQT5_INSTALL_PATH=/usr/lib/x86_64-linux-gnu/qt5"
@ -461,6 +476,13 @@ function s:Call_and_log(cmd)
return v:shell_error return v:shell_error
endfunction endfunction
function s:DlcproTuiStart()
let workdir = s:ProjectSrcDir . '/user-interface/src'
let cmd = g:ProjectBuildDir . '/user-interface/src/user-interface'
call asyncrun#quickfix_toggle(10, 1)
execute 'AsyncRun -mode=async -save=2 -cwd='.workdir.' @ ' . cmd
endfunction
"function s:CopyFirmware(command) "function s:CopyFirmware(command)
" let command = 'bash '.s:GdbSlave.' -h '.g:DeviceIP.' '.a:command " let command = 'bash '.s:GdbSlave.' -h '.g:DeviceIP.' '.a:command
"" if a:command == 'update' || a:command == 'start-debug' "" if a:command == 'update' || a:command == 'start-debug'
@ -482,6 +504,12 @@ 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 '.s:jlink_path.'/JLinkExe -a 0x8000000 '.g:Program)
endfunction endfunction
function g:JLinkSWOviewer()
let cmd = s:jlink_path.'/JLinkSWOViewerCLExe -device STM32H743ZI -itmmask 0xffffffff -swofreq 450000'
call asyncrun#quickfix_toggle(10, 1)
execute 'AsyncRun -mode=async @ ' . cmd
endfunction
function s:DeviceUpdateProgramLinux() function s:DeviceUpdateProgramLinux()
call s:Call_and_log('ssh -o RemoteCommand=none '.g:SshOpts.' root@'.g:DeviceIP.' "killall -q gdbserver start-dc.sh '.fnamemodify(g:ProgramRemote, ':t').'"') 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 sleep 2
@ -571,11 +599,15 @@ function s:DeviceDebug(attach)
call s:DeviceStartGdbServer() call s:DeviceStartGdbServer()
sleep 1 sleep 1
call s:StartDebugger(g:Elffile, a:attach) call s:StartDebugger(g:Elffile, a:attach)
sleep 1
call s:SendToDebugger('target extended-remote localhost:'.g:GdbPort) call s:SendToDebugger('target extended-remote localhost:'.g:GdbPort)
sleep 1
if exists("g:ProgramRemote") if exists("g:ProgramRemote")
call s:SendToDebugger('set remote exec-file '.g:ProgramRemote) call s:SendToDebugger('set remote exec-file '.g:ProgramRemote)
sleep 1
endif endif
call s:SendToDebugger('file '.g:Elffile) call s:SendToDebugger('file '.g:Elffile)
call s:SendToDebugger('set solib-search-path '. g:oselas_gcc_solib_paths)
if ((g:project_type == 'operation-panel-f1') || (g:project_type == 'operation-panel-f4')) if ((g:project_type == 'operation-panel-f1') || (g:project_type == 'operation-panel-f4'))
call s:SendToDebugger('y') call s:SendToDebugger('y')
call s:SendToDebugger('monitor reset') call s:SendToDebugger('monitor reset')
@ -583,6 +615,7 @@ function s:DeviceDebug(attach)
call s:SendToDebugger('break main') call s:SendToDebugger('break main')
else else
call s:SendToDebugger('break main') call s:SendToDebugger('break main')
sleep 1
call s:SendToDebugger('run') call s:SendToDebugger('run')
endif endif
execute '2hide' execute '2hide'
@ -596,7 +629,6 @@ function s:DeviceDebug(attach)
call s:SendToDebugger('set substitute-path '.g:DlcproBasePath.' '.s:ProjectSrcDir) call s:SendToDebugger('set substitute-path '.g:DlcproBasePath.' '.s:ProjectSrcDir)
endif endif
" call s:SendToDebugger('set solib-search-path '.g:GccRoot.'/arm-cortexa8-linux-gnueabi/lib/'.':'.g:GccRoot.'/sysroot-arm-cortexa8-linux-gnueabi/lib/'.':'.g:GccRoot.'/sysroot-arm-cortexa8-linux-gnueabi/usr/lib/')
" call s:SendToDebugger('set can-use-hw-watchpoints 0') " call s:SendToDebugger('set can-use-hw-watchpoints 0')
endfunction endfunction

View File

@ -315,26 +315,6 @@ function ConvertUTF8()
silent! %s/&#226;&#130;&#172;/€/ " € silent! %s/&#226;&#130;&#172;/€/ " €
endfunction endfunction
" find all non-extern functions in h-files
function FindDeclaration()
let bmsk_sw = g:bmsk_sw
let bmsk_header = g:bmsk_header
let bios_header = g:bios_header
let id = '(\\ *[a-zA-Z0-9_]+\\ *)'
let not_extern = '([^x]*\\ +)'
let start = not_extern . '*'
let type = '(' . id . '\\ +)'
let declarator = '(' . id . ')'
let parameter = '(' . id . ')(\\ +' . id .',?\\ *)?'
let parlist = '(' . parameter . '+)'
let bracket = '(\\(' . parlist . '\\))'
let definition = '(\\ *({.*)?)'
let declaration = '(\\ *;.*)'
let end = definition
"let end = definition . declaration . '?'
execute ':Hgrep -x '' . start . type . declarator . bracket . end . '''
endfunction
" indent a wordNum to position " indent a wordNum to position
command -range -nargs=+ IndentWordNum call IndentWords(<f-args>, <line1>, <line2>) command -range -nargs=+ IndentWordNum call IndentWords(<f-args>, <line1>, <line2>)
" handle range " handle range

View File

@ -1,3 +0,0 @@
e:\wa\bmsk-qx13468
e:\wa\bmsk-k25
e:\wa\bmsk-k40

File diff suppressed because it is too large Load Diff

View File

@ -6,14 +6,6 @@ function s:OpenDiffTab(left, right)
diffthis diffthis
endfunction endfunction
function s:FixLineendings()
if !exists('b:reload_dos') && !&binary && &ff=='unix' && (0 < search('\r$', 'nc'))
edit ++ff=dos
echom 'fixed lineendings'
let b:reload_dos = 1
endif
endfunction
function s:OpenMergeTabs() function s:OpenMergeTabs()
set columns=200 set columns=200
call s:OpenDiffTab(2, 4) call s:OpenDiffTab(2, 4)

View File

@ -1,63 +0,0 @@
" vim: filetype=vim
" ========
" Settings
" ========
compiler $VIM_COMPILER
set path=$VIM_PATH
set tags=$VIM_TAGS
set cscopeprg=$VIM_CSCOPEPRG
let s:cscopefile = $VIM_CSCOPEFILE
let s:makegoals = $VIM_MAKEGOALS
let s:makeopts = $VIM_MAKEOPTS
if exists('s:did_projectplugin')
finish
endif
let s:did_projectplugin='bmsk'
" ====
" Make
" ====
function s:GetMakeOptions()
return ''
endfunction
function GetAllMakeCompletions(...)
return join(s:makegoals + s:makeopts, "\n")
endfunction
command -complete=custom,GetAllMakeCompletions -nargs=* Make call s:Make('<args>')
function s:Make(args)
echo a:args
CscopeDisconnect
execute 'make ' . a:args .' '. s:GetMakeOptions()
CscopeConnect
clist
endfunction
" -----------------
" CSCOPE-Connection
" -----------------
command CscopeConnect call s:CscopeConnect(s:cscopefile)
function s:CscopeConnect(cscopefile)
if filereadable(a:cscopefile)
execute 'cscope add ' . a:cscopefile
else
echomsg 'cscope: Could not connect: File ' . a:cscopefile . ' does not exist'
endif
endfunction
command CscopeDisconnect call s:CscopeDisconnect()
function s:CscopeDisconnect()
cscope kill -1
endfunction
" ================
" Start of session
" ================
function s:ProjectOnStart()
CscopeConnect
endfunction
call s:ProjectOnStart()

View File

@ -19,19 +19,6 @@ let &runtimepath = &runtimepath . ',' . g:vimsuite . '/vimfiles.stefan/after'
" packages liegen unter vimsuite/pack " packages liegen unter vimsuite/pack
execute "set packpath+=".g:vimsuite execute "set packpath+=".g:vimsuite
" Laden weiterer Einstellungen:
if (has("win32") || has("win64"))
let g:os ='dos'
execute 'source ' . expand(g:vimfiles . '/vimrc.dos')
else
let g:os = 'linux'
execute 'source ' . expand(g:vimfiles . '/vimrc.linux')
endif
if !exists('nobmsk')
execute 'source ' . expand(g:vimfiles . '/vimrc.bmsk')
endif
" ------------------ " ------------------
" packages / plugins " packages / plugins
" ------------------ " ------------------
@ -44,14 +31,16 @@ packadd! flake8
packadd! flog packadd! flog
packadd! fugitive packadd! fugitive
"packadd! gdb-from-vim "packadd! gdb-from-vim
"packadd! git-lens.vim
packadd! gundo packadd! gundo
packadd! isort packadd! isort
packadd! linediff packadd! linediff
packadd! merginal packadd! merginal
packadd! plantuml-syntax
"packadd! pyclewn "packadd! pyclewn
"packadd! pylint "packadd! pylint
packadd! python-pep8-indent packadd! python-pep8-indent
packadd! qml packadd qml
packadd! sessionman packadd! sessionman
packadd! SrchRplcHiGrp packadd! SrchRplcHiGrp
packadd! syntastic packadd! syntastic
@ -59,7 +48,7 @@ packadd! tagbar
"packadd! tail "packadd! tail
packadd! tcomment packadd! tcomment
packadd! termdebug packadd! termdebug
packadd! vc " packadd! vc
packadd! vimagit packadd! vimagit
packadd! vim-clang-format packadd! vim-clang-format
packadd! vim-textidote packadd! vim-textidote
@ -68,6 +57,12 @@ packadd! xml
packadd! yapf packadd! yapf
packadd! YouCompleteMe packadd! YouCompleteMe
" call plug#begin()
" ...
" Plug 'Eliot00/git-lens.vim'
" ...
" call plug#end()
" global settings " global settings
" --------------- " ---------------
set nobackup " keep no backup file set nobackup " keep no backup file
@ -84,10 +79,26 @@ filetype plugin indent on
"syntax on "syntax on
syntax enable syntax enable
" no syntax highliting when printing if has('gui')
set guifont=Liberation\ Mono\ 9
"set guifontwide=
set guioptions=arL
set guioptions+=m
"set tearoff-feature
set guioptions+=t
" add toolbar
" set guioptions+=T
endif
colorscheme Stefan
" no syntax highlighting when printing
set printoptions+=syntax:n set printoptions+=syntax:n
"highlite search " truecolor for console
set termguicolors
"highlight search
set incsearch set incsearch
set hlsearch set hlsearch
@ -158,8 +169,13 @@ if &diff
set guioptions+=b set guioptions+=b
" turn off csv ftplugin in diff mode " turn off csv ftplugin in diff mode
au! filetypedetect * *.csv,*.dat,*.tsv,*.tab au! filetypedetect * *.csv,*.dat,*.tsv,*.tab
" Turn off spellcheck
setlocal nospell
endif endif
" Switch spell off in diff mode
autocmd OptionSet diff setlocal nospell
" horizontal scrollbar in diff-mode " horizontal scrollbar in diff-mode
set diffopt=filler,vertical set diffopt=filler,vertical
" don't switch on DiffChar by default " don't switch on DiffChar by default
@ -174,7 +190,7 @@ endfunction
" options for DirDiff " options for DirDiff
let g:DirDiffCommand = expand($VIMRUNTIME . '/diff') let g:DirDiffCommand = expand($VIMRUNTIME . '/diff')
let g:DirDiffExcludes = '*.log,*.pyc,.svn,.git*,.asc,_ccmwaid.inf,.static_wa,out,Build,build,tags,cscope.out,.directory' let g:DirDiffExcludes = '*.log,*.pyc,.svn,.git*,.asc,.static_wa,out,Build,build,tags,cscope.out,.directory'
"let g:DirDiffDynamicDiffText = 1 "let g:DirDiffDynamicDiffText = 1
@ -264,7 +280,7 @@ let g:DoxygenToolkit_compactOneLineDoc = "yes"
let g:DoxygenToolkit_compactDoc = "yes" let g:DoxygenToolkit_compactDoc = "yes"
" Replace version by copyright ... " Replace version by copyright ...
let g:DoxygenToolkit_versionTag = "@copyright " let g:DoxygenToolkit_versionTag = "@copyright "
let g:DoxygenToolkit_versionString = "(c) 2020 TOPTICA Photonics AG" let g:DoxygenToolkit_versionString = "(c) 2020-2023 TOPTICA Photonics AG"
" ----- " -----
" netrw " netrw
@ -313,6 +329,10 @@ let g:ycm_clangd_args = ['--all-scopes-completion', '--header-insertion=iwyu', '
" use tt for YCM GoTo " use tt for YCM GoTo
nnoremap tt :YcmCompleter GoTo<CR> nnoremap tt :YcmCompleter GoTo<CR>
" -----
" Gundo
" -----
let g:gundo_prefer_python3 = 1
if exists('g:debug') if exists('g:debug')
if (g:debug > 0) if (g:debug > 0)

View File

@ -1,13 +0,0 @@
if !exists('g:Austausch')
let g:Austausch = expand('//easerv.muc/Organisation/ea-41/Austausch')
endif
if !exists('g:myAustausch')
let g:myAustausch = expand(g:Austausch . '/Liebl')
endif
if !exists('g:bmskWA')
let g:bmskWA = expand('c:/wa')
endif
if !exists('g:WA')
let g:WA = expand('c:/wa')
endif

View File

@ -1,50 +0,0 @@
"let g:debug = 1
let g:backupdir = expand($TEMP . '/vi')
let g:swapdir = expand($TEMP . '/vi')
let g:gvim = expand($VIMRUNTIME . '/gvim.exe ')
"let g:pythonPath = expand('c:/wa/tools/python/2.7.1')
let g:diff = expand($VIMRUNTIME . '/diff ')
let g:svn = expand('svn ')
let g:cvs = expand('cvs ')
let g:cp = expand('copy ')
let g:cat = expand('type ')
let g:mv = expand('move ')
let g:rm = expand('del ')
let g:rm_f = expand('del ') . '/Q '
let g:mkdir = expand('mkdir ')
" unix-tools
let g:vimtools = expand(g:vimfiles . '/tools')
let g:patch = expand(g:vimtools . '/patch.exe ')
let g:ctags = expand(g:vimtools . '/ctags.exe ')
let g:cscope = expand(g:vimtools . '/cscope.exe ')
let g:tee = expand(g:vimtools . '/tee.exe ')
let g:untee = expand(g:vimtools . '/untee.bat ')
let g:wget = expand(g:vimtools . '/wget.exe')
"let g:nobmsk = 1
"let g:nobmskmenu = 1
"let g:noccm = 1
"let g:noccmmenu = 1
if has('gui')
" set Font
set guifont=Lucida_Console:h8
" set guifont=Terminal:h6
"set guifontwide=
" Set standards for GUI
set guioptions=arL
"set menu
set guioptions+=m
"set tearoff-feature
set guioptions+=t
" add toolbar
" set guioptions+=T
endif
colorscheme Stefan

View File

@ -1,45 +0,0 @@
"let g:debug = 1
let g:backupdir = expand('/tmp')
let g:swapdir = expand('/tmp')
let g:gvim = expand('gvim ')
let g:python = expand('python ')
let g:diff = expand('diff ')
let g:svn = expand('svn ')
let g:cvs = expand('cvs ')
let g:cp = expand('cp ')
let g:mv = expand('mv ')
let g:rm = expand('rm ')
let g:rm_f = expand('rm -rf ')
let g:mkdir = expand('mkdir ')
let g:wget = expand('wget')
" unix-tools
let g:patch = expand('patch ')
let g:cscope = expand('cscope ')
set printexpr=system('kprinter\ '.v:fname_in).delete(v:fname_in)+v:shell_error
let g:nobmsk = 1
let g:nobmskmenu = 1
let g:noccm = 1
let g:noccmmenu = 1
if has('gui')
" set Font
set guifont=Liberation\ Mono\ 9
"set guifontwide=
" Set standards for GUI
set guioptions=arL
"set menu
set guioptions+=m
"set tearoff-feature
set guioptions+=t
" add toolbar
" set guioptions+=T
endif
colorscheme Stefan