Skip to content

Commit 9ac4fd9

Browse files
NikolaaaNNikolaaaN
committed
quectel: make and os change.
1 parent 5173484 commit 9ac4fd9

File tree

3 files changed

+77
-69
lines changed

3 files changed

+77
-69
lines changed

‎ports/quectel/Makefile‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
TOP := ../..
2+
ifneq ($(HeliosSDK_PATH),)
3+
ROOT := $(HeliosSDK_PATH)
4+
else
25
ROOT := $(TOP)/../..
6+
endif
37

48
include ../../py/mkenv.mk
59
include mpconfigport.mk
@@ -23,10 +27,14 @@ QSTR_DEFS = qstrdefsport.h
2327
# MicroPython feature configurations
2428
MICROPY_ROM_TEXT_COMPRESSION ?= 1
2529

26-
2730
FROZEN_MANIFEST = $(QUEC_PY_MOD)
2831

32+
ifeq ($(OS),Windows_NT)
2933
export MICROPY_MPYCROSS = $(TOP)/mpy-cross/build/mpy-cross.exe
34+
else
35+
export MICROPY_MPYCROSS = $(TOP)/mpy-cross/build/mpy-cross
36+
endif
37+
3038
# include py core make definitions
3139
include $(TOP)/py/py.mk
3240
include $(TOP)/extmod/extmod.mk

‎ports/quectel/modules/_boot.py‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
import uos
15+
import os
1616
import ujson
1717

1818
"""
@@ -25,7 +25,7 @@
2525

2626
def _repl_enable():
2727
global datacall_flag
28-
if "system_config.json" in uos.listdir("/"):
28+
if "system_config.json" in os.listdir("/"):
2929
with open("/system_config.json", "r", encoding="utf-8") as fd:
3030
try:
3131
json_data = ujson.load(fd)
@@ -43,21 +43,21 @@ def _repl_enable():
4343
try:
4444
udev = None
4545
try:
46-
from uos import VfsLfs1 as VfsLfs
46+
from os import VfsLfs1 as VfsLfs
4747
except Exception:
48-
from uos import VfsLfs2 as VfsLfs
48+
from os import VfsLfs2 as VfsLfs
4949

50-
udev = uos.FlashDevice("customer_fs", 4096)
50+
udev = os.FlashDevice("customer_fs", 4096)
5151
try:
52-
uos.mount(udev, "/")
52+
os.mount(udev, "/")
5353
except Exception as e:
5454
if "ENODEV" in str(e):
5555
VfsLfs.mkfs(udev)
56-
uos.mount(udev, "/")
57-
if "usr" not in uos.listdir():
58-
uos.mkdir("usr")
59-
if "bak" not in uos.listdir():
60-
uos.mkdir("bak")
56+
os.mount(udev, "/")
57+
if "usr" not in os.listdir():
58+
os.mkdir("usr")
59+
if "bak" not in os.listdir():
60+
os.mkdir("bak")
6161

6262
except Exception:
6363
print("error occurs in boot step.")

‎ports/quectel/moduos.c‎

Lines changed: 57 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
#include "vfs_quecfs.h"
4141
#endif
4242

43-
#if MICROPY_QPY_MODULE_UOS
43+
#if MICROPY_QPY_MODULE_OS
4444

4545
static char sysname[30] = {0};
4646
static char nodename[20] = {0};
@@ -50,16 +50,16 @@ extern const mp_obj_type_t mp_fat_vfs_type;
5050

5151

5252
static const qstr os_uname_info_fields[] = {
53-
MP_QSTR_sysname, MP_QSTR_nodename, MP_QSTR_release,
53+
MP_QSTR_sysname, MP_QSTR_nodename,MP_QSTR_release,
5454
MP_QSTR_version, MP_QSTR_machine, MP_QSTR_qpyver,
5555
};
5656

57-
static MP_DEFINE_STR_OBJ(os_uname_info_sysname_obj, sysname);
58-
static MP_DEFINE_STR_OBJ(os_uname_info_nodename_obj, nodename);
59-
static MP_DEFINE_STR_OBJ(os_uname_info_release_obj, MICROPY_VERSION_STRING);
60-
static MP_DEFINE_STR_OBJ(os_uname_info_version_obj, MICROPY_GIT_TAG " on " MICROPY_BUILD_DATE);
61-
static MP_DEFINE_STR_OBJ(os_uname_info_machine_obj, machine);
62-
static MP_DEFINE_STR_OBJ(os_uname_info_qpyver_obj, QUECPYTHON_VERSION_STRING);
57+
static MP_DEFINE_STR_OBJ(os_uname_info_sysname_obj, sysname);
58+
static MP_DEFINE_STR_OBJ(os_uname_info_nodename_obj, nodename);
59+
static MP_DEFINE_STR_OBJ(os_uname_info_release_obj, MICROPY_VERSION_STRING);
60+
static MP_DEFINE_STR_OBJ(os_uname_info_version_obj, MICROPY_GIT_TAG " on " MICROPY_BUILD_DATE);
61+
static MP_DEFINE_STR_OBJ(os_uname_info_machine_obj, machine);
62+
static MP_DEFINE_STR_OBJ(os_uname_info_qpyver_obj, QUECPYTHON_VERSION_STRING);
6363

6464
static MP_DEFINE_ATTRTUPLE(
6565
os_uname_info_obj,
@@ -74,51 +74,51 @@ static MP_DEFINE_ATTRTUPLE(
7474
);
7575

7676
static mp_obj_t os_uname2(void) {
77-
Helios_Dev_GetProductName((void *)sysname, sizeof(sysname));
77+
Helios_Dev_GetProductName((void *)sysname, sizeof(sysname));
7878
Helios_Dev_GetModel((void *)nodename, sizeof(nodename));
79-
snprintf(machine, sizeof(machine), "%s with QUECTEL", nodename);
80-
81-
os_uname_info_sysname_obj.len = strlen(sysname);
82-
os_uname_info_nodename_obj.len = strlen(nodename);
83-
os_uname_info_machine_obj.len = strlen(machine);
84-
os_uname_info_qpyver_obj.len = strlen(QUECPYTHON_VERSION_STRING);
85-
return (mp_obj_t)&os_uname_info_obj;
79+
snprintf(machine, sizeof(machine), "%s with QUECTEL", nodename);
80+
81+
os_uname_info_sysname_obj.len = strlen(sysname);
82+
os_uname_info_nodename_obj.len = strlen(nodename);
83+
os_uname_info_machine_obj.len = strlen(machine);
84+
os_uname_info_qpyver_obj.len = strlen(QUECPYTHON_VERSION_STRING);
85+
return (mp_obj_t)&os_uname_info_obj;
8686
}
8787
static MP_DEFINE_CONST_FUN_OBJ_0(os_uname2_obj, os_uname2);
8888

8989

9090
static mp_obj_t os_uname(void) {
91-
char sysname[40] = {0};
92-
char nodname[20] = {0};
93-
char release[20] = {0};
94-
char machine[30] = {0};
95-
char version[128] = {0};
96-
// char qpy_ver[20] = {0};
91+
char sysname[40] = {0};
92+
char nodname[20] = {0};
93+
char release[20] = {0};
94+
char machine[30] = {0};
95+
char version[128] = {0};
96+
//char qpy_ver[20] = {0};
9797

9898
char mob_usb_product[64] = {0};
9999
char mob_model_id[64] = {0};
100-
// char _qpy_ver[20] = {0};
100+
//char _qpy_ver[20] = {0};
101101

102102
Helios_Dev_GetProductName((void *)mob_usb_product, sizeof(mob_usb_product));
103103
Helios_Dev_GetModel((void *)mob_model_id, sizeof(mob_model_id));
104-
// Helios_Dev_GetQpyVersion((void *)_qpy_ver, sizeof(_qpy_ver));
105-
106-
snprintf(sysname, sizeof(sysname), "sysname=%s", mob_usb_product);
107-
snprintf(nodname, sizeof(nodname), "nodename=%s", mob_model_id);
108-
snprintf(release, sizeof(release), "release=%s", MICROPY_VERSION_STRING);
109-
snprintf(version, sizeof(version), "version=%s on %s", MICROPY_GIT_TAG, MICROPY_BUILD_DATE);
110-
snprintf(machine, sizeof(machine), "machine=%s with QUECTEL", mob_model_id);
111-
// snprintf(qpy_ver, sizeof(qpy_ver), "qpyver=%s", _qpy_ver);
112-
113-
mp_obj_t tuple[6] = {
114-
mp_obj_new_str(sysname, strlen(sysname)),
115-
mp_obj_new_str(nodname, strlen(nodname)),
116-
mp_obj_new_str(release, strlen(release)),
117-
mp_obj_new_str(version, strlen(version)),
118-
mp_obj_new_str(machine, strlen(machine)),
119-
mp_obj_new_str("qpyver="QUECPYTHON_VERSION_STRING, strlen("qpyver="QUECPYTHON_VERSION_STRING)),
120-
};
121-
104+
//Helios_Dev_GetQpyVersion((void *)_qpy_ver, sizeof(_qpy_ver));
105+
106+
snprintf(sysname, sizeof(sysname), "sysname=%s", mob_usb_product);
107+
snprintf(nodname, sizeof(nodname), "nodename=%s", mob_model_id);
108+
snprintf(release, sizeof(release), "release=%s", MICROPY_VERSION_STRING);
109+
snprintf(version, sizeof(version), "version=%s on %s", MICROPY_GIT_TAG, MICROPY_BUILD_DATE);
110+
snprintf(machine, sizeof(machine), "machine=%s with QUECTEL", mob_model_id);
111+
//snprintf(qpy_ver, sizeof(qpy_ver), "qpyver=%s", _qpy_ver);
112+
113+
mp_obj_t tuple[6] = {
114+
mp_obj_new_str(sysname, strlen(sysname)),
115+
mp_obj_new_str(nodname, strlen(nodname)),
116+
mp_obj_new_str(release, strlen(release)),
117+
mp_obj_new_str(version, strlen(version)),
118+
mp_obj_new_str(machine, strlen(machine)),
119+
mp_obj_new_str("qpyver="QUECPYTHON_VERSION_STRING, strlen("qpyver="QUECPYTHON_VERSION_STRING)),
120+
};
121+
122122
return mp_obj_new_tuple(6, tuple);
123123
}
124124

@@ -150,7 +150,7 @@ static MP_DEFINE_CONST_FUN_OBJ_0(os_urandom___init___obj, os_urandom___init__);
150150
static mp_obj_t os_dupterm_notify(mp_obj_t obj_in) {
151151
(void)obj_in;
152152
for (;;) {
153-
int c = mp_uos_dupterm_rx_chr();
153+
int c = mp_os_dupterm_rx_chr();
154154
if (c < 0) {
155155
break;
156156
}
@@ -163,14 +163,14 @@ static MP_DEFINE_CONST_FUN_OBJ_1(os_dupterm_notify_obj, os_dupterm_notify);
163163

164164
extern const mp_obj_type_t helios_flash_device_type;
165165
static const mp_rom_map_elem_t os_module_globals_table[] = {
166-
{ MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_uos) },
166+
{ MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_os) },
167167
#if OS_URANDOM_SEED_ON_IMPORT
168168
{ MP_ROM_QSTR(MP_QSTR___init__), MP_ROM_PTR(&os_urandom___init___obj) },
169169
#endif
170-
{ MP_ROM_QSTR(MP_QSTR_uname), MP_ROM_PTR(&os_uname_obj) },
171-
{ MP_ROM_QSTR(MP_QSTR_uname2), MP_ROM_PTR(&os_uname2_obj) },
170+
{ MP_ROM_QSTR(MP_QSTR_uname), MP_ROM_PTR(&os_uname_obj) },
171+
{ MP_ROM_QSTR(MP_QSTR_uname2), MP_ROM_PTR(&os_uname2_obj) },
172172
#if MICROPY_PY_OS_DUPTERM
173-
{ MP_ROM_QSTR(MP_QSTR_dupterm), MP_ROM_PTR(&mp_uos_dupterm_obj) },
173+
{ MP_ROM_QSTR(MP_QSTR_dupterm), MP_ROM_PTR(&mp_os_dupterm_obj) },
174174
{ MP_ROM_QSTR(MP_QSTR_dupterm_notify), MP_ROM_PTR(&os_dupterm_notify_obj) },
175175
#endif
176176
{ MP_ROM_QSTR(MP_QSTR_FlashDevice), MP_ROM_PTR(&helios_flash_device_type) },
@@ -196,31 +196,31 @@ static const mp_rom_map_elem_t os_module_globals_table[] = {
196196
#if MICROPY_VFS_LFS2
197197
{ MP_ROM_QSTR(MP_QSTR_VfsLfs2), MP_ROM_PTR(&mp_type_vfs_lfs2) },
198198
#endif
199-
#if defined(PLAT_Qualcomm)
200-
{ MP_ROM_QSTR(MP_QSTR_VfsEfs), MP_ROM_PTR(&mp_type_vfs_efs) },
201-
#endif
199+
#if defined(PLAT_Qualcomm)
200+
{ MP_ROM_QSTR(MP_QSTR_VfsEfs), MP_ROM_PTR(&mp_type_vfs_efs) },
201+
#endif
202202
#if defined(PLAT_Unisoc_8910_R05) || defined(PLAT_Unisoc_8910_R06)
203-
{ MP_ROM_QSTR(MP_QSTR_VfsTemp), MP_ROM_PTR(&mp_type_vfs_temp) },
203+
{ MP_ROM_QSTR(MP_QSTR_VfsTemp), MP_ROM_PTR(&mp_type_vfs_temp) },
204204
#endif
205205
#if defined(PLAT_Unisoc_8910_R05) || defined(PLAT_Unisoc_8910_R06) || (defined(PLAT_Unisoc_8850_R02) && !defined(BOARD_EC800GCN_LD_XBND))
206-
{ MP_ROM_QSTR(MP_QSTR_VfsSd), MP_ROM_PTR(&mp_type_vfs_temp) },
206+
{ MP_ROM_QSTR(MP_QSTR_VfsSd), MP_ROM_PTR(&mp_type_vfs_temp) },
207207
#endif
208-
#if MICROPY_VFS_FAT_SDIO
208+
#if MICROPY_VFS_FAT_SDIO
209209
{ MP_ROM_QSTR(MP_QSTR_VfsEmmc), MP_ROM_PTR(&mp_type_vfs_sdio_emmc) },
210210
{ MP_ROM_QSTR(MP_QSTR_VfsSd), MP_ROM_PTR(&mp_type_vfs_sdio_sd) },
211-
#endif
212-
#if MICROPY_VFS_QUECFS
211+
#endif
212+
#if MICROPY_VFS_QUECFS
213213
{ MP_ROM_QSTR(MP_QSTR_VfsQuecfs), MP_ROM_PTR(&mp_type_vfs_quecfs) },
214-
#endif
214+
#endif
215215
#endif
216216
};
217217

218218
static MP_DEFINE_CONST_DICT(os_module_globals, os_module_globals_table);
219219

220-
const mp_obj_module_t uos_module = {
220+
const mp_obj_module_t os_module = {
221221
.base = { &mp_type_module },
222222
.globals = (mp_obj_dict_t *)&os_module_globals,
223223
};
224224

225-
MP_REGISTER_MODULE(MP_QSTR_uos, uos_module);
225+
MP_REGISTER_MODULE(MP_QSTR_os, os_module);
226226
#endif

0 commit comments

Comments
 (0)