From a1e4ac0bb75c90d9a6f6bfba41b4249015a87dc8 Mon Sep 17 00:00:00 2001 From: erikkaashoek Date: Tue, 1 Dec 2020 08:57:13 +0100 Subject: [PATCH] Conversion to line --- NANOVNA_STM32_F303/board.h | 431 +++++++++++++++++++++++++++++++++++-- sa_core.c | 4 +- si4432.c | 54 ++--- si4432.h | 2 +- 4 files changed, 449 insertions(+), 42 deletions(-) diff --git a/NANOVNA_STM32_F303/board.h b/NANOVNA_STM32_F303/board.h index 793d633..397b676 100644 --- a/NANOVNA_STM32_F303/board.h +++ b/NANOVNA_STM32_F303/board.h @@ -55,6 +55,410 @@ /* on-board */ +#if 0 +#define TINYSA4_PROTO +#define GPIO_LED 0 +#define LINE_LED PAL_LINE(GPIOA,GPIO_LED) +#define GPIOA_LEVER1 1 +#define GPIOA_LEVER2 2 +#define GPIOA_PUSH 3 +#define GPIO_SD_DAT2 4 +#define LINE_SD_DAT2 PAL_LINE(GPIOA,GPIO_SD_DAT2) +#define GPIOA_DAC2 5 +#define GPIOA_XP 6 +#define GPIOA_YP 7 +#define GPIO_LNA 8 +#define LINE_LNA PAL_LINE(GPIOA, GPIO_LNA) +#define GPIO_UART_TX 9 +#define GPIO_UART_TX_PORT GPIOA +#define GPIO_UART_RX 10 +#define GPIO_UART_RX_PORT GPIOA +#define GPIOA_USB_DM 11 +#define GPIOA_USB_DP 12 +#define GPIOA_JTMS 13 +#define GPIOA_JTCK 14 +#define GPIO_PE_SEL 15 +#define LINE_PE_SEL PAL_LINE(GPIOA,GPIO_PE_SEL) + +#define GPIOB_XN 0 +#define GPIOB_YN 1 +#define GPIO_LCD_RESET 2 +#define GPIO_LCD_RESET_PORT GPIOB +#define GPIOB_SPI_SCLK 3 +#define GPIOB_SPI_MISO 4 +#define GPIOB_SPI_MOSI 5 +#define GPIO_LO_SEL 6 +#define LINE_LO_SEL PAL_LINE(GPIOB, GPIO_LO_SEL) +#define GPIO_SD_CD 7 +#define LINE_SD_CD PAL_LINE(GPIOB, GPIO_SD_CD) +#define GPIO_RX_SEL 8 +#define LINE_RX_SEL PAL_LINE(GPIOB, GPIO_RX_SEL) +#define GPIO_RX_CTS 9 +#define LINE_RX_CTS PAL_LINE(GPIOB, GPIO_RX_CTS) +#define GPIO_LCD_CD 10 +#define GPIO_LCD_CD_PORT GPIOB +#define GPIO_LCD_CS 11 +#define GPIO_LCD_CS_PORT GPIOB +#define GPIO_RX_SDN 12 +#define LINE_RX_SDN PAL_LINE(GPIOB, GPIO_RX_SDN) +#define GPIO_PB13 13 +#define LINE_PB13 PAL_LINE(GPIOB, GPIO_PB13) +#define GPIO_PB14 14 +#define LINE_PB14 PAL_LINE(GPIOB, GPIO_PB14) +#define GPIO_ULTRA 15 +#define LINE_ULTRA PAL_LINE(GPIOB,GPIO_ULTRA) + +#define GPIO_SD_CS 13 +#define LINE_SD_CS PAL_LINE(GPIOC, GPIO_SD_CS) + + +#define GPIOF_OSC_IN 0 +#define GPIOF_OSC_OUT 1 + + +/* + * I/O ports initial setup, this configuration is established soon after reset + * in the initialization code. + * Please refer to the STM32 Reference Manual for details. + */ +#define PIN_MODE_INPUT(n) (0U << ((n) * 2U)) +#define PIN_MODE_OUTPUT(n) (1U << ((n) * 2U)) +#define PIN_MODE_ALTERNATE(n) (2U << ((n) * 2U)) +#define PIN_MODE_ANALOG(n) (3U << ((n) * 2U)) +#define PIN_ODR_LOW(n) (0U << (n)) +#define PIN_ODR_HIGH(n) (1U << (n)) +#define PIN_OTYPE_PUSHPULL(n) (0U << (n)) +#define PIN_OTYPE_OPENDRAIN(n) (1U << (n)) +#define PIN_OSPEED_2M(n) (0U << ((n) * 2U)) +#define PIN_OSPEED_25M(n) (1U << ((n) * 2U)) +#define PIN_OSPEED_50M(n) (2U << ((n) * 2U)) +#define PIN_OSPEED_100M(n) (3U << ((n) * 2U)) +#define PIN_PUPDR_FLOATING(n) (0U << ((n) * 2U)) +#define PIN_PUPDR_PULLUP(n) (1U << ((n) * 2U)) +#define PIN_PUPDR_PULLDOWN(n) (2U << ((n) * 2U)) +#define PIN_AFIO_AF(n, v) ((v##U) << (((n) % 8U) * 4U)) + +/* + * GPIOA setup: + * + * PA8 - MCO (alternate 0). + * PA11 - USB_DM (alternate 14). + * PA12 - USB_DP (alternate 14). + * PA13 - SWDIO (alternate 0). + * PA14 - SWCLK (alternate 0). + */ +#define VAL_GPIOA_MODER (PIN_MODE_OUTPUT(0U) | \ + PIN_MODE_INPUT(1U) | \ + PIN_MODE_INPUT(2U) | \ + PIN_MODE_INPUT(3U) | \ + PIN_MODE_OUTPUT(4U) | \ + PIN_MODE_ANALOG(GPIOA_DAC2) | \ + PIN_MODE_ANALOG(GPIOA_XP) | \ + PIN_MODE_ANALOG(GPIOA_YP) | \ + PIN_MODE_OUTPUT(8U) | \ + PIN_MODE_OUTPUT(9U) | \ + PIN_MODE_INPUT(10U) | \ + PIN_MODE_ALTERNATE(GPIOA_USB_DM) | \ + PIN_MODE_ALTERNATE(GPIOA_USB_DP) | \ + PIN_MODE_ALTERNATE(GPIOA_JTMS) | \ + PIN_MODE_ALTERNATE(GPIOA_JTCK) | \ + PIN_MODE_OUTPUT(15)) +#define VAL_GPIOA_OTYPER (PIN_OTYPE_PUSHPULL(0U) | \ + PIN_OTYPE_PUSHPULL(1U) | \ + PIN_OTYPE_PUSHPULL(2U) | \ + PIN_OTYPE_PUSHPULL(3U) | \ + PIN_OTYPE_PUSHPULL(4U) | \ + PIN_OTYPE_PUSHPULL(5U) | \ + PIN_OTYPE_PUSHPULL(6U) | \ + PIN_OTYPE_PUSHPULL(7U) | \ + PIN_OTYPE_PUSHPULL(8U) | \ + PIN_OTYPE_PUSHPULL(9) | \ + PIN_OTYPE_PUSHPULL(10) | \ + PIN_OTYPE_PUSHPULL(GPIOA_USB_DM) | \ + PIN_OTYPE_PUSHPULL(GPIOA_USB_DP) | \ + PIN_OTYPE_PUSHPULL(GPIOA_JTMS) | \ + PIN_OTYPE_PUSHPULL(GPIOA_JTCK) | \ + PIN_OTYPE_PUSHPULL(15)) +#define VAL_GPIOA_OSPEEDR (PIN_OSPEED_2M(0) | \ + PIN_OSPEED_2M(1) | \ + PIN_OSPEED_2M(2) | \ + PIN_OSPEED_2M(3) | \ + PIN_OSPEED_2M(4) | \ + PIN_OSPEED_2M(5) | \ + PIN_OSPEED_2M(6) | \ + PIN_OSPEED_2M(7) | \ + PIN_OSPEED_100M(8U) | \ + PIN_OSPEED_100M(9) | \ + PIN_OSPEED_100M(10) | \ + PIN_OSPEED_100M(GPIOA_USB_DM) | \ + PIN_OSPEED_100M(GPIOA_USB_DP) | \ + PIN_OSPEED_100M(GPIOA_JTMS) | \ + PIN_OSPEED_100M(GPIOA_JTCK) | \ + PIN_OSPEED_100M(15)) +#define VAL_GPIOA_PUPDR (PIN_PUPDR_FLOATING(0) | \ + PIN_PUPDR_PULLDOWN(1) | \ + PIN_PUPDR_PULLDOWN(2) | \ + PIN_PUPDR_PULLDOWN(3) | \ + PIN_PUPDR_PULLUP(4) | \ + PIN_PUPDR_FLOATING(5) | \ + PIN_PUPDR_FLOATING(6) | \ + PIN_PUPDR_FLOATING(7) | \ + PIN_PUPDR_PULLUP(8U) | \ + PIN_PUPDR_PULLUP(9) | \ + PIN_PUPDR_PULLUP(10) | \ + PIN_PUPDR_FLOATING(GPIOA_USB_DM) | \ + PIN_PUPDR_FLOATING(GPIOA_USB_DP) | \ + PIN_PUPDR_PULLDOWN(GPIOA_JTMS) | \ + PIN_PUPDR_PULLDOWN(GPIOA_JTCK) | \ + PIN_PUPDR_PULLUP(15)) +#define VAL_GPIOA_ODR (PIN_ODR_HIGH(0) | \ + PIN_ODR_HIGH(1) | \ + PIN_ODR_HIGH(2) | \ + PIN_ODR_HIGH(3) | \ + PIN_ODR_HIGH(4) | \ + PIN_ODR_LOW(5) | \ + PIN_ODR_HIGH(6) | \ + PIN_ODR_HIGH(7) | \ + PIN_ODR_HIGH(8U) | \ + PIN_ODR_HIGH(9) | \ + PIN_ODR_HIGH(10) | \ + PIN_ODR_HIGH(GPIOA_USB_DM) | \ + PIN_ODR_HIGH(GPIOA_USB_DP) | \ + PIN_ODR_HIGH(GPIOA_JTMS) | \ + PIN_ODR_HIGH(GPIOA_JTCK) | \ + PIN_ODR_HIGH(15)) +#define VAL_GPIOA_AFRL (PIN_AFIO_AF(0, 0) | \ + PIN_AFIO_AF(1, 0) | \ + PIN_AFIO_AF(2, 0) | \ + PIN_AFIO_AF(3, 0) | \ + PIN_AFIO_AF(4, 0) | \ + PIN_AFIO_AF(5, 0) | \ + PIN_AFIO_AF(6, 0) | \ + PIN_AFIO_AF(7, 0)) +#define VAL_GPIOA_AFRH (PIN_AFIO_AF(8U, 0) | \ + PIN_AFIO_AF(9, 0) | \ + PIN_AFIO_AF(10, 0) | \ + PIN_AFIO_AF(GPIOA_USB_DM, 14) | \ + PIN_AFIO_AF(GPIOA_USB_DP, 14) | \ + PIN_AFIO_AF(GPIOA_JTMS, 0) | \ + PIN_AFIO_AF(GPIOA_JTCK, 0) | \ + PIN_AFIO_AF(15, 0)) + +/* + * GPIOB setup: + * + * PB0 - XN analog + * PB1 - YN analog + * PB3 - SPI1_SCLK (alternate 5). + * PB4 - SPI1_MISO (alternate 5). + * PB5 - SPI1_MOSI (alternate 5). + * PB8 - I2C1_SCL (alternate 4). + * PB9 - I2C1_SDA (alternate 4). + * PB12 - I2S2_WCLK (alternate 5). + * PB13 - I2S2_BCLK (alternate 5). + * PB15 - I2S2_MOSI (alternate 5). + */ +#define VAL_GPIOB_MODER (PIN_MODE_ANALOG(GPIOB_XN) | \ + PIN_MODE_ANALOG(GPIOB_YN) | \ + PIN_MODE_OUTPUT(2) | \ + PIN_MODE_ALTERNATE(GPIOB_SPI_SCLK) | \ + PIN_MODE_ALTERNATE(GPIOB_SPI_MISO) | \ + PIN_MODE_ALTERNATE(GPIOB_SPI_MOSI) | \ + PIN_MODE_OUTPUT(6) | \ + PIN_MODE_OUTPUT(7) | \ + PIN_MODE_OUTPUT(8) | \ + PIN_MODE_INPUT(9) | \ + PIN_MODE_OUTPUT(10) | \ + PIN_MODE_OUTPUT(11) | \ + PIN_MODE_OUTPUT(12) | \ + PIN_MODE_OUTPUT(13) | \ + PIN_MODE_OUTPUT(14) | \ + PIN_MODE_OUTPUT(15)) +#define VAL_GPIOB_OTYPER (PIN_OTYPE_PUSHPULL(0) | \ + PIN_OTYPE_PUSHPULL(1) | \ + PIN_OTYPE_PUSHPULL(2) | \ + PIN_OTYPE_PUSHPULL(3) | \ + PIN_OTYPE_PUSHPULL(4) | \ + PIN_OTYPE_PUSHPULL(5) | \ + PIN_OTYPE_PUSHPULL(6) | \ + PIN_OTYPE_PUSHPULL(7) | \ + PIN_OTYPE_PUSHPULL(8) | \ + PIN_OTYPE_PUSHPULL(9) | \ + PIN_OTYPE_PUSHPULL(10) | \ + PIN_OTYPE_PUSHPULL(11) | \ + PIN_OTYPE_PUSHPULL(12) | \ + PIN_OTYPE_PUSHPULL(13) | \ + PIN_OTYPE_PUSHPULL(14) | \ + PIN_OTYPE_PUSHPULL(15)) +#define VAL_GPIOB_OSPEEDR (PIN_PUPDR_FLOATING(GPIOB_XN) | \ + PIN_PUPDR_FLOATING(GPIOB_YN) | \ + PIN_OSPEED_100M(2) | \ + PIN_OSPEED_100M(3) | \ + PIN_OSPEED_100M(4) | \ + PIN_OSPEED_100M(5) | \ + PIN_OSPEED_100M(6) | \ + PIN_OSPEED_100M(7) | \ + PIN_OSPEED_100M(8) | \ + PIN_OSPEED_100M(9) | \ + PIN_OSPEED_100M(10) | \ + PIN_OSPEED_100M(11) | \ + PIN_OSPEED_100M(12) | \ + PIN_OSPEED_100M(13) | \ + PIN_OSPEED_100M(14) | \ + PIN_OSPEED_100M(15)) +#define VAL_GPIOB_PUPDR (PIN_PUPDR_PULLUP(0) | \ + PIN_PUPDR_PULLUP(1) | \ + PIN_PUPDR_PULLUP(2) | \ + PIN_PUPDR_PULLUP(3) | \ + PIN_PUPDR_PULLUP(4) | \ + PIN_PUPDR_PULLUP(5) | \ + PIN_PUPDR_PULLUP(6) | \ + PIN_PUPDR_PULLUP(7) | \ + PIN_PUPDR_PULLUP(8) | \ + PIN_PUPDR_PULLUP(9) | \ + PIN_PUPDR_PULLUP(10) | \ + PIN_PUPDR_PULLUP(11) | \ + PIN_PUPDR_PULLUP(12) | \ + PIN_PUPDR_PULLUP(13) | \ + PIN_PUPDR_PULLUP(14) | \ + PIN_PUPDR_PULLUP(15)) +#define VAL_GPIOB_ODR (PIN_ODR_HIGH(0) | \ + PIN_ODR_HIGH(1) | \ + PIN_ODR_HIGH(2) | \ + PIN_ODR_HIGH(3) | \ + PIN_ODR_HIGH(4) | \ + PIN_ODR_HIGH(5) | \ + PIN_ODR_HIGH(6) | \ + PIN_ODR_HIGH(7) | \ + PIN_ODR_HIGH(8) | \ + PIN_ODR_HIGH(9) | \ + PIN_ODR_HIGH(10) | \ + PIN_ODR_HIGH(11) | \ + PIN_ODR_HIGH(12) | \ + PIN_ODR_HIGH(13) | \ + PIN_ODR_HIGH(14) | \ + PIN_ODR_HIGH(15)) +#define VAL_GPIOB_AFRL (PIN_AFIO_AF(0, 0) | \ + PIN_AFIO_AF(1, 0) | \ + PIN_AFIO_AF(2, 0) | \ + PIN_AFIO_AF(GPIOB_SPI_SCLK, 5) | \ + PIN_AFIO_AF(GPIOB_SPI_MOSI, 5) | \ + PIN_AFIO_AF(GPIOB_SPI_MISO, 5) | \ + PIN_AFIO_AF(6, 0) | \ + PIN_AFIO_AF(7, 0)) +#define VAL_GPIOB_AFRH (PIN_AFIO_AF(8, 0) | \ + PIN_AFIO_AF(9, 0) | \ + PIN_AFIO_AF(10, 0) | \ + PIN_AFIO_AF(11, 0) | \ + PIN_AFIO_AF(12, 0) | \ + PIN_AFIO_AF(13, 0) | \ + PIN_AFIO_AF(14, 0) | \ + PIN_AFIO_AF(15, 0)) +/* + * GPIOC setup: + * + * PC13 - LED (output pushpull maximum). + * PC14 - USB DISC (output pushpull maximum). + */ + +#define VAL_GPIOC_MODER (PIN_MODE_INPUT(0) | \ + PIN_MODE_INPUT(1) | \ + PIN_MODE_INPUT(2) | \ + PIN_MODE_INPUT(3) | \ + PIN_MODE_INPUT(4) | \ + PIN_MODE_INPUT(5) | \ + PIN_MODE_INPUT(6) | \ + PIN_MODE_INPUT(7) | \ + PIN_MODE_INPUT(8) | \ + PIN_MODE_INPUT(9) | \ + PIN_MODE_INPUT(10) | \ + PIN_MODE_INPUT(11) | \ + PIN_MODE_INPUT(12) | \ + PIN_MODE_OUTPUT(13) | \ + PIN_MODE_INPUT(14) | \ + PIN_MODE_OUTPUT(15)) +#define VAL_GPIOC_OTYPER (PIN_OTYPE_PUSHPULL(0) | \ + PIN_OTYPE_PUSHPULL(1) | \ + PIN_OTYPE_PUSHPULL(2) | \ + PIN_OTYPE_PUSHPULL(3) | \ + PIN_OTYPE_PUSHPULL(4) | \ + PIN_OTYPE_PUSHPULL(5) | \ + PIN_OTYPE_PUSHPULL(6) | \ + PIN_OTYPE_PUSHPULL(7) | \ + PIN_OTYPE_PUSHPULL(8) | \ + PIN_OTYPE_PUSHPULL(9) | \ + PIN_OTYPE_PUSHPULL(10) | \ + PIN_OTYPE_PUSHPULL(11) | \ + PIN_OTYPE_PUSHPULL(12) | \ + PIN_OTYPE_PUSHPULL(13) | \ + PIN_OTYPE_PUSHPULL(14) | \ + PIN_OTYPE_PUSHPULL(15)) +#define VAL_GPIOC_OSPEEDR (PIN_OSPEED_100M(0) | \ + PIN_OSPEED_100M(1) | \ + PIN_OSPEED_100M(2) | \ + PIN_OSPEED_100M(3) | \ + PIN_OSPEED_100M(4) | \ + PIN_OSPEED_100M(5) | \ + PIN_OSPEED_100M(6) | \ + PIN_OSPEED_100M(7) | \ + PIN_OSPEED_100M(8) | \ + PIN_OSPEED_100M(9) | \ + PIN_OSPEED_100M(10) | \ + PIN_OSPEED_100M(11) | \ + PIN_OSPEED_100M(12) | \ + PIN_OSPEED_100M(13) | \ + PIN_OSPEED_100M(14) | \ + PIN_OSPEED_100M(15)) +#define VAL_GPIOC_PUPDR (PIN_PUPDR_PULLUP(0) | \ + PIN_PUPDR_PULLUP(1) | \ + PIN_PUPDR_PULLUP(2) | \ + PIN_PUPDR_PULLUP(3) | \ + PIN_PUPDR_PULLUP(4) | \ + PIN_PUPDR_PULLUP(5) | \ + PIN_PUPDR_PULLUP(6) | \ + PIN_PUPDR_PULLUP(7) | \ + PIN_PUPDR_PULLUP(8) | \ + PIN_PUPDR_PULLUP(9) | \ + PIN_PUPDR_PULLUP(10) | \ + PIN_PUPDR_PULLUP(11) | \ + PIN_PUPDR_PULLUP(12) | \ + PIN_PUPDR_FLOATING(13) | \ + PIN_PUPDR_FLOATING(14) | \ + PIN_PUPDR_FLOATING(15)) +#define VAL_GPIOC_ODR (PIN_ODR_HIGH(0) | \ + PIN_ODR_HIGH(1) | \ + PIN_ODR_HIGH(2) | \ + PIN_ODR_HIGH(3) | \ + PIN_ODR_HIGH(4) | \ + PIN_ODR_HIGH(5) | \ + PIN_ODR_HIGH(6) | \ + PIN_ODR_HIGH(7) | \ + PIN_ODR_HIGH(8) | \ + PIN_ODR_HIGH(9) | \ + PIN_ODR_HIGH(10) | \ + PIN_ODR_HIGH(11) | \ + PIN_ODR_HIGH(12) | \ + PIN_ODR_HIGH(13) | \ + PIN_ODR_HIGH(14) | \ + PIN_ODR_HIGH(15)) +#define VAL_GPIOC_AFRL (PIN_AFIO_AF(0, 0) | \ + PIN_AFIO_AF(1, 0) | \ + PIN_AFIO_AF(2, 0) | \ + PIN_AFIO_AF(3, 0) | \ + PIN_AFIO_AF(4, 0) | \ + PIN_AFIO_AF(5, 0) | \ + PIN_AFIO_AF(6, 0) | \ + PIN_AFIO_AF(7, 0)) +#define VAL_GPIOC_AFRH (PIN_AFIO_AF(8, 0) | \ + PIN_AFIO_AF(9, 0) | \ + PIN_AFIO_AF(10, 0) | \ + PIN_AFIO_AF(11, 0) | \ + PIN_AFIO_AF(12, 0) | \ + PIN_AFIO_AF(13, 0) | \ + PIN_AFIO_AF(14, 0) | \ + PIN_AFIO_AF(15, 0)) + +#else //#define GPIOA_BUTTON 0 #define GPIOA_LEVER1 1 #define GPIOA_LEVER2 2 @@ -65,7 +469,7 @@ #define GPIOA_YP 7 //#define GPIOA_MCO 8 #define GPIO_PE_SEL 9 -#define GPIO_PE_SEL_PORT GPIOA +#define LINE_PE_SEL PAL_LINE(GPIOA,GPIO_PE_SEL) #define GPIO_RF_PWR 10 #define GPIO_RF_PWR_PORT GPIOA #define GPIOA_USB_DM 11 @@ -78,7 +482,7 @@ #define GPIOB_XN 0 #define GPIOB_YN 1 #define GPIO_RX_SEL 2 -#define GPIO_RX_SEL_PORT GPIOB +#define LINE_RX_SEL PAL_LINE(GPIOB,GPIO_RX_SEL) #define GPIOB_SPI_SCLK 3 #define GPIOB_SPI_MISO 4 #define GPIOB_SPI_MOSI 5 @@ -89,7 +493,7 @@ //#define 8 8 //#define 9 9 #define GPIO_LO_SEL 10 -#define GPIO_LO_SEL_PORT GPIOB +#define LINE_LO_SEL PAL_LINE(GPIOB,GPIO_LO_SEL) #define GPIO_SD_CS 11 #define GPIO_SD_CS_PORT GPIOB //#define 12 12 @@ -98,7 +502,11 @@ //#define 15 15 #define GPIO_LED 13 -#define GPIO_LED_PORT GPIOC +#define LINE_LED PAL_LINE(GPIOC,13) +#define GPIO_RX_CTS 14 +#define LINE_RX_CTS PAL_LINE(GPIOC,14) +#define GPIO_RX_SDN 15 +#define LINE_RX_SDN PAL_LINE(GPIOC,15) #define GPIOF_OSC_IN 0 #define GPIOF_OSC_OUT 1 @@ -348,8 +756,6 @@ * PC13 - LED (output pushpull maximum). * PC14 - USB DISC (output pushpull maximum). */ -#define GPIOC_LED 13 - #define VAL_GPIOC_MODER (PIN_MODE_INPUT(0) | \ PIN_MODE_INPUT(1) | \ PIN_MODE_INPUT(2) | \ @@ -363,7 +769,7 @@ PIN_MODE_INPUT(10) | \ PIN_MODE_INPUT(11) | \ PIN_MODE_INPUT(12) | \ - PIN_MODE_OUTPUT(GPIOC_LED) | \ + PIN_MODE_OUTPUT(13) | \ PIN_MODE_INPUT(14) | \ PIN_MODE_OUTPUT(15)) #define VAL_GPIOC_OTYPER (PIN_OTYPE_PUSHPULL(0) | \ @@ -379,7 +785,7 @@ PIN_OTYPE_PUSHPULL(10) | \ PIN_OTYPE_PUSHPULL(11) | \ PIN_OTYPE_PUSHPULL(12) | \ - PIN_OTYPE_PUSHPULL(GPIOC_LED) | \ + PIN_OTYPE_PUSHPULL(13) | \ PIN_OTYPE_PUSHPULL(14) | \ PIN_OTYPE_PUSHPULL(15)) #define VAL_GPIOC_OSPEEDR (PIN_OSPEED_100M(0) | \ @@ -395,7 +801,7 @@ PIN_OSPEED_100M(10) | \ PIN_OSPEED_100M(11) | \ PIN_OSPEED_100M(12) | \ - PIN_OSPEED_100M(GPIOC_LED) | \ + PIN_OSPEED_100M(13) | \ PIN_OSPEED_100M(14) | \ PIN_OSPEED_100M(15)) #define VAL_GPIOC_PUPDR (PIN_PUPDR_PULLUP(0) | \ @@ -411,7 +817,7 @@ PIN_PUPDR_PULLUP(10) | \ PIN_PUPDR_PULLUP(11) | \ PIN_PUPDR_PULLUP(12) | \ - PIN_PUPDR_FLOATING(GPIOC_LED) | \ + PIN_PUPDR_FLOATING(13) | \ PIN_PUPDR_FLOATING(14) | \ PIN_PUPDR_FLOATING(15)) #define VAL_GPIOC_ODR (PIN_ODR_HIGH(0) | \ @@ -427,7 +833,7 @@ PIN_ODR_HIGH(10) | \ PIN_ODR_HIGH(11) | \ PIN_ODR_HIGH(12) | \ - PIN_ODR_HIGH(GPIOC_LED) | \ + PIN_ODR_HIGH(13) | \ PIN_ODR_HIGH(14) | \ PIN_ODR_HIGH(15)) #define VAL_GPIOC_AFRL (PIN_AFIO_AF(0, 0) | \ @@ -443,9 +849,10 @@ PIN_AFIO_AF(10, 0) | \ PIN_AFIO_AF(11, 0) | \ PIN_AFIO_AF(12, 0) | \ - PIN_AFIO_AF(GPIOC_LED, 0) | \ + PIN_AFIO_AF(13, 0) | \ PIN_AFIO_AF(14, 0) | \ PIN_AFIO_AF(15, 0)) +#endif /* * GPIOD setup: diff --git a/sa_core.c b/sa_core.c index f864c28..61a7509 100644 --- a/sa_core.c +++ b/sa_core.c @@ -2113,7 +2113,7 @@ static bool sweep(bool break_on_operation) palClearPad(GPIOB, GPIOB_LED); #endif #ifdef TINYSA4 - palClearPad(GPIOC, GPIOC_LED); + palClearLine(LINE_LED); #endif downslope = true; // Initialize the peak search algorithm temppeakLevel = -150; @@ -2718,7 +2718,7 @@ sweep_again: // stay in sweep loop when output mo palSetPad(GPIOB, GPIOB_LED); #endif #ifdef TINYSA4 - palSetPad(GPIOC, GPIOC_LED); + palSetLine(LINE_LED); #endif return true; diff --git a/si4432.c b/si4432.c index 70d2ac1..9eebdac 100644 --- a/si4432.c +++ b/si4432.c @@ -1,4 +1,4 @@ - /* +/* * This is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3, or (at your option) @@ -32,12 +32,12 @@ // 10MHz clock #define SI4432_10MHZ 10000000U // !!!! FROM ili9341.c for disable it !!!! -#define LCD_CS_HIGH palSetPad(GPIOB, GPIOB_LCD_CS) -#define SI_CS_LOW palClearPad(GPIOA, GPIOA_SI_SEL) -#define SI_CS_HIGH palSetPad(GPIOA, GPIOA_SI_SEL) +//#define LCD_CS_HIGH palSetPad(GPIOB, GPIOB_LCD_CS) +#define SI_CS_LOW palClearLine(LINE_RX_SEL) +#define SI_CS_HIGH palSetLine(LINE_RX_SEL) -#define SI_SDN_LOW palClearPad(GPIOC, 15) -#define SI_SDN_HIGH palSetPad(GPIOC, 15) +#define SI_SDN_LOW palClearLine(LINE_RX_SDN) +#define SI_SDN_HIGH palSetLine(LINE_RX_SDN) // Hardware or software SPI use @@ -74,8 +74,8 @@ static uint32_t new_port_moder; #define SPI1_SDO ((palReadPort(GPIOB)>>GPIOB_SPI_MISO)&1) #define SPI1_portSDO (palReadPort(GPIOB)&(1<= 0; i--) shiftOut((value >> (8 * i)) & 0xFF); - palSetPad(GPIOB, ADF4351_LE[channel]); + palSetLine(ADF4351_LE[channel]); my_microsecond_delay(1); // Must - palClearPad(GPIOB, ADF4351_LE[channel]); + palClearLine(ADF4351_LE[channel]); } void ADF4351_Set(int channel) { set_SPI_mode(SPI_MODE_SI); // my_microsecond_delay(1); - palClearPad(GPIOB, ADF4351_LE[channel]); + palClearLine(ADF4351_LE[channel]); // my_microsecond_delay(1); for (int i = 5; i >= 0; i--) { @@ -1197,7 +1197,7 @@ static void SI4463_set_state(si446x_state_t); #include -#define SI4463_READ_CTS ((palReadPort(GPIOC)>>14)&1) +#define SI4463_READ_CTS (palReadLine(LINE_RX_CTS)) int SI4463_wait_for_cts(void) { @@ -1212,22 +1212,22 @@ int SI4463_wait_for_cts(void) void SI4463_write_byte(uint8_t ADR, uint8_t DATA) { set_SPI_mode(SPI_MODE_SI); - palClearPad(GPIO_RX_SEL_PORT, GPIO_RX_SEL); + palClearLine(LINE_RX_SEL); ADR |= 0x80 ; // RW = 1 shiftOut( ADR ); shiftOut( DATA ); - palSetPad(GPIO_RX_SEL_PORT, GPIO_RX_SEL); + palSetLine(LINE_RX_SEL); } void SI4463_write_buffer(uint8_t ADR, uint8_t *DATA, int len) { set_SPI_mode(SPI_MODE_SI); - palClearPad(GPIO_RX_SEL_PORT, GPIO_RX_SEL); + palClearLine(LINE_RX_SEL); ADR |= 0x80 ; // RW = 1 shiftOut( ADR ); while (len-- > 0) shiftOut( *(DATA++) ); - palSetPad(GPIO_RX_SEL_PORT, GPIO_RX_SEL); + palSetLine(LINE_RX_SEL); } @@ -1236,10 +1236,10 @@ uint8_t SI4463_read_byte( uint8_t ADR ) set_SPI_mode(SPI_MODE_SI); uint8_t DATA ; set_SPI_mode(SPI_MODE_SI); - palClearPad(GPIO_RX_SEL_PORT, GPIO_RX_SEL); + palClearLine(LINE_RX_SEL); shiftOut( ADR ); DATA = shiftIn(); - palSetPad(GPIO_RX_SEL_PORT, GPIO_RX_SEL); + palSetLine(LINE_RX_SEL); return DATA ; } @@ -1251,7 +1251,7 @@ uint8_t SI4463_get_response(void* buff, uint8_t len) if (!cts) { return false; } - palClearPad(GPIO_RX_SEL_PORT, GPIO_RX_SEL); + palClearLine(LINE_RX_SEL); shiftOut( SI446X_CMD_READ_CMD_BUFF ); cts = (shiftIn() == 0xFF); if (cts) @@ -1261,7 +1261,7 @@ uint8_t SI4463_get_response(void* buff, uint8_t len) ((uint8_t*)buff)[i] = shiftIn(); } } - palSetPad(GPIO_RX_SEL_PORT, GPIO_RX_SEL); + palSetLine(LINE_RX_SEL); return cts; } @@ -1289,11 +1289,11 @@ void SI4463_do_api(void* data, uint8_t len, void* out, uint8_t outLen) if (SI4463_wait_for_cts()) #endif { - palClearPad(GPIO_RX_SEL_PORT, GPIO_RX_SEL); + palClearLine(LINE_RX_SEL); for(uint8_t i=0;i