[diablu commit] r310 - in trunk/SMS2OSC/src/pt/citar/diablu/sms2osc: . bluetooth osc

[codesite...@google.com]

Author: pedro.r.santos
Date: Tue Nov 4 08:53:46 2008
New Revision: 310

Modified:
trunk/SMS2OSC/src/pt/citar/diablu/sms2osc/S2O.java
trunk/SMS2OSC/src/pt/citar/diablu/sms2osc/bluetooth/S2OBTConnection.java
trunk/SMS2OSC/src/pt/citar/diablu/sms2osc/osc/S2OOscListener.java

Log:
Sms sending is now possible:
/diablu/sms2osc/sendsms 'phone number' 'message'

Sms detection
/diablu/sms2osc/sms 'phone number' 'message'

Modified: trunk/SMS2OSC/src/pt/citar/diablu/sms2osc/S2O.java
==============================================================================
--- trunk/SMS2OSC/src/pt/citar/diablu/sms2osc/S2O.java (original)
+++ trunk/SMS2OSC/src/pt/citar/diablu/sms2osc/S2O.java Tue Nov 4 08:53:46
2008
@@ -1,7 +1,11 @@
package pt.citar.diablu.sms2osc;

+import java.util.logging.ConsoleHandler;
+import java.util.logging.Level;
+import java.util.logging.Logger;
import pt.citar.diablu.sms2osc.bluetooth.S2OBTConnection;
import pt.citar.diablu.sms2osc.gui.S2OGUI;
+import pt.citar.diablu.sms2osc.osc.S2OOscClient;
import pt.citar.diablu.sms2osc.osc.S2OOscServer;
import pt.citar.diablu.sms2osc.util.S2OCommPortList;
import pt.citar.diablu.sms2osc.util.S2OProperties;
@@ -9,11 +13,15 @@

public class S2O {

+ private Logger logger;
private S2OCommPortList commPortList;
private S2OProperties properties;
+ private ConsoleHandler ch = new ConsoleHandler();
+

private S2OGUI gui;
private S2OOscServer oscServer;
+ private S2OOscClient oscClient;

private S2OBTConnection btConnection;
@@ -21,10 +29,17 @@

public S2O()
{
+ logger = Logger.getLogger("pt.citar.diablu.sms2osc");
+ ch.setLevel(Level.ALL);
+ logger.addHandler(ch);
+ System.out.println(logger.getHandlers()[0].getLevel());
+
+ logger.log(Level.SEVERE, "start");
commPortList = new S2OCommPortList();
properties = new S2OProperties(this);
properties.loadProperties();
oscServer = new S2OOscServer(this);
+ oscClient = new S2OOscClient(this);
gui = new S2OGUI(this);
btConnection = new S2OBTConnection(this,
properties.getGateway(), "COM6", 57600, "Siemens", "S65");

@@ -61,6 +76,10 @@

public S2OOscServer getOscServer() {
return oscServer;
+ }
+
+ public S2OOscClient getOscClient() {
+ return oscClient;
}

Modified:
trunk/SMS2OSC/src/pt/citar/diablu/sms2osc/bluetooth/S2OBTConnection.java
==============================================================================
---
trunk/SMS2OSC/src/pt/citar/diablu/sms2osc/bluetooth/S2OBTConnection.java
(original)
+++
trunk/SMS2OSC/src/pt/citar/diablu/sms2osc/bluetooth/S2OBTConnection.java
Tue Nov 4 08:53:46 2008
@@ -1,6 +1,7 @@

package pt.citar.diablu.sms2osc.bluetooth;

+import de.sciss.net.OSCMessage;
import pt.citar.diablu.sms2osc.*;
import java.io.IOException;
import java.util.ArrayList;
@@ -147,7 +148,7 @@

if (msgType == MessageTypes.INBOUND) {
System.out.println(">>> New Inbound message detected from
Gateway: " + gatewayId);
- //s2o.getMessages().addMessage(msg.getOriginator(),
msg.getText());
+ s2o.getOscClient().send(new
OSCMessage("/diablu/sms2osc/sms", new Object[] { msg.getOriginator(),
msg.getText()}));
System.out.println("Message: " + msg.getText());

} else if (msgType == MessageTypes.STATUSREPORT) {

Modified: trunk/SMS2OSC/src/pt/citar/diablu/sms2osc/osc/S2OOscListener.java
==============================================================================
--- trunk/SMS2OSC/src/pt/citar/diablu/sms2osc/osc/S2OOscListener.java
(original)
+++ trunk/SMS2OSC/src/pt/citar/diablu/sms2osc/osc/S2OOscListener.java Tue
Nov 4 08:53:46 2008
@@ -19,18 +19,16 @@
}

public void messageReceived(OSCMessage msg, SocketAddress sender, long
time) {
-
- String msgReceived = msg.getName();
-
- for(int i = 0; i <msg.getArgCount(); i++)
- {
- msgReceived += " " + msg.getArg(i);
- }
- System.out.println(msgReceived);
-
+ System.out.println(msg.getName());
+ if(msg.getName().compareTo("/diablu/sms2osc/sendsms") == 0)
+ sendSms(msg);
+ }
+
+ private void sendSms(OSCMessage msg)
+ {
+ s2o.getBtConnection().sendMessage((String) msg.getArg(0), (String)
msg.getArg(1));
+ System.out.println("sent message");
}
-
-
}