Merge branch 'master' of https://github.com/N4IRS/DMRlink

dmr_install

@@ -0,0 +1,56 @@
+#! /bin/sh
+
+#################################################
+#                                               #
+# Create directory structure for DMRlink        #
+#                                               #
+#################################################
+
+# Minor updates to DIAL
+# rm /etc/asterisk/firsttime
+cd /etc/asterisk/
+wget https://github.com/N4IRS/AllStar/raw/master/configs/dnsmgr.conf
+# wget https://github.com/N4IRS/AllStar/raw/master/configs/modules.conf
+
+# Checkout DMRlink and put it in /opt
+cd /srv
+git clone https://github.com/N4IRS/DMRlink
+cd /srv/DMRlink/
+./mk_dmrlink
+
+# setup boot for DV3000
+cd /srv
+systemctl stop getty@ttyAMA0.service
+systemctl disable getty@ttyAMA0.service
+apt-get install -y sudo
+
+# Setup WiringPi
+git clone git://git.drogon.net/wiringPi
+cd wiringPi/
+./build
+cd ..
+
+# Setup AMBEserverGPIO
+git clone https://github.com/dl5di/OpenDV.git
+mv OpenDV/DummyRepeater/DV3000 DV3000
+rm -rf OpenDV
+cd DV3000/
+make clean
+make
+make install
+make init-install
+python AMBEtest3.py
+cd /etc/init.d
+update-rc.d AMBEserverGPIO start 50 2 3 4 5
+
+# Setup DMRGateway
+cd /srv
+git clone https://github.com/N4IRS/DMRGateway.git
+cd DMRGateway/
+./install.sh
+cp config.txt /boot
+cp cmdline.txt /boot
+
+# reboot
+
+

dmrlink_SAMPLE.cfg

@@ -58,7 +58,7 @@ PRINT_PEERS_INC_FLAGS: 0
 [LOGGER]
 LOG_FILE: /var/log/dmrlink/dmrlink.log
 LOG_HANDLERS: file
-LOG_LEVEL: WARNING
+LOG_LEVEL: INFO
 LOG_NAME: DMRlink
 
 
@@ -69,7 +69,7 @@ LOG_NAME: DMRlink
 # [NAME]        The name you want to use to identify the IPSC instance (use
 #               something better than "IPSC1"...)
 # ENABLED:      Should we communiate with this network? Handy if you need to
-#			    shut one down but don't want to lose the config
+#		shut one down but don't want to lose the config
 # RADIO_ID:     This is the radio ID that DMRLink should use to communicate
 # IP:           This is the local IPv4 address to listen on. It may be left
                 blank if you do not need or wish to specify. It is mostly
@@ -105,10 +105,10 @@ LOG_NAME: DMRlink
 # ...Repeat the block for each IPSC network to join.
 #
 
-[IPSC1]
+[SAMPLE_PEER]
 ENABLED: True
 RADIO_ID: 12345
-IP: 4.3.2.1
+IP: 127.0.0.1 
 PORT: 50000
 ALIVE_TIMER: 5
 MAX_MISSED: 20
@@ -128,3 +128,31 @@ AUTH_ENABLED: True
 AUTH_KEY: 1A2B3C
 MASTER_IP: 1.2.3.4
 MASTER_PORT: 50000
+
+
+[SAMPLE_MASTER]
+ENABLED: False
+RADIO_ID: 54321
+IP: 192.168.1.1
+PORT: 50000
+ALIVE_TIMER: 5
+MAX_MISSED: 20
+PEER_OPER: True
+IPSC_MODE: DIGITAL
+TS1_LINK: True
+TS2_LINK: True
+CSBK_CALL: False
+RCM: True
+CON_APP: True
+XNL_CALL: False
+XNL_MASTER: False
+DATA_CALL: True
+VOICE_CALL: True
+MASTER_PEER: True
+AUTH_ENABLED: True
+AUTH_KEY: 1A2B3C
+# Below not used for a Master
+# MASTER_IP: 1.2.3.4
+# MASTER_PORT: 50000
+
+

get_ids.sh

@@ -1,3 +1,11 @@
+#! /bin/sh
+
+#################################################
+#                                               #
+# Create directory structure for DMRlink        #
+#                                               #
+#################################################
+
 # To provide more readable output from DMRlink with current subscriber and repeater IDs, we download the CSV files from DMR-MARC
 # If you are going to use this in a cron task,  don't run it more then once a day.
 # It might be good to find alternale a source as a backup.

mk_dmrlink

@@ -41,7 +41,6 @@ rm bitstring-3.1.3.zip
 
 # Put common files in /opt/dmrlink
 cp /srv/DMRlink/subscriber_ids.csv /opt/dmrlink
-cp /srv/DMRlink/subscriber_idsxxx.csv /opt/dmrlink
 cp /srv/DMRlink/talkgroup_ids.csv /opt/dmrlink
 cp /srv/DMRlink/peer_ids.csv /opt/dmrlink
 cp /srv/DMRlink/get_ids.sh /opt/dmrlink