diff options
| author | patacongo <patacongo@7fd9a85b-ad96-42d3-883c-3090e2eb8679> | 2012-05-15 20:10:32 +0000 |
|---|---|---|
| committer | patacongo <patacongo@7fd9a85b-ad96-42d3-883c-3090e2eb8679> | 2012-05-15 20:10:32 +0000 |
| commit | d21b932f5ecbedadab9113374d89c6243478ec3e (patch) | |
| tree | 51e09899dc63fadd94c36505db44c511e5483f4f /nuttx | |
| parent | f81489f95ee8b2c6808c62499a2360d94a449a8f (diff) | |
| download | px4-firmware-d21b932f5ecbedadab9113374d89c6243478ec3e.tar.gz px4-firmware-d21b932f5ecbedadab9113374d89c6243478ec3e.tar.bz2 px4-firmware-d21b932f5ecbedadab9113374d89c6243478ec3e.zip | |
NXWidgets::CNxTkWindow must subtract the height of the toolbar (if any) when reporting the size of the window
git-svn-id: https://nuttx.svn.sourceforge.net/svnroot/nuttx/trunk@4741 7fd9a85b-ad96-42d3-883c-3090e2eb8679
Diffstat (limited to 'nuttx')
| -rw-r--r-- | nuttx/TODO | 2 | ||||
| -rw-r--r-- | nuttx/drivers/input/stmpe11_tsc.c | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/nuttx/TODO b/nuttx/TODO index d1d9df3fa..33f29d2dc 100644 --- a/nuttx/TODO +++ b/nuttx/TODO @@ -793,7 +793,7 @@ o Graphics subystem (graphics/) and moved out into a graphics layer (like NxWM) that knows more about the appropriate context to do the autoraise. Status: Open - Proiority: Medium low + Priority: Medium low o Pascal Add-On (pcode/) ^^^^^^^^^^^^^^^^^^^^^^ diff --git a/nuttx/drivers/input/stmpe11_tsc.c b/nuttx/drivers/input/stmpe11_tsc.c index afe27ac89..ca6d92ce0 100644 --- a/nuttx/drivers/input/stmpe11_tsc.c +++ b/nuttx/drivers/input/stmpe11_tsc.c @@ -929,7 +929,7 @@ void stmpe11_tscworker(FAR struct stmpe11_dev_s *priv, uint8_t intsta) if (!pendown) { /* The pen is up.. reset thresholding variables. FIFOs will read zero if - * there is no data available (hence the choice of (0,0) + * there is no data available (hence the choice of (0,0)) */ priv->threshx = 0; @@ -1050,11 +1050,11 @@ void stmpe11_tscworker(FAR struct stmpe11_dev_s *priv, uint8_t intsta) stmpe11_notify(priv); - /* Clear the interrupt pending bit and enable the FIFO again */ + /* Reset and clear all data in the FIFO */ ignored: - stmpe11_putreg8(priv, STMPE11_FIFO_STA, 0x01); - stmpe11_putreg8(priv, STMPE11_FIFO_STA, 0x00); + stmpe11_putreg8(priv, STMPE11_FIFO_STA, FIFO_STA_FIFO_RESET); + stmpe11_putreg8(priv, STMPE11_FIFO_STA, 0); } #endif /* CONFIG_INPUT && CONFIG_INPUT_STMPE11 && !CONFIG_STMPE11_TSC_DISABLE */ |