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

Eliminate some warnings

Browse Source
This commit is contained in:
Gregory Nutt 2016-06-05 11:57:52 -06:00
parent ad952adb76
commit b99f42ace6
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nxwm/include/ccalibration.hxx
View File

@ -182,7 +182,7 @@ namespace NxWM
bool m_stop; /**< True: We have been asked to stop the calibration */
bool m_touched; /**< True: The screen is touched */
uint8_t m_touchId; /**< The ID of the touch */
#if CONFIG_NXWM_CALIBRATION_AVERAGE
#ifdef CONFIG_NXWM_CALIBRATION_AVERAGE
uint8_t m_nsamples; /**< Number of samples collected so far at this position */
struct nxgl_point_s m_sampleData[CONFIG_NXWM_CALIBRATION_NSAMPLES];
#endif
@ -278,7 +278,7 @@ namespace NxWM
* @return True: Average data is available; False: Need to collect more samples
*/
#if CONFIG_NXWM_CALIBRATION_AVERAGE
#ifdef CONFIG_NXWM_CALIBRATION_AVERAGE
bool averageSamples(struct nxgl_point_s &average);
#endif

12
nxwm/src/ccalibration.cxx
View File

@ -690,7 +690,7 @@ FAR void *CCalibration::calibration(FAR void *arg)
* @return True: Average data is available; False: Need to collect more samples
*/
#if CONFIG_NXWM_CALIBRATION_AVERAGE
#ifdef CONFIG_NXWM_CALIBRATION_AVERAGE
bool CCalibration::averageSamples(struct nxgl_point_s &average)
{
// Have we started collecting sample data? */
@ -801,7 +801,7 @@ void CCalibration::stateMachine(void)
{
gvdbg("Old m_calphase=%d\n", m_calphase);
#if CONFIG_NXWM_CALIBRATION_AVERAGE
#ifdef CONFIG_NXWM_CALIBRATION_AVERAGE
// Are we collecting samples?
struct nxgl_point_s average;
@ -891,7 +891,7 @@ void CCalibration::stateMachine(void)
// A touch has been received while in the CALPHASE_UPPER_LEFT state.
// Save the touch data and set up the next calibration display
#if CONFIG_NXWM_CALIBRATION_AVERAGE
#ifdef CONFIG_NXWM_CALIBRATION_AVERAGE
m_calibData[CALIB_UPPER_LEFT_INDEX].x = average.x;
m_calibData[CALIB_UPPER_LEFT_INDEX].y = average.y;
#else
@ -928,7 +928,7 @@ void CCalibration::stateMachine(void)
// A touch has been received while in the CALPHASE_UPPER_RIGHT state.
// Save the touch data and set up the next calibration display
#if CONFIG_NXWM_CALIBRATION_AVERAGE
#ifdef CONFIG_NXWM_CALIBRATION_AVERAGE
m_calibData[CALIB_UPPER_RIGHT_INDEX].x = average.x;
m_calibData[CALIB_UPPER_RIGHT_INDEX].y = average.y;
#else
@ -965,7 +965,7 @@ void CCalibration::stateMachine(void)
// A touch has been received while in the CALPHASE_LOWER_RIGHT state.
// Save the touch data and set up the next calibration display
#if CONFIG_NXWM_CALIBRATION_AVERAGE
#ifdef CONFIG_NXWM_CALIBRATION_AVERAGE
m_calibData[CALIB_LOWER_RIGHT_INDEX].x = average.x;
m_calibData[CALIB_LOWER_RIGHT_INDEX].y = average.y;
#else
@ -1002,7 +1002,7 @@ void CCalibration::stateMachine(void)
// A touch has been received while in the CALPHASE_LOWER_LEFT state.
// Save the touch data and set up the next calibration display
#if CONFIG_NXWM_CALIBRATION_AVERAGE
#ifdef CONFIG_NXWM_CALIBRATION_AVERAGE
m_calibData[CALIB_LOWER_LEFT_INDEX].x = average.x;
m_calibData[CALIB_LOWER_LEFT_INDEX].y = average.y;
#else