You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by xi...@apache.org on 2020/11/24 11:33:44 UTC
[incubator-nuttx-apps] branch master updated (747ca59 -> 99633ab)
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx-apps.git.
from 747ca59 canutils/candump/candump.c: Fix printf formats
new 2667fb2 graphics/nxwidgets/src/cimage.cxx: Fix a syslog format
new 4f11793 graphics/nxwm/src/ctouchscreen.cxx: Fix syslog formats
new 99633ab graphics/nxwm/src/ccalibration.cxx: Fix syslog formats
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
graphics/nxwidgets/src/cimage.cxx | 2 +-
graphics/nxwm/src/ccalibration.cxx | 7 +++++--
graphics/nxwm/src/ctouchscreen.cxx | 4 +++-
3 files changed, 9 insertions(+), 4 deletions(-)
[incubator-nuttx-apps] 02/03: graphics/nxwm/src/ctouchscreen.cxx:
Fix syslog formats
Posted by xi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx-apps.git
commit 4f11793e9d998806a85d4657db202f6f1129dd42
Author: YAMAMOTO Takashi <ya...@midokura.com>
AuthorDate: Tue Nov 24 12:45:52 2020 +0900
graphics/nxwm/src/ctouchscreen.cxx: Fix syslog formats
---
graphics/nxwm/src/ctouchscreen.cxx | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/graphics/nxwm/src/ctouchscreen.cxx b/graphics/nxwm/src/ctouchscreen.cxx
index b7e279c..1fab3ee 100644
--- a/graphics/nxwm/src/ctouchscreen.cxx
+++ b/graphics/nxwm/src/ctouchscreen.cxx
@@ -39,6 +39,7 @@
#include <nuttx/config.h>
+#include <cinttypes>
#include <cunistd>
#include <cerrno>
#include <cfcntl>
@@ -557,7 +558,8 @@ void CTouchscreen::handleMouseInput(struct touch_sample_s *sample)
y = (nxgl_coord_t)bigY;
}
- _info("raw: (%d, %d) scaled: (%d, %d)\n", rawX, rawY, x, y);
+ _info("raw: (%" PRId32 ", %" PRId32 ") scaled: (%d, %d)\n",
+ rawX, rawY, x, y);
#endif
}
[incubator-nuttx-apps] 03/03: graphics/nxwm/src/ccalibration.cxx:
Fix syslog formats
Posted by xi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx-apps.git
commit 99633aba70afb898c99b294f83bfe6e33376ce51
Author: YAMAMOTO Takashi <ya...@midokura.com>
AuthorDate: Tue Nov 24 12:49:08 2020 +0900
graphics/nxwm/src/ccalibration.cxx: Fix syslog formats
---
graphics/nxwm/src/ccalibration.cxx | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/graphics/nxwm/src/ccalibration.cxx b/graphics/nxwm/src/ccalibration.cxx
index a15afaa..4120491 100644
--- a/graphics/nxwm/src/ccalibration.cxx
+++ b/graphics/nxwm/src/ccalibration.cxx
@@ -37,6 +37,7 @@
* Included Files
****************************************************************************/
+#include <cinttypes>
#include <cunistd>
#include <cerrno>
@@ -1241,7 +1242,8 @@ 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);
- iinfo("New xSlope: %08x xOffset: %08x\n", data.xSlope, data.xOffset);
+ iinfo("New xSlope: %08" PRIx32 " xOffset: %08" PRIx32 "\n",
+ data.xSlope, data.xOffset);
// Similarly for Y
//
@@ -1262,7 +1264,8 @@ 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);
- iinfo("New ySlope: %08x yOffset: %08x\n", data.ySlope, data.yOffset);
+ iinfo("New ySlope: %08" PRIx32 " yOffset: %08" PRIx32 "\n",
+ data.ySlope, data.yOffset);
#endif
return true;
[incubator-nuttx-apps] 01/03: graphics/nxwidgets/src/cimage.cxx:
Fix a syslog format
Posted by xi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx-apps.git
commit 2667fb265ba61804cc78009d0cf890189a4e0dec
Author: YAMAMOTO Takashi <ya...@midokura.com>
AuthorDate: Tue Nov 24 12:30:15 2020 +0900
graphics/nxwidgets/src/cimage.cxx: Fix a syslog format
---
graphics/nxwidgets/src/cimage.cxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/graphics/nxwidgets/src/cimage.cxx b/graphics/nxwidgets/src/cimage.cxx
index 2a53a6b..b470784 100644
--- a/graphics/nxwidgets/src/cimage.cxx
+++ b/graphics/nxwidgets/src/cimage.cxx
@@ -268,7 +268,7 @@ void CImage::drawContents(CGraphicsPort *port, bool selected)
if (!m_bitmap->getRun(0, srcRow, nLeftPixels, &buffer[m_origin.x]))
{
- ginfo("IBitmap::getRun failed at image row\n", srcRow);
+ ginfo("IBitmap::getRun failed at image row %d\n", srcRow);
delete buffer;
return;
}