Merge branch 'afsk_speaker'

build.xml

@@ -200,6 +200,7 @@
 		<pathelement location="${android-jar}"/>
 		<pathelement location="${out-classes}"/>
 		<fileset dir="tools" includes="*.jar"/>
+		<fileset dir="${external-libs-folder}"  includes="*.jar"/>
 	    </classpath>
 	</scalac>
     </target>

default.properties

@@ -8,4 +8,4 @@
 # project structure.
 
 # Project target: Android 1.6
-target=android-4
+target=android-4

res/values-da/strings.xml

@@ -77,6 +77,7 @@
 	<item>UDP port 8080</item>
 	<item>HTTP POST</item>
 	<item>TCP connection</item>
+	<item>AFSK</item>
 </string-array>
 <string name="p_host">Server</string>
 <string name="p_host_summary">APRS-IS server (port 8080) til at sende beacons</string>

res/values-de/strings.xml

@@ -89,6 +89,7 @@ http://www.gnu.de/documents/gpl-2.0.de.html</string>
 	<item>UDP Port 8080</item>
 	<item>HTTP POST</item>
 	<item>TCP-Verbindung</item>
+	<item>AFSK Töne</item>
 </string-array>
 <string name="p_host">Server</string>
 <string name="p_host_summary">APRS-IS Zielserver (Port 8080)</string>

res/values-es/strings.xml

@@ -99,6 +99,7 @@
 	<item>UDP port 8080</item>
 	<item>HTTP POST</item>
 	<item>TCP connection</item>
+	<item>AFSK</item>
 </string-array>
 <string name="p_host">Server</string>
 <string name="p_host_summary">APRS-IS server (port 8080) to send beacons</string>

res/values-fr/strings.xml

@@ -99,6 +99,7 @@
 	<item>UDP port 8080</item>
 	<item>HTTP POST</item>
 	<item>TCP connection</item>
+	<item>AFSK</item>
 </string-array>
 <string name="p_host">Serveur</string>
 <string name="p_host_summary">APRS-IS server (port 8080) to send beacons</string>

res/values-ja/strings.xml

@@ -97,6 +97,7 @@
 	<item>UDP ポート8080</item>
 	<item>HTTP POST</item>
 	<item>TCP connection</item>
+        <item>AFSK</item>
 </string-array>
 <string name="p_host">送信サーバ</string>
 <string name="p_host_summary">ビーコンを送信するAPRS-ISサーバ (ポート8080)</string>

res/values-nb/strings.xml

@@ -77,6 +77,7 @@
 	<item>UDP port 8080</item>
 	<item>HTTP POST</item>
 	<item>TCP connection</item>
+        <item>AFSK</item>
 </string-array>
 <string name="p_host">Server</string>
 <string name="p_host_summary">APRS-IS server (port 8080) for å sende beacons</string>

res/values-nl/strings.xml

@@ -97,6 +97,7 @@
 	<item>UDP poort 8080</item>
 	<item>HTTP POST</item>
 	<item>TCP connection</item>
+	<item>AFSK</item>
 </string-array>
 <string name="p_host">Server</string>
 <string name="p_host_summary">APRS-IS server (port 8080) voor het versturen van bakens</string>

res/values-pl/strings.xml

@@ -97,6 +97,7 @@
 	<item>UDP port 8080</item>
 	<item>HTTP POST</item>
 	<item>TCP connection</item>
+        <item>AFSK</item>
 </string-array>
 <string name="p_host">Server</string>
 <string name="p_host_summary">APRS-IS server (port 8080) to send beacons</string>

res/values-tr/strings.xml

@@ -97,6 +97,7 @@
 	<item>UDP port 8080</item>
 	<item>HTTP POST</item>
 	<item>TCP connection</item>
+        <item>AFSK</item>
 </string-array>
 <string name="p_host">Sunucu</string>
 <string name="p_host_summary">Beacon gönderilecek APRS-IS sunucusu (port 8080)</string>

res/values-zh-rCN/strings.xml

@@ -77,6 +77,7 @@
 	<item>UDP 端口 8080</item>
 	<item>HTTP POST</item>
 	<item>TCP connection</item>
+        <item>AFSK</item>
 </string-array>
 <string name="p_host">服务器</string>
 <string name="p_host_summary">APRS-IS 服务器 (端口 8080) 发送信标</string>

res/values/arrays.xml

@@ -4,6 +4,7 @@
 		<item>udp</item>
 		<item>http</item>
 		<item>tcp</item>
+		<item>afsk</item>
 	</string-array>
 
 	<string-array name="p_ssid_ev">

res/values/strings.xml

@@ -101,6 +101,7 @@
 	<item>UDP port 8080</item>
 	<item>HTTP POST</item>
 	<item>TCP connection</item>
+	<item>AFSK via Speaker</item>
 </string-array>
 <string name="p_host">Server</string>
 <string name="p_host_summary">APRS-IS server (port 8080) to send beacons</string>

src/AfskUploader.scala

@@ -0,0 +1,40 @@
+package de.duenndns.aprsdroid
+
+import _root_.android.location.Location
+import _root_.android.preference.PreferenceManager
+import _root_.android.util.Log
+import _root_.java.net.{InetAddress, DatagramSocket, DatagramPacket}
+import com.nogy.afu.soundmodem.{Message, APRSFrame, Afsk}
+
+class AfskUploader(host : String, login : String) extends AprsIsUploader(host, login) {
+	val TAG = "AprsAfsk"
+	var FrameLength = 150	//1200Bits = 1sec to open VOX
+	var Digis = "WIDE1-1"
+	
+	def start() {
+	}
+
+	def update(packet : String) : String = {
+		// Need to "parse" the packet in order to replace the Digipeaters
+		val Array(from, to_data) = packet.split(">", 2)
+		val Array(to_digis, data) = to_data.split(":", 2)
+		val Array(to, digis) = to_digis.split(",", 2)
+		val msg = new APRSFrame(from,to,Digis,data,FrameLength).getMessage()
+		val mod = new Afsk()
+		mod.sendMessage(msg)
+		Log.d(TAG, "update(): From: " + from +" To: "+ to +" Via: " + Digis + " telling " + data)
+		"AFSK OK"
+	}
+
+	def stop() {
+	}
+
+	// Non Interface methods
+	def set_FrameLength(length: Int) = {
+		FrameLength = length
+	}
+
+	def set_Digis(Digipeaters : String) = {
+		Digis = Digipeaters
+	}
+}

src/AprsService.scala

@@ -88,6 +88,8 @@ class AprsService extends Service with LocationListener {
 			poster = new HttpPostUploader(hostname, login)
 		case "tcp" =>
 			poster = new TcpUploader(this, hostname, login, " filter m/%d".format(filterdist))
+		case "afsk" =>
+			poster = new AfskUploader(hostname, login)
 		case _ =>
 			stopSelf()
 		}