jalr/THB2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Отключение внутренних подтяжек у выводов INP и TRG (RX2/TX2)

Browse source
This commit is contained in:
pvvx 2024-02-07 02:28:41 +03:00
parent 00ca0621e4
commit 3208ba5283
10 changed files with 3159 additions and 3135 deletions
Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -28,7 +28,7 @@ Custom firmware for Tuya [THB2](https://pvvx.github.io/THB2), [BTH01](https://pv
|---|--- |
| 1.0 | Первая релизная версия |
| 1.1 | Добавлен триггер - вывод TX2 срабатывающий по установленным значениям температуры и/или влажности с гистерезисами. Передача состояния вывода RX2 при connect. Для термометров с экраном добавлен показ смайлика с "комфортом". Дополнены: изменение имени и MAC устройства. |
| 1.2 | Будущая версия (ещё в работе, доступна в bthome_phy6222/bin): Отключение внутренних подтяжек у выводов INP и TRG (RX2/TX2).
## Прошивка:

2
bthome_phy6222/bin/BOOT_BTH01_v11.hex → bthome_phy6222/bin/BOOT_BTH01_v12.hex
View file

@ -2197,7 +2197,7 @@
:10B9300001B40248844601BC604700BF8B5201003D
:10B9400001B40248844601BC604700BF791800007A
:10B9500000020103020303030403050206020702B7
:10B96000080209000A030B030C020D020E030F0369
:10B96000080209000A030B030C000D000E030F036D
:10B97000100311031303140315001600993D001161
:10B98000CD3D0011000000000200000092B900113E
:10B99000192A0F180A000000F1590000FD240000C8

3124
bthome_phy6222/bin/BOOT_TH05_v11.hex
View file

File diff suppressed because it is too large Load diff

3114
bthome_phy6222/bin/BOOT_TH05_v12.hex Normal file
View file

File diff suppressed because it is too large Load diff

2
bthome_phy6222/bin/BOOT_THB2_v11.hex → bthome_phy6222/bin/BOOT_THB2_v12.hex
View file

@ -2193,7 +2193,7 @@
:10B8F00001B40248844601BC604700BFE117000064
:10B9000001B40248844601BC604700BF8B5201006D
:10B9100001B40248844601BC604700BF79180000AA
:10B9200000030103020303030402050206020700E9
:10B9200000030103020303030402050006000700ED
:10B93000080309030A030B030C000D000E030F0399
:10B940001003110013031403150316037D3D0011AA
:10B95000B13D0011000000000200000062B90011BA

BIN
bthome_phy6222/bin/BTH01_v11.bin → bthome_phy6222/bin/BTH01_v12.bin
View file

Binary file not shown.

BIN
bthome_phy6222/bin/TH05_v11.bin → bthome_phy6222/bin/TH05_v12.bin
View file

Binary file not shown.

BIN
bthome_phy6222/bin/THB2_v11.bin → bthome_phy6222/bin/THB2_v12.bin
View file

Binary file not shown.

5
bthome_phy6222/source/lcd_th05.c
View file

@ -280,6 +280,10 @@ void chow_measure(void) {
/* flg != 0 -> chow_measure */
void chow_lcd(int flg) {
#if OTA_TYPE == OTA_TYPE_BOOT
if(flg)
chow_measure();
#else
if(cfg.flg & FLG_SHOW_TIME) {
if(wrk.lcd_count++ & 1)
chow_clock();
@ -288,6 +292,7 @@ void chow_lcd(int flg) {
} else if(flg) {
chow_measure();
}
#endif
}
static void send_to_lcd(uint8_t *pbuf, int len){

45
bthome_phy6222/source/main.c
View file

@ -115,8 +115,16 @@ const ioinit_cfg_t ioInit[] = {
{ GPIO_P02, GPIO_PULL_DOWN },
{ GPIO_P03, GPIO_PULL_DOWN },
{ GPIO_P07, GPIO_PULL_UP }, // KEY
#ifdef GPIO_TRG
{ GPIO_P09, GPIO_FLOATING }, // TX - GPIO_TRG
#else
{ GPIO_P09, GPIO_PULL_UP }, // TX
#endif
#ifdef GPIO_INP
{ GPIO_P10, GPIO_FLOATING }, // RX - GPIO_INP
#else
{ GPIO_P10, GPIO_PULL_UP }, // RX
#endif
{ GPIO_P11, GPIO_FLOATING }, // ADC_VBAT
{ GPIO_P14, GPIO_PULL_DOWN },
{ GPIO_P15, GPIO_PULL_DOWN },
@ -127,14 +135,18 @@ const ioinit_cfg_t ioInit[] = {
{ GPIO_P23, GPIO_PULL_DOWN },
{ GPIO_P24, GPIO_PULL_DOWN },
{ GPIO_P25, GPIO_PULL_DOWN },
{ GPIO_P26, GPIO_FLOATING }, // LED
#ifdef GPIO_LED
{ GPIO_P26, GPIO_FLOATING }, // LED - GPIO_LED
#else
{ GPIO_P26, GPIO_FLOATING }, // LED - GPIO_LED
#endif
// {GPIO_P27, GPIO_FLOATING },
{ GPIO_P31, GPIO_PULL_DOWN },
{ GPIO_P32, GPIO_PULL_DOWN },
{ GPIO_P33, GPIO_PULL_DOWN },
{ GPIO_P34, GPIO_PULL_DOWN }
#elif (DEVICE == DEVICE_BTH01)
{ GPIO_P00, GPIO_PULL_UP }, // Sensor Vdd
{ GPIO_P00, GPIO_PULL_UP }, // GPIO_SPWR Sensor Vdd
{ GPIO_P01, GPIO_PULL_DOWN },
{ GPIO_P02, GPIO_PULL_DOWN },
{ GPIO_P03, GPIO_PULL_DOWN },
@ -144,14 +156,22 @@ const ioinit_cfg_t ioInit[] = {
{ GPIO_P11, GPIO_PULL_UP }, // ADC Vbat
{ GPIO_P14, GPIO_PULL_UP }, // KEY
#ifdef GPIO_LED
{ GPIO_P15, GPIO_FLOATING }, // LED
{ GPIO_P15, GPIO_FLOATING }, // LED - GPIO_LED
#else
{ GPIO_P15, GPIO_PULL_DOWN },
#endif
{ GPIO_P16, GPIO_PULL_DOWN },
{ GPIO_P17, GPIO_PULL_DOWN },
#ifdef GPIO_INP
{ GPIO_P18, GPIO_FLOATING }, // RX2 - GPIO_INP
#else
{ GPIO_P18, GPIO_PULL_UP }, // RX2
{ GPIO_P20, GPIO_PULL_UP }, // TX2
#endif
#ifdef GPIO_TRG
{ GPIO_P20, GPIO_FLOATING }, // TX2 - GPIO_TRG
#else
{ GPIO_P20, GPIO_PULL_UP }, // TX2 - GPIO_TRG
#endif
{ GPIO_P23, GPIO_PULL_DOWN },
{ GPIO_P24, GPIO_PULL_DOWN },
{ GPIO_P25, GPIO_PULL_DOWN }, // P25
@ -162,20 +182,29 @@ const ioinit_cfg_t ioInit[] = {
{ GPIO_P33, GPIO_FLOATING }, // I2C_SDA
{ GPIO_P34, GPIO_FLOATING } // // I2C_SCL
#elif (DEVICE == DEVICE_TH05)
{ GPIO_P00, GPIO_PULL_UP }, // Sensor Vdd
{ GPIO_P00, GPIO_PULL_UP }, // GPIO_SPWR Sensor Vdd
{ GPIO_P01, GPIO_PULL_DOWN },
{ GPIO_P02, GPIO_PULL_UP },
{ GPIO_P02, GPIO_PULL_UP }, // GPIO_LPWR
{ GPIO_P03, GPIO_PULL_DOWN },
{ GPIO_P07, GPIO_PULL_DOWN },
{ GPIO_P09, GPIO_PULL_UP }, // TX1
{ GPIO_P10, GPIO_PULL_UP }, // RX1
{ GPIO_P11, GPIO_PULL_UP }, // ADC Vbat
{ GPIO_P14, GPIO_PULL_UP }, // KEY
{ GPIO_P14, GPIO_PULL_UP }, // KEY - GPIO_KEY
{ GPIO_P15, GPIO_PULL_DOWN },
{ GPIO_P16, GPIO_PULL_DOWN },
{ GPIO_P17, GPIO_PULL_DOWN },
#ifdef GPIO_INP
{ GPIO_P18, GPIO_FLOATING }, // RX2 - GPIO_INP
#else
{ GPIO_P18, GPIO_PULL_UP }, // RX2
{ GPIO_P20, GPIO_PULL_UP }, // TX2
#endif
#ifdef GPIO_TRG
{ GPIO_P20, GPIO_FLOATING }, // TX2 - GPIO_TRG
#else
{ GPIO_P20, GPIO_PULL_UP }, // TX2 - GPIO_TRG
#endif
{ GPIO_P23, GPIO_PULL_DOWN },
{ GPIO_P24, GPIO_PULL_DOWN },
{ GPIO_P25, GPIO_PULL_DOWN }, // P25