Embedded/pikapython
1
0
Fork 0
mirror of https://gitee.com/Lyon1998/pikapython.git synced 2025-01-15 17:02:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

asctime() return str, tick port win32

Browse Source
This commit is contained in:
Lyon 2024-01-02 16:22:21 +08:00
parent bf917e356a
commit c72702fce6
3 changed files with 27 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
port/linux/package/pikascript/_time.pyi
View File

@ -1,4 +1,4 @@
from PikaObj import *
from PikaObj import *
def __init__(self): ...
@ -30,12 +30,12 @@ def mktime(self) -> int:
@PIKA_C_MACRO_IF("PIKA_STD_DEVICE_UNIX_TIME_ENABLE")
def asctime(self):
def asctime(self) -> str:
"""Convert struct_time to string."""
@PIKA_C_MACRO_IF("PIKA_STD_DEVICE_UNIX_TIME_ENABLE")
def ctime(self, unix_time: float):
def ctime(self, unix_time: float) -> str:
"""Convert unix time to string."""

33
port/linux/package/pikascript/pikascript-lib/time/_time.c
View File

@ -1,4 +1,4 @@
#include "_time.h"
#include "_time.h"
#include "PikaVM.h"
#if defined(__linux)
#include <unistd.h>
@ -415,19 +415,6 @@ int64_t time_mktime(const _tm* this_tm, int locale) {
return unix_time;
}
void time_asctime(const _tm* this_tm) {
const char* week[] = {"Sun", "Mon", "Tues", "Wed", "Thur", "Fri", "Sat"};
const char* month[] = {"Jan", "Feb", "Mar", "Apr", "May", "Jun",
"Jul", "Aug", "Sept", "Oct", "Nov", "Dec"};
char str[100];
sprintf(str, "%s %s %d %02d:%02d:%02d %d", week[this_tm->tm_wday],
month[this_tm->tm_mon], this_tm->tm_mday, this_tm->tm_hour,
this_tm->tm_min, this_tm->tm_sec, this_tm->tm_year);
time_printf("%s\n", str);
}
pika_float _time_time(PikaObj* self) {
/* run platformGetTick() */
PIKA_PYTHON_BEGIN
@ -535,17 +522,17 @@ int _time_mktime(PikaObj* self) {
#endif
}
void _time_asctime(PikaObj* self) {
char* _time_asctime(PikaObj* self) {
#if !PIKA_STD_DEVICE_UNIX_TIME_ENABLE
obj_setErrorCode(self, 1);
obj_setSysOut(
self, "[error] PIKA_STD_DEVICE_UNIX_TIME_ENABLE need to be enable.");
#else
_time_ctime(self, _time_time(self));
return _time_ctime(self, _time_time(self));
#endif
}
void _time_ctime(PikaObj* self, pika_float unix_time) {
char* _time_ctime(PikaObj* self, pika_float unix_time) {
#if !PIKA_STD_DEVICE_UNIX_TIME_ENABLE
obj_setErrorCode(self, 1);
obj_setSysOut(
@ -554,7 +541,17 @@ void _time_ctime(PikaObj* self, pika_float unix_time) {
_tm this_tm;
int locale = g_pika_local_timezone;
time_localtime(unix_time, &this_tm, locale);
time_asctime(&this_tm);
const char* week[] = { "Sun", "Mon", "Tues", "Wed", "Thur", "Fri", "Sat" };
const char* month[] = { "Jan", "Feb", "Mar", "Apr", "May", "Jun",
"Jul", "Aug", "Sept", "Oct", "Nov", "Dec" };
char str[100];
sprintf(str, "%s %s %d %02d:%02d:%02d %d", week[this_tm.tm_wday],
month[this_tm.tm_mon], this_tm.tm_mday, this_tm.tm_hour,
this_tm.tm_min, this_tm.tm_sec, this_tm.tm_year);
// time_printf("%s\n", str);
return obj_cacheStr(self, str);
#endif
}

9
src/PikaPlatform.c
View File

@ -156,6 +156,15 @@ PIKA_WEAK int64_t pika_platform_get_tick(void) {
#elif PIKA_RTTHREAD_ENABLE
uint32_t tick = rt_tick_get() * 1000;
return (uint32_t)((tick + RT_TICK_PER_SECOND - 1) / RT_TICK_PER_SECOND);
#elif defined(_WIN32) && !defined(CROSS_BUILD)
FILETIME ft;
ULARGE_INTEGER ull;
GetSystemTimeAsFileTime(&ft); // 获取当前时间
ull.LowPart = ft.dwLowDateTime;
ull.HighPart = ft.dwHighDateTime;
ull.QuadPart -= 116444736000000000;
ull.QuadPart /= 10000;
return ull.QuadPart;
#else
return -1;
#endif