Raspberries/upm
Public Access
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix some issues for string based constructors

Browse Source 
Signed-off-by: Adelin Dobre <adelin.dobre@rinftech.com>
Signed-off-by: Mihai Tudor Panu <mihai.tudor.panu@intel.com>
This commit is contained in:
Adelin Dobre
2018-07-27 15:46:16 +03:00
committed by Mihai Tudor Panu
parent 8f11061de3
commit 2975bae075
22 changed files with 257 additions and 264 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/bmm150/bmm150.cxx
View File

@@ -146,47 +146,47 @@ BMM150::BMM150(std::string initStr) : mraaIo(initStr)
std::string::size_type sz;
for(std::string tok:upmTokens) {
if(tok.substr(0,5) == "init:") {
BMM150_USAGE_PRESETS_T usage = (BMM150_USAGE_PRESETS_T)std::stoi(tok.substr(5),nullptr,0);
if(tok.substr(0, 5) == "init:") {
BMM150_USAGE_PRESETS_T usage = (BMM150_USAGE_PRESETS_T)std::stoi(tok.substr(5), nullptr, 0);
init(usage);
}
if(tok.substr(0,9) == "writeReg:") {
uint8_t reg = std::stoi(tok.substr(9),&sz,0);
if(tok.substr(0, 9) == "writeReg:") {
uint8_t reg = std::stoi(tok.substr(9), &sz, 0);
tok = tok.substr(9);
uint8_t val = std::stoi(tok.substr(sz+1),nullptr,0);
uint8_t val = std::stoi(tok.substr(sz+1), nullptr, 0);
writeReg(reg, val);
}
if(tok.substr(0,18) == "setOutputDataRate:") {
BMM150_DATA_RATE_T odr = (BMM150_DATA_RATE_T)std::stoi(tok.substr(18),nullptr,0);
if(tok.substr(0, 18) == "setOutputDataRate:") {
BMM150_DATA_RATE_T odr = (BMM150_DATA_RATE_T)std::stoi(tok.substr(18), nullptr, 0);
setOutputDataRate(odr);
}
if(tok.substr(0,12) == "setPowerBit:") {
bool power = std::stoi(tok.substr(12),&sz,0);
if(tok.substr(0, 12) == "setPowerBit:") {
bool power = std::stoi(tok.substr(12), &sz, 0);
setPowerBit(power);
}
if(tok.substr(0,10) == "setOpmode:") {
BMM150_OPERATION_MODE_T opmode = (BMM150_OPERATION_MODE_T)std::stoi(tok.substr(10),nullptr,0);
if(tok.substr(0, 10) == "setOpmode:") {
BMM150_OPERATION_MODE_T opmode = (BMM150_OPERATION_MODE_T)std::stoi(tok.substr(10), nullptr, 0);
setOpmode(opmode);
}
if(tok.substr(0,19) == "setInterruptEnable:") {
u_int8_t bits = (u_int8_t)std::stoi(tok.substr(19),nullptr,0);
if(tok.substr(0, 19) == "setInterruptEnable:") {
u_int8_t bits = (u_int8_t)std::stoi(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);
if(tok.substr(0, 19) == "setInterruptConfig:") {
u_int8_t bits = (u_int8_t)std::stoi(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);
if(tok.substr(0, 17) == "setRepetitionsXY:") {
u_int8_t reps = (u_int8_t)std::stoi(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);
if(tok.substr(0, 16) == "setRepetitionsZ:") {
u_int8_t reps = (u_int8_t)std::stoi(tok.substr(16), nullptr, 0);
setRepetitionsZ(reps);
}
if(tok.substr(0,14) == "setPresetMode:") {
BMM150_USAGE_PRESETS_T usage = (BMM150_USAGE_PRESETS_T)std::stoi(tok.substr(14),nullptr,0);
if(tok.substr(0, 14) == "setPresetMode:") {
BMM150_USAGE_PRESETS_T usage = (BMM150_USAGE_PRESETS_T)std::stoi(tok.substr(14), nullptr, 0);
setPresetMode(usage);
}
}