Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -37,4 +37,5 @@ configMemory.bin
# MSVC
enc_temp_folder/**

*.su
*.su
/.idea/**
8 changes: 8 additions & 0 deletions docs/json/channelTypes.json
Original file line number Diff line number Diff line change
Expand Up @@ -487,6 +487,14 @@
"file": "new_pins.h",
"driver": ""
},
{
"name": "EnergyImport_kWh_div1000",
"title": "TODO",
"descr": "TODO",
"enum": "ChType_EnergyImport_kWh_div1000",
"file": "new_pins.h",
"driver": ""
},
{
"name": "Max",
"title": "TODO",
Expand Down
8 changes: 8 additions & 0 deletions docs/json/ioRoles.json
Original file line number Diff line number Diff line change
Expand Up @@ -654,5 +654,13 @@
"enum": "IOR_Total_Options",
"file": "new_pins.h",
"driver": ""
},
{
"name": "HLW8112_SCSN",
"title": "HLW8112 SCSN Pin",
"descr": "SCSN pin for HLW8112 SPI energy measuring devices. ",
"enum": "IOR_BHLW8112_SCSN",
"file": "new_pins.h",
"driver": "HLW8112SPI"
}
]
1 change: 1 addition & 0 deletions platforms/obk_main.mk
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,7 @@ OBKM_SRC += $(OBK_SRCS)driver/drv_freeze.c
OBKM_SRC += $(OBK_SRCS)driver/drv_gn6932.c
OBKM_SRC += $(OBK_SRCS)driver/drv_hd2015.c
OBKM_SRC += $(OBK_SRCS)driver/drv_hgs02.c
OBKM_SRC += $(OBK_SRCS)driver/drv_hlw8112.c
OBKM_SRC += $(OBK_SRCS)driver/drv_ht16k33.c
OBKM_SRC += $(OBK_SRCS)driver/drv_httpButtons.c
OBKM_SRC += $(OBK_SRCS)driver/drv_hue.c
Expand Down
Loading
Loading