From e1920937caf4a8421b98389b139f1e1c1b8ae229 Mon Sep 17 00:00:00 2001
From: mistangl <m.stangl@schoenenberger.de>
Date: Thu, 5 Jun 2025 23:35:08 +0200
Subject: [PATCH 1/2] run.bat rausgeschmissen und alles in setenv.bat und
 getexdraw.bat integriert. install.bat mit angepasst

---
 bin/getexdraw.bat |  9 +++++++++
 bin/install.bat   | 12 ++++++------
 bin/setenv.bat    | 10 +++++-----
 3 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/bin/getexdraw.bat b/bin/getexdraw.bat
index 159784f..720f392 100644
--- a/bin/getexdraw.bat
+++ b/bin/getexdraw.bat
@@ -3,12 +3,21 @@
 if [%1]==[] goto usage
 for /F %%i in ("%1") do set FILENAME=%%~ni
 
+    
+call setenv.bat
+
+
 echo --hole Positionen
 call getpositions.bat --filename %1 -s -r -w  %FILENAME%_positions.json
 echo --erzeuge Graph mit Routing
 call routing.bat --filename %FILENAME%_positions.json -w %FILENAME%_todraw.json 
 echo --zeichne Kabel in dxf Datei 
 call draw_dxf.bat --filename %FILENAME%_todraw.json --new %FILENAME%_cables.dxf -x %FILENAME%_cables.xlsx --copy_layer %FILENAME%_reduziert.dxf --origin %1
+
+move %PROJECT_WORK%\%FILENAME%_* %INSTALL_DIR%
+pause
+
+
 goto :eof
 
 
diff --git a/bin/install.bat b/bin/install.bat
index d64c0dc..9b4f201 100644
--- a/bin/install.bat
+++ b/bin/install.bat
@@ -1,11 +1,11 @@
 @echo on
 
-set TARGETDIR="%USERPROFILE%\Desktop\Kabeltool"
-mkdir %TARGETDIR%
-set SHORTCUT=%TARGETDIR%\create_cables.lnk
-set CHECKOUT_DIR="C:\kabellaengen"
+call setenv.bat
 
-set TARGET=%CHECKOUT_DIR%\bin\run.bat
-set ICON=%CHECKOUT_DIR%\doc\img\Icons\Icon_Gemini2.ico
+mkdir %INSTALL_DIR%
+set SHORTCUT=%INSTALL_DIR%\create_cables.lnk
+
+set TARGET=%PROJECT_BIN%\getexdraw.bat
+set ICON=%PROJECT_DOC%\img\Icons\Icon_Gemini2.ico
  
 powershell -Command "$s=(New-Object -COM WScript.Shell).CreateShortcut('%SHORTCUT%');$s.TargetPath='%TARGET%';$s.IconLocation='%ICON%';$s.Save()"
\ No newline at end of file
diff --git a/bin/setenv.bat b/bin/setenv.bat
index f3dbf24..d42f459 100644
--- a/bin/setenv.bat
+++ b/bin/setenv.bat
@@ -2,23 +2,23 @@
 REM ~dp0 steht für das Verzeichnis, in der diese Datei liegt 
 pushd %~dp0\..
 
-set PROJECT=%cd%
+set PROJECT=C:\kabellaengen
 set PROJECT_BIN=%PROJECT%\bin
 set PROJECT_CFG=%PROJECT%\cfg
+set PROJECT_DOC=%PROJECT%\doc
 set PROJECT_LIB=%PROJECT%\lib
 set PROJECT_DATA=%PROJECT%\data
 set PROJECT_WORK=%PROJECT%\work
-set PROJECT_LOG=%PROJECT%\log
 set PROJECT_TEST=%PROJECT%\testdata
-set PROJECT_HOT=%PROJECT%\hotfolder
 
 if not exist %PROJECT%\work mkdir %PROJECT%\work
-if not exist %PROJECT%\log mkdir %PROJECT%\log
 if not exist %PROJECT%\data mkdir %PROJECT%\data
-if not exist %PROJECT%\hotfolder mkdir %PROJECT%\hotfolder
+
+set INSTALL_DIR="%USERPROFILE%\Desktop\Kabeltool"
 
 set PATH=%PROJECT_BIN%;%PATH%
 
+
 popd
 goto :eof
 

From f08ee5cb021afadb181d69407ab8e6759eb0567d Mon Sep 17 00:00:00 2001
From: mistangl <m.stangl@schoenenberger.de>
Date: Fri, 6 Jun 2025 15:18:27 +0200
Subject: [PATCH 2/2] =?UTF-8?q?neue=20Config=20f=C3=BCr=20die=20Zuordnung?=
 =?UTF-8?q?=20zwischen=20L=C3=A4nge=20und=20SivasId?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 cfg/kabel.cfg | 98 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 98 insertions(+)
 create mode 100644 cfg/kabel.cfg

diff --git a/cfg/kabel.cfg b/cfg/kabel.cfg
new file mode 100644
index 0000000..da99fb7
--- /dev/null
+++ b/cfg/kabel.cfg
@@ -0,0 +1,98 @@
+# Kabel für die Motoren
+[MA]
+100=725000015
+
+# Kabel für die Ventile
+[WD_Q]
+# Länge in m zu Sivaseintrag
+1=722001300
+2=722001301
+2.5=722001308
+3=722001302
+5=722001303
+10=722001304
+15=722001305
+20=722001306
+25=722001307
+30=722001309
+35=722001310
+40=722001311
+50=722001312
+
+# Kabel für Default Sensoren
+[WD_I]
+1=722001330
+2=722001331
+2.5=722001338
+3=722001332
+5=722001333
+10=722001334
+15=722001335
+20=722001336
+25=722001337
+30=722001339
+35=722001340
+40=722001341
+50=722001342
+
+# Kabel für Sensor 829422026
+[WD_I-829422026]
+2.5=722001358
+3=722001352
+5=722001353
+10=722001354
+15=722001355
+20=722001356
+30=722001357
+40=722001359
+
+
+# Kabel für Sensor 720002003
+[WD_I-720002003]
+2.5=722001358
+3=722001352
+5=722001353
+10=722001354
+15=722001355
+20=722001356
+30=722001357
+40=722001359
+
+
+# Bezeichner jeder Verbindungsleitung
+[Sivasnummern]
+725000015=4G1,5mm², Steuerleitung
+722001300=M12 St-0°/ M8 Bu-0° 1m
+722001301=M12 St-0°/ M8 Bu-0° 2m
+722001302=M12 St-0°/ M8 Bu-0° 3m
+722001303=M12 St-0°/ M8 Bu-0° 5m
+722001304=M12 St-0°/ M8 Bu-0° 10m
+722001305=M12 St-0°/ M8 Bu-0° 15m
+722001306=M12 St-0°/ M8 Bu-0° 20m
+722001307=M12 St-0°/ M8 Bu-0° 25m
+722001308=M12 St-0°/ M8 Bu-0° 2,5m
+722001309=M12 St-0°/ M8 Bu-0° 30m
+722001310=M12 St-0°/ M8 Bu-0° 35m
+722001311=M12 St-0°/ M8 Bu-0° 40m
+722001312=M12 St-0°/ M8 Bu-0° 50m
+722001330=M12 St-0°/ M12 Bu-90° 1m
+722001331=M12 St-0°/ M12 Bu-90° 2m
+722001332=M12 St-0°/ M12 Bu-90° 3m
+722001333=M12 St-0°/ M12 Bu-90° 5m
+722001334=M12 St-0°/ M12 Bu-90° 10m
+722001335=M12 St-0°/ M12 Bu-90° 15m
+722001336=M12 St-0°/ M12 Bu-90° 20m
+722001337=M12 St-0°/ M12 Bu-90° 25m
+722001338=M12 St-0°/ M12 Bu-90° 2,5
+722001339=M12 St-0°/ M12 Bu-90° 30m
+722001340=M12 St-0°/ M12 Bu-90° 35m
+722001341=M12 St-0°/ M12 Bu-90° 40m
+722001342=M12 St-0°/ M12 Bu-90° 50m
+722001352=M12 St-0°/ M12 Bu-0° 3m
+722001353=M12 St-0°/ M12 Bu-0° 5m
+722001354=M12 St-0°/ M12 Bu-0° 10m
+722001355=M12 St-0°/ M12 Bu-0° 15m
+722001356=M12 St-0°/ M12 Bu-0° 20m
+722001357=M12 St-0°/ M12 Bu-0° 30m
+722001358=M12 St-0°/ M12 Bu-0° 2,5m
+722001359=M12 St-0°/ M12 Bu-0° 40m