diff --git a/bin/BOOT_BTH01_v20.hex b/bin/BOOT_BTH01_v20.hex index 06e670f..c2af07f 100644 --- a/bin/BOOT_BTH01_v20.hex +++ b/bin/BOOT_BTH01_v20.hex @@ -371,7 +371,7 @@ :104710000A21584306F088FE0B4D286070BDA02B7F :10472000EDD9A023EAE7C046C861FF1F480AFF1F72 :10473000EE41FF1FB043FF1FEC41FF1FEA41FF1F87 -:10474000E841FF1F71020000B861FF1FF8B5192191 +:10474000E841FF1F71020000B861FF1FF8B520218A :104750000020FEF785FE114C011E114D09D10C22DF :10476000104BC1CBC1C4280006F02EFEFFF79CFF02 :10477000F8BD0C2220000C49FEF746FE0C2802D0A2 @@ -2211,7 +2211,7 @@ :10BA0800493E0011793F00110000000016160000A1 :10BA18000200000024BA0011F4FFF3FFD2FC00007A :10BA2800B940001100000000000000005475796161 -:10BA38000042312E3900303031340067697468753E +:10BA38000042322E30003030313400676974687546 :10BA4800622E636F6D2F70767678004254483031DD :10BA5800000000000200000070BA0011292A282AFC :10BA6800272A262A252A242A0A180000E204000088 @@ -2219,7 +2219,7 @@ :10BA88001027000060F000000400000006640000B9 :10BA9800204E000000000000060000005C4400008A :10BAA800102700006CEE00000700000005000000F1 -:10BAB8001F501D00023CB4000001140019000000D2 +:10BAB8001F501D00023CB4000001140020000000CB :10BAC800810200003031323334353637383941425B :10BAD8004344454600000000B557001109580011BD :10BAE8000000000002000000F8BA00116F2A6E2A58 diff --git a/bin/BOOT_TH05D_v20.hex b/bin/BOOT_TH05D_v20.hex index d750c29..028b692 100644 --- a/bin/BOOT_TH05D_v20.hex +++ b/bin/BOOT_TH05D_v20.hex @@ -374,7 +374,7 @@ :1047400007F046FA0B4D286070BDA02BEDD9A023D1 :10475000EAE7C046E061FF1F480AFF1FF641FF1F5E :10476000C843FF1FF441FF1FF241FF1FF041FF1F2D -:1047700071020000D061FF1FF8B519210020FEF77B +:1047700071020000D061FF1FF8B520210020FEF774 :104780006FFE114C011E114D09D10C22104BC1CBF3 :10479000C1C4280007F064FAFFF79CFFF8BD0C22A3 :1047A00020000C49FEF730FE0C2802D0084B43CB0A @@ -709,8 +709,8 @@ :105C300070BDC0469542FF1F3D64FF1F3C64FF1FBF :105C4000102110B50D4B1A780A401A70DA785631C7 :105C50000A40DA70602219791140223ADA71083A62 -:105C60009A71AA325A71DF3A0A431A7106225A709F -:105C700039329A70FFF7C8FF10BDC0469542FF1F2A +:105C60009A71AA325A71DF3A0A431A716B225A703A +:105C70000C3A9A70FFF7C8FF10BDC0469542FF1F4F :105C800010B5002832D01E4C0223E05E1D4B1B686D :105C90005B062CD509233221584305F099FF41308A :105CA000FF3000B2FFF7D6FE0520FFF765FE0422A5 @@ -2277,7 +2277,7 @@ :10BE30003D3E00116D3F001100000000161600008D :10BE4000020000004CBE0011F4FFF3FFD2FC000022 :10BE5000AD40001100000000000000005475796141 -:10BE60000042312E3900303031380067697468750E +:10BE60000042322E30003030313800676974687516 :10BE7000622E636F6D2F70767678005448303544AB :10BE8000000000000200000098BE0011292A282AA4 :10BE9000272A262A252A242A0A180000E20400005C @@ -2285,7 +2285,7 @@ :10BEB0001027000060F0000004000000066400008D :10BEC000204E000000000000060000005C4400005E :10BED000102700006CEE00000700000005000000C5 -:10BEE0001F501D00023CB4000001180019000000A2 +:10BEE0001F501D00023CB40000011800200000009B :10BEF000A10200003031323334353637383941420F :10BF000043444546000000001D58001171580011BF :10BF1000000000000200000020BF00116F2A6E2AFE diff --git a/bin/BOOT_TH05F_v20.hex b/bin/BOOT_TH05F_v20.hex index f9fe043..042e1b2 100644 --- a/bin/BOOT_TH05F_v20.hex +++ b/bin/BOOT_TH05F_v20.hex @@ -374,7 +374,7 @@ :104740000A21584307F038FA0B4D286070BDA02BA2 :10475000EDD9A023EAE7C046DC61FF1F480AFF1F2E :10476000EE41FF1FC443FF1FEC41FF1FEA41FF1F43 -:10477000E841FF1F71020000CC61FF1FF8B519214D +:10477000E841FF1F71020000CC61FF1FF8B5202146 :104780000020FEF76DFE114C011E114D09D10C22C7 :10479000104BC1CBC1C4280007F056FAFFF79CFFAD :1047A000F8BD0C2220000C49FEF72EFE0C2802D08A @@ -704,8 +704,8 @@ :105BE00006F092F807212000FFF7D2FF70BDC046F3 :105BF0009442FF1F8E42FF1F8D42FF1FE62220218D :105C000010B50A4B1A70203A5A701C329A70DA7822 -:105C10000A40DA70082219791140033A0A431A71CE -:105C2000B7225A71FFF7CEFF10BDC0469442FF1F46 +:105C10000A40DA70082219791140353A0A431A719C +:105C2000F5225A71FFF7CEFF10BDC0469442FF1F08 :105C300010B5244B5B78002B3AD1002838D0224C89 :105C40000223E05E214B1B685B0632D5092332211B :105C5000584305F0B1FF4130FF3000B2FFF7ECFED2 @@ -2276,7 +2276,7 @@ :10BE1800413E0011713F001100000000161600009D :10BE28000200000034BE0011F4FFF3FFD2FC000052 :10BE3800B140001100000000000000005475796155 -:10BE48000042312E39003030313900676974687525 +:10BE48000042322E3000303031390067697468752D :10BE5800622E636F6D2F70767678005448303546C1 :10BE6800000000000200000080BE0011292A282AD4 :10BE7800272A262A252A242A0A180000E204000074 @@ -2284,7 +2284,7 @@ :10BE98001027000060F000000400000006640000A5 :10BEA800204E000000000000060000005C44000076 :10BEB800102700006CEE00000700000005000000DD -:10BEC8001F501D00023CB4000001190019000000B9 +:10BEC8001F501D00023CB4000001190020000000B2 :10BED800A102000030313233343536373839414227 :10BEE8004344454600000000395800118D580011A0 :10BEF800000000000200000008BF00116F2A6E2A2F diff --git a/bin/BOOT_TH05_v20.hex b/bin/BOOT_TH05_v20.hex index 2e90837..0fd2499 100644 --- a/bin/BOOT_TH05_v20.hex +++ b/bin/BOOT_TH05_v20.hex @@ -374,7 +374,7 @@ :104740000A21584307F0D0F90B4D286070BDA02B0B :10475000EDD9A023EAE7C046D461FF1F480AFF1F36 :10476000EE41FF1FBC43FF1FEC41FF1FEA41FF1F4B -:10477000E841FF1F71020000C461FF1FF8B5192155 +:10477000E841FF1F71020000C461FF1FF8B520214E :104780000020FEF76DFE114C011E114D09D10C22C7 :10479000104BC1CBC1C4280007F04EF8FFF79CFFB7 :1047A000F8BD0C2220000C49FEF72EFE0C2802D08A @@ -703,7 +703,7 @@ :105BD000FFF7D2FF70BDC0468D42FF1F3164FF1F2B :105BE0003064FF1FE622402110B50A4B1A70403A7C :105BF0005A703E329A70DA780A40DA7008221979BF -:105C00001140053A0A431A71D7225A71FFF7CEFFA5 +:105C00001140533A0A431A71F3225A71FFF7CEFF3B :105C100010BDC0468D42FF1F10B5002838D0214C62 :105C20000223E05E204B1B685B0632D5092332213C :105C3000584305F059FF4130FF3000B2FFF7F0FE46 @@ -2274,7 +2274,7 @@ :10BDF800413E0011713F00110000000016160000BE :10BE08000200000014BE0011F4FFF3FFD2FC000092 :10BE1800B140001100000000000000005475796175 -:10BE28000042312E39003030313500676974687549 +:10BE28000042322E30003030313500676974687551 :10BE3800622E636F6D2F7076767800544830350027 :10BE4800020000005CBE0011292A282A272A262A77 :10BE5800252A242A0A180000E204000071020000C2 @@ -2282,7 +2282,7 @@ :10BE780060F000000400000006640000204E00008E :10BE880000000000060000005C44000010270000CD :10BE98006CEE000007000000050000001F501D00A8 -:10BEA800023CB4000001150019000000A1020000C6 +:10BEA800023CB4000001150020000000A1020000BF :10BEB80030313233343536373839414243444546D8 :10BEC80000000000395800118D58001100000000D2 :10BED80002000000E4BE00116F2A6E2A1A18EAD880 diff --git a/bin/BOOT_THB1_v20.hex b/bin/BOOT_THB1_v20.hex index 37fb658..253f472 100644 --- a/bin/BOOT_THB1_v20.hex +++ b/bin/BOOT_THB1_v20.hex @@ -374,7 +374,7 @@ :1047400070BDA02BEDD9A023EAE7C046D461FF1FBE :10475000480AFF1FEE41FF1FBC43FF1FEC41FF1F34 :10476000EA41FF1FE841FF1F71020000C461FF1F03 -:10477000F8B519210020FEF773FE114C011E114DF2 +:10477000F8B520210020FEF773FE114C011E114DEB :1047800009D10C22104BC1CBC1C4280007F0A0FAFC :10479000FFF79CFFF8BD0C2220000C49FEF734FE09 :1047A0000C2802D0084B43CB43C40C2228000849F4 @@ -703,7 +703,7 @@ :105BD000FFF7D2FF70BDC0468D42FF1F3164FF1F2B :105BE0003064FF1F7F2210B50A4B59789143033A66 :105BF0001A70103A0A435A7078220E219A70DA7895 -:105C00008A43DA7006221A7139325A71FFF7CEFFD1 +:105C00008A43DA706B221A710C3A5A71FFF7CEFF91 :105C100010BDC0468D42FF1F10B5002832D01E4C6B :105C20000223E05E1D4B1B685B062CD50923322145 :105C3000584305F0DDFF4130FF3000B2FFF7F0FEC2 @@ -2270,7 +2270,7 @@ :10BDC000353E0011653F001100000000161600000E :10BDD00002000000DCBD0011F4FFF3FFD2FC000004 :10BDE000A5400011000000000000000054757961BA -:10BDF0000042312E39003030313700676974687580 +:10BDF0000042322E30003030313700676974687588 :10BE0000622E636F6D2F7076767800544842310051 :10BE10000200000024BE0011292A282A272A262AE7 :10BE2000252A242A0A180000E204000071020000FA @@ -2278,7 +2278,7 @@ :10BE400060F000000400000006640000204E0000C6 :10BE500000000000060000005C4400001027000005 :10BE60006CEE000007000000050000001F501D00E0 -:10BE7000023CB4000001170019000000A1020000FC +:10BE7000023CB4000001170020000000A1020000F5 :10BE80003031323334353637383941424344454610 :10BE9000000000001D580011715800110000000042 :10BEA00002000000ACBE00116F2A6E2A1A18EAD8F0 diff --git a/bin/BOOT_THB2_v20.hex b/bin/BOOT_THB2_v20.hex index 0caf575..2cf3245 100644 --- a/bin/BOOT_THB2_v20.hex +++ b/bin/BOOT_THB2_v20.hex @@ -370,7 +370,7 @@ :104700000B4D286070BDA02BEDD9A023EAE7C04671 :10471000C861FF1F480AFF1FEE41FF1FB043FF1F84 :10472000EC41FF1FEA41FF1FE841FF1F710200003B -:10473000B861FF1FF8B519210020FEF791FE114C5A +:10473000B861FF1FF8B520210020FEF791FE114C53 :10474000011E114D09D10C22104BC1CBC1C4280050 :1047500006F022FEFFF79CFFF8BD0C2220000C495A :10476000FEF752FE0C2802D0084B43CB43C40C2268 @@ -2208,7 +2208,7 @@ :10B9D800313E0011613F0011000000001616000002 :10B9E80002000000F4B90011F4FFF3FFD2FC0000DC :10B9F800A1400011000000000000000054757961AA -:10BA08000042312E3900303031330067697468756F +:10BA08000042322E30003030313300676974687577 :10BA1800622E636F6D2F707676780054484232003C :10BA2800020000003CBA0011292A282A272A262ABF :10BA3800252A242A0A180000E204000071020000E6 @@ -2216,7 +2216,7 @@ :10BA580060F000000400000006640000204E0000B2 :10BA680000000000060000005C44000010270000F1 :10BA78006CEE000007000000050000001F501D00CC -:10BA8800023CB4000001130019000000810200000C +:10BA8800023CB40000011300200000008102000005 :10BA980030313233343536373839414243444546FC :10BAA8000000000089570011DD5700110000000058 :10BAB80002000000C4BA00116F2A6E2A1A1800008A diff --git a/bin/BOOT_THB3_v20.hex b/bin/BOOT_THB3_v20.hex index b0be468..e5ec4b3 100644 --- a/bin/BOOT_THB3_v20.hex +++ b/bin/BOOT_THB3_v20.hex @@ -374,7 +374,7 @@ :1047400070BDA02BEDD9A023EAE7C046D461FF1FBE :10475000480AFF1FEE41FF1FBC43FF1FEC41FF1F34 :10476000EA41FF1FE841FF1F71020000C461FF1F03 -:10477000F8B519210020FEF773FE114C011E114DF2 +:10477000F8B520210020FEF773FE114C011E114DEB :1047800009D10C22104BC1CBC1C4280007F0A0FAFC :10479000FFF79CFFF8BD0C2220000C49FEF734FE09 :1047A0000C2802D0084B43CB43C40C2228000849F4 @@ -703,7 +703,7 @@ :105BD000FFF7D2FF70BDC0468D42FF1F3164FF1F2B :105BE0003064FF1F7F2210B50A4B59789143033A66 :105BF0001A70103A0A435A7078220E219A70DA7895 -:105C00008A43DA7006221A7139325A71FFF7CEFFD1 +:105C00008A43DA706B221A710C3A5A71FFF7CEFF91 :105C100010BDC0468D42FF1F10B5002832D01E4C6B :105C20000223E05E1D4B1B685B062CD50923322145 :105C3000584305F0DDFF4130FF3000B2FFF7F0FEC2 @@ -2270,7 +2270,7 @@ :10BDC000353E0011653F001100000000161600000E :10BDD00002000000DCBD0011F4FFF3FFD2FC000004 :10BDE000A5400011000000000000000054757961BA -:10BDF0000042312E39003030314100676974687576 +:10BDF0000042322E3000303031410067697468757E :10BE0000622E636F6D2F707676780054484233004F :10BE10000200000024BE0011292A282A272A262AE7 :10BE2000252A242A0A180000E204000071020000FA @@ -2278,7 +2278,7 @@ :10BE400060F000000400000006640000204E0000C6 :10BE500000000000060000005C4400001027000005 :10BE60006CEE000007000000050000001F501D00E0 -:10BE7000023CB40000011A0019000000A1020000F9 +:10BE7000023CB40000011A0020000000A1020000F2 :10BE80003031323334353637383941424344454610 :10BE9000000000001D580011715800110000000042 :10BEA00002000000ACBE00116F2A6E2A1A18EAD8F0 diff --git a/bin/BTH01_v20.bin b/bin/BTH01_v20.bin index 224f798..ae628a4 100644 Binary files a/bin/BTH01_v20.bin and b/bin/BTH01_v20.bin differ diff --git a/bin/TH05D_v20.bin b/bin/TH05D_v20.bin index 6fdb5a3..ce95c96 100644 Binary files a/bin/TH05D_v20.bin and b/bin/TH05D_v20.bin differ diff --git a/bin/TH05F_v20.bin b/bin/TH05F_v20.bin index 6311bca..eebe72c 100644 Binary files a/bin/TH05F_v20.bin and b/bin/TH05F_v20.bin differ diff --git a/bin/TH05_v20.bin b/bin/TH05_v20.bin index 4989568..a894542 100644 Binary files a/bin/TH05_v20.bin and b/bin/TH05_v20.bin differ diff --git a/bin/THB1_v20.bin b/bin/THB1_v20.bin index a87a253..db80ab3 100644 Binary files a/bin/THB1_v20.bin and b/bin/THB1_v20.bin differ diff --git a/bin/THB2_v20.bin b/bin/THB2_v20.bin index c48cd95..b06f5b5 100644 Binary files a/bin/THB2_v20.bin and b/bin/THB2_v20.bin differ diff --git a/bin/THB3_v20.bin b/bin/THB3_v20.bin index 4cb4571..bf49039 100644 Binary files a/bin/THB3_v20.bin and b/bin/THB3_v20.bin differ diff --git a/bthome_phy6222/source/cmd_parser.c b/bthome_phy6222/source/cmd_parser.c index 3aebb15..96f992f 100644 --- a/bthome_phy6222/source/cmd_parser.c +++ b/bthome_phy6222/source/cmd_parser.c @@ -104,8 +104,10 @@ int cmd_parser(uint8_t * obuf, uint8_t * ibuf, uint32_t len) { obuf[1] = 0; // no err if (cmd == CMD_ID_DEVID) { // Get DEV_ID memcpy(obuf, &dev_id, sizeof(dev_id)); +#if (DEV_SERVICES & SERVICE_THS) dev_id_t * p = (dev_id_t *)&obuf; p->dev_spec_data = thsensor_cfg.sensor_type; +#endif olen = sizeof(dev_id); } else if (cmd == CMD_ID_CFG) { // Get/Set device config if (--len > sizeof(cfg)) diff --git a/bthome_phy6222/source/config.h b/bthome_phy6222/source/config.h index fb7e8a0..be5a7b8 100644 --- a/bthome_phy6222/source/config.h +++ b/bthome_phy6222/source/config.h @@ -13,7 +13,7 @@ // #include "bus_dev.h" #ifndef APP_VERSION -#define APP_VERSION 0x19 // BCD +#define APP_VERSION 0x20 // BCD #endif /* rf_phy_ana_cfg diff --git a/bthome_phy6222/source/lcd_th05d.c b/bthome_phy6222/source/lcd_th05d.c index 04e1a65..7d64b3b 100644 --- a/bthome_phy6222/source/lcd_th05d.c +++ b/bthome_phy6222/source/lcd_th05d.c @@ -213,7 +213,7 @@ void show_big_number_x10(int16_t number) { } else { display_buff[6] = 0; display_buff[7] = 0; - /* number: -995..19995 */ + /* number: -19995..19995 */ if (number > 1995 || number < -1995) { //display_buff[5] &= ~BIT(0); // no point, show: -1999..1999 if (number < 0) { diff --git a/bthome_phy6222/source/sensors.c b/bthome_phy6222/source/sensors.c index 730d49f..abf164f 100644 --- a/bthome_phy6222/source/sensors.c +++ b/bthome_phy6222/source/sensors.c @@ -239,4 +239,10 @@ void init_sensor(void) { deinit_i2c(&i2c_dev0); } +#else + +#include "sensors.h" + +measured_data_t measured_data; + #endif // (DEV_SERVICES & SERVICE_THS) diff --git a/bthome_phy6222/source/sensors.h b/bthome_phy6222/source/sensors.h index 051004b..6d7c697 100644 --- a/bthome_phy6222/source/sensors.h +++ b/bthome_phy6222/source/sensors.h @@ -210,14 +210,24 @@ int read_sensors(void); #else // (DEV_SERVICES & SERVICE_THS) +typedef struct __attribute__((packed)) _measured_flg_t { + uint8_t pin_input : 1; // GPIO_INP input pin + uint8_t trg_output : 1; // GPIO_TRG pin output value + uint8_t comfort : 1; // Temperature or Humidity comfort + uint8_t trg_on : 1; // Temperature or Humidity trigger on + uint8_t temp_trg_on : 1; // Temperature trigger on + uint8_t humi_trg_on : 1; // Humidity trigger on +} measured_flg_t; + typedef struct _measured_data_t { uint16_t count; -// int16_t temp; // x 0.01 C -// int16_t humi; // x 0.01 % uint16_t battery_mv; // mV uint8_t battery; // 0..100 % + measured_flg_t flg; } measured_data_t; +#define send_len_measured_data 5 + extern measured_data_t measured_data; diff --git a/bthome_phy6222/source/thb2_main.c b/bthome_phy6222/source/thb2_main.c index 6676cf7..25469a1 100644 --- a/bthome_phy6222/source/thb2_main.c +++ b/bthome_phy6222/source/thb2_main.c @@ -711,7 +711,7 @@ uint16_t BLEPeripheral_ProcessEvent( uint8_t task_id, uint16_t events ) adv_wrk.adv_reload_count = RDS_RETRY_ADV_COUNT; adv_wrk.rds_timer_tik = clkt.utc_time_tik - (RDS_RETRY_DOUBLE_SEC << 15); LL_SetAdvData(bthome_data_beacon((void *) gapRole_AdvertData), gapRole_AdvertData); - set_new_adv_interval(DEF_EVENT_ADV_INERVAL); // actual time * 625us + set_new_adv_interval(DEF_EVENT_ADV_INERVAL); // 50ms, actual time * 625us } else if(cfg.flg & FLG_MEAS_NOTIFY) { get_utc_time_sec(); // ัั‡ะตั‚ UTC timestamp measure_notify(); diff --git a/update_boot/BOOT_BTH01_v20.bin b/update_boot/BOOT_BTH01_v20.bin new file mode 100644 index 0000000..761f609 Binary files /dev/null and b/update_boot/BOOT_BTH01_v20.bin differ diff --git a/update_boot/BOOT_TH05D_v20.bin b/update_boot/BOOT_TH05D_v20.bin new file mode 100644 index 0000000..eddfa77 Binary files /dev/null and b/update_boot/BOOT_TH05D_v20.bin differ diff --git a/update_boot/BOOT_TH05F_v20.bin b/update_boot/BOOT_TH05F_v20.bin new file mode 100644 index 0000000..11a4023 Binary files /dev/null and b/update_boot/BOOT_TH05F_v20.bin differ diff --git a/update_boot/BOOT_TH05_v20.bin b/update_boot/BOOT_TH05_v20.bin new file mode 100644 index 0000000..511ac30 Binary files /dev/null and b/update_boot/BOOT_TH05_v20.bin differ diff --git a/update_boot/BOOT_THB1_v20.bin b/update_boot/BOOT_THB1_v20.bin new file mode 100644 index 0000000..1c50188 Binary files /dev/null and b/update_boot/BOOT_THB1_v20.bin differ diff --git a/update_boot/BOOT_THB2_v20.bin b/update_boot/BOOT_THB2_v20.bin new file mode 100644 index 0000000..bb043ca Binary files /dev/null and b/update_boot/BOOT_THB2_v20.bin differ diff --git a/update_boot/BOOT_THB3_v20.bin b/update_boot/BOOT_THB3_v20.bin new file mode 100644 index 0000000..897d530 Binary files /dev/null and b/update_boot/BOOT_THB3_v20.bin differ