Diff: main.cpp

Revision:

17:719bb7709c80

Parent:

16:28d062c5522b

Child:

18:53d83febbe0a

--- a/main.cpp	Mon Oct 06 11:42:25 2014 +0000
+++ b/main.cpp	Mon Mar 16 10:26:15 2015 +0000
@@ -1,133 +1,66 @@
-/*******************************************************************************
- * Copyright (c) 2014 IBM Corp.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * and Eclipse Distribution License v1.0 which accompany this distribution.
- *
- * The Eclipse Public License is available at
- *    http://www.eclipse.org/legal/epl-v10.html
- * and the Eclipse Distribution License is available at
- *   http://www.eclipse.org/org/documents/edl-v10.php.
- *
- * Contributors:
- *    Ian Craggs - initial API and implementation and/or initial documentation
- *******************************************************************************/
- 
- /**
-  This is a sample program to illustrate the use of the MQTT Client library
-  on the mbed platform.  The Client class requires two classes which mediate
-  access to system interfaces for networking and timing.  As long as these two
-  classes provide the required public programming interfaces, it does not matter
-  what facilities they use underneath. In this program, they use the mbed
-  system libraries.
- 
- */
-
-
-#include "C12832.h"
-C12832 lcd(p5, p7, p6, p8, p11);
-
+/** MQTT Publish von Sensordaten als JSON */
+#include "mbed.h"
 #include "MQTTEthernet.h"
 #include "MQTTClient.h"
 
-int arrivedcount = 0;
-
-
-void messageArrived(MQTT::MessageData& md)
-{
-    MQTT::Message &message = md.message;
-    lcd.cls();
-    lcd.locate(0,3);
-    printf("Message arrived: qos %d, retained %d, dup %d, packetid %d\n", message.qos, message.retained, message.dup, message.id);
-    printf("Payload %.*s\n", message.payloadlen, (char*)message.payload);
-    ++arrivedcount;
-    lcd.puts((char*)message.payload);
-}
-
+// Topic
+char* topic = "mbed/k64f/iotkit";
+// MQTT Brocker
+char* hostname = "iot.eclipse.org";
+int port = 1883;
+// MQTT Message
+MQTT::Message message;
+// I/O Buffer
+char buf[100];
+// UI
+DigitalOut led1( LED1 );
+// Lichtsensor
+AnalogIn   light( A1 );
 
-int main(int argc, char* argv[])
-{   
-    MQTTEthernet ipstack = MQTTEthernet();
-    float version = 0.47;
-    char* topic = "mbed-sample";
-    
-    lcd.printf("Version is %f\n", version);
-    printf("Version is %f\n", version);
-              
-    MQTT::Client<MQTTEthernet, Countdown> client = MQTT::Client<MQTTEthernet, Countdown>(ipstack);
-    
-    char* hostname = "m2m.eclipse.org";
-    int port = 1883;
-    lcd.printf("Connecting to %s:%d\n", hostname, port);
+/** Hilfsfunktion zum Publizieren auf MQTT Broker */
+void publish( MQTTEthernet &ipstack, MQTT::Client<MQTTEthernet, Countdown> &client )
+{
+    printf("Connecting to %s:%d\n", hostname, port);
     int rc = ipstack.connect(hostname, port);
-    if (rc != 0)
-        lcd.printf("rc from TCP connect is %d\n", rc);
- 
-    MQTTPacket_connectData data = MQTTPacket_connectData_initializer;       
+    if ( rc != 0 )
+        printf("rc from TCP connect is %d\n", rc);
+
+    // mit MQTT Broker verbinden
+    MQTTPacket_connectData data = MQTTPacket_connectData_initializer;
     data.MQTTVersion = 3;
     data.clientID.cstring = "mbed-sample";
     data.username.cstring = "testuser";
     data.password.cstring = "testpassword";
-    if ((rc = client.connect(data)) != 0)
-        lcd.printf("rc from MQTT connect is %d\n", rc);
-    
-    if ((rc = client.subscribe(topic, MQTT::QOS1, messageArrived)) != 0)
-        lcd.printf("rc from MQTT subscribe is %d\n", rc);
+    if ( (rc = client.connect(data)) != 0 )
+        printf("rc from MQTT connect is %d\n", rc);
 
-    MQTT::Message message;
-
-    // QoS 0
-    char buf[100];
-    sprintf(buf, "Hello World!  QoS 0 message from app version %f\n", version);
+    // Message als JSON aufbereiten und senden
+    sprintf( buf, "{ \"light:\": %f }", light.read() );
+    printf( "Publish: %s\n", buf );
     message.qos = MQTT::QOS0;
     message.retained = false;
     message.dup = false;
-    message.payload = (void*)buf;
-    message.payloadlen = strlen(buf)+1;
-    rc = client.publish(topic, message);
-    while (arrivedcount < 1)
-        client.yield(100);
-        
-    // QoS 1
-    sprintf(buf, "Hello World!  QoS 1 message from app version %f\n", version);
-    message.qos = MQTT::QOS1;
-    message.payloadlen = strlen(buf)+1;
-    rc = client.publish(topic, message);
-    while (arrivedcount < 2)
-        client.yield(100);
-        
-    // QoS 2
-    sprintf(buf, "Hello World!  QoS 2 message from app version %f\n", version);
-    message.qos = MQTT::QOS2;
+    message.payload = (void*) buf;
     message.payloadlen = strlen(buf)+1;
-    rc = client.publish(topic, message);
-    while (arrivedcount < 3)
-        client.yield(100);
-        
-    // n * QoS 2
-    for (int i = 1; i <= 10; ++i)
-    {
-        sprintf(buf, "Hello World!  QoS 2 message number %d from app version %f\n", i, version);
-        message.qos = MQTT::QOS2;
-        message.payloadlen = strlen(buf)+1;
-        rc = client.publish(topic, message);
-        while (arrivedcount < i + 3)
-            client.yield(100);
-    }
+    client.publish(topic, message);
     
-    if ((rc = client.unsubscribe(topic)) != 0)
-        printf("rc from unsubscribe was %d\n", rc);
-    
-    if ((rc = client.disconnect()) != 0)
-        printf("rc from disconnect was %d\n", rc);
-    
+    // Verbindung beenden, ansonsten ist nach 4x Schluss
+    client.disconnect();
     ipstack.disconnect();
-    
-    lcd.cls();
-    lcd.locate(0,3);
-    lcd.printf("Version %.2f: finish %d msgs\n", version, arrivedcount);
-    printf("Finishing with %d messages received\n", arrivedcount);
-    
-    return 0;
 }
+
+/** Hauptprogramm */
+int main()
+{
+    // Ethernet und MQTT initialisieren (muss in main erfolgen)
+    MQTTEthernet ipstack = MQTTEthernet();
+    MQTT::Client<MQTTEthernet, Countdown> client = MQTT::Client<MQTTEthernet, Countdown>(ipstack);
+
+    while   ( 1 ) 
+    {
+        led1 = 1;
+        publish( ipstack, client );
+        led1 = 0;
+        wait    ( 2.0 );
+    }
+}