Merge pull request #432 from alanbjohnston/master-b-n

Add PacSat Command and Control

dtmf_aprs_cc.py

@@ -61,6 +61,7 @@ if __name__ == "__main__":
 					system("echo '\nBPSK Mode!!\n'")
 					mode = 'b'
 					change_mode = True
+					
 				elif ((line.find("MODE=s")) > 0):
 					system("echo '\nSSTV Mode!!\n'")
 					mode = 's'
@@ -85,20 +86,30 @@ if __name__ == "__main__":
 					system("echo '\nRepeater Mode!!\n'")
 					mode = 'e'
 					change_mode = True
-					
+
 				elif ((line.find(":t6#")) > 0):
+					system("echo '\nRepeater Mode!!\n'")
+					mode = 'e'
+					change_mode = True
+					
+				elif ((line.find("MODE=j")) > 0):
+					system("echo '\nFUNcube Mode!!\n'")
+					mode = 'j'
+					change_mode = True
+					
+				elif ((line.find(":t7#")) > 0):
 					system("echo '\nFUNcube Mode!!\n'")
 					mode = 'j'
 					change_mode = True	
 					
 				elif ((line.find("MODE=G")) > 0):
 					system("echo '\nPacSatSim Mode!!\n'")
-					mode = 'p'
+					mode = 'G'
 					change_mode = True
 					
 				elif ((line.find(":t8#")) > 0):
 					system("echo '\nPacSatSim Mode!!\n'")
-					mode = 'p'
+					mode = 'G'
 					change_mode = True
 					
 				elif ((line.find("MODE=n")) > 0):

groundstation/command.sh

@@ -20,7 +20,7 @@ echo
 
 autotune=0
 
-mode=$(zenity --timeout=20 --list 2>/dev/null --width=300 --height=360 --title="Transmit Command" --text="Choose the command to transmit" --column="Mode" --column="Result" a "APRS Mode" f "FSK Mode" b "BPSK Mode" s "SSTV Mode" m "CM Mode" e "Repeater Mode" j "FUNcube Mode" o "Beacon On/Off")
+mode=$(zenity --timeout=20 --list 2>/dev/null --width=300 --height=380 --title="Transmit Command" --text="Choose the command to transmit" --column="Mode" --column="Result" a "APRS Mode" f "FSK Mode" b "BPSK Mode" s "SSTV Mode" m "CM Mode" e "Repeater Mode" j "FUNcube Mode" G "PacSatSim Mode" o "Beacon On/Off")
 
 # echo $mode
 

install

@@ -480,8 +480,17 @@ fi
 
 cd /home/pi/pi-power-button
 
+if [ ! $(git branch --show-current | grep master-b) ]; then
+
+	echo "updating branch of pi-power-button to master-b."
+	git pull
+	git checkout master-b
+	script/install
+	FLAG=1
+fi
+
 git pull --no-rebase > .updated_p
-git checkout master
+#git checkout master
 grep 'changed' /home/pi/pi-power-button/.updated_p
 if [[ $(grep 'changed' /home/pi/pi-power-button/.updated_p) ]]; then