Diff: main.cpp

Revision:

1:f6ebd1725aae

Parent:

0:0046df9d5380

Child:

2:6d5dbdb22631

--- a/main.cpp	Tue Sep 15 19:37:13 2020 +0000
+++ b/main.cpp	Wed Sep 16 03:54:31 2020 +0000
@@ -1,108 +1,67 @@
-/*
- * Copyright (c) 2006-2020 Arm Limited and affiliates.
- * SPDX-License-Identifier: Apache-2.0
- */
 #include "mbed.h"
-#include "TCPSocket.h"
 #include "ESP8266Interface.h"
 
-ESP8266Interface wifi(D5, D4);
-
-const char *sec2str(nsapi_security_t sec)
-{
-    switch (sec) {
-        case NSAPI_SECURITY_NONE:
-            return "None";
-        case NSAPI_SECURITY_WEP:
-            return "WEP";
-        case NSAPI_SECURITY_WPA:
-            return "WPA";
-        case NSAPI_SECURITY_WPA2:
-            return "WPA2";
-        case NSAPI_SECURITY_WPA_WPA2:
-            return "WPA/WPA2";
-        case NSAPI_SECURITY_UNKNOWN:
-        default:
-            return "Unknown";
-    }
-}
-
-void scan_demo(WiFiInterface *wifi)
-{
-    WiFiAccessPoint *ap;
-
-    printf("Scan:\r\n");
-
-    int count = wifi->scan(NULL, 0);
-
-    /* Limit number of network arbitrary to 15 */
-    count = count < 15 ? count : 15;
-
-    ap = new WiFiAccessPoint[count];
-
-    count = wifi->scan(ap, count);
-    for (int i = 0; i < count; i++) {
-        printf("Network: %s secured: %s BSSID: %hhX:%hhX:%hhX:%hhx:%hhx:%hhx RSSI: %hhd Ch: %hhd\r\n", ap[i].get_ssid(),
-               sec2str(ap[i].get_security()), ap[i].get_bssid()[0], ap[i].get_bssid()[1], ap[i].get_bssid()[2],
-               ap[i].get_bssid()[3], ap[i].get_bssid()[4], ap[i].get_bssid()[5], ap[i].get_rssi(), ap[i].get_channel());
-    }
-    printf("%d networks available.\r\n", count);
-
-    delete[] ap;
-}
-
-void http_demo(NetworkInterface *net)
-{
-    // Open a socket on the network interface, and create a TCP connection to mbed.org
-    TCPSocket socket;
-    socket.open(net);
-
-    SocketAddress a;
-    net->gethostbyname("ifconfig.io", &a);
-    a.set_port(80);
-    socket.connect(a);
-    // Send a simple http request
-    char sbuffer[] = "GET / HTTP/1.1\r\nHost: ifconfig.io\r\n\r\n";
-    int scount = socket.send(sbuffer, sizeof sbuffer);
-    printf("sent %d [%.*s]\n", scount, strstr(sbuffer, "\r\n") - sbuffer, sbuffer);
-
-    // Recieve a simple http response and print out the response line
-    char rbuffer[64];
-    int rcount = socket.recv(rbuffer, sizeof rbuffer);
-    printf("recv %d [%.*s]\n", rcount, strstr(rbuffer, "\r\n") - rbuffer, rbuffer);
-
-    // Close the socket to return its memory and bring down the network interface
-    socket.close();
-}
+// Library to use https://github.com/ARMmbed/mbed-mqtt
+#include <MQTTClientMbedOs.h>
 
 int main()
 {
-    SocketAddress a;
-
-    printf("WiFi example\r\n\r\n");
-
-    scan_demo(&wifi);
+    ESP8266Interface esp(MBED_CONF_APP_ESP_TX_PIN, MBED_CONF_APP_ESP_RX_PIN);
+    
+    //Store device IP
+    SocketAddress deviceIP;
+    //Store broker IP
+    SocketAddress MQTTBroker;
+    
+    TCPSocket socket;
+    MQTTClient client(&socket);
+    
+    printf("\nConnecting wifi..\n");
 
-    printf("\r\nConnecting...\r\n");
-    int ret = wifi.connect(MBED_CONF_APP_WIFI_SSID, MBED_CONF_APP_WIFI_PASSWORD, NSAPI_SECURITY_WPA_WPA2);
-    if (ret != 0) {
-        printf("\r\nConnection error\r\n");
-        return -1;
+    int ret = esp.connect(MBED_CONF_APP_WIFI_SSID, MBED_CONF_APP_WIFI_PASSWORD, NSAPI_SECURITY_WPA_WPA2);
+
+    if(ret != 0)
+    {
+        printf("\nConnection error\n");
+    }
+    else
+    {
+        printf("\nConnection success\n");
     }
 
-    printf("Success\r\n\r\n");
-    printf("MAC: %s\r\n", wifi.get_mac_address());
-    wifi.get_ip_address(&a);
-    printf("IP: %s\r\n", a.get_ip_address());
-    wifi.get_netmask(&a);
-    printf("Netmask: %s\r\n", a.get_ip_address());
-    wifi.get_gateway(&a);
-    printf("Gateway: %s\r\n", a.get_ip_address());
-    printf("RSSI: %d\r\n\r\n", wifi.get_rssi());
+    esp.get_ip_address(&deviceIP);
+    printf("IP via DHCP: %s\n", deviceIP.get_ip_address());
+    
+     // Use with IP
+    //SocketAddress MQTTBroker(MBED_CONF_APP_MQTT_BROKER_IP, MBED_CONF_APP_MQTT_BROKER_PORT);
+    
+    // Use with DNS
+    esp.gethostbyname(MBED_CONF_APP_MQTT_BROKER_HOSTNAME, &MQTTBroker);
+    MQTTBroker.set_port(MBED_CONF_APP_MQTT_BROKER_PORT);
+
+    MQTTPacket_connectData data = MQTTPacket_connectData_initializer;       
+    data.MQTTVersion = 3;
+    char *id = MBED_CONF_APP_MQTT_ID;
+    data.clientID.cstring = id;
+
+    char buffer[64];
+    sprintf(buffer, "Hello from Mbed OS %d.%d", MBED_MAJOR_VERSION, MBED_MINOR_VERSION);
 
-    http_demo(&wifi);
+    MQTT::Message msg;
+    msg.qos = MQTT::QOS0;
+    msg.retained = false;
+    msg.dup = false;
+    msg.payload = (void*)buffer;
+    msg.payloadlen = strlen(buffer);
 
-    wifi.disconnect();
+    socket.open(&esp);
+    socket.connect(MQTTBroker);
+    client.connect(data);
 
-    printf("\r\nDone\r\n");
+    client.publish(MBED_CONF_APP_MQTT_TOPIC, msg);
+    //client.yield(100);
+    client.disconnect();
+
 }
+
+