Skip to content

Commit a0f0067

Browse files
authored
Merge pull request #5 from MacroYau/patch
Fix #4 for error compiling for ESP8266 and other non-AVR architectures
2 parents 3d118e0 + ea9eff4 commit a0f0067

File tree

1 file changed

+9
-7
lines changed

1 file changed

+9
-7
lines changed

src/SparkFun_VEML6075_Arduino_Library.cpp

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,9 @@ VEML6075_error_t VEML6075::begin(TwoWire &wirePort)
120120
_deviceAddress = VEML6075_ADDRESS;
121121
_i2cPort = &wirePort;
122122

123-
_i2cPort->end();
123+
#ifdef WIRE_HAS_END
124+
_i2cPort->end();
125+
#endif
124126
_i2cPort->begin();
125127

126128
err = _connected();
@@ -214,7 +216,7 @@ VEML6075::veml6075_uv_it_t VEML6075::getIntegrationTime(void)
214216
{
215217
return IT_INVALID;
216218
}
217-
return (conf & VEML6075_UV_IT_MASK) >> VEML6075_UV_IT_SHIFT;
219+
return static_cast<VEML6075::veml6075_uv_it_t>((conf & VEML6075_UV_IT_MASK) >> VEML6075_UV_IT_SHIFT);
218220
}
219221

220222
VEML6075_error_t VEML6075::setHighDynamic(VEML6075::veml6075_hd_t hd)
@@ -251,7 +253,7 @@ VEML6075::veml6075_hd_t VEML6075::getHighDynamic(void)
251253
{
252254
return HD_INVALID;
253255
}
254-
return (conf & VEML6075_HD_MASK) >> VEML6075_HD_SHIFT;
256+
return static_cast<VEML6075::veml6075_hd_t>((conf & VEML6075_HD_MASK) >> VEML6075_HD_SHIFT);
255257
}
256258

257259
VEML6075_error_t VEML6075::setTrigger(VEML6075::veml6075_uv_trig_t trig)
@@ -280,7 +282,7 @@ VEML6075::veml6075_uv_trig_t VEML6075::getTrigger(void)
280282
{
281283
return TRIGGER_INVALID;
282284
}
283-
return (conf & VEML6075_TRIG_MASK) >> VEML6075_TRIG_SHIFT;
285+
return static_cast<VEML6075::veml6075_uv_trig_t>((conf & VEML6075_TRIG_MASK) >> VEML6075_TRIG_SHIFT);
284286
}
285287

286288

@@ -310,15 +312,15 @@ VEML6075::veml6075_af_t VEML6075::getAutoForce(void)
310312
{
311313
return AF_INVALID;
312314
}
313-
return (conf & VEML6075_AF_MASK) >> VEML6075_AF_SHIFT;
315+
return static_cast<VEML6075::veml6075_af_t>((conf & VEML6075_AF_MASK) >> VEML6075_AF_SHIFT);
314316
}
315317

316-
VEML6075_error_t VEML6075::powerOn(boolean enable = true)
318+
VEML6075_error_t VEML6075::powerOn(boolean enable)
317319
{
318320
return shutdown(!enable);
319321
}
320322

321-
VEML6075_error_t VEML6075::shutdown(boolean shutdown = true)
323+
VEML6075_error_t VEML6075::shutdown(boolean shutdown)
322324
{
323325
VEML6075_error_t err;
324326
veml6075_t conf;

0 commit comments

Comments
 (0)