sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merged nuttx/nuttx into master

Browse Source
This commit is contained in:
Simon Piriou 2017-03-11 12:24:47 +01:00
commit 358c22c122
17 changed files with 595 additions and 205 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
arch/arm/src/stm32/chip/stm32f33xxx_adc.h
View File

@ -49,13 +49,13 @@
* Pre-processor Definitions * Pre-processor Definitions
****************************************************************************************************/ ****************************************************************************************************/
#define STM32_ADC1_BASE_OFFSET 0x0000 #define STM32_ADC1_OFFSET 0x0000
#define STM32_ADC2_BASE_OFFSET 0x0100 #define STM32_ADC2_OFFSET 0x0100
#define STM32_ADC12_BASE_OFFSET 0x0300 #define STM32_ADC12_CMN_OFFSET 0x0300
#define STM32_ADC1_BASE (STM32_ADC1_BASE_OFFSET+STM32_ADC12_BASE) /* ADC1 Master ADC */ #define STM32_ADC1_BASE (STM32_ADC1_OFFSET+STM32_ADC12_BASE) /* ADC1 Master ADC */
#define STM32_ADC2_BASE (STM32_ADC1_BASE_OFFSET+STM32_ADC12_BASE) /* ADC2 Slave ADC */ #define STM32_ADC2_BASE (STM32_ADC2_OFFSET+STM32_ADC12_BASE) /* ADC2 Slave ADC */
#define STM32_ADC12_BASE (STM32_ADC1_BASE_OFFSET+STM32_ADC12_BASE) /* ADC1, ADC2 common */ #define STM32_ADC12_CMN_BASE (STM32_ADC12_CMN_OFFSET+STM32_ADC12_BASE) /* ADC1, ADC2 common */
/* Register Offsets *********************************************************************************/ /* Register Offsets *********************************************************************************/
@ -151,9 +151,9 @@
#define STM32_ADC2_DIFSEL (STM32_ADC2_BASE+STM32_ADC_DIFSEL_OFFSET) #define STM32_ADC2_DIFSEL (STM32_ADC2_BASE+STM32_ADC_DIFSEL_OFFSET)
#define STM32_ADC2_CALFACT (STM32_ADC2_BASE+STM32_ADC_CALFACT_OFFSET) #define STM32_ADC2_CALFACT (STM32_ADC2_BASE+STM32_ADC_CALFACT_OFFSET)
#define STM32_ADC12_CSR (STM32_ADC12_BASE+STM32_ADC_CSR_OFFSET) #define STM32_ADC12_CSR (STM32_ADC12_CMN_BASE+STM32_ADC_CSR_OFFSET)
#define STM32_ADC12_CCR (STM32_ADC12_BASE+STM32_ADC_CCR_OFFSET) #define STM32_ADC12_CCR (STM32_ADC12_CMN_BASE+STM32_ADC_CCR_OFFSET)
#define STM32_ADC12_CDR (STM32_ADC12_BASE+STM32_ADC_CDR_OFFSET) #define STM32_ADC12_CDR (STM32_ADC12_CMN_BASE+STM32_ADC_CDR_OFFSET)
/* Register Bitfield Definitions ********************************************************************/ /* Register Bitfield Definitions ********************************************************************/
/* ADC interrupt and status register (ISR) and ADC interrupt enable register (IER) */ /* ADC interrupt and status register (ISR) and ADC interrupt enable register (IER) */

5
configs/README.txt
View File

@ -519,6 +519,11 @@ configs/p112
Dave Brooks was successfully funded through Kickstarter for and another Dave Brooks was successfully funded through Kickstarter for and another
run of P112 boards in November of 2012. run of P112 boards in November of 2012.
configs/photon
A configuration for the Photon Wifi board from Particle Devices
(https://www.particle.io). This board features the STM32F205RGY6 MCU from
STMicro.
configs/pic32mx-starterkit configs/pic32mx-starterkit
This directory contains the port of NuttX to the Microchip PIC32 Ethernet This directory contains the port of NuttX to the Microchip PIC32 Ethernet
Starter Kit (DM320004) with the Multimedia Expansion Board (MEB, DM320005). Starter Kit (DM320004) with the Multimedia Expansion Board (MEB, DM320005).

39
configs/olimex-stm32-p407/README.txt
View File

@ -20,25 +20,43 @@ Board Support
The following peripherals are available in this configuration. The following peripherals are available in this configuration.
- LEDs: show the sytem status - LEDs: Show the sytem status
- Buttons: TAMPER-button, WKUP-button, J1-Joystick (consists of RIGHT-, - Buttons: TAMPER-button, WKUP-button, J1-Joystick (consists of RIGHT-,
UP-, LEFT-, DOWN-, and CENTER-button). Built in app UP-, LEFT-, DOWN-, and CENTER-button).
'buttons' works.
- ADC: ADC1 samples the red trim potentiometer AN_TR - ADC: ADC1 samples the red trim potentiometer AN_TR
Built in app 'adc' works. Built in app 'adc' works.
- USB-FS-OTG: There is a USB-A-connector (host) connected to the full - USB-FS-OTG: There is a USB-A-connector (host) connected to the full
speed STM32 inputs. speed STM32 OTG inputs.
- USB-HS-OTG: The other connector (device) is connected to the high speed - USB-HS-OTG: The other connector (device) is connected to the high speed
STM32 inputs. STM32 OTG inputs.
- CAN: Built in app 'can' works, but apart from that not really tested. - CAN: Built in app 'can' works, but apart from that not really
tested.
- Ethernet: Ping to other station on the network works. - Ethernet: Ping to other station on the network works.
- microSD: Not fully functional. See below.
- LCD: Nokia 6610. This is similar the Nokia 6100 LCD used on other
Olimex boards. There is a driver for that LCD at
drivers/lcd/nokia6100.c, however, it is not properly
integrated. It uses a 9-bit SPI interface which is difficult
to get working properly.
- External Support is included for the onboard SRAM. It uses SRAM
SRAM: settings from another board that might need to be tweaked.
Difficult to test because the SRAM conflicts with both
RS232 ports.
- Other: Buzzer, Camera, Temperature sensor, audio have not been
tested.
If so, then it requires a 9-bit
microSD Card Interface microSD Card Interface
====================== ======================
@ -205,6 +223,13 @@ OTGFS Host
CONFIG_EXAMPLES_HIDKBD_DEVNAME="/dev/kbda" CONFIG_EXAMPLES_HIDKBD_DEVNAME="/dev/kbda"
CONFIG_EXAMPLES_HIDKBD_STACKSIZE=1024 CONFIG_EXAMPLES_HIDKBD_STACKSIZE=1024
STATUS: The MSC configurations seems fully functional. The HIDKBD seems rather
flaky. Sometimes the LEDs become very bright (indicating that it is being
swamped with interrupts). Data input is not clean with apps/examples/hidkbd:
There are missing characters and sometimes duplicated characters. This implies
some logic issues, probably in drivers/usbhost/usbhost_hidkbd, with polling and
data filtering.
Configurations Configurations
============== ==============
@ -404,7 +429,7 @@ STATUS
feature configurations. feature configurations.
CCM memory is not included in the heap (CONFIG_STM32_CCMEXCLUDE=y) because CCM memory is not included in the heap (CONFIG_STM32_CCMEXCLUDE=y) because
it does no suport DMA, leaving only 128KiB for program usage. it does not suport DMA, leaving only 128KiB for program usage.
2107-01-23: Added the the knsh configuration and support for the PROTECTED 2107-01-23: Added the the knsh configuration and support for the PROTECTED
build mode. build mode.

9
configs/photon/include/board.h
View File

@ -1,7 +1,7 @@
/************************************************************************************ /************************************************************************************
* configs/photon/include/board.h * configs/photon/include/board.h
* *
* Copyright (C) 2013, 2016 Gregory Nutt. All rights reserved. * Copyright (C) 2017 Gregory Nutt. All rights reserved.
* Author: Simon Piriou <spiriou31@gmail.com> * Author: Simon Piriou <spiriou31@gmail.com>
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@ -163,7 +163,8 @@
#undef EXTERN #undef EXTERN
#if defined(__cplusplus) #if defined(__cplusplus)
#define EXTERN extern "C" #define EXTERN extern "C"
extern "C" { extern "C"
{
#else #else
#define EXTERN extern #define EXTERN extern
#endif #endif
@ -171,6 +172,7 @@ extern "C" {
/************************************************************************************ /************************************************************************************
* Public Function Prototypes * Public Function Prototypes
************************************************************************************/ ************************************************************************************/
/************************************************************************************ /************************************************************************************
* Name: stm32_boardinitialize * Name: stm32_boardinitialize
* *
@ -181,7 +183,7 @@ extern "C" {
* *
************************************************************************************/ ************************************************************************************/
EXTERN void stm32_boardinitialize(void); void stm32_boardinitialize(void);
#undef EXTERN #undef EXTERN
#if defined(__cplusplus) #if defined(__cplusplus)
@ -189,5 +191,4 @@ EXTERN void stm32_boardinitialize(void);
#endif #endif
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLY__ */
#endif /* __CONFIG_PHOTON_INCLUDE_BOARD_H */ #endif /* __CONFIG_PHOTON_INCLUDE_BOARD_H */

3
configs/photon/nsh/Make.defs
View File

@ -1,7 +1,7 @@
############################################################################ ############################################################################
# configs/photon/nsh/Make.defs # configs/photon/nsh/Make.defs
# #
# Copyright (C) 2011-2012 Gregory Nutt. All rights reserved. # Copyright (C) 2017 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <gnutt@nuttx.org> # Author: Gregory Nutt <gnutt@nuttx.org>
# #
# Redistribution and use in source and binary forms, with or without # Redistribution and use in source and binary forms, with or without
@ -114,4 +114,3 @@ HOSTCC = gcc
HOSTINCLUDES = -I. HOSTINCLUDES = -I.
HOSTCFLAGS = -Wall -Wstrict-prototypes -Wshadow -Wundef -g -pipe HOSTCFLAGS = -Wall -Wstrict-prototypes -Wshadow -Wundef -g -pipe
HOSTLDFLAGS = HOSTLDFLAGS =

2
configs/photon/nsh/defconfig
View File

@ -16,7 +16,7 @@ CONFIG_HOST_LINUX=y
# #
# Build Configuration # Build Configuration
# #
CONFIG_APPS_DIR="../apps" # CONFIG_APPS_DIR="../apps"
CONFIG_BUILD_FLAT=y CONFIG_BUILD_FLAT=y
# CONFIG_BUILD_2PASS is not set # CONFIG_BUILD_2PASS is not set

8
configs/photon/nsh/setenv.sh
View File

@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
# configs/photon/nsh/setenv.sh # configs/photon/nsh/setenv.sh
# #
# Copyright (C) 2011-2012 Gregory Nutt. All rights reserved. # Copyright (C) 2017 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <gnutt@nuttx.org> # Author: Gregory Nutt <gnutt@nuttx.org>
# #
# Redistribution and use in source and binary forms, with or without # Redistribution and use in source and binary forms, with or without
@ -55,7 +55,7 @@ fi
# This is the Cygwin path to the location where I installed the CodeSourcery # This is the Cygwin path to the location where I installed the CodeSourcery
# toolchain under windows. You will also have to edit this if you install # toolchain under windows. You will also have to edit this if you install
# the CodeSourcery toolchain in any other location # the CodeSourcery toolchain in any other location
export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/CodeSourcery/Sourcery G++ Lite/bin" # export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/CodeSourcery/Sourcery G++ Lite/bin"
#export TOOLCHAIN_BIN="/cygdrive/c/Users/MyName/MentorGraphics/Sourcery_CodeBench_Lite_for_ARM_EABI/bin" #export TOOLCHAIN_BIN="/cygdrive/c/Users/MyName/MentorGraphics/Sourcery_CodeBench_Lite_for_ARM_EABI/bin"
# This is the location where I installed the ARM "GNU Tools for ARM Embedded Processors" # This is the location where I installed the ARM "GNU Tools for ARM Embedded Processors"
@ -70,6 +70,10 @@ export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/CodeSourcery/Sourcery G++
#export TOOLCHAIN_BIN="/usr/bin:/cygdrive/c/Program Files (x86)/Atollic/TrueSTUDIO for ARM Pro 2.3.0/ARMTools/bin" #export TOOLCHAIN_BIN="/usr/bin:/cygdrive/c/Program Files (x86)/Atollic/TrueSTUDIO for ARM Pro 2.3.0/ARMTools/bin"
#export TOOLCHAIN_BIN="/usr/bin:/cygdrive/c/Program Files (x86)/Atollic/TrueSTUDIO for STMicroelectronics STM32 Lite 2.3.0/ARMTools/bin" #export TOOLCHAIN_BIN="/usr/bin:/cygdrive/c/Program Files (x86)/Atollic/TrueSTUDIO for STMicroelectronics STM32 Lite 2.3.0/ARMTools/bin"
# This is the location where I installed the ARM "GNU Tools for ARM Embedded Processors"
# You can this free toolchain here https://launchpad.net/gcc-arm-embedded
export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/GNU Tools ARM Embedded/4.9 2015q2/bin"
# This is the Cygwin path to the location where I build the buildroot # This is the Cygwin path to the location where I build the buildroot
# toolchain. # toolchain.
#export TOOLCHAIN_BIN="${WD}/../buildroot/build_arm_nofpu/staging_dir/bin" #export TOOLCHAIN_BIN="${WD}/../buildroot/build_arm_nofpu/staging_dir/bin"

6
configs/photon/scripts/ld.script
View File

@ -1,7 +1,7 @@
/**************************************************************************** /****************************************************************************
* configs/photon/scripts/ld.script * configs/photon/scripts/ld.script
* *
* Copyright (C) 2011-2012 Gregory Nutt. All rights reserved. * Copyright (C) 2017 Gregory Nutt. All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions * modification, are permitted provided that the following conditions
@ -43,8 +43,8 @@
MEMORY MEMORY
{ {
flash (rx) : ORIGIN = 0x08000000, LENGTH = 1024K flash (rx) : ORIGIN = 0x08000000, LENGTH = 1024K
sram (rwx) : ORIGIN = 0x20000000, LENGTH = 112K sram (rwx) : ORIGIN = 0x20000000, LENGTH = 112K
} }
OUTPUT_ARCH(arm) OUTPUT_ARCH(arm)

6
configs/photon/scripts/photon_dfu.ld
View File

@ -1,7 +1,7 @@
/**************************************************************************** /****************************************************************************
* configs/photon/scripts/photon_dfu.ld * configs/photon/scripts/photon_dfu.ld
* *
* Copyright (C) 2011-2012 Gregory Nutt. All rights reserved. * Copyright (C) 2017 Gregory Nutt. All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions * modification, are permitted provided that the following conditions
@ -40,8 +40,8 @@
MEMORY MEMORY
{ {
flash (rx) : ORIGIN = 0x08020000, LENGTH = 896K flash (rx) : ORIGIN = 0x08020000, LENGTH = 896K
sram (rwx) : ORIGIN = 0x20000000, LENGTH = 112K sram (rwx) : ORIGIN = 0x20000000, LENGTH = 112K
} }
OUTPUT_ARCH(arm) OUTPUT_ARCH(arm)

2
configs/photon/src/Makefile
View File

@ -1,7 +1,7 @@
############################################################################ ############################################################################
# configs/photon/src/Makefile # configs/photon/src/Makefile
# #
# Copyright (C) 2011-2013, 2015-2016 Gregory Nutt. All rights reserved. # Copyright (C) 2017 Gregory Nutt. All rights reserved.
# #
# Redistribution and use in source and binary forms, with or without # Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions # modification, are permitted provided that the following conditions

48
configs/photon/src/dfu_signature.c
View File

@ -1,7 +1,7 @@
/**************************************************************************** /****************************************************************************
* configs/photon/src/dfu_signature.c * configs/photon/src/dfu_signature.c
* *
* Copyright (C) 2011-2012, 2015-2016 Gregory Nutt. All rights reserved. * Copyright (C) 2017 Gregory Nutt. All rights reserved.
* Author: Simon Piriou <spiriou31@gmail.com> * Author: Simon Piriou <spiriou31@gmail.com>
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@ -40,28 +40,38 @@
#include <stdint.h> #include <stdint.h>
/**************************************************************************** /****************************************************************************
* Private Data * Private Types
****************************************************************************/
__attribute__((packed)) struct dfu_signature
{
uint32_t linker_start_address;
uint32_t linker_end_address;
uint8_t reserved[4];
uint16_t board_id;
uint8_t firmware_type1;
uint8_t firmware_type2;
uint8_t reserved2[8];
};
/****************************************************************************
* Public Data
****************************************************************************/ ****************************************************************************/
extern uint32_t _firmware_start; extern uint32_t _firmware_start;
extern uint32_t _firmware_end; extern uint32_t _firmware_end;
__attribute__((packed)) struct dfu_signature { /****************************************************************************
uint32_t linker_start_address; * Private Data
uint32_t linker_end_address; ****************************************************************************/
uint8_t reserved[4];
uint16_t board_id;
uint8_t firmware_type1;
uint8_t firmware_type2;
uint8_t reserved2[8];
};
__attribute__((externally_visible, section(".dfu_signature"))) \ __attribute__((externally_visible, section(".dfu_signature")))
const struct dfu_signature dfu_sign = { const struct dfu_signature dfu_sign =
(uint32_t)&_firmware_start, /* Flash image start address */ {
(uint32_t)&_firmware_end, /* Flash image end address */ (uint32_t)&_firmware_start, /* Flash image start address */
{0, 0, 0, 0}, /* reserved */ (uint32_t)&_firmware_end, /* Flash image end address */
6, /* Current board is photon */ {0, 0, 0, 0}, /* reserved */
4, 1, /* Firmware is "system-part1" */ 6, /* Current board is photon */
{0, 0, 0, 0, 0, 0, 0, 0} /* reserved */ 4, 1, /* Firmware is "system-part1" */
{0, 0, 0, 0, 0, 0, 0, 0} /* reserved */
}; };

3
configs/photon/src/photon.h
View File

@ -1,7 +1,7 @@
/**************************************************************************** /****************************************************************************
* configs/photon/src/photon.h * configs/photon/src/photon.h
* *
* Copyright (C) 2011-2012, 2015-2016 Gregory Nutt. All rights reserved. * Copyright (C) 2017 Gregory Nutt. All rights reserved.
* Author: Simon Piriou <spiriou31@gmail.com> * Author: Simon Piriou <spiriou31@gmail.com>
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@ -47,7 +47,6 @@
/**************************************************************************** /****************************************************************************
* Pre-processor Definitions * Pre-processor Definitions
****************************************************************************/ ****************************************************************************/
/* Configuration *************************************************************/
/**************************************************************************** /****************************************************************************
* Public Types * Public Types

2
configs/photon/src/stm32_appinit.c
View File

@ -1,7 +1,7 @@
/**************************************************************************** /****************************************************************************
* config/photon/src/stm32_appinit.c * config/photon/src/stm32_appinit.c
* *
* Copyright (C) 2012, 2014, 2016 Gregory Nutt. All rights reserved. * Copyright (C) 2017 Gregory Nutt. All rights reserved.
* Author: Simon Piriou <spiriou31@gmail.com> * Author: Simon Piriou <spiriou31@gmail.com>
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without

2
configs/photon/src/stm32_boot.c
View File

@ -1,7 +1,7 @@
/************************************************************************************ /************************************************************************************
* configs/photon/src/stm32_boot.c * configs/photon/src/stm32_boot.c
* *
* Copyright (C) 2011-2012, 2015 Gregory Nutt. All rights reserved. * Copyright (C) 2017 Gregory Nutt. All rights reserved.
* Author: Simon Piriou <spiriou31@gmail.com> * Author: Simon Piriou <spiriou31@gmail.com>
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without

641
drivers/wireless/nrf24l01.c
View File

File diff suppressed because it is too large Load Diff

2
include/nuttx/wireless/nrf24l01.h
View File

@ -92,11 +92,9 @@
#ifdef NRF24L01_DEBUG #ifdef NRF24L01_DEBUG
# define werr(format, ...) _err(format, ##__VA_ARGS__) # define werr(format, ...) _err(format, ##__VA_ARGS__)
# define werr(format, ...) _err(format, ##__VA_ARGS__)
# define winfo(format, ...) _info(format, ##__VA_ARGS__) # define winfo(format, ...) _info(format, ##__VA_ARGS__)
#else #else
# define werr(x...) # define werr(x...)
# define werr(x...)
# define winfo(x...) # define winfo(x...)
#endif #endif

4
tools/testbuild.sh
View File

@ -57,6 +57,7 @@ function showusage {
echo " -s Use C++ unsigned long size_t in new operator. Default unsigned int" echo " -s Use C++ unsigned long size_t in new operator. Default unsigned int"
echo " -a <appsdir> provides the relative path to the apps/ directory. Default ../apps" echo " -a <appsdir> provides the relative path to the apps/ directory. Default ../apps"
echo " -n <nxdir> provides the relative path to the NxWidgets/ directory. Default ../NxWidgets" echo " -n <nxdir> provides the relative path to the NxWidgets/ directory. Default ../NxWidgets"
echo " -d enables script debug output"
echo " -h will show this help test and terminate" echo " -h will show this help test and terminate"
echo " <testlist-file> selects the list of configurations to test. No default" echo " <testlist-file> selects the list of configurations to test. No default"
echo "" echo ""
@ -80,6 +81,9 @@ while [ ! -z "$1" ]; do
host=windows host=windows
wenv=cygwin wenv=cygwin
;; ;;
-d )
set -x
;;
-u ) -u )
host=windows host=windows
wenv=ubuntu wenv=ubuntu