Revision 8:71161d247b82, committed 2016-03-17

Comitter:

manl2003

Date:

Thu Mar 17 12:44:26 2016 +0000

Parent:

7:8c6addd3f909

Commit message:

asd

Changed in this revision

diff -r 8c6addd3f909 -r 71161d247b82 XBeeLib.lib
--- a/XBeeLib.lib	Mon Jun 01 19:01:22 2015 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-http://developer.mbed.org/teams/Digi-International-Inc/code/XBeeLib/#629712865107

diff -r 8c6addd3f909 -r 71161d247b82 XBee_Cooker.lib
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/XBee_Cooker.lib	Thu Mar 17 12:44:26 2016 +0000
@@ -0,0 +1,1 @@
+https://developer.mbed.org/users/manl2003/code/XBee_Cooker/#0e9dcb5dffbc

diff -r 8c6addd3f909 -r 71161d247b82 config.h
--- a/config.h	Mon Jun 01 19:01:22 2015 +0200
+++ b/config.h	Thu Mar 17 12:44:26 2016 +0000
@@ -21,15 +21,15 @@
 
 #define SYNC_OPS_TIMEOUT_MS         2000
 
-//#define RADIO_TX                NC /* TODO: specify your setup's Serial TX pin connected to the XBee module DIN pin */
-//#define RADIO_RX                NC /* TODO: specify your setup's Serial RX pin connected to the XBee module DOUT pin */
-//#define RADIO_RTS               NC /* TODO: specify your setup's Serial RTS# pin connected to the XBee module RTS# pin */
-//#define RADIO_CTS               NC /* TODO: specify your setup's Serial CTS# pin connected to the XBee module CTS# pin */
-//#define RADIO_RESET             NC /* TODO: specify your setup's GPIO (output) connected to the XBee module's reset pin */
-//#define RADIO_SLEEP_REQ         NC /* TODO: specify your setup's GPIO (output) connected to the XBee module's SLEEP_RQ pin */
-//#define RADIO_ON_SLEEP          NC /* TODO: specify your setup's GPIO (input) connected to the XBee module's ON_SLEEP pin */
-//#define DEBUG_TX                NC /* TODO: specify your setup's Serial TX for debugging */
-//#define DEBUG_RX                NC /* TODO: specify your setup's Serial RX for debugging (optional) */
+#define RADIO_TX                NC /* TODO: specify your setup's Serial TX pin connected to the XBee module DIN pin */
+#define RADIO_RX                NC /* TODO: specify your setup's Serial RX pin connected to the XBee module DOUT pin */
+#define RADIO_RTS               NC /* TODO: specify your setup's Serial RTS# pin connected to the XBee module RTS# pin */
+#define RADIO_CTS               NC /* TODO: specify your setup's Serial CTS# pin connected to the XBee module CTS# pin */
+#define RADIO_RESET             NC /* TODO: specify your setup's GPIO (output) connected to the XBee module's reset pin */
+#define RADIO_SLEEP_REQ         NC /* TODO: specify your setup's GPIO (output) connected to the XBee module's SLEEP_RQ pin */
+#define RADIO_ON_SLEEP          NC /* TODO: specify your setup's GPIO (input) connected to the XBee module's ON_SLEEP pin */
+#define DEBUG_TX                NC /* TODO: specify your setup's Serial TX for debugging */
+#define DEBUG_RX                NC /* TODO: specify your setup's Serial RX for debugging (optional) */
 
 #if !defined(RADIO_TX)
     #error "Please define RADIO_TX pin"

diff -r 8c6addd3f909 -r 71161d247b82 main.cpp
--- a/main.cpp	Mon Jun 01 19:01:22 2015 +0200
+++ b/main.cpp	Thu Mar 17 12:44:26 2016 +0000
@@ -1,71 +1,7 @@
-/**
- * Copyright (c) 2015 Digi International Inc.,
- * All rights not expressly granted are reserved.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this file,
- * You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * Digi International Inc. 11001 Bren Road East, Minnetonka, MN 55343
- * =======================================================================
- */
-
 #include "mbed.h"
-#include "XBeeLib.h"
-#if defined(ENABLE_LOGGING)
-#include "DigiLoggerMbedSerial.h"
-using namespace DigiLog;
-#endif
-
-using namespace XBeeLib;
-
-Serial *log_serial;
-
-/** Callback function, invoked at packet reception */
-static void receive_cb(const RemoteXBeeZB& remote, bool broadcast, const uint8_t *const data, uint16_t len)
-{
-    const uint64_t remote_addr64 = remote.get_addr64();
-
-    log_serial->printf("\r\nGot a %s RX packet [%08x:%08x|%04x], len %d\r\nData: ", broadcast ? "BROADCAST" : "UNICAST", UINT64_HI32(remote_addr64), UINT64_LO32(remote_addr64), remote.get_addr16(), len);
-
-    for (int i = 0; i < len; i++)
-        log_serial->printf("%02x ", data[i]);
-
-    log_serial->printf("\r\n");
-}
+#include "CookerComms.h"
 
 int main()
 {
-    log_serial = new Serial(DEBUG_TX, DEBUG_RX);
-    log_serial->baud(9600);
-    log_serial->printf("Sample application to demo how to receive unicast and broadcast data with the XBeeZB\r\n\r\n");
-    log_serial->printf(XB_LIB_BANNER);
-
-#if defined(ENABLE_LOGGING)
-    new DigiLoggerMbedSerial(log_serial, LogLevelInfo);
-#endif
-
-    XBeeZB xbee = XBeeZB(RADIO_TX, RADIO_RX, RADIO_RESET, NC, NC, 9600);
-
-    /* Register callbacks */
-    xbee.register_receive_cb(&receive_cb);
-
-    RadioStatus const radioStatus = xbee.init();
-    MBED_ASSERT(radioStatus == Success);
-
-    /* Wait until the device has joined the network */
-    log_serial->printf("Waiting for device to join the network: ");
-    while (!xbee.is_joined()) {
-        wait_ms(1000);
-        log_serial->printf(".");
-    }
-    log_serial->printf("OK\r\n");
-
-    while (true) {
-        xbee.process_rx_frames();
-        wait_ms(100);
-        log_serial->printf(".");
-    }
-
-    delete(log_serial);
-}
+    return 0;
+}
\ No newline at end of file