From: Mike Beattie <mike@ethernal.org>
Date: Fri, 31 Aug 2012 04:38:21 +0000 (+1200)
Subject: altosdroid: complete frequency change dialog
X-Git-Tag: 1.1~37^2~4
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=543ecb530d6fdf188a746ac59b72544e69bad830

altosdroid: complete frequency change dialog

Also implement Service IPC to action request.

Signed-off-by: Mike Beattie <mike@ethernal.org>
---

diff --git a/altosdroid/res/menu/option_menu.xml b/altosdroid/res/menu/option_menu.xml
index 525541e1..d7ba8305 100644
--- a/altosdroid/res/menu/option_menu.xml
+++ b/altosdroid/res/menu/option_menu.xml
@@ -18,6 +18,6 @@
           android:icon="@android:drawable/ic_menu_search"
           android:title="@string/connect_device" />
     <item android:id="@+id/select_freq"
-          android:icon="@android:drawable/ic_menu_search"
+          android:icon="@android:drawable/ic_menu_preferences"
           android:title="@string/select_freq" />
 </menu>
diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
index 27760162..de0b02a6 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
@@ -355,7 +355,10 @@ public class AltosDroid extends Activity {
 	}
 
 	void setFrequency(double freq) {
-		
+		try {
+			mService.send(Message.obtain(null, TelemetryService.MSG_SETFREQUENCY, freq));
+		} catch (RemoteException e) {
+		}
 	}
 
 	void setFrequency(String freq) {
@@ -399,6 +402,7 @@ public class AltosDroid extends Activity {
 						 }
 					 });
 			AlertDialog alert = builder.create();
+			alert.show();
 			return true;
 		}
 		return false;
diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryService.java b/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryService.java
index ffe96946..6a1f1c5a 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryService.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryService.java
@@ -52,6 +52,7 @@ public class TelemetryService extends Service {
 	static final int MSG_CONNECT_FAILED    = 5;
 	static final int MSG_DISCONNECTED      = 6;
 	static final int MSG_TELEMETRY         = 7;
+	static final int MSG_SETFREQUENCY      = 8;
 
 	public static final int STATE_NONE       = 0;
 	public static final int STATE_READY      = 1;
@@ -126,6 +127,15 @@ public class TelemetryService extends Service {
 			case MSG_TELEMETRY:
 				s.sendMessageToClients(Message.obtain(null, AltosDroid.MSG_TELEMETRY, msg.obj));
 				break;
+			case MSG_SETFREQUENCY:
+				if (s.state == STATE_CONNECTED) {
+					try {
+						s.mAltosBluetooth.set_radio_frequency((Double) msg.obj);
+					} catch (InterruptedException e) {
+					} catch (TimeoutException e) {
+					}
+				}
+				break;
 			default:
 				super.handleMessage(msg);
 			}