rename sensor.h

README.md

@@ -20,6 +20,7 @@ Custom firmware for Tuya [THB2](https://pvvx.github.io/THB2), [BTH01](https://pv
 * Измеренное среднее потребление от источника в 3.3В при сканировании термометров THB2 и BTH01 в пассивном режиме составляет до 8 мкА. Для TH-05 среднее потребление около 23 мкА - [таков ток установленных компонентов](https://github.com/pvvx/THB2/issues/8#issuecomment-1908982171).
 * Запись итории каждые 30 минут
 * Интервал соединения с учетом Connect Latency - 900 мс
+* Поддерживаемые сенсоры температуры и влажности: AHT30, CHT8305, CHT8215, CHT8310
 
 ## Прошивка:
 

bthome_phy6222/source/battery.c

@@ -9,7 +9,7 @@
 #include "thb2_main.h"
 #include "pwrmgr.h"
 #include "jump_function.h"
-#include "sensor.h"
+#include "sensors.h"
 
 #ifndef ADC_PIN
 #define ADC_PIN GPIO_P11

bthome_phy6222/source/battservice.c

@@ -17,7 +17,7 @@
 #include "peripheral.h"
 
 #include "battservice.h"
-#include "sensor.h"
+#include "sensors.h"
 /*********************************************************************
 	MACROS
 */

bthome_phy6222/source/bthome_beacon.c

@@ -9,7 +9,7 @@
 #include "config.h"
 #include "bcomdef.h"
 #include "gapbondmgr.h"
-#include "sensor.h"
+#include "sensors.h"
 #include "bthome_beacon.h"
 
 uint8_t bthome_data_beacon(void * padbuf) {

bthome_phy6222/source/cmd_parcer.c

@@ -21,7 +21,7 @@
 #include "flash_eep.h"
 #include "bleperipheral.h"
 #include "sbp_profile.h"
-#include "sensor.h"
+#include "sensors.h"
 #include "cmd_parcer.h"
 #include "devinfoservice.h"
 #include "ble_ota.h"

bthome_phy6222/source/cmd_parser.c

@@ -21,7 +21,7 @@
 #include "flash_eep.h"
 #include "thb2_main.h"
 #include "sbp_profile.h"
-#include "sensor.h"
+#include "sensors.h"
 #include "cmd_parser.h"
 #include "devinfoservice.h"
 #include "ble_ota.h"

bthome_phy6222/source/config.c

@@ -34,7 +34,7 @@
 #include "thservice.h"
 #include "thb2_peripheral.h"
 #include "bthome_beacon.h"
-#include "sensor.h"
+#include "sensors.h"
 #include "battery.h"
 #include "sbp_profile.h"
 #include "logger.h"
@@ -91,7 +91,7 @@ void test_config(void) {
 	if (cfg.rf_tx_power > RF_PHY_TX_POWER_EXTRA_MAX)
 		cfg.rf_tx_power = RF_PHY_TX_POWER_EXTRA_MAX;
 	g_rfPhyTxPower = cfg.rf_tx_power;
-	rf_phy_set_txPower(g_rfPhyTxPower);
+	//rf_phy_set_txPower(g_rfPhyTxPower);
 
 	gapRole_MinConnInterval = periConnParameters.intervalMin = DEFAULT_DESIRED_MIN_CONN_INTERVAL;
 	gapRole_MaxConnInterval = periConnParameters.intervalMax = DEFAULT_DESIRED_MAX_CONN_INTERVAL;

bthome_phy6222/source/lcd_th05.c

@@ -12,7 +12,7 @@
 #include "gpio.h"
 #include "rom_sym_def.h"
 #include "dev_i2c.h"
-#include "sensor.h"
+#include "sensors.h"
 #include "lcd_th05.h"
 #include "thb2_peripheral.h"
 

bthome_phy6222/source/logger.c

@@ -9,7 +9,7 @@
 #include "flash.h"
 #include "flash_eep.h"
 #include "logger.h"
-#include "sensor.h"
+#include "sensors.h"
 #include "cmd_parser.h"
 
 #define RAM

bthome_phy6222/source/sbp_profile.c

@@ -27,7 +27,7 @@
 #include "logger.h"
 #include "hci.h"
 #include "lcd_th05.h"
-#include "sensor.h"
+#include "sensors.h"
 
 /*********************************************************************
  * MACROS

bthome_phy6222/source/sensors.c

@@ -4,7 +4,7 @@
 */
 
 #include "config.h"
-#include "sensor.h"
+#include "sensors.h"
 
 measured_data_t measured_data;
 

bthome_phy6222/source/sensors.h

@@ -1,5 +1,5 @@
 /*
-	sensor.h
+	sensors.h
 	Author: pvvx
 */
 
@@ -66,7 +66,7 @@
 #define CHT8215_CFG_CONSEC_FQ	0x0006
 #define CHT8215_CFG_ATM			0x0001
 
-#define CHT8315_MID	0x5959
+#define CHT8215_MID	0x5959
 #define CHT8215_VID	0x1582
 
 /* CHT8305 https://github.com/pvvx/pvvx.github.io/blob/master/BTH01/CHT8305.pdf */

bthome_phy6222/source/thb2_main.c

@@ -38,7 +38,7 @@
 #include "thservice.h"
 #include "thb2_peripheral.h"
 #include "bthome_beacon.h"
-#include "sensor.h"
+#include "sensors.h"
 #include "battery.h"
 #include "sbp_profile.h"
 #include "ble_ota.h"

bthome_phy6222/source/thservice.c

@@ -20,7 +20,7 @@
 //#include "hiddev.h"
 
 #include "thservice.h"
-#include "sensor.h"
+#include "sensors.h"
 /*********************************************************************
 	MACROS
 */

bthome_phy6222/web/PHY62x2BTHome.html

@@ -1860,7 +1860,7 @@ function ShowGrf(temp, humi) {
 </div>
 
 <div id="tabUtils" class="tabcontent">
-  <div id="divDygraph"></div>
+  <div align="center" id="divDygraph">Ожидание двух измерений. Notify замеров должен быть включен!</div>
   <div id="labelsDiv"></div>
   <p><a href="GraphMemo.html" target="_blank">Memo Graph</a> - График истории замеров</p>
 </div>