Merge pull request 'https://gitlink.org.cn/wgzAIIT/wgz-information.git' (#3) from prepare_for_master into ok1052

ok
This commit is contained in:
wgzAIIT 2022-03-10 19:59:01 +08:00
commit cbdd2b0885
5 changed files with 4723 additions and 5 deletions

View File

@ -336,7 +336,7 @@
#define DMACHAN_SPI1_RX DMAMAP_SPI1_RX_1 #define DMACHAN_SPI1_RX DMAMAP_SPI1_RX_1
#define DMACHAN_SPI1_TX DMAMAP_SPI1_TX_1 #define DMACHAN_SPI1_TX DMAMAP_SPI1_TX_1
/* SPI2 - Test MAX31855 on SPI2 PB10 = SCK, PB14 = MISO */ /* SPI2 - Test sx127x on SPI2 PB13 = SCK, PC2 = MISO PC3 MOSI*/
#define GPIO_SPI2_MISO GPIO_SPI2_MISO_2 #define GPIO_SPI2_MISO GPIO_SPI2_MISO_2
#define GPIO_SPI2_MOSI GPIO_SPI2_MOSI_2 #define GPIO_SPI2_MOSI GPIO_SPI2_MOSI_2

View File

@ -229,10 +229,9 @@
/* LoRa SX127x */ /* LoRa SX127x */
#define GPIO_SX127X_DIO0 (GPIO_INPUT|GPIO_FLOAT|GPIO_EXTI|GPIO_PORTD|GPIO_PIN0) #define GPIO_SX127X_DIO0 (GPIO_INPUT|GPIO_FLOAT|GPIO_EXTI|GPIO_PORTC|GPIO_PIN1)
#define GPIO_SX127X_RESET (GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_OUTPUT_CLEAR|\ #define GPIO_SX127X_RESET (GPIO_PORTF|GPIO_PIN11)
GPIO_SPEED_50MHz|GPIO_PORTD|GPIO_PIN4)
/* PWM /* PWM
* *

View File

@ -71,6 +71,7 @@ void weak_function stm32_spidev_initialize(void)
stm32_configgpio(GPIO_MAX7219_CS); /* MAX7219 chip select */ stm32_configgpio(GPIO_MAX7219_CS); /* MAX7219 chip select */
#endif #endif
#ifdef CONFIG_LPWAN_SX127X #ifdef CONFIG_LPWAN_SX127X
spiinfo("Configure GPIO for SX127X SPI2/CS\n");
stm32_configgpio(GPIO_SX127X_CS); /* SX127x chip select */ stm32_configgpio(GPIO_SX127X_CS); /* SX127x chip select */
#endif #endif

View File

@ -103,7 +103,7 @@ static void sx127x_chip_reset(void)
/* Configure reset as output */ /* Configure reset as output */
stm32_configgpio(GPIO_SX127X_RESET); stm32_configgpio(GPIO_SX127X_RESET | GPIO_OUTPUT | GPIO_SPEED_50MHz | GPIO_OUTPUT_CLEAR);
/* Set pin to zero */ /* Set pin to zero */

File diff suppressed because it is too large Load Diff