scott/InfiniTime
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Fixed a few compilation errors, fixed UUID.

Browse source
This commit is contained in:
Avamander 2021-11-28 15:33:06 +02:00
parent ed6f0aade4
commit ffb17357e7
5 changed files with 25 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/components/ble/weather/WeatherData.h
View file

@ -250,7 +250,7 @@ namespace Pinetime {
class Location : public TimelineHeader {
public:
/** Location name */
std::unique_ptr<std::string> location;
std::string location;
/** Altitude relative to sea level in meters */
int16_t altitude;
/** Latitude, EPSG:3857 (Google Maps, Openstreetmaps datum) */
@ -311,7 +311,7 @@ namespace Pinetime {
* For chemical compounds use the molecular formula e.g. "NO2", "CO2", "O3"
* For pollen use the genus, e.g. "Betula" for birch or "Alternaria" for that mold's spores
*/
std::unique_ptr<std::string> polluter;
std::string polluter;
/**
* Amount of the pollution in SI units,
* otherwise it's going to be difficult to create UI, alerts

2
src/components/ble/weather/WeatherService.cpp
View file

@ -87,7 +87,7 @@ namespace Pinetime {
if (UsefulBuf_IsNULLOrEmptyC(String) != 0) {
return BLE_ATT_ERR_INVALID_ATTR_VALUE_LEN;
}
airquality->polluter = std::make_unique<std::string>(static_cast<const char*>(String.ptr), String.len);
airquality->polluter = std::string(static_cast<const char*>(String.ptr), String.len);
int64_t tmpAmount = 0;
QCBORDecode_GetInt64InMapSZ(&decodeContext, "Amount", &tmpAmount);
if (tmpAmount < 0) {

2
src/components/ble/weather/WeatherService.h
View file

@ -88,7 +88,7 @@ namespace Pinetime {
// 0003yyxx-78fc-48fe-8e23-433b3a1942d0
static constexpr ble_uuid128_t CharUuid(uint8_t x, uint8_t y) {
return ble_uuid128_t {.u = {.type = BLE_UUID_TYPE_128},
.value = {0xd0, 0x42, 0x19, 0x3a, 0x3b, 0x43, 0x23, 0x8e, 0xfe, 0x48, 0xfc, 0x78, x, y, 0x03, 0x00}};
.value = {0xd0, 0x42, 0x19, 0x3a, 0x3b, 0x43, 0x23, 0x8e, 0xfe, 0x48, 0xfc, 0x78, y, x, 0x03, 0x00}};
}
ble_uuid128_t weatherUuid {BaseUuid()};