commit
d29a9818af
17 changed files with 1509 additions and 31 deletions
3
.gitmodules
vendored
3
.gitmodules
vendored
|
@ -4,3 +4,6 @@
|
||||||
[submodule "src/libs/littlefs"]
|
[submodule "src/libs/littlefs"]
|
||||||
path = src/libs/littlefs
|
path = src/libs/littlefs
|
||||||
url = https://github.com/littlefs-project/littlefs.git
|
url = https://github.com/littlefs-project/littlefs.git
|
||||||
|
[submodule "src/libs/QCBOR"]
|
||||||
|
path = src/libs/QCBOR
|
||||||
|
url = https://github.com/laurencelundblade/QCBOR.git
|
||||||
|
|
|
@ -79,6 +79,10 @@ The following custom services are implemented in InfiniTime:
|
||||||
- Since InfiniTime 1.7:
|
- Since InfiniTime 1.7:
|
||||||
* [Motion Service](MotionService.md): 00030000-78fc-48fe-8e23-433b3a1942d0
|
* [Motion Service](MotionService.md): 00030000-78fc-48fe-8e23-433b3a1942d0
|
||||||
|
|
||||||
|
|
||||||
|
- Since InfiniTime 1.8:
|
||||||
|
* [Weather Service](/src/components/ble/weather/WeatherService.h): 00040000-78fc-48fe-8e23-433b3a1942d0
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
## BLE services
|
## BLE services
|
||||||
|
|
|
@ -358,6 +358,14 @@ set(LVGL_SRC
|
||||||
libs/lvgl/src/lv_widgets/lv_win.c
|
libs/lvgl/src/lv_widgets/lv_win.c
|
||||||
)
|
)
|
||||||
|
|
||||||
|
set(QCBOR_SRC
|
||||||
|
libs/QCBOR/src/ieee754.c
|
||||||
|
libs/QCBOR/src/qcbor_decode.c
|
||||||
|
libs/QCBOR/src/qcbor_encode.c
|
||||||
|
libs/QCBOR/src/qcbor_err_to_str.c
|
||||||
|
libs/QCBOR/src/UsefulBuf.c
|
||||||
|
)
|
||||||
|
|
||||||
list(APPEND IMAGE_FILES
|
list(APPEND IMAGE_FILES
|
||||||
displayapp/icons/battery/os_battery_error.c
|
displayapp/icons/battery/os_battery_error.c
|
||||||
displayapp/icons/battery/os_battery_100.c
|
displayapp/icons/battery/os_battery_100.c
|
||||||
|
@ -408,6 +416,7 @@ list(APPEND SOURCE_FILES
|
||||||
displayapp/screens/Label.cpp
|
displayapp/screens/Label.cpp
|
||||||
displayapp/screens/FirmwareUpdate.cpp
|
displayapp/screens/FirmwareUpdate.cpp
|
||||||
displayapp/screens/Music.cpp
|
displayapp/screens/Music.cpp
|
||||||
|
displayapp/screens/Weather.cpp
|
||||||
displayapp/screens/Navigation.cpp
|
displayapp/screens/Navigation.cpp
|
||||||
displayapp/screens/Metronome.cpp
|
displayapp/screens/Metronome.cpp
|
||||||
displayapp/screens/Motion.cpp
|
displayapp/screens/Motion.cpp
|
||||||
|
@ -473,6 +482,7 @@ list(APPEND SOURCE_FILES
|
||||||
components/ble/CurrentTimeService.cpp
|
components/ble/CurrentTimeService.cpp
|
||||||
components/ble/AlertNotificationService.cpp
|
components/ble/AlertNotificationService.cpp
|
||||||
components/ble/MusicService.cpp
|
components/ble/MusicService.cpp
|
||||||
|
components/ble/weather/WeatherService.cpp
|
||||||
components/ble/NavigationService.cpp
|
components/ble/NavigationService.cpp
|
||||||
displayapp/fonts/lv_font_navi_80.c
|
displayapp/fonts/lv_font_navi_80.c
|
||||||
components/ble/BatteryInformationService.cpp
|
components/ble/BatteryInformationService.cpp
|
||||||
|
@ -544,6 +554,7 @@ list(APPEND RECOVERY_SOURCE_FILES
|
||||||
components/ble/CurrentTimeService.cpp
|
components/ble/CurrentTimeService.cpp
|
||||||
components/ble/AlertNotificationService.cpp
|
components/ble/AlertNotificationService.cpp
|
||||||
components/ble/MusicService.cpp
|
components/ble/MusicService.cpp
|
||||||
|
components/ble/weather/WeatherService.cpp
|
||||||
components/ble/BatteryInformationService.cpp
|
components/ble/BatteryInformationService.cpp
|
||||||
components/ble/ImmediateAlertService.cpp
|
components/ble/ImmediateAlertService.cpp
|
||||||
components/ble/ServiceDiscovery.cpp
|
components/ble/ServiceDiscovery.cpp
|
||||||
|
@ -647,6 +658,9 @@ set(INCLUDE_FILES
|
||||||
components/datetime/DateTimeController.h
|
components/datetime/DateTimeController.h
|
||||||
components/brightness/BrightnessController.h
|
components/brightness/BrightnessController.h
|
||||||
components/motion/MotionController.h
|
components/motion/MotionController.h
|
||||||
|
components/firmwarevalidator/FirmwareValidator.h
|
||||||
|
components/ble/BleController.h
|
||||||
|
components/ble/NotificationManager.h
|
||||||
components/ble/NimbleController.h
|
components/ble/NimbleController.h
|
||||||
components/ble/DeviceInformationService.h
|
components/ble/DeviceInformationService.h
|
||||||
components/ble/CurrentTimeClient.h
|
components/ble/CurrentTimeClient.h
|
||||||
|
@ -659,6 +673,7 @@ set(INCLUDE_FILES
|
||||||
components/ble/BleClient.h
|
components/ble/BleClient.h
|
||||||
components/ble/HeartRateService.h
|
components/ble/HeartRateService.h
|
||||||
components/ble/MotionService.h
|
components/ble/MotionService.h
|
||||||
|
components/ble/weather/WeatherService.h
|
||||||
components/settings/Settings.h
|
components/settings/Settings.h
|
||||||
components/timer/TimerController.h
|
components/timer/TimerController.h
|
||||||
components/alarm/AlarmController.h
|
components/alarm/AlarmController.h
|
||||||
|
@ -784,7 +799,7 @@ link_directories(
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
set(COMMON_FLAGS -MP -MD -mthumb -mabi=aapcs -Wall -Wno-unknown-pragmas -g3 -ffunction-sections -fdata-sections -fno-strict-aliasing -fno-builtin --short-enums -mcpu=cortex-m4 -mfloat-abi=hard -mfpu=fpv4-sp-d16 -Wreturn-type -Werror=return-type -fstack-usage -fno-exceptions -fno-non-call-exceptions)
|
set(COMMON_FLAGS -MP -MD -mthumb -mabi=aapcs -Wall -Wextra -Warray-bounds=2 -Wformat=2 -Wformat-overflow=2 -Wformat-truncation=2 -Wformat-nonliteral -ftree-vrp -Wno-unused-parameter -Wno-missing-field-initializers -Wno-unknown-pragmas -Wno-expansion-to-defined -g3 -ffunction-sections -fdata-sections -fno-strict-aliasing -fno-builtin --short-enums -mcpu=cortex-m4 -mfloat-abi=hard -mfpu=fpv4-sp-d16 -Wreturn-type -Werror=return-type -fstack-usage -fno-exceptions -fno-non-call-exceptions)
|
||||||
add_definitions(-DCONFIG_GPIO_AS_PINRESET)
|
add_definitions(-DCONFIG_GPIO_AS_PINRESET)
|
||||||
add_definitions(-DNIMBLE_CFG_CONTROLLER)
|
add_definitions(-DNIMBLE_CFG_CONTROLLER)
|
||||||
add_definitions(-DOS_CPUTIME_FREQ)
|
add_definitions(-DOS_CPUTIME_FREQ)
|
||||||
|
@ -806,10 +821,10 @@ add_library(nrf-sdk STATIC ${SDK_SOURCE_FILES})
|
||||||
target_include_directories(nrf-sdk SYSTEM PUBLIC . ../)
|
target_include_directories(nrf-sdk SYSTEM PUBLIC . ../)
|
||||||
target_include_directories(nrf-sdk SYSTEM PUBLIC ${INCLUDES_FROM_LIBS})
|
target_include_directories(nrf-sdk SYSTEM PUBLIC ${INCLUDES_FROM_LIBS})
|
||||||
target_compile_options(nrf-sdk PRIVATE
|
target_compile_options(nrf-sdk PRIVATE
|
||||||
$<$<AND:$<COMPILE_LANGUAGE:C>,$<CONFIG:DEBUG>>: ${COMMON_FLAGS} -Og -g3>
|
$<$<AND:$<COMPILE_LANGUAGE:C>,$<CONFIG:DEBUG>>: ${COMMON_FLAGS} -Wno-expansion-to-defined -Og -g3>
|
||||||
$<$<AND:$<COMPILE_LANGUAGE:C>,$<CONFIG:RELEASE>>: ${COMMON_FLAGS} -Os>
|
$<$<AND:$<COMPILE_LANGUAGE:C>,$<CONFIG:RELEASE>>: ${COMMON_FLAGS} -Wno-expansion-to-defined -O3>
|
||||||
$<$<AND:$<COMPILE_LANGUAGE:CXX>,$<CONFIG:DEBUG>>: ${COMMON_FLAGS} -Og -fno-rtti>
|
$<$<AND:$<COMPILE_LANGUAGE:CXX>,$<CONFIG:DEBUG>>: ${COMMON_FLAGS} -Wno-expansion-to-defined -Og -fno-rtti>
|
||||||
$<$<AND:$<COMPILE_LANGUAGE:CXX>,$<CONFIG:RELEASE>>: ${COMMON_FLAGS} -Os -fno-rtti>
|
$<$<AND:$<COMPILE_LANGUAGE:CXX>,$<CONFIG:RELEASE>>: ${COMMON_FLAGS} -Wno-expansion-to-defined -O3 -fno-rtti>
|
||||||
$<$<COMPILE_LANGUAGE:ASM>: -MP -MD -x assembler-with-cpp>
|
$<$<COMPILE_LANGUAGE:ASM>: -MP -MD -x assembler-with-cpp>
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -837,6 +852,25 @@ target_compile_options(lvgl PRIVATE
|
||||||
$<$<COMPILE_LANGUAGE:ASM>: -MP -MD -x assembler-with-cpp>
|
$<$<COMPILE_LANGUAGE:ASM>: -MP -MD -x assembler-with-cpp>
|
||||||
)
|
)
|
||||||
|
|
||||||
|
# QCBOR
|
||||||
|
add_library(QCBOR STATIC ${QCBOR_SRC})
|
||||||
|
target_include_directories(QCBOR SYSTEM PUBLIC libs/QCBOR/inc)
|
||||||
|
# This is required with the current configuration
|
||||||
|
target_compile_definitions(QCBOR PUBLIC QCBOR_DISABLE_FLOAT_HW_USE)
|
||||||
|
# These are for space-saving
|
||||||
|
target_compile_definitions(QCBOR PUBLIC QCBOR_DISABLE_PREFERRED_FLOAT)
|
||||||
|
target_compile_definitions(QCBOR PUBLIC QCBOR_DISABLE_EXP_AND_MANTISSA)
|
||||||
|
target_compile_definitions(QCBOR PUBLIC QCBOR_DISABLE_INDEFINITE_LENGTH_STRINGS)
|
||||||
|
#target_compile_definitions(QCBOR PUBLIC QCBOR_DISABLE_INDEFINITE_LENGTH_ARRAYS)
|
||||||
|
target_compile_definitions(QCBOR PUBLIC QCBOR_DISABLE_UNCOMMON_TAGS)
|
||||||
|
target_compile_definitions(QCBOR PUBLIC USEFULBUF_CONFIG_LITTLE_ENDIAN)
|
||||||
|
set_target_properties(QCBOR PROPERTIES LINKER_LANGUAGE C)
|
||||||
|
target_compile_options(QCBOR PRIVATE
|
||||||
|
$<$<AND:$<COMPILE_LANGUAGE:C>,$<CONFIG:DEBUG>>: ${COMMON_FLAGS} -O0 -g3>
|
||||||
|
$<$<AND:$<COMPILE_LANGUAGE:C>,$<CONFIG:RELEASE>>: ${COMMON_FLAGS} -O3>
|
||||||
|
$<$<COMPILE_LANGUAGE:ASM>: -MP -MD -x assembler-with-cpp>
|
||||||
|
)
|
||||||
|
|
||||||
# LITTLEFS_SRC
|
# LITTLEFS_SRC
|
||||||
add_library(littlefs STATIC ${LITTLEFS_SRC})
|
add_library(littlefs STATIC ${LITTLEFS_SRC})
|
||||||
target_include_directories(littlefs SYSTEM PUBLIC . ../)
|
target_include_directories(littlefs SYSTEM PUBLIC . ../)
|
||||||
|
@ -855,12 +889,12 @@ set(EXECUTABLE_FILE_NAME ${EXECUTABLE_NAME}-${pinetime_VERSION_MAJOR}.${pinetime
|
||||||
set(NRF5_LINKER_SCRIPT "${CMAKE_SOURCE_DIR}/gcc_nrf52.ld")
|
set(NRF5_LINKER_SCRIPT "${CMAKE_SOURCE_DIR}/gcc_nrf52.ld")
|
||||||
add_executable(${EXECUTABLE_NAME} ${SOURCE_FILES})
|
add_executable(${EXECUTABLE_NAME} ${SOURCE_FILES})
|
||||||
set_target_properties(${EXECUTABLE_NAME} PROPERTIES OUTPUT_NAME ${EXECUTABLE_FILE_NAME})
|
set_target_properties(${EXECUTABLE_NAME} PROPERTIES OUTPUT_NAME ${EXECUTABLE_FILE_NAME})
|
||||||
target_link_libraries(${EXECUTABLE_NAME} nimble nrf-sdk lvgl littlefs)
|
target_link_libraries(${EXECUTABLE_NAME} nimble nrf-sdk lvgl littlefs QCBOR)
|
||||||
target_compile_options(${EXECUTABLE_NAME} PUBLIC
|
target_compile_options(${EXECUTABLE_NAME} PUBLIC
|
||||||
$<$<AND:$<COMPILE_LANGUAGE:C>,$<CONFIG:DEBUG>>: ${COMMON_FLAGS} -Og -g3>
|
$<$<AND:$<COMPILE_LANGUAGE:C>,$<CONFIG:DEBUG>>: ${COMMON_FLAGS} -Wextra -Wformat -Wno-missing-field-initializers -Wno-unused-parameter -Og -g3>
|
||||||
$<$<AND:$<COMPILE_LANGUAGE:C>,$<CONFIG:RELEASE>>: ${COMMON_FLAGS} -Os>
|
$<$<AND:$<COMPILE_LANGUAGE:C>,$<CONFIG:RELEASE>>: ${COMMON_FLAGS} -Wextra -Wformat -Wno-missing-field-initializers -Wno-unused-parameter -Os>
|
||||||
$<$<AND:$<COMPILE_LANGUAGE:CXX>,$<CONFIG:DEBUG>>: ${COMMON_FLAGS} -Og -g3 -fno-rtti>
|
$<$<AND:$<COMPILE_LANGUAGE:CXX>,$<CONFIG:DEBUG>>: ${COMMON_FLAGS} -Wextra -Wformat -Wno-missing-field-initializers -Wno-unused-parameter -Og -g3 -fno-rtti>
|
||||||
$<$<AND:$<COMPILE_LANGUAGE:CXX>,$<CONFIG:RELEASE>>: ${COMMON_FLAGS} -Os -fno-rtti>
|
$<$<AND:$<COMPILE_LANGUAGE:CXX>,$<CONFIG:RELEASE>>: ${COMMON_FLAGS} -Wextra -Wformat -Wno-missing-field-initializers -Wno-unused-parameter -Os -fno-rtti>
|
||||||
$<$<COMPILE_LANGUAGE:ASM>: -MP -MD -x assembler-with-cpp>
|
$<$<COMPILE_LANGUAGE:ASM>: -MP -MD -x assembler-with-cpp>
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -884,7 +918,7 @@ set(IMAGE_MCUBOOT_FILE_NAME ${EXECUTABLE_MCUBOOT_NAME}-image-${pinetime_VERSION_
|
||||||
set(DFU_MCUBOOT_FILE_NAME ${EXECUTABLE_MCUBOOT_NAME}-dfu-${pinetime_VERSION_MAJOR}.${pinetime_VERSION_MINOR}.${pinetime_VERSION_PATCH}.zip)
|
set(DFU_MCUBOOT_FILE_NAME ${EXECUTABLE_MCUBOOT_NAME}-dfu-${pinetime_VERSION_MAJOR}.${pinetime_VERSION_MINOR}.${pinetime_VERSION_PATCH}.zip)
|
||||||
set(NRF5_LINKER_SCRIPT_MCUBOOT "${CMAKE_SOURCE_DIR}/gcc_nrf52-mcuboot.ld")
|
set(NRF5_LINKER_SCRIPT_MCUBOOT "${CMAKE_SOURCE_DIR}/gcc_nrf52-mcuboot.ld")
|
||||||
add_executable(${EXECUTABLE_MCUBOOT_NAME} ${SOURCE_FILES})
|
add_executable(${EXECUTABLE_MCUBOOT_NAME} ${SOURCE_FILES})
|
||||||
target_link_libraries(${EXECUTABLE_MCUBOOT_NAME} nimble nrf-sdk lvgl littlefs)
|
target_link_libraries(${EXECUTABLE_MCUBOOT_NAME} nimble nrf-sdk lvgl littlefs QCBOR)
|
||||||
set_target_properties(${EXECUTABLE_MCUBOOT_NAME} PROPERTIES OUTPUT_NAME ${EXECUTABLE_MCUBOOT_FILE_NAME})
|
set_target_properties(${EXECUTABLE_MCUBOOT_NAME} PROPERTIES OUTPUT_NAME ${EXECUTABLE_MCUBOOT_FILE_NAME})
|
||||||
target_compile_options(${EXECUTABLE_MCUBOOT_NAME} PUBLIC
|
target_compile_options(${EXECUTABLE_MCUBOOT_NAME} PUBLIC
|
||||||
$<$<AND:$<COMPILE_LANGUAGE:C>,$<CONFIG:DEBUG>>: ${COMMON_FLAGS} -Og -g3>
|
$<$<AND:$<COMPILE_LANGUAGE:C>,$<CONFIG:DEBUG>>: ${COMMON_FLAGS} -Og -g3>
|
||||||
|
@ -920,7 +954,7 @@ endif()
|
||||||
set(EXECUTABLE_RECOVERY_NAME "pinetime-recovery")
|
set(EXECUTABLE_RECOVERY_NAME "pinetime-recovery")
|
||||||
set(EXECUTABLE_RECOVERY_FILE_NAME ${EXECUTABLE_RECOVERY_NAME}-${pinetime_VERSION_MAJOR}.${pinetime_VERSION_MINOR}.${pinetime_VERSION_PATCH})
|
set(EXECUTABLE_RECOVERY_FILE_NAME ${EXECUTABLE_RECOVERY_NAME}-${pinetime_VERSION_MAJOR}.${pinetime_VERSION_MINOR}.${pinetime_VERSION_PATCH})
|
||||||
add_executable(${EXECUTABLE_RECOVERY_NAME} ${RECOVERY_SOURCE_FILES})
|
add_executable(${EXECUTABLE_RECOVERY_NAME} ${RECOVERY_SOURCE_FILES})
|
||||||
target_link_libraries(${EXECUTABLE_RECOVERY_NAME} nimble nrf-sdk littlefs)
|
target_link_libraries(${EXECUTABLE_RECOVERY_NAME} nimble nrf-sdk littlefs QCBOR)
|
||||||
set_target_properties(${EXECUTABLE_RECOVERY_NAME} PROPERTIES OUTPUT_NAME ${EXECUTABLE_RECOVERY_FILE_NAME})
|
set_target_properties(${EXECUTABLE_RECOVERY_NAME} PROPERTIES OUTPUT_NAME ${EXECUTABLE_RECOVERY_FILE_NAME})
|
||||||
target_compile_definitions(${EXECUTABLE_RECOVERY_NAME} PUBLIC "PINETIME_IS_RECOVERY")
|
target_compile_definitions(${EXECUTABLE_RECOVERY_NAME} PUBLIC "PINETIME_IS_RECOVERY")
|
||||||
target_compile_options(${EXECUTABLE_RECOVERY_NAME} PUBLIC
|
target_compile_options(${EXECUTABLE_RECOVERY_NAME} PUBLIC
|
||||||
|
|
|
@ -3,6 +3,7 @@
|
||||||
#include <hal/nrf_gpio.h>
|
#include <hal/nrf_gpio.h>
|
||||||
#include <nrfx_saadc.h>
|
#include <nrfx_saadc.h>
|
||||||
#include <algorithm>
|
#include <algorithm>
|
||||||
|
#include <cmath>
|
||||||
|
|
||||||
using namespace Pinetime::Controllers;
|
using namespace Pinetime::Controllers;
|
||||||
|
|
||||||
|
|
|
@ -53,8 +53,9 @@ int AlertNotificationService::OnAlert(uint16_t conn_handle, uint16_t attr_handle
|
||||||
|
|
||||||
// Ignore notifications with empty message
|
// Ignore notifications with empty message
|
||||||
const auto packetLen = OS_MBUF_PKTLEN(ctxt->om);
|
const auto packetLen = OS_MBUF_PKTLEN(ctxt->om);
|
||||||
if (packetLen <= headerSize)
|
if (packetLen <= headerSize) {
|
||||||
return 0;
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
size_t bufferSize = std::min(packetLen + stringTerminatorSize, maxBufferSize);
|
size_t bufferSize = std::min(packetLen + stringTerminatorSize, maxBufferSize);
|
||||||
auto messageSize = std::min(maxMessageSize, (bufferSize - headerSize));
|
auto messageSize = std::min(maxMessageSize, (bufferSize - headerSize));
|
||||||
|
|
|
@ -44,6 +44,7 @@ NimbleController::NimbleController(Pinetime::System::SystemTask& systemTask,
|
||||||
alertNotificationClient {systemTask, notificationManager},
|
alertNotificationClient {systemTask, notificationManager},
|
||||||
currentTimeService {dateTimeController},
|
currentTimeService {dateTimeController},
|
||||||
musicService {systemTask},
|
musicService {systemTask},
|
||||||
|
weatherService {systemTask, dateTimeController},
|
||||||
navService {systemTask},
|
navService {systemTask},
|
||||||
batteryInformationService {batteryController},
|
batteryInformationService {batteryController},
|
||||||
immediateAlertService {systemTask, notificationManager},
|
immediateAlertService {systemTask, notificationManager},
|
||||||
|
@ -88,6 +89,7 @@ void NimbleController::Init() {
|
||||||
currentTimeClient.Init();
|
currentTimeClient.Init();
|
||||||
currentTimeService.Init();
|
currentTimeService.Init();
|
||||||
musicService.Init();
|
musicService.Init();
|
||||||
|
weatherService.Init();
|
||||||
navService.Init();
|
navService.Init();
|
||||||
anService.Init();
|
anService.Init();
|
||||||
dfuService.Init();
|
dfuService.Init();
|
||||||
|
|
|
@ -20,6 +20,7 @@
|
||||||
#include "components/ble/NavigationService.h"
|
#include "components/ble/NavigationService.h"
|
||||||
#include "components/ble/ServiceDiscovery.h"
|
#include "components/ble/ServiceDiscovery.h"
|
||||||
#include "components/ble/MotionService.h"
|
#include "components/ble/MotionService.h"
|
||||||
|
#include "components/ble/weather/WeatherService.h"
|
||||||
#include "components/fs/FS.h"
|
#include "components/fs/FS.h"
|
||||||
|
|
||||||
namespace Pinetime {
|
namespace Pinetime {
|
||||||
|
@ -72,6 +73,9 @@ namespace Pinetime {
|
||||||
Pinetime::Controllers::AlertNotificationService& alertService() {
|
Pinetime::Controllers::AlertNotificationService& alertService() {
|
||||||
return anService;
|
return anService;
|
||||||
};
|
};
|
||||||
|
Pinetime::Controllers::WeatherService& weather() {
|
||||||
|
return weatherService;
|
||||||
|
};
|
||||||
|
|
||||||
uint16_t connHandle();
|
uint16_t connHandle();
|
||||||
void NotifyBatteryLevel(uint8_t level);
|
void NotifyBatteryLevel(uint8_t level);
|
||||||
|
@ -99,6 +103,7 @@ namespace Pinetime {
|
||||||
AlertNotificationClient alertNotificationClient;
|
AlertNotificationClient alertNotificationClient;
|
||||||
CurrentTimeService currentTimeService;
|
CurrentTimeService currentTimeService;
|
||||||
MusicService musicService;
|
MusicService musicService;
|
||||||
|
WeatherService weatherService;
|
||||||
NavigationService navService;
|
NavigationService navService;
|
||||||
BatteryInformationService batteryInformationService;
|
BatteryInformationService batteryInformationService;
|
||||||
ImmediateAlertService immediateAlertService;
|
ImmediateAlertService immediateAlertService;
|
||||||
|
|
385
src/components/ble/weather/WeatherData.h
Normal file
385
src/components/ble/weather/WeatherData.h
Normal file
|
@ -0,0 +1,385 @@
|
||||||
|
/* Copyright (C) 2021 Avamander
|
||||||
|
|
||||||
|
This file is part of InfiniTime.
|
||||||
|
|
||||||
|
InfiniTime is free software: you can redistribute it and/or modify
|
||||||
|
it under the terms of the GNU General Public License as published
|
||||||
|
by the Free Software Foundation, either version 3 of the License, or
|
||||||
|
(at your option) any later version.
|
||||||
|
|
||||||
|
InfiniTime is distributed in the hope that it will be useful,
|
||||||
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
GNU General Public License for more details.
|
||||||
|
|
||||||
|
You should have received a copy of the GNU General Public License
|
||||||
|
along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Different weather events, weather data structures used by {@link WeatherService.h}
|
||||||
|
*
|
||||||
|
* How to upload events to the timeline?
|
||||||
|
*
|
||||||
|
* All timeline write payloads are simply CBOR-encoded payloads of the structs described below.
|
||||||
|
*
|
||||||
|
* All payloads have a mandatory header part and the dynamic part that
|
||||||
|
* depends on the event type specified in the header. If you don't,
|
||||||
|
* you'll get an error returned. Data is relatively well-validated,
|
||||||
|
* so keep in the bounds of the data types given.
|
||||||
|
*
|
||||||
|
* Write all struct members (CamelCase keys) into a single finite-sized map, and write it to the characteristic.
|
||||||
|
* Mind the MTU.
|
||||||
|
*
|
||||||
|
* How to debug?
|
||||||
|
*
|
||||||
|
* There's a Screen that you can compile into your firmware that shows currently valid events.
|
||||||
|
* You can adapt that to display something else. That part right now is very much work in progress
|
||||||
|
* because the exact requirements are not yet known.
|
||||||
|
*
|
||||||
|
*
|
||||||
|
* Implemented based on and other material:
|
||||||
|
* https://en.wikipedia.org/wiki/METAR
|
||||||
|
* https://www.weather.gov/jetstream/obscurationtypes
|
||||||
|
* http://www.faraim.org/aim/aim-4-03-14-493.html
|
||||||
|
*/
|
||||||
|
|
||||||
|
namespace Pinetime {
|
||||||
|
namespace Controllers {
|
||||||
|
class WeatherData {
|
||||||
|
public:
|
||||||
|
/**
|
||||||
|
* Visibility obscuration types
|
||||||
|
*/
|
||||||
|
enum class obscurationtype {
|
||||||
|
/** No obscuration */
|
||||||
|
None = 0,
|
||||||
|
/** Water particles suspended in the air; low visibility; does not fall */
|
||||||
|
Fog = 1,
|
||||||
|
/** Tiny, dry particles in the air; invisible to the eye; opalescent */
|
||||||
|
Haze = 2,
|
||||||
|
/** Small fire-created particles suspended in the air */
|
||||||
|
Smoke = 3,
|
||||||
|
/** Fine rock powder, from for example volcanoes */
|
||||||
|
Ash = 4,
|
||||||
|
/** Fine particles of earth suspended in the air by the wind */
|
||||||
|
Dust = 5,
|
||||||
|
/** Fine particles of sand suspended in the air by the wind */
|
||||||
|
Sand = 6,
|
||||||
|
/** Water particles suspended in the air; low-ish visibility; temperature is near dewpoint */
|
||||||
|
Mist = 7,
|
||||||
|
/** This is SPECIAL in the sense that the thing raining down is doing the obscuration */
|
||||||
|
Precipitation = 8,
|
||||||
|
Length
|
||||||
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Types of precipitation
|
||||||
|
*/
|
||||||
|
enum class precipitationtype {
|
||||||
|
/**
|
||||||
|
* No precipitation
|
||||||
|
*
|
||||||
|
* Theoretically we could just _not_ send the event, but then
|
||||||
|
* how do we differentiate between no precipitation and
|
||||||
|
* no information about precipitation
|
||||||
|
*/
|
||||||
|
None = 0,
|
||||||
|
/** Drops larger than a drizzle; also widely separated drizzle */
|
||||||
|
Rain = 1,
|
||||||
|
/** Fairly uniform rain consisting of fine drops */
|
||||||
|
Drizzle = 2,
|
||||||
|
/** Rain that freezes upon contact with objects and ground */
|
||||||
|
FreezingRain = 3,
|
||||||
|
/** Rain + hail; ice pellets; small translucent frozen raindrops */
|
||||||
|
Sleet = 4,
|
||||||
|
/** Larger ice pellets; falling separately or in irregular clumps */
|
||||||
|
Hail = 5,
|
||||||
|
/** Hail with smaller grains of ice; mini-snowballs */
|
||||||
|
SmallHail = 6,
|
||||||
|
/** Snow... */
|
||||||
|
Snow = 7,
|
||||||
|
/** Frozen drizzle; very small snow crystals */
|
||||||
|
SnowGrains = 8,
|
||||||
|
/** Needles; columns or plates of ice. Sometimes described as "diamond dust". In very cold regions */
|
||||||
|
IceCrystals = 9,
|
||||||
|
/** It's raining down ash, e.g. from a volcano */
|
||||||
|
Ash = 10,
|
||||||
|
Length
|
||||||
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* These are special events that can "enhance" the "experience" of existing weather events
|
||||||
|
*/
|
||||||
|
enum class specialtype {
|
||||||
|
/** Strong wind with a sudden onset that lasts at least a minute */
|
||||||
|
Squall = 0,
|
||||||
|
/** Series of waves in a water body caused by the displacement of a large volume of water */
|
||||||
|
Tsunami = 1,
|
||||||
|
/** Violent; rotating column of air */
|
||||||
|
Tornado = 2,
|
||||||
|
/** Unplanned; unwanted; uncontrolled fire in an area */
|
||||||
|
Fire = 3,
|
||||||
|
/** Thunder and/or lightning */
|
||||||
|
Thunder = 4,
|
||||||
|
Length
|
||||||
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* These are used for weather timeline manipulation
|
||||||
|
* that isn't just adding to the stack of weather events
|
||||||
|
*/
|
||||||
|
enum class controlcodes {
|
||||||
|
/** How much is stored already */
|
||||||
|
GetLength = 0,
|
||||||
|
/** This wipes the entire timeline */
|
||||||
|
DelTimeline = 1,
|
||||||
|
/** There's a currently valid timeline event with the given type */
|
||||||
|
HasValidEvent = 3,
|
||||||
|
Length
|
||||||
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Events have types
|
||||||
|
* then they're easier to parse after sending them over the air
|
||||||
|
*/
|
||||||
|
enum class eventtype : uint8_t {
|
||||||
|
/** @see obscuration */
|
||||||
|
Obscuration = 0,
|
||||||
|
/** @see precipitation */
|
||||||
|
Precipitation = 1,
|
||||||
|
/** @see wind */
|
||||||
|
Wind = 2,
|
||||||
|
/** @see temperature */
|
||||||
|
Temperature = 3,
|
||||||
|
/** @see airquality */
|
||||||
|
AirQuality = 4,
|
||||||
|
/** @see special */
|
||||||
|
Special = 5,
|
||||||
|
/** @see pressure */
|
||||||
|
Pressure = 6,
|
||||||
|
/** @see location */
|
||||||
|
Location = 7,
|
||||||
|
/** @see cloud */
|
||||||
|
Clouds = 8,
|
||||||
|
/** @see humidity */
|
||||||
|
Humidity = 9,
|
||||||
|
Length
|
||||||
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Valid event query
|
||||||
|
*
|
||||||
|
* NOTE: Not currently available, until needs are better known
|
||||||
|
*/
|
||||||
|
class ValidEventQuery {
|
||||||
|
public:
|
||||||
|
static constexpr controlcodes code = controlcodes::HasValidEvent;
|
||||||
|
eventtype eventType;
|
||||||
|
};
|
||||||
|
|
||||||
|
/** The header used for further parsing */
|
||||||
|
class TimelineHeader {
|
||||||
|
public:
|
||||||
|
/**
|
||||||
|
* UNIX timestamp
|
||||||
|
* TODO: This is currently WITH A TIMEZONE OFFSET!
|
||||||
|
* Please send events with the timestamp offset by the timezone.
|
||||||
|
**/
|
||||||
|
uint64_t timestamp;
|
||||||
|
/**
|
||||||
|
* Time in seconds until the event expires
|
||||||
|
*
|
||||||
|
* 32 bits ought to be enough for everyone
|
||||||
|
*
|
||||||
|
* If there's a newer event of the same type then it overrides this one, even if it hasn't expired
|
||||||
|
*/
|
||||||
|
uint32_t expires;
|
||||||
|
/**
|
||||||
|
* What type of weather-related event
|
||||||
|
*/
|
||||||
|
eventtype eventType;
|
||||||
|
};
|
||||||
|
|
||||||
|
/** Specifies how cloudiness is stored */
|
||||||
|
class Clouds : public TimelineHeader {
|
||||||
|
public:
|
||||||
|
/** Cloud coverage in percentage, 0-100% */
|
||||||
|
uint8_t amount;
|
||||||
|
};
|
||||||
|
|
||||||
|
/** Specifies how obscuration is stored */
|
||||||
|
class Obscuration : public TimelineHeader {
|
||||||
|
public:
|
||||||
|
/** Type of precipitation */
|
||||||
|
obscurationtype type;
|
||||||
|
/**
|
||||||
|
* Visibility distance in meters
|
||||||
|
* 65535 is reserved for unspecified
|
||||||
|
*/
|
||||||
|
uint16_t amount;
|
||||||
|
};
|
||||||
|
|
||||||
|
/** Specifies how precipitation is stored */
|
||||||
|
class Precipitation : public TimelineHeader {
|
||||||
|
public:
|
||||||
|
/** Type of precipitation */
|
||||||
|
precipitationtype type;
|
||||||
|
/**
|
||||||
|
* How much is it going to rain? In millimeters
|
||||||
|
* 255 is reserved for unspecified
|
||||||
|
**/
|
||||||
|
uint8_t amount;
|
||||||
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* How wind speed is stored
|
||||||
|
*
|
||||||
|
* In order to represent bursts of wind instead of constant wind,
|
||||||
|
* you have minimum and maximum speeds.
|
||||||
|
*
|
||||||
|
* As direction can fluctuate wildly and some watchfaces might wish to display it nicely,
|
||||||
|
* we're following the aerospace industry weather report option of specifying a range.
|
||||||
|
*/
|
||||||
|
class Wind : public TimelineHeader {
|
||||||
|
public:
|
||||||
|
/** Meters per second */
|
||||||
|
uint8_t speedMin;
|
||||||
|
/** Meters per second */
|
||||||
|
uint8_t speedMax;
|
||||||
|
/** Unitless direction between 0-255; approximately 1 unit per 0.71 degrees */
|
||||||
|
uint8_t directionMin;
|
||||||
|
/** Unitless direction between 0-255; approximately 1 unit per 0.71 degrees */
|
||||||
|
uint8_t directionMax;
|
||||||
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* How temperature is stored
|
||||||
|
*
|
||||||
|
* As it's annoying to figure out the dewpoint on the watch,
|
||||||
|
* please send it from the companion
|
||||||
|
*
|
||||||
|
* We don't do floats, picodegrees are not useful. Make sure to multiply.
|
||||||
|
*/
|
||||||
|
class Temperature : public TimelineHeader {
|
||||||
|
public:
|
||||||
|
/**
|
||||||
|
* Temperature °C but multiplied by 100 (e.g. -12.50°C becomes -1250)
|
||||||
|
* -32768 is reserved for "no data"
|
||||||
|
*/
|
||||||
|
int16_t temperature;
|
||||||
|
/**
|
||||||
|
* Dewpoint °C but multiplied by 100 (e.g. -12.50°C becomes -1250)
|
||||||
|
* -32768 is reserved for "no data"
|
||||||
|
*/
|
||||||
|
int16_t dewPoint;
|
||||||
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* How location info is stored
|
||||||
|
*
|
||||||
|
* This can be mostly static with long expiration,
|
||||||
|
* as it usually is, but it could change during a trip for ex.
|
||||||
|
* so we allow changing it dynamically.
|
||||||
|
*
|
||||||
|
* Location info can be for some kind of map watchface
|
||||||
|
* or daylight calculations, should those be required.
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
class Location : public TimelineHeader {
|
||||||
|
public:
|
||||||
|
/** Location name */
|
||||||
|
std::string location;
|
||||||
|
/** Altitude relative to sea level in meters */
|
||||||
|
int16_t altitude;
|
||||||
|
/** Latitude, EPSG:3857 (Google Maps, Openstreetmaps datum) */
|
||||||
|
int32_t latitude;
|
||||||
|
/** Longitude, EPSG:3857 (Google Maps, Openstreetmaps datum) */
|
||||||
|
int32_t longitude;
|
||||||
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* How humidity is stored
|
||||||
|
*/
|
||||||
|
class Humidity : public TimelineHeader {
|
||||||
|
public:
|
||||||
|
/** Relative humidity, 0-100% */
|
||||||
|
uint8_t humidity;
|
||||||
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* How air pressure is stored
|
||||||
|
*/
|
||||||
|
class Pressure : public TimelineHeader {
|
||||||
|
public:
|
||||||
|
/** Air pressure in hectopascals (hPa) */
|
||||||
|
int16_t pressure;
|
||||||
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* How special events are stored
|
||||||
|
*/
|
||||||
|
class Special : public TimelineHeader {
|
||||||
|
public:
|
||||||
|
/** Special event's type */
|
||||||
|
specialtype type;
|
||||||
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* How air quality is stored
|
||||||
|
*
|
||||||
|
* These events are a bit more complex because the topic is not simple,
|
||||||
|
* the intention is to heavy-lift the annoying preprocessing from the watch
|
||||||
|
* this allows watchface or watchapp makers to generate accurate alerts and graphics
|
||||||
|
*
|
||||||
|
* If this needs further enforced standardization, pull requests are welcome
|
||||||
|
*/
|
||||||
|
class AirQuality : public TimelineHeader {
|
||||||
|
public:
|
||||||
|
/**
|
||||||
|
* The name of the pollution
|
||||||
|
*
|
||||||
|
* for the sake of better compatibility with watchapps
|
||||||
|
* that might want to use this data for say visuals
|
||||||
|
* don't localize the name.
|
||||||
|
*
|
||||||
|
* Ideally watchapp itself localizes the name, if it's at all needed.
|
||||||
|
*
|
||||||
|
* E.g.
|
||||||
|
* For generic ones use "PM0.1", "PM5", "PM10"
|
||||||
|
* 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::string polluter;
|
||||||
|
/**
|
||||||
|
* Amount of the pollution in SI units,
|
||||||
|
* otherwise it's going to be difficult to create UI, alerts
|
||||||
|
* and so on and for.
|
||||||
|
*
|
||||||
|
* See more:
|
||||||
|
* https://ec.europa.eu/environment/air/quality/standards.htm
|
||||||
|
* http://www.ourair.org/wp-content/uploads/2012-aaqs2.pdf
|
||||||
|
*
|
||||||
|
* Example units:
|
||||||
|
* count/m³ for pollen
|
||||||
|
* µgC/m³ for micrograms of organic carbon
|
||||||
|
* µg/m³ sulfates, PM0.1, PM1, PM2, PM10 and so on, dust
|
||||||
|
* mg/m³ CO2, CO
|
||||||
|
* ng/m³ for heavy metals
|
||||||
|
*
|
||||||
|
* List is not comprehensive, should be improved.
|
||||||
|
* The current ones are what watchapps assume!
|
||||||
|
*
|
||||||
|
* Note: ppb and ppm to concentration should be calculated on the companion, using
|
||||||
|
* the correct formula (taking into account temperature and air pressure)
|
||||||
|
*
|
||||||
|
* Note2: The amount is off by times 100, for two decimal places of precision.
|
||||||
|
* E.g. 54.32µg/m³ is 5432
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
uint32_t amount;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}
|
604
src/components/ble/weather/WeatherService.cpp
Normal file
604
src/components/ble/weather/WeatherService.cpp
Normal file
|
@ -0,0 +1,604 @@
|
||||||
|
/* Copyright (C) 2021 Avamander
|
||||||
|
|
||||||
|
This file is part of InfiniTime.
|
||||||
|
|
||||||
|
InfiniTime is free software: you can redistribute it and/or modify
|
||||||
|
it under the terms of the GNU General Public License as published
|
||||||
|
by the Free Software Foundation, either version 3 of the License, or
|
||||||
|
(at your option) any later version.
|
||||||
|
|
||||||
|
InfiniTime is distributed in the hope that it will be useful,
|
||||||
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
GNU General Public License for more details.
|
||||||
|
|
||||||
|
You should have received a copy of the GNU General Public License
|
||||||
|
along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
#include <qcbor/qcbor_spiffy_decode.h>
|
||||||
|
#include "WeatherService.h"
|
||||||
|
#include "libs/QCBOR/inc/qcbor/qcbor.h"
|
||||||
|
#include "systemtask/SystemTask.h"
|
||||||
|
|
||||||
|
int WeatherCallback(uint16_t connHandle, uint16_t attrHandle, struct ble_gatt_access_ctxt* ctxt, void* arg) {
|
||||||
|
return static_cast<Pinetime::Controllers::WeatherService*>(arg)->OnCommand(connHandle, attrHandle, ctxt);
|
||||||
|
}
|
||||||
|
|
||||||
|
namespace Pinetime {
|
||||||
|
namespace Controllers {
|
||||||
|
WeatherService::WeatherService(System::SystemTask& system, DateTime& dateTimeController)
|
||||||
|
: system(system), dateTimeController(dateTimeController) {
|
||||||
|
nullHeader = &nullTimelineheader;
|
||||||
|
nullTimelineheader->timestamp = 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
void WeatherService::Init() {
|
||||||
|
uint8_t res = 0;
|
||||||
|
res = ble_gatts_count_cfg(serviceDefinition);
|
||||||
|
ASSERT(res == 0);
|
||||||
|
|
||||||
|
res = ble_gatts_add_svcs(serviceDefinition);
|
||||||
|
ASSERT(res == 0);
|
||||||
|
}
|
||||||
|
|
||||||
|
int WeatherService::OnCommand(uint16_t connHandle, uint16_t attrHandle, struct ble_gatt_access_ctxt* ctxt) {
|
||||||
|
if (ctxt->op == BLE_GATT_ACCESS_OP_WRITE_CHR) {
|
||||||
|
const uint8_t packetLen = OS_MBUF_PKTLEN(ctxt->om); // NOLINT(cppcoreguidelines-pro-bounds-pointer-arithmetic)
|
||||||
|
if (packetLen <= 0) {
|
||||||
|
return BLE_ATT_ERR_INVALID_ATTR_VALUE_LEN;
|
||||||
|
}
|
||||||
|
// Decode
|
||||||
|
QCBORDecodeContext decodeContext;
|
||||||
|
UsefulBufC encodedCbor = {ctxt->om->om_data, OS_MBUF_PKTLEN(ctxt->om)}; // NOLINT(cppcoreguidelines-pro-bounds-pointer-arithmetic)
|
||||||
|
|
||||||
|
QCBORDecode_Init(&decodeContext, encodedCbor, QCBOR_DECODE_MODE_NORMAL);
|
||||||
|
// KINDLY provide us a fixed-length map
|
||||||
|
QCBORDecode_EnterMap(&decodeContext, nullptr);
|
||||||
|
// Always encodes to the smallest number of bytes based on the value
|
||||||
|
int64_t tmpTimestamp = 0;
|
||||||
|
QCBORDecode_GetInt64InMapSZ(&decodeContext, "Timestamp", &tmpTimestamp);
|
||||||
|
if (QCBORDecode_GetError(&decodeContext) != QCBOR_SUCCESS) {
|
||||||
|
CleanUpQcbor(&decodeContext);
|
||||||
|
return BLE_ATT_ERR_INVALID_ATTR_VALUE_LEN;
|
||||||
|
}
|
||||||
|
int64_t tmpExpires = 0;
|
||||||
|
QCBORDecode_GetInt64InMapSZ(&decodeContext, "Expires", &tmpExpires);
|
||||||
|
if (QCBORDecode_GetError(&decodeContext) != QCBOR_SUCCESS || tmpExpires < 0 || tmpExpires > 4294967295) {
|
||||||
|
CleanUpQcbor(&decodeContext);
|
||||||
|
return BLE_ATT_ERR_INVALID_ATTR_VALUE_LEN;
|
||||||
|
}
|
||||||
|
int64_t tmpEventType = 0;
|
||||||
|
QCBORDecode_GetInt64InMapSZ(&decodeContext, "EventType", &tmpEventType);
|
||||||
|
if (QCBORDecode_GetError(&decodeContext) != QCBOR_SUCCESS || tmpEventType < 0 ||
|
||||||
|
tmpEventType >= static_cast<int64_t>(WeatherData::eventtype::Length)) {
|
||||||
|
CleanUpQcbor(&decodeContext);
|
||||||
|
return BLE_ATT_ERR_INVALID_ATTR_VALUE_LEN;
|
||||||
|
}
|
||||||
|
|
||||||
|
switch (static_cast<WeatherData::eventtype>(tmpEventType)) {
|
||||||
|
case WeatherData::eventtype::AirQuality: {
|
||||||
|
std::unique_ptr<WeatherData::AirQuality> airquality = std::make_unique<WeatherData::AirQuality>();
|
||||||
|
airquality->timestamp = tmpTimestamp;
|
||||||
|
airquality->eventType = static_cast<WeatherData::eventtype>(tmpEventType);
|
||||||
|
airquality->expires = tmpExpires;
|
||||||
|
|
||||||
|
UsefulBufC stringBuf; // TODO: Everything ok with lifecycle here?
|
||||||
|
QCBORDecode_GetTextStringInMapSZ(&decodeContext, "Polluter", &stringBuf);
|
||||||
|
if (UsefulBuf_IsNULLOrEmptyC(stringBuf) != 0) {
|
||||||
|
CleanUpQcbor(&decodeContext);
|
||||||
|
return BLE_ATT_ERR_INVALID_ATTR_VALUE_LEN;
|
||||||
|
}
|
||||||
|
airquality->polluter = std::string(static_cast<const char*>(stringBuf.ptr), stringBuf.len);
|
||||||
|
|
||||||
|
int64_t tmpAmount = 0;
|
||||||
|
QCBORDecode_GetInt64InMapSZ(&decodeContext, "Amount", &tmpAmount);
|
||||||
|
if (tmpAmount < 0 || tmpAmount > 4294967295) {
|
||||||
|
CleanUpQcbor(&decodeContext);
|
||||||
|
return BLE_ATT_ERR_INVALID_ATTR_VALUE_LEN;
|
||||||
|
}
|
||||||
|
airquality->amount = tmpAmount; // NOLINT(bugprone-narrowing-conversions,cppcoreguidelines-narrowing-conversions)
|
||||||
|
|
||||||
|
if (!AddEventToTimeline(std::move(airquality))) {
|
||||||
|
CleanUpQcbor(&decodeContext);
|
||||||
|
return BLE_ATT_ERR_INVALID_ATTR_VALUE_LEN;
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
case WeatherData::eventtype::Obscuration: {
|
||||||
|
std::unique_ptr<WeatherData::Obscuration> obscuration = std::make_unique<WeatherData::Obscuration>();
|
||||||
|
obscuration->timestamp = tmpTimestamp;
|
||||||
|
obscuration->eventType = static_cast<WeatherData::eventtype>(tmpEventType);
|
||||||
|
obscuration->expires = tmpExpires;
|
||||||
|
|
||||||
|
int64_t tmpType = 0;
|
||||||
|
QCBORDecode_GetInt64InMapSZ(&decodeContext, "Type", &tmpType);
|
||||||
|
if (tmpType < 0 || tmpType >= static_cast<int64_t>(WeatherData::obscurationtype::Length)) {
|
||||||
|
CleanUpQcbor(&decodeContext);
|
||||||
|
return BLE_ATT_ERR_INVALID_ATTR_VALUE_LEN;
|
||||||
|
}
|
||||||
|
obscuration->type = static_cast<WeatherData::obscurationtype>(tmpType);
|
||||||
|
|
||||||
|
int64_t tmpAmount = 0;
|
||||||
|
QCBORDecode_GetInt64InMapSZ(&decodeContext, "Amount", &tmpAmount);
|
||||||
|
if (tmpAmount < 0 || tmpAmount > 65535) {
|
||||||
|
CleanUpQcbor(&decodeContext);
|
||||||
|
return BLE_ATT_ERR_INVALID_ATTR_VALUE_LEN;
|
||||||
|
}
|
||||||
|
obscuration->amount = tmpAmount; // NOLINT(bugprone-narrowing-conversions,cppcoreguidelines-narrowing-conversions)
|
||||||
|
|
||||||
|
if (!AddEventToTimeline(std::move(obscuration))) {
|
||||||
|
CleanUpQcbor(&decodeContext);
|
||||||
|
return BLE_ATT_ERR_INVALID_ATTR_VALUE_LEN;
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
case WeatherData::eventtype::Precipitation: {
|
||||||
|
std::unique_ptr<WeatherData::Precipitation> precipitation = std::make_unique<WeatherData::Precipitation>();
|
||||||
|
precipitation->timestamp = tmpTimestamp;
|
||||||
|
precipitation->eventType = static_cast<WeatherData::eventtype>(tmpEventType);
|
||||||
|
precipitation->expires = tmpExpires;
|
||||||
|
|
||||||
|
int64_t tmpType = 0;
|
||||||
|
QCBORDecode_GetInt64InMapSZ(&decodeContext, "Type", &tmpType);
|
||||||
|
if (tmpType < 0 || tmpType >= static_cast<int64_t>(WeatherData::precipitationtype::Length)) {
|
||||||
|
CleanUpQcbor(&decodeContext);
|
||||||
|
return BLE_ATT_ERR_INVALID_ATTR_VALUE_LEN;
|
||||||
|
}
|
||||||
|
precipitation->type = static_cast<WeatherData::precipitationtype>(tmpType);
|
||||||
|
|
||||||
|
int64_t tmpAmount = 0;
|
||||||
|
QCBORDecode_GetInt64InMapSZ(&decodeContext, "Amount", &tmpAmount);
|
||||||
|
if (tmpAmount < 0 || tmpAmount > 255) {
|
||||||
|
CleanUpQcbor(&decodeContext);
|
||||||
|
return BLE_ATT_ERR_INVALID_ATTR_VALUE_LEN;
|
||||||
|
}
|
||||||
|
precipitation->amount = tmpAmount; // NOLINT(bugprone-narrowing-conversions,cppcoreguidelines-narrowing-conversions)
|
||||||
|
|
||||||
|
if (!AddEventToTimeline(std::move(precipitation))) {
|
||||||
|
CleanUpQcbor(&decodeContext);
|
||||||
|
return BLE_ATT_ERR_INVALID_ATTR_VALUE_LEN;
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
case WeatherData::eventtype::Wind: {
|
||||||
|
std::unique_ptr<WeatherData::Wind> wind = std::make_unique<WeatherData::Wind>();
|
||||||
|
wind->timestamp = tmpTimestamp;
|
||||||
|
wind->eventType = static_cast<WeatherData::eventtype>(tmpEventType);
|
||||||
|
wind->expires = tmpExpires;
|
||||||
|
|
||||||
|
int64_t tmpMin = 0;
|
||||||
|
QCBORDecode_GetInt64InMapSZ(&decodeContext, "SpeedMin", &tmpMin);
|
||||||
|
if (tmpMin < 0 || tmpMin > 255) {
|
||||||
|
CleanUpQcbor(&decodeContext);
|
||||||
|
return BLE_ATT_ERR_INVALID_ATTR_VALUE_LEN;
|
||||||
|
}
|
||||||
|
wind->speedMin = tmpMin; // NOLINT(bugprone-narrowing-conversions,cppcoreguidelines-narrowing-conversions)
|
||||||
|
|
||||||
|
int64_t tmpMax = 0;
|
||||||
|
QCBORDecode_GetInt64InMapSZ(&decodeContext, "SpeedMin", &tmpMax);
|
||||||
|
if (tmpMax < 0 || tmpMax > 255) {
|
||||||
|
CleanUpQcbor(&decodeContext);
|
||||||
|
return BLE_ATT_ERR_INVALID_ATTR_VALUE_LEN;
|
||||||
|
}
|
||||||
|
wind->speedMax = tmpMax; // NOLINT(bugprone-narrowing-conversions,cppcoreguidelines-narrowing-conversions)
|
||||||
|
|
||||||
|
int64_t tmpDMin = 0;
|
||||||
|
QCBORDecode_GetInt64InMapSZ(&decodeContext, "DirectionMin", &tmpDMin);
|
||||||
|
if (tmpDMin < 0 || tmpDMin > 255) {
|
||||||
|
CleanUpQcbor(&decodeContext);
|
||||||
|
return BLE_ATT_ERR_INVALID_ATTR_VALUE_LEN;
|
||||||
|
}
|
||||||
|
wind->directionMin = tmpDMin; // NOLINT(bugprone-narrowing-conversions,cppcoreguidelines-narrowing-conversions)
|
||||||
|
|
||||||
|
int64_t tmpDMax = 0;
|
||||||
|
QCBORDecode_GetInt64InMapSZ(&decodeContext, "DirectionMax", &tmpDMax);
|
||||||
|
if (tmpDMax < 0 || tmpDMax > 255) {
|
||||||
|
CleanUpQcbor(&decodeContext);
|
||||||
|
return BLE_ATT_ERR_INVALID_ATTR_VALUE_LEN;
|
||||||
|
}
|
||||||
|
wind->directionMax = tmpDMax; // NOLINT(bugprone-narrowing-conversions,cppcoreguidelines-narrowing-conversions)
|
||||||
|
|
||||||
|
if (!AddEventToTimeline(std::move(wind))) {
|
||||||
|
CleanUpQcbor(&decodeContext);
|
||||||
|
return BLE_ATT_ERR_INVALID_ATTR_VALUE_LEN;
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
case WeatherData::eventtype::Temperature: {
|
||||||
|
std::unique_ptr<WeatherData::Temperature> temperature = std::make_unique<WeatherData::Temperature>();
|
||||||
|
temperature->timestamp = tmpTimestamp;
|
||||||
|
temperature->eventType = static_cast<WeatherData::eventtype>(tmpEventType);
|
||||||
|
temperature->expires = tmpExpires;
|
||||||
|
|
||||||
|
int64_t tmpTemperature = 0;
|
||||||
|
QCBORDecode_GetInt64InMapSZ(&decodeContext, "Temperature", &tmpTemperature);
|
||||||
|
if (tmpTemperature < -32768 || tmpTemperature > 32767) {
|
||||||
|
CleanUpQcbor(&decodeContext);
|
||||||
|
return BLE_ATT_ERR_INVALID_ATTR_VALUE_LEN;
|
||||||
|
}
|
||||||
|
temperature->temperature =
|
||||||
|
static_cast<int16_t>(tmpTemperature); // NOLINT(bugprone-narrowing-conversions,cppcoreguidelines-narrowing-conversions)
|
||||||
|
|
||||||
|
int64_t tmpDewPoint = 0;
|
||||||
|
QCBORDecode_GetInt64InMapSZ(&decodeContext, "DewPoint", &tmpDewPoint);
|
||||||
|
if (tmpDewPoint < -32768 || tmpDewPoint > 32767) {
|
||||||
|
CleanUpQcbor(&decodeContext);
|
||||||
|
return BLE_ATT_ERR_INVALID_ATTR_VALUE_LEN;
|
||||||
|
}
|
||||||
|
temperature->dewPoint =
|
||||||
|
static_cast<int16_t>(tmpDewPoint); // NOLINT(bugprone-narrowing-conversions,cppcoreguidelines-narrowing-conversions)
|
||||||
|
|
||||||
|
if (!AddEventToTimeline(std::move(temperature))) {
|
||||||
|
CleanUpQcbor(&decodeContext);
|
||||||
|
return BLE_ATT_ERR_INVALID_ATTR_VALUE_LEN;
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
case WeatherData::eventtype::Special: {
|
||||||
|
std::unique_ptr<WeatherData::Special> special = std::make_unique<WeatherData::Special>();
|
||||||
|
special->timestamp = tmpTimestamp;
|
||||||
|
special->eventType = static_cast<WeatherData::eventtype>(tmpEventType);
|
||||||
|
special->expires = tmpExpires;
|
||||||
|
|
||||||
|
int64_t tmpType = 0;
|
||||||
|
QCBORDecode_GetInt64InMapSZ(&decodeContext, "Type", &tmpType);
|
||||||
|
if (tmpType < 0 || tmpType >= static_cast<int64_t>(WeatherData::specialtype::Length)) {
|
||||||
|
CleanUpQcbor(&decodeContext);
|
||||||
|
return BLE_ATT_ERR_INVALID_ATTR_VALUE_LEN;
|
||||||
|
}
|
||||||
|
special->type = static_cast<WeatherData::specialtype>(tmpType);
|
||||||
|
|
||||||
|
if (!AddEventToTimeline(std::move(special))) {
|
||||||
|
CleanUpQcbor(&decodeContext);
|
||||||
|
return BLE_ATT_ERR_INVALID_ATTR_VALUE_LEN;
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
case WeatherData::eventtype::Pressure: {
|
||||||
|
std::unique_ptr<WeatherData::Pressure> pressure = std::make_unique<WeatherData::Pressure>();
|
||||||
|
pressure->timestamp = tmpTimestamp;
|
||||||
|
pressure->eventType = static_cast<WeatherData::eventtype>(tmpEventType);
|
||||||
|
pressure->expires = tmpExpires;
|
||||||
|
|
||||||
|
int64_t tmpPressure = 0;
|
||||||
|
QCBORDecode_GetInt64InMapSZ(&decodeContext, "Pressure", &tmpPressure);
|
||||||
|
if (tmpPressure < 0 || tmpPressure >= 65535) {
|
||||||
|
CleanUpQcbor(&decodeContext);
|
||||||
|
return BLE_ATT_ERR_INVALID_ATTR_VALUE_LEN;
|
||||||
|
}
|
||||||
|
pressure->pressure = tmpPressure; // NOLINT(bugprone-narrowing-conversions,cppcoreguidelines-narrowing-conversions)
|
||||||
|
|
||||||
|
if (!AddEventToTimeline(std::move(pressure))) {
|
||||||
|
CleanUpQcbor(&decodeContext);
|
||||||
|
return BLE_ATT_ERR_INVALID_ATTR_VALUE_LEN;
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
case WeatherData::eventtype::Location: {
|
||||||
|
std::unique_ptr<WeatherData::Location> location = std::make_unique<WeatherData::Location>();
|
||||||
|
location->timestamp = tmpTimestamp;
|
||||||
|
location->eventType = static_cast<WeatherData::eventtype>(tmpEventType);
|
||||||
|
location->expires = tmpExpires;
|
||||||
|
|
||||||
|
UsefulBufC stringBuf; // TODO: Everything ok with lifecycle here?
|
||||||
|
QCBORDecode_GetTextStringInMapSZ(&decodeContext, "Location", &stringBuf);
|
||||||
|
if (UsefulBuf_IsNULLOrEmptyC(stringBuf) != 0) {
|
||||||
|
CleanUpQcbor(&decodeContext);
|
||||||
|
return BLE_ATT_ERR_INVALID_ATTR_VALUE_LEN;
|
||||||
|
}
|
||||||
|
location->location = std::string(static_cast<const char*>(stringBuf.ptr), stringBuf.len);
|
||||||
|
|
||||||
|
int64_t tmpAltitude = 0;
|
||||||
|
QCBORDecode_GetInt64InMapSZ(&decodeContext, "Altitude", &tmpAltitude);
|
||||||
|
if (tmpAltitude < -32768 || tmpAltitude >= 32767) {
|
||||||
|
CleanUpQcbor(&decodeContext);
|
||||||
|
return BLE_ATT_ERR_INVALID_ATTR_VALUE_LEN;
|
||||||
|
}
|
||||||
|
location->altitude = static_cast<int16_t>(tmpAltitude);
|
||||||
|
|
||||||
|
int64_t tmpLatitude = 0;
|
||||||
|
QCBORDecode_GetInt64InMapSZ(&decodeContext, "Latitude", &tmpLatitude);
|
||||||
|
if (tmpLatitude < -2147483648 || tmpLatitude >= 2147483647) {
|
||||||
|
CleanUpQcbor(&decodeContext);
|
||||||
|
return BLE_ATT_ERR_INVALID_ATTR_VALUE_LEN;
|
||||||
|
}
|
||||||
|
location->latitude = static_cast<int32_t>(tmpLatitude);
|
||||||
|
|
||||||
|
int64_t tmpLongitude = 0;
|
||||||
|
QCBORDecode_GetInt64InMapSZ(&decodeContext, "Longitude", &tmpLongitude);
|
||||||
|
if (tmpLongitude < -2147483648 || tmpLongitude >= 2147483647) {
|
||||||
|
CleanUpQcbor(&decodeContext);
|
||||||
|
return BLE_ATT_ERR_INVALID_ATTR_VALUE_LEN;
|
||||||
|
}
|
||||||
|
location->latitude = static_cast<int32_t>(tmpLongitude);
|
||||||
|
|
||||||
|
if (!AddEventToTimeline(std::move(location))) {
|
||||||
|
CleanUpQcbor(&decodeContext);
|
||||||
|
return BLE_ATT_ERR_INVALID_ATTR_VALUE_LEN;
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
case WeatherData::eventtype::Clouds: {
|
||||||
|
std::unique_ptr<WeatherData::Clouds> clouds = std::make_unique<WeatherData::Clouds>();
|
||||||
|
clouds->timestamp = tmpTimestamp;
|
||||||
|
clouds->eventType = static_cast<WeatherData::eventtype>(tmpEventType);
|
||||||
|
clouds->expires = tmpExpires;
|
||||||
|
|
||||||
|
int64_t tmpAmount = 0;
|
||||||
|
QCBORDecode_GetInt64InMapSZ(&decodeContext, "Amount", &tmpAmount);
|
||||||
|
if (tmpAmount < 0 || tmpAmount > 255) {
|
||||||
|
CleanUpQcbor(&decodeContext);
|
||||||
|
return BLE_ATT_ERR_INVALID_ATTR_VALUE_LEN;
|
||||||
|
}
|
||||||
|
clouds->amount = static_cast<uint8_t>(tmpAmount);
|
||||||
|
|
||||||
|
if (!AddEventToTimeline(std::move(clouds))) {
|
||||||
|
CleanUpQcbor(&decodeContext);
|
||||||
|
return BLE_ATT_ERR_INVALID_ATTR_VALUE_LEN;
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
case WeatherData::eventtype::Humidity: {
|
||||||
|
std::unique_ptr<WeatherData::Humidity> humidity = std::make_unique<WeatherData::Humidity>();
|
||||||
|
humidity->timestamp = tmpTimestamp;
|
||||||
|
humidity->eventType = static_cast<WeatherData::eventtype>(tmpEventType);
|
||||||
|
humidity->expires = tmpExpires;
|
||||||
|
|
||||||
|
int64_t tmpType = 0;
|
||||||
|
QCBORDecode_GetInt64InMapSZ(&decodeContext, "Humidity", &tmpType);
|
||||||
|
if (tmpType < 0 || tmpType >= 255) {
|
||||||
|
CleanUpQcbor(&decodeContext);
|
||||||
|
return BLE_ATT_ERR_INVALID_ATTR_VALUE_LEN;
|
||||||
|
}
|
||||||
|
humidity->humidity = static_cast<uint8_t>(tmpType);
|
||||||
|
|
||||||
|
if (!AddEventToTimeline(std::move(humidity))) {
|
||||||
|
CleanUpQcbor(&decodeContext);
|
||||||
|
return BLE_ATT_ERR_INVALID_ATTR_VALUE_LEN;
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
default: {
|
||||||
|
CleanUpQcbor(&decodeContext);
|
||||||
|
return BLE_ATT_ERR_INVALID_ATTR_VALUE_LEN;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
QCBORDecode_ExitMap(&decodeContext);
|
||||||
|
GetTimelineLength();
|
||||||
|
TidyTimeline();
|
||||||
|
|
||||||
|
if (QCBORDecode_Finish(&decodeContext) != QCBOR_SUCCESS) {
|
||||||
|
return BLE_ATT_ERR_INSUFFICIENT_RES;
|
||||||
|
}
|
||||||
|
} else if (ctxt->op == BLE_GATT_ACCESS_OP_READ_CHR) {
|
||||||
|
// Encode
|
||||||
|
uint8_t buffer[64];
|
||||||
|
QCBOREncodeContext encodeContext;
|
||||||
|
/* TODO: This is very much still a test endpoint
|
||||||
|
* it needs a characteristic UUID check
|
||||||
|
* and actual implementations that show
|
||||||
|
* what actually has to be read.
|
||||||
|
* WARN: Consider commands not part of the API for now!
|
||||||
|
*/
|
||||||
|
QCBOREncode_Init(&encodeContext, UsefulBuf_FROM_BYTE_ARRAY(buffer));
|
||||||
|
QCBOREncode_OpenMap(&encodeContext);
|
||||||
|
QCBOREncode_AddTextToMap(&encodeContext, "test", UsefulBuf_FROM_SZ_LITERAL("test"));
|
||||||
|
QCBOREncode_AddInt64ToMap(&encodeContext, "test", 1ul);
|
||||||
|
QCBOREncode_CloseMap(&encodeContext);
|
||||||
|
|
||||||
|
UsefulBufC encodedEvent;
|
||||||
|
auto uErr = QCBOREncode_Finish(&encodeContext, &encodedEvent);
|
||||||
|
if (uErr != 0) {
|
||||||
|
return BLE_ATT_ERR_INSUFFICIENT_RES;
|
||||||
|
}
|
||||||
|
auto res = os_mbuf_append(ctxt->om, &buffer, sizeof(buffer));
|
||||||
|
if (res == 0) {
|
||||||
|
return BLE_ATT_ERR_INSUFFICIENT_RES;
|
||||||
|
}
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
std::unique_ptr<WeatherData::Clouds>& WeatherService::GetCurrentClouds() {
|
||||||
|
uint64_t currentTimestamp = GetCurrentUnixTimestamp();
|
||||||
|
for (auto&& header : this->timeline) {
|
||||||
|
if (header->eventType == WeatherData::eventtype::Clouds && IsEventStillValid(header, currentTimestamp)) {
|
||||||
|
return reinterpret_cast<std::unique_ptr<WeatherData::Clouds>&>(header);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return reinterpret_cast<std::unique_ptr<WeatherData::Clouds>&>(*this->nullHeader);
|
||||||
|
}
|
||||||
|
|
||||||
|
std::unique_ptr<WeatherData::Obscuration>& WeatherService::GetCurrentObscuration() {
|
||||||
|
uint64_t currentTimestamp = GetCurrentUnixTimestamp();
|
||||||
|
for (auto&& header : this->timeline) {
|
||||||
|
if (header->eventType == WeatherData::eventtype::Obscuration && IsEventStillValid(header, currentTimestamp)) {
|
||||||
|
return reinterpret_cast<std::unique_ptr<WeatherData::Obscuration>&>(header);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return reinterpret_cast<std::unique_ptr<WeatherData::Obscuration>&>(*this->nullHeader);
|
||||||
|
}
|
||||||
|
|
||||||
|
std::unique_ptr<WeatherData::Precipitation>& WeatherService::GetCurrentPrecipitation() {
|
||||||
|
uint64_t currentTimestamp = GetCurrentUnixTimestamp();
|
||||||
|
for (auto&& header : this->timeline) {
|
||||||
|
if (header->eventType == WeatherData::eventtype::Precipitation && IsEventStillValid(header, currentTimestamp)) {
|
||||||
|
return reinterpret_cast<std::unique_ptr<WeatherData::Precipitation>&>(header);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return reinterpret_cast<std::unique_ptr<WeatherData::Precipitation>&>(*this->nullHeader);
|
||||||
|
}
|
||||||
|
|
||||||
|
std::unique_ptr<WeatherData::Wind>& WeatherService::GetCurrentWind() {
|
||||||
|
uint64_t currentTimestamp = GetCurrentUnixTimestamp();
|
||||||
|
for (auto&& header : this->timeline) {
|
||||||
|
if (header->eventType == WeatherData::eventtype::Wind && IsEventStillValid(header, currentTimestamp)) {
|
||||||
|
return reinterpret_cast<std::unique_ptr<WeatherData::Wind>&>(header);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return reinterpret_cast<std::unique_ptr<WeatherData::Wind>&>(*this->nullHeader);
|
||||||
|
}
|
||||||
|
|
||||||
|
std::unique_ptr<WeatherData::Temperature>& WeatherService::GetCurrentTemperature() {
|
||||||
|
uint64_t currentTimestamp = GetCurrentUnixTimestamp();
|
||||||
|
for (auto&& header : this->timeline) {
|
||||||
|
if (header->eventType == WeatherData::eventtype::Temperature && IsEventStillValid(header, currentTimestamp)) {
|
||||||
|
return reinterpret_cast<std::unique_ptr<WeatherData::Temperature>&>(header);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return reinterpret_cast<std::unique_ptr<WeatherData::Temperature>&>(*this->nullHeader);
|
||||||
|
}
|
||||||
|
|
||||||
|
std::unique_ptr<WeatherData::Humidity>& WeatherService::GetCurrentHumidity() {
|
||||||
|
uint64_t currentTimestamp = GetCurrentUnixTimestamp();
|
||||||
|
for (auto&& header : this->timeline) {
|
||||||
|
if (header->eventType == WeatherData::eventtype::Humidity && IsEventStillValid(header, currentTimestamp)) {
|
||||||
|
return reinterpret_cast<std::unique_ptr<WeatherData::Humidity>&>(header);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return reinterpret_cast<std::unique_ptr<WeatherData::Humidity>&>(*this->nullHeader);
|
||||||
|
}
|
||||||
|
|
||||||
|
std::unique_ptr<WeatherData::Pressure>& WeatherService::GetCurrentPressure() {
|
||||||
|
uint64_t currentTimestamp = GetCurrentUnixTimestamp();
|
||||||
|
for (auto&& header : this->timeline) {
|
||||||
|
if (header->eventType == WeatherData::eventtype::Pressure && IsEventStillValid(header, currentTimestamp)) {
|
||||||
|
return reinterpret_cast<std::unique_ptr<WeatherData::Pressure>&>(header);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return reinterpret_cast<std::unique_ptr<WeatherData::Pressure>&>(*this->nullHeader);
|
||||||
|
}
|
||||||
|
|
||||||
|
std::unique_ptr<WeatherData::Location>& WeatherService::GetCurrentLocation() {
|
||||||
|
uint64_t currentTimestamp = GetCurrentUnixTimestamp();
|
||||||
|
for (auto&& header : this->timeline) {
|
||||||
|
if (header->eventType == WeatherData::eventtype::Location && IsEventStillValid(header, currentTimestamp)) {
|
||||||
|
return reinterpret_cast<std::unique_ptr<WeatherData::Location>&>(header);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return reinterpret_cast<std::unique_ptr<WeatherData::Location>&>(*this->nullHeader);
|
||||||
|
}
|
||||||
|
|
||||||
|
std::unique_ptr<WeatherData::AirQuality>& WeatherService::GetCurrentQuality() {
|
||||||
|
uint64_t currentTimestamp = GetCurrentUnixTimestamp();
|
||||||
|
for (auto&& header : this->timeline) {
|
||||||
|
if (header->eventType == WeatherData::eventtype::AirQuality && IsEventStillValid(header, currentTimestamp)) {
|
||||||
|
return reinterpret_cast<std::unique_ptr<WeatherData::AirQuality>&>(header);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return reinterpret_cast<std::unique_ptr<WeatherData::AirQuality>&>(*this->nullHeader);
|
||||||
|
}
|
||||||
|
|
||||||
|
size_t WeatherService::GetTimelineLength() const {
|
||||||
|
return timeline.size();
|
||||||
|
}
|
||||||
|
|
||||||
|
bool WeatherService::AddEventToTimeline(std::unique_ptr<WeatherData::TimelineHeader> event) {
|
||||||
|
if (timeline.size() == timeline.max_size()) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
timeline.push_back(std::move(event));
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool WeatherService::HasTimelineEventOfType(const WeatherData::eventtype type) const {
|
||||||
|
uint64_t currentTimestamp = GetCurrentUnixTimestamp();
|
||||||
|
for (auto&& header : timeline) {
|
||||||
|
if (header->eventType == type && IsEventStillValid(header, currentTimestamp)) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
void WeatherService::TidyTimeline() {
|
||||||
|
uint64_t timeCurrent = GetCurrentUnixTimestamp();
|
||||||
|
timeline.erase(std::remove_if(std::begin(timeline),
|
||||||
|
std::end(timeline),
|
||||||
|
[&](std::unique_ptr<WeatherData::TimelineHeader> const& header) {
|
||||||
|
return !IsEventStillValid(header, timeCurrent);
|
||||||
|
}),
|
||||||
|
std::end(timeline));
|
||||||
|
|
||||||
|
std::sort(std::begin(timeline), std::end(timeline), CompareTimelineEvents);
|
||||||
|
}
|
||||||
|
|
||||||
|
bool WeatherService::CompareTimelineEvents(const std::unique_ptr<WeatherData::TimelineHeader>& first,
|
||||||
|
const std::unique_ptr<WeatherData::TimelineHeader>& second) {
|
||||||
|
return first->timestamp > second->timestamp;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool WeatherService::IsEventStillValid(const std::unique_ptr<WeatherData::TimelineHeader>& uniquePtr, const uint64_t timestamp) {
|
||||||
|
// Not getting timestamp in isEventStillValid for more speed
|
||||||
|
return uniquePtr->timestamp + uniquePtr->expires >= timestamp;
|
||||||
|
}
|
||||||
|
|
||||||
|
uint64_t WeatherService::GetCurrentUnixTimestamp() const {
|
||||||
|
return std::chrono::duration_cast<std::chrono::seconds>(dateTimeController.CurrentDateTime().time_since_epoch()).count();
|
||||||
|
}
|
||||||
|
|
||||||
|
int16_t WeatherService::GetTodayMinTemp() const {
|
||||||
|
uint64_t currentTimestamp = GetCurrentUnixTimestamp();
|
||||||
|
uint64_t currentDayEnd = currentTimestamp - ((24 - dateTimeController.Hours()) * 60 * 60) -
|
||||||
|
((60 - dateTimeController.Minutes()) * 60) - (60 - dateTimeController.Seconds());
|
||||||
|
int16_t result = -32768;
|
||||||
|
for (auto&& header : this->timeline) {
|
||||||
|
if (header->eventType == WeatherData::eventtype::Temperature && IsEventStillValid(header, currentTimestamp) &&
|
||||||
|
header->timestamp < currentDayEnd &&
|
||||||
|
reinterpret_cast<const std::unique_ptr<WeatherData::Temperature>&>(header)->temperature != -32768) {
|
||||||
|
int16_t temperature = reinterpret_cast<const std::unique_ptr<WeatherData::Temperature>&>(header)->temperature;
|
||||||
|
if (result == -32768) {
|
||||||
|
result = temperature;
|
||||||
|
} else if (result > temperature) {
|
||||||
|
result = temperature;
|
||||||
|
} else {
|
||||||
|
// The temperature in this item is higher than the lowest we've found
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
|
int16_t WeatherService::GetTodayMaxTemp() const {
|
||||||
|
uint64_t currentTimestamp = GetCurrentUnixTimestamp();
|
||||||
|
uint64_t currentDayEnd = currentTimestamp - ((24 - dateTimeController.Hours()) * 60 * 60) -
|
||||||
|
((60 - dateTimeController.Minutes()) * 60) - (60 - dateTimeController.Seconds());
|
||||||
|
int16_t result = -32768;
|
||||||
|
for (auto&& header : this->timeline) {
|
||||||
|
if (header->eventType == WeatherData::eventtype::Temperature && IsEventStillValid(header, currentTimestamp) &&
|
||||||
|
header->timestamp < currentDayEnd &&
|
||||||
|
reinterpret_cast<const std::unique_ptr<WeatherData::Temperature>&>(header)->temperature != -32768) {
|
||||||
|
int16_t temperature = reinterpret_cast<const std::unique_ptr<WeatherData::Temperature>&>(header)->temperature;
|
||||||
|
if (result == -32768) {
|
||||||
|
result = temperature;
|
||||||
|
} else if (result < temperature) {
|
||||||
|
result = temperature;
|
||||||
|
} else {
|
||||||
|
// The temperature in this item is lower than the highest we've found
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
|
void WeatherService::CleanUpQcbor(QCBORDecodeContext* decodeContext) {
|
||||||
|
QCBORDecode_ExitMap(decodeContext);
|
||||||
|
QCBORDecode_Finish(decodeContext);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
172
src/components/ble/weather/WeatherService.h
Normal file
172
src/components/ble/weather/WeatherService.h
Normal file
|
@ -0,0 +1,172 @@
|
||||||
|
/* Copyright (C) 2021 Avamander
|
||||||
|
|
||||||
|
This file is part of InfiniTime.
|
||||||
|
|
||||||
|
InfiniTime is free software: you can redistribute it and/or modify
|
||||||
|
it under the terms of the GNU General Public License as published
|
||||||
|
by the Free Software Foundation, either version 3 of the License, or
|
||||||
|
(at your option) any later version.
|
||||||
|
|
||||||
|
InfiniTime is distributed in the hope that it will be useful,
|
||||||
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
GNU General Public License for more details.
|
||||||
|
|
||||||
|
You should have received a copy of the GNU General Public License
|
||||||
|
along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include <cstdint>
|
||||||
|
#include <string>
|
||||||
|
#include <vector>
|
||||||
|
#include <memory>
|
||||||
|
|
||||||
|
#define min // workaround: nimble's min/max macros conflict with libstdc++
|
||||||
|
#define max
|
||||||
|
#include <host/ble_gap.h>
|
||||||
|
#include <host/ble_uuid.h>
|
||||||
|
#undef max
|
||||||
|
#undef min
|
||||||
|
|
||||||
|
#include "WeatherData.h"
|
||||||
|
#include "libs/QCBOR/inc/qcbor/qcbor.h"
|
||||||
|
#include "components/datetime/DateTimeController.h"
|
||||||
|
|
||||||
|
int WeatherCallback(uint16_t connHandle, uint16_t attrHandle, struct ble_gatt_access_ctxt* ctxt, void* arg);
|
||||||
|
|
||||||
|
namespace Pinetime {
|
||||||
|
namespace System {
|
||||||
|
class SystemTask;
|
||||||
|
}
|
||||||
|
namespace Controllers {
|
||||||
|
|
||||||
|
class WeatherService {
|
||||||
|
public:
|
||||||
|
explicit WeatherService(System::SystemTask& system, DateTime& dateTimeController);
|
||||||
|
|
||||||
|
void Init();
|
||||||
|
|
||||||
|
int OnCommand(uint16_t connHandle, uint16_t attrHandle, struct ble_gatt_access_ctxt* ctxt);
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Helper functions for quick access to currently valid data
|
||||||
|
*/
|
||||||
|
std::unique_ptr<WeatherData::Location>& GetCurrentLocation();
|
||||||
|
std::unique_ptr<WeatherData::Clouds>& GetCurrentClouds();
|
||||||
|
std::unique_ptr<WeatherData::Obscuration>& GetCurrentObscuration();
|
||||||
|
std::unique_ptr<WeatherData::Precipitation>& GetCurrentPrecipitation();
|
||||||
|
std::unique_ptr<WeatherData::Wind>& GetCurrentWind();
|
||||||
|
std::unique_ptr<WeatherData::Temperature>& GetCurrentTemperature();
|
||||||
|
std::unique_ptr<WeatherData::Humidity>& GetCurrentHumidity();
|
||||||
|
std::unique_ptr<WeatherData::Pressure>& GetCurrentPressure();
|
||||||
|
std::unique_ptr<WeatherData::AirQuality>& GetCurrentQuality();
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Searches for the current day's maximum temperature
|
||||||
|
* @return -32768 if there's no data, degrees Celsius times 100 otherwise
|
||||||
|
*/
|
||||||
|
int16_t GetTodayMaxTemp() const;
|
||||||
|
/**
|
||||||
|
* Searches for the current day's minimum temperature
|
||||||
|
* @return -32768 if there's no data, degrees Celsius times 100 otherwise
|
||||||
|
*/
|
||||||
|
int16_t GetTodayMinTemp() const;
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Management functions
|
||||||
|
*/
|
||||||
|
/**
|
||||||
|
* Adds an event to the timeline
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
bool AddEventToTimeline(std::unique_ptr<WeatherData::TimelineHeader> event);
|
||||||
|
/**
|
||||||
|
* Gets the current timeline length
|
||||||
|
*/
|
||||||
|
size_t GetTimelineLength() const;
|
||||||
|
/**
|
||||||
|
* Checks if an event of a certain type exists in the timeline
|
||||||
|
*/
|
||||||
|
bool HasTimelineEventOfType(WeatherData::eventtype type) const;
|
||||||
|
|
||||||
|
private:
|
||||||
|
// 00040000-78fc-48fe-8e23-433b3a1942d0
|
||||||
|
static constexpr ble_uuid128_t BaseUuid() {
|
||||||
|
return CharUuid(0x00, 0x00);
|
||||||
|
}
|
||||||
|
|
||||||
|
// 0004yyxx-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, y, x, 0x04, 0x00}};
|
||||||
|
}
|
||||||
|
|
||||||
|
ble_uuid128_t weatherUuid {BaseUuid()};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Just write timeline data here.
|
||||||
|
*
|
||||||
|
* See {@link WeatherData.h} for more information.
|
||||||
|
*/
|
||||||
|
ble_uuid128_t weatherDataCharUuid {CharUuid(0x00, 0x01)};
|
||||||
|
/**
|
||||||
|
* This doesn't take timeline data, provides some control over it.
|
||||||
|
*
|
||||||
|
* NOTE: Currently not supported. Companion app implementer feedback required.
|
||||||
|
* There's very little point in solidifying an API before we know the needs.
|
||||||
|
*/
|
||||||
|
ble_uuid128_t weatherControlCharUuid {CharUuid(0x00, 0x02)};
|
||||||
|
|
||||||
|
const struct ble_gatt_chr_def characteristicDefinition[3] = {
|
||||||
|
{.uuid = &weatherDataCharUuid.u,
|
||||||
|
.access_cb = WeatherCallback,
|
||||||
|
.arg = this,
|
||||||
|
.flags = BLE_GATT_CHR_F_WRITE,
|
||||||
|
.val_handle = &eventHandle},
|
||||||
|
{.uuid = &weatherControlCharUuid.u, .access_cb = WeatherCallback, .arg = this, .flags = BLE_GATT_CHR_F_WRITE | BLE_GATT_CHR_F_READ},
|
||||||
|
{nullptr}};
|
||||||
|
const struct ble_gatt_svc_def serviceDefinition[2] = {
|
||||||
|
{.type = BLE_GATT_SVC_TYPE_PRIMARY, .uuid = &weatherUuid.u, .characteristics = characteristicDefinition}, {0}};
|
||||||
|
|
||||||
|
uint16_t eventHandle {};
|
||||||
|
|
||||||
|
Pinetime::System::SystemTask& system;
|
||||||
|
Pinetime::Controllers::DateTime& dateTimeController;
|
||||||
|
|
||||||
|
std::vector<std::unique_ptr<WeatherData::TimelineHeader>> timeline;
|
||||||
|
std::unique_ptr<WeatherData::TimelineHeader> nullTimelineheader = std::make_unique<WeatherData::TimelineHeader>();
|
||||||
|
std::unique_ptr<WeatherData::TimelineHeader>* nullHeader;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Cleans up the timeline of expired events
|
||||||
|
*/
|
||||||
|
void TidyTimeline();
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Compares two timeline events
|
||||||
|
*/
|
||||||
|
static bool CompareTimelineEvents(const std::unique_ptr<WeatherData::TimelineHeader>& first,
|
||||||
|
const std::unique_ptr<WeatherData::TimelineHeader>& second);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Returns current UNIX timestamp
|
||||||
|
*/
|
||||||
|
uint64_t GetCurrentUnixTimestamp() const;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Checks if the event hasn't gone past and expired
|
||||||
|
*
|
||||||
|
* @param header timeline event to check
|
||||||
|
* @param currentTimestamp what's the time right now
|
||||||
|
* @return if the event is valid
|
||||||
|
*/
|
||||||
|
static bool IsEventStillValid(const std::unique_ptr<WeatherData::TimelineHeader>& uniquePtr, const uint64_t timestamp);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* This is a helper function that closes a QCBOR map and decoding context cleanly
|
||||||
|
*/
|
||||||
|
void CleanUpQcbor(QCBORDecodeContext* decodeContext);
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}
|
|
@ -25,6 +25,7 @@ namespace Pinetime {
|
||||||
Metronome,
|
Metronome,
|
||||||
Motion,
|
Motion,
|
||||||
Steps,
|
Steps,
|
||||||
|
Weather,
|
||||||
PassKey,
|
PassKey,
|
||||||
QuickSettings,
|
QuickSettings,
|
||||||
Settings,
|
Settings,
|
||||||
|
|
222
src/displayapp/screens/Weather.cpp
Normal file
222
src/displayapp/screens/Weather.cpp
Normal file
|
@ -0,0 +1,222 @@
|
||||||
|
/* Copyright (C) 2021 Avamander
|
||||||
|
|
||||||
|
This file is part of InfiniTime.
|
||||||
|
|
||||||
|
InfiniTime is free software: you can redistribute it and/or modify
|
||||||
|
it under the terms of the GNU General Public License as published
|
||||||
|
by the Free Software Foundation, either version 3 of the License, or
|
||||||
|
(at your option) any later version.
|
||||||
|
|
||||||
|
InfiniTime is distributed in the hope that it will be useful,
|
||||||
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
GNU General Public License for more details.
|
||||||
|
|
||||||
|
You should have received a copy of the GNU General Public License
|
||||||
|
along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
#include "Weather.h"
|
||||||
|
#include <lvgl/lvgl.h>
|
||||||
|
#include <components/ble/weather/WeatherService.h>
|
||||||
|
#include "Label.h"
|
||||||
|
#include "components/battery/BatteryController.h"
|
||||||
|
#include "components/ble/BleController.h"
|
||||||
|
#include "components/ble/weather/WeatherData.h"
|
||||||
|
|
||||||
|
using namespace Pinetime::Applications::Screens;
|
||||||
|
|
||||||
|
Weather::Weather(Pinetime::Applications::DisplayApp* app, Pinetime::Controllers::WeatherService& weather)
|
||||||
|
: Screen(app),
|
||||||
|
dateTimeController {dateTimeController},
|
||||||
|
weatherService(weather),
|
||||||
|
screens {app,
|
||||||
|
0,
|
||||||
|
{[this]() -> std::unique_ptr<Screen> {
|
||||||
|
return CreateScreenTemperature();
|
||||||
|
},
|
||||||
|
[this]() -> std::unique_ptr<Screen> {
|
||||||
|
return CreateScreenAir();
|
||||||
|
},
|
||||||
|
[this]() -> std::unique_ptr<Screen> {
|
||||||
|
return CreateScreenClouds();
|
||||||
|
},
|
||||||
|
[this]() -> std::unique_ptr<Screen> {
|
||||||
|
return CreateScreenPrecipitation();
|
||||||
|
},
|
||||||
|
[this]() -> std::unique_ptr<Screen> {
|
||||||
|
return CreateScreenHumidity();
|
||||||
|
}},
|
||||||
|
Screens::ScreenListModes::UpDown} {
|
||||||
|
}
|
||||||
|
|
||||||
|
Weather::~Weather() {
|
||||||
|
lv_obj_clean(lv_scr_act());
|
||||||
|
}
|
||||||
|
|
||||||
|
void Weather::Refresh() {
|
||||||
|
if (running) {
|
||||||
|
// screens.Refresh();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
bool Weather::OnButtonPushed() {
|
||||||
|
running = false;
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool Weather::OnTouchEvent(Pinetime::Applications::TouchEvents event) {
|
||||||
|
return screens.OnTouchEvent(event);
|
||||||
|
}
|
||||||
|
|
||||||
|
std::unique_ptr<Screen> Weather::CreateScreenTemperature() {
|
||||||
|
lv_obj_t* label = lv_label_create(lv_scr_act(), nullptr);
|
||||||
|
lv_label_set_recolor(label, true);
|
||||||
|
std::unique_ptr<Controllers::WeatherData::Temperature>& current = weatherService.GetCurrentTemperature();
|
||||||
|
if (current->timestamp == 0) {
|
||||||
|
// Do not use the data, it's invalid
|
||||||
|
lv_label_set_text_fmt(label,
|
||||||
|
"#FFFF00 Temperature#\n\n"
|
||||||
|
"#444444 %d#°C \n\n"
|
||||||
|
"#444444 %d#\n\n"
|
||||||
|
"%d\n"
|
||||||
|
"%d\n",
|
||||||
|
0,
|
||||||
|
0,
|
||||||
|
0,
|
||||||
|
0);
|
||||||
|
} else {
|
||||||
|
lv_label_set_text_fmt(label,
|
||||||
|
"#FFFF00 Temperature#\n\n"
|
||||||
|
"#444444 %d#°C \n\n"
|
||||||
|
"#444444 %hd#\n\n"
|
||||||
|
"%llu\n"
|
||||||
|
"%lu\n",
|
||||||
|
current->temperature / 100,
|
||||||
|
current->dewPoint,
|
||||||
|
current->timestamp,
|
||||||
|
current->expires);
|
||||||
|
}
|
||||||
|
lv_label_set_align(label, LV_LABEL_ALIGN_CENTER);
|
||||||
|
lv_obj_align(label, lv_scr_act(), LV_ALIGN_CENTER, 0, 0);
|
||||||
|
return std::unique_ptr<Screen>(new Screens::Label(0, 5, app, label));
|
||||||
|
}
|
||||||
|
|
||||||
|
std::unique_ptr<Screen> Weather::CreateScreenAir() {
|
||||||
|
lv_obj_t* label = lv_label_create(lv_scr_act(), nullptr);
|
||||||
|
lv_label_set_recolor(label, true);
|
||||||
|
std::unique_ptr<Controllers::WeatherData::AirQuality>& current = weatherService.GetCurrentQuality();
|
||||||
|
if (current->timestamp == 0) {
|
||||||
|
// Do not use the data, it's invalid
|
||||||
|
lv_label_set_text_fmt(label,
|
||||||
|
"#FFFF00 Air quality#\n\n"
|
||||||
|
"#444444 %s#\n"
|
||||||
|
"#444444 %d#\n\n"
|
||||||
|
"%d\n"
|
||||||
|
"%d\n",
|
||||||
|
"",
|
||||||
|
0,
|
||||||
|
0,
|
||||||
|
0);
|
||||||
|
} else {
|
||||||
|
lv_label_set_text_fmt(label,
|
||||||
|
"#FFFF00 Air quality#\n\n"
|
||||||
|
"#444444 %s#\n"
|
||||||
|
"#444444 %lu#\n\n"
|
||||||
|
"%llu\n"
|
||||||
|
"%lu\n",
|
||||||
|
current->polluter.c_str(),
|
||||||
|
(current->amount / 100),
|
||||||
|
current->timestamp,
|
||||||
|
current->expires);
|
||||||
|
}
|
||||||
|
lv_label_set_align(label, LV_LABEL_ALIGN_CENTER);
|
||||||
|
lv_obj_align(label, lv_scr_act(), LV_ALIGN_CENTER, 0, 0);
|
||||||
|
return std::unique_ptr<Screen>(new Screens::Label(0, 5, app, label));
|
||||||
|
}
|
||||||
|
|
||||||
|
std::unique_ptr<Screen> Weather::CreateScreenClouds() {
|
||||||
|
lv_obj_t* label = lv_label_create(lv_scr_act(), nullptr);
|
||||||
|
lv_label_set_recolor(label, true);
|
||||||
|
std::unique_ptr<Controllers::WeatherData::Clouds>& current = weatherService.GetCurrentClouds();
|
||||||
|
if (current->timestamp == 0) {
|
||||||
|
// Do not use the data, it's invalid
|
||||||
|
lv_label_set_text_fmt(label,
|
||||||
|
"#FFFF00 Clouds#\n\n"
|
||||||
|
"#444444 %d%%#\n\n"
|
||||||
|
"%d\n"
|
||||||
|
"%d\n",
|
||||||
|
0,
|
||||||
|
0,
|
||||||
|
0);
|
||||||
|
} else {
|
||||||
|
lv_label_set_text_fmt(label,
|
||||||
|
"#FFFF00 Clouds#\n\n"
|
||||||
|
"#444444 %hhu%%#\n\n"
|
||||||
|
"%llu\n"
|
||||||
|
"%lu\n",
|
||||||
|
current->amount,
|
||||||
|
current->timestamp,
|
||||||
|
current->expires);
|
||||||
|
}
|
||||||
|
lv_label_set_align(label, LV_LABEL_ALIGN_CENTER);
|
||||||
|
lv_obj_align(label, lv_scr_act(), LV_ALIGN_CENTER, 0, 0);
|
||||||
|
return std::unique_ptr<Screen>(new Screens::Label(0, 5, app, label));
|
||||||
|
}
|
||||||
|
|
||||||
|
std::unique_ptr<Screen> Weather::CreateScreenPrecipitation() {
|
||||||
|
lv_obj_t* label = lv_label_create(lv_scr_act(), nullptr);
|
||||||
|
lv_label_set_recolor(label, true);
|
||||||
|
std::unique_ptr<Controllers::WeatherData::Precipitation>& current = weatherService.GetCurrentPrecipitation();
|
||||||
|
if (current->timestamp == 0) {
|
||||||
|
// Do not use the data, it's invalid
|
||||||
|
lv_label_set_text_fmt(label,
|
||||||
|
"#FFFF00 Precipitation#\n\n"
|
||||||
|
"#444444 %d%%#\n\n"
|
||||||
|
"%d\n"
|
||||||
|
"%d\n",
|
||||||
|
0,
|
||||||
|
0,
|
||||||
|
0);
|
||||||
|
} else {
|
||||||
|
lv_label_set_text_fmt(label,
|
||||||
|
"#FFFF00 Precipitation#\n\n"
|
||||||
|
"#444444 %hhu%%#\n\n"
|
||||||
|
"%llu\n"
|
||||||
|
"%lu\n",
|
||||||
|
current->amount,
|
||||||
|
current->timestamp,
|
||||||
|
current->expires);
|
||||||
|
}
|
||||||
|
lv_label_set_align(label, LV_LABEL_ALIGN_CENTER);
|
||||||
|
lv_obj_align(label, lv_scr_act(), LV_ALIGN_CENTER, 0, 0);
|
||||||
|
return std::unique_ptr<Screen>(new Screens::Label(0, 5, app, label));
|
||||||
|
}
|
||||||
|
|
||||||
|
std::unique_ptr<Screen> Weather::CreateScreenHumidity() {
|
||||||
|
lv_obj_t* label = lv_label_create(lv_scr_act(), nullptr);
|
||||||
|
lv_label_set_recolor(label, true);
|
||||||
|
std::unique_ptr<Controllers::WeatherData::Humidity>& current = weatherService.GetCurrentHumidity();
|
||||||
|
if (current->timestamp == 0) {
|
||||||
|
// Do not use the data, it's invalid
|
||||||
|
lv_label_set_text_fmt(label,
|
||||||
|
"#FFFF00 Humidity#\n\n"
|
||||||
|
"#444444 %d%%#\n\n"
|
||||||
|
"%d\n"
|
||||||
|
"%d\n",
|
||||||
|
0,
|
||||||
|
0,
|
||||||
|
0);
|
||||||
|
} else {
|
||||||
|
lv_label_set_text_fmt(label,
|
||||||
|
"#FFFF00 Humidity#\n\n"
|
||||||
|
"#444444 %hhu%%#\n\n"
|
||||||
|
"%llu\n"
|
||||||
|
"%lu\n",
|
||||||
|
current->humidity,
|
||||||
|
current->timestamp,
|
||||||
|
current->expires);
|
||||||
|
}
|
||||||
|
lv_label_set_align(label, LV_LABEL_ALIGN_CENTER);
|
||||||
|
lv_obj_align(label, lv_scr_act(), LV_ALIGN_CENTER, 0, 0);
|
||||||
|
return std::unique_ptr<Screen>(new Screens::Label(0, 5, app, label));
|
||||||
|
}
|
45
src/displayapp/screens/Weather.h
Normal file
45
src/displayapp/screens/Weather.h
Normal file
|
@ -0,0 +1,45 @@
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include <memory>
|
||||||
|
#include <components/ble/weather/WeatherService.h>
|
||||||
|
#include "Screen.h"
|
||||||
|
#include "ScreenList.h"
|
||||||
|
|
||||||
|
namespace Pinetime {
|
||||||
|
namespace Applications {
|
||||||
|
class DisplayApp;
|
||||||
|
|
||||||
|
namespace Screens {
|
||||||
|
class Weather : public Screen {
|
||||||
|
public:
|
||||||
|
explicit Weather(DisplayApp* app, Pinetime::Controllers::WeatherService& weather);
|
||||||
|
|
||||||
|
~Weather() override;
|
||||||
|
|
||||||
|
void Refresh() override;
|
||||||
|
|
||||||
|
bool OnButtonPushed() override;
|
||||||
|
|
||||||
|
bool OnTouchEvent(TouchEvents event) override;
|
||||||
|
|
||||||
|
private:
|
||||||
|
bool running = true;
|
||||||
|
|
||||||
|
Pinetime::Controllers::DateTime& dateTimeController;
|
||||||
|
Controllers::WeatherService& weatherService;
|
||||||
|
|
||||||
|
ScreenList<5> screens;
|
||||||
|
|
||||||
|
std::unique_ptr<Screen> CreateScreenTemperature();
|
||||||
|
|
||||||
|
std::unique_ptr<Screen> CreateScreenAir();
|
||||||
|
|
||||||
|
std::unique_ptr<Screen> CreateScreenClouds();
|
||||||
|
|
||||||
|
std::unique_ptr<Screen> CreateScreenPrecipitation();
|
||||||
|
|
||||||
|
std::unique_ptr<Screen> CreateScreenHumidity();
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
|
@ -6,7 +6,7 @@
|
||||||
using namespace Pinetime::Applications::Screens;
|
using namespace Pinetime::Applications::Screens;
|
||||||
|
|
||||||
namespace {
|
namespace {
|
||||||
static void event_handler(lv_obj_t * obj, lv_event_t event) {
|
void event_handler(lv_obj_t* obj, lv_event_t event) {
|
||||||
SettingSteps* screen = static_cast<SettingSteps*>(obj->user_data);
|
SettingSteps* screen = static_cast<SettingSteps*>(obj->user_data);
|
||||||
screen->UpdateSelected(obj, event);
|
screen->UpdateSelected(obj, event);
|
||||||
}
|
}
|
||||||
|
@ -30,33 +30,32 @@ SettingSteps::SettingSteps(
|
||||||
lv_obj_set_height(container1, LV_VER_RES - 60);
|
lv_obj_set_height(container1, LV_VER_RES - 60);
|
||||||
lv_cont_set_layout(container1, LV_LAYOUT_COLUMN_LEFT);
|
lv_cont_set_layout(container1, LV_LAYOUT_COLUMN_LEFT);
|
||||||
|
|
||||||
lv_obj_t * title = lv_label_create(lv_scr_act(), NULL);
|
lv_obj_t* title = lv_label_create(lv_scr_act(), nullptr);
|
||||||
lv_label_set_text_static(title,"Daily steps goal");
|
lv_label_set_text_static(title,"Daily steps goal");
|
||||||
lv_label_set_align(title, LV_LABEL_ALIGN_CENTER);
|
lv_label_set_align(title, LV_LABEL_ALIGN_CENTER);
|
||||||
lv_obj_align(title, lv_scr_act(), LV_ALIGN_IN_TOP_MID, 15, 15);
|
lv_obj_align(title, lv_scr_act(), LV_ALIGN_IN_TOP_MID, 15, 15);
|
||||||
|
|
||||||
lv_obj_t * icon = lv_label_create(lv_scr_act(), NULL);
|
lv_obj_t* icon = lv_label_create(lv_scr_act(), nullptr);
|
||||||
lv_obj_set_style_local_text_color(icon, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_ORANGE);
|
lv_obj_set_style_local_text_color(icon, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_ORANGE);
|
||||||
|
|
||||||
lv_label_set_text_static(icon, Symbols::shoe);
|
lv_label_set_text_static(icon, Symbols::shoe);
|
||||||
lv_label_set_align(icon, LV_LABEL_ALIGN_CENTER);
|
lv_label_set_align(icon, LV_LABEL_ALIGN_CENTER);
|
||||||
lv_obj_align(icon, title, LV_ALIGN_OUT_LEFT_MID, -10, 0);
|
lv_obj_align(icon, title, LV_ALIGN_OUT_LEFT_MID, -10, 0);
|
||||||
|
|
||||||
|
stepValue = lv_label_create(lv_scr_act(), nullptr);
|
||||||
stepValue = lv_label_create(lv_scr_act(), NULL);
|
|
||||||
lv_obj_set_style_local_text_font(stepValue, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &jetbrains_mono_42);
|
lv_obj_set_style_local_text_font(stepValue, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &jetbrains_mono_42);
|
||||||
lv_label_set_text_fmt(stepValue, "%lu", settingsController.GetStepsGoal());
|
lv_label_set_text_fmt(stepValue, "%lu", settingsController.GetStepsGoal());
|
||||||
lv_label_set_align(stepValue, LV_LABEL_ALIGN_CENTER);
|
lv_label_set_align(stepValue, LV_LABEL_ALIGN_CENTER);
|
||||||
lv_obj_align(stepValue, lv_scr_act(), LV_ALIGN_CENTER, 0, -10);
|
lv_obj_align(stepValue, lv_scr_act(), LV_ALIGN_CENTER, 0, -10);
|
||||||
|
|
||||||
btnPlus = lv_btn_create(lv_scr_act(), NULL);
|
btnPlus = lv_btn_create(lv_scr_act(), nullptr);
|
||||||
btnPlus->user_data = this;
|
btnPlus->user_data = this;
|
||||||
lv_obj_set_size(btnPlus, 80, 50);
|
lv_obj_set_size(btnPlus, 80, 50);
|
||||||
lv_obj_align(btnPlus, lv_scr_act(), LV_ALIGN_CENTER, 55, 80);
|
lv_obj_align(btnPlus, lv_scr_act(), LV_ALIGN_CENTER, 55, 80);
|
||||||
lv_obj_set_style_local_value_str(btnPlus, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, "+");
|
lv_obj_set_style_local_value_str(btnPlus, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, "+");
|
||||||
lv_obj_set_event_cb(btnPlus, event_handler);
|
lv_obj_set_event_cb(btnPlus, event_handler);
|
||||||
|
|
||||||
btnMinus = lv_btn_create(lv_scr_act(), NULL);
|
btnMinus = lv_btn_create(lv_scr_act(), nullptr);
|
||||||
btnMinus->user_data = this;
|
btnMinus->user_data = this;
|
||||||
lv_obj_set_size(btnMinus, 80, 50);
|
lv_obj_set_size(btnMinus, 80, 50);
|
||||||
lv_obj_set_event_cb(btnMinus, event_handler);
|
lv_obj_set_event_cb(btnMinus, event_handler);
|
||||||
|
|
1
src/libs/QCBOR
Submodule
1
src/libs/QCBOR
Submodule
|
@ -0,0 +1 @@
|
||||||
|
Subproject commit 9e2f70804393823cc6d16f9f1035ef7223faca04
|
|
@ -19,14 +19,13 @@ void NrfLogger::Init() {
|
||||||
|
|
||||||
void NrfLogger::Process(void*) {
|
void NrfLogger::Process(void*) {
|
||||||
NRF_LOG_INFO("Logger task started!");
|
NRF_LOG_INFO("Logger task started!");
|
||||||
// Suppress endless loop diagnostic
|
|
||||||
#pragma clang diagnostic push
|
#pragma clang diagnostic push
|
||||||
#pragma ide diagnostic ignored "EndlessLoop"
|
#pragma ide diagnostic ignored "EndlessLoop"
|
||||||
while (true) {
|
while (true) {
|
||||||
NRF_LOG_FLUSH();
|
NRF_LOG_FLUSH();
|
||||||
vTaskDelay(100); // Not good for power consumption, it will wake up every 100ms...
|
vTaskDelay(100); // Not good for power consumption, it will wake up every 100ms...
|
||||||
}
|
}
|
||||||
// Clear diagnostic suppression
|
|
||||||
#pragma clang diagnostic pop
|
#pragma clang diagnostic pop
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue