diff --git a/Ubiquitous/Nuttx/aiit_board/aiit-arm32-board/configs/adb/defconfig b/Ubiquitous/Nuttx/aiit_board/aiit-arm32-board/configs/adb/defconfig index 1c7327558..4dee2a8c5 100644 --- a/Ubiquitous/Nuttx/aiit_board/aiit-arm32-board/configs/adb/defconfig +++ b/Ubiquitous/Nuttx/aiit_board/aiit-arm32-board/configs/adb/defconfig @@ -73,14 +73,14 @@ CONFIG_STM32_JTAG_SW_ENABLE=y CONFIG_STM32_OTGFS=y CONFIG_STM32_PWR=y CONFIG_STM32_SPI2=y -CONFIG_STM32_USART2=y +CONFIG_STM32_USART1=y CONFIG_SYMTAB_ORDEREDBYNAME=y CONFIG_SYSTEM_ADBD=y CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_NSH_SYMTAB=y CONFIG_SYSTEM_NSH_SYMTAB_ARRAYNAME="g_symtab" CONFIG_SYSTEM_NSH_SYMTAB_COUNTNAME="g_nsymbols" -CONFIG_USART2_SERIAL_CONSOLE=y +CONFIG_USART1_SERIAL_CONSOLE=y CONFIG_USBADB=y CONFIG_USBDEV=y CONFIG_USERMAIN_STACKSIZE=3072 diff --git a/Ubiquitous/Nuttx/aiit_board/aiit-arm32-board/configs/audio/defconfig b/Ubiquitous/Nuttx/aiit_board/aiit-arm32-board/configs/audio/defconfig index 16e35c095..05b29fe9b 100644 --- a/Ubiquitous/Nuttx/aiit_board/aiit-arm32-board/configs/audio/defconfig +++ b/Ubiquitous/Nuttx/aiit_board/aiit-arm32-board/configs/audio/defconfig @@ -67,13 +67,13 @@ CONFIG_STM32_PWR=y CONFIG_STM32_SPI1=y CONFIG_STM32_SPI3=y CONFIG_STM32_SPI_DMA=y -CONFIG_STM32_USART2=y +CONFIG_STM32_USART1=y CONFIG_STM32_USBHOST=y CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_NXPLAYER=y -CONFIG_USART2_RXBUFSIZE=128 -CONFIG_USART2_SERIAL_CONSOLE=y -CONFIG_USART2_TXBUFSIZE=128 +CONFIG_USART1_RXBUFSIZE=128 +CONFIG_USART1_SERIAL_CONSOLE=y +CONFIG_USART1_TXBUFSIZE=128 CONFIG_USBHOST_ISOC_DISABLE=y CONFIG_USBHOST_MSC=y CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/Ubiquitous/Nuttx/aiit_board/aiit-arm32-board/configs/canard/defconfig b/Ubiquitous/Nuttx/aiit_board/aiit-arm32-board/configs/canard/defconfig index 13e7308f5..1d3f01179 100644 --- a/Ubiquitous/Nuttx/aiit_board/aiit-arm32-board/configs/canard/defconfig +++ b/Ubiquitous/Nuttx/aiit_board/aiit-arm32-board/configs/canard/defconfig @@ -48,10 +48,10 @@ CONFIG_STM32_CAN1_BAUD=500000 CONFIG_STM32_JTAG_SW_ENABLE=y CONFIG_STM32_PWR=y CONFIG_STM32_SPI1=y -CONFIG_STM32_USART2=y +CONFIG_STM32_USART1=y CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_TIME64=y -CONFIG_USART2_RXBUFSIZE=128 -CONFIG_USART2_SERIAL_CONSOLE=y -CONFIG_USART2_TXBUFSIZE=128 +CONFIG_USART1_RXBUFSIZE=128 +CONFIG_USART1_SERIAL_CONSOLE=y +CONFIG_USART1_TXBUFSIZE=128 CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/Ubiquitous/Nuttx/aiit_board/aiit-arm32-board/configs/cxxtest/defconfig b/Ubiquitous/Nuttx/aiit_board/aiit-arm32-board/configs/cxxtest/defconfig index 11ff70589..4ec45be69 100644 --- a/Ubiquitous/Nuttx/aiit_board/aiit-arm32-board/configs/cxxtest/defconfig +++ b/Ubiquitous/Nuttx/aiit_board/aiit-arm32-board/configs/cxxtest/defconfig @@ -35,11 +35,11 @@ CONFIG_START_DAY=2 CONFIG_START_MONTH=11 CONFIG_START_YEAR=2012 CONFIG_STM32_JTAG_SW_ENABLE=y -CONFIG_STM32_USART2=y +CONFIG_STM32_USART1=y CONFIG_SYMTAB_ORDEREDBYNAME=y CONFIG_TESTING_CXXTEST=y CONFIG_UCLIBCXX=y -CONFIG_USART2_RXBUFSIZE=128 -CONFIG_USART2_SERIAL_CONSOLE=y -CONFIG_USART2_TXBUFSIZE=128 +CONFIG_USART1_RXBUFSIZE=128 +CONFIG_USART1_SERIAL_CONSOLE=y +CONFIG_USART1_TXBUFSIZE=128 CONFIG_USER_ENTRYPOINT="cxxtest_main" diff --git a/Ubiquitous/Nuttx/aiit_board/aiit-arm32-board/configs/elf/defconfig b/Ubiquitous/Nuttx/aiit_board/aiit-arm32-board/configs/elf/defconfig index 8a62a6ee7..2b57bce5a 100644 --- a/Ubiquitous/Nuttx/aiit_board/aiit-arm32-board/configs/elf/defconfig +++ b/Ubiquitous/Nuttx/aiit_board/aiit-arm32-board/configs/elf/defconfig @@ -41,8 +41,8 @@ CONFIG_START_DAY=26 CONFIG_START_MONTH=10 CONFIG_START_YEAR=2012 CONFIG_STM32_JTAG_SW_ENABLE=y -CONFIG_STM32_USART2=y +CONFIG_STM32_USART1=y CONFIG_SYMTAB_ORDEREDBYNAME=y -CONFIG_USART2_SERIAL_CONSOLE=y +CONFIG_USART1_SERIAL_CONSOLE=y CONFIG_USERMAIN_STACKSIZE=4096 CONFIG_USER_ENTRYPOINT="elf_main" diff --git a/Ubiquitous/Nuttx/aiit_board/aiit-arm32-board/configs/kostest/defconfig b/Ubiquitous/Nuttx/aiit_board/aiit-arm32-board/configs/kostest/defconfig index 7f9d275f7..930d57cdf 100644 --- a/Ubiquitous/Nuttx/aiit_board/aiit-arm32-board/configs/kostest/defconfig +++ b/Ubiquitous/Nuttx/aiit_board/aiit-arm32-board/configs/kostest/defconfig @@ -38,13 +38,14 @@ CONFIG_START_DAY=22 CONFIG_START_MONTH=3 CONFIG_START_YEAR=2013 CONFIG_STM32_JTAG_SW_ENABLE=y -CONFIG_STM32_USART2=y +CONFIG_STM32_SPI2=y +CONFIG_STM32_USART1=y CONFIG_SYMTAB_ORDEREDBYNAME=y CONFIG_SYS_RESERVED=9 CONFIG_TESTING_OSTEST=y CONFIG_TESTING_OSTEST_NBARRIER_THREADS=3 CONFIG_TESTING_OSTEST_STACKSIZE=2048 -CONFIG_USART2_RXBUFSIZE=128 -CONFIG_USART2_SERIAL_CONSOLE=y -CONFIG_USART2_TXBUFSIZE=128 +CONFIG_USART1_RXBUFSIZE=128 +CONFIG_USART1_SERIAL_CONSOLE=y +CONFIG_USART1_TXBUFSIZE=128 CONFIG_USER_ENTRYPOINT="ostest_main" diff --git a/Ubiquitous/Nuttx/aiit_board/aiit-arm32-board/configs/lcd1602/defconfig b/Ubiquitous/Nuttx/aiit_board/aiit-arm32-board/configs/lcd1602/defconfig index b0a34e63e..6263e5e87 100644 --- a/Ubiquitous/Nuttx/aiit_board/aiit-arm32-board/configs/lcd1602/defconfig +++ b/Ubiquitous/Nuttx/aiit_board/aiit-arm32-board/configs/lcd1602/defconfig @@ -50,9 +50,9 @@ CONFIG_STM32_I2C1=y CONFIG_STM32_JTAG_SW_ENABLE=y CONFIG_STM32_PWR=y CONFIG_STM32_SPI1=y -CONFIG_STM32_USART2=y +CONFIG_STM32_USART1=y CONFIG_SYSTEM_NSH=y -CONFIG_USART2_RXBUFSIZE=128 -CONFIG_USART2_SERIAL_CONSOLE=y -CONFIG_USART2_TXBUFSIZE=128 +CONFIG_USART1_RXBUFSIZE=128 +CONFIG_USART1_SERIAL_CONSOLE=y +CONFIG_USART1_TXBUFSIZE=128 CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/Ubiquitous/Nuttx/aiit_board/aiit-arm32-board/configs/max31855/defconfig b/Ubiquitous/Nuttx/aiit_board/aiit-arm32-board/configs/max31855/defconfig index 274902cc7..3006f295e 100644 --- a/Ubiquitous/Nuttx/aiit_board/aiit-arm32-board/configs/max31855/defconfig +++ b/Ubiquitous/Nuttx/aiit_board/aiit-arm32-board/configs/max31855/defconfig @@ -48,9 +48,9 @@ CONFIG_STM32_JTAG_SW_ENABLE=y CONFIG_STM32_PWR=y CONFIG_STM32_SPI1=y CONFIG_STM32_SPI2=y -CONFIG_STM32_USART2=y +CONFIG_STM32_USART1=y CONFIG_SYSTEM_NSH=y -CONFIG_USART2_RXBUFSIZE=128 -CONFIG_USART2_SERIAL_CONSOLE=y -CONFIG_USART2_TXBUFSIZE=128 +CONFIG_USART1_RXBUFSIZE=128 +CONFIG_USART1_SERIAL_CONSOLE=y +CONFIG_USART1_TXBUFSIZE=128 CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/Ubiquitous/Nuttx/aiit_board/aiit-arm32-board/configs/max7219/defconfig b/Ubiquitous/Nuttx/aiit_board/aiit-arm32-board/configs/max7219/defconfig index 488869dd9..9c3eb2971 100644 --- a/Ubiquitous/Nuttx/aiit_board/aiit-arm32-board/configs/max7219/defconfig +++ b/Ubiquitous/Nuttx/aiit_board/aiit-arm32-board/configs/max7219/defconfig @@ -78,9 +78,9 @@ CONFIG_START_MONTH=4 CONFIG_STM32_JTAG_SW_ENABLE=y CONFIG_STM32_PWR=y CONFIG_STM32_SPI1=y -CONFIG_STM32_USART2=y +CONFIG_STM32_USART1=y CONFIG_SYSTEM_NSH=y -CONFIG_USART2_RXBUFSIZE=128 -CONFIG_USART2_SERIAL_CONSOLE=y -CONFIG_USART2_TXBUFSIZE=128 +CONFIG_USART1_RXBUFSIZE=128 +CONFIG_USART1_SERIAL_CONSOLE=y +CONFIG_USART1_TXBUFSIZE=128 CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/Ubiquitous/Nuttx/aiit_board/aiit-arm32-board/configs/mmcsdspi/defconfig b/Ubiquitous/Nuttx/aiit_board/aiit-arm32-board/configs/mmcsdspi/defconfig index 13602d4fd..f041ade34 100644 --- a/Ubiquitous/Nuttx/aiit_board/aiit-arm32-board/configs/mmcsdspi/defconfig +++ b/Ubiquitous/Nuttx/aiit_board/aiit-arm32-board/configs/mmcsdspi/defconfig @@ -65,10 +65,10 @@ CONFIG_STM32_DMA2=y CONFIG_STM32_JTAG_SW_ENABLE=y CONFIG_STM32_PWR=y CONFIG_STM32_SPI2=y -CONFIG_STM32_USART2=y +CONFIG_STM32_USART1=y CONFIG_SYSTEM_NSH=y CONFIG_TESTING_OSTEST=y -CONFIG_USART2_RXBUFSIZE=128 -CONFIG_USART2_SERIAL_CONSOLE=y -CONFIG_USART2_TXBUFSIZE=128 +CONFIG_USART1_RXBUFSIZE=128 +CONFIG_USART1_SERIAL_CONSOLE=y +CONFIG_USART1_TXBUFSIZE=128 CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/Ubiquitous/Nuttx/aiit_board/aiit-arm32-board/configs/modbus_slave/defconfig b/Ubiquitous/Nuttx/aiit_board/aiit-arm32-board/configs/modbus_slave/defconfig index 6e7868e91..6c8c77411 100644 --- a/Ubiquitous/Nuttx/aiit_board/aiit-arm32-board/configs/modbus_slave/defconfig +++ b/Ubiquitous/Nuttx/aiit_board/aiit-arm32-board/configs/modbus_slave/defconfig @@ -54,12 +54,12 @@ CONFIG_STM32_JTAG_SW_ENABLE=y CONFIG_STM32_PWR=y CONFIG_STM32_SPI1=y CONFIG_STM32_USART1=y -CONFIG_STM32_USART2=y +CONFIG_STM32_USART1=y CONFIG_SYSTEM_NSH=y CONFIG_USART1_BAUD=38400 CONFIG_USART1_PARITY=2 CONFIG_USART1_RS485=y -CONFIG_USART2_RXBUFSIZE=128 -CONFIG_USART2_SERIAL_CONSOLE=y -CONFIG_USART2_TXBUFSIZE=128 +CONFIG_USART1_RXBUFSIZE=128 +CONFIG_USART1_SERIAL_CONSOLE=y +CONFIG_USART1_TXBUFSIZE=128 CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/Ubiquitous/Nuttx/aiit_board/aiit-arm32-board/configs/module/defconfig b/Ubiquitous/Nuttx/aiit_board/aiit-arm32-board/configs/module/defconfig index fd7f26f4f..060ecf497 100644 --- a/Ubiquitous/Nuttx/aiit_board/aiit-arm32-board/configs/module/defconfig +++ b/Ubiquitous/Nuttx/aiit_board/aiit-arm32-board/configs/module/defconfig @@ -47,9 +47,9 @@ CONFIG_START_YEAR=2011 CONFIG_STM32_JTAG_SW_ENABLE=y CONFIG_STM32_PWR=y CONFIG_STM32_SPI1=y -CONFIG_STM32_USART2=y +CONFIG_STM32_USART1=y CONFIG_SYSTEM_NSH=y -CONFIG_USART2_RXBUFSIZE=128 -CONFIG_USART2_SERIAL_CONSOLE=y -CONFIG_USART2_TXBUFSIZE=128 +CONFIG_USART1_RXBUFSIZE=128 +CONFIG_USART1_SERIAL_CONSOLE=y +CONFIG_USART1_TXBUFSIZE=128 CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/Ubiquitous/Nuttx/aiit_board/aiit-arm32-board/configs/nsh/defconfig b/Ubiquitous/Nuttx/aiit_board/aiit-arm32-board/configs/nsh/defconfig index a4f317394..4fd15e399 100644 --- a/Ubiquitous/Nuttx/aiit_board/aiit-arm32-board/configs/nsh/defconfig +++ b/Ubiquitous/Nuttx/aiit_board/aiit-arm32-board/configs/nsh/defconfig @@ -45,10 +45,10 @@ CONFIG_START_MONTH=12 CONFIG_START_YEAR=2011 CONFIG_STM32_JTAG_SW_ENABLE=y CONFIG_STM32_PWR=y -CONFIG_STM32_SPI1=y -CONFIG_STM32_USART2=y +CONFIG_STM32_SPI2=y +CONFIG_STM32_USART1=y CONFIG_SYSTEM_NSH=y -CONFIG_USART2_RXBUFSIZE=128 -CONFIG_USART2_SERIAL_CONSOLE=y -CONFIG_USART2_TXBUFSIZE=128 +CONFIG_USART1_RXBUFSIZE=128 +CONFIG_USART1_SERIAL_CONSOLE=y +CONFIG_USART1_TXBUFSIZE=128 CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/Ubiquitous/Nuttx/aiit_board/aiit-arm32-board/configs/nxlines/defconfig b/Ubiquitous/Nuttx/aiit_board/aiit-arm32-board/configs/nxlines/defconfig index d18dcf117..3d3bda7d8 100644 --- a/Ubiquitous/Nuttx/aiit_board/aiit-arm32-board/configs/nxlines/defconfig +++ b/Ubiquitous/Nuttx/aiit_board/aiit-arm32-board/configs/nxlines/defconfig @@ -66,9 +66,9 @@ CONFIG_STM32_FSMC=y CONFIG_STM32_JTAG_SW_ENABLE=y CONFIG_STM32_PWR=y CONFIG_STM32_SPI1=y -CONFIG_STM32_USART2=y +CONFIG_STM32_USART1=y CONFIG_SYMTAB_ORDEREDBYNAME=y -CONFIG_USART2_RXBUFSIZE=128 -CONFIG_USART2_SERIAL_CONSOLE=y -CONFIG_USART2_TXBUFSIZE=128 +CONFIG_USART1_RXBUFSIZE=128 +CONFIG_USART1_SERIAL_CONSOLE=y +CONFIG_USART1_TXBUFSIZE=128 CONFIG_USER_ENTRYPOINT="nxlines_main" diff --git a/Ubiquitous/Nuttx/aiit_board/aiit-arm32-board/configs/pm/defconfig b/Ubiquitous/Nuttx/aiit_board/aiit-arm32-board/configs/pm/defconfig index a8ebda005..8583cdca7 100644 --- a/Ubiquitous/Nuttx/aiit_board/aiit-arm32-board/configs/pm/defconfig +++ b/Ubiquitous/Nuttx/aiit_board/aiit-arm32-board/configs/pm/defconfig @@ -49,9 +49,9 @@ CONFIG_STM32_JTAG_SW_ENABLE=y CONFIG_STM32_PWR=y CONFIG_STM32_RTC=y CONFIG_STM32_TIM1=y -CONFIG_STM32_USART2=y +CONFIG_STM32_USART1=y CONFIG_SYSTEM_NSH=y -CONFIG_USART2_RXBUFSIZE=128 -CONFIG_USART2_SERIAL_CONSOLE=y -CONFIG_USART2_TXBUFSIZE=128 +CONFIG_USART1_RXBUFSIZE=128 +CONFIG_USART1_SERIAL_CONSOLE=y +CONFIG_USART1_TXBUFSIZE=128 CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/Ubiquitous/Nuttx/aiit_board/aiit-arm32-board/configs/posix_spawn/defconfig b/Ubiquitous/Nuttx/aiit_board/aiit-arm32-board/configs/posix_spawn/defconfig index c24eb776a..21b83ee56 100644 --- a/Ubiquitous/Nuttx/aiit_board/aiit-arm32-board/configs/posix_spawn/defconfig +++ b/Ubiquitous/Nuttx/aiit_board/aiit-arm32-board/configs/posix_spawn/defconfig @@ -43,9 +43,9 @@ CONFIG_START_DAY=26 CONFIG_START_MONTH=10 CONFIG_START_YEAR=2012 CONFIG_STM32_JTAG_SW_ENABLE=y -CONFIG_STM32_USART2=y +CONFIG_STM32_USART1=y CONFIG_SYMTAB_ORDEREDBYNAME=y -CONFIG_USART2_RXBUFSIZE=128 -CONFIG_USART2_SERIAL_CONSOLE=y -CONFIG_USART2_TXBUFSIZE=128 +CONFIG_USART1_RXBUFSIZE=128 +CONFIG_USART1_SERIAL_CONSOLE=y +CONFIG_USART1_TXBUFSIZE=128 CONFIG_USER_ENTRYPOINT="posix_spawn_main" diff --git a/Ubiquitous/Nuttx/aiit_board/aiit-arm32-board/configs/pseudoterm/defconfig b/Ubiquitous/Nuttx/aiit_board/aiit-arm32-board/configs/pseudoterm/defconfig index e31a5e1e4..404f7309e 100644 --- a/Ubiquitous/Nuttx/aiit_board/aiit-arm32-board/configs/pseudoterm/defconfig +++ b/Ubiquitous/Nuttx/aiit_board/aiit-arm32-board/configs/pseudoterm/defconfig @@ -46,10 +46,10 @@ CONFIG_START_YEAR=2011 CONFIG_STM32_JTAG_SW_ENABLE=y CONFIG_STM32_PWR=y CONFIG_STM32_SPI1=y -CONFIG_STM32_USART2=y +CONFIG_STM32_USART1=y CONFIG_STM32_USART3=y CONFIG_SYSTEM_NSH=y -CONFIG_USART2_RXBUFSIZE=128 -CONFIG_USART2_SERIAL_CONSOLE=y -CONFIG_USART2_TXBUFSIZE=128 +CONFIG_USART1_RXBUFSIZE=128 +CONFIG_USART1_SERIAL_CONSOLE=y +CONFIG_USART1_TXBUFSIZE=128 CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/Ubiquitous/Nuttx/aiit_board/aiit-arm32-board/configs/rgbled/defconfig b/Ubiquitous/Nuttx/aiit_board/aiit-arm32-board/configs/rgbled/defconfig index c3472e284..ad09c7e54 100644 --- a/Ubiquitous/Nuttx/aiit_board/aiit-arm32-board/configs/rgbled/defconfig +++ b/Ubiquitous/Nuttx/aiit_board/aiit-arm32-board/configs/rgbled/defconfig @@ -57,9 +57,9 @@ CONFIG_STM32_TIM3=y CONFIG_STM32_TIM3_CH3OUT=y CONFIG_STM32_TIM3_CHANNEL=3 CONFIG_STM32_TIM3_PWM=y -CONFIG_STM32_USART2=y +CONFIG_STM32_USART1=y CONFIG_SYSTEM_NSH=y -CONFIG_USART2_RXBUFSIZE=128 -CONFIG_USART2_SERIAL_CONSOLE=y -CONFIG_USART2_TXBUFSIZE=128 +CONFIG_USART1_RXBUFSIZE=128 +CONFIG_USART1_SERIAL_CONSOLE=y +CONFIG_USART1_TXBUFSIZE=128 CONFIG_USER_ENTRYPOINT="rgbled_main" diff --git a/Ubiquitous/Nuttx/aiit_board/aiit-arm32-board/configs/rndis/defconfig b/Ubiquitous/Nuttx/aiit_board/aiit-arm32-board/configs/rndis/defconfig index 16646ebab..adfced3dd 100644 --- a/Ubiquitous/Nuttx/aiit_board/aiit-arm32-board/configs/rndis/defconfig +++ b/Ubiquitous/Nuttx/aiit_board/aiit-arm32-board/configs/rndis/defconfig @@ -88,14 +88,14 @@ CONFIG_STM32_JTAG_SW_ENABLE=y CONFIG_STM32_OTGFS=y CONFIG_STM32_PWR=y CONFIG_STM32_SPI1=y -CONFIG_STM32_USART2=y +CONFIG_STM32_USART1=y CONFIG_SYMTAB_ORDEREDBYNAME=y CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_NSH_SYMTAB=y CONFIG_SYSTEM_NSH_SYMTAB_ARRAYNAME="g_symtab" CONFIG_SYSTEM_NSH_SYMTAB_COUNTNAME="g_nsymbols" CONFIG_SYSTEM_PING=y -CONFIG_USART2_SERIAL_CONSOLE=y +CONFIG_USART1_SERIAL_CONSOLE=y CONFIG_USBDEV=y CONFIG_USERMAIN_STACKSIZE=3072 CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/Ubiquitous/Nuttx/aiit_board/aiit-arm32-board/configs/st7789/defconfig b/Ubiquitous/Nuttx/aiit_board/aiit-arm32-board/configs/st7789/defconfig index 29068d3b9..61bd8edf9 100644 --- a/Ubiquitous/Nuttx/aiit_board/aiit-arm32-board/configs/st7789/defconfig +++ b/Ubiquitous/Nuttx/aiit_board/aiit-arm32-board/configs/st7789/defconfig @@ -59,10 +59,10 @@ CONFIG_START_YEAR=2011 CONFIG_STM32_JTAG_SW_ENABLE=y CONFIG_STM32_PWR=y CONFIG_STM32_SPI1=y -CONFIG_STM32_USART2=y +CONFIG_STM32_USART1=y CONFIG_SYSTEM_NSH=y -CONFIG_USART2_RXBUFSIZE=128 -CONFIG_USART2_SERIAL_CONSOLE=y -CONFIG_USART2_TXBUFSIZE=128 +CONFIG_USART1_RXBUFSIZE=128 +CONFIG_USART1_SERIAL_CONSOLE=y +CONFIG_USART1_TXBUFSIZE=128 CONFIG_USER_ENTRYPOINT="nsh_main" CONFIG_VIDEO_FB=y diff --git a/Ubiquitous/Nuttx/aiit_board/aiit-arm32-board/configs/testlibcxx/defconfig b/Ubiquitous/Nuttx/aiit_board/aiit-arm32-board/configs/testlibcxx/defconfig index ded93ba37..c70ac036b 100644 --- a/Ubiquitous/Nuttx/aiit_board/aiit-arm32-board/configs/testlibcxx/defconfig +++ b/Ubiquitous/Nuttx/aiit_board/aiit-arm32-board/configs/testlibcxx/defconfig @@ -44,10 +44,10 @@ CONFIG_START_DAY=2 CONFIG_START_MONTH=11 CONFIG_START_YEAR=2012 CONFIG_STM32_JTAG_SW_ENABLE=y -CONFIG_STM32_USART2=y +CONFIG_STM32_USART1=y CONFIG_SYMTAB_ORDEREDBYNAME=y CONFIG_SYSTEM_NSH=y -CONFIG_USART2_RXBUFSIZE=128 -CONFIG_USART2_SERIAL_CONSOLE=y -CONFIG_USART2_TXBUFSIZE=128 +CONFIG_USART1_RXBUFSIZE=128 +CONFIG_USART1_SERIAL_CONSOLE=y +CONFIG_USART1_TXBUFSIZE=128 CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/Ubiquitous/Nuttx/aiit_board/aiit-arm32-board/configs/usbmsc/defconfig b/Ubiquitous/Nuttx/aiit_board/aiit-arm32-board/configs/usbmsc/defconfig index 690fb94ac..86e58275b 100644 --- a/Ubiquitous/Nuttx/aiit_board/aiit-arm32-board/configs/usbmsc/defconfig +++ b/Ubiquitous/Nuttx/aiit_board/aiit-arm32-board/configs/usbmsc/defconfig @@ -47,14 +47,14 @@ CONFIG_STM32_JTAG_SW_ENABLE=y CONFIG_STM32_OTGFS=y CONFIG_STM32_PWR=y CONFIG_STM32_SPI1=y -CONFIG_STM32_USART2=y +CONFIG_STM32_USART1=y CONFIG_SYSLOG_CHAR=y CONFIG_SYSLOG_DEVPATH="/dev/ttyS0" CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_USBMSC=y CONFIG_SYSTEM_USBMSC_DEVPATH1="/dev/ram0" CONFIG_TASK_NAME_SIZE=0 -CONFIG_USART2_SERIAL_CONSOLE=y +CONFIG_USART1_SERIAL_CONSOLE=y CONFIG_USBDEV=y CONFIG_USBMSC=y CONFIG_USBMSC_REMOVABLE=y diff --git a/Ubiquitous/Nuttx/aiit_board/aiit-arm32-board/configs/usbnsh/defconfig b/Ubiquitous/Nuttx/aiit_board/aiit-arm32-board/configs/usbnsh/defconfig index c2be8c320..c51b2589e 100644 --- a/Ubiquitous/Nuttx/aiit_board/aiit-arm32-board/configs/usbnsh/defconfig +++ b/Ubiquitous/Nuttx/aiit_board/aiit-arm32-board/configs/usbnsh/defconfig @@ -54,7 +54,7 @@ CONFIG_STM32_JTAG_SW_ENABLE=y CONFIG_STM32_OTGFS=y CONFIG_STM32_PWR=y CONFIG_STM32_SPI1=y -CONFIG_STM32_USART2=y +CONFIG_STM32_USART1=y CONFIG_SYSTEM_NSH=y CONFIG_USBDEV=y CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/Ubiquitous/Nuttx/aiit_board/aiit-arm32-board/configs/wifi/defconfig b/Ubiquitous/Nuttx/aiit_board/aiit-arm32-board/configs/wifi/defconfig index 6fc94e5cc..462474f24 100644 --- a/Ubiquitous/Nuttx/aiit_board/aiit-arm32-board/configs/wifi/defconfig +++ b/Ubiquitous/Nuttx/aiit_board/aiit-arm32-board/configs/wifi/defconfig @@ -92,7 +92,7 @@ CONFIG_STM32_SPI2_DMA=y CONFIG_STM32_SPI3=y CONFIG_STM32_SPI3_DMA=y CONFIG_STM32_SPI_DMA=y -CONFIG_STM32_USART2=y +CONFIG_STM32_USART1=y CONFIG_SYMTAB_ORDEREDBYNAME=y CONFIG_SYSTEM_DHCPC_RENEW=y CONFIG_SYSTEM_NSH=y @@ -102,9 +102,9 @@ CONFIG_SYSTEM_NSH_SYMTAB_COUNTNAME="g_nsymbols" CONFIG_SYSTEM_NTPC=y CONFIG_TESTING_OSTEST=y CONFIG_TESTING_OSTEST_FPUSIZE=132 -CONFIG_USART2_RXBUFSIZE=128 -CONFIG_USART2_SERIAL_CONSOLE=y -CONFIG_USART2_TXBUFSIZE=128 +CONFIG_USART1_RXBUFSIZE=128 +CONFIG_USART1_SERIAL_CONSOLE=y +CONFIG_USART1_TXBUFSIZE=128 CONFIG_USER_ENTRYPOINT="nsh_main" CONFIG_WIRELESS_GS2200M=y CONFIG_WL_GS2200M=y diff --git a/Ubiquitous/Nuttx/aiit_board/aiit-arm32-board/configs/winbuild/defconfig b/Ubiquitous/Nuttx/aiit_board/aiit-arm32-board/configs/winbuild/defconfig index 256962421..d1de6e677 100644 --- a/Ubiquitous/Nuttx/aiit_board/aiit-arm32-board/configs/winbuild/defconfig +++ b/Ubiquitous/Nuttx/aiit_board/aiit-arm32-board/configs/winbuild/defconfig @@ -32,13 +32,13 @@ CONFIG_START_DAY=21 CONFIG_START_MONTH=9 CONFIG_START_YEAR=2009 CONFIG_STM32_JTAG_SW_ENABLE=y -CONFIG_STM32_USART2=y +CONFIG_STM32_USART1=y CONFIG_SYMTAB_ORDEREDBYNAME=y CONFIG_TESTING_OSTEST=y CONFIG_TESTING_OSTEST_NBARRIER_THREADS=3 CONFIG_TESTING_OSTEST_STACKSIZE=2048 -CONFIG_USART2_RXBUFSIZE=128 -CONFIG_USART2_SERIAL_CONSOLE=y -CONFIG_USART2_TXBUFSIZE=128 +CONFIG_USART1_RXBUFSIZE=128 +CONFIG_USART1_SERIAL_CONSOLE=y +CONFIG_USART1_TXBUFSIZE=128 CONFIG_USER_ENTRYPOINT="ostest_main" CONFIG_WINDOWS_NATIVE=y diff --git a/Ubiquitous/Nuttx/aiit_board/aiit-arm32-board/configs/xen1210/defconfig b/Ubiquitous/Nuttx/aiit_board/aiit-arm32-board/configs/xen1210/defconfig index 11169f85b..1939bed03 100644 --- a/Ubiquitous/Nuttx/aiit_board/aiit-arm32-board/configs/xen1210/defconfig +++ b/Ubiquitous/Nuttx/aiit_board/aiit-arm32-board/configs/xen1210/defconfig @@ -50,9 +50,9 @@ CONFIG_STM32_SPI1=y CONFIG_STM32_TIM1=y CONFIG_STM32_TIM1_CH1OUT=y CONFIG_STM32_TIM1_PWM=y -CONFIG_STM32_USART2=y +CONFIG_STM32_USART1=y CONFIG_SYSTEM_NSH=y -CONFIG_USART2_RXBUFSIZE=128 -CONFIG_USART2_SERIAL_CONSOLE=y -CONFIG_USART2_TXBUFSIZE=128 +CONFIG_USART1_RXBUFSIZE=128 +CONFIG_USART1_SERIAL_CONSOLE=y +CONFIG_USART1_TXBUFSIZE=128 CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/Ubiquitous/Nuttx/aiit_board/aiit-arm32-board/src/stm32_sx127x.c b/Ubiquitous/Nuttx/aiit_board/aiit-arm32-board/src/stm32_sx127x.c index 1659ec74d..cc5e7d653 100644 --- a/Ubiquitous/Nuttx/aiit_board/aiit-arm32-board/src/stm32_sx127x.c +++ b/Ubiquitous/Nuttx/aiit_board/aiit-arm32-board/src/stm32_sx127x.c @@ -143,7 +143,7 @@ static int sx127x_freq_select(uint32_t freq) /* Only HF supported (BAND3 - 860-930 MHz) */ - if (freq < SX127X_HFBAND_THR) + if (freq > SX127X_HFBAND_THR) { ret = -EINVAL; wlerr("LF band not supported\n"); diff --git a/Ubiquitous/Nuttx/app_match_nuttx/nuttx/drivers/wireless/lpwan/Kconfig b/Ubiquitous/Nuttx/app_match_nuttx/nuttx/drivers/wireless/lpwan/Kconfig new file mode 100644 index 000000000..842502894 --- /dev/null +++ b/Ubiquitous/Nuttx/app_match_nuttx/nuttx/drivers/wireless/lpwan/Kconfig @@ -0,0 +1,88 @@ +# +# For a description of the syntax of this configuration file, +# see the file kconfig-language.txt in the NuttX tools repository. +# + +if DRIVERS_LPWAN + +config LPWAN_SX127X + bool "SX127X Low Power Long Range transceiver support" + default n + select SPI + select SCHED_HPWORK + ---help--- + This options adds driver support for the Samtech SX127X chip. + +if LPWAN_SX127X + +config LPWAN_SX127X_RFFREQ_DEFAULT + int "SX127X default RF frequency" + default 433000000 + +config LPWAN_SX127X_SPIFREQ + int "SX127X SPI frequency" + default 1000000 + ---help--- + SX127X SPI frequency up to 10MHz + +config LPWAN_SX127X_TXPOWER_DEFAULT + int "SX127X default TX power" + default 20 + +config LPWAN_SX127X_PREAMBLE_DEFAULT + int "SX127X default preamble length" + default 8 + +config LPWAN_SX127X_MODULATION_DEFAULT + int "SX127X default modulation scheme" + default 3 if LPWAN_SX127X_LORA + default 1 if LPWAN_SX127X_FSKOOK + range 1 3 + ---help--- + 1 - FSK, 2 - OOK, 3 - LORA + +config LPWAN_SX127X_CRCON + int "SX127X CRC ON" + range 0 1 + default 1 + +config LPWAN_SX127X_RXSUPPORT + bool "SX127X RX support" + default y + +if LPWAN_SX127X_RXSUPPORT + +config LPWAN_SX127X_RXFIFO_LEN + int "SX127X RX FIFO length" + default 5 + +config LPWAN_SX127X_RXFIFO_DATA_LEN + int "SX127X RX FIFO data length" + default 256 + +endif #LPWAN_SX127X_RXSUPPORT + +config LPWAN_SX127X_TXSUPPORT + bool "SX127X TX support" + default y + +config LPWAN_SX127X_LORA + bool "SX127X LORA support" + default y + +if LPWAN_SX127X_LORA + +config LPWAN_SX127X_LORA_IMPHEADER + int "SX127X LORA implicit header ON" + range 0 1 + default 0 + +endif # LPWAN_SX127X_LORA + +config LPWAN_SX127X_FSKOOK + bool "SX127X FSK/OOK support" + default n + +endif # WL_SX127X + +endif # DRIVERS_LPWAN diff --git a/Ubiquitous/Nuttx/app_match_nuttx/nuttx/drivers/wireless/lpwan/sx127x/sx127x.c b/Ubiquitous/Nuttx/app_match_nuttx/nuttx/drivers/wireless/lpwan/sx127x/sx127x.c index f4cabca13..1ce9f8044 100644 --- a/Ubiquitous/Nuttx/app_match_nuttx/nuttx/drivers/wireless/lpwan/sx127x/sx127x.c +++ b/Ubiquitous/Nuttx/app_match_nuttx/nuttx/drivers/wireless/lpwan/sx127x/sx127x.c @@ -769,6 +769,36 @@ static int sx127x_open(FAR struct file *filep) goto errout; } + /* Set modulation */ + + wlinfo("Set modulation mode to %d\n", CONFIG_LPWAN_SX127X_MODULATION_DEFAULT); + ret = sx127x_modulation_set(dev, CONFIG_LPWAN_SX127X_MODULATION_DEFAULT); + if (ret < 0) + { + wlerr("modulation_set failed\n"); + goto errout; + } + + /* Set RF frequency */ + + wlinfo("Set frequency to %" PRId32 "\n", CONFIG_LPWAN_SX127X_RFFREQ_DEFAULT); + ret = sx127x_frequency_set(dev, CONFIG_LPWAN_SX127X_RFFREQ_DEFAULT); + if (ret < 0) + { + wlerr("failed to change frequency %d!\n", ret); + goto errout; + } + + /* Set TX power */ + + wlinfo("Set power to %d\n", CONFIG_LPWAN_SX127X_TXPOWER_DEFAULT); + ret = sx127x_power_set(dev, CONFIG_LPWAN_SX127X_TXPOWER_DEFAULT); + if (ret < 0) + { + wlerr("failed to change power %d!\n", ret); + goto errout; + } + dev->nopens++; errout: @@ -844,6 +874,13 @@ static ssize_t sx127x_read(FAR struct file *filep, FAR char *buffer, DEBUGASSERT(inode && inode->i_private); dev = (FAR struct sx127x_dev_s *)inode->i_private; + /* Set mode to RX */ + + wlinfo("Set opmode to %" PRId32 "\n", SX127X_OPMODE_RX); + sx127x_opmode_set(dev, SX127X_OPMODE_RX); + + sx127x_writeregbyte(dev, SX127X_LRM_IRQ, 8); + ret = nxsem_wait(&dev->dev_sem); if (ret < 0) { @@ -912,9 +949,10 @@ static ssize_t sx127x_write(FAR struct file *filep, FAR const char *buffer, sx127x_opmode_set(dev, SX127X_OPMODE_STANDBY); - /* Initialize TX mode */ sx127x_writeregbyte(dev, SX127X_LRM_IRQ, 8); + /* Initialize TX mode */ + ret = sx127x_opmode_init(dev, SX127X_OPMODE_TX); if (ret < 0) { @@ -940,6 +978,8 @@ static ssize_t sx127x_write(FAR struct file *filep, FAR const char *buffer, nxsem_wait(&dev->tx_sem); + sx127x_writeregbyte(dev, SX127X_LRM_IRQ, 8); + errout: /* Change mode to IDLE after transfer * NOTE: if sequencer for FSK/OOK is ON - this should be done automatically