diff --git a/.github/workflows/workflow.yaml b/.github/workflows/workflow.yaml index 05855568e..261a100bc 100644 --- a/.github/workflows/workflow.yaml +++ b/.github/workflows/workflow.yaml @@ -220,6 +220,8 @@ jobs: variant: irRemoteESP - platform: OpenBK7231N variant: sensors + - platform: OpenBK7231N + variant: hlw8112 - platform: OpenBL602 variant: berry diff --git a/Makefile b/Makefile index 5a7f48c51..7af48ab6c 100644 --- a/Makefile +++ b/Makefile @@ -27,6 +27,8 @@ else ifeq ($(VARIANT),irRemoteESP) OBK_VARIANT = 4 else ifeq ($(VARIANT),sensors) OBK_VARIANT = 5 +else ifeq ($(VARIANT),hlw8112) +OBK_VARIANT = 6 else ifeq ($(VARIANT),2M) OBK_VARIANT = 1 ESP_FSIZE = 2MB diff --git a/src/obk_config.h b/src/obk_config.h index 19265b98f..e58dcf8c2 100644 --- a/src/obk_config.h +++ b/src/obk_config.h @@ -10,6 +10,7 @@ #define OBK_VARIANT_POWERMETERING 3 #define OBK_VARIANT_IRREMOTEESP 4 #define OBK_VARIANT_SENSORS 5 +#define OBK_VARIANT_HLW8112 6 #define OBK_VARIANT_ESP2M 1 #define OBK_VARIANT_ESP4M 2 #define OBK_VARIANT_ESP2M_BERRY 3 @@ -292,9 +293,6 @@ #define NEW_TCP_SERVER 1 #endif -#if PLATFORM_BK7231N -#define ENABLE_DRIVER_HLW8112SPI 0 -#endif // ENABLE_I2C_ is a syntax for // our I2C system defines for drv_i2c_main.c // #define ENABLE_I2C_ADS1115 1 @@ -305,7 +303,7 @@ #define ENABLE_OBK_BERRY 1 #endif -#if (OBK_VARIANT == OBK_VARIANT_TUYAMCU || OBK_VARIANT == OBK_VARIANT_POWERMETERING || OBK_VARIANT == OBK_VARIANT_IRREMOTEESP) +#if (OBK_VARIANT == OBK_VARIANT_TUYAMCU || OBK_VARIANT == OBK_VARIANT_POWERMETERING || OBK_VARIANT == OBK_VARIANT_IRREMOTEESP || OBK_VARIANT == OBK_VARIANT_HLW8112) #undef ENABLE_DRIVER_LED #undef ENABLE_I2C #undef ENABLE_DRIVER_BATTERY @@ -346,6 +344,14 @@ #define ENABLE_DRIVER_DS1820_FULL 1 #endif +#if (OBK_VARIANT == OBK_VARIANT_HLW8112) +#define ENABLE_DRIVER_HLW8112SPI 1 +#undef ENABLE_DRIVER_BL0937 +#undef ENABLE_DRIVER_BL0942 +#undef ENABLE_DRIVER_BL0942SPI +#undef ENABLE_DRIVER_CSE7766 +#endif + #elif PLATFORM_LN882H //#define ENABLE_SEND_POSTANDGET 1