bazot-laurent
Cayenne-LPP avec NFC
Diff: src/CayenneLPP.cpp
- Revision:
- 7:8509fb453a2e
- Parent:
- 6:5a9d65b33e85
- Child:
- 8:2b94df050b00
--- a/src/CayenneLPP.cpp Thu Mar 09 16:32:30 2017 +0000
+++ b/src/CayenneLPP.cpp Fri Mar 12 08:12:27 2021 +0000
@@ -1,202 +1,232 @@
#include "CayenneLPP.h"
-CayenneLPP::CayenneLPP(uint8_t size) : maxsize(size) {
+CayenneLPP::CayenneLPP(uint8_t size) : maxsize(size)
+{
buffer = (uint8_t*) malloc(size);
cursor = 0;
}
-CayenneLPP::~CayenneLPP(void) {
+CayenneLPP::~CayenneLPP(void)
+{
free(buffer);
}
-void CayenneLPP::reset(void) {
+void CayenneLPP::reset(void)
+{
cursor = 0;
}
-uint8_t CayenneLPP::getSize(void) {
+uint8_t CayenneLPP::getSize(void)
+{
return cursor;
}
-uint8_t* CayenneLPP::getBuffer(void) {
+uint8_t* CayenneLPP::getBuffer(void)
+{
// uint8_t[cursor] result;
// memcpy(result, buffer, cursor);
// return result;
return buffer;
}
-uint8_t CayenneLPP::copy(uint8_t* dst) {
+uint8_t CayenneLPP::copy(uint8_t* dst)
+{
memcpy(dst, buffer, cursor);
return cursor;
}
-uint8_t CayenneLPP::addDigitalInput(uint8_t channel, uint8_t value) {
+uint8_t CayenneLPP::addDigitalInput(uint8_t channel, uint8_t value)
+{
if ((cursor + LPP_DIGITAL_INPUT_SIZE) > maxsize) {
return 0;
}
- buffer[cursor++] = channel;
- buffer[cursor++] = LPP_DIGITAL_INPUT;
- buffer[cursor++] = value;
+ buffer[cursor++] = channel;
+ buffer[cursor++] = LPP_DIGITAL_INPUT;
+ buffer[cursor++] = value;
return cursor;
}
-uint8_t CayenneLPP::addDigitalOutput(uint8_t channel, uint8_t value) {
+uint8_t CayenneLPP::addDigitalOutput(uint8_t channel, uint8_t value)
+{
if ((cursor + LPP_DIGITAL_OUTPUT_SIZE) > maxsize) {
return 0;
}
- buffer[cursor++] = channel;
- buffer[cursor++] = LPP_DIGITAL_OUTPUT;
- buffer[cursor++] = value;
+ buffer[cursor++] = channel;
+ buffer[cursor++] = LPP_DIGITAL_OUTPUT;
+ buffer[cursor++] = value;
return cursor;
}
-uint8_t CayenneLPP::addAnalogInput(uint8_t channel, float value) {
+uint8_t CayenneLPP::addAnalogInput(uint8_t channel, float value)
+{
if ((cursor + LPP_ANALOG_INPUT_SIZE) > maxsize) {
return 0;
}
-
+
int16_t val = value * 100;
- buffer[cursor++] = channel;
- buffer[cursor++] = LPP_ANALOG_INPUT;
- buffer[cursor++] = val >> 8;
- buffer[cursor++] = val;
+ buffer[cursor++] = channel;
+ buffer[cursor++] = LPP_ANALOG_INPUT;
+ buffer[cursor++] = val >> 8;
+ buffer[cursor++] = val;
return cursor;
}
-uint8_t CayenneLPP::addAnalogOutput(uint8_t channel, float value) {
+uint8_t CayenneLPP::addAnalogOutput(uint8_t channel, float value)
+{
if ((cursor + LPP_ANALOG_OUTPUT_SIZE) > maxsize) {
return 0;
}
int16_t val = value * 100;
- buffer[cursor++] = channel;
+ buffer[cursor++] = channel;
buffer[cursor++] = LPP_ANALOG_OUTPUT;
- buffer[cursor++] = val >> 8;
- buffer[cursor++] = val;
-
+ buffer[cursor++] = val >> 8;
+ buffer[cursor++] = val;
+
return cursor;
}
-uint8_t CayenneLPP::addLuminosity(uint8_t channel, uint16_t lux) {
+uint8_t CayenneLPP::addLuminosity(uint8_t channel, uint16_t lux)
+{
if ((cursor + LPP_LUMINOSITY_SIZE) > maxsize) {
return 0;
}
- buffer[cursor++] = channel;
- buffer[cursor++] = LPP_LUMINOSITY;
- buffer[cursor++] = lux >> 8;
- buffer[cursor++] = lux;
+ buffer[cursor++] = channel;
+ buffer[cursor++] = LPP_LUMINOSITY;
+ buffer[cursor++] = lux >> 8;
+ buffer[cursor++] = lux;
+
+ return cursor;
+}
+
+uint8_t CayenneLPP::addPresence(uint8_t channel, uint8_t value)
+{
+ if ((cursor + LPP_PRESENCE_SIZE) > maxsize) {
+ return 0;
+ }
+ buffer[cursor++] = channel;
+ buffer[cursor++] = LPP_PRESENCE;
+ buffer[cursor++] = value;
return cursor;
}
-uint8_t CayenneLPP::addPresence(uint8_t channel, uint8_t value) {
- if ((cursor + LPP_PRESENCE_SIZE) > maxsize) {
- return 0;
+
+uint8_t CayenneLPP::addNFC(uint8_t channel, char * NFC)
+{
+ int index;
+ buffer[cursor++] = channel;
+ for (index=0; index <4; index++) {
+ buffer[cursor++]=NFC[index] ;
}
- buffer[cursor++] = channel;
- buffer[cursor++] = LPP_PRESENCE;
- buffer[cursor++] = value;
-
return cursor;
}
-uint8_t CayenneLPP::addTemperature(uint8_t channel, float celsius) {
+
+uint8_t CayenneLPP::addTemperature(uint8_t channel, float celsius)
+{
if ((cursor + LPP_TEMPERATURE_SIZE) > maxsize) {
return 0;
}
int16_t val = celsius * 10;
- buffer[cursor++] = channel;
- buffer[cursor++] = LPP_TEMPERATURE;
- buffer[cursor++] = val >> 8;
- buffer[cursor++] = val;
+ buffer[cursor++] = channel;
+ buffer[cursor++] = LPP_TEMPERATURE;
+ buffer[cursor++] = val >> 8;
+ buffer[cursor++] = val;
return cursor;
}
-uint8_t CayenneLPP::addRelativeHumidity(uint8_t channel, float rh) {
+uint8_t CayenneLPP::addRelativeHumidity(uint8_t channel, float rh)
+{
if ((cursor + LPP_RELATIVE_HUMIDITY_SIZE) > maxsize) {
return 0;
}
- buffer[cursor++] = channel;
- buffer[cursor++] = LPP_RELATIVE_HUMIDITY;
- buffer[cursor++] = rh * 2;
+ buffer[cursor++] = channel;
+ buffer[cursor++] = LPP_RELATIVE_HUMIDITY;
+ buffer[cursor++] = rh * 2;
return cursor;
}
-uint8_t CayenneLPP::addAccelerometer(uint8_t channel, float x, float y, float z) {
+uint8_t CayenneLPP::addAccelerometer(uint8_t channel, float x, float y, float z)
+{
if ((cursor + LPP_ACCELEROMETER_SIZE) > maxsize) {
return 0;
}
int16_t vx = x * 1000;
int16_t vy = y * 1000;
int16_t vz = z * 1000;
-
- buffer[cursor++] = channel;
- buffer[cursor++] = LPP_ACCELEROMETER;
- buffer[cursor++] = vx >> 8;
- buffer[cursor++] = vx;
- buffer[cursor++] = vy >> 8;
- buffer[cursor++] = vy;
- buffer[cursor++] = vz >> 8;
- buffer[cursor++] = vz;
+
+ buffer[cursor++] = channel;
+ buffer[cursor++] = LPP_ACCELEROMETER;
+ buffer[cursor++] = vx >> 8;
+ buffer[cursor++] = vx;
+ buffer[cursor++] = vy >> 8;
+ buffer[cursor++] = vy;
+ buffer[cursor++] = vz >> 8;
+ buffer[cursor++] = vz;
return cursor;
}
-uint8_t CayenneLPP::addBarometricPressure(uint8_t channel, float hpa) {
+uint8_t CayenneLPP::addBarometricPressure(uint8_t channel, float hpa)
+{
if ((cursor + LPP_BAROMETRIC_PRESSURE_SIZE) > maxsize) {
return 0;
}
int16_t val = hpa * 10;
-
- buffer[cursor++] = channel;
- buffer[cursor++] = LPP_BAROMETRIC_PRESSURE;
- buffer[cursor++] = val >> 8;
- buffer[cursor++] = val;
+
+ buffer[cursor++] = channel;
+ buffer[cursor++] = LPP_BAROMETRIC_PRESSURE;
+ buffer[cursor++] = val >> 8;
+ buffer[cursor++] = val;
return cursor;
}
-uint8_t CayenneLPP::addGyrometer(uint8_t channel, float x, float y, float z) {
+uint8_t CayenneLPP::addGyrometer(uint8_t channel, float x, float y, float z)
+{
if ((cursor + LPP_GYROMETER_SIZE) > maxsize) {
return 0;
}
int16_t vx = x * 100;
int16_t vy = y * 100;
int16_t vz = z * 100;
-
- buffer[cursor++] = channel;
- buffer[cursor++] = LPP_GYROMETER;
- buffer[cursor++] = vx >> 8;
- buffer[cursor++] = vx;
- buffer[cursor++] = vy >> 8;
- buffer[cursor++] = vy;
- buffer[cursor++] = vz >> 8;
- buffer[cursor++] = vz;
+
+ buffer[cursor++] = channel;
+ buffer[cursor++] = LPP_GYROMETER;
+ buffer[cursor++] = vx >> 8;
+ buffer[cursor++] = vx;
+ buffer[cursor++] = vy >> 8;
+ buffer[cursor++] = vy;
+ buffer[cursor++] = vz >> 8;
+ buffer[cursor++] = vz;
return cursor;
}
-uint8_t CayenneLPP::addGPS(uint8_t channel, float latitude, float longitude, float meters) {
+uint8_t CayenneLPP::addGPS(uint8_t channel, float latitude, float longitude, float meters)
+{
if ((cursor + LPP_GPS_SIZE) > maxsize) {
return 0;
}
int32_t lat = latitude * 10000;
int32_t lon = longitude * 10000;
int32_t alt = meters * 100;
-
- buffer[cursor++] = channel;
- buffer[cursor++] = LPP_GPS;
+
+ buffer[cursor++] = channel;
+ buffer[cursor++] = LPP_GPS;
- buffer[cursor++] = lat >> 16;
- buffer[cursor++] = lat >> 8;
- buffer[cursor++] = lat;
- buffer[cursor++] = lon >> 16;
- buffer[cursor++] = lon >> 8;
- buffer[cursor++] = lon;
- buffer[cursor++] = alt >> 16;
+ buffer[cursor++] = lat >> 16;
+ buffer[cursor++] = lat >> 8;
+ buffer[cursor++] = lat;
+ buffer[cursor++] = lon >> 16;
+ buffer[cursor++] = lon >> 8;
+ buffer[cursor++] = lon;
+ buffer[cursor++] = alt >> 16;
buffer[cursor++] = alt >> 8;
buffer[cursor++] = alt;