From 645b771533f289c146502ad91af5dfbd0d3af03f Mon Sep 17 00:00:00 2001 From: root Date: Wed, 19 Jun 2019 10:31:53 +0100 Subject: support V2 board --- app/timex.c | 40 +++++++++++++++++++++++++--------------- 1 file changed, 25 insertions(+), 15 deletions(-) diff --git a/app/timex.c b/app/timex.c index 6bc3ad2..a80843f 100644 --- a/app/timex.c +++ b/app/timex.c @@ -111,10 +111,15 @@ #define BUFFER_SIZE 2048 -#define TIMEX_INPUT_BANK GPIOB -#define TIMEX_INPUT_GPIO GPIO9 -#define TIMEX_OUTPUT_BANK GPIOB -#define TIMEX_OUTPUT_GPIO GPIO8 +#define TIMEX_INPUT1_BANK GPIOB +#define TIMEX_INPUT1_GPIO GPIO7 +#define TIMEX_OUTPUT1_BANK GPIOB +#define TIMEX_OUTPUT1_GPIO GPIO6 + +#define TIMEX_INPUT2_BANK GPIOB +#define TIMEX_INPUT2_GPIO GPIO9 +#define TIMEX_OUTPUT2_BANK GPIOB +#define TIMEX_OUTPUT2_GPIO GPIO8 ring_t timex_ring; static uint8_t timex_ring_buf[BUFFER_SIZE]; @@ -122,10 +127,13 @@ static uint8_t timex_ring_buf[BUFFER_SIZE]; static inline void timex_led (int v) { - if (v) - gpio_set (TIMEX_OUTPUT_BANK, TIMEX_OUTPUT_GPIO); - else - gpio_clear (TIMEX_OUTPUT_BANK, TIMEX_OUTPUT_GPIO); + if (v) { + gpio_set (TIMEX_OUTPUT1_BANK, TIMEX_OUTPUT1_GPIO); + gpio_set (TIMEX_OUTPUT2_BANK, TIMEX_OUTPUT2_GPIO); + } else { + gpio_clear (TIMEX_OUTPUT1_BANK, TIMEX_OUTPUT1_GPIO); + gpio_clear (TIMEX_OUTPUT2_BANK, TIMEX_OUTPUT2_GPIO); + } } @@ -312,13 +320,13 @@ uint8_t ex[] = { 0x05, 0x60, 0x03, 0x00, 0x78, // 0x00, // DATA START 0x20, 0x61, 0x01, 0x00, 0x0e, 0x00, 0x1b, 0x00, 0x26, 0x00, 0x39, 0x01, 0x01, 0x01, 0x01, 0x13, /**/ 0x03, 0x0d, 0x05, 0x05, 0x28, 0x9c, 0x62, 0x65, 0x95, 0x43, 0x2a, 0x59, 0xd6, 0xfd, 0x38, 0xc2, // DATA HEADER + DATA - 0x20, 0x61, 0x02, 0x0b, 0x01, 0x9c, 0x62, 0x65, 0x95, 0x43, 0x76, 0x0a, 0x47, 0xfd, 0x13, 0x04, + 0x20, 0x61, 0x02, 0x0b, 0x01, 0x9c, 0x62, 0x65, 0x95, 0x43, 0x76, 0x0a, 0x47, 0xfd, 0x13, 0x04, /**/ 0x54, 0x55, 0x55, 0x55, 0xcf, 0x8b, 0xb7, 0x35, 0x4e, 0x55, 0x91, 0x90, 0x83, 0x6d, 0xb6, 0x6a, //DATA - 0x17, 0x61, 0x03, 0x90, 0xf3, 0x03, 0x0f, 0x05, 0x01, 0x9c, 0x62, 0x65, 0x95, 0x43, 0x2e, 0xd2, + 0x17, 0x61, 0x03, 0x90, 0xf3, 0x03, 0x0f, 0x05, 0x01, 0x9c, 0x62, 0x65, 0x95, 0x43, 0x2e, 0xd2, /**/ 0xd6, 0x45, 0x8d, 0x22, 0xfe, 0xd4, 0x6e, // 0x00, //DATA - 0x04, 0x62, 0x29, 0x83, // DATA END - 0x08, 0x31, 0x01, 0x15, 0x18, 0x17, 0xba, 0x26, //TIME ZONE LABEL 1 - 0x08, 0x31, 0x02, 0x11, 0x17, 0x10, 0x0d, 0x23, //TIME ZONE LABEL 2 + 0x04, 0x62, 0x29, 0x83, + 0x08, 0x31, 0x01, 0x15, 0x18, 0x17, 0xba, 0x26, + 0x08, 0x31, 0x02, 0x11, 0x17, 0x10, 0x0d, 0x23, 0x12, 0x50, 0x01, 0x09, 0x00, 0x00, 0x00, 0x1c, 0x0a, 0x16, 0x19, 0x15, 0x0e, 0x24, 0x24, 0x01, /**/ 0x0e, 0x39, // ALARM 1 0x12, 0x50, 0x02, 0x00, 0x00, 0x00, 0x00, 0x0a, 0x15, 0x0a, 0x1b, 0x16, 0x24, 0x27, 0x02, 0x00, @@ -386,8 +394,10 @@ timex_init (void) #ifdef SEND_EXAMPLE_DATA send_example_data(); #endif - gpio_set_mode (TIMEX_INPUT_BANK, GPIO_MODE_INPUT, GPIO_CNF_INPUT_FLOAT, TIMEX_INPUT_GPIO); - gpio_set_mode (TIMEX_OUTPUT_BANK, GPIO_MODE_OUTPUT_2_MHZ, GPIO_CNF_OUTPUT_OPENDRAIN, TIMEX_OUTPUT_GPIO); + gpio_set_mode (TIMEX_INPUT1_BANK, GPIO_MODE_INPUT, GPIO_CNF_INPUT_FLOAT, TIMEX_INPUT1_GPIO); + gpio_set_mode (TIMEX_INPUT2_BANK, GPIO_MODE_INPUT, GPIO_CNF_INPUT_FLOAT, TIMEX_INPUT2_GPIO); + gpio_set_mode (TIMEX_OUTPUT1_BANK, GPIO_MODE_OUTPUT_2_MHZ, GPIO_CNF_OUTPUT_OPENDRAIN, TIMEX_OUTPUT1_GPIO); + gpio_set_mode (TIMEX_OUTPUT2_BANK, GPIO_MODE_OUTPUT_2_MHZ, GPIO_CNF_OUTPUT_OPENDRAIN, TIMEX_OUTPUT2_GPIO); timex_led (1); } -- cgit v1.2.3