Compare commits

...
Author SHA1 Message Date
J. Nick Koston 17f6225436 [modem] Register the automations with the core helpers
The three state triggers become callback automations on add_on_state_callback,
the enable, disable and send_at actions and the two conditions are apply
registrations, so automation.h and its five classes go. Optional pins and
values go through cg.add_pin and cg.add_optional, the connect timeout gets a
numeric scheduler id, loop() reads the cached loop time, and the username and
password setters that no schema key or C++ setter backed are dropped.

esp32-idf test config: RAM 24948 -> 24908 bytes, flash 361403 -> 360987 bytes.
2026-10-21 14:59:47 -10:00
J. Nick Koston 1d866e147e [modem] Satisfy the new lints and use the codegen helpers 2026-10-21 14:43:41 -10:00
J. Nick Koston 025cf4647f Merge remote-tracking branch 'origin/dev' into s2/gsm 2026-10-21 14:41:48 -10:00
J. Nick Koston 534496bd89 Merge remote-tracking branch 'origin/dev' into s2/gsm 2026-10-21 14:28:54 -10:00
J. Nick Koston 15bca8614a Merge branch 'dev' into gsm 2026-10-11 22:06:40 -10:00
J. Nick Koston 7746f5d483 Merge branch 'dev' into gsm 2026-09-26 15:46:25 +01:00
oarcher 2668bb00a4 Merge branch 'dev' into gsm 2026-08-18 18:23:34 +02:00
oarcher dff224077c fallback 2026-08-18 18:21:52 +02:00
oarcher fe17af632c explicit fallthrough 2026-06-27 15:07:49 +02:00
oarcher 2318e7baed bump esp_modem 2.0.2 2026-06-27 14:55:50 +02:00
oarcher 114238802a Merge branch 'dev' into gsm 2026-06-27 14:51:59 +02:00
oarcher b5749249c8 Merge branch 'dev' into gsm 2026-06-22 11:09:16 +02:00
oarcher b19b09378b Merge branch 'dev' into gsm 2026-06-10 11:48:37 +02:00
oarcher a115220bf8 centralize network initialization for ESP32 (#14012) 2026-05-31 22:00:40 +02:00
oarcher c7d534f8ca use cv.sensitive for pin code 2026-05-31 21:53:46 +02:00
oarcher ce82777269 Merge branch 'dev' into gsm 2026-05-31 21:46:34 +02:00
oarcher 7a1efc879d [clang-tidy] Concatenate nested namespaces 2026-05-08 13:27:38 +02:00
oarcher 81e4dd13e1 Merge branch 'dev' into gsm 2026-05-08 13:13:27 +02:00
oarcher c2b061056e update CODEOWNERS 2026-05-04 22:37:44 +02:00
oarcher 5b6d2c26c1 Merge branch 'dev' into gsm 2026-05-04 22:36:37 +02:00
oarcher 8f95e44653 bump esp_modem to 2.0.1 2026-05-03 18:06:03 +02:00
oarcher 1bec107346 Merge branch 'dev' into gsm 2026-05-03 18:05:03 +02:00
oarcher 83eb5f37bf update from #13885 2026-04-25 23:15:44 +02:00
oarcher a98f0e66be Merge branch 'dev' into gsm 2026-04-25 23:03:43 +02:00
oarcher 397b7b4ec6 fix test 2026-03-27 21:54:59 +01:00
oarcher e3bf673296 fix change baud rate 2026-03-27 21:47:10 +01:00
oarcher 2f265b92d2 Merge branch 'dev' into gsm 2026-03-27 20:30:47 +01:00
oarcher 5c2379dfd1 less states and triggers 2026-03-27 20:27:12 +01:00
oarcher 98e6d18bb3 externalise to nulluart 2026-03-24 21:21:19 +01:00
oarcher e516cce2c1 remove unused states 2026-03-24 19:31:27 +01:00
oarcher 04097ac08e no more old_state for callbacks 2026-03-12 22:38:50 +01:00
oarcher 1ba8183cf4 refactor state machine 2026-03-12 22:20:32 +01:00
oarcher addf571824 externalize enable_debug 2026-03-12 08:29:36 +01:00
oarcher 83886e1997 simplify state machine 2026-03-11 21:57:30 +01:00
oarcher 1df7986fb1 removed final validate 2026-03-11 19:52:24 +01:00
oarcher e38a473ac3 removed useless reset action 2026-03-11 19:45:52 +01:00
oarcher 129427d24c modem sync loop fix 2026-03-11 13:21:02 +01:00
oarcher 89f59efc84 arduino clang 2026-03-11 11:36:07 +01:00
oarcher afa1b22ca4 always use cmux 2026-03-11 00:26:44 +01:00
oarcher 7ed64156f4 update codeowners 2026-03-11 00:14:19 +01:00
oarcher 689cb4729d removed to_string() 2026-03-11 00:11:18 +01:00
oarcher 106d143e4a synchronous register_action 2026-03-11 00:05:58 +01:00
oarcher 9f832a900d fix uart flush return type 2026-03-11 00:05:23 +01:00
oarcher 9f79961ed1 fix tests from previous update 2026-03-10 23:58:59 +01:00
oarcher ae106d3550 fix tests from last updates 2026-03-10 23:48:15 +01:00
oarcher 348fe63013 Merge branch 'dev' into gsm 2026-03-10 23:36:00 +01:00
oarcher 7ee10adf5e externalize modem platform (PR #14683) 2026-03-10 23:31:42 +01:00
oarcher ad3a91b9b0 removed nmea 2026-03-10 21:06:20 +01:00
oarcher 45b66567b2 externalize wifi ap dhcp server restart 2026-03-10 21:00:36 +01:00
oarcher c405ae82ee removed power handling 2026-03-10 12:00:30 +01:00
oarcher 35e9bd9b26 on_sync callback 2026-03-08 20:41:43 +01:00
oarcher c4c26a8ae6 add text_sensor dep 2026-03-08 02:35:52 +01:00
oarcher b19fd6f91f defer urc text sensor 2026-03-07 18:35:10 +01:00
oarcher e37833af37 implement UARTComponent (to feed nmea to gps) 2026-03-07 15:53:35 +01:00
oarcher 8e38fc1d2f urc handler as text sensor 2026-03-07 14:47:55 +01:00
oarcher c531efb5e0 move to USE_ESP32 2026-03-06 23:36:58 +01:00
oarcher ee7bec52b1 nmea method fix 2026-03-06 20:29:12 +01:00
oarcher b47a9887b3 apply clang suggest 2026-03-06 18:42:29 +01:00
oarcher d9de2b8848 fix include 2026-03-06 18:22:59 +01:00
oarcher acb9f4817e moved to USE_ESP32 2026-03-06 18:14:50 +01:00
oarcher d4f2daa9bd Merge branch 'dev' into gsm 2026-03-06 17:21:59 +01:00
oarcher 1701947ab2 split to nmea base component 2026-03-06 16:28:46 +01:00
oarcher 6e7fe95f87 network include 2026-03-05 20:36:20 +01:00
oarcher 856bbff6e9 nmea on_update 2026-03-05 20:35:55 +01:00
oarcher c3129c5f48 Merge branch 'dev' into gsm 2026-03-05 19:40:03 +01:00
oarcher acae3bf94a log CGNSSINFO token count 2026-02-25 19:41:18 +01:00
oarcher 9345718b55 dynamic gnss parser 2026-02-23 21:57:06 +01:00
oarcher bd211f3794 fix gnss parser for empty token 2026-02-23 12:29:48 +01:00
oarcher e5d7a6b7a6 CGNSSINFO17 parser 2026-02-22 23:29:45 +01:00
oarcher f597a66ca6 allow gnss command and parser in yaml 2026-02-22 22:58:32 +01:00
oarcher 72e5337ffa update int to size_t for uart 2026-02-15 14:22:29 +01:00
oarcher f4c6ed0339 Merge branch 'dev' into gsm 2026-02-15 14:20:26 +01:00
oarcher 6ee6930eb0 refactor state machine 2026-02-10 12:55:34 +01:00
Olivier ARCHER 965ede31ad Merge pull request #6 from Rapsssito/multiple-interfaces
fix: simplify power_pin configuration
2026-02-10 12:17:02 +01:00
Rapsssito 90dd532a4c Return to original 2026-02-09 23:44:47 +01:00
Rapsssito efc049c0f3 Fix typo 2026-02-09 23:34:43 +01:00
Rapsssito cfecf1a538 Revert changes unrelated to modem 2026-02-09 23:05:23 +01:00
Rapsssito d09333c9e1 Remove unnecesary const 2026-02-09 15:53:51 +01:00
Rapsssito 6499ebe32e Simplify power_pin 2026-02-09 15:45:16 +01:00
Rapsssito f70296ef59 fix: allow multiple interfaces 2026-02-09 14:15:00 +01:00
Olivier ARCHER 9446601c83 Merge pull request #5 from Rapsssito/gsm-power-inverse
fix: improve enabling protocol without status pin
2026-02-09 12:36:00 +01:00
Olivier ARCHER 322fed1599 short timeout to check if the modem respond on UNDEF state 2026-02-09 12:35:15 +01:00
Rapsssito 24fd685f13 Remove return 2026-02-07 13:47:31 +01:00
Rapsssito 75fb0daca7 Fix lint 2026-02-07 13:40:34 +01:00
Rapsssito 83a9921784 Improve IF flow 2026-02-07 13:24:12 +01:00
Rapsssito e86b12ac84 Set modem to use hardware flow control too 2026-02-07 13:10:22 +01:00
Rapsssito 7627377d20 Add additional check for enabling 2026-02-07 13:01:53 +01:00
Rapsssito fd3e42c1d1 Use timeouts to not block the loop, reduce the risk of WDT 2026-02-07 11:45:11 +01:00
oarcher bfc8185dc8 reconfigure dhcp server after connect 2026-02-07 01:08:08 +01:00
oarcher 1d41d8dcd5 Merge branch 'dev' into gsm 2026-02-06 22:46:06 +01:00
oarcher 88e2144421 urc log 2026-02-06 22:44:27 +01:00
Rapsssito 30cfa0f7d6 Simplify code 2026-02-06 17:44:45 +01:00
Rapsssito bfbdb57a6e Aggregate power pin config 2026-02-06 17:43:40 +01:00
oarcher b9405a4ddc update clang-tidy.hash 2026-02-04 23:34:42 +01:00
oarcher 6fe880d2bf Merge remote-tracking branch 'refs/remotes/origin/gsm' into gsm 2026-02-04 23:31:41 +01:00
oarcher 3fbff42e21 urc logging 2026-02-04 23:27:47 +01:00
oarcher 026ae244d8 Merge branch 'dev' into gsm 2026-02-04 23:18:33 +01:00
Olivier ARCHER 1ecd252975 Merge pull request #4 from Rapsssito/gsm-hardware-flow
feat: add hardware flow control
2026-02-04 11:49:04 +01:00
Rodrigo MartínandOlivier ARCHER 202e91a7d0 Update esphome/components/modem/modem_handler.cpp
Co-authored-by: Olivier ARCHER <olivier.archer@gmail.com>
2026-02-02 09:24:16 +01:00
oarcher 6297be44de log network_registration_state 2026-01-31 18:25:32 +01:00
oarcher c8425de4da fix some deprecation 2026-01-30 19:54:04 +01:00
oarcher b5c0fd8ec2 allow use_address 2026-01-30 19:54:04 +01:00
Rapsssito 34189d357a Make the linter happy 2026-01-28 13:20:43 +01:00
Rapsssito 583eb2d5b4 feat: add hardware flow control 2026-01-28 13:13:00 +01:00
Rapsssito 6a59c30ef9 Fix unavailable UART 2026-01-28 11:56:18 +01:00
Olivier ARCHER 89920ca3d5 Merge pull request #3 from Rapsssito/gsm-sim7070
feat: add SIM7070 support
2026-01-27 21:05:37 +01:00
Rapsssito 0d27fc3d9d Remove stranded SIM7090 2026-01-27 16:13:25 +01:00
Rapsssito 8768cf4681 feat: add SIM7070 support 2026-01-27 16:09:21 +01:00
oarcher 02bd72a75e Merge branch 'dev' into gsm 2026-01-25 19:57:30 +01:00
oarcher bf4f6501ea clang hash 2025-12-19 00:43:06 +01:00
oarcher cef7b289c3 bump esp_modem 2.0.0 2025-12-19 00:41:37 +01:00
Olivier ARCHER eb8d17f133 Merge branch 'dev' into gsm 2025-12-18 22:36:46 +01:00
oarcher 1b7a6f9201 fix automations, add tests 2025-11-19 16:57:09 +01:00
oarcher 10eb3c6e84 migrate automations, add tests 2025-11-19 00:09:04 +01:00
oarcher dfa6a5c098 clang tidy hash 2025-11-18 19:09:44 +01:00
oarcher f8517d9347 fix return type for use_adress 2025-11-18 19:06:47 +01:00
oarcher e6a4eeff81 include map 2025-11-18 19:06:07 +01:00
oarcher 3102e22613 Merge branch 'dev' into gsm 2025-11-18 18:51:10 +01:00
oarcher c77f0f4c1d bump esp_modem to 1.4.2 2025-11-18 18:29:38 +01:00
oarcher 9829a81064 find available uart port num 2025-09-01 16:10:52 +02:00
oarcher 346490f9be keep dte/dce not null after setup 2025-08-21 12:53:41 +02:00
Olivier ARCHER 9efbd39dce Merge branch 'dev' into gsm 2025-08-16 20:46:26 +02:00
oarcher 0bac32fb6a remove can_proceed 2025-08-16 20:41:49 +02:00
oarcher 10d70ea657 fix nullptr + logs 2025-08-16 20:39:35 +02:00
oarcher 0f6ecc91b0 small delay before pin check 2025-08-16 16:35:04 +02:00
oarcher 0521304f7f lint unused 2025-08-16 12:52:55 +02:00
oarcher 2e83d1bf76 force command mode if needed when syncing 2025-08-16 12:05:51 +02:00
oarcher e3ca47e8d0 handle exit data_mode, allow pin err 2025-08-16 11:09:14 +02:00
oarcher 1022c43797 Merge branch 'dev' into gsm 2025-08-10 20:17:24 +02:00
oarcher 83e8da545c sim7080 gnss support 2025-08-09 20:59:55 +02:00
oarcher df44741085 Merge branch 'dev' into gsm 2025-08-09 17:28:17 +02:00
oarcher 04ad19827c send nmea frames over virtual uart (for gps component) 2025-08-09 17:25:40 +02:00
oarcher c2044addde Delegate nmea analysis to gps componenent 2025-08-04 13:40:12 +02:00
oarcher 0fe5a8b8f5 Enabling state and triggers + some refactor 2025-08-02 21:36:56 +02:00
oarcher d47fb46cd0 Merge remote-tracking branch 'upstream/dev' into gsm 2025-07-26 12:33:40 +02:00
oarcher b88aa4c259 Merge branch 'dev' into gsm 2025-07-24 15:26:19 +02:00
oarcher 73b25cb214 Revert "moved sensors to another PR"
This reverts commit e27948e8cb.
2025-07-22 20:04:42 +02:00
oarcher e27948e8cb moved sensors to another PR 2025-07-22 19:40:29 +02:00
oarcher 94685309a7 Merge remote-tracking branch 'refs/remotes/origin/gsm' into gsm 2025-07-22 18:36:47 +02:00
oarcher 8f00dd44f7 unused includes 2025-07-22 18:35:16 +02:00
Jesse Hills 5924e55307 Merge branch 'dev' into gsm 2025-07-22 07:24:54 +12:00
oarcher a14e52feb5 default cmux to true 2025-07-20 01:28:48 +02:00
oarcher 5e5f5bb2c7 add 'is_enabled()' 2025-07-20 00:49:06 +02:00
oarcher 6ef89a6c68 enabled condition fix 2025-07-20 00:01:53 +02:00
oarcher eb2009e730 is_connected -> connected condition, and othes automation as wifi component 2025-07-19 23:57:52 +02:00
oarcher e802fb1b44 Merge remote-tracking branch 'refs/remotes/origin/gsm' into gsm 2025-07-19 23:29:08 +02:00
oarcher a279b2d094 lint 2025-07-19 23:26:48 +02:00
pre-commit-ci-lite[bot] e164f7a5fe [pre-commit.ci lite] apply automatic fixes 2025-07-19 21:18:46 +00:00
oarcher 3f490d229d split modem component/handler 2025-07-19 23:15:25 +02:00
oarcher c2012f2358 yaml actions and conditions 2025-07-19 17:56:09 +02:00
oarcher 4800d057b6 tx/rx/dte buffer size options 2025-07-19 02:30:19 +02:00
oarcher 1f87d08ef7 on_start_ppp trigger 2025-07-19 02:07:50 +02:00
oarcher 07c205a3e5 check sync if connected and cmux 2025-07-18 22:11:17 +02:00
oarcher 3c804b0b25 ton/toff delay in yaml config 2025-07-18 21:27:57 +02:00
pre-commit-ci-lite[bot] 95c0a56791 [pre-commit.ci lite] apply automatic fixes 2025-07-17 21:17:34 +00:00
oarcher 0d30ae69b8 init seq and state machine 2025-07-17 21:00:18 +02:00
oarcher 0f08d5e117 added sim status to status string 2025-07-16 15:28:01 +02:00
oarcher de084c5ab7 check radio state before pin, and some state machine refactor 2025-07-16 13:02:23 +02:00
oarcher ca82e2d829 warn if safe mode used 2025-07-15 19:19:56 +02:00
oarcher 83d2256ecf clear warning flag on connect and fix retry delay 2025-07-14 20:21:59 +02:00
oarcher c304f0b4e2 simplify send_at 2025-07-14 13:42:47 +02:00
oarcher c79272f739 state machine refactor 2025-07-14 12:33:16 +02:00
oarcher ba7e7e7f7b fix race condition in event handler 2025-07-13 16:02:11 +02:00
oarcher f8bf778b82 Do not disconnect before connect, less verbose logs 2025-07-11 21:15:12 +02:00
oarcher e7be564951 logs messages 2025-07-10 23:21:18 +02:00
oarcher bbade6f7e2 moved sim pin check to state machine 2025-07-10 18:04:17 +02:00
oarcher 0780f3f30b tidy 2025-07-10 02:17:28 +02:00
oarcher 9827c6839d lint 2025-07-10 01:41:06 +02:00
Olivier ARCHER f2b864adc9 Merge branch 'dev' into gsm 2025-07-10 01:32:35 +02:00
oarcher 6f974e908a Improved reliability if no power pin provided 2025-07-10 01:28:50 +02:00
oarcher ad5366c91e removed watchdog 2025-07-09 14:55:06 +02:00
oarcher 1725245aa2 improved stability and reliability 2025-07-09 13:52:03 +02:00
oarcher 4ebd5ac87a Refactors modem component to improve baud rate handling
Updates baud rate configuration to allow for default values and simplifies modem initialization by removing deprecated methods.

Changes logging levels for better clarity during operations and improves power management logic.

Enhances overall modem readiness checks by centralizing sync operations, ensuring more robust detection of modem states.

Removes unused variables and commented-out code, streamlining the codebase for better maintainability.
2025-07-09 11:58:53 +02:00
oarcher 35d5fa96c3 use autodetect mode 2025-07-09 01:11:55 +02:00
oarcher c5b6210845 default baud rate of 115200 and better baud rate recovery 2025-07-07 09:55:53 +02:00
oarcher 1ce46cc47c check status pin before poweron 2025-07-06 19:35:32 +02:00
oarcher f1b26c8304 delay after sim pin 2025-07-06 19:24:34 +02:00
oarcher e1210ebe06 fix status_pin and baud_rate 2025-07-06 19:17:55 +02:00
oarcher be2462bc2e update idf_component 2025-07-05 18:53:44 +02:00
oarcher dc491d5ca0 Merge branch 'dev' into gsm 2025-07-05 18:17:12 +02:00
oarcher 2bdfa915a5 add map include for sensor 2025-07-05 17:43:23 +02:00
oarcher e5c2158d47 watchdog fix 2025-06-12 19:27:37 +02:00
Olivier ARCHER 09c2f79605 Merge branch 'dev' into gsm 2025-06-07 21:38:42 +02:00
oarcher 37e8e4c3df add CONFIG_PPP_SUPPORT for tidy 2025-06-07 19:25:16 +02:00
oarcher 273a6d12b5 bump esp_modem 1.1 -> 1.4 2025-06-07 15:31:37 +02:00
oarcher dc439ba504 Merge branch 'dev' into gsm 2025-06-07 15:06:59 +02:00
oarcher a172a9c6c8 check gnss len 2024-08-28 21:20:36 +02:00
oarcher a159a9f899 is_connected from component state 2024-08-28 21:05:53 +02:00
oarcher f2263e62bf fix empty gnss 2024-08-28 21:02:52 +02:00
oarcher bc7eb17c0b fix pin check 2024-08-28 20:15:11 +02:00
oarcher c166e16911 recover previous baud rate 2024-08-21 21:33:16 +02:00
oarcher f6cc32a39a Merge remote-tracking branch 'upstream/dev' into gsm 2024-08-18 23:04:30 +02:00
oarcher a223f2d66b save/restore state from flash 2024-08-18 22:26:36 +02:00
oarcher 17309fb315 use flush_uart to get long at results 2024-08-17 03:34:42 +02:00
oarcher 8681a5b302 baud rate 2024-08-17 03:33:48 +02:00
oarcher def2be4b83 fix text sensor bad pointer 2024-08-16 17:44:09 +02:00
oarcher 6cbd2af6b4 read gnns state 2024-08-16 17:43:26 +02:00
oarcher 352111b556 update priority 2024-08-16 17:41:48 +02:00
oarcher d164ccd12a better sim error checks 2024-08-16 17:37:15 +02:00
oarcher 6d1a18b2fa Merge remote-tracking branch 'upstream/dev' into gsm 2024-08-15 19:06:31 +02:00
oarcher 24a4845991 signal strength text sensor 2024-08-15 19:05:48 +02:00
oarcher 2c9c6aea30 handle bad connection and reboot_timeout 2024-08-15 19:03:32 +02:00
oarcher 3102f6bfd5 Merge remote-tracking branch 'upstream/dev' into gsm 2024-08-14 22:20:08 +02:00
oarcher 77a30830c7 fix schemas 2024-08-14 22:18:54 +02:00
oarcher 412ba4f60f Merge remote-tracking branch 'upstream/dev' into gsm 2024-08-13 23:30:02 +02:00
oarcher 0b6708ddbe allow reconnect 2024-08-13 23:11:23 +02:00
oarcher c4705967bd health check 2024-08-13 21:50:58 +02:00
oarcher 5982d11ffb improved sync 2024-08-13 21:05:48 +02:00
oarcher faa3b2474e simplify disconnect 2024-08-13 17:55:00 +02:00
oarcher 00f54725e3 on_not_responding nw state cb 2024-08-13 17:24:31 +02:00
oarcher 3a289c8284 debug option 2024-08-13 16:41:27 +02:00
oarcher 67fb79a6e7 fix some gnss isues 2024-08-13 01:24:58 +02:00
oarcher 0b4d2cbe07 use fv.full_config.get().data for final validate 2024-08-12 22:51:05 +02:00
oarcher 685deedfce removed unused options 2024-08-12 22:09:48 +02:00
oarcher 36373e68dd update ber and rssi 2024-08-12 21:54:42 +02:00
oarcher 8824ac14cf faster modem_ready 2024-08-12 20:33:47 +02:00
oarcher 307880bc05 send_at return AtCommandResult 2024-08-12 16:46:31 +02:00
oarcher 60a7ef7408 read modem gnss state 2024-08-12 14:55:37 +02:00
oarcher e1af5bc767 Merge remote-tracking branch 'upstream/dev' into gsm 2024-08-12 11:34:39 +02:00
oarcher 116628bdc6 update test 2024-08-11 18:46:16 +02:00
oarcher 6cd0d8f8c2 Merge remote-tracking branch 'upstream/dev' into gsm 2024-08-11 17:39:43 +02:00
oarcher 181beb0852 gnss as a switch 2024-08-11 17:37:44 +02:00
oarcher 5d8f37aed5 allow nan for gnss 2024-08-08 21:02:26 +02:00
oarcher 3120d0d43a less defines 2024-08-08 20:06:54 +02:00
oarcher 8f948599fa fix speed sensor 2024-08-08 14:35:56 +02:00
oarcher 51aca893da Merge branch 'dev' into gsm 2024-08-07 22:46:09 +02:00
oarcher 1aa2ce8608 add some gnss sensors 2024-08-07 22:38:02 +02:00
oarcher 1256bfdd54 removed status_pin 2024-08-07 01:32:56 +02:00
oarcher e5d520363a update tests 2024-08-07 00:18:46 +02:00
oarcher 5f5afbab2c update codeowners 2024-08-07 00:13:04 +02:00
oarcher 28dd222283 lint 2024-08-07 00:10:03 +02:00
oarcher 4ec62a2be6 sim7670 gnss 2024-08-06 23:59:44 +02:00
oarcher 9bfde3b3ab sensors 2024-08-06 22:47:05 +02:00
oarcher 85324a828e text_sensor 2024-08-06 18:54:28 +02:00
oarcher 3df3c776be gnss power and local watchdog 2024-08-06 18:53:34 +02:00
oarcher 67cce34779 allow debug at commands 2024-08-06 18:52:46 +02:00
oarcher a78885c391 fix send_at return 2024-08-06 01:40:29 +02:00
oarcher d33207bda7 enable_gnss and platform validate 2024-08-06 01:39:03 +02:00
oarcher 9fa6db28eb sync fix 2024-08-06 00:41:17 +02:00
oarcher af3b3c93ef remove some parts that will be handled by sensors 2024-08-05 20:57:18 +02:00
Olivier ARCHER 5b4ccabc17 Merge branch 'dev' into gsm 2024-08-03 02:37:37 +02:00
oarcher a82e07880a network interface ordering, and missing implementation 2024-08-03 00:24:11 +02:00
oarcher 490e13c86c modem info update 2024-08-02 02:06:32 +02:00
oarcher 83c6d8deb0 network type info 2024-08-02 02:05:46 +02:00
oarcher 62fb07e595 refactor 2024-08-01 23:00:16 +02:00
oarcher 00b9e83d0e filter state cb from previous state 2024-08-01 15:58:02 +02:00
oarcher 1b9c9e9ccb code clean 2024-08-01 04:28:14 +02:00
oarcher 4b0ae086dc user power states 2024-08-01 03:35:27 +02:00
oarcher 5bc6cd8a17 modem_sync and start/stop ppp 2024-08-01 01:11:15 +02:00
oarcher 72119838d9 removed disconnecting state 2024-07-31 23:21:52 +02:00
oarcher c9f1ee0a62 removed connecting state 2024-07-31 21:43:47 +02:00
oarcher 4f74cec977 wait for network attached before trying to connect 2024-07-31 20:53:06 +02:00
oarcher 4e6da9f34d recover from alternate cmux state 2024-07-31 19:49:43 +02:00
oarcher e4d6f5e58d use new watchdog component 2024-07-30 14:46:27 +02:00
oarcher 00aab9ce8d Merge remote-tracking branch 'refs/remotes/origin/gsm' into gsm 2024-07-30 13:14:37 +02:00
Olivier ARCHER 8061104496 Merge branch 'esphome:dev' into gsm 2024-07-30 13:10:24 +02:00
oarcher 40e6bb16d0 prepare PR#4091 merge 2024-07-30 00:56:22 +02:00
oarcher 8175da82ee code clean and reset default values 2024-07-29 23:56:28 +02:00
oarcher c4c96e4bc9 allow wifi AP & increase buffer size 2024-07-28 18:00:46 +02:00
Olivier ARCHER 4d348aae3c Merge branch 'esphome:dev' into gsm 2024-07-27 01:30:15 +02:00
oarcher acd2a9bf54 lost ip event trigger 2024-07-27 00:42:08 +02:00
oarcher 71725ab4c4 CMUX disabled by default 2024-07-26 23:59:11 +02:00
oarcher 90ec353d85 optionnal cmux WIP 2024-07-26 22:40:45 +02:00
oarcher 34d5445e27 allow power_pin without status_pin 2024-07-26 20:39:37 +02:00
oarcher 98ba007de3 use define for to_code + more conf validation 2024-07-23 15:13:09 +02:00
oarcher b8c965b3fc removed flight pin 2024-07-23 02:44:40 +02:00
oarcher 1096bc264f model power delay 2024-07-23 02:19:10 +02:00
oarcher 5c0b7222ec use timeout cb for long power delay 2024-07-23 01:16:51 +02:00
oarcher d2c26e95bd update test 2024-07-23 00:44:20 +02:00
oarcher 0ada4af5cf removed health check 2024-07-23 00:29:06 +02:00
oarcher adad7469e5 common exit_cmux_ 2024-07-23 00:26:23 +02:00
oarcher 971fbd6d26 poweroff and poweron 2024-07-22 23:51:34 +02:00
oarcher 7b5fe70cf6 power & status WIP 2024-07-22 18:49:17 +02:00
oarcher ca55ed7b4b fix printf type 2024-07-22 15:10:29 +02:00
oarcher 171213fe38 disable on sim error 2024-07-22 01:09:43 +02:00
oarcher 900a306eda better CMUX handling 2024-07-22 00:33:47 +02:00
oarcher f6e67462e7 log watchdog 2024-07-21 22:21:03 +02:00
oarcher d0cefb4a08 prepare_sim_ 2024-07-21 18:05:37 +02:00
oarcher 5321163e6b update tests 2024-07-21 03:33:03 +02:00
oarcher a814ea337f gpio pins numbering 2024-07-21 03:17:04 +02:00
oarcher 6d2e6eb15a lint 2024-07-21 02:29:07 +02:00
oarcher cd363d104e lint 2024-07-21 02:21:56 +02:00
oarcher d85c645c23 code clean 2024-07-21 02:15:02 +02:00
oarcher 61628f6cdd blocking on_not_responding cb 2024-07-21 01:13:26 +02:00
oarcher 87244f6196 test fix 2024-07-18 20:38:51 +02:00
oarcher 492ea38d92 fix unreachable wdt 2024-07-18 19:09:56 +02:00
oarcher a8e43335ae better states handling + enable/disable 2024-07-18 18:41:52 +02:00
oarcher 290952fd9c on_disconnect callback 2024-07-17 20:27:25 +02:00
oarcher a702097b1f on_connect callback 2024-07-17 19:50:36 +02:00
oarcher 2370d5c83d more generic state callback 2024-07-17 18:47:53 +02:00
oarcher eb37215e9f lint 2024-07-17 14:41:27 +02:00
oarcher 671c71c406 disable CONFIG_UART_ISR_IN_IRAM 2024-07-17 14:13:32 +02:00
oarcher 7e09c54490 increase / restore WDT 2024-07-17 13:55:00 +02:00
oarcher 6b377ad1f8 reduced delay 2024-07-17 13:15:37 +02:00
oarcher 7b393e71d4 better send_at 2024-07-17 12:58:50 +02:00
oarcher 521931d0fe code clean 2024-07-17 12:34:05 +02:00
oarcher bd5fd0c12b removed script 2024-07-17 10:35:51 +02:00
oarcher 377c30f72e fix test 2024-07-17 02:07:51 +02:00
oarcher 8095850e83 lint 2024-07-17 00:59:51 +02:00
oarcher 877fb5a144 use esp idf only 2024-07-17 00:31:55 +02:00
oarcher 5bafee43bd nolint delay 2024-07-17 00:15:06 +02:00
oarcher a6baff9085 automation and better DCE recover 2024-07-17 00:08:29 +02:00
Olivier ARCHER 321594ae3d Merge branch 'esphome:dev' into gsm 2024-07-15 14:39:02 +02:00
oarcher c2d3774762 add component conflict handling 2024-07-07 15:02:20 +02:00
oarcher 60840a0286 new test 2024-06-15 02:01:39 +02:00
oarcher 5d0d7c84c0 Sort idf components 2024-06-14 00:53:25 +02:00
oarcher b584d2b81e lint 2024-06-13 17:06:59 +02:00
oarcher 89066c374e add esp_modem to idf_component 2024-06-13 16:35:57 +02:00
Olivier ARCHER 1a72358db2 Merge branch 'dev' into gsm 2024-06-13 14:08:41 +02:00
Olivier ARCHER a43eb1563e lint include idf 2024-06-13 13:44:31 +02:00
oarcher 7ab0776302 nolint 2024-05-31 17:13:59 +02:00
oarcher ac1bd3012a nolint fix 2024-05-31 15:03:57 +02:00
oarcher 58dcc3b44c changed to nolint 2024-05-31 13:21:21 +02:00
oarcher e1267aedaf disable some clang-tidy warnings 2024-05-31 12:35:29 +02:00
oarcher a15c02478a clang 2024-05-31 09:58:39 +02:00
oarcher b2f81eb57c updated test 2024-05-31 04:04:57 +02:00
oarcher 0f0c0a79c3 update codeowners 2024-05-31 03:38:28 +02:00
oarcher 0e7029f163 CONFIG_UART_ISR_IN_IRAM (HW FIFO Overflow) 2024-05-31 00:12:55 +02:00
oarcher ee873ee420 nolint delay 2024-05-26 21:01:13 +02:00
oarcher 9b9f54664a add ready 2024-05-26 20:53:13 +02:00
Olivier ARCHER 87c6c41541 Merge branch 'dev' into gsm 2024-05-26 19:45:11 +02:00
oarcher 2e042ad727 add modem_ready 2024-05-26 19:44:48 +02:00
oarcher d67fa07ee2 improved pin checks 2024-05-19 01:42:12 +02:00
oarcher 32f2c9f88e log message while the modem is not ready. 2024-05-19 00:49:13 +02:00
oarcher 064af5aecd ready option is required 2024-05-19 00:30:58 +02:00
oarcher ab88916988 removed power management 2024-05-16 19:57:49 +02:00
oarcher c4cdea0a9f yamllint 2024-05-15 12:08:10 +02:00
oarcher ef6382edee add init_at 2024-05-15 11:53:31 +02:00
oarcher 7260eb6225 public dce 2024-05-14 14:20:22 +02:00
oarcher 4f7bd585e9 renamed from 'gsm' to 'modem' 2024-05-13 23:14:44 +02:00
oarcher a3ed854b51 lint and status check 2024-05-13 22:31:43 +02:00
oarcher 73ff266096 better power on/off handling 2024-05-13 21:38:54 +02:00
oarcher a71a4bf677 lint 2024-05-13 18:05:27 +02:00
oarcher df6a2e7718 rename test bmp3xx to bmp3xx_i2c 2024-05-13 16:15:41 +02:00
Olivier ARCHER 0a2f9b2123 Merge branch 'esphome:dev' into gsm 2024-05-13 16:08:27 +02:00
oarcher 3a6b6b65d9 updated codeowners 2024-05-13 16:00:35 +02:00
oarcher 111dc0e8bd lint 2024-05-13 15:57:05 +02:00
oarcher 5d925f6ef0 add tests 2024-05-13 15:47:20 +02:00
oarcher 3f02b4a930 using esphome::esp_log_printf_ 2024-05-13 15:41:55 +02:00
oarcher d858ca6e46 remove sdkconfig verbose (device froze) 2024-05-13 01:06:26 +02:00
oarcher cf24dbb59c debug ppp 2024-05-12 21:50:42 +02:00
oarcher ccd10c9fd9 static const 2024-05-12 17:00:24 +02:00
oarcher bff381f6c5 revert unowned changes 2024-05-12 00:03:00 +02:00
oarcher 0a01d1ef32 gsm component 2024-05-11 23:01:51 +02:00
11 changed files with 1116 additions and 0 deletions
+1
View File
@@ -0,0 +1 @@
b024c362cb4f55a7498b76dfd5602131167411a31e119657a79e909df12c752b
+1
View File
@@ -425,6 +425,7 @@ esphome/components/modbus_controller/sensor/* @martgras
esphome/components/modbus_controller/switch/* @martgras
esphome/components/modbus_controller/text_sensor/* @martgras
esphome/components/modbus_server/* @exciton
esphome/components/modem/* @oarcher
esphome/components/mopeka_ble/* @Fabian-Schmidt @spbrogan
esphome/components/mopeka_pro_check/* @spbrogan
esphome/components/mopeka_std_check/* @Fabian-Schmidt
+204
View File
@@ -0,0 +1,204 @@
from esphome import automation, pins
import esphome.codegen as cg
from esphome.components import uart
from esphome.components.const import CONF_RTS_PIN
from esphome.components.esp32 import add_idf_component, add_idf_sdkconfig_option
from esphome.components.text_sensor import new_text_sensor, text_sensor_schema
import esphome.config_validation as cv
from esphome.const import (
CONF_BAUD_RATE,
CONF_COMMAND,
CONF_ENABLE_ON_BOOT,
CONF_ID,
CONF_MODEL,
CONF_ON_CONNECT,
CONF_ON_DISCONNECT,
CONF_REBOOT_TIMEOUT,
CONF_RX_BUFFER_SIZE,
CONF_RX_PIN,
CONF_TX_BUFFER_SIZE,
CONF_TX_PIN,
CONF_USE_ADDRESS,
DEVICE_CLASS_EMPTY,
)
from esphome.core import coroutine_with_priority
CODEOWNERS = ["@oarcher"]
DEPENDENCIES = ["esp32"]
AUTO_LOAD = ["network", "uart", "text_sensor"]
CONFLICTS_WITH = ["captive_portal", "ethernet"]
DOMAIN = "modem"
CONF_MODEM = "modem"
CONF_MODEM_ID = "modem_id"
CONF_PIN_CODE = "pin_code"
CONF_APN = "apn"
CONF_CTS_PIN = "cts_pin"
CONF_INIT_AT = "init_at"
CONF_ON_SYNC = "on_sync"
CONF_DTE_BUFFER_SIZE = "dte_buffer_size"
CONF_URC = "urc"
MODEM_MODELS = [
"BG96",
"SIM800",
"SIM7000",
"SIM7070",
"SIM7080",
"SIM7600",
"SIM7670",
"GENERIC",
]
modem_ns = cg.esphome_ns.namespace("modem")
ModemComponent = modem_ns.class_("ModemComponent", cg.Component, uart.UARTComponent)
ModemComponentState = modem_ns.enum("ModemComponentState", is_class=True)
MODEM_COMPONENT_SCHEMA = cv.Schema(
{cv.GenerateID(CONF_MODEM_ID): cv.use_id(ModemComponent)}
)
# Each trigger fires on one state, and none while the component is failed
_NOT_FAILED = "!{parent}->is_failed()"
def _on_state(conf_key: str, state: str) -> automation.CallbackAutomation:
return automation.CallbackAutomation(
conf_key,
"add_on_state_callback",
params=[(ModemComponentState, "state")],
forward=[],
when=f"{_NOT_FAILED} && state == modem::ModemComponentState::{state}",
)
_CALLBACK_AUTOMATIONS = (
_on_state(CONF_ON_CONNECT, "MODEM_CONNECTED"),
_on_state(CONF_ON_DISCONNECT, "MODEM_DISCONNECTING"),
_on_state(CONF_ON_SYNC, "MODEM_SYNCED"),
)
CONFIG_SCHEMA = cv.All(
cv.Schema(
{
cv.GenerateID(CONF_ID): cv.declare_id(ModemComponent),
cv.Required(CONF_TX_PIN): pins.internal_gpio_output_pin_schema,
cv.Required(CONF_RX_PIN): pins.internal_gpio_input_pin_schema,
cv.Optional(CONF_RTS_PIN): pins.internal_gpio_output_pin_schema,
cv.Optional(CONF_CTS_PIN): pins.internal_gpio_input_pin_schema,
cv.Optional(CONF_BAUD_RATE): cv.positive_int,
cv.Required(CONF_MODEL): cv.one_of(*MODEM_MODELS, upper=True),
cv.Required(CONF_APN): cv.string,
cv.Optional(CONF_PIN_CODE): cv.sensitive(cv.string_strict),
cv.Optional(CONF_USE_ADDRESS): 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_TX_BUFFER_SIZE, default=1024): cv.positive_int,
cv.Optional(CONF_RX_BUFFER_SIZE, default=1024): cv.positive_int,
cv.Optional(CONF_DTE_BUFFER_SIZE, default=1024): cv.positive_int,
cv.Optional(
CONF_REBOOT_TIMEOUT, default="10min"
): cv.positive_time_period_milliseconds,
cv.Optional(CONF_ON_CONNECT): automation.validate_automation({}),
cv.Optional(CONF_ON_DISCONNECT): automation.validate_automation({}),
cv.Optional(CONF_ON_SYNC): automation.validate_automation({}),
cv.Optional(CONF_URC): text_sensor_schema(
device_class=DEVICE_CLASS_EMPTY,
),
}
)
.extend(MODEM_COMPONENT_SCHEMA)
.extend(cv.COMPONENT_SCHEMA),
cv.require_framework_version(
esp_idf=cv.Version(4, 0, 0), # 5.2.0 OK
),
)
MODEM_ID_SCHEMA = automation.maybe_simple_id(
{cv.GenerateID(): cv.use_id(ModemComponent)}
)
SEND_AT_SCHEMA = cv.maybe_simple_value(
{
cv.GenerateID(): cv.use_id(ModemComponent),
cv.Required(CONF_COMMAND): cv.templatable(cv.string),
},
key=CONF_COMMAND,
)
automation.register_apply_action(
"modem.enable", MODEM_ID_SCHEMA, automation.ApplyCall("enable()")
)
automation.register_apply_action(
"modem.disable", MODEM_ID_SCHEMA, automation.ApplyCall("disable()")
)
automation.register_apply_action(
"modem.send_at",
SEND_AT_SCHEMA,
automation.ApplyCall("send_at({}, 1000, true)", ((CONF_COMMAND, cg.std_string),)),
)
automation.register_apply_condition(
"modem.connected", MODEM_ID_SCHEMA, "is_connected()"
)
automation.register_apply_condition("modem.enabled", MODEM_ID_SCHEMA, "is_enabled()")
@coroutine_with_priority(60.0)
async def to_code(config):
add_idf_component(
name="esp_modem",
repo="https://github.com/espressif/esp-protocols.git",
ref="modem-v2.0.0",
path="components/esp_modem",
)
add_idf_sdkconfig_option("CONFIG_PPP", True)
add_idf_sdkconfig_option("CONFIG_LWIP_PPP_SUPPORT", True)
add_idf_sdkconfig_option("CONFIG_ESP_MODEM_CMUX_DELAY_AFTER_DLCI_SETUP", 500)
add_idf_sdkconfig_option("CONFIG_PPP_SUPPORT", True)
add_idf_sdkconfig_option(
"CONFIG_ESP_MODEM_CMUX_USE_SHORT_PAYLOADS_ONLY", True
) # Slower but more reliable
add_idf_sdkconfig_option("CONFIG_ESP_MODEM_URC_HANDLER", True)
# If "Uart queue full" messages appear (e.g., with A7672), these config options might need adjustment
# See: https://github.com/espressif/esp-protocols/issues/272#issuecomment-1558682967
# add_idf_sdkconfig_option("CONFIG_ESP_MODEM_CMUX_DEFRAGMENT_PAYLOAD", True)
# add_idf_sdkconfig_option("CONFIG_ESP_MODEM_USE_INFLATABLE_BUFFER_IF_NEEDED", True)
# add_idf_sdkconfig_option("CONFIG_ESP_MODEM_CMUX_USE_SHORT_PAYLOADS_ONLY", False)
cg.add_define("USE_MODEM")
var = cg.new_Pvariable(config[CONF_ID])
cg.add(var.set_reboot_timeout(config[CONF_REBOOT_TIMEOUT]))
cg.add_optional(var.set_use_address, config.get(CONF_USE_ADDRESS))
cg.add_optional(var.set_pin_code, config.get(CONF_PIN_CODE))
if config[CONF_ENABLE_ON_BOOT]:
cg.add(var.enable())
for cmd in config.get(CONF_INIT_AT, []):
cg.add(var.add_init_at_command(cmd))
cg.add(var.set_model(config[CONF_MODEL]))
cg.add(var.set_apn(config[CONF_APN]))
await cg.add_pin(var.set_tx_pin, config[CONF_TX_PIN])
await cg.add_pin(var.set_rx_pin, config[CONF_RX_PIN])
await cg.add_pin(var.set_rts_pin, config.get(CONF_RTS_PIN))
await cg.add_pin(var.set_cts_pin, config.get(CONF_CTS_PIN))
cg.add_optional(var.set_baud_rate, config.get(CONF_BAUD_RATE))
cg.add(var.set_rx_buffer_size(config[CONF_RX_BUFFER_SIZE]))
cg.add(var.set_tx_buffer_size(config[CONF_TX_BUFFER_SIZE]))
cg.add(var.set_dte_buffer_size(config[CONF_DTE_BUFFER_SIZE]))
await automation.build_callback_automations(var, config, _CALLBACK_AUTOMATIONS)
if urc_config := config.get(CONF_URC, None):
cg.add_define("USE_MODEM_URC")
urc_text_sensor = await new_text_sensor(urc_config)
cg.add(var.set_urc_text_sensor(urc_text_sensor))
await cg.register_component(var, config)
@@ -0,0 +1,469 @@
#ifdef USE_ESP32
#include "modem_component.h"
#include "modem_handler.h"
#include "esphome/core/log.h"
#include "esphome/core/application.h"
#include "esphome/core/defines.h"
#include "esphome/components/network/util.h"
#include <esp_netif.h>
#include <esp_netif_ppp.h>
#include <esp_event.h>
#include <driver/gpio.h>
#include <lwip/dns.h>
#include <cxx_include/esp_modem_dte.hpp>
#include <esp_modem_config.h>
#include <cxx_include/esp_modem_api.hpp>
#include <cstring>
#include <iostream>
#include <cmath>
#define ESPHL_ERROR_CHECK(err, message) \
if ((err) != ESP_OK) { \
ESP_LOGE(TAG, message ": (%d) %s", err, esp_err_to_name(err)); \
this->mark_failed(); \
return; \
}
namespace esphome::modem {
ESPHOME_LOG_TAG(TAG, "modem");
ModemComponent *global_modem_component = nullptr; // NOLINT(cppcoreguidelines-avoid-non-const-global-variables)
ModemComponent::ModemComponent() {
assert(global_modem_component == nullptr);
global_modem_component = this;
this->modem_handler = std::make_unique<ModemHandler>();
}
// Delegated methods
AtCommandResult ModemComponent::send_at(const std::string &cmd, uint32_t timeout, bool verbose) {
return this->modem_handler->send_at(cmd, timeout, verbose);
}
void ModemComponent::enable() {
ESP_LOGI(TAG, "Setting modem target state to CONNECTED");
this->target_state_ = ModemComponentState::MODEM_CONNECTED;
// State machine in loop() will handle the ascent
}
void ModemComponent::disable() {
ESP_LOGI(TAG, "Setting modem target state to DISABLED");
this->target_state_ = ModemComponentState::MODEM_DISABLED;
// State machine in loop() will handle the descent
}
network::IPAddresses ModemComponent::get_ip_addresses() {
network::IPAddresses addresses;
if (this->component_state_ == ModemComponentState::MODEM_CONNECTED) {
addresses[0] = network::IPAddress(&this->modem_handler->network_infos.ip_info.ip);
}
return addresses;
}
void ModemComponent::setup() {
ESP_LOGI(TAG, "Modem setup...");
this->pref_ = global_preferences->make_preference<ModemRestoreState>(76007670UL);
this->pref_.load(&this->modem_restore_state_);
// find an available UART
#ifdef UART_NUM_2
for (auto p : {UART_NUM_2, UART_NUM_1}) {
#else
for (auto p : {UART_NUM_1}) {
#endif
if (!uart_is_driver_installed(p)) {
this->modem_handler->uart_port_num = p;
break;
}
}
if (this->modem_handler->uart_port_num == UART_NUM_MAX) {
ESP_LOGE(TAG, "No free UART port for modem");
this->mark_failed(LOG_STR("No free UART port for modem"));
return;
}
ESP_LOGCONFIG(TAG, "Config Modem:");
ESP_LOGCONFIG(TAG, " Model : %s", this->modem_handler->model.c_str());
ESP_LOGCONFIG(TAG, " APN : %s", this->modem_handler->apn.c_str());
ESP_LOGCONFIG(TAG, " PIN code : %s",
(this->modem_handler->pin_code.empty()) ? LOG_STR_LITERAL("No") : LOG_STR_LITERAL("Yes (not shown)"));
ESP_LOGCONFIG(TAG, " Tx Pin : GPIO%u", this->modem_handler->tx_pin->get_pin());
ESP_LOGCONFIG(TAG, " Rx Pin : GPIO%u", this->modem_handler->rx_pin->get_pin());
ESP_LOGCONFIG(
TAG, " Enabled : %s",
(this->component_state_ != ModemComponentState::MODEM_DISABLED) ? LOG_STR_LITERAL("Yes") : LOG_STR_LITERAL("No"));
if (this->modem_handler->baud_rate != 0) {
ESP_LOGCONFIG(TAG, " Baud rate : %d", this->modem_handler->baud_rate);
}
ESP_LOGCONFIG(TAG, " UART port : %d", this->modem_handler->uart_port_num);
ESP_LOGCONFIG(TAG, " TX buffer size : %d", this->modem_handler->tx_buffer_size);
ESP_LOGCONFIG(TAG, " RX buffer size : %d", this->modem_handler->rx_buffer_size);
ESP_LOGCONFIG(TAG, " DTE buffer size : %d", this->modem_handler->dte_buffer_size);
if (CONFIG_ESP_TASK_WDT_TIMEOUT_S <= 10) {
ESP_LOGW(TAG, "WDT timeout (%d s) may be too low for modem. Increase if WDT triggers.",
CONFIG_ESP_TASK_WDT_TIMEOUT_S);
}
esp_netif_config_t netif_ppp_config = ESP_NETIF_DEFAULT_PPP();
this->modem_handler->ppp_netif = esp_netif_new(&netif_ppp_config);
assert(this->modem_handler->ppp_netif);
esp_err_t err = esp_event_handler_register(IP_EVENT, ESP_EVENT_ANY_ID, &ModemHandler::ip_event_handler,
this->modem_handler.get());
ESPHL_ERROR_CHECK(err, "IP event handler register failed");
this->modem_handler->modem_create_dte_dce(this->modem_handler->baud_rate);
ESP_LOGV(TAG, "Setup complete");
}
void ModemComponent::loop() {
if (App.get_loop_component_start_time() < this->next_loop_millis_) {
// Some commands require a delay.
delay(10);
return;
}
// Calculate next step toward target_state_
ModemComponentState next_state = this->compute_next_state_();
if (next_state != this->component_state_) {
this->transition_to_(next_state);
}
}
ModemComponentState ModemComponent::compute_next_state_() {
// Priority 1: If target = DISABLED and we're not there, descend
if (this->target_state_ == ModemComponentState::MODEM_DISABLED) {
if (this->component_state_ == ModemComponentState::MODEM_DISABLED) {
return ModemComponentState::MODEM_DISABLED; // Stay
}
if (this->component_state_ != ModemComponentState::MODEM_DISCONNECTING) {
return ModemComponentState::MODEM_DISCONNECTING; // Start descent
}
// Otherwise we're already in DISCONNECTING, let handler manage
}
// Priority 2: Execute current state logic
switch (this->component_state_) {
case ModemComponentState::MODEM_DISABLED:
return this->handle_state_disabled_();
case ModemComponentState::MODEM_ENABLING:
return this->handle_state_enabling_();
case ModemComponentState::MODEM_SYNCED:
return this->handle_state_synced_();
case ModemComponentState::MODEM_CONNECTING:
return this->handle_state_connecting_();
case ModemComponentState::MODEM_WAIT_IP:
return this->handle_state_wait_ip_();
case ModemComponentState::MODEM_CONNECTED:
return this->handle_state_connected_();
case ModemComponentState::MODEM_DISCONNECTING:
return this->handle_state_disconnecting_();
}
return this->component_state_; // Fallback
}
ModemComponentState ModemComponent::handle_state_disabled_() {
this->loop_delay_(3000);
// If target is DISABLED, stay here
if (this->target_state_ == ModemComponentState::MODEM_DISABLED) {
return ModemComponentState::MODEM_DISABLED;
}
// Otherwise, target is CONNECTED, start ascent
return ModemComponentState::MODEM_ENABLING;
}
ModemComponentState ModemComponent::handle_state_enabling_() {
// Connect to the modem (testing different baud), and set the modem in a fresh state (disconnect from a previous
// connection) the modem will be synced at expected baud rate when exiting this state.
auto try_autobaud = [&](int baud) {
this->modem_handler->modem_create_dte_dce(baud);
this->modem_handler->dce->set_mode(esp_modem::modem_mode::AUTODETECT);
bool success = this->modem_handler->dce->get_mode() != esp_modem::modem_mode::UNDEF;
// Sometimes the modem does not answer autobaud commands,
// so try sending an AT command to confirm it's responsive at this baud rate.
if (!success) {
App.feed_wdt();
auto result = this->modem_handler->send_at("AT", 100);
success = result.esp_modem_command_result == command_result::OK;
}
if (success) {
this->modem_handler->current_baud_rate = baud;
this->modem_restore_state_.baud_rate = baud;
this->pref_.save(&this->modem_restore_state_);
}
return success;
};
// possible baud rate to try
std::vector<int> bauds = {this->modem_handler->current_baud_rate, this->modem_restore_state_.baud_rate,
this->modem_handler->baud_rate, 115200};
std::sort(bauds.begin(), bauds.end());
bauds.erase(std::unique(bauds.begin(), bauds.end()), bauds.end());
this->modem_handler->dce->set_mode(esp_modem::modem_mode::AUTODETECT);
auto mode = this->modem_handler->dce->get_mode();
ESP_LOGI(TAG, "Autodetect mode (1st): %d", static_cast<int>(mode));
switch (mode) {
case modem_mode::CMUX_MANUAL_MODE:
ESP_LOGD(TAG, "Modem warm reboot. Exiting CMUX");
this->modem_handler->dce->set_mode(modem_mode::CMUX_MANUAL_EXIT);
break;
case modem_mode::UNDEF: {
ESP_LOGD(TAG, "Trying other baud rate");
bool responded = false;
for (int b : bauds) {
if (try_autobaud(b)) {
ESP_LOGD(TAG, "Modem responded at baud %d", b);
responded = true;
break;
}
}
if (!responded) {
ESP_LOGW(TAG, "Modem not responding. Check power, PWRKEY and TX/RX wiring.");
this->loop_delay_(1000);
return ModemComponentState::MODEM_ENABLING;
}
break;
}
case modem_mode::COMMAND_MODE:
ESP_LOGD(TAG, "OK: Modem in COMMAND mode.");
break;
case modem_mode::DATA_MODE:
// Can block 20s! But no workaround found (with esp_modem 2.0.0)
ESP_LOGW(TAG, "Exiting DATA_MODE. (long blocking call, make sur to have a long WDT!)");
this->modem_handler->dce->set_mode(modem_mode::COMMAND_MODE);
break;
default:
ESP_LOGW(TAG, "Modem in unexpected mode %d. Attempting to switch to COMMAND mode.", static_cast<int>(mode));
this->modem_handler->dce->set_mode(modem_mode::COMMAND_MODE);
this->modem_handler->dce->set_mode(modem_mode::UNDEF);
// return ModemComponentState::MODEM_ENABLING;
break;
}
if (this->modem_handler->dce->sync() != esp_modem::command_result::OK) {
ESP_LOGW(TAG, "Waiting SYNC");
this->loop_delay_(1000);
return ModemComponentState::MODEM_ENABLING;
}
#ifdef USE_MODEM_URC
auto urc_handler = [this](const esp_modem::DTE::UrcBufferInfo &buffer_info) {
if (!buffer_info.is_command_active) {
std::string line(reinterpret_cast<const char *>(buffer_info.new_data_start), buffer_info.new_data_size);
// Publish to text sensor if configured
if (this->urc_text_sensor != nullptr) {
// defer so we won't be in the callback context
this->defer([this, line]() { this->urc_text_sensor->publish_state(line); });
}
}
return esp_modem::DTE::UrcConsumeInfo{esp_modem::DTE::UrcConsumeResult::CONSUME_NONE, 0};
};
this->modem_handler->dce->set_enhanced_urc(urc_handler);
#endif
int radio_state = 1;
this->modem_handler->dce->get_radio_state(radio_state);
if (radio_state == 1) {
// On warm reboot, we need to disconnect modem radio.
if (this->modem_handler->dce->set_radio_state(0) != command_result::OK) {
ESP_LOGW(TAG, "Failed to disconnect previous network session");
}
return ModemComponentState::MODEM_ENABLING;
}
if (this->modem_handler->baud_rate != this->modem_handler->current_baud_rate) {
ESP_LOGD(TAG, "Setting baud rate: %d -> %d", this->modem_handler->current_baud_rate,
this->modem_handler->baud_rate);
this->modem_handler->dce->sync();
if (this->modem_handler->dce->set_baud(this->modem_handler->baud_rate) == esp_modem::command_result::OK) {
ESP_LOGD(TAG, "Modem baud rate set to %d.", this->modem_handler->baud_rate);
delay(200); // NOLINT
this->modem_handler->modem_create_dte_dce(this->modem_handler->baud_rate);
App.feed_wdt();
delay(200); // NOLINT
this->modem_handler->dce->sync();
if (this->modem_handler->dce->sync() == esp_modem::command_result::OK) {
ESP_LOGI(TAG, "Modem synced at baud rate %d.", this->modem_handler->current_baud_rate);
this->modem_restore_state_.baud_rate = this->modem_handler->current_baud_rate;
this->pref_.save(&this->modem_restore_state_);
global_preferences->sync();
} else {
ESP_LOGE(TAG, "Failed to sync modem at baud rate %d.", this->modem_handler->baud_rate);
return ModemComponentState::MODEM_DISCONNECTING;
}
} else {
ESP_LOGW(TAG, "Failed to set modem baud rate to %d. Using %d.", this->modem_handler->baud_rate,
this->modem_handler->current_baud_rate);
this->loop_delay_(1000);
return ModemComponentState::MODEM_ENABLING;
}
}
return ModemComponentState::MODEM_SYNCED;
}
ModemComponentState ModemComponent::handle_state_synced_() { return ModemComponentState::MODEM_CONNECTING; }
ModemComponentState ModemComponent::handle_state_connecting_() {
// Merges INIT_NETWORK and START_PPP states
if (this->modem_handler->dce->sync() != esp_modem::command_result::OK) {
ESP_LOGW(TAG, "Modem not synced during network init");
return ModemComponentState::MODEM_ENABLING;
}
int attachement_state = 0;
this->modem_handler->dce->set_radio_state(1);
this->modem_handler->prepare_sim();
this->modem_handler->dce->set_network_attachment_state(1);
this->modem_handler->dce->get_network_attachment_state(attachement_state);
if (!attachement_state) {
ESP_LOGW(TAG, "Modem not yet ready to connect");
this->modem_handler->modem_log_status();
this->loop_delay_(4000);
return ModemComponentState::MODEM_CONNECTING;
}
ESP_LOGI(TAG, "Modem initialized and ready, starting PPP");
if (!this->modem_handler->dce->set_mode(esp_modem::modem_mode::CMUX_MODE)) {
ESP_LOGE(TAG, "Failed to enter PPP. Resetting modem.");
return ModemComponentState::MODEM_DISCONNECTING;
}
return ModemComponentState::MODEM_WAIT_IP;
}
ModemComponentState ModemComponent::handle_state_wait_ip_() {
if (this->modem_handler->network_infos.got_ip) {
return ModemComponentState::MODEM_CONNECTED;
}
if (this->wait_ip_retry_ > 0) {
--this->wait_ip_retry_;
}
if (this->wait_ip_retry_ > 0) {
ESP_LOGD(TAG, "Wait IP left retry: %d", this->wait_ip_retry_);
this->loop_delay_(this->modem_handler->connect_retry_delay);
return ModemComponentState::MODEM_WAIT_IP;
}
ESP_LOGE(TAG, "Unable to get IP address");
return ModemComponentState::MODEM_DISCONNECTING;
}
ModemComponentState ModemComponent::handle_state_connected_() {
if (!this->modem_handler->network_infos.got_ip) {
ESP_LOGW(TAG, "Lost IP");
this->loop_delay_(this->modem_handler->connect_retry_delay);
return ModemComponentState::MODEM_DISCONNECTING;
}
return ModemComponentState::MODEM_CONNECTED;
}
ModemComponentState ModemComponent::handle_state_disconnecting_() {
this->modem_handler->dce->set_mode(modem_mode::CMUX_MANUAL_EXIT);
// turn off radio.It can take up to 2 min to get lost IP event.
if (this->modem_handler->dce->set_radio_state(0) == esp_modem::command_result::OK) {
ESP_LOGI(TAG, "Modem set to minimal functionality.");
} else {
ESP_LOGE(TAG, "Failed to set modem to minimal functionality.");
}
return ModemComponentState::MODEM_DISABLED;
}
void ModemComponent::transition_to_(ModemComponentState next_state) {
if (next_state == this->component_state_) {
return;
}
ModemComponentState previous_state = this->component_state_;
this->component_state_ = next_state;
ESP_LOGD(TAG, "State change: %d -> %d", static_cast<int>(previous_state), static_cast<int>(next_state));
this->on_state_callback_.call(next_state);
this->on_enter_state_(next_state);
}
void ModemComponent::on_enter_state_(ModemComponentState state) {
// State invariants (entry establishes these):
// - MODEM_WAIT_IP: waiting for PPP got IP, retry counter initialized.
// - MODEM_CONNECTED: got_ip expected, connect timeout cancelled, params dumped.
// - DISABLED: no modem timeouts active, no retries pending.
switch (state) {
case ModemComponentState::MODEM_ENABLING:
this->set_timeout(CONNECT_TIMEOUT_ID, this->timeout_,
[this]() { this->abort_("Modem was not able to connect (timeout)"); });
break;
case ModemComponentState::MODEM_WAIT_IP:
this->wait_ip_retry_ = 10;
break;
case ModemComponentState::MODEM_CONNECTED:
this->cancel_timeout(CONNECT_TIMEOUT_ID);
this->status_clear_warning();
this->dump_connect_params_();
break;
case ModemComponentState::MODEM_DISCONNECTING:
ESP_LOGI(TAG, "Disconnecting modem");
this->cancel_timeout(CONNECT_TIMEOUT_ID);
this->loop_delay_(this->modem_handler->command_delay);
break;
case ModemComponentState::MODEM_DISABLED:
this->cancel_timeout(CONNECT_TIMEOUT_ID);
this->wait_ip_retry_ = 0;
break;
default:
break;
}
}
void ModemComponent::abort_(const char *message) {
ESP_LOGE(TAG, "Aborting: %s.", message);
this->pref_.save(&this->modem_restore_state_);
App.reboot();
}
void ModemComponent::loop_delay_(uint32_t delay_ms) {
this->next_loop_millis_ = App.get_loop_component_start_time() + delay_ms;
}
void ModemComponent::dump_connect_params_() {
char buffer[network::IP_ADDRESS_BUFFER_SIZE];
if (this->component_state_ != ModemComponentState::MODEM_CONNECTED) {
ESP_LOGCONFIG(TAG, "Modem connection: Not connected.");
return;
}
esp_netif_ip_info_t ip = this->modem_handler->network_infos.ip_info;
esp_netif_dns_info_t dns_main = this->modem_handler->network_infos.dns_main;
esp_netif_dns_info_t dns_backup = this->modem_handler->network_infos.dns_backup;
ESP_LOGCONFIG(TAG, "Modem connection:");
ESP_LOGCONFIG(TAG, " IP Address : %s", network::IPAddress(&ip.ip).str_to(buffer));
ESP_LOGCONFIG(TAG, " Hostname : '%s'", App.get_name().c_str());
ESP_LOGCONFIG(TAG, " Subnet : %s", network::IPAddress(&ip.netmask).str_to(buffer));
ESP_LOGCONFIG(TAG, " Gateway : %s", network::IPAddress(&ip.gw).str_to(buffer));
ESP_LOGCONFIG(TAG, " DNS main : %s", network::IPAddress(&dns_main.ip.u_addr.ip4).str_to(buffer));
ESP_LOGCONFIG(TAG, " DNS backup : %s", network::IPAddress(&dns_backup.ip.u_addr.ip4).str_to(buffer));
}
} // namespace esphome::modem
#endif
+133
View File
@@ -0,0 +1,133 @@
#pragma once
#ifdef USE_ESP32
#include "esphome/core/component.h"
#include "esphome/core/log.h"
#include "esphome/core/gpio.h"
#include "esphome/core/automation.h"
#include "esphome/core/preferences.h"
#include "esphome/components/network/ip_address.h"
#ifdef USE_MODEM_URC
#include "esphome/components/text_sensor/text_sensor.h"
#endif
#include <memory>
#include <unordered_map>
#include <utility>
#include "modem_handler.h"
namespace esphome::modem {
enum class ModemComponentState {
MODEM_DISABLED,
MODEM_ENABLING,
MODEM_SYNCED,
MODEM_CONNECTING, // Merges INIT_NETWORK + START_PPP
MODEM_WAIT_IP,
MODEM_CONNECTED,
MODEM_DISCONNECTING, // Renamed from DISABLING
};
struct ModemRestoreState {
int baud_rate{0};
} __attribute__((packed));
class ModemComponent : public Component {
public:
void set_reboot_timeout(uint32_t timeout) { this->timeout_ = timeout; }
void set_use_address(const char *use_address) { this->use_address_ = use_address; }
// Setters now modify the handler's attributes
void set_rx_pin(InternalGPIOPin *rx_pin) { this->modem_handler->rx_pin = rx_pin; }
void set_tx_pin(InternalGPIOPin *tx_pin) { this->modem_handler->tx_pin = tx_pin; }
void set_rts_pin(InternalGPIOPin *rts_pin) { this->modem_handler->rts_pin = rts_pin; }
void set_cts_pin(InternalGPIOPin *cts_pin) { this->modem_handler->cts_pin = cts_pin; }
void set_baud_rate(int baud_rate) { this->modem_handler->baud_rate = baud_rate; }
void set_model(const std::string &model) { this->modem_handler->model = model; }
void set_pin_code(const std::string &pin_code) { this->modem_handler->pin_code = pin_code; }
void set_tx_buffer_size(uint16_t tx_buffer_size) { this->modem_handler->tx_buffer_size = tx_buffer_size; }
void set_rx_buffer_size(uint16_t rx_buffer_size) { this->modem_handler->rx_buffer_size = rx_buffer_size; }
void set_dte_buffer_size(uint16_t dte_buffer_size) { this->modem_handler->dte_buffer_size = dte_buffer_size; }
void set_apn(const std::string &apn) { this->modem_handler->apn = apn; }
void add_init_at_command(const std::string &cmd) { this->modem_handler->init_at_commands.push_back(cmd); }
#ifdef USE_MODEM_URC
void set_urc_text_sensor(text_sensor::TextSensor *urc_text_sensor) { this->urc_text_sensor = urc_text_sensor; }
text_sensor::TextSensor *urc_text_sensor{nullptr};
#endif
bool is_connected() { return this->component_state_ == ModemComponentState::MODEM_CONNECTED; }
bool is_disabled() {
return this->component_state_ == ModemComponentState::MODEM_DISABLED &&
this->target_state_ == ModemComponentState::MODEM_DISABLED;
}
bool is_enabled() { return !is_disabled(); }
// Delegated methods
AtCommandResult send_at(const std::string &cmd, uint32_t timeout = 0, bool verbose = false);
void enable();
void disable();
network::IPAddresses get_ip_addresses();
const char *get_use_address() const { return this->use_address_; };
// ========== INTERNAL METHODS ==========
// (In most use cases, you won't need these)
ModemComponent();
void setup() override;
void loop() override;
void dump_config() override { this->dump_connect_params_(); }
float get_setup_priority() const override { return setup_priority::WIFI + 1; } // Just before Wi-Fi
template<typename F> void add_on_state_callback(F &&callback) {
this->on_state_callback_.add(std::forward<F>(callback));
}
std::unique_ptr<ModemHandler> modem_handler{nullptr};
protected:
// ===== State handler methods =====
ModemComponentState handle_state_disabled_();
ModemComponentState handle_state_enabling_();
ModemComponentState handle_state_synced_();
ModemComponentState handle_state_connecting_(); // Merges INIT_NETWORK + START_PPP
ModemComponentState handle_state_wait_ip_();
ModemComponentState handle_state_connected_();
ModemComponentState handle_state_disconnecting_();
void transition_to_(ModemComponentState next_state);
void on_enter_state_(ModemComponentState state);
// target_state_ model helpers
ModemComponentState compute_next_state_();
bool is_going_up_() const { return target_state_ == ModemComponentState::MODEM_CONNECTED; }
bool is_going_down_() const { return target_state_ == ModemComponentState::MODEM_DISABLED; }
void abort_(const char *message);
void loop_delay_(uint32_t delay_ms);
void dump_connect_params_();
// Scheduler id of the connect timeout armed while enabling
static constexpr uint32_t CONNECT_TIMEOUT_ID = 0;
// Attributes from YAML config
uint32_t timeout_;
CallbackManager<void(ModemComponentState)> on_state_callback_;
// Changes will trigger user callback
ModemComponentState component_state_{ModemComponentState::MODEM_DISABLED};
ModemComponentState target_state_{ModemComponentState::MODEM_DISABLED}; // Stable target state
uint32_t next_loop_millis_{0};
uint8_t wait_ip_retry_{0};
ModemRestoreState modem_restore_state_{};
ESPPreferenceObject pref_;
private:
// Stores a pointer to a string literal (static storage duration).
// ONLY set from Python-generated code with string literals - never dynamic strings.
const char *use_address_{""};
};
extern ModemComponent *global_modem_component; // NOLINT(cppcoreguidelines-avoid-non-const-global-variables)
} // namespace esphome::modem
#endif
+189
View File
@@ -0,0 +1,189 @@
#ifdef USE_ESP32
#include "modem_handler.h"
#include "esphome/core/log.h"
#include "esphome/core/application.h"
#include <cmath>
namespace esphome::modem {
using namespace esp_modem;
ESPHOME_LOG_TAG(TAG, "modem_handler");
void ModemHandler::modem_create_dte_dce(int baud_rate) {
this->current_baud_rate = baud_rate;
esp_modem_dte_config_t dte_config = ESP_MODEM_DTE_DEFAULT_CONFIG();
dte_config.uart_config.tx_io_num = this->tx_pin->get_pin();
dte_config.uart_config.rx_io_num = this->rx_pin->get_pin();
dte_config.uart_config.rx_buffer_size = this->rx_buffer_size;
dte_config.uart_config.tx_buffer_size = this->tx_buffer_size;
dte_config.uart_config.event_queue_size = this->uart_event_queue_size;
dte_config.uart_config.port_num = this->uart_port_num;
if (baud_rate != 0) {
ESP_LOGD(TAG, "DTE baud rate: %d", baud_rate);
dte_config.uart_config.baud_rate = baud_rate;
}
if (this->rts_pin != nullptr && this->cts_pin != nullptr) {
ESP_LOGD(TAG, "Using RTS/CTS hardware flow control");
dte_config.uart_config.rts_io_num = this->rts_pin->get_pin();
dte_config.uart_config.cts_io_num = this->cts_pin->get_pin();
dte_config.uart_config.flow_control = ESP_MODEM_FLOW_CONTROL_HW;
} else {
dte_config.uart_config.flow_control = ESP_MODEM_FLOW_CONTROL_NONE;
}
dte_config.task_stack_size = this->uart_event_task_stack_size;
dte_config.task_priority = this->uart_event_task_priority;
dte_config.dte_buffer_size = this->dte_buffer_size;
this->dce.reset();
this->dte.reset();
this->dte = create_uart_dte(&dte_config);
esp_modem_dce_config_t dce_config = ESP_MODEM_DCE_DEFAULT_CONFIG(this->apn.c_str());
if (this->model == "GENERIC") {
this->dce = create_generic_dce(&dce_config, this->dte, this->ppp_netif);
} else if (this->model == "BG96") {
this->dce = create_BG96_dce(&dce_config, this->dte, this->ppp_netif);
} else if (this->model == "SIM800") {
this->dce = create_SIM800_dce(&dce_config, this->dte, this->ppp_netif);
} else if (this->model == "SIM7000" || this->model == "SIM7080") {
this->dce = create_SIM7000_dce(&dce_config, this->dte, this->ppp_netif);
} else if (this->model == "SIM7070") {
this->dce = create_SIM7070_dce(&dce_config, this->dte, this->ppp_netif);
} else if (this->model == "SIM7600" || this->model == "SIM7670") {
this->dce = create_SIM7600_dce(&dce_config, this->dte, this->ppp_netif);
} else {
ESP_LOGE(TAG, "Invalid model %s. DCE not created.", this->model.c_str());
return;
}
ESP_LOGV(TAG, "DTE/DCE created.");
}
AtCommandResult ModemHandler::send_at(const std::string &cmd, uint32_t timeout, bool verbose) {
const uint32_t cmd_timeout = timeout == 0 ? this->command_delay : timeout;
AtCommandResult at_command_result;
at_command_result.success = false;
at_command_result.esp_modem_command_result = command_result::TIMEOUT;
if (this->dce) {
at_command_result.esp_modem_command_result = this->dce->at(cmd, at_command_result.output, cmd_timeout);
at_command_result.success = at_command_result.esp_modem_command_result == command_result::OK;
} else {
ESP_LOGE(TAG, "Modem DCE not ready, cannot send AT command: %s", cmd.c_str());
at_command_result.esp_modem_command_result = command_result::FAIL;
}
return at_command_result;
}
bool ModemHandler::get_signal_quality(float &out_rssi, float &out_ber) {
out_rssi = NAN;
out_ber = NAN;
int modem_rssi = 99;
int modem_ber = 99;
if (this->dce && this->dce->sync() == command_result::OK &&
(this->dce->get_signal_quality(modem_rssi, modem_ber) == command_result::OK)) {
if (modem_rssi != 99)
out_rssi = -113.0f + (modem_rssi * 2);
if (modem_ber != 99)
out_ber = 0.1f * (modem_ber * modem_ber);
return true;
}
return false;
}
void ModemHandler::modem_log_status() {
bool synced = false;
int cfun = -1;
int attached = 0;
int network_mode = 0;
int registration_state = 0;
float rssi = NAN, ber = NAN;
std::string sim_status = "UNKNOWN";
if (this->dce && this->dce->sync() == esp_modem::command_result::OK) {
synced = true;
auto res = this->send_at("AT+CPIN?");
if (res) {
auto &out = res.output;
sim_status = out.starts_with("+CPIN: ") ? out.substr(7) : out;
}
this->dce->get_radio_state(cfun);
this->dce->get_network_attachment_state(attached);
this->dce->get_network_registration_state(registration_state);
this->get_signal_quality(rssi, ber);
this->dce->get_network_system_mode(network_mode);
}
bool connected =
synced && network_mode != 0 && attached && !std::isnan(rssi) && sim_status.find("READY") != std::string::npos;
char cfun_str[16];
if (cfun == 1) {
snprintf(cfun_str, sizeof(cfun_str), "OK");
} else {
snprintf(cfun_str, sizeof(cfun_str), "NOK(%d)", cfun);
}
ESP_LOGI(TAG,
"Modem status: %s, attached: %s, registration state: %d, radio function: %s, SIM: %s, type: %d, ber: %.0f "
"%%, rssi: %.0f dB",
connected ? LOG_STR_LITERAL("Good") : (synced ? LOG_STR_LITERAL("BAD") : LOG_STR_LITERAL("No SYNC")),
attached ? LOG_STR_LITERAL("Yes") : LOG_STR_LITERAL("NO"), registration_state, cfun_str, sim_status.c_str(),
(int) network_mode, ber * 100.0f, rssi);
}
bool ModemHandler::prepare_sim() {
App.feed_wdt();
delay(200); // NOLINT
AtCommandResult result = this->send_at("AT+CPIN?");
if (!result.success) {
ESP_LOGW(TAG, "Failed to check pin: %s", result.c_str());
return false;
}
std::string current_sim_status = result.output.starts_with("+CPIN: ") ? result.output.substr(7) : result.output;
ESP_LOGD(TAG, "SIM: %s", current_sim_status.c_str());
if (current_sim_status.find("READY") != std::string::npos) {
return true;
}
if (this->pin_code.empty()) {
ESP_LOGE(TAG, "SIM PIN empty, but SIM locked.");
return false;
}
ESP_LOGD(TAG, "Unlocking SIM with PIN...");
if (this->dce->set_pin(this->pin_code) == command_result::OK) {
ESP_LOGD(TAG, "PIN set. (But not yet checked).");
return true;
}
ESP_LOGE(TAG, "Failed to set PIN.");
return false;
}
void ModemHandler::ip_event_handler(void *arg, esp_event_base_t event_base, int32_t event_id, void *event_data) {
auto *handler = static_cast<ModemHandler *>(arg);
switch (event_id) {
case IP_EVENT_PPP_GOT_IP: {
ip_event_got_ip_t *event = (ip_event_got_ip_t *) event_data;
ESP_LOGD(TAG, "PPP IP event: Got IP " IPSTR, IP2STR(&event->ip_info.ip));
handler->network_infos.ip_info = event->ip_info;
esp_netif_get_dns_info(event->esp_netif, ESP_NETIF_DNS_MAIN, &handler->network_infos.dns_main);
esp_netif_get_dns_info(event->esp_netif, ESP_NETIF_DNS_BACKUP, &handler->network_infos.dns_backup);
handler->network_infos.got_ip = true;
break;
}
case IP_EVENT_PPP_LOST_IP:
if (handler->network_infos.got_ip) {
ESP_LOGD(TAG, "PPP IP event: Lost IP.");
handler->network_infos.got_ip = false;
}
break;
}
}
} // namespace esphome::modem
#endif
+74
View File
@@ -0,0 +1,74 @@
#pragma once
#ifdef USE_ESP32
#include <memory>
#include "esphome/core/gpio.h"
#include <cxx_include/esp_modem_api.hpp>
#include <esp_modem_config.h>
#include <vector>
#include <cmath>
namespace esphome::modem {
using namespace esp_modem;
struct AtCommandResult {
std::string output{};
bool success{false};
command_result esp_modem_command_result{command_result::TIMEOUT};
operator bool() const { return success; }
const char *c_str() const { return output.c_str(); }
};
struct NetworkInfos {
esp_netif_ip_info_t ip_info{};
esp_netif_dns_info_t dns_main{};
esp_netif_dns_info_t dns_backup{};
bool got_ip{false};
};
class ModemHandler {
public:
// Attributes from YAML config
InternalGPIOPin *tx_pin;
InternalGPIOPin *rx_pin;
InternalGPIOPin *rts_pin{nullptr};
InternalGPIOPin *cts_pin{nullptr};
std::string model;
uint16_t tx_buffer_size = 512;
uint16_t rx_buffer_size = 512;
uint16_t dte_buffer_size = 512;
std::string pin_code;
std::string apn;
std::vector<std::string> init_at_commands;
int baud_rate = 0;
// esp_modem objects
std::unique_ptr<DCE> dce{nullptr};
std::shared_ptr<DTE> dte{nullptr};
esp_netif_t *ppp_netif{nullptr};
// Internal state attributes
int current_baud_rate{0};
NetworkInfos network_infos{};
// UART config
uint8_t uart_event_queue_size = 10;
size_t uart_event_task_stack_size = 4096;
uint8_t uart_event_task_priority = 5;
uint32_t command_delay = 1000;
uint32_t connect_retry_delay = 5000;
uart_port_t uart_port_num = UART_NUM_MAX;
// Methods
void modem_create_dte_dce(int baud_rate);
AtCommandResult send_at(const std::string &cmd, uint32_t timeout = 0, bool verbose = false);
bool get_signal_quality(float &out_rssi, float &out_ber);
static void ip_event_handler(void *arg, esp_event_base_t event_base, int32_t event_id, void *event_data);
void modem_log_status();
bool prepare_sim();
};
} // namespace esphome::modem
#endif
+2
View File
@@ -25,6 +25,8 @@ dependencies:
version: 1.1.2
espressif/esp32-camera:
version: 2.1.7
espressif/esp_modem:
version: 2.0.2
espressif/mdns:
version: 1.14.0
espressif/esp_wifi_remote:
+4
View File
@@ -26,3 +26,7 @@ CONFIG_BT_ENABLED=y
# esp32_camera
CONFIG_SPIRAM=y
# modem
CONFIG_PPP_SUPPORT=y
CONFIG_ESP_MODEM_URC_HANDLER=y
+18
View File
@@ -0,0 +1,18 @@
esphome:
on_boot:
then:
- modem.disable
- modem.enable
- if:
condition:
modem.enabled:
then:
modem.send_at: "AT+CGSN"
else:
modem.enable:
- if:
condition:
not:
modem.connected:
then:
logger.log: modem not connected
@@ -0,0 +1,21 @@
logger:
modem:
id: atmodem
rx_pin: GPIO26
tx_pin: GPIO27
baud_rate: 115200
model: SIM7600
apn: orange
pin_code: "0000"
enable_on_boot: True
reboot_timeout: 5min
on_connect:
logger.log: "modem connected"
on_disconnect:
logger.log: "modem disconnected"
on_sync:
logger.log: "modem synced - ready for AT commands"
packages:
modem: !include common.yaml