diff options
-rw-r--r-- | NxWidgets/Kconfig | 6 | ||||
-rw-r--r-- | NxWidgets/nxwm/Makefile | 2 | ||||
-rw-r--r-- | NxWidgets/nxwm/images/calculator24x25.png (renamed from NxWidgets/nxwm/images/calculator.png) | bin | 263 -> 263 bytes | |||
-rw-r--r-- | NxWidgets/nxwm/images/calibration24x21.png (renamed from NxWidgets/nxwm/images/calibration.png) | bin | 415 -> 415 bytes | |||
-rw-r--r-- | NxWidgets/nxwm/images/cmd25x22.png (renamed from NxWidgets/nxwm/images/cmd.png) | bin | 264 -> 264 bytes | |||
-rw-r--r-- | NxWidgets/nxwm/images/minimize21x21.png (renamed from NxWidgets/nxwm/images/minimize.png) | bin | 284 -> 284 bytes | |||
-rw-r--r-- | NxWidgets/nxwm/images/nxlogo25x25.png (renamed from NxWidgets/nxwm/images/nxlogo.png) | bin | 608 -> 608 bytes | |||
-rw-r--r-- | NxWidgets/nxwm/images/play24x24.png (renamed from NxWidgets/nxwm/images/play.png) | bin | 233 -> 233 bytes | |||
-rw-r--r-- | NxWidgets/nxwm/images/play48x48.png | bin | 0 -> 374 bytes | |||
-rw-r--r-- | NxWidgets/nxwm/images/start25x25.png (renamed from NxWidgets/nxwm/images/start.png) | bin | 719 -> 719 bytes | |||
-rw-r--r-- | NxWidgets/nxwm/images/stop21x21.png (renamed from NxWidgets/nxwm/images/stop.png) | bin | 381 -> 381 bytes | |||
-rw-r--r-- | NxWidgets/nxwm/include/nxwmconfig.hxx | 2 | ||||
-rw-r--r-- | NxWidgets/nxwm/include/nxwmglyphs.hxx | 2 | ||||
-rw-r--r-- | NxWidgets/nxwm/src/ccalibration.cxx | 33 | ||||
-rw-r--r-- | NxWidgets/nxwm/src/ctouchscreen.cxx | 2 | ||||
-rw-r--r-- | NxWidgets/nxwm/src/glyph_play24x24.cxx (renamed from NxWidgets/nxwm/src/glyph_play.cxx) | 6 | ||||
-rw-r--r-- | nuttx/configs/sama5d3x-ek/nxwm/defconfig | 2 |
17 files changed, 33 insertions, 22 deletions
diff --git a/NxWidgets/Kconfig b/NxWidgets/Kconfig index 7c7b0b8d4..ef512a5e5 100644 --- a/NxWidgets/Kconfig +++ b/NxWidgets/Kconfig @@ -567,15 +567,15 @@ config NXWM_CUSTOM_STARTWINDOW_ICON bool "Custom Start Window Icon" default n ---help--- - Select to override the default Start Window Icon: NxWM::g_playBitmap + Select to override the default Start Window Icon: NxWM::g_playBitmap24x24 if NXWM_CUSTOM_STARTWINDOW_ICON config NXWM_STARTWINDOW_ICON string "StartWindow Icon" - default "NxWM::g_playBitmap" + default "NxWM::g_playBitmap24x24" ---help--- - The glyph to use as the start window icon. Default: NxWM::g_playBitmap + The glyph to use as the start window icon. Default: NxWM::g_playBitmap24x24 endif # NXWM_CUSTOM_STARTWINDOW_ICON diff --git a/NxWidgets/nxwm/Makefile b/NxWidgets/nxwm/Makefile index f4d148316..6efb464cf 100644 --- a/NxWidgets/nxwm/Makefile +++ b/NxWidgets/nxwm/Makefile @@ -72,7 +72,7 @@ endif # Images CXXSRCS += glyph_calculator.cxx glyph_calibration.cxx glyph_cmd.cxx -CXXSRCS += glyph_minimize.cxx glyph_nsh.cxx glyph_play.cxx glyph_start.cxx +CXXSRCS += glyph_minimize.cxx glyph_nsh.cxx glyph_play24x24.cxx glyph_start.cxx CXXSRCS += glyph_stop.cxx ifeq ($(CONFIG_NXWM_MEDIAPLAYER),y) diff --git a/NxWidgets/nxwm/images/calculator.png b/NxWidgets/nxwm/images/calculator24x25.png Binary files differindex fe3ad3e86..fe3ad3e86 100644 --- a/NxWidgets/nxwm/images/calculator.png +++ b/NxWidgets/nxwm/images/calculator24x25.png diff --git a/NxWidgets/nxwm/images/calibration.png b/NxWidgets/nxwm/images/calibration24x21.png Binary files differindex 76a84127f..76a84127f 100644 --- a/NxWidgets/nxwm/images/calibration.png +++ b/NxWidgets/nxwm/images/calibration24x21.png diff --git a/NxWidgets/nxwm/images/cmd.png b/NxWidgets/nxwm/images/cmd25x22.png Binary files differindex 3e6cf667c..3e6cf667c 100644 --- a/NxWidgets/nxwm/images/cmd.png +++ b/NxWidgets/nxwm/images/cmd25x22.png diff --git a/NxWidgets/nxwm/images/minimize.png b/NxWidgets/nxwm/images/minimize21x21.png Binary files differindex 7080533dd..7080533dd 100644 --- a/NxWidgets/nxwm/images/minimize.png +++ b/NxWidgets/nxwm/images/minimize21x21.png diff --git a/NxWidgets/nxwm/images/nxlogo.png b/NxWidgets/nxwm/images/nxlogo25x25.png Binary files differindex 63ece46e5..63ece46e5 100644 --- a/NxWidgets/nxwm/images/nxlogo.png +++ b/NxWidgets/nxwm/images/nxlogo25x25.png diff --git a/NxWidgets/nxwm/images/play.png b/NxWidgets/nxwm/images/play24x24.png Binary files differindex 02ff75414..02ff75414 100644 --- a/NxWidgets/nxwm/images/play.png +++ b/NxWidgets/nxwm/images/play24x24.png diff --git a/NxWidgets/nxwm/images/play48x48.png b/NxWidgets/nxwm/images/play48x48.png Binary files differnew file mode 100644 index 000000000..24dddd781 --- /dev/null +++ b/NxWidgets/nxwm/images/play48x48.png diff --git a/NxWidgets/nxwm/images/start.png b/NxWidgets/nxwm/images/start25x25.png Binary files differindex 8cad18756..8cad18756 100644 --- a/NxWidgets/nxwm/images/start.png +++ b/NxWidgets/nxwm/images/start25x25.png diff --git a/NxWidgets/nxwm/images/stop.png b/NxWidgets/nxwm/images/stop21x21.png Binary files differindex 365068b4a..365068b4a 100644 --- a/NxWidgets/nxwm/images/stop.png +++ b/NxWidgets/nxwm/images/stop21x21.png diff --git a/NxWidgets/nxwm/include/nxwmconfig.hxx b/NxWidgets/nxwm/include/nxwmconfig.hxx index a10491d39..5b42e3a70 100644 --- a/NxWidgets/nxwm/include/nxwmconfig.hxx +++ b/NxWidgets/nxwm/include/nxwmconfig.hxx @@ -312,7 +312,7 @@ */ #ifndef CONFIG_NXWM_STARTWINDOW_ICON -# define CONFIG_NXWM_STARTWINDOW_ICON NxWM::g_playBitmap +# define CONFIG_NXWM_STARTWINDOW_ICON NxWM::g_playBitmap24x24 #endif /** diff --git a/NxWidgets/nxwm/include/nxwmglyphs.hxx b/NxWidgets/nxwm/include/nxwmglyphs.hxx index 5bcd4fb83..799ca61b6 100644 --- a/NxWidgets/nxwm/include/nxwmglyphs.hxx +++ b/NxWidgets/nxwm/include/nxwmglyphs.hxx @@ -70,7 +70,7 @@ namespace NxWM #endif extern const struct NXWidgets::SRlePaletteBitmap g_minimizeBitmap; extern const struct NXWidgets::SRlePaletteBitmap g_nshBitmap; - extern const struct NXWidgets::SRlePaletteBitmap g_playBitmap; + extern const struct NXWidgets::SRlePaletteBitmap g_playBitmap24x24; extern const struct NXWidgets::SRlePaletteBitmap g_startBitmap; extern const struct NXWidgets::SRlePaletteBitmap g_stopBitmap; } diff --git a/NxWidgets/nxwm/src/ccalibration.cxx b/NxWidgets/nxwm/src/ccalibration.cxx index 01bdf3b44..51b536db0 100644 --- a/NxWidgets/nxwm/src/ccalibration.cxx +++ b/NxWidgets/nxwm/src/ccalibration.cxx @@ -73,6 +73,17 @@ #define CALIBRATION_CIRCLE_RADIUS 16 #define CALIBRATION_LINE_THICKNESS 2 +/* We want debug output from some logic in this file if either input/touchscreen + * or graphics debug is enabled. + */ + +#ifndef CONFIG_DEBUG_INPUT +# undef idbg +# define idbg gdbg +# undef ivdbg +# define ivdbg gvdbg +#endif + /**************************************************************************** * Private Data ****************************************************************************/ @@ -341,7 +352,7 @@ void CCalibration::touchscreenInput(struct touch_sample_s &sample) m_touchPos.x = sample.point[0].x; m_touchPos.y = sample.point[0].y; - gvdbg("Touch id: %d flags: %02x x: %d y: %d h: %d w: %d pressure: %d\n", + ivdbg("Touch id: %d flags: %02x x: %d y: %d h: %d w: %d pressure: %d\n", sample.point[0].id, sample.point[0].flags, sample.point[0].x, sample.point[0].y, sample.point[0].h, sample.point[0].w, sample.point[0].pressure); @@ -379,7 +390,7 @@ void CCalibration::touchscreenInput(struct touch_sample_s &sample) { // Yes.. invoke the state machine. - gvdbg("State: %d Screen x: %d y: %d Touch x: %d y: %d\n", + ivdbg("State: %d Screen x: %d y: %d Touch x: %d y: %d\n", m_calphase, m_screenInfo.pos.x, m_screenInfo.pos.y, m_touchPos.x, m_touchPos.y); @@ -682,7 +693,7 @@ bool CCalibration::averageSamples(struct nxgl_point_s &average) // Save the sample data - gvdbg("Sample %d: Touch x: %d y: %d\n", m_nsamples+1, m_touchPos.x, m_touchPos.y); + ivdbg("Sample %d: Touch x: %d y: %d\n", m_nsamples+1, m_touchPos.x, m_touchPos.y); m_sampleData[m_nsamples].x = m_touchPos.x; m_sampleData[m_nsamples].y = m_touchPos.y; @@ -771,7 +782,7 @@ bool CCalibration::averageSamples(struct nxgl_point_s &average) average.y = m_sampleData[0].y; #endif - gvdbg("Average: Touch x: %d y: %d\n", average.x, average.y); + ivdbg("Average: Touch x: %d y: %d\n", average.x, average.y); m_nsamples = 0; return true; } @@ -1016,7 +1027,7 @@ void CCalibration::stateMachine(void) break; } - gvdbg("New m_calphase=%d Screen x: %d y: %d\n", + ivdbg("New m_calphase=%d Screen x: %d y: %d\n", m_calphase, m_screenInfo.pos.x, m_screenInfo.pos.y); } @@ -1145,7 +1156,7 @@ bool CCalibration::createCalibrationData(struct SCalibrationData &data) data.left.slope = (bottomX - topX) / (bottomY - topY); data.left.offset = topX - topY * data.left.slope; - gdbg("Left slope: %f offset: %f\n", data.left.slope, data.left.offset); + idbg("Left slope: %f offset: %f\n", data.left.slope, data.left.offset); topX = (float)m_calibData[CALIB_UPPER_RIGHT_INDEX].x; bottomX = (float)m_calibData[CALIB_LOWER_RIGHT_INDEX].x; @@ -1156,7 +1167,7 @@ bool CCalibration::createCalibrationData(struct SCalibrationData &data) data.right.slope = (bottomX - topX) / (bottomY - topY); data.right.offset = topX - topY * data.right.slope; - gdbg("Right slope: %f offset: %f\n", data.right.slope, data.right.offset); + idbg("Right slope: %f offset: %f\n", data.right.slope, data.right.offset); // Y lines: // @@ -1174,7 +1185,7 @@ bool CCalibration::createCalibrationData(struct SCalibrationData &data) data.top.slope = (rightY - leftY) / (rightX - leftX); data.top.offset = leftY - leftX * data.top.slope; - gdbg("Top slope: %f offset: %f\n", data.top.slope, data.top.offset); + idbg("Top slope: %f offset: %f\n", data.top.slope, data.top.offset); leftX = (float)m_calibData[CALIB_LOWER_LEFT_INDEX].x; rightX = (float)m_calibData[CALIB_LOWER_RIGHT_INDEX].x; @@ -1185,7 +1196,7 @@ bool CCalibration::createCalibrationData(struct SCalibrationData &data) data.bottom.slope = (rightY - leftY) / (rightX - leftX); data.bottom.offset = leftY - leftX * data.bottom.slope; - gdbg("Bottom slope: %f offset: %f\n", data.bottom.slope, data.bottom.offset); + idbg("Bottom slope: %f offset: %f\n", data.bottom.slope, data.bottom.offset); // Save also the calibration screen positions @@ -1213,7 +1224,7 @@ bool CCalibration::createCalibrationData(struct SCalibrationData &data) data.xSlope = b16divb16(itob16(CALIBRATION_RIGHTX - CALIBRATION_LEFTX), (rightX - leftX)); data.xOffset = itob16(CALIBRATION_LEFTX) - b16mulb16(leftX, data.xSlope); - gdbg("New xSlope: %08x xOffset: %08x\n", data.xSlope, data.xOffset); + idbg("New xSlope: %08x xOffset: %08x\n", data.xSlope, data.xOffset); // Similarly for Y // @@ -1234,7 +1245,7 @@ bool CCalibration::createCalibrationData(struct SCalibrationData &data) data.ySlope = b16divb16(itob16(CALIBRATION_BOTTOMY - CALIBRATION_TOPY), (bottomY - topY)); data.yOffset = itob16(CALIBRATION_TOPY) - b16mulb16(topY, data.ySlope); - gdbg("New ySlope: %08x yOffset: %08x\n", data.ySlope, data.yOffset); + idbg("New ySlope: %08x yOffset: %08x\n", data.ySlope, data.yOffset); #endif return true; diff --git a/NxWidgets/nxwm/src/ctouchscreen.cxx b/NxWidgets/nxwm/src/ctouchscreen.cxx index 1b9c53e4d..105908859 100644 --- a/NxWidgets/nxwm/src/ctouchscreen.cxx +++ b/NxWidgets/nxwm/src/ctouchscreen.cxx @@ -579,7 +579,7 @@ void CTouchscreen::handleMouseInput(struct touch_sample_s *sample) #endif - gvdbg("raw: (%d, %d) scaled: (%d, %d)\n", rawX, rawY, x, y); + vdbg("raw: (%d, %d) scaled: (%d, %d)\n", rawX, rawY, x, y); } // Get the server handle and "inject the mouse data diff --git a/NxWidgets/nxwm/src/glyph_play.cxx b/NxWidgets/nxwm/src/glyph_play24x24.cxx index 8c16addae..7ccce5e89 100644 --- a/NxWidgets/nxwm/src/glyph_play.cxx +++ b/NxWidgets/nxwm/src/glyph_play24x24.cxx @@ -1,7 +1,7 @@ /******************************************************************************************** - * NxWidgets/nxwm/src/glyph_play.cxx + * NxWidgets/nxwm/src/glyph_play24x24.cxx * - * Copyright (C) 2012 Gregory Nutt. All rights reserved. + * Copyright (C) 2012-2013 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <gnutt@nuttx.org> * * Redistribution and use in source and binary forms, with or without @@ -243,7 +243,7 @@ static const struct NXWidgets::SRlePaletteBitmapEntry g_playRleEntries[] = * Public Bitmap Structure Defintions ********************************************************************************************/ -const struct NXWidgets::SRlePaletteBitmap NxWM::g_playBitmap = +const struct NXWidgets::SRlePaletteBitmap NxWM::g_playBitmap24x24 = { CONFIG_NXWIDGETS_BPP, // bpp - Bits per pixel CONFIG_NXWIDGETS_FMT, // fmt - Color format diff --git a/nuttx/configs/sama5d3x-ek/nxwm/defconfig b/nuttx/configs/sama5d3x-ek/nxwm/defconfig index 403cc986f..b4279f283 100644 --- a/nuttx/configs/sama5d3x-ek/nxwm/defconfig +++ b/nuttx/configs/sama5d3x-ek/nxwm/defconfig @@ -605,7 +605,7 @@ CONFIG_STDIO_BUFFER_SIZE=64 CONFIG_STDIO_LINEBUFFER=y CONFIG_NUNGET_CHARS=2 CONFIG_LIB_HOMEDIR="/" -# CONFIG_LIBM is not set +CONFIG_LIBM=y # CONFIG_NOPRINTF_FIELDWIDTH is not set CONFIG_LIBC_FLOATINGPOINT=y CONFIG_LIB_RAND_ORDER=1 |