Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Change to CayenneLPP sample for moving function #1

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Change to CayenneLPP sample for moving function #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6da86fd
Add changes use in USB Mode
stevejcl Jun 6, 2018
91a874d
Change to CayenneLPP sample for moving function
stevejcl Jun 6, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
156 changes: 134 additions & 22 deletions examples/CayenneLPP/CayenneLPP.ino
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,21 @@ CayenneLPP lpp(51);
// Interval between send in seconds, so 300s = 5min
#define CONFIG_INTERVAL ((uint32_t)300)

// Timeout after stop moving in seconds to resend start motion
#define MOVE_TIMEOUT ((uint32_t)30)

// Force use MOVE INTERVAL after x times start detected before end MOVE_TIMEOUT (always moving object).
#define MAX_NBSTART ((uint16_t)10)

// Timeout after MAX_NBSTOP stop detected before end MOVE_TIMEOUT, in seconds to resend start motion
#define MOVE_INTERVAL ((uint32_t)60)

bool move_start = false;
bool move_stop = false;
bool move_timeout = false;
bool use_move_interval = false;
uint16_t nbstart_detect = 0;

void sendData(uint8_t port=PORT_SETUP, uint32_t duration=0);

void setup()
Expand Down Expand Up @@ -61,6 +76,7 @@ void setup()
node->onInterval(interval);
node->onSleep(sleep);
node->onMotionStart(onMotionStart);
node->onMotionStop(onMotionStop);
node->onButtonRelease(onButtonRelease);

// Test sensors
Expand All @@ -69,6 +85,9 @@ void setup()
debugSerial.println("-- TTN: STATUS");
ttn.showStatus();

// Each interval (with watchdog)
//node->configInterval(true, CONFIG_INTERVAL*1000);

// Each interval (with Lora Module and Serial IRQ)
// Take care this one need to be called after any
// first call to ttn.* so object has been instancied
Expand All @@ -91,24 +110,66 @@ void setup()
// node->configUSB(true);
}

void color_blink(ttn_color color, uint8_t count)
{
for (uint8_t i=0 ; i<count ; i++) {
node->setColor(color);
delay(30);
node->setColor(TTN_BLACK);
delay(470);
}
}

void loop()
{
node->loop();
}

void interval(uint8_t wakeReason)
{
debugSerial.print(F("-- SEND: INTERVAL 0x"));
debugSerial.print(wakeReason, HEX);
debugSerial.println(F("ms"));
sendData(PORT_INTERVAL);
if (wakeReason != 0)
{
debugSerial.print(F("-- SEND: INTERVAL 0x"));
debugSerial.print(wakeReason, HEX);
debugSerial.println(F("ms"));

if (move_timeout || use_move_interval)
{
// interval set after stop mouvement so reset to detect it after
color_blink(TTN_WHITE, 5);

if (use_move_interval)
{
sendData(PORT_INTERVAL);
nbstart_detect = 0;
use_move_interval = false;
}

move_start = false;
move_stop = false;
move_timeout = false;
// Back to TTN interval
node->configInterval(&ttn, CONFIG_INTERVAL*1000);
}
else
sendData(PORT_INTERVAL);
}
}

void wake(uint8_t wakeReason)
{
debugSerial.print(F("-- WAKE: 0x"));
debugSerial.println(wakeReason, HEX);
node->setColor(TTN_GREEN);
if (wakeReason != 0)
{
debugSerial.print(F("-- WAKE: 0x"));
debugSerial.println(wakeReason, HEX);

if (wakeReason & TTN_WAKE_WATCHDOG) {
debugSerial.print(F(" Watchdog"));
color_blink(TTN_YELLOW, 2);
}
else
node->setColor(TTN_GREEN);
}
}

void sleep()
Expand All @@ -120,20 +181,75 @@ void onMotionStart()
{
node->setColor(TTN_RED);

// This move has already been detected
// We need to detect stop motion before sending any new motion
// this avoid flooding network when the device is all time moving
if (node->isMoving())
// Send First Move
// Then wait Stop Motion and End of Move Timeout To send next Motion receive
// this avoid flooding network when the device is all time moving
if (move_start || use_move_interval)
{
debugSerial.print("-- STILL MOVING");
if (move_stop && !use_move_interval)
{
nbstart_detect ++;
debugSerial.print(F("-- DETECT: NB START BEFORE TIMEOUT : "));
debugSerial.print(nbstart_detect);

if (nbstart_detect > MAX_NBSTART)
{
debugSerial.print("-- MAX NB STOP, USE MOVE INTERVAL");
// SET MOVE INTERVAL
use_move_interval = true;
node->configInterval(&ttn, MOVE_INTERVAL*1000);
}
else
{
move_stop = false;
move_timeout = false;
// Back to TTN interval with MOVE_INTERVAL
node->configInterval(&ttn, MOVE_INTERVAL*1000);
}
}
else
move_start = true;
}
else
{
else {
nbstart_detect = 0;
move_start = true;
move_stop = false;
debugSerial.print("-- DETECT: MOTION START");
debugSerial.print("-- SEND: START MOTION");
sendData(PORT_MOTION);
}
}

void onMotionStop(unsigned long duration)
{
if (move_start)
{
if (move_stop)
{
debugSerial.print("-- DETECT: STOP MOTION AFTER FIRST STOP ");
move_start = false;
}
else
{
debugSerial.print("-- DETECT: FIRST STOP MOTION");

node->setColor(TTN_CYAN);
move_stop = true;
move_timeout = true;
// SET MOVE TIMEOUT
node->configInterval(true, MOVE_TIMEOUT*1000);
}
}
else
{
move_stop = false;
// Back to TTN interval
move_timeout = false;
// Back to TTN interval
node->configInterval(&ttn, CONFIG_INTERVAL*1000);
}
}

void onButtonRelease(unsigned long duration)
{
uint32_t timepressed = (uint32_t) duration;
Expand All @@ -146,12 +262,7 @@ void onButtonRelease(unsigned long duration)
if (timepressed > 2000) {
// blink yellow led for 60 seconds
// this will let us to upload new sketch if needed
for (uint8_t i=0 ; i<60 ; i++) {
node->setColor(TTN_YELLOW);
delay(30);
node->setColor(TTN_BLACK);
delay(470);
}
color_blink(TTN_YELLOW, 60);
}

// then send data
Expand All @@ -175,10 +286,11 @@ void sendData(uint8_t port, uint32_t duration)

printSensors();


lpp.reset();
lpp.addDigitalInput(1, node->isButtonPressed());
lpp.addDigitalInput(2, node->isUSBConnected());
lpp.addDigitalInput(3, node->isMoving());
lpp.addDigitalInput(3, move_start);
lpp.addAnalogInput(4, bat/1000.0);
lpp.addTemperature(5, node->getTemperatureAsFloat());
lpp.addLuminosity(6, node->getLight());
Expand Down Expand Up @@ -268,4 +380,4 @@ void printSensors()
debugSerial.println();

}

10 changes: 9 additions & 1 deletion src/TheThingsNode.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,11 @@ void TheThingsNode::loop()
}
}
}

// Check if INTERVAL has been achieved : USB mode
if (TTN_INTERVAL >= this->intervalMs) {
wakeStatus |= TTN_WAKE_INTERVAL;
}

// We sure to be called only once when button still pressed
// Button management will start only below this code
Expand Down Expand Up @@ -330,20 +335,23 @@ void TheThingsNode::showStatus()

void TheThingsNode::configInterval(bool enabled, uint32_t ms)
{
TTN_INTERVAL = 0; // reset for USB
this->intervalMs = ms;
this->pttn = NULL;
this->intervalEnabled = enabled;
}

void TheThingsNode::configInterval(TheThingsNetwork *ttn, uint32_t ms)
{
TTN_INTERVAL = 0; // reset for USB
this->intervalMs = ms;
this->pttn = ttn;
this->intervalEnabled = true;
}

void TheThingsNode::configInterval(bool enabled)
{
TTN_INTERVAL = 0; // reset for USB
this->pttn = NULL;
this->intervalEnabled = enabled;
}
Expand Down Expand Up @@ -1055,7 +1063,7 @@ void TheThingsNode::WDT_stop()
WDTCSR = 0 << WDP0 | 1 << WDP1 | 0 << WDP2 | 0 << WDP3;
sei();

this->wdtStarted = true;
this->wdtStarted = false; // modif
}

void TheThingsNode::deepSleep(void)
Expand Down