Troposphere

debian/rules

@@ -10,19 +10,18 @@
 #export DH_VERBOSE=1
 
 override_dh_installinit:
-	mkdir -p debian/openrepeater/etc/nginx/sites-avaible
+	mkdir -p debian/usr/share/examples/openrepeater/sites-available
 	mkdir -p debian/openrepeater/etc/openrepeater/svxlink
 	mkdir -p debian/openrepeater/usr/sbin
 	mkdir -p debian/openrepeater/usr/share/examples/openrepeater
 	mkdir -p debian/openrepeater/var/lib/openrepeater/db
 	mkdir -p debian/openrepeater/var/www/openrepeater
-	cp -rp install/nginx/openrepeater debian/usr/share/examples/openrepeater/sites-available/
+	cp -rp install/nginx/openrepeater debian/usr/share/examples/openrepeater/sites-available
 	cp -rp install/default debian/openrepeater/usr/share/examples/openrepeater
 	cp -rp install/nginx debian/openrepeater/usr/share/examples/openrepeater
 	cp -rp install/php5 debian/openrepeater/usr/share/examples/openrepeater
+	cp -rp install/sql debian/openrepeater/usr/share/examples/openrepeater
 	cp -rp install/svxlink-conf/* debian/openrepeater/etc/openrepeater/svxlink
-	cp -rp install/sql/database.php debian/openrepeater/etc/openrepeater
-	cp -rp install/sql/openrepeater.db debian/openrepeater/var/lib/openrepeater/db
 	cp -rp install/sounds debian/openrepeater/var/lib/openrepeater
 	cp -rp install/scripts/* debian/openrepeater/usr/sbin
 	cp -rp functions includes modules theme wizard *.php debian/openrepeater/var/www/openrepeater

functions/svxlink_update.php

@@ -322,25 +322,25 @@ function built_tx($curPort, $portsArray, $settingsArray) {
 
 	# Space separated list of GPIO pins that point IN and have an
 	# Active HIGH state (3.3v = ON, 0v = OFF)
-	GPIO_IN_HIGH=""
+	GPIO_IN_HIGH="'.$gpioInHighString.'"
 
 	# Space separated list of GPIO pins that point IN and have an
 	# Active LOW state (0v = ON, 3.3v = OFF)
-	GPIO_IN_LOW=""
+	GPIO_IN_LOW="'.$gpioInLowString.'"
 
 	# Space separated list of GPIO pins that point OUT and have an
 	# Active HIGH state (3.3v = ON, 0v = OFF)
-	GPIO_OUT_HIGH=""
+	GPIO_OUT_HIGH="'.$gpioOutHighString.'"
 
 	# Space separated list of GPIO pins that point OUT and have an
 	# Active LOW state (0v = ON, 3.3v = OFF)
-	GPIO_OUT_LOW=""
+	GPIO_OUT_LOW="'.$gpioOutLowString.'"
 
 	# User that should own the GPIO device files
 	GPIO_USER="svxlink"
 
 	# Group for the GPIO device files
-	GPIO_GROUP="daemony"
+	GPIO_GROUP="daemon"
 
 	# File access mode for the GPIO device files
 	GPIO_MODE="0664"
@@ -360,7 +360,7 @@ function built_tx($curPort, $portsArray, $settingsArray) {
 
 file_put_contents('/etc/openrepeater/svxlink/svxlink.conf', $orpFileHeader . $svx_global . $svx_logic . $svx_ports);
 file_put_contents('/etc/openrepeater/svxlink/local-events.d/CustomLogic.tcl', $orpFileHeader . $tclOverride);
-file_put_contents('/etc/openrepeater/svxlink/svxlink_gpio.conf', $orpFileHeader . $gpioConfigFile);
+file_put_contents('/etc/openrepeater/svxlink/gpio.conf', $orpFileHeader . $gpioConfigFile);
 
 
 /* CLOSE DATABSE CONNECTION */

includes/get_sound.php

@@ -45,17 +45,17 @@
 	preg_match('/card\s.*?\[(.*?)\]/', $in_val, $in_label);
 	preg_match('/card\s.*?\[.*?\].*?\[(.*?)\]/', $in_val, $in_type);
 
-/*
+
 	// Write Left & Right Channels to Array
 	$device_list[] = array('card' => $in_cardnum[1], 'label' => $in_label[1], 'type' => $in_type[1], 'direction' => "IN", 'channel' => 0, 'channel_label' => "Left");
 	$device_list[] = array('card' => $in_cardnum[1], 'label' => $in_label[1], 'type' => $in_type[1], 'direction' => "IN", 'channel' => 1, 'channel_label' => "Right");
 	$device_in_count = $device_in_count + 2; // this is because left and right are currently hard coded
-*/
+
 
 	// Write Mono Input Channel to Array
-	$device_list[] = array('card' => $in_cardnum[1], 'label' => $in_label[1], 'type' => $in_type[1], 'direction' => "IN", 'channel' => 0, 'channel_label' => "Mono");
+/*	$device_list[] = array('card' => $in_cardnum[1], 'label' => $in_label[1], 'type' => $in_type[1], 'direction' => "IN", 'channel' => 0, 'channel_label' => "Mono");
 	$device_in_count = $device_in_count + 1; // this is because left and right are currently hard coded
-
+*/
 }
 
 // Loop through ouputs and add to device array

install/default/svxlink

@@ -17,6 +17,6 @@ ENV="ASYNC_AUDIO_NOTRIGGER=1"
 # AUDIO_SETTINGS_ONSTOP="<string>"
 #   <string>: shell script command(s)
 
-if [ -r /etc/openrepeater/svxlink/svxlink_gpio.conf ]; then
-        . /etc/openrepeater/svxlink/svxlink_gpio.conf
+if [ -r /etc/openrepeater/svxlink/gpio.conf ]; then
+        . /etc/openrepeater/svxlink/gpio.conf
 fi