andry/EMS-ESP32
1
0
Fork 0
mirror of https://github.com/emsesp/EMS-ESP32.git synced 2025-12-06 15:59:52 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2107 from proddy/dev

Browse Source 
dont show broken link if IMG cant be found
This commit is contained in:
Proddy
2024-10-17 14:04:19 +02:00
committed by GitHub
parent 210637fde3 849610950f
commit 8bab7579ee
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
interface/src/app/main/Help.tsx
View File

@@ -37,6 +37,7 @@ const Help = () => {
const [customSupportIMG, setCustomSupportIMG] = useState<string | null>(null); const [customSupportIMG, setCustomSupportIMG] = useState<string | null>(null);
const [customSupportHTML, setCustomSupportHTML] = useState<string | null>(null); const [customSupportHTML, setCustomSupportHTML] = useState<string | null>(null);
const [notFound, setNotFound] = useState<boolean>(false);
useRequest(() => callAction({ action: 'customSupport' })).onSuccess((event) => { useRequest(() => callAction({ action: 'customSupport' })).onSuccess((event) => {
if (event && event.data && Object.keys(event.data).length !== 0) { if (event && event.data && Object.keys(event.data).length !== 0) {
@@ -102,7 +103,12 @@ const Help = () => {
sx={{ sx={{
maxHeight: { xs: 100, md: 250 } maxHeight: { xs: 100, md: 250 }
}} }}
src={customSupportIMG || 'https://emsesp.org/_media/images/installer.jpeg'} onError={(e) => setNotFound(true)}
src={
notFound
? ''
: customSupportIMG || 'https://emsesp.org/_media/images/installer.jpeg'
}
/> />
</Stack> </Stack>

4
src/system.cpp
View File

@@ -791,9 +791,9 @@ void System::system_check() {
#ifndef EMSESP_STANDALONE #ifndef EMSESP_STANDALONE
#if CONFIG_IDF_TARGET_ESP32S3 || CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32S2 #if CONFIG_IDF_TARGET_ESP32S3 || CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32S2
#if ESP_IDF_VERSION_MAJOR < 5 #if ESP_IDF_VERSION_MAJOR < 5
temp_sensor_read_celsius(&temperature_); temp_sensor_read_celsius(&temperature_);
#else #else
temperature_sensor_get_celsius(temperature_handle_, &temperature_); temperature_sensor_get_celsius(temperature_handle_, &temperature_);
#endif #endif
#endif #endif
#endif #endif