Th3maz1ng/projet3_temperature
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Ajout de l'attribut privée tension afin de corriger une erreur de calcule

Browse Source
This commit is contained in:
anschrammh 2020-01-15 19:01:08 +01:00
parent 0927059d4e
commit e186bf16d1
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/MeasureUnit/MeasureUnit.h
View File

@ -11,6 +11,7 @@ class MeasureUnit
enum ERROR {OK = 0, MALLOC_ERR = 1}; enum ERROR {OK = 0, MALLOC_ERR = 1};
MeasureUnit(uint8_t *analogInput, uint16_t thermistorCount, uint64_t precResistor, ThermistorSetting thermistorSetting, Adc &adc); MeasureUnit(uint8_t *analogInput, uint16_t thermistorCount, uint64_t precResistor, ThermistorSetting thermistorSetting, Adc &adc);
~MeasureUnit(); ~MeasureUnit();
void init(){_adc.begin();}
void setGlobalTempOffset(double offset); void setGlobalTempOffset(double offset);
void levelTemperaturesOff(); void levelTemperaturesOff();
double getGlobalTempOffset(); double getGlobalTempOffset();
@ -46,7 +47,7 @@ class MeasureUnit
//Async part //Async part
STATE _state; STATE _state;
uint8_t _channel; uint8_t _channel;
double _courant; double _courant, _tension;
boolean _triggerLevelOff; //Attribut permettant de savoir si un étalonnage a été demandé boolean _triggerLevelOff; //Attribut permettant de savoir si un étalonnage a été demandé
}; };

3
lib/PayloadFormatter/PayloadFormatter.cpp
View File

@ -5,6 +5,7 @@ PayloadFormatter::PayloadFormatter(uint8_t numOfRow, uint8_t numOfColumn) : _tot
_length = numOfRow * numOfColumn * 2 + 7 + 1; _length = numOfRow * numOfColumn * 2 + 7 + 1;
_payload = (uint8_t *) calloc(_length, sizeof(uint8_t)); _payload = (uint8_t *) calloc(_length, sizeof(uint8_t));
} }
PayloadFormatter::~PayloadFormatter() PayloadFormatter::~PayloadFormatter()
{ {
free(_payload); free(_payload);
@ -24,7 +25,7 @@ boolean PayloadFormatter::endSession()
return ret; return ret;
} }
int16_t PayloadFormatter::buildPayload(uint8_t **buffer, DateTime *dateTime, double *tempArray) int16_t PayloadFormatter::buildPayload(uint8_t **buffer, DateTime *dateTime, double *tempArray, uint8_t numOfRow, uint8_t numOfColumn)
{ {
*buffer = _payload; *buffer = _payload;
if(_currentPayload == _totalPayloads || !_totalPayloads) if(_currentPayload == _totalPayloads || !_totalPayloads)

2
lib/PayloadFormatter/PayloadFormatter.h
View File

@ -9,7 +9,7 @@ class PayloadFormatter
PayloadFormatter(uint8_t numOfRow, uint8_t numOfColumn); PayloadFormatter(uint8_t numOfRow, uint8_t numOfColumn);
~PayloadFormatter(); ~PayloadFormatter();
int16_t buildPayload(uint8_t **buffer, DateTime *dateTime, double *tempArray); int16_t buildPayload(uint8_t **buffer, DateTime *dateTime, double *tempArray, uint8_t numOfRow = -1, uint8_t numOfColumn = -1);
void startSession(uint8_t totalPackets); void startSession(uint8_t totalPackets);
boolean endSession(); boolean endSession();