alexey.zholtikov/upm
1
0
Fork 0
mirror of https://github.com/eclipse/upm.git synced 2025-10-29 14:15:33 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

grovescam: fix narrowing conversions (c++11)

Browse Source 
Signed-off-by: Jon Trulson <jtrulson@ics.com>
Signed-off-by: Mihai Tudor Panu <mihai.tudor.panu@intel.com>
This commit is contained in:
Jon Trulson
2016-03-03 14:42:57 -07:00
committed by Mihai Tudor Panu
parent 7a133cf891
commit be34f53a51
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/grovescam/grovescam.cxx
View File

@@ -194,7 +194,8 @@ void GROVESCAM::drainInput()
bool GROVESCAM::init() bool GROVESCAM::init()
{ {
const unsigned int pktLen = 6; const unsigned int pktLen = 6;
uint8_t cmd[pktLen] = {0xaa, 0x0d|m_camAddr, 0x00, 0x00, 0x00, 0x00}; uint8_t cmd[pktLen] = {0xaa, static_cast<uint8_t>(0x0d|m_camAddr), 0x00,
0x00, 0x00, 0x00};
uint8_t resp[pktLen]; uint8_t resp[pktLen];
int retries = 0; int retries = 0;
@@ -246,7 +247,8 @@ bool GROVESCAM::init()
bool GROVESCAM::preCapture(PIC_FORMATS_T fmt) bool GROVESCAM::preCapture(PIC_FORMATS_T fmt)
{ {
const unsigned int pktLen = 6; const unsigned int pktLen = 6;
uint8_t cmd[pktLen] = { 0xaa, 0x01 | m_camAddr, 0x00, 0x07, 0x00, fmt }; uint8_t cmd[pktLen] = { 0xaa, static_cast<uint8_t>(0x01 | m_camAddr), 0x00,
0x07, 0x00, fmt };
uint8_t resp[pktLen]; uint8_t resp[pktLen];
int retries = 0; int retries = 0;
@@ -282,7 +284,8 @@ bool GROVESCAM::preCapture(PIC_FORMATS_T fmt)
bool GROVESCAM::doCapture() bool GROVESCAM::doCapture()
{ {
const unsigned int pktLen = 6; const unsigned int pktLen = 6;
uint8_t cmd[pktLen] = { 0xaa, 0x06 | m_camAddr, 0x08, MAX_PKT_LEN & 0xff, uint8_t cmd[pktLen] = { 0xaa, static_cast<uint8_t>(0x06 | m_camAddr), 0x08,
MAX_PKT_LEN & 0xff,
(MAX_PKT_LEN >> 8) & 0xff, 0}; (MAX_PKT_LEN >> 8) & 0xff, 0};
uint8_t resp[pktLen]; uint8_t resp[pktLen];
int retries = 0; int retries = 0;
@@ -422,7 +425,8 @@ bool GROVESCAM::storeImage(const char *fname)
if ((m_picTotalLen % (MAX_PKT_LEN-6)) != 0) if ((m_picTotalLen % (MAX_PKT_LEN-6)) != 0)
pktCnt += 1; pktCnt += 1;
uint8_t cmd[pktLen] = { 0xaa, 0x0e | m_camAddr, 0x00, 0x00, 0x00, 0x00 }; uint8_t cmd[pktLen] = { 0xaa, static_cast<uint8_t>(0x0e | m_camAddr), 0x00,
0x00, 0x00, 0x00 };
uint8_t pkt[MAX_PKT_LEN]; uint8_t pkt[MAX_PKT_LEN];
int retries = 0; int retries = 0;