sascha/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2025-10-30 22:53:59 +00:00
Code Issues Releases Wiki Activity

enable_gnss and platform validate

Browse Source
This commit is contained in:
oarcher
2024-08-06 01:39:03 +02:00
parent 9fa6db28eb
commit d33207bda7
2 changed files with 17 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
esphome/components/modem/__init__.py
View File

@@ -20,6 +20,7 @@ from esphome.const import (
CONF_USERNAME, CONF_USERNAME,
) )
from esphome.core import coroutine_with_priority from esphome.core import coroutine_with_priority
import esphome.final_validate as fv
_LOGGER = logging.getLogger(__name__) _LOGGER = logging.getLogger(__name__)
@@ -29,6 +30,7 @@ AUTO_LOAD = ["network", "watchdog"]
# following should be removed if conflicts are resolved (so we can have a wifi ap using modem) # following should be removed if conflicts are resolved (so we can have a wifi ap using modem)
CONFLICTS_WITH = ["captive_portal", "ethernet"] CONFLICTS_WITH = ["captive_portal", "ethernet"]
CONF_MODEM = "modem"
CONF_PIN_CODE = "pin_code" CONF_PIN_CODE = "pin_code"
CONF_APN = "apn" CONF_APN = "apn"
CONF_DTR_PIN = "dtr_pin" CONF_DTR_PIN = "dtr_pin"
@@ -37,6 +39,7 @@ CONF_POWER_PIN = "power_pin"
CONF_INIT_AT = "init_at" CONF_INIT_AT = "init_at"
CONF_ON_NOT_RESPONDING = "on_not_responding" CONF_ON_NOT_RESPONDING = "on_not_responding"
CONF_ENABLE_CMUX = "enable_cmux" CONF_ENABLE_CMUX = "enable_cmux"
CONF_ENABLE_GNSS = "enable_gnss"
MODEM_MODELS = ["BG96", "SIM800", "SIM7000", "SIM7600", "GENERIC"] MODEM_MODELS = ["BG96", "SIM800", "SIM7000", "SIM7600", "GENERIC"]
MODEM_MODELS_POWER = { MODEM_MODELS_POWER = {
@@ -78,6 +81,7 @@ CONFIG_SCHEMA = cv.All(
cv.Optional(CONF_INIT_AT): cv.All(cv.ensure_list(cv.string)), cv.Optional(CONF_INIT_AT): cv.All(cv.ensure_list(cv.string)),
cv.Optional(CONF_ENABLE_ON_BOOT, default=True): cv.boolean, cv.Optional(CONF_ENABLE_ON_BOOT, default=True): cv.boolean,
cv.Optional(CONF_ENABLE_CMUX, default=False): cv.boolean, cv.Optional(CONF_ENABLE_CMUX, default=False): cv.boolean,
cv.Optional(CONF_ENABLE_GNSS, default=False): cv.boolean,
cv.Optional(CONF_ON_NOT_RESPONDING): automation.validate_automation( cv.Optional(CONF_ON_NOT_RESPONDING): automation.validate_automation(
{ {
cv.GenerateID(CONF_TRIGGER_ID): cv.declare_id( cv.GenerateID(CONF_TRIGGER_ID): cv.declare_id(
@@ -103,6 +107,15 @@ CONFIG_SCHEMA = cv.All(
) )
def final_validate_platform(config):
if modem_config := fv.full_config.get().get(CONF_MODEM, None):
if not modem_config[CONF_ENABLE_CMUX]:
raise cv.Invalid(
f"'{CONF_MODEM}' platform require '{CONF_ENABLE_CMUX}' to be 'true'."
)
return config
def _final_validate(config): def _final_validate(config):
# if config.get(CONF_POWER_PIN, None) and not config.get(CONF_STATUS_PIN, None): # if config.get(CONF_POWER_PIN, None) and not config.get(CONF_STATUS_PIN, None):
# raise cv.Invalid( # raise cv.Invalid(
@@ -170,6 +183,9 @@ async def to_code(config):
if config[CONF_ENABLE_CMUX]: if config[CONF_ENABLE_CMUX]:
cg.add(var.enable_cmux()) cg.add(var.enable_cmux())
if config[CONF_ENABLE_GNSS]:
cg.add(var.enable_gnss())
if init_at := config.get(CONF_INIT_AT, None): if init_at := config.get(CONF_INIT_AT, None):
for cmd in init_at: for cmd in init_at:
cg.add(var.add_init_at_command(cmd)) cg.add(var.add_init_at_command(cmd))

1
tests/components/modem/test.esp32-idf.yaml
View File

@@ -13,6 +13,7 @@ modem:
pin_code: "0000" pin_code: "0000"
enable_on_boot: True enable_on_boot: True
enable_cmux: False enable_cmux: False
enable_gnss: False
init_at: init_at:
- AT - AT
on_not_responding: on_not_responding: