phone-side
/
nuttx-bb
9
0
Fork 0
Code Releases Activity

Mostly cosmetic updates 

git-svn-id: https://nuttx.svn.sourceforge.net/svnroot/nuttx/trunk@4980 7fd9a85b-ad96-42d3-883c-3090e2eb8679
This commit is contained in:
patacongo 2012-07-26 20:38:46 +00:00
parent 856152a1dd
commit 490584bbf0
7 changed files with 217 additions and 158 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
nuttx/Documentation/NuttX.html
View File

@ -8,7 +8,7 @@
<tr align="center" bgcolor="#e4e4e4">
<td>
<h1><big><font color="#3c34ec"><i>NuttX RTOS</i></font></big></h1>
<p>Last Updated: July 19, 2012</p>
<p>Last Updated: July 25, 2012</p>
</td>
</tr>
</table>
@ -2300,11 +2300,13 @@
<b>STATUS:</b>
The basic port is code complete.
Two configurations are available:
An OS test configuration and a that support the NuttShell (NSH).
(1) An OS test configuration and a (2) configuration that support the NuttShell (NSH).
The OS test configuration is fully functional and proves that we have a basically healthy NuttX port to the Mirtoo.
This includes support for the SST25 serial FLASH on board the module.
The NSH configuration includes support for a serial console and for the SST25 serial FLASH and the PGA117 amplifier/multiplexer on board the module.
The NSH configuration is set up to use the NuttX wear-leveling FLASH file system (NXFFS).
The PGA117, however, is not yet fully integrated to support ADC sampling.
See the <a href="http://www.nuttx.org/NuttShell.html">NSH User Guide</a> for further information about NSH.
There are some remaining issues to be resolved with the NSH configuration but, with any luck, the verified port should be available with the NuttX 6.20 release.
The first verified port to the Mirtoo module was available with the NuttX 6.20 release.
</p>
</ul>
</td>

1
nuttx/Documentation/NuttXRelated.html
View File

@ -39,6 +39,7 @@
<td>&nbsp</td>
<td>
<li><a href="http://osmocom.org/" target="top">Osmocom-BB</a></li>
<li><a href="https://pixhawk.ethz.ch/px4/" target="top">PX4 Autopilot</a></li>
<li><a href="http://rgmp.sourceforge.net/wiki/index.php/Main_Page" target="top">RGMP</a></li>
</tr>
<tr>

25
nuttx/configs/stm32f4discovery/README.txt
View File

@ -508,12 +508,12 @@ I purchased an LCD display on eBay from china. The LCD is 320x240 RGB565 and
is based on an SSD1289 LCD controller and an XPT2046 touch IC. The pin out
from the 2x16 connect on the LCD is labeled as follows:
LCD CONNECTOR: SSD1289 MPU INTERFACE PINS
LCD CONNECTOR: SSD1289 MPU INTERFACE PINS:
+------+------+ DEN I Display enble pin
1 | GND | 3V3 | 2 VSYNC I Frame synchonrization signal
+------+------+ HSYNC I Line synchroniziation signal
3 | D1 | D0 | 4 DOTCLIK I Dot clock ans OSC source
+------+------+ DEN I Display enable pin
1 | GND | 3V3 | 2 VSYNC I Frame synchronization signal
+------+------+ HSYNC I Line synchronization signal
3 | D1 | D0 | 4 DOTCLK I Dot clock and OSC source
+------+------+ DC I Data or command
5 | D3 | D2 | 6 E (~RD) I Enable/Read strobe
+------+------+ R (~WR) I Read/Write strobe
@ -531,12 +531,12 @@ LCD CONNECTOR: SSD1289 MPU INTERFACE PINS
+------+------+
19 | RS | CS | 20
+------+------+
21 | RD | WR | 22
21 | RD | WR | 22 NOTES:
+------+------+
23 |EL_CNT|RESET | 24
+------+------+
25 |TP_RQ |TP_S0 | 26 These pins are for the touch panel
23 |BL_CNT|RESET | 24 BL_CNT is the PWM backlight level control.
+------+------+
25 |TP_RQ |TP_S0 | 26 These pins are for the touch panel: TP_REQ
+------+------+ TP_S0, TP_SI, TP_SCX, and TP_CS
27 | NC |TP_SI | 28
+------+------+
29 | NC |TP_SCX| 30
@ -546,9 +546,9 @@ LCD CONNECTOR: SSD1289 MPU INTERFACE PINS
MAPPING TO STM32 F4:
---------------- ------------- ----------------------------------
---------------- -------------- ----------------------------------
STM32 FUNCTION LCD PIN STM32F4Discovery PIN
---------------- ------------- ----------------------------------
---------------- -------------- ----------------------------------
FSMC_D0 D0 pin 4 PD14 P1 pin 46 Conflict (Note 1)
FSMC_D1 D1 pin 3 PD15 P1 pin 47 Conflict (Note 2)
FSMC_D2 D2 pin 6 PD0 P2 pin 36 Free I/O
@ -570,7 +570,8 @@ MAPPING TO STM32 F4:
FSMC_NWE ~WR pin 22 PD5 P2 pin 29 Conflict (Note 3)
FSMC_NOE ~RD pin 21 PD4 P2 pin 32 Conflict (Note 4)
PC6 RESET pin 24 PC6 P2 pin 47 Free I/O
---------------- ------------- ----------------------------------
Timer ouput BL_CNT pin 23 (to be determined)
---------------- -------------- ----------------------------------
1 Used for the RED LED
2 Used for the BLUE LED

2
nuttx/drivers/Kconfig
View File

@ -201,7 +201,7 @@ if WATCHDOG
endif
menuconfig ANALOG
bool "Analog Device(adc,dac) support"
bool "Analog Device(ADC/DAC) support"
default n
---help---
This directory holds implementations of analog device drivers.

67
nuttx/drivers/analog/Kconfig
View File

@ -3,22 +3,75 @@
# see misc/tools/kconfig-language.txt.
#
config CONFIG_ADC
bool "Analog Digital Convert"
config ADC
bool "Analog-to-Digital Conversion"
default n
---help---
Select to enable support for analog input device support. This includes
not only Analog-to-Digital Converters (ADC) but also amplifiers and
analog multiplexers.
config ADC_ADS125X
bool "TI ads1255/ads1256 support"
bool "TI ADS1255/ADS1256 support"
default n
depends on CONFIG_ADC
depends on ADC
select SPI
config CONFIG_DAC
bool "Digital Analog Convert"
config ADS1255_FREQUENCY
int "ADS1255/ADS1256 SPI frequency"
default 1000000
depends on ADC_ADS125X
config ADC_PGA11X
bool "TI PGA112/3/6/7 support"
default n
depends on ADC
select SPI
---help---
Enables support for the PGA112, PGA113, PGA116, PGA117 Zerø-Drift
PROGRAMMABLE GAIN AMPLIFIER with MUX
config PGA11X_SPIFREQUENCY
int "TI PGA112/3/6/7 SPI frequency"
default 1000000
depends on ADC_PGA11X
---help---
PGA11x SPI frequency.
config PGA11X_SPIMODE
int "TI PGA112/3/6/7 SPI mode"
default 0
depends on ADC_PGA11X
---help---
PGA11x SPI mode. The specification says that the device operates in Mode 0 or
Mode 3. But sometimes you need to tinker with this to get things to work
correctly. Default: Mode 0
config PGA11X_DAISYCHAIN
bool "TI PGA112/3/6/7 daisy chain mode"
default n
depends on ADC_PGA11X
---help---
Enable support to use two PGA116/7's in Daisy Chain configuration.
config PGA11X_MULTIPLE
bool "Multiple TI PGA112/3/6/7 support"
default n
depends on ADC_PGA11X && !PGA11X_DAISYCHAIN
---help---
Can be defined to support multiple PGA11X devices on board with separate
chip selects (not daisy chained). Each device will require a customized
SPI interface to distinguish them when SPI_SELECT is called with
devid=SPIDEV_MUX.
config DAC
bool "Digital-to-Analog Conversion"
default n
---help---
Select to enable support for Digital-to-Analog Converters (DACs).
config DAC_AD5410
bool "AD5410 support"
default n
depends on CONFIG_DAC
depends on DAC
select SPI

38
nuttx/drivers/lcd/p14201.c
View File

@ -2,8 +2,8 @@
* drivers/lcd/p14201.c
* Driver for RiT P14201 series display (wih sd1329 IC controller)
*
* Copyright (C) 2010 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
* Copyright (C) 2010, 2012 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@ -269,7 +269,7 @@ static uint8_t g_runbuffer[RIT_XRES / 2];
/* CONFIG_P14201_FRAMEBUFFER - If defined, accesses will be performed using an in-memory
* copy of the OLEDs GDDRAM. This cost of this buffer is 128 * 64 / 2 = 4Kb. If this
* is defined, then the driver will be full functioned. If not, then:
* is defined, then the driver will be full functional. If not, then:
*
* - Reading graphics memory cannot be supported, and
* - All pixel writes must be aligned to byte boundaries.
@ -429,12 +429,12 @@ static const uint8_t g_setallrow[] =
**************************************************************************************/
/**************************************************************************************
* Function: rit_configspi
* Name: rit_configspi
*
* Description:
* Configure the SPI for use with the P14201
*
* Parameters:
* Input Parameters:
* spi - Reference to the SPI driver structure
*
* Returned Value:
@ -467,12 +467,12 @@ static inline void rit_configspi(FAR struct spi_dev_s *spi)
}
/**************************************************************************************
* Function: rit_select
* Name: rit_select
*
* Description:
* Select the SPI, locking and re-configuring if necessary
*
* Parameters:
* Input Parameters:
* spi - Reference to the SPI driver structure
*
* Returned Value:
@ -512,12 +512,12 @@ static void rit_select(FAR struct spi_dev_s *spi)
#endif
/**************************************************************************************
* Function: rit_deselect
* Name: rit_deselect
*
* Description:
* De-select the SPI
*
* Parameters:
* Input Parameters:
* spi - Reference to the SPI driver structure
*
* Returned Value:
@ -545,12 +545,12 @@ static void rit_deselect(FAR struct spi_dev_s *spi)
#endif
/**************************************************************************************
* Function: rit_sndbytes
* Name: rit_sndbytes
*
* Description:
* Send a sequence of command or data bytes to the SSD1329 controller.
*
* Parameters:
* Input Parameters:
* spi - Reference to the SPI driver structure
* buffer - A reference to memory containing the command bytes to be sent.
* buflen - The number of command bytes in buffer to be sent
@ -589,12 +589,12 @@ static void rit_sndbytes(FAR struct rit_dev_s *priv, FAR const uint8_t *buffer,
}
/**************************************************************************************
* Function: rit_sndcmd
* Name: rit_sndcmd
*
* Description:
* Send multiple commands from a table of commands.
*
* Parameters:
* Input Parameters:
* spi - Reference to the SPI driver structure
* table - A reference to table containing all of the commands to be sent.
*
@ -623,9 +623,10 @@ static void rit_sndcmds(FAR struct rit_dev_s *priv, FAR const uint8_t *table)
* Name: rit_clear
*
* Description:
* This method can be used to write a partial raster line to the LCD:
* This method can be used to clear the entire display.
*
* rpriv - Reference to private driver structure
* Input Parameters:
* priv - Reference to private driver structure
*
* Assumptions:
* Caller has selected the OLED section.
@ -692,8 +693,9 @@ static inline void rit_clear(FAR struct rit_dev_s *priv)
* Name: rit_putrun
*
* Description:
* This method can be used to write a partial raster line to the LCD:
* This method can be used to write a partial raster line to the LCD.
*
* Input Parameters:
* row - Starting row to write to (range: 0 <= row < yres)
* col - Starting column to write to (range: 0 <= col <= xres-npixels)
* buffer - The buffer containing the run to be written to the LCD
@ -915,6 +917,7 @@ static int rit_putrun(fb_coord_t row, fb_coord_t col, FAR const uint8_t *buffer,
rit_deselect(priv->spi);
}
return OK;
}
#endif
@ -1023,6 +1026,7 @@ static int rit_getrun(fb_coord_t row, fb_coord_t col, FAR uint8_t *buffer,
*buffer = (curr << 4);
}
}
return OK;
}
#else
@ -1198,13 +1202,11 @@ static int rit_setcontrast(struct lcd_dev_s *dev, unsigned int contrast)
* setting at 0 (full off == sleep mode).
*
* Input Parameters:
*
* spi - A reference to the SPI driver instance.
* devno - A value in the range of 0 throuh CONFIG_P14201_NINTERFACES-1. This allows
* support for multiple OLED devices.
*
* Returned Value:
*
* On success, this function returns a reference to the LCD object for the specified
* OLED. NULL is returned on any failure.
*