From a8cd0f72ec82add4d4171a2a899aa250e7c31b0f Mon Sep 17 00:00:00 2001 From: Adelin Dobre Date: Tue, 31 Jul 2018 14:29:52 +0300 Subject: [PATCH] Add changes getting values for upm parameters Signed-off-by: Adelin Dobre Signed-off-by: Mihai Tudor Panu --- src/adc121c021/adc121c021.cxx | 14 +++++++------- src/adis16448/adis16448.cxx | 4 ++-- src/bh1750/bh1750.cxx | 2 +- src/bma220/bma220.cxx | 4 ++-- src/bma250e/bma250e.cxx | 20 ++++++++++---------- src/bmg160/bmg160.cxx | 14 +++++++------- src/bmm150/bmm150.cxx | 12 ++++++------ src/bmp280/bmp280.cxx | 4 ++-- src/bmpx8x/bmpx8x.cxx | 4 ++-- 9 files changed, 39 insertions(+), 39 deletions(-) diff --git a/src/adc121c021/adc121c021.cxx b/src/adc121c021/adc121c021.cxx index 996dd5a5..d3359292 100644 --- a/src/adc121c021/adc121c021.cxx +++ b/src/adc121c021/adc121c021.cxx @@ -90,15 +90,15 @@ ADC121C021::ADC121C021(std::string initStr) : mraaIo(initStr) m_vref = std::stof(tok.substr(5)); } if(tok.substr(0, 10) == "writeByte:") { - uint8_t reg = std::stoi(tok.substr(10), &sz, 0); + uint8_t reg = std::stoul(tok.substr(10), &sz, 0); tok = tok.substr(10); - uint8_t byte = std::stoi(tok.substr(sz+1), nullptr, 0); + uint8_t byte = std::stoul(tok.substr(sz+1), nullptr, 0); writeByte(reg, byte); } if(tok.substr(0,10) == "writeWord:") { - uint8_t reg = std::stoi(tok.substr(10), &sz, 0); + uint8_t reg = std::stoul(tok.substr(10), &sz, 0); tok = tok.substr(10); - uint16_t word = std::stoi(tok.substr(sz+1), nullptr, 0); + uint16_t word = std::stoul(tok.substr(sz+1), nullptr, 0); writeWord(reg, word); } if(tok.substr(0,16) == "enableAlertFlag:") { @@ -118,15 +118,15 @@ ADC121C021::ADC121C021(std::string initStr) : mraaIo(initStr) enableAlertPinPolarityHigh(enable); } if(tok.substr(0,17) == "setAlertLowLimit:") { - uint16_t limit = std::stoi(tok.substr(17), nullptr, 0); + uint16_t limit = std::stoul(tok.substr(17), nullptr, 0); setAlertLowLimit(limit); } if(tok.substr(0,18) == "setAlertHighLimit:") { - uint16_t limit = std::stoi(tok.substr(18), nullptr, 0); + uint16_t limit = std::stoul(tok.substr(18), nullptr, 0); setAlertHighLimit(limit); } if(tok.substr(0,14) == "setHysteresis:") { - uint16_t limit = std::stoi(tok.substr(14), nullptr, 0); + uint16_t limit = std::stoul(tok.substr(14), nullptr, 0); setHysteresis(limit); } } diff --git a/src/adis16448/adis16448.cxx b/src/adis16448/adis16448.cxx index b84c7f90..c56b52cb 100644 --- a/src/adis16448/adis16448.cxx +++ b/src/adis16448/adis16448.cxx @@ -125,9 +125,9 @@ ADIS16448::ADIS16448(std::string initStr) : mraaIo(initStr) for (std::string tok : upmTokens) { if(tok.substr(0, 9) == "regWrite:") { - uint8_t regAddr = std::stoi(tok.substr(9), &sz, 0); + uint8_t regAddr = std::stoul(tok.substr(9), &sz, 0); tok = tok.substr(9); - uint16_t regData = std::stoi(tok.substr(sz+1), nullptr, 0); + uint16_t regData = std::stoul(tok.substr(sz+1), nullptr, 0); regWrite(regAddr, regData); } } diff --git a/src/bh1750/bh1750.cxx b/src/bh1750/bh1750.cxx index 954d6c09..7719f8b2 100644 --- a/src/bh1750/bh1750.cxx +++ b/src/bh1750/bh1750.cxx @@ -96,7 +96,7 @@ BH1750::BH1750(std::string initStr) : mraaIo(initStr) powerDown(); } if(tok.substr(0, 12) == "sendCommand:") { - uint8_t mode = (uint8_t)std::stoi(tok.substr(12), nullptr, 0); + uint8_t mode = (uint8_t)std::stoul(tok.substr(12), nullptr, 0); sendCommand(mode); } } diff --git a/src/bma220/bma220.cxx b/src/bma220/bma220.cxx index f0f13a71..453110ca 100644 --- a/src/bma220/bma220.cxx +++ b/src/bma220/bma220.cxx @@ -107,9 +107,9 @@ BMA220::BMA220(std::string initStr) : mraaIo(new mraa::MraaIo(initStr)) for(std::string tok :upmTokens) { if(tok.substr(0, 9) == "writeReg:") { - uint8_t reg = std::stoi(tok.substr(9), &sz, 0); + uint8_t reg = std::stoul(tok.substr(9), &sz, 0); tok = tok.substr(9); - uint8_t val = std::stoi(tok.substr(sz+1), nullptr, 0); + uint8_t val = std::stoul(tok.substr(sz+1), nullptr, 0); writeReg(reg, val); } if(tok.substr(0, 22) == "setAccelerometerScale:") { diff --git a/src/bma250e/bma250e.cxx b/src/bma250e/bma250e.cxx index 0078802a..a8792782 100644 --- a/src/bma250e/bma250e.cxx +++ b/src/bma250e/bma250e.cxx @@ -167,9 +167,9 @@ BMA250E::BMA250E(std::string initStr) : mraaIo(initStr) enableFIFO(useFIFO); } if(tok.substr(0, 9) == "writeReg:") { - uint8_t reg = std::stoi(tok.substr(9), &sz, 0); + uint8_t reg = std::stoul(tok.substr(9), &sz, 0); tok = tok.substr(9); - uint8_t val = std::stoi(tok.substr(sz+1), nullptr, 0); + uint8_t val = std::stoul(tok.substr(sz+1), nullptr, 0); writeReg(reg, val); } if(tok.substr(0, 9) == "setRange:") { @@ -195,35 +195,35 @@ BMA250E::BMA250E(std::string initStr) : mraaIo(initStr) fifoConfig(mode, axes); } if(tok.substr(0, 20) == "setInterruptEnable0:") { - u_int8_t bits = (u_int8_t)std::stoi(tok.substr(20), nullptr, 0); + u_int8_t bits = (u_int8_t)std::stoul(tok.substr(20), nullptr, 0); setInterruptEnable0(bits); } if(tok.substr(0, 20) == "setInterruptEnable1:") { - u_int8_t bits = (u_int8_t)std::stoi(tok.substr(20), nullptr, 0); + u_int8_t bits = (u_int8_t)std::stoul(tok.substr(20), nullptr, 0); setInterruptEnable1(bits); } if(tok.substr(0, 20) == "setInterruptEnable2:") { - u_int8_t bits = (u_int8_t)std::stoi(tok.substr(20), nullptr, 0); + u_int8_t bits = (u_int8_t)std::stoul(tok.substr(20), nullptr, 0); setInterruptEnable2(bits); } if(tok.substr(0, 17) == "setInterruptMap0:") { - u_int8_t bits = (u_int8_t)std::stoi(tok.substr(17), nullptr, 0); + u_int8_t bits = (u_int8_t)std::stoul(tok.substr(17), nullptr, 0); setInterruptMap0(bits); } if(tok.substr(0, 17) == "setInterruptMap1:") { - u_int8_t bits = (u_int8_t)std::stoi(tok.substr(17), nullptr, 0); + u_int8_t bits = (u_int8_t)std::stoul(tok.substr(17), nullptr, 0); setInterruptMap1(bits); } if(tok.substr(0, 17) == "setInterruptMap2:") { - u_int8_t bits = (u_int8_t)std::stoi(tok.substr(17), nullptr, 0); + u_int8_t bits = (u_int8_t)std::stoul(tok.substr(17), nullptr, 0); setInterruptMap2(bits); } if(tok.substr(0, 16) == "setInterruptSrc:") { - u_int8_t bits = (u_int8_t)std::stoi(tok.substr(16), nullptr, 0); + u_int8_t bits = (u_int8_t)std::stoul(tok.substr(16), nullptr, 0); setInterruptSrc(bits); } if(tok.substr(0, 26) == "setInterruptOutputControl:") { - u_int8_t bits = (u_int8_t)std::stoi(tok.substr(26), nullptr, 0); + u_int8_t bits = (u_int8_t)std::stoul(tok.substr(26), nullptr, 0); setInterruptOutputControl(bits); } if(tok.substr(0, 26) == "setInterruptLatchBehavior:") { diff --git a/src/bmg160/bmg160.cxx b/src/bmg160/bmg160.cxx index 7cfab0ec..1a0939f8 100644 --- a/src/bmg160/bmg160.cxx +++ b/src/bmg160/bmg160.cxx @@ -145,9 +145,9 @@ BMG160::BMG160(std::string initStr) : mraaIo(initStr) enableFIFO(useFIFO); } if(tok.substr(0, 9) == "writeReg:") { - uint8_t reg = std::stoi(tok.substr(9), &sz, 0); + uint8_t reg = std::stoul(tok.substr(9), &sz, 0); tok = tok.substr(9); - uint8_t val = std::stoi(tok.substr(sz+1), nullptr, 0); + uint8_t val = std::stoul(tok.substr(sz+1), nullptr, 0); writeReg(reg, val); } if(tok.substr(0, 9) == "setRange:") { @@ -173,23 +173,23 @@ BMG160::BMG160(std::string initStr) : mraaIo(initStr) fifoConfig(mode, axes); } if(tok.substr(0, 20) == "setInterruptEnable0:") { - u_int8_t bits = (u_int8_t)std::stoi(tok.substr(20), nullptr, 0); + u_int8_t bits = (u_int8_t)std::stoul(tok.substr(20), nullptr, 0); setInterruptEnable0(bits); } if(tok.substr(0, 17) == "setInterruptMap0:") { - u_int8_t bits = (u_int8_t)std::stoi(tok.substr(17), nullptr, 0); + u_int8_t bits = (u_int8_t)std::stoul(tok.substr(17), nullptr, 0); setInterruptMap0(bits); } if(tok.substr(0, 17) == "setInterruptMap1:") { - u_int8_t bits = (u_int8_t)std::stoi(tok.substr(17), nullptr, 0); + u_int8_t bits = (u_int8_t)std::stoul(tok.substr(17), nullptr, 0); setInterruptMap1(bits); } if(tok.substr(0, 16) == "setInterruptSrc:") { - u_int8_t bits = (u_int8_t)std::stoi(tok.substr(16), nullptr, 0); + u_int8_t bits = (u_int8_t)std::stoul(tok.substr(16), nullptr, 0); setInterruptSrc(bits); } if(tok.substr(0, 26) == "setInterruptOutputControl:") { - u_int8_t bits = (u_int8_t)std::stoi(tok.substr(26), nullptr, 0); + u_int8_t bits = (u_int8_t)std::stoul(tok.substr(26), nullptr, 0); setInterruptOutputControl(bits); } if(tok.substr(0, 26) == "setInterruptLatchBehavior:") { diff --git a/src/bmm150/bmm150.cxx b/src/bmm150/bmm150.cxx index ec24a8b0..234ebf92 100644 --- a/src/bmm150/bmm150.cxx +++ b/src/bmm150/bmm150.cxx @@ -151,9 +151,9 @@ BMM150::BMM150(std::string initStr) : mraaIo(initStr) init(usage); } if(tok.substr(0, 9) == "writeReg:") { - uint8_t reg = std::stoi(tok.substr(9), &sz, 0); + uint8_t reg = std::stoul(tok.substr(9), &sz, 0); tok = tok.substr(9); - uint8_t val = std::stoi(tok.substr(sz+1), nullptr, 0); + uint8_t val = std::stoul(tok.substr(sz+1), nullptr, 0); writeReg(reg, val); } if(tok.substr(0, 18) == "setOutputDataRate:") { @@ -170,19 +170,19 @@ BMM150::BMM150(std::string initStr) : mraaIo(initStr) setOpmode(opmode); } if(tok.substr(0, 19) == "setInterruptEnable:") { - u_int8_t bits = (u_int8_t)std::stoi(tok.substr(19), nullptr, 0); + u_int8_t bits = (u_int8_t)std::stoul(tok.substr(19), nullptr, 0); setInterruptEnable(bits); } if(tok.substr(0, 19) == "setInterruptConfig:") { - u_int8_t bits = (u_int8_t)std::stoi(tok.substr(19), nullptr, 0); + u_int8_t bits = (u_int8_t)std::stoul(tok.substr(19), nullptr, 0); setInterruptConfig(bits); } if(tok.substr(0, 17) == "setRepetitionsXY:") { - u_int8_t reps = (u_int8_t)std::stoi(tok.substr(17), nullptr, 0); + u_int8_t reps = (u_int8_t)std::stoul(tok.substr(17), nullptr, 0); setRepetitionsXY(reps); } if(tok.substr(0, 16) == "setRepetitionsZ:") { - u_int8_t reps = (u_int8_t)std::stoi(tok.substr(16), nullptr, 0); + u_int8_t reps = (u_int8_t)std::stoul(tok.substr(16), nullptr, 0); setRepetitionsZ(reps); } if(tok.substr(0, 14) == "setPresetMode:") { diff --git a/src/bmp280/bmp280.cxx b/src/bmp280/bmp280.cxx index 19e9a732..8d18369b 100644 --- a/src/bmp280/bmp280.cxx +++ b/src/bmp280/bmp280.cxx @@ -170,9 +170,9 @@ BMP280::BMP280(std::string initStr) : mraaIo(initStr) setSeaLevelPreassure(seaLevelhPA); } if(tok.substr(0, 9) == "writeReg:") { - uint8_t reg = std::stoi(tok.substr(9), &sz, 0); + uint8_t reg = std::stoul(tok.substr(9), &sz, 0); tok = tok.substr(9); - uint8_t val = std::stoi(tok.substr(sz+1), nullptr, 0); + uint8_t val = std::stoul(tok.substr(sz+1), nullptr, 0); writeReg(reg, val); } if(tok.substr(0, 10) == "setFilter:") { diff --git a/src/bmpx8x/bmpx8x.cxx b/src/bmpx8x/bmpx8x.cxx index 6b0dac8f..3408116d 100644 --- a/src/bmpx8x/bmpx8x.cxx +++ b/src/bmpx8x/bmpx8x.cxx @@ -110,9 +110,9 @@ BMPX8X::BMPX8X(std::string initStr) : mraaIo(initStr) setOversampling(oss); } if(tok.substr(0, 9) == "writeReg:") { - uint8_t reg = std::stoi(tok.substr(9), &sz, 0); + uint8_t reg = std::stoul(tok.substr(9), &sz, 0); tok = tok.substr(9); - uint8_t val = std::stoi(tok.substr(sz+1), nullptr, 0); + uint8_t val = std::stoul(tok.substr(sz+1), nullptr, 0); writeReg(reg, val); } }