SymbX/ModemManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

quectel: new custom +CTZU=? parser

Browse Source 
Some quectel devices, like the EC25 have a non-standard additional '3'
mode value:

  0: Disable automatic time zone update via NITZ
  1: Enable automatic time zone update via NITZ
  3: Enable automatic time zone update via NITZ and update LOCAL time to RTC
This commit is contained in:
Aleksander Morgado
2020-09-04 08:32:30 +00:00
parent 42288fc2a1
commit e65175234b
4 changed files with 239 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/Makefile.am
+23
View File
@@ -1155,6 +1155,28 @@ endif
if ENABLE_PLUGIN_QUECTEL
noinst_LTLIBRARIES += libhelpers-quectel.la
libhelpers_quectel_la_SOURCES = \
quectel/mm-modem-helpers-quectel.c \
quectel/mm-modem-helpers-quectel.h \
$(NULL)
libhelpers_quectel_la_CPPFLAGS = \
-DMM_MODULE_NAME=\"quectel\" \
$(NULL)
noinst_PROGRAMS += test-modem-helpers-quectel
test_modem_helpers_quectel_SOURCES = \
quectel/tests/test-modem-helpers-quectel.c \
$(NULL)
test_modem_helpers_quectel_CPPFLAGS = \
-I$(top_srcdir)/plugins/quectel \
$(NULL)
test_modem_helpers_quectel_LDADD = \
$(builddir)/libhelpers-quectel.la \
$(top_builddir)/src/libhelpers.la \
$(top_builddir)/libmm-glib/libmm-glib.la \
$(NULL)
pkglib_LTLIBRARIES += libmm-plugin-quectel.la
libmm_plugin_quectel_la_SOURCES = \
quectel/mm-plugin-quectel.c \
@@ -1175,6 +1197,7 @@ libmm_plugin_quectel_la_CPPFLAGS = \
-DMM_MODULE_NAME=\"quectel\" \
$(NULL)
libmm_plugin_quectel_la_LDFLAGS = $(PLUGIN_COMMON_LINKER_FLAGS)
libmm_plugin_quectel_la_LIBADD = $(builddir)/libhelpers-quectel.la
dist_udevrules_DATA += quectel/77-mm-quectel-port-types.rules
AM_CFLAGS += -DTESTUDEVRULESDIR_QUECTEL=\"${srcdir}/quectel\"
plugins/quectel/mm-modem-helpers-quectel.c
+91
View File
@@ -0,0 +1,91 @@
/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details:
*
* Copyright (C) 2020 Aleksander Morgado <aleksander@aleksander.es>
*/
#include <glib.h>
#include <ModemManager.h>
#define _LIBMM_INSIDE_MM
#include <libmm-glib.h>
#include "mm-log.h"
#include "mm-modem-helpers.h"
#include "mm-modem-helpers-quectel.h"
gboolean
mm_quectel_parse_ctzu_test_response (const gchar *response,
gpointer log_object,
gboolean *supports_disable,
gboolean *supports_enable,
gboolean *supports_enable_update_rtc,
GError **error)
{
g_auto(GStrv) split = NULL;
g_autoptr(GArray) modes = NULL;
guint i;
/*
* Response may be:
* - +CTZU: (0,1)
* - +CTZU: (0,1,3)
*/
#define N_EXPECTED_GROUPS 1
split = mm_split_string_groups (mm_strip_tag (response, "+CTZU:"));
if (!split) {
g_set_error (error, MM_CORE_ERROR, MM_CORE_ERROR_FAILED,
"Couldn't split the +CTZU test response in groups");
return FALSE;
}
if (g_strv_length (split) != N_EXPECTED_GROUPS) {
g_set_error (error, MM_CORE_ERROR, MM_CORE_ERROR_FAILED,
"Cannot parse +CTZU test response: invalid number of groups (%u != %u)",
g_strv_length (split), N_EXPECTED_GROUPS);
return FALSE;
}
modes = mm_parse_uint_list (split[0], error);
if (!modes) {
g_prefix_error (error, "Failed to parse integer list in +CTZU test response: ");
return FALSE;
}
*supports_disable = FALSE;
*supports_enable = FALSE;
*supports_enable_update_rtc = FALSE;
for (i = 0; i < modes->len; i++) {
guint mode;
mode = g_array_index (modes, guint, i);
switch (mode) {
case 0:
*supports_disable = TRUE;
break;
case 1:
*supports_enable = TRUE;
break;
case 3:
*supports_enable_update_rtc = TRUE;
break;
default:
mm_obj_dbg (log_object, "unknown +CTZU mode: %u", mode);
break;
}
}
return TRUE;
}
plugins/quectel/mm-modem-helpers-quectel.h
+32
View File
@@ -0,0 +1,32 @@
/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details:
*
* Copyright (C) 2020 Aleksander Morgado <aleksander@aleksander.es>
*/
#ifndef MM_MODEM_HELPERS_QUECTEL_H
#define MM_MODEM_HELPERS_QUECTEL_H
#include <glib.h>
#include <ModemManager.h>
#define _LIBMM_INSIDE_MM
#include <libmm-glib.h>
gboolean mm_quectel_parse_ctzu_test_response (const gchar *response,
gpointer log_object,
gboolean *supports_disable,
gboolean *supports_enable,
gboolean *supports_enable_update_rtc,
GError **error);
#endif /* MM_MODEM_HELPERS_QUECTEL_H */
plugins/quectel/tests/test-modem-helpers-quectel.c
+93
View File
@@ -0,0 +1,93 @@
/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details:
*
* Copyright (C) 2020 Aleksander Morgado <aleksander@aleksander.es>
*/
#include <glib.h>
#include <glib-object.h>
#include <locale.h>
#include <ModemManager.h>
#define _LIBMM_INSIDE_MM
#include <libmm-glib.h>
#include <math.h>
#include "mm-log-test.h"
#include "mm-modem-helpers.h"
#include "mm-modem-helpers-quectel.h"
/*****************************************************************************/
/* Test ^CTZU test responses */
typedef struct {
const gchar *response;
gboolean expect_supports_disable;
gboolean expect_supports_enable;
gboolean expect_supports_enable_update_rtc;
} TestCtzuResponse;
static const TestCtzuResponse test_ctzu_response[] = {
{ "+CTZU: (0,1)", TRUE, TRUE, FALSE },
{ "+CTZU: (0,1,3)", TRUE, TRUE, TRUE },
};
static void
common_test_ctzu (const gchar *response,
gboolean expect_supports_disable,
gboolean expect_supports_enable,
gboolean expect_supports_enable_update_rtc)
{
g_autoptr(GError) error = NULL;
gboolean res;
gboolean supports_disable = FALSE;
gboolean supports_enable = FALSE;
gboolean supports_enable_update_rtc = FALSE;
res = mm_quectel_parse_ctzu_test_response (response,
NULL,
&supports_disable,
&supports_enable,
&supports_enable_update_rtc,
&error);
g_assert_no_error (error);
g_assert (res);
g_assert_cmpuint (expect_supports_disable, ==, supports_disable);
g_assert_cmpuint (expect_supports_enable, ==, supports_enable);
g_assert_cmpuint (expect_supports_enable_update_rtc, ==, supports_enable_update_rtc);
}
static void
test_ctzu (void)
{
guint i;
for (i = 0; i < G_N_ELEMENTS (test_ctzu_response); i++)
common_test_ctzu (test_ctzu_response[i].response,
test_ctzu_response[i].expect_supports_disable,
test_ctzu_response[i].expect_supports_enable,
test_ctzu_response[i].expect_supports_enable_update_rtc);
}
/*****************************************************************************/
int main (int argc, char **argv)
{
setlocale (LC_ALL, "");
g_test_init (&argc, &argv, NULL);
g_test_add_func ("/MM/quectel/ctzu", test_ctzu);
return g_test_run ();
}