From 4410b3fd38d5182588a062b83a27e276147bf116 Mon Sep 17 00:00:00 2001 From: xdrm-brackets Date: Sun, 2 Dec 2018 21:45:06 +0100 Subject: [PATCH] update main according to lib updates --- node/main/main.ino | 38 ++++++++++++++++++++++++++++++++------ 1 file changed, 32 insertions(+), 6 deletions(-) diff --git a/node/main/main.ino b/node/main/main.ino index de26f10..2478f58 100644 --- a/node/main/main.ino +++ b/node/main/main.ino @@ -1,17 +1,19 @@ #include -#include -#include "protocol.h" #include +#include "packet.h" // Packet +#include "xbee_wrapper.h" // WBeeWrapper +#include "protocol.h" // Peripherals LiquidCrystal_I2C screen(0x27, 16, 2); -XBee xbee = XBee(); +XBeeWrapper xbee = XBeeWrapper(); // ACTUAL DATA uint8_t wave_id = 255; // last wave uint8_t dist = 255; // actual distance struct discover dsc = {0,0,0}; struct message msg = {1, dist, 0, 0, {}}; +Packet pkt; void setup() { Serial.begin(38400); @@ -20,8 +22,32 @@ void setup() { screen.begin(); screen.backlight(); - xbee.setSerial(Serial1); - Serial1.begin(38400); + xbee.begin(38400); } -void loop() {} +void loop() { + + // 1. ignore if no received data + if( xbee.receive(pkt) == XBWRCV_OK ){ + // manage packet + } + // xbee.readPacket(); + // if( xbee.getResponse().isAvailable() ){ + + // if( xbee.getResponse().getApiId() == ZB_RX_RESPONSE ){ + // // got a zb rx packet + + // // now extract response + // xbee.getResponse().getZBRxResponse(res); + + // // get data type (byte 0) + // uint8_t type = res.getData(0) + + + // res.getBytes() + // analogWrite(dataLed, res.getData(0)); + // } + + // } + +}