@@ -50,16 +50,16 @@ extern const mp_obj_type_t mp_fat_vfs_type;
5050
5151
5252static 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
6464static MP_DEFINE_ATTRTUPLE (
6565 os_uname_info_obj ,
@@ -74,51 +74,51 @@ static MP_DEFINE_ATTRTUPLE(
7474 );
7575
7676static 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}
8787static MP_DEFINE_CONST_FUN_OBJ_0 (os_uname2_obj , os_uname2 ) ;
8888
8989
9090static 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
@@ -167,8 +167,8 @@ static const mp_rom_map_elem_t os_module_globals_table[] = {
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
173173 { 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 ) },
@@ -196,22 +196,22 @@ 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
0 commit comments