Merge branch 'master' of https://github.com/rogerclarkmelbourne/Arduino_STM32
This commit is contained in:
commit
44d5894c3d
|
@ -71,8 +71,12 @@ class RTClock {
|
|||
uint8_t minute(time_t t) { breakTime(t, tmm); return tmm.minute; }
|
||||
uint8_t second(time_t t) { breakTime(t, tmm); return tmm.second; }
|
||||
uint8_t isPM(time_t t) { return (hour(t)>=12); }
|
||||
|
||||
// Usage: localtime = TimeZone(UnixTime, 8);
|
||||
time_t TimeZone(time_t t, int TZ) { return ( t + (TZ * SECS_PER_HOUR)); }
|
||||
|
||||
time_t TimeZone(time_t t, int TZ) { return ( t + (TZ * SECS_PER_HOUR)); } // usage: localtime = TimeZone(UnixTime, 8); // Beijing timezone = 8
|
||||
// Usage: 1. localtime = TimeZone(UnixTime, 9, 45) -> UTC +09:45 TimeZone;
|
||||
time_t TimeZone(time_t t, int HTZ, int MTZ) { return ( t + (HTZ * SECS_PER_HOUR) + (MTZ * 60)); } // HTZ = Hour offset, MTZ = Minute offset
|
||||
|
||||
void createAlarm(voidFuncPtr function, time_t alarm_time_t);
|
||||
void createAlarm(voidFuncPtr function, struct tm_t & alarm_tm);
|
||||
|
|
|
@ -109,6 +109,16 @@
|
|||
#define BOARD_USB_DISC_DEV GPIOC
|
||||
#define BOARD_USB_DISC_BIT 12
|
||||
|
||||
/*
|
||||
* SDIO Pins
|
||||
*/
|
||||
#define BOARD_SDIO_D0 PC8
|
||||
#define BOARD_SDIO_D1 PC9
|
||||
#define BOARD_SDIO_D2 PC10
|
||||
#define BOARD_SDIO_D3 PC11
|
||||
#define BOARD_SDIO_CLK PC12
|
||||
#define BOARD_SDIO_CMD PD2
|
||||
|
||||
/* Pin aliases: these give the GPIO port/bit for each pin as an
|
||||
* enum. These are optional, but recommended. They make it easier to
|
||||
* write code using low-level GPIO functionality. */
|
||||
|
|
|
@ -102,6 +102,16 @@
|
|||
#define BOARD_USB_DISC_DEV GPIOC
|
||||
#define BOARD_USB_DISC_BIT 12
|
||||
|
||||
/*
|
||||
* SDIO Pins
|
||||
*/
|
||||
#define BOARD_SDIO_D0 PC8
|
||||
#define BOARD_SDIO_D1 PC9
|
||||
#define BOARD_SDIO_D2 PC10
|
||||
#define BOARD_SDIO_D3 PC11
|
||||
#define BOARD_SDIO_CLK PC12
|
||||
#define BOARD_SDIO_CMD PD2
|
||||
|
||||
/* Pin aliases: these give the GPIO port/bit for each pin as an
|
||||
* enum. These are optional, but recommended. They make it easier to
|
||||
* write code using low-level GPIO functionality. */
|
||||
|
|
Loading…
Reference in New Issue