update time related functions.

Author: gengyong

ports/xt804/.gitignore

@@ -1,4 +1,6 @@
 # local debug folder
 temp
 
+# sdk folder
+sdk
 

ports/xt804/qstrdefsport.h

@@ -59,6 +59,8 @@ Q(ticks_cpu)
 Q(ticks_add)
 Q(ticks_diff)
 Q(time_ns)
+Q(unixtime)
+Q(SECONDS_1970_TO_2000)
 // -------------- xt804 ----------------
 Q(xt804)
 Q(Partition)
@@ -179,6 +181,11 @@ Q(Alarm)
 //---------------- WDT ----------------
 Q(feed)
 Q(past)
+//---------------- SPI ----------------
+Q(cs)
+
+
+
 
 
 

ports/xt804/src/hal_common.h

@@ -2,6 +2,7 @@
 #ifndef MPY_XT804_HAL_COMMON_H_
 #define MPY_XT804_HAL_COMMON_H_
 
+
 extern int8_t g_colorful_print;
 void hal_print(const char * label, const char * term, const char * fmt, ...);
 

ports/xt804/src/hal_uart0_core.c

@@ -135,8 +135,7 @@ int mp_hal_stdin_rx_chr(void) {
 if (stdin_ringbuf.iget != stdin_ringbuf.iput) {
 int code = 0;
 if (decode_utf8_from_buffer(&code)) {
- //if (code == mp_interrupt_char) {
- if (code == 3) {
+ if (code == mp_interrupt_char) {
  printf("INTERRRRRRRRUUUUUPPPPPPTT!\r\n");
  mp_sched_keyboard_interrupt();
  } else {

ports/xt804/src/machine_pin.c

@@ -26,6 +26,7 @@ typedef struct _machine_pin_obj_t {
  pin_gpio_t * gpio;
  uint32_t pin;
  uint32_t features;
+ char name[4];
  uint8_t id;
  uint8_t irq_slot;
 } machine_pin_obj_t;
@@ -48,6 +49,11 @@ const machine_pin_obj_t* machine_pin_get_obj(mp_obj_t pin_in);
 #define PIN_FEATURE_I2C_SDA ((uint32_t)0x00001000)
 #define PIN_FEATURE_I2S_MCLK ((uint32_t)0x00002000)
 
+#define PIN_FEATURE_SPI_CLK ((uint32_t)0x00010000)
+#define PIN_FEATURE_SPI_CS ((uint32_t)0x00020000)
+#define PIN_FEATURE_SPI_MOSI ((uint32_t)0x00040000)
+#define PIN_FEATURE_SPI_MISO ((uint32_t)0x00080000)
+
 
 
 

ports/xt804/src/machine_pin.h

@@ -135,9 +135,9 @@ static inline bool PWM_Calc_Prescaler_Period_By_Freq(uint32_t freq, uint32_t * o
  return true;
  }
 #else
- // 1. period 要能整除 (APB_CLK / freq), 不能整除也要保证余数最小。 这样可以保证freq精度。
- // 2. 使 period 尽量大，最大到256. 这样可以保证占空比精度。
- // 3. 使 period有更多因数， 特别是2， 5，10 的倍数. 这样方便设置占空比，有利于保证占空比精度。
+ // 1. period 要能整除 (APB_CLK / freq), 不能整除也要保证余数最小。 这样可以保证freq精度。<完成>
+ // 2. 使 period 尽量大，最大到256. 这样可以保证占空比精度。<完成>
+ // 3. 使 period有更多因数， 特别是2， 5，10 的倍数. 这样方便设置占空比，有利于保证占空比精度。<完不成>
  if (freq > 0 && freq <= APB_CLK) {
  int top = APB_CLK / freq;
 
@@ -241,6 +241,7 @@ mp_obj_t mp_machine_pwm_make_new(const mp_obj_type_t *type, size_t n_args, size_
  const machine_pin_obj_t * pin = MP_OBJ_TO_PTR(all_args[0]);
 
  // Get PWM channel.
+ // TODO: looking for better check method!
  mp_int_t pwnchan = 0;
  if (pin->features & PIN_FEATURE_PWN0) {
  pwnchan = 0;

ports/xt804/src/machine_pwm.c

@@ -39,13 +39,10 @@
 #include "shared/timeutils/timeutils.h"
 #include "modmachine.h"
 #include "mphalport.h"
+#include "mpy_hal_boot.h"
 
 #define RTC_ALARM_GROUP_CAPACITY (8)
 
-#define UNIX_TIMESTAMP_AT_2000 (946684800)
-
-PMU_HandleTypeDef xt804_rtc_source;
-
 typedef struct _machine_rtc_obj_t {
  mp_obj_base_t base;
 } machine_rtc_obj_t;
@@ -330,17 +327,8 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(machine_rtc_datetime_obj, 1, 2, machi
 
 
 STATIC mp_obj_t machine_rtc_timestamp(mp_obj_t self_in) {
- RTC_TimeTypeDef rtctime;
- HAL_PMU_RTC_GetTime(&xt804_rtc_source, &rtctime);
- uint32_t seconds = timeutils_seconds_since_2000(
- rtctime.Year + 2000, 
- rtctime.Month,
- rtctime.Date,
- rtctime.Hours,
- rtctime.Minutes,
- rtctime.Seconds
- );
- return mp_obj_new_int_from_ll((uint64_t)seconds + UNIX_TIMESTAMP_AT_2000);
+ uint32_t seconds = mp_hal_time_s();
+ return mp_obj_new_int_from_ll((uint64_t)seconds);
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_rtc_timestamp_obj, machine_rtc_timestamp);
 
@@ -607,7 +595,7 @@ const mp_obj_type_t machine_rtc_type = {
 STATIC void machine_rtc_alarm_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
  machine_rtc_alarm_obj_t *self = MP_OBJ_TO_PTR(self_in);
  int id = MPY_ARRAY_INDEX(machine_rtc_alarms_obj, self) % RTC_ALARM_GROUP_CAPACITY;
- mp_printf(print, "Alarm(id=%d, time=%ld)", id, self->alarm_datetime_s + UNIX_TIMESTAMP_AT_2000);
+ mp_printf(print, "Alarm(id=%d, time=%ld)", id, self->alarm_datetime_s + TIMEUTILS_SECONDS_1970_TO_2000);
 }
 
 STATIC mp_obj_t machine_rtc_alarm_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {