restart V12

This commit is contained in:
Yunhorn 2023-10-15 17:19:26 +08:00
parent f48b29aa3b
commit 7daadf926a
1 changed files with 2 additions and 168 deletions

View File

@ -47,94 +47,9 @@
* @brief This is the list of Yunhorn STS products to be used in ALL product config
*/
/** YUNHORN SMARTOILETS OCCUPANCY PRODUCTS **/
/*#define YUNHORN_STS_O1_ENABLED */
/*#define YUNHORN_STS_O2_ENABLED */
/*#define YUNHORN_STS_O3_ENABLED */
/*#define YUNHORN_STS_O4_ENABLED */
/*#define YUNHORN_STS_O5_ENABLED */
/*#define YUNHORN_STS_O6_ENABLED */
/*#define YUNHORN_STS_O7_ENABLED */
/*#define YUNHORN_STS_O8_ENABLED */
/*#define YUNHORN_STS_O9_ENABLED */
/*#define YUNHORN_STS_O10_ENABLED */
/** YUNHORN SMARTOILETS ENVIRONMENT PRODUCTS **/
/*#define YUNHORN_STS_E1_ENABLED */
/*#define YUNHORN_STS_E2_ENABLED */
/*#define YUNHORN_STS_E3_ENABLED */
/*#define YUNHORN_STS_E4_ENABLED */
/*#define YUNHORN_STS_E5_ENABLED */
/*#define YUNHORN_STS_E6_ENABLED */
/** YUNHORN SMARTOILETS PEOPLE COUNTING PRODUCTS **/
/*#define YUNHORN_STS_P1_ENABLED */
/*#define YUNHORN_STS_P2_ENABLED */
/*#define YUNHORN_STS_P3_ENABLED */
/*#define YUNHORN_STS_P4_ENABLED */
/*#define YUNHORN_STS_P5_ENABLED */
/*#define YUNHORN_STS_P6_ENABLED */
/** YUNHORN SMARTOILETS CLEANSING RESOUCES LEVEL PRODUCTS **/
/*#define YUNHORN_STS_R1_ENABLED */
/*#define YUNHORN_STS_R2_ENABLED */
/*#define YUNHORN_STS_R3_ENABLED */
/*#define YUNHORN_STS_R4_ENABLED */
/*#define YUNHORN_STS_R5_ENABLED */
/*#define YUNHORN_STS_R6_ENABLED */
/*#define YUNHORN_STS_R7_ENABLED */
/*#define YUNHORN_STS_R8_ENABLED */
/** YUNHORN SMARTOILETS MECHNICAL REACTURAL PRODUCTS **/
/*#define YUNHORN_STS_M1_ENABLED */
/*#define YUNHORN_STS_M2_ENABLED */
/*#define YUNHORN_STS_M3_ENABLED */
/*#define YUNHORN_STS_M4_ENABLED */
/*#define YUNHORN_STS_M5_ENABLED */
/*#define YUNHORN_STS_M6_ENABLED */
#define YUNHORN_STS_M7_ENABLED
/*#define YUNHORN_STS_M8_ENABLED */
/*#define YUNHORN_STS_M9_ENABLED */
//#define YUNHORN_STS_M10_ENABLED
/** YUNHORN SMARTOILETS DIPLAY AND SMART PANEL PRODUCTS **/
/*#define YUNHORN_STS_D1_ENABLED */
/*#define YUNHORN_STS_D2_ENABLED */
/*#define YUNHORN_STS_D3_ENABLED */
/*#define YUNHORN_STS_D4_ENABLED */
/*#define YUNHORN_STS_D5_ENABLED */
/*#define YUNHORN_STS_D6_ENABLED */
/*#define YUNHORN_STS_D7_ENABLED */
/*#define YUNHORN_STS_D8_ENABLED */
/** YUNHORN SMARTOILETS DIGITAL SIGNAGE PRODUCTS **/
/*#define YUNHORN_STS_F1_ENABLED */
/*#define YUNHORN_STS_F2_ENABLED */
/*#define YUNHORN_STS_F3_ENABLED */
/*#define YUNHORN_STS_F4_ENABLED */
/*#define YUNHORN_STS_F5_ENABLED */
/*#define YUNHORN_STS_F6_ENABLED */
/*#define YUNHORN_STS_F7_ENABLED */
/*#define YUNHORN_STS_F8_ENABLED */
/*#define YUNHORN_STS_F9_ENABLED */
/*#define YUNHORN_STS_F10_ENABLED */
/** YUNHORN SMARTOILETS CONNECTIVITY AND GATEWAY PRODUCTS **/
/*#define YUNHORN_STS_N1_ENABLED */
/*#define YUNHORN_STS_N2_ENABLED */
/*#define YUNHORN_STS_N3_ENABLED */
/*#define YUNHORN_STS_N4_ENABLED */
/*#define YUNHORN_STS_N5_ENABLED */
/*#define YUNHORN_STS_N6_ENABLED */
/*#define YUNHORN_STS_N7_ENABLED */
/*#define YUNHORN_STS_N8_ENABLED */
/** Includes ---------------------------------------------------------
@ -142,78 +57,10 @@
* LORA-WAN MESSAGE UPLINK DATA PORTS AND HEARTBEAT PORTS DEFINATION
*/
//#define YUNHORN_STS_O1_LORA_APP_DATA_PORT 4U
//#define YUNHORN_STS_O1_LORA_APP_HTBT_PORT 5U
//#define YUNHORN_STS_O2_LORA_APP_DATA_PORT 4U
//#define YUNHORN_STS_O2_LORA_APP_HTBT_PORT 5U
//#define YUNHORN_STS_O3_LORA_APP_DATA_PORT 4U
//#define YUNHORN_STS_O3_LORA_APP_HTBT_PORT 5U
//#define YUNHORN_STS_O4_LORA_APP_DATA_PORT 56U
//#define YUNHORN_STS_O4_LORA_APP_HTBT_PORT 57U
//#define YUNHORN_STS_O5_LORA_APP_DATA_PORT 4U
//#define YUNHORN_STS_O5_LORA_APP_HTBT_PORT 5U
//#define YUNHORN_STS_E1_LORA_APP_DATA_PORT 102U
//#define YUNHORN_STS_E1_LORA_APP_HTBT_PORT 103U
//#define YUNHORN_STS_E2_LORA_APP_DATA_PORT 101U
//#define YUNHORN_STS_E2_LORA_APP_HTBT_PORT 108U
//#define YUNHORN_STS_E3_LORA_APP_DATA_PORT 00U
//#define YUNHORN_STS_E3_LORA_APP_HTBT_PORT 00U
//#define YUNHORN_STS_E4_LORA_APP_DATA_PORT 70U
//#define YUNHORN_STS_E4_LORA_APP_HTBT_PORT 71U
//#define YUNHORN_STS_R0_LORA_APP_DATA_PORT 11U
//#define YUNHORN_STS_R0_LORA_APP_HTBT_PORT 11U
//#define YUNHORN_STS_R1_LORA_APP_DATA_PORT 57U
//#define YUNHORN_STS_R1_LORA_APP_HTBT_PORT 57U
//#define YUNHORN_STS_R2_LORA_APP_DATA_PORT 58U
//#define YUNHORN_STS_R2_LORA_APP_HTBT_PORT 58U
//#define YUNHORN_STS_R3_LORA_APP_DATA_PORT 7U
//#define YUNHORN_STS_R3_LORA_APP_HTBT_PORT 8U
//#define YUNHORN_STS_R4_LORA_APP_DATA_PORT 8U
//#define YUNHORN_STS_R4_LORA_APP_HTBT_PORT 8U
//#define YUNHORN_STS_R5_LORA_APP_DATA_PORT 11U
//#define YUNHORN_STS_R5_LORA_APP_HTBT_PORT 11U
//#define YUNHORN_STS_M1_LORA_APP_DATA_PORT 6U
//#define YUNHORN_STS_M1_LORA_APP_HTBT_PORT 6U
//#define YUNHORN_STS_M2_LORA_APP_DATA_PORT 59U
//#define YUNHORN_STS_M2_LORA_APP_HTBT_PORT 219U
//#define YUNHORN_STS_M3_LORA_APP_DATA_PORT 9U
//#define YUNHORN_STS_M3_LORA_APP_HTBT_PORT 9U
//#define YUNHORN_STS_M4_LORA_APP_DATA_PORT 12U
//#define YUNHORN_STS_M4_LORA_APP_HTBT_PORT 12U
//#define YUNHORN_STS_M5_LORA_APP_DATA_PORT 8U
//#define YUNHORN_STS_M5_LORA_APP_HTBT_PORT 8U
//#define YUNHORN_STS_M6_LORA_APP_DATA_PORT 219U
//#define YUNHORN_STS_M6_LORA_APP_HTBT_PORT 219U
//#define YUNHORN_STS_M8_LORA_APP_DATA_PORT 55U
//#define YUNHORN_STS_M8_LORA_APP_HTBT_PORT 55U
//#define YUNHORN_STS_M9_LORA_APP_DATA_PORT 16U
//#define YUNHORN_STS_M9_LORA_APP_HTBT_PORT 16U
//#define YUNHORN_STS_M10_LORA_APP_DATA_PORT 9U
//#define YUNHORN_STS_M10_LORA_APP_HTBT_PORT 9U
#ifdef YUNHORN_STS_E4_ENABLED
//#include "yunhorn_sts_e4_conf.h"
#define senddataport YUNHORN_STS_E4_LORA_APP_DATA_PORT
#define sendhtbtport YUNHORN_STS_E4_LORA_APP_HTBT_PORT
#endif /* YUNHORN_STS_E4_ENABLED */
#ifdef YUNHORN_STS_R0_ENABLED
//#include "yunhorn_sts_e4_conf.h"
#define senddataport YUNHORN_STS_R0_LORA_APP_DATA_PORT
#define sendhtbtport YUNHORN_STS_R0_LORA_APP_HTBT_PORT
#endif /* YUNHORN_STS_R0_ENABLED */
#ifdef YUNHORN_STS_M7_ENABLED
#define MajorVer 23U
#define MinorVer 10U
#define SubMinorVer 14U
#define SubMinorVer 15U
#define FirmwareVersion 3U
#define YUNHORN_STS_M7_NVM_CFG_SIZE 3U
#define YUNHORN_STS_M7_CFG_CMD_SIZE 9U
@ -244,17 +91,6 @@
#define MOTION_SENSOR_TIM_HANDLE htim2
#define MOTION_SENSOR_I2C_HANDLE hi2c1
#ifdef USE_OLED_SSD1306
#define SSD1306_I2C_HANDLE hi2c2
#include "ssd1306.h"
#include "ssd1306_tests.h"
#endif
#ifdef USE_TOF_VL53LXX // RETIRED TODO
#define I2C_TIMING_TOF250 0x20303E5D
#define I2C_TIMING 0x20303E5D //DEFAULT FOR I2C TOF
#include "yunhorn_tof.h"
#endif
#ifdef USE_STM32WLE5
#define I2C_TIMING_STANDARD_MODE 0x2000090E //STANDARD MODE 100Khz
@ -279,15 +115,13 @@
// BATTERY PACK STS_BPER_3K, STS_BPER_6K, STS_BPER_19K
// BATTERY PACK STS_BPCR_2K, STS_BPCR_5K, STS_BPCR_9K
#define BAT_CR2032 ((uint32_t) 3000)
#define BAT_CR2450 ((uint32_t) 3000)
#define BAT_CR2477 ((uint32_t) 3000)
#define BAT_LION523450_1000MAH ((uint32_t) 4200)
#define BAT_ER34615_19000AH ((uint32_t) 3600)
#define BAT_ER14505_2P_4800MAH ((uint32_t) 3600)
#define BAT_STS_BOARD_3V3 ((uint32_t) 3300)
#define VDD_BAT BAT_STS_BOARD_3V3
#define VDD_BAT BAT_ER34615_19000AH
/* STM32WL55JC READ/WRITE FLASH ADDRESS AND SIZE
* SECTION START ADDRESS SIZE