mirrors
/
Tasmota
mirror of https://github.com/arendst/Tasmota.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Consolidate HX711 ShiftIn function 

Consolidate HX711 ShiftIn function (#13983)
This commit is contained in:
Theo Arends 2022-04-03 17:51:03 +02:00
parent 4cb6dc2f58
commit a80a100efb
1 changed files with 34 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
tasmota/xsns_34_hx711.ino
View File

@ -87,11 +87,33 @@ struct HX {
/*********************************************************************************************/
uint8_t HxShiftIn(void) {
uint8_t value = 0;
for (uint32_t i = 0; i < 8; ++i) {
digitalWrite(Hx.pin_sck, HIGH);
#ifdef ESP32
delayMicroseconds(1); // could be required for faster mcu's
#endif
value |= digitalRead(Hx.pin_dout) << (7 - i);
#ifdef ESP32
delayMicroseconds(1); // could be required for faster mcu's
#endif
digitalWrite(Hx.pin_sck, LOW);
#ifdef ESP32
delayMicroseconds(1); // could be required for faster mcu's
#endif
}
return value;
}
bool HxIsReady(uint16_t timeout)
{
// A reading can take up to 100 mS or 600mS after power on
uint32_t start = millis();
while ((digitalRead(Hx.pin_dout) == HIGH) && (millis() - start < timeout)) { yield(); }
while ((digitalRead(Hx.pin_dout) == HIGH) && (millis() - start < timeout)) {
yield();
}
return (digitalRead(Hx.pin_dout) == LOW);
}
@ -103,13 +125,19 @@ long HxRead(void)
uint8_t filler = 0x00;
// pulse the clock pin 24 times to read the data
data[2] = shiftIn(Hx.pin_dout, Hx.pin_sck, MSBFIRST);
data[1] = shiftIn(Hx.pin_dout, Hx.pin_sck, MSBFIRST);
data[0] = shiftIn(Hx.pin_dout, Hx.pin_sck, MSBFIRST);
// data[2] = shiftIn(Hx.pin_dout, Hx.pin_sck, MSBFIRST);
// data[1] = shiftIn(Hx.pin_dout, Hx.pin_sck, MSBFIRST);
// data[0] = shiftIn(Hx.pin_dout, Hx.pin_sck, MSBFIRST);
data[2] = HxShiftIn();
data[1] = HxShiftIn();
data[0] = HxShiftIn();
// set the channel and the gain factor for the next reading using the clock pin
for (unsigned int i = 0; i < HX_GAIN_128; i++) {
digitalWrite(Hx.pin_sck, HIGH);
#ifdef ESP32
delayMicroseconds(1); // could be required for faster mcu's
#endif
digitalWrite(Hx.pin_sck, LOW);
}
@ -308,6 +336,8 @@ void HxInit(void)
void HxEvery100mSecond(void)
{
long raw = HxRead();
if (-1 == raw) { return; }
Hx.sum_raw += raw;
Hx.sum_weight += raw;