Skip to content

Commit e930bd2

Browse files
hlw8112 variant (#1819)
1 parent 1b70310 commit e930bd2

File tree

3 files changed

+14
-4
lines changed

3 files changed

+14
-4
lines changed

.github/workflows/workflow.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -220,6 +220,8 @@ jobs:
220220
variant: irRemoteESP
221221
- platform: OpenBK7231N
222222
variant: sensors
223+
- platform: OpenBK7231N
224+
variant: hlw8112
223225

224226
- platform: OpenBL602
225227
variant: berry

Makefile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@ else ifeq ($(VARIANT),irRemoteESP)
2727
OBK_VARIANT = 4
2828
else ifeq ($(VARIANT),sensors)
2929
OBK_VARIANT = 5
30+
else ifeq ($(VARIANT),hlw8112)
31+
OBK_VARIANT = 6
3032
else ifeq ($(VARIANT),2M)
3133
OBK_VARIANT = 1
3234
ESP_FSIZE = 2MB

src/obk_config.h

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
#define OBK_VARIANT_POWERMETERING 3
1111
#define OBK_VARIANT_IRREMOTEESP 4
1212
#define OBK_VARIANT_SENSORS 5
13+
#define OBK_VARIANT_HLW8112 6
1314
#define OBK_VARIANT_ESP2M 1
1415
#define OBK_VARIANT_ESP4M 2
1516
#define OBK_VARIANT_ESP2M_BERRY 3
@@ -292,9 +293,6 @@
292293
#define NEW_TCP_SERVER 1
293294
#endif
294295

295-
#if PLATFORM_BK7231N
296-
#define ENABLE_DRIVER_HLW8112SPI 0
297-
#endif
298296
// ENABLE_I2C_ is a syntax for
299297
// our I2C system defines for drv_i2c_main.c
300298
// #define ENABLE_I2C_ADS1115 1
@@ -305,7 +303,7 @@
305303
#define ENABLE_OBK_BERRY 1
306304
#endif
307305

308-
#if (OBK_VARIANT == OBK_VARIANT_TUYAMCU || OBK_VARIANT == OBK_VARIANT_POWERMETERING || OBK_VARIANT == OBK_VARIANT_IRREMOTEESP)
306+
#if (OBK_VARIANT == OBK_VARIANT_TUYAMCU || OBK_VARIANT == OBK_VARIANT_POWERMETERING || OBK_VARIANT == OBK_VARIANT_IRREMOTEESP || OBK_VARIANT == OBK_VARIANT_HLW8112)
309307
#undef ENABLE_DRIVER_LED
310308
#undef ENABLE_I2C
311309
#undef ENABLE_DRIVER_BATTERY
@@ -346,6 +344,14 @@
346344
#define ENABLE_DRIVER_DS1820_FULL 1
347345
#endif
348346

347+
#if (OBK_VARIANT == OBK_VARIANT_HLW8112)
348+
#define ENABLE_DRIVER_HLW8112SPI 1
349+
#undef ENABLE_DRIVER_BL0937
350+
#undef ENABLE_DRIVER_BL0942
351+
#undef ENABLE_DRIVER_BL0942SPI
352+
#undef ENABLE_DRIVER_CSE7766
353+
#endif
354+
349355
#elif PLATFORM_LN882H
350356

351357
//#define ENABLE_SEND_POSTANDGET 1

0 commit comments

Comments
 (0)