From 1f9b9d1de3b5acbdb0a61c2f8e2209af3b88be3c Mon Sep 17 00:00:00 2001
From: Simon <simon@gb7fr.org.uk>
Date: Sun, 12 Sep 2021 20:12:02 +0100
Subject: [PATCH] Update compose file

---
 config/DMRGateway.ini |  3 +--
 config/dmrlink.cfg    |  4 ++--
 config/hblink.cfg     |  4 ++--
 docker-compose.yml    | 12 +++++++++---
 entrypoint            |  3 ++-
 5 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/config/DMRGateway.ini b/config/DMRGateway.ini
index 92c743c..86af8cb 100644
--- a/config/DMRGateway.ini
+++ b/config/DMRGateway.ini
@@ -80,11 +80,10 @@ TypeRewrite=2,4000,2,4000
 PassAllTG=1
 PassAllTG=2
 
-
-
 Password=passw0rd
 Location=1
 Debug=0
+Options={{DMRG_OPTIONS}}
 
 
 
diff --git a/config/dmrlink.cfg b/config/dmrlink.cfg
index 30729d6..4ac3b26 100644
--- a/config/dmrlink.cfg
+++ b/config/dmrlink.cfg
@@ -165,12 +165,12 @@ MASTER_PORT: 50000
 GROUP_HANGTIME: 5
 
 
-[DEFAULTS]
+[IPSC_Bridge]
 ENABLED: True
 RADIO_ID: {{IPSC_RADIO_ID}}
 IP:
 PORT: 55000
-ALIVE_TIMER: 10
+ALIVE_TIMER: 6
 MAX_MISSED: 20
 PEER_OPER: True
 IPSC_MODE: DIGITAL
diff --git a/config/hblink.cfg b/config/hblink.cfg
index fcd92c0..4b500a1 100644
--- a/config/hblink.cfg
+++ b/config/hblink.cfg
@@ -80,7 +80,7 @@ GROUP_HANGTIME: 5
 # Setting Loose to True relaxes the validation on packets received from the master.
 # This will allow HBlink to connect to a non-compliant system such as XLXD, DMR+ etc.
 
-[DMRGATEWAY]
+[HB_Bridge]
 MODE: CLIENT
 ENABLED: True
 LOOSE: True
@@ -96,7 +96,7 @@ RX_FREQ: {{HB_RX_FREQ}}
 TX_FREQ: {{HB_TX_FREQ}}
 TX_POWER: {{HB_TX_POWER}}
 COLORCODE: {{HB_COLORCODE}}
-SLOTS: 3
+SLOTS: {{HB_SLOTS}}
 LATITUDE: {{HB_LAT}}
 LONGITUDE: {{HB_LON}}
 HEIGHT: {{HB_HEIGHT}}
diff --git a/docker-compose.yml b/docker-compose.yml
index 7832a0b..55494d5 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -27,7 +27,7 @@ services:
           - IPSC_MASTER_IP=
           - IPSC_MASTER_PORT=
           #Which timeslots to forward
-          - IPSC_TS1=False
+          - IPSC_TS1=True
           - IPSC_TS2=True
           #DMR ID we use to talk to the IPSC network
           #This should probably be the repeater server's SERVER_ID
@@ -44,9 +44,15 @@ services:
           - 'HB_LON=-'
           - HB_HEIGHT=
           - HB_LOCATION=
-          #Put an Options line here to configure static TGs etc
-          - HB_OPTIONS=
+          #Which slots to enable: 
+          # 1 = 1, 2 = 2, 3 = both
+          # Note there are some issues with both slots
+          # at this time.
+          # Slot 2 is setup to work with dial-a-tg **only**
+          - HB_SLOTS=1
           #Configure Repeater server side (DMRGateway)
+          #Put an Options line here to configure static TGs etc
+          - 'DMRG_OPTIONS='
           #Target server
           - DMRG_TARGET=
         image: 'hacknix/freedmr-ipsc:latest'
diff --git a/entrypoint b/entrypoint
index 52478c1..2de1a6b 100755
--- a/entrypoint
+++ b/entrypoint
@@ -22,8 +22,9 @@ sed -i "s/{{HB_LAT}}/$HB_LAT/" /opt/hblink.cfg
 sed -i "s/{{HB_LON}}/$HB_LON/" /opt/hblink.cfg
 sed -i "s/{{HB_HEIGHT}}/$HB_HEIGHT/" /opt/hblink.cfg
 sed -i "s/{{HB_LOCATION}}/$HB_LOCATION/" /opt/hblink.cfg
-sed -i "s/{{HB_OPTIONS}}/$HB_OPTIONS/" /opt/hblink.cfg
+sed -i "s/{{HB_SLOTS}}/$HB_SLOTS/" /opt/hblink.cfg
 
+sed -i "s/{{DMRG_OPTIONS}}/$DMRG_OPTIONS/" /opt/DMRGateway.ini
 sed -i "s/{{DMRG_TARGET}}/$DMRG_TARGET/" /opt/DMRGateway.ini
 
 #Run processes