jeans/Tasmota
jeans/Tasmota
1
0
Fork 0
mirror of https://github.com/arendst/Tasmota.git synced 2025-04-25 23:37:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Matter alternate Illuminance calculation (#18847)

Browse Source
This commit is contained in:
s-hadinger 2023-06-10 19:40:57 +02:00 committed by GitHub
parent 827c14e4bd
commit 5cb9bae72c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 24 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/libesp32/berry_matter/src/embedded/Matter_Plugin_Bridge_Sensor_Illuminance.be
View File

@ -53,10 +53,10 @@ class Matter_Plugin_Bridge_Sensor_Illuminance : Matter_Plugin_Bridge_Sensor
if val == nil return nil end if val == nil return nil end
import math import math
if val < 1 if val < 0
return 0 return 0
else else
return math.log10(val) * 10000 + 1 return math.log10(val + 1) * 10000
end end
end end

4
lib/libesp32/berry_matter/src/embedded/Matter_Plugin_Sensor_Illuminance.be
View File

@ -43,10 +43,10 @@ class Matter_Plugin_Sensor_Illuminance : Matter_Plugin_Sensor
if val == nil return nil end if val == nil return nil end
import math import math
if val < 1 if val < 0
return 0 return 0
else else
return math.log10(val) * 10000 + 1 return math.log10(val + 1) * 10000
end end
end end

21
lib/libesp32/berry_matter/src/solidify/solidified_Matter_Plugin_Bridge_Sensor_Illuminance.h
View File

@ -21,13 +21,13 @@ be_local_closure(Matter_Plugin_Bridge_Sensor_Illuminance_pre_value, /* name */
1, /* has constants */ 1, /* has constants */
( &(const bvalue[ 4]) { /* constants */ ( &(const bvalue[ 4]) { /* constants */
/* K0 */ be_nested_str_weak(math), /* K0 */ be_nested_str_weak(math),
/* K1 */ be_const_int(1), /* K1 */ be_const_int(0),
/* K2 */ be_const_int(0), /* K2 */ be_nested_str_weak(log10),
/* K3 */ be_nested_str_weak(log10), /* K3 */ be_const_int(1),
}), }),
be_str_weak(pre_value), be_str_weak(pre_value),
&be_const_str_solidified, &be_const_str_solidified,
( &(const binstruction[18]) { /* code */ ( &(const binstruction[17]) { /* code */
0x4C080000, // 0000 LDNIL R2 0x4C080000, // 0000 LDNIL R2
0x1C080202, // 0001 EQ R2 R1 R2 0x1C080202, // 0001 EQ R2 R1 R2
0x780A0001, // 0002 JMPF R2 #0005 0x780A0001, // 0002 JMPF R2 #0005
@ -36,16 +36,15 @@ be_local_closure(Matter_Plugin_Bridge_Sensor_Illuminance_pre_value, /* name */
0xA40A0000, // 0005 IMPORT R2 K0 0xA40A0000, // 0005 IMPORT R2 K0
0x140C0301, // 0006 LT R3 R1 K1 0x140C0301, // 0006 LT R3 R1 K1
0x780E0001, // 0007 JMPF R3 #000A 0x780E0001, // 0007 JMPF R3 #000A
0x80060400, // 0008 RET 1 K2 0x80060200, // 0008 RET 1 K1
0x70020006, // 0009 JMP #0011 0x70020005, // 0009 JMP #0010
0x8C0C0503, // 000A GETMET R3 R2 K3 0x8C0C0502, // 000A GETMET R3 R2 K2
0x5C140200, // 000B MOVE R5 R1 0x00140303, // 000B ADD R5 R1 K3
0x7C0C0400, // 000C CALL R3 2 0x7C0C0400, // 000C CALL R3 2
0x5412270F, // 000D LDINT R4 10000 0x5412270F, // 000D LDINT R4 10000
0x080C0604, // 000E MUL R3 R3 R4 0x080C0604, // 000E MUL R3 R3 R4
0x000C0701, // 000F ADD R3 R3 K1 0x80040600, // 000F RET 1 R3
0x80040600, // 0010 RET 1 R3 0x80000000, // 0010 RET 0
0x80000000, // 0011 RET 0
}) })
) )
); );

21
lib/libesp32/berry_matter/src/solidify/solidified_Matter_Plugin_Sensor_Illuminance.h
View File

@ -131,13 +131,13 @@ be_local_closure(Matter_Plugin_Sensor_Illuminance_pre_value, /* name */
1, /* has constants */ 1, /* has constants */
( &(const bvalue[ 4]) { /* constants */ ( &(const bvalue[ 4]) { /* constants */
/* K0 */ be_nested_str_weak(math), /* K0 */ be_nested_str_weak(math),
/* K1 */ be_const_int(1), /* K1 */ be_const_int(0),
/* K2 */ be_const_int(0), /* K2 */ be_nested_str_weak(log10),
/* K3 */ be_nested_str_weak(log10), /* K3 */ be_const_int(1),
}), }),
be_str_weak(pre_value), be_str_weak(pre_value),
&be_const_str_solidified, &be_const_str_solidified,
( &(const binstruction[18]) { /* code */ ( &(const binstruction[17]) { /* code */
0x4C080000, // 0000 LDNIL R2 0x4C080000, // 0000 LDNIL R2
0x1C080202, // 0001 EQ R2 R1 R2 0x1C080202, // 0001 EQ R2 R1 R2
0x780A0001, // 0002 JMPF R2 #0005 0x780A0001, // 0002 JMPF R2 #0005
@ -146,16 +146,15 @@ be_local_closure(Matter_Plugin_Sensor_Illuminance_pre_value, /* name */
0xA40A0000, // 0005 IMPORT R2 K0 0xA40A0000, // 0005 IMPORT R2 K0
0x140C0301, // 0006 LT R3 R1 K1 0x140C0301, // 0006 LT R3 R1 K1
0x780E0001, // 0007 JMPF R3 #000A 0x780E0001, // 0007 JMPF R3 #000A
0x80060400, // 0008 RET 1 K2 0x80060200, // 0008 RET 1 K1
0x70020006, // 0009 JMP #0011 0x70020005, // 0009 JMP #0010
0x8C0C0503, // 000A GETMET R3 R2 K3 0x8C0C0502, // 000A GETMET R3 R2 K2
0x5C140200, // 000B MOVE R5 R1 0x00140303, // 000B ADD R5 R1 K3
0x7C0C0400, // 000C CALL R3 2 0x7C0C0400, // 000C CALL R3 2
0x5412270F, // 000D LDINT R4 10000 0x5412270F, // 000D LDINT R4 10000
0x080C0604, // 000E MUL R3 R3 R4 0x080C0604, // 000E MUL R3 R3 R4
0x000C0701, // 000F ADD R3 R3 K1 0x80040600, // 000F RET 1 R3
0x80040600, // 0010 RET 1 R3 0x80000000, // 0010 RET 0
0x80000000, // 0011 RET 0
}) })
) )
); );