Skip to content

Commit

Permalink
HX711 redesign (#13986)
Browse files Browse the repository at this point in the history
- Add HX711 command ``Sensor34 10 0|1|<weight in gram>`` to set HX711 fixed tare (0 = use auto tare, 1 = use calibrated tare, Any other value is user selected tare)
- HX711 removed command ``Sensor34 7`` as now active tare is persistent resulting in calculated current weight
- Changed HX711 commands ``Sensor34 11 <valueA>`` and ``Sensor34 12 <valueB>`` to use HX711 absolute weight conversion (#15292)
  • Loading branch information
arendst committed Apr 9, 2022
1 parent 1f3d2ee commit 1f3bb67
Show file tree
Hide file tree
Showing 6 changed files with 118 additions and 83 deletions.
14 changes: 11 additions & 3 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,20 @@ All notable changes to this project will be documented in this file.

## [Unreleased] - Development

## [11.0.0.6]
## [11.0.0.7]
### Added
- Commands ``Sensor34 10 <valueA>`` and ``Sensor34 11 <valueB>`` to use HX711 absolute weight conversion (#15292)
- HX711 command ``Sensor34 10 0|1|<weight in gram>`` to set HX711 fixed tare (0 = use auto tare, 1 = use calibrated tare, Any other value is user selected tare)

### Changed
- NeoPool: boost command with redox control state, relay and aux detail display
- HX711 removed command ``Sensor34 7`` as now active tare is persistent resulting in calculated current weight
- HX711 commands ``Sensor34 11 <valueA>`` and ``Sensor34 12 <valueB>`` to use HX711 absolute weight conversion (#15292)

## [11.0.0.6] 20220409
### Added
- HX711 commands ``Sensor34 10 <valueA>`` and ``Sensor34 11 <valueB>`` to use HX711 absolute weight conversion (#15292)

### Changed
- NeoPool boost command with redox control state, relay and aux detail display

### Fixed
- NeoPool filtration state and speed display
Expand Down
6 changes: 4 additions & 2 deletions RELEASENOTES.md
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ The latter links can be used for OTA upgrades too like ``OtaUrl http://ota.tasmo

[Complete list](BUILDS.md) of available feature and sensors.

## Changelog v11.0.0.6
## Changelog v11.0.0.7
### Added
- Command ``SetOption135 1`` to disable LVGL splash screen
- Command ``SetOption136 1`` to disable single sensor reports from Tuya devices while keeping teleperiod reports [#15216](https://github.com/arendst/Tasmota/issues/15216)
Expand All @@ -112,7 +112,8 @@ The latter links can be used for OTA upgrades too like ``OtaUrl http://ota.tasmo
- Command ``RfTimeout 100..60000`` to disable duplicate RfReceive. Default 1000 [#15061](https://github.com/arendst/Tasmota/issues/15061)
- Command ``IfxSensor 1`` to send non-teleperiod data to influxdb
- Commands ``Sensor12 D0 .. D5, S0 .. S5`` allowing differential or single-ended modes [#15001](https://github.com/arendst/Tasmota/issues/15001)
- Commands ``Sensor34 10 <valueA>`` and ``Sensor34 11 <valueB>`` to use HX711 absolute weight conversion [#15292](https://github.com/arendst/Tasmota/issues/15292)
- HX711 command ``Sensor34 10 0|1|<weight in gram>`` to set HX711 fixed tare (0 = use auto tare, 1 = use calibrated tare, Any other value is user selected tare)
- HX711 commands ``Sensor34 11 <valueA>`` and ``Sensor34 12 <valueB>`` to use HX711 absolute weight conversion [#15292](https://github.com/arendst/Tasmota/issues/15292)
- NeoPool commands ``NPpHMin``, ``NPpHMax``, ``NPpH``, ``NPRedox``, ``NPHydrolysis``, ``NPIonization``, ``NPChlorine`` and ``NPControl`` [#15015](https://github.com/arendst/Tasmota/issues/15015)
- NeoPool system voltages display
- TasmotaSerial implement ``end()``
Expand All @@ -139,6 +140,7 @@ The latter links can be used for OTA upgrades too like ``OtaUrl http://ota.tasmo
- Extent number of pulsetimers from 8 to 32 [#8266](https://github.com/arendst/Tasmota/issues/8266)
- Consolidate three RTC chip drivers (DS3231, BM8563, PCF85363) into one driver updating RTC as soon as possible after restart
- Removed command ``Sensor33`` and replaced by ``RtcNtpserver``
- HX711 removed command ``Sensor34 7`` as now active tare is persistent resulting in calculated current weight
- Remove support for Internet Explorer by allowing ECMAScript6 syntax using less JavaScript code bytes [#15280](https://github.com/arendst/Tasmota/issues/15280)
- DS3231 I2C address define ``USE_RTC_ADDR`` into ``DS3231_ADDRESS``
- Display of energy values in GUI use columns when define ``USE_ENERGY_COLUMN_GUI`` is enabled (default)
Expand Down
7 changes: 3 additions & 4 deletions tasmota/settings.h
Original file line number Diff line number Diff line change
Expand Up @@ -486,9 +486,7 @@ typedef struct {
int32_t energy_kWhtoday_ph[3]; // 314
int32_t energy_kWhyesterday_ph[3]; // 320
int32_t energy_kWhtotal_ph[3]; // 32C

uint8_t free_338[4]; // 338

int32_t weight_user_tare; // 338
uint8_t web_time_start; // 33C
uint8_t web_time_end; // 33D
uint8_t sserial_config; // 33E
Expand Down Expand Up @@ -647,8 +645,9 @@ typedef struct {
uint32_t ipv4_rgx_subnetmask; // 55C
uint16_t pwm_value_ext[16-5]; // 560 Extension to pwm_value to store up to 16 PWM for ESP32. This array stores values 5..15

uint8_t free_576[6]; // 576
uint8_t free_576[2]; // 576

int32_t weight_offset; // 578
uint16_t pulse_timer[MAX_PULSETIMERS]; // 57C
SysMBitfield1 flag2; // 5BC
uint32_t pulse_counter[MAX_COUNTERS]; // 5C0
Expand Down
7 changes: 7 additions & 0 deletions tasmota/settings.ino
Original file line number Diff line number Diff line change
Expand Up @@ -1520,6 +1520,13 @@ void SettingsDelta(void) {
Settings->weight_absconv_a = 0;
Settings->weight_absconv_b = 0;
}
if (Settings->version < 0x0B000007) { // 11.0.0.7
Settings->weight_user_tare = 0;
Settings->weight_offset = 0;
#ifdef USE_HX711
Settings->weight_offset = Settings->energy_frequency_calibration * Settings->weight_calibration;
#endif
}

Settings->version = VERSION;
SettingsSave(1);
Expand Down
2 changes: 1 addition & 1 deletion tasmota/tasmota_version.h
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,6 @@
#ifndef _TASMOTA_VERSION_H_
#define _TASMOTA_VERSION_H_

const uint32_t VERSION = 0x0B000006; // 11.0.0.6
const uint32_t VERSION = 0x0B000007; // 11.0.0.7

#endif // _TASMOTA_VERSION_H_
Loading

0 comments on commit 1f3bb67

Please sign in to comment.