Skip to content

Commit

Permalink
1.2.1
Browse files Browse the repository at this point in the history
  • Loading branch information
olkal committed May 24, 2020
1 parent ae1a2d2 commit d2b0259
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,8 @@ void loop() {
newDataReady = 0;
Serial.print("Load_cell output val: ");
Serial.print(i);
Serial.print(" ");
Serial.println(millis() - t);
//Serial.print(" ");
//Serial.println(millis() - t);
t = millis();
}
}
Expand Down
2 changes: 1 addition & 1 deletion library.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name=HX711_ADC
version=1.2.0
version=1.2.1
author=Olav Kallhovd
maintainer=Olav Kallhovd
sentence=Library for the HX711 24-bit ADC for weight scales.
Expand Down
4 changes: 2 additions & 2 deletions src/HX711_ADC.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,6 @@ int HX711_ADC::startMultiple(unsigned int t)
{
tareTimeoutFlag = 0;
lastDoutLowTime = millis();
static unsigned long timeout = millis() + tareTimeOut;
if(startStatus == 0) {
if(isFirst) {
startMultipleTimeStamp = millis();
Expand All @@ -103,6 +102,7 @@ int HX711_ADC::startMultiple(unsigned int t)
return 0;
}
else { //do tare after stabilization time is up
static unsigned long timeout = millis() + tareTimeOut;
doTare = 1;
update();
if(convRslt == 2)
Expand Down Expand Up @@ -132,7 +132,6 @@ int HX711_ADC::startMultiple(unsigned int t, bool dotare)
{
tareTimeoutFlag = 0;
lastDoutLowTime = millis();
static unsigned long timeout = millis() + tareTimeOut;
if(startStatus == 0) {
if(isFirst) {
startMultipleTimeStamp = millis();
Expand All @@ -154,6 +153,7 @@ int HX711_ADC::startMultiple(unsigned int t, bool dotare)
else { //do tare after stabilization time is up
if (dotare)
{
static unsigned long timeout = millis() + tareTimeOut;
doTare = 1;
update();
if(convRslt == 2)
Expand Down

0 comments on commit d2b0259

Please sign in to comment.