Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[P026][Sysvars] Add Internal temperature sensor value for ESP32 #4820

Merged
merged 13 commits into from
Sep 26, 2023
Merged

[P026][Sysvars] Add Internal temperature sensor value for ESP32 #4820

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
4aa9401
[P026][Sysvars] Add Internal temperature sensor value for ESP32
tonhuisman Sep 23, 2023
4e0ac29
[P026][Sysvars] Feedback and fixes
tonhuisman Sep 23, 2023
8ad3b5b
[P026][Sysvars] Fix typo in comment
tonhuisman Sep 24, 2023
31653e8
[P026] Add Get Config feature for all values
tonhuisman Sep 24, 2023
384ab4d
[P026] Add documentation
tonhuisman Sep 24, 2023
4a3c45a
Merge branch 'mega' of https://github.com/letscontrolit/ESPEasy into …
tonhuisman Sep 25, 2023
210d192
[P026][Sysvars] Avoid temperature reading errors on ESP32 classic (2 …
tonhuisman Sep 25, 2023
36ca64e
[P026][Sysvars] Read temperature every second on ESP32 classic for be…
tonhuisman Sep 25, 2023
e672b51
[Build] Try to use real branch name on GH Actions builds
tonhuisman Sep 25, 2023
43527d5
[Build] Ignore Docs commits to trigger an Actions run
tonhuisman Sep 25, 2023
e96bfb2
[P026][Sysvars] Explicitly disable FEATURE_INTERNAL_TEMPERATURE for E…
tonhuisman Sep 25, 2023
1eb7a0d
[P026][Sysvars] Add delay() call
tonhuisman Sep 25, 2023
01c673e
[Build][P026] Update documentation (without Actions run...)
tonhuisman Sep 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
32 changes: 16 additions & 16 deletions src/_P026_Sysinfo.ino
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,23 +213,23 @@ boolean Plugin_026(uint8_t function, struct EventStruct *event, String& string)
// return decode(bytes,
// [header, uint24, uint24, int8, vcc, pct_8, uint8, uint8, uint8, uint8, uint24, uint16],
// ['header', 'uptime', 'freeheap', 'rssi', 'vcc', 'load', 'ip1', 'ip2', 'ip3', 'ip4', 'web', 'freestack']);
// on ESP32 you can add 'internaltemperature' of type int16 (1e2) to the list
// on ESP32 you can add 'internaltemperature' of type int16 (1e2) to the list (disabled for now, so not available)
uint8_t index = 0;
string += LoRa_addInt(P026_get_value(index++), PackedData_uint24); // uptime
string += LoRa_addInt(P026_get_value(index++), PackedData_uint24); // freeheap
string += LoRa_addFloat(P026_get_value(index++), PackedData_int8); // rssi
string += LoRa_addFloat(P026_get_value(index++), PackedData_vcc); // vcc
string += LoRa_addFloat(P026_get_value(index++), PackedData_pct_8); // load
string += LoRa_addInt(P026_get_value(index++), PackedData_uint8); // ip1
string += LoRa_addInt(P026_get_value(index++), PackedData_uint8); // ip2
string += LoRa_addInt(P026_get_value(index++), PackedData_uint8); // ip3
string += LoRa_addInt(P026_get_value(index++), PackedData_uint8); // ip4
string += LoRa_addInt(P026_get_value(index++), PackedData_uint24); // web
string += LoRa_addInt(P026_get_value(index++), PackedData_uint16); // freestack
# if FEATURE_INTERNAL_TEMPERATURE
string += LoRa_addInt(P026_get_value(index++) * 100.0f, PackedData_int16_1e2); // internal temperature in 0.01 degrees
# endif // if FEATURE_INTERNAL_TEMPERATURE
event->Par1 = index; // valuecount
string += LoRa_addInt(P026_get_value(index++), PackedData_uint24); // uptime
string += LoRa_addInt(P026_get_value(index++), PackedData_uint24); // freeheap
string += LoRa_addFloat(P026_get_value(index++), PackedData_int8); // rssi
string += LoRa_addFloat(P026_get_value(index++), PackedData_vcc); // vcc
string += LoRa_addFloat(P026_get_value(index++), PackedData_pct_8); // load
string += LoRa_addInt(P026_get_value(index++), PackedData_uint8); // ip1
string += LoRa_addInt(P026_get_value(index++), PackedData_uint8); // ip2
string += LoRa_addInt(P026_get_value(index++), PackedData_uint8); // ip3
string += LoRa_addInt(P026_get_value(index++), PackedData_uint8); // ip4
string += LoRa_addInt(P026_get_value(index++), PackedData_uint24); // web
string += LoRa_addInt(P026_get_value(index++), PackedData_uint16); // freestack
// # if FEATURE_INTERNAL_TEMPERATURE
// string += LoRa_addInt(P026_get_value(index++) * 100.0f, PackedData_int16_1e2); // internal temperature in 0.01 degrees
// # endif // if FEATURE_INTERNAL_TEMPERATURE
event->Par1 = index; // valuecount
success = true;
break;
}
Expand Down
8 changes: 4 additions & 4 deletions src/src/Helpers/Hardware.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -623,22 +623,22 @@ uint8_t temprature_sens_read();

float getInternalTemperature() {
tonhuisman marked this conversation as resolved.
Show resolved Hide resolved
float temperature = -273.15f; // Inprobable value
tonhuisman marked this conversation as resolved.
Show resolved Hide resolved
bool success;
#ifdef ESP32
#if defined(ESP32_CLASSIC)
uint8_t raw = temprature_sens_read();
#ifndef BUILD_NO_DEBUG
addLog(LOG_LEVEL_DEBUG, concat(F("ESP32: Raw temperature value: "), raw));
#endif
success = (raw != 128);
temperature = (raw - 32) / 1.8f;
if (raw != 128) {
temperature = (raw - 32) / 1.8f;
}
#elif defined(ESP32C3) || defined(ESP32S2) || defined(ESP32S3)
temp_sensor_config_t tsens = TSENS_CONFIG_DEFAULT();
temp_sensor_set_config(tsens);
temp_sensor_start();
esp_err_t result = temp_sensor_read_celsius(&temperature);
temp_sensor_stop();
if (result = ESP_OK) {
if (result != ESP_OK) {
temperature = -273.15f;
tonhuisman marked this conversation as resolved.
Show resolved Hide resolved
}
#endif // ESP32_CLASSIC
Expand Down
2 changes: 1 addition & 1 deletion src/src/Helpers/SystemVariables.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -363,7 +363,7 @@ const __FlashStringHelper * SystemVariables::toFlashString(SystemVariables::Enum
case Enum::ISNTP: return F("isntp");
case Enum::ISWIFI: return F("iswifi");
#if FEATURE_INTERNAL_TEMPERATURE
case Enum::INTERNAL_TEMPERATURE: return F("internaltemperature");
case Enum::INTERNAL_TEMPERATURE: return F("inttemp");
#endif // if FEATURE_INTERNAL_TEMPERATURE
#if FEATURE_ETHERNET
case Enum::ETHWIFIMODE: return F("ethwifimode");
Expand Down