From 8fa3fbea566121d405bc5f85336c330406d06bb7 Mon Sep 17 00:00:00 2001
From: Mashintime <awh@brainless.us>
Date: Wed, 10 Jan 2024 19:34:47 -0500
Subject: [PATCH] Update windows batch files

---
 gui/GUI-Install-Requirements.bat                   |  8 ++++++++
 tools/Windows/TNC-Launch.bat => gui/GUI-Launch.bat |  4 ++--
 gui/GUI-Update-Requirements.bat                    |  8 ++++++++
 modem/Modem-Install-Requrements.bat                |  5 +++++
 modem/Modem-Launch.bat                             | 10 ++++++++++
 modem/Modem-list-audio-devs.bat                    |  6 ++++++
 tools/Windows/GUI-Install-Requirements.bat         |  7 +++++--
 tools/Windows/GUI-Launch.bat                       |  4 ++--
 tools/Windows/GUI-Update-Requirements.bat          |  7 +++++--
 tools/Windows/Modem-Install-Requrements.bat        |  5 +++++
 tools/Windows/Modem-Launch.bat                     | 10 ++++++++++
 tools/Windows/Modem-list-audio-devs.bat            |  6 ++++++
 tools/Windows/TNC-Install-Requrements.bat          |  5 -----
 tools/Windows/copy-files.bat                       |  8 ++++++--
 14 files changed, 78 insertions(+), 15 deletions(-)
 create mode 100644 gui/GUI-Install-Requirements.bat
 rename tools/Windows/TNC-Launch.bat => gui/GUI-Launch.bat (62%)
 create mode 100644 gui/GUI-Update-Requirements.bat
 create mode 100644 modem/Modem-Install-Requrements.bat
 create mode 100644 modem/Modem-Launch.bat
 create mode 100644 modem/Modem-list-audio-devs.bat
 create mode 100644 tools/Windows/Modem-Install-Requrements.bat
 create mode 100644 tools/Windows/Modem-Launch.bat
 create mode 100644 tools/Windows/Modem-list-audio-devs.bat
 delete mode 100644 tools/Windows/TNC-Install-Requrements.bat

diff --git a/gui/GUI-Install-Requirements.bat b/gui/GUI-Install-Requirements.bat
new file mode 100644
index 00000000..c61dab25
--- /dev/null
+++ b/gui/GUI-Install-Requirements.bat
@@ -0,0 +1,8 @@
+@echo off
+REM Place this batch file in FreeData/gui and then run it
+REM ie. c:\FD-Src\gui
+echo Install requirements for GUI...
+
+call npm install
+
+pause
\ No newline at end of file
diff --git a/tools/Windows/TNC-Launch.bat b/gui/GUI-Launch.bat
similarity index 62%
rename from tools/Windows/TNC-Launch.bat
rename to gui/GUI-Launch.bat
index 8ac7af61..937c86bc 100644
--- a/tools/Windows/TNC-Launch.bat
+++ b/gui/GUI-Launch.bat
@@ -1,5 +1,5 @@
 REM Place this batch file in FreeData/tnc and then run it
-REM ie. c:\FD-Src\tnc
+REM ie. c:\FD-Src\gui
 
-python daemon.py
+call npm start
 pause
\ No newline at end of file
diff --git a/gui/GUI-Update-Requirements.bat b/gui/GUI-Update-Requirements.bat
new file mode 100644
index 00000000..4746422d
--- /dev/null
+++ b/gui/GUI-Update-Requirements.bat
@@ -0,0 +1,8 @@
+@echo off
+REM Place this batch file in FreeData/tnc and then run it
+REM ie. c:\FD-Src\gui
+echo Checking and install for updated requirements
+
+call npm update
+
+pause
\ No newline at end of file
diff --git a/modem/Modem-Install-Requrements.bat b/modem/Modem-Install-Requrements.bat
new file mode 100644
index 00000000..b7acb064
--- /dev/null
+++ b/modem/Modem-Install-Requrements.bat
@@ -0,0 +1,5 @@
+REM Place this batch file in FreeData/modem and then run it
+REM ie. c:\FD-Src\modem
+
+python -m pip install -r ..\requirements.txt
+pause
\ No newline at end of file
diff --git a/modem/Modem-Launch.bat b/modem/Modem-Launch.bat
new file mode 100644
index 00000000..80d92f3f
--- /dev/null
+++ b/modem/Modem-Launch.bat
@@ -0,0 +1,10 @@
+REM Place this batch file in FreeData/tnc and then run it
+REM ie. c:\FD-Src\tnc
+
+REM Set environment variable to let modem know where to find config, change if you need to specify a different config
+set FREEDATA_CONFIG=.\config.ini 
+
+REM launch modem
+flask --app server run
+
+pause
\ No newline at end of file
diff --git a/modem/Modem-list-audio-devs.bat b/modem/Modem-list-audio-devs.bat
new file mode 100644
index 00000000..bf15556d
--- /dev/null
+++ b/modem/Modem-list-audio-devs.bat
@@ -0,0 +1,6 @@
+@echo off
+REM PLace in modem directory and run to retrieve list of audio devices; you'll need the CRC for the config.ini
+
+python ..\tools\list_audio_devices.py
+
+pause
\ No newline at end of file
diff --git a/tools/Windows/GUI-Install-Requirements.bat b/tools/Windows/GUI-Install-Requirements.bat
index ecd0c113..c61dab25 100644
--- a/tools/Windows/GUI-Install-Requirements.bat
+++ b/tools/Windows/GUI-Install-Requirements.bat
@@ -1,5 +1,8 @@
-REM Place this batch file in FreeData/tnc and then run it
-REM ie. c:\FD-Src\gui_vue
+@echo off
+REM Place this batch file in FreeData/gui and then run it
+REM ie. c:\FD-Src\gui
+echo Install requirements for GUI...
 
 call npm install
+
 pause
\ No newline at end of file
diff --git a/tools/Windows/GUI-Launch.bat b/tools/Windows/GUI-Launch.bat
index 8b82932d..3d54f81c 100644
--- a/tools/Windows/GUI-Launch.bat
+++ b/tools/Windows/GUI-Launch.bat
@@ -1,5 +1,5 @@
-REM Place this batch file in FreeData/tnc and then run it
-REM ie. c:\FD-Src\gui_vue
+REM Place this batch file in FreeData/gui and then run it
+REM ie. c:\FD-Src\gui
 
 call npm start
 pause
\ No newline at end of file
diff --git a/tools/Windows/GUI-Update-Requirements.bat b/tools/Windows/GUI-Update-Requirements.bat
index 510b180e..f6ae7248 100644
--- a/tools/Windows/GUI-Update-Requirements.bat
+++ b/tools/Windows/GUI-Update-Requirements.bat
@@ -1,5 +1,8 @@
-REM Place this batch file in FreeData/tnc and then run it
-REM ie. c:\FD-Src\gui_vue
+@echo off
+REM Place this batch file in FreeData/gui and then run it
+REM ie. c:\FD-Src\gui
+echo Check for and install updated requirements
 
 call npm update
+
 pause
\ No newline at end of file
diff --git a/tools/Windows/Modem-Install-Requrements.bat b/tools/Windows/Modem-Install-Requrements.bat
new file mode 100644
index 00000000..b7acb064
--- /dev/null
+++ b/tools/Windows/Modem-Install-Requrements.bat
@@ -0,0 +1,5 @@
+REM Place this batch file in FreeData/modem and then run it
+REM ie. c:\FD-Src\modem
+
+python -m pip install -r ..\requirements.txt
+pause
\ No newline at end of file
diff --git a/tools/Windows/Modem-Launch.bat b/tools/Windows/Modem-Launch.bat
new file mode 100644
index 00000000..6a02ae79
--- /dev/null
+++ b/tools/Windows/Modem-Launch.bat
@@ -0,0 +1,10 @@
+REM Place this batch file in FreeData/modem and then run it
+REM ie. c:\FD-Src\modem
+
+REM Set environment variable to let modem know where to find config, change if you need to specify a different config
+set FREEDATA_CONFIG=.\config.ini 
+
+REM launch modem
+flask --app server run
+
+pause
\ No newline at end of file
diff --git a/tools/Windows/Modem-list-audio-devs.bat b/tools/Windows/Modem-list-audio-devs.bat
new file mode 100644
index 00000000..bf15556d
--- /dev/null
+++ b/tools/Windows/Modem-list-audio-devs.bat
@@ -0,0 +1,6 @@
+@echo off
+REM PLace in modem directory and run to retrieve list of audio devices; you'll need the CRC for the config.ini
+
+python ..\tools\list_audio_devices.py
+
+pause
\ No newline at end of file
diff --git a/tools/Windows/TNC-Install-Requrements.bat b/tools/Windows/TNC-Install-Requrements.bat
deleted file mode 100644
index bdbe4e6b..00000000
--- a/tools/Windows/TNC-Install-Requrements.bat
+++ /dev/null
@@ -1,5 +0,0 @@
-REM Place this batch file in FreeData/tnc and then run it
-REM ie. c:\FD-Src\tnc
-
-python -m pip install -r ..\requirements.txt
-pause
\ No newline at end of file
diff --git a/tools/Windows/copy-files.bat b/tools/Windows/copy-files.bat
index 02ecffb9..f51b3fa8 100644
--- a/tools/Windows/copy-files.bat
+++ b/tools/Windows/copy-files.bat
@@ -1,6 +1,10 @@
+@echo off
 REM This will copy the helper batch files to the approriate places for you
 
-copy GUI* ..\..\gui_vue\
-copy TNC* ..\..\tnc\
+echo Copying GUI scripts to GUI directory
+copy GUI* ..\..\gui\
+
+echo Copying Modem scripts to Modem directory
+copy MODEM* ..\..\modem\
 
 pause
\ No newline at end of file