espressif/esp-protocols
1
0
Fork 1
mirror of https://github.com/espressif/esp-protocols.git synced 2025-07-18 13:02:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix(esp_modem): Correction of switching to CMUX

Browse Source 
* BG96 needs a small pause between CMUX command reception and actual use
of the CMUX mode
* Correct CMUX payload reception to check FT_UIH message type (P/F flag
could be cleared or set)

Closes https://github.com/espressif/esp-protocols/issues/33
This commit is contained in:
David Cermak
2022-05-10 17:55:55 +02:00
parent 38149c8d9b
commit 503218b3ba
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/esp_modem/src/esp_modem_cmux.cpp
View File

@ -103,7 +103,7 @@ struct CMux::CMuxFrame {
void CMux::data_available(uint8_t *data, size_t len) void CMux::data_available(uint8_t *data, size_t len)
{ {
if (data && type == 0xFF && len > 0 && dlci > 0) { if (data && (type&FT_UIH) == FT_UIH && len > 0 && dlci > 0) { // valid payload on a virtual term
int virtual_term = dlci - 1; int virtual_term = dlci - 1;
if (virtual_term < MAX_TERMINALS_NUM && read_cb[virtual_term]) { if (virtual_term < MAX_TERMINALS_NUM && read_cb[virtual_term]) {
// Post partial data (or defragment to post on CMUX footer) // Post partial data (or defragment to post on CMUX footer)

6
components/esp_modem/src/esp_modem_dce.cpp
View File

@ -12,6 +12,8 @@
// See the License for the specific language governing permissions and // See the License for the specific language governing permissions and
// limitations under the License. // limitations under the License.
#include <unistd.h>
#include "cxx_include/esp_modem_dte.hpp" #include "cxx_include/esp_modem_dte.hpp"
#include "cxx_include/esp_modem_dce.hpp" #include "cxx_include/esp_modem_dce.hpp"
#include "esp_log.h" #include "esp_log.h"
@ -63,7 +65,9 @@ bool DCE_Mode::set(DTE *dte, ModuleIf *device, Netif &netif, modem_mode m)
if (mode == modem_mode::DATA_MODE || mode == modem_mode::CMUX_MODE) { if (mode == modem_mode::DATA_MODE || mode == modem_mode::CMUX_MODE) {
return false; return false;
} }
device->set_mode(modem_mode::CMUX_MODE); device->set_mode(modem_mode::CMUX_MODE); // switch the device into CMUX mode
usleep(100'000); // some devices need a few ms to switch
if (!dte->set_mode(modem_mode::CMUX_MODE)) { if (!dte->set_mode(modem_mode::CMUX_MODE)) {
return false; return false;
} }