Merge pull request #68 from Avamander/patch-1
Rename folders to follow a consistent style
|
@ -4,7 +4,7 @@ project(pinetime VERSION 0.8.2 LANGUAGES C CXX ASM)
|
|||
set(NRF_TARGET "nrf52")
|
||||
|
||||
if (NOT ARM_NONE_EABI_TOOLCHAIN_PATH)
|
||||
message(FATAL_ERROR "The path to the toolchain (arm-non-eabi) must be specified on the command line (add -DARM_NONE_EABI_TOOLCHAIN_PATH=<path>")
|
||||
message(FATAL_ERROR "The path to the toolchain (arm-none-eabi) must be specified on the command line (add -DARM_NONE_EABI_TOOLCHAIN_PATH=<path>")
|
||||
endif ()
|
||||
|
||||
if (NOT NRF5_SDK_PATH)
|
||||
|
|
|
@ -45,7 +45,7 @@ As of now, here is the list of achievements of this project:
|
|||
## Documentation
|
||||
|
||||
### Develop
|
||||
- [Generate the fonts and symbols](src/DisplayApp/Fonts/Readme.md)
|
||||
- [Generate the fonts and symbols](src/displayapp/fonts/Readme.md)
|
||||
|
||||
### Build, flash and debug
|
||||
- [Project branches](doc/branches.md)
|
||||
|
|
Before Width: | Height: | Size: 187 KiB After Width: | Height: | Size: 187 KiB |
Before Width: | Height: | Size: 208 KiB After Width: | Height: | Size: 208 KiB |
Before Width: | Height: | Size: 176 KiB After Width: | Height: | Size: 176 KiB |
|
@ -10,20 +10,20 @@ set(NRF_BOARD pca10040)
|
|||
if (NOT NRF5_SDK_PATH)
|
||||
message(FATAL_ERROR "The path to the nRF5 SDK (NRF5_SDK_PATH) must be set.")
|
||||
endif ()
|
||||
if(DEFINED ARM_NONE_EABI_TOOLCHAIN_PATH)
|
||||
if (DEFINED ARM_NONE_EABI_TOOLCHAIN_PATH)
|
||||
set(ARM_NONE_EABI_TOOLCHAIN_BIN_PATH ${ARM_NONE_EABI_TOOLCHAIN_PATH}/bin)
|
||||
endif()
|
||||
endif ()
|
||||
|
||||
if (NOT NRF_TARGET MATCHES "nrf52")
|
||||
message(FATAL_ERROR "Only rRF52 boards are supported right now")
|
||||
endif()
|
||||
endif ()
|
||||
|
||||
# Setup toolchain
|
||||
include(${CMAKE_SOURCE_DIR}/cmake-nRF5x/arm-gcc-toolchain.cmake)
|
||||
|
||||
if(NOT DEFINED ARM_GCC_TOOLCHAIN)
|
||||
if (NOT DEFINED ARM_GCC_TOOLCHAIN)
|
||||
message(FATAL_ERROR "The toolchain must be set up before calling this macro")
|
||||
endif()
|
||||
endif ()
|
||||
set(CMAKE_OSX_SYSROOT "/")
|
||||
set(CMAKE_OSX_DEPLOYMENT_TARGET "")
|
||||
|
||||
|
@ -84,7 +84,7 @@ set(SDK_SOURCE_FILES
|
|||
|
||||
# GPIOTE
|
||||
"${NRF5_SDK_PATH}/components/libraries/gpiote/app_gpiote.c"
|
||||
)
|
||||
)
|
||||
|
||||
set(TINYCRYPT_SRC
|
||||
libs/mynewt-nimble/ext/tinycrypt/src/aes_encrypt.c
|
||||
|
@ -292,55 +292,55 @@ set(LVGL_SRC
|
|||
)
|
||||
|
||||
list(APPEND IMAGE_FILES
|
||||
DisplayApp/Icons/battery/os_battery_error.c
|
||||
DisplayApp/Icons/battery/os_battery_100.c
|
||||
DisplayApp/Icons/battery/os_battery_090.c
|
||||
DisplayApp/Icons/battery/os_battery_080.c
|
||||
DisplayApp/Icons/battery/os_battery_070.c
|
||||
DisplayApp/Icons/battery/os_battery_060.c
|
||||
DisplayApp/Icons/battery/os_battery_050.c
|
||||
DisplayApp/Icons/battery/os_battery_040.c
|
||||
DisplayApp/Icons/battery/os_battery_030.c
|
||||
DisplayApp/Icons/battery/os_battery_020.c
|
||||
DisplayApp/Icons/battery/os_battery_010.c
|
||||
DisplayApp/Icons/battery/os_battery_005.c
|
||||
displayapp/icons/battery/os_battery_error.c
|
||||
displayapp/icons/battery/os_battery_100.c
|
||||
displayapp/icons/battery/os_battery_090.c
|
||||
displayapp/icons/battery/os_battery_080.c
|
||||
displayapp/icons/battery/os_battery_070.c
|
||||
displayapp/icons/battery/os_battery_060.c
|
||||
displayapp/icons/battery/os_battery_050.c
|
||||
displayapp/icons/battery/os_battery_040.c
|
||||
displayapp/icons/battery/os_battery_030.c
|
||||
displayapp/icons/battery/os_battery_020.c
|
||||
displayapp/icons/battery/os_battery_010.c
|
||||
displayapp/icons/battery/os_battery_005.c
|
||||
|
||||
DisplayApp/Icons/battery/os_batterycharging_100.c
|
||||
DisplayApp/Icons/battery/os_batterycharging_090.c
|
||||
DisplayApp/Icons/battery/os_batterycharging_080.c
|
||||
DisplayApp/Icons/battery/os_batterycharging_070.c
|
||||
DisplayApp/Icons/battery/os_batterycharging_060.c
|
||||
DisplayApp/Icons/battery/os_batterycharging_050.c
|
||||
DisplayApp/Icons/battery/os_batterycharging_040.c
|
||||
DisplayApp/Icons/battery/os_batterycharging_030.c
|
||||
DisplayApp/Icons/battery/os_batterycharging_020.c
|
||||
DisplayApp/Icons/battery/os_batterycharging_010.c
|
||||
DisplayApp/Icons/battery/os_batterycharging_005.c
|
||||
displayapp/icons/battery/os_batterycharging_100.c
|
||||
displayapp/icons/battery/os_batterycharging_090.c
|
||||
displayapp/icons/battery/os_batterycharging_080.c
|
||||
displayapp/icons/battery/os_batterycharging_070.c
|
||||
displayapp/icons/battery/os_batterycharging_060.c
|
||||
displayapp/icons/battery/os_batterycharging_050.c
|
||||
displayapp/icons/battery/os_batterycharging_040.c
|
||||
displayapp/icons/battery/os_batterycharging_030.c
|
||||
displayapp/icons/battery/os_batterycharging_020.c
|
||||
displayapp/icons/battery/os_batterycharging_010.c
|
||||
displayapp/icons/battery/os_batterycharging_005.c
|
||||
|
||||
DisplayApp/Icons/bluetooth/os_bt_connected.c
|
||||
DisplayApp/Icons/bluetooth/os_bt_disconnected.c
|
||||
displayapp/icons/bluetooth/os_bt_connected.c
|
||||
displayapp/icons/bluetooth/os_bt_disconnected.c
|
||||
)
|
||||
|
||||
list(APPEND SOURCE_FILES
|
||||
Logging/NrfLogger.cpp
|
||||
DisplayApp/DisplayApp.cpp
|
||||
DisplayApp/Screens/Screen.cpp
|
||||
DisplayApp/Screens/Clock.cpp
|
||||
DisplayApp/Screens/Tile.cpp
|
||||
DisplayApp/Screens/Meter.cpp
|
||||
DisplayApp/Screens/Gauge.cpp
|
||||
DisplayApp/Screens/InfiniPaint.cpp
|
||||
DisplayApp/Screens/DropDownDemo.cpp
|
||||
DisplayApp/Screens/Modal.cpp
|
||||
DisplayApp/Screens/BatteryIcon.cpp
|
||||
DisplayApp/Screens/BleIcon.cpp
|
||||
DisplayApp/Screens/Brightness.cpp
|
||||
DisplayApp/Screens/SystemInfo.cpp
|
||||
DisplayApp/Screens/Label.cpp
|
||||
DisplayApp/Screens/FirmwareUpdate.cpp
|
||||
DisplayApp/Screens/Music.cpp
|
||||
DisplayApp/Screens/FirmwareValidation.cpp
|
||||
DisplayApp/Screens/ApplicationList.cpp
|
||||
logging/NrfLogger.cpp
|
||||
displayapp/DisplayApp.cpp
|
||||
displayapp/screens/Screen.cpp
|
||||
displayapp/screens/Clock.cpp
|
||||
displayapp/screens/Tile.cpp
|
||||
displayapp/screens/Meter.cpp
|
||||
displayapp/screens/Gauge.cpp
|
||||
displayapp/screens/InfiniPaint.cpp
|
||||
displayapp/screens/DropDownDemo.cpp
|
||||
displayapp/screens/Modal.cpp
|
||||
displayapp/screens/BatteryIcon.cpp
|
||||
displayapp/screens/BleIcon.cpp
|
||||
displayapp/screens/Brightness.cpp
|
||||
displayapp/screens/SystemInfo.cpp
|
||||
displayapp/screens/Label.cpp
|
||||
displayapp/screens/FirmwareUpdate.cpp
|
||||
displayapp/screens/Music.cpp
|
||||
displayapp/screens/FirmwareValidation.cpp
|
||||
displayapp/screens/ApplicationList.cpp
|
||||
main.cpp
|
||||
drivers/St7789.cpp
|
||||
drivers/SpiNorFlash.cpp
|
||||
|
@ -349,34 +349,34 @@ list(APPEND SOURCE_FILES
|
|||
drivers/Watchdog.cpp
|
||||
drivers/DebugPins.cpp
|
||||
drivers/InternalFlash.cpp
|
||||
Components/Battery/BatteryController.cpp
|
||||
Components/Ble/BleController.cpp
|
||||
Components/Ble/NotificationManager.cpp
|
||||
Components/DateTime/DateTimeController.cpp
|
||||
Components/Brightness/BrightnessController.cpp
|
||||
Components/Ble/NimbleController.cpp
|
||||
Components/Ble/DeviceInformationService.cpp
|
||||
Components/Ble/CurrentTimeClient.cpp
|
||||
Components/Ble/AlertNotificationClient.cpp
|
||||
Components/Ble/DfuService.cpp
|
||||
Components/Ble/CurrentTimeService.cpp
|
||||
Components/Ble/AlertNotificationService.cpp
|
||||
Components/Ble/MusicService.cpp
|
||||
Components/Ble/BatteryInformationService.cpp
|
||||
Components/Ble/ImmediateAlertService.cpp
|
||||
Components/FirmwareValidator/FirmwareValidator.cpp
|
||||
components/battery/BatteryController.cpp
|
||||
components/ble/BleController.cpp
|
||||
components/ble/NotificationManager.cpp
|
||||
components/datetime/DateTimeController.cpp
|
||||
components/brightness/BrightnessController.cpp
|
||||
components/ble/NimbleController.cpp
|
||||
components/ble/DeviceInformationService.cpp
|
||||
components/ble/CurrentTimeClient.cpp
|
||||
components/ble/AlertNotificationClient.cpp
|
||||
components/ble/DfuService.cpp
|
||||
components/ble/CurrentTimeService.cpp
|
||||
components/ble/AlertNotificationService.cpp
|
||||
components/ble/MusicService.cpp
|
||||
components/ble/BatteryInformationService.cpp
|
||||
components/ble/ImmediateAlertService.cpp
|
||||
components/firmwarevalidator/FirmwareValidator.cpp
|
||||
drivers/Cst816s.cpp
|
||||
FreeRTOS/port.c
|
||||
FreeRTOS/port_cmsis_systick.c
|
||||
FreeRTOS/port_cmsis.c
|
||||
|
||||
DisplayApp/LittleVgl.cpp
|
||||
DisplayApp/Fonts/jetbrains_mono_extrabold_compressed.c
|
||||
DisplayApp/Fonts/jetbrains_mono_bold_20.c
|
||||
displayapp/LittleVgl.cpp
|
||||
displayapp/fonts/jetbrains_mono_extrabold_compressed.c
|
||||
displayapp/fonts/jetbrains_mono_bold_20.c
|
||||
|
||||
SystemTask/SystemTask.cpp
|
||||
systemtask/SystemTask.cpp
|
||||
drivers/TwiMaster.cpp
|
||||
)
|
||||
)
|
||||
|
||||
list(APPEND GRAPHICS_SOURCE_FILES
|
||||
# FreeRTOS
|
||||
|
@ -387,38 +387,38 @@ list(APPEND GRAPHICS_SOURCE_FILES
|
|||
drivers/SpiNorFlash.cpp
|
||||
drivers/SpiMaster.cpp
|
||||
drivers/Spi.cpp
|
||||
Logging/NrfLogger.cpp
|
||||
logging/NrfLogger.cpp
|
||||
|
||||
Components/Gfx/Gfx.cpp
|
||||
components/gfx/Gfx.cpp
|
||||
drivers/St7789.cpp
|
||||
Components/Brightness/BrightnessController.cpp
|
||||
components/brightness/BrightnessController.cpp
|
||||
|
||||
graphics.cpp
|
||||
)
|
||||
)
|
||||
|
||||
set(INCLUDE_FILES
|
||||
Logging/Logger.h
|
||||
Logging/NrfLogger.h
|
||||
DisplayApp/DisplayApp.h
|
||||
DisplayApp/TouchEvents.h
|
||||
DisplayApp/Screens/Screen.h
|
||||
DisplayApp/Screens/Clock.h
|
||||
DisplayApp/Screens/Tile.h
|
||||
DisplayApp/Screens/Meter.h
|
||||
DisplayApp/Screens/Gauge.h
|
||||
DisplayApp/Screens/InfiniPaint.h
|
||||
DisplayApp/Screens/DropDownDemo.h
|
||||
DisplayApp/Screens/Modal.h
|
||||
DisplayApp/Screens/BatteryIcon.h
|
||||
DisplayApp/Screens/BleIcon.cpp
|
||||
DisplayApp/Screens/Brightness.h
|
||||
DisplayApp/Screens/SystemInfo.h
|
||||
DisplayApp/Screens/ScreenList.h
|
||||
DisplayApp/Screens/Label.h
|
||||
DisplayApp/Screens/FirmwareUpdate.h
|
||||
DisplayApp/Screens/FirmwareValidation.h
|
||||
DisplayApp/Screens/ApplicationList.h
|
||||
DisplayApp/Apps.h
|
||||
logging/Logger.h
|
||||
logging/NrfLogger.h
|
||||
displayapp/DisplayApp.h
|
||||
displayapp/TouchEvents.h
|
||||
displayapp/screens/Screen.h
|
||||
displayapp/screens/Clock.h
|
||||
displayapp/screens/Tile.h
|
||||
displayapp/screens/Meter.h
|
||||
displayapp/screens/Gauge.h
|
||||
displayapp/screens/InfiniPaint.h
|
||||
displayapp/screens/DropDownDemo.h
|
||||
displayapp/screens/Modal.h
|
||||
displayapp/screens/BatteryIcon.h
|
||||
displayapp/screens/BleIcon.cpp
|
||||
displayapp/screens/Brightness.h
|
||||
displayapp/screens/SystemInfo.h
|
||||
displayapp/screens/ScreenList.h
|
||||
displayapp/screens/Label.h
|
||||
displayapp/screens/FirmwareUpdate.h
|
||||
displayapp/screens/FirmwareValidation.h
|
||||
displayapp/screens/ApplicationList.h
|
||||
displayapp/Apps.h
|
||||
drivers/St7789.h
|
||||
drivers/SpiNorFlash.h
|
||||
drivers/SpiMaster.h
|
||||
|
@ -426,19 +426,19 @@ set(INCLUDE_FILES
|
|||
drivers/Watchdog.h
|
||||
drivers/DebugPins.h
|
||||
drivers/InternalFlash.h
|
||||
Components/Battery/BatteryController.h
|
||||
Components/Ble/BleController.h
|
||||
Components/Ble/NotificationManager.h
|
||||
Components/DateTime/DateTimeController.h
|
||||
Components/Brightness/BrightnessController.h
|
||||
Components/Ble/NimbleController.h
|
||||
Components/Ble/DeviceInformationService.h
|
||||
Components/Ble/CurrentTimeClient.h
|
||||
Components/Ble/AlertNotificationClient.h
|
||||
Components/Ble/DfuService.h
|
||||
Components/FirmwareValidator/FirmwareValidator.h
|
||||
Components/Ble/BatteryInformationService.h
|
||||
Components/Ble/ImmediateAlertService.h
|
||||
components/battery/BatteryController.h
|
||||
components/ble/BleController.h
|
||||
components/ble/NotificationManager.h
|
||||
components/datetime/DateTimeController.h
|
||||
components/brightness/BrightnessController.h
|
||||
components/ble/NimbleController.h
|
||||
components/ble/DeviceInformationService.h
|
||||
components/ble/CurrentTimeClient.h
|
||||
components/ble/AlertNotificationClient.h
|
||||
components/ble/DfuService.h
|
||||
components/firmwarevalidator/FirmwareValidator.h
|
||||
components/ble/BatteryInformationService.h
|
||||
components/ble/ImmediateAlertService.h
|
||||
drivers/Cst816s.h
|
||||
FreeRTOS/portmacro.h
|
||||
FreeRTOS/portmacro_cmsis.h
|
||||
|
@ -450,12 +450,12 @@ set(INCLUDE_FILES
|
|||
libs/date/includes/date/julian.h
|
||||
libs/date/includes/date/ptz.h
|
||||
libs/date/includes/date/tz_private.h
|
||||
DisplayApp/LittleVgl.h
|
||||
SystemTask/SystemTask.h
|
||||
SystemTask/SystemMonitor.h
|
||||
DisplayApp/Screens/Symbols.h
|
||||
displayapp/LittleVgl.h
|
||||
systemtask/SystemTask.h
|
||||
systemtask/SystemMonitor.h
|
||||
displayapp/screens/Symbols.h
|
||||
drivers/TwiMaster.h
|
||||
)
|
||||
)
|
||||
|
||||
include_directories(
|
||||
.
|
||||
|
@ -563,9 +563,9 @@ add_definitions(-DDEBUG_NRF_USER)
|
|||
add_definitions(-D__STACK_SIZE=8192)
|
||||
add_definitions(-D__HEAP_SIZE=8192)
|
||||
|
||||
if(NOT CMAKE_BUILD_TYPE)
|
||||
if (NOT CMAKE_BUILD_TYPE)
|
||||
set(CMAKE_BUILD_TYPE "Release")
|
||||
endif()
|
||||
endif ()
|
||||
|
||||
# NRF SDK
|
||||
add_library(nrf-sdk STATIC ${SDK_SOURCE_FILES})
|
||||
|
@ -616,7 +616,7 @@ target_compile_options(${EXECUTABLE_NAME} PUBLIC
|
|||
$<$<AND:$<COMPILE_LANGUAGE:CXX>,$<CONFIG:DEBUG>>: ${COMMON_FLAGS} -O0 -g3>
|
||||
$<$<AND:$<COMPILE_LANGUAGE:CXX>,$<CONFIG:RELEASE>>: ${COMMON_FLAGS} -O3>
|
||||
$<$<COMPILE_LANGUAGE:ASM>: -MP -MD -std=c99 -x assembler-with-cpp>
|
||||
)
|
||||
)
|
||||
|
||||
set_target_properties(${EXECUTABLE_NAME} PROPERTIES
|
||||
SUFFIX ".out"
|
||||
|
@ -663,7 +663,7 @@ add_custom_command(TARGET ${EXECUTABLE_MCUBOOT_NAME}
|
|||
COMMAND ${CMAKE_OBJCOPY} -O binary ${EXECUTABLE_MCUBOOT_FILE_NAME}.out "${EXECUTABLE_MCUBOOT_FILE_NAME}.bin"
|
||||
COMMAND ${CMAKE_OBJCOPY} -O ihex ${EXECUTABLE_MCUBOOT_FILE_NAME}.out "${EXECUTABLE_MCUBOOT_FILE_NAME}.hex"
|
||||
COMMENT "post build steps for ${EXECUTABLE_MCUBOOT_FILE_NAME}"
|
||||
)
|
||||
)
|
||||
|
||||
# Build binary that writes the graphic assets for the bootloader
|
||||
set(EXECUTABLE_GRAPHICS_NAME "pinetime-graphics")
|
||||
|
@ -695,7 +695,7 @@ add_custom_command(TARGET ${EXECUTABLE_GRAPHICS_NAME}
|
|||
)
|
||||
|
||||
# FLASH
|
||||
if(USE_JLINK)
|
||||
if (USE_JLINK)
|
||||
add_custom_target(FLASH_ERASE
|
||||
COMMAND ${NRFJPROG} --eraseall -f ${NRF_TARGET}
|
||||
COMMENT "erasing flashing"
|
||||
|
@ -708,7 +708,7 @@ if(USE_JLINK)
|
|||
COMMENT "flashing ${EXECUTABLE_NAME}.hex"
|
||||
)
|
||||
|
||||
elseif(USE_GDB_CLIENT)
|
||||
elseif (USE_GDB_CLIENT)
|
||||
add_custom_target(FLASH_ERASE
|
||||
COMMAND ${GDB_CLIENT_BIN_PATH} -nx --batch -ex 'target extended-remote ${GDB_CLIENT_TARGET_REMOTE}' -ex 'monitor swdp_scan' -ex 'attach 1' -ex 'mon erase_mass'
|
||||
COMMENT "erasing flashing"
|
||||
|
@ -718,7 +718,36 @@ elseif(USE_GDB_CLIENT)
|
|||
COMMAND ${GDB_CLIENT_BIN_PATH} -nx --batch -ex 'target extended-remote ${GDB_CLIENT_TARGET_REMOTE}' -ex 'monitor swdp_scan' -ex 'attach 1' -ex 'load' -ex 'kill' ${EXECUTABLE_NAME}.hex
|
||||
COMMENT "flashing ${EXECUTABLE_NAME}.hex"
|
||||
)
|
||||
elseif(USE_OPENOCD)
|
||||
elseif (USE_OPENOCD)
|
||||
if (USE_CMSIS_DAP)
|
||||
add_custom_target(FLASH_ERASE
|
||||
COMMAND ${OPENOCD_BIN_PATH} -c 'source [find interface/cmsis-dap.cfg]' -c 'transport select swd'
|
||||
-c 'source [find target/nrf52.cfg]'
|
||||
-c 'init'
|
||||
-c 'halt'
|
||||
-c 'nrf5 mass_erase'
|
||||
-c 'halt'
|
||||
-c 'reset'
|
||||
-c 'exit'
|
||||
COMMENT "erasing flashing"
|
||||
)
|
||||
add_custom_target("FLASH_${EXECUTABLE_NAME}"
|
||||
DEPENDS ${EXECUTABLE_NAME}
|
||||
COMMAND ${OPENOCD_BIN_PATH}
|
||||
-c 'tcl_port disabled'
|
||||
-c 'gdb_port 3333'
|
||||
-c 'telnet_port 4444'
|
||||
-c 'source [find interface/cmsis-dap.cfg]'
|
||||
-c 'transport select swd'
|
||||
-c 'source [find target/nrf52.cfg]'
|
||||
-c 'halt'
|
||||
-c "program \"${EXECUTABLE_NAME}.hex\""
|
||||
-c 'reset'
|
||||
-c 'shutdown'
|
||||
COMMENT "flashing ${EXECUTABLE_NAME}.hex"
|
||||
)
|
||||
else ()
|
||||
message()
|
||||
add_custom_target(FLASH_ERASE
|
||||
COMMAND ${OPENOCD_BIN_PATH} -f interface/stlink.cfg -c 'transport select hla_swd' -f target/nrf52.cfg -c init -c halt -c 'nrf5 mass_erase' -c reset -c shutdown
|
||||
COMMENT "erasing flashing"
|
||||
|
@ -728,6 +757,5 @@ elseif(USE_OPENOCD)
|
|||
COMMAND ${OPENOCD_BIN_PATH} -c "tcl_port disabled" -c "gdb_port 3333" -c "telnet_port 4444" -f interface/stlink.cfg -c 'transport select hla_swd' -f target/nrf52.cfg -c "program \"${EXECUTABLE_NAME}.hex\"" -c reset -c shutdown
|
||||
COMMENT "flashing ${EXECUTABLE_NAME}.hex"
|
||||
)
|
||||
|
||||
endif()
|
||||
|
||||
endif ()
|
||||
endif ()
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
#include <SystemTask/SystemTask.h>
|
||||
#include <systemtask/SystemTask.h>
|
||||
#include "NotificationManager.h"
|
||||
|
||||
#include "AlertNotificationClient.h"
|
|
@ -1,7 +1,7 @@
|
|||
|
||||
#include <hal/nrf_rtc.h>
|
||||
#include "NotificationManager.h"
|
||||
#include <SystemTask/SystemTask.h>
|
||||
#include <systemtask/SystemTask.h>
|
||||
|
||||
#include "AlertNotificationService.h"
|
||||
#include <cstring>
|
|
@ -1,5 +1,5 @@
|
|||
#include "BatteryInformationService.h"
|
||||
#include "../Battery/BatteryController.h"
|
||||
#include "components/battery/BatteryController.h"
|
||||
|
||||
using namespace Pinetime::Controllers;
|
||||
|
|
@ -1,7 +1,8 @@
|
|||
#pragma once
|
||||
#include <cstdint>
|
||||
#include <array>
|
||||
#include <Components/DateTime/DateTimeController.h>
|
||||
|
||||
#include "components/datetime/DateTimeController.h"
|
||||
#include <host/ble_gap.h>
|
||||
|
||||
namespace Pinetime {
|
|
@ -1,7 +1,8 @@
|
|||
#pragma once
|
||||
#include <cstdint>
|
||||
#include <array>
|
||||
#include <Components/DateTime/DateTimeController.h>
|
||||
|
||||
#include "components/datetime/DateTimeController.h"
|
||||
#include <host/ble_gap.h>
|
||||
|
||||
namespace Pinetime {
|
|
@ -1,6 +1,7 @@
|
|||
#include <Components/Ble/BleController.h>
|
||||
#include <SystemTask/SystemTask.h>
|
||||
#include <cstring>
|
||||
|
||||
#include "components/ble/BleController.h"
|
||||
#include "systemtask/SystemTask.h"
|
||||
#include "DfuService.h"
|
||||
|
||||
using namespace Pinetime::Controllers;
|
|
@ -1,5 +1,5 @@
|
|||
#include <systemtask/SystemTask.h>
|
||||
#include "ImmediateAlertService.h"
|
||||
#include <SystemTask/SystemTask.h>
|
||||
#include "AlertNotificationService.h"
|
||||
|
||||
using namespace Pinetime::Controllers;
|
|
@ -1,4 +1,4 @@
|
|||
#include <SystemTask/SystemTask.h>
|
||||
#include <systemtask/SystemTask.h>
|
||||
#include "MusicService.h"
|
||||
|
||||
int MSCallback(uint16_t conn_handle, uint16_t attr_handle, struct ble_gatt_access_ctxt *ctxt, void *arg) {
|
|
@ -1,8 +1,8 @@
|
|||
|
||||
#include <Components/DateTime/DateTimeController.h>
|
||||
#include "components/datetime/DateTimeController.h"
|
||||
|
||||
#include <SystemTask/SystemTask.h>
|
||||
#include <Components/Ble/NotificationManager.h>
|
||||
#include <systemtask/SystemTask.h>
|
||||
#include "components/ble/NotificationManager.h"
|
||||
#include <hal/nrf_rtc.h>
|
||||
|
||||
#include "NimbleController.h"
|
|
@ -1,6 +1,7 @@
|
|||
#pragma once
|
||||
|
||||
#include <cstdint>
|
||||
|
||||
#include "AlertNotificationService.h"
|
||||
#include "AlertNotificationClient.h"
|
||||
#include "DeviceInformationService.h"
|
|
@ -1,24 +1,25 @@
|
|||
#include <string>
|
||||
|
||||
#include "DisplayApp.h"
|
||||
#include <FreeRTOS.h>
|
||||
#include <task.h>
|
||||
#include <libraries/log/nrf_log.h>
|
||||
#include <nrf_font.h>
|
||||
#include <queue.h>
|
||||
#include <Components/DateTime/DateTimeController.h>
|
||||
#include "components/datetime/DateTimeController.h"
|
||||
#include <drivers/Cst816s.h>
|
||||
#include <string>
|
||||
#include <DisplayApp/Screens/Tile.h>
|
||||
#include <DisplayApp/Screens/Meter.h>
|
||||
#include <DisplayApp/Screens/Gauge.h>
|
||||
#include <DisplayApp/Screens/Brightness.h>
|
||||
#include <DisplayApp/Screens/SystemInfo.h>
|
||||
#include <DisplayApp/Screens/Music.h>
|
||||
#include <Components/Ble/NotificationManager.h>
|
||||
#include <DisplayApp/Screens/FirmwareUpdate.h>
|
||||
#include <DisplayApp/Screens/ApplicationList.h>
|
||||
#include <DisplayApp/Screens/FirmwareValidation.h>
|
||||
#include <DisplayApp/Screens/InfiniPaint.h>
|
||||
#include "../SystemTask/SystemTask.h"
|
||||
#include "displayapp/screens/Tile.h"
|
||||
#include "displayapp/screens/Meter.h"
|
||||
#include "displayapp/screens/Gauge.h"
|
||||
#include "displayapp/screens/Brightness.h"
|
||||
#include "displayapp/screens/SystemInfo.h"
|
||||
#include "displayapp/screens/Music.h"
|
||||
#include "components/ble/NotificationManager.h"
|
||||
#include "displayapp/screens/FirmwareUpdate.h"
|
||||
#include "displayapp/screens/ApplicationList.h"
|
||||
#include "displayapp/screens/FirmwareValidation.h"
|
||||
#include "displayapp/screens/InfiniPaint.h"
|
||||
#include "systemtask/SystemTask.h"
|
||||
|
||||
using namespace Pinetime::Applications;
|
||||
|
||||
|
@ -43,13 +44,13 @@ DisplayApp::DisplayApp(Drivers::St7789 &lcd, Components::LittleVgl &lvgl, Driver
|
|||
}
|
||||
|
||||
void DisplayApp::Start() {
|
||||
if (pdPASS != xTaskCreate(DisplayApp::Process, "DisplayApp", 512, this, 0, &taskHandle))
|
||||
if (pdPASS != xTaskCreate(DisplayApp::Process, "displayapp", 512, this, 0, &taskHandle))
|
||||
APP_ERROR_HANDLER(NRF_ERROR_NO_MEM);
|
||||
}
|
||||
|
||||
void DisplayApp::Process(void *instance) {
|
||||
auto *app = static_cast<DisplayApp *>(instance);
|
||||
NRF_LOG_INFO("DisplayApp task started!");
|
||||
NRF_LOG_INFO("displayapp task started!");
|
||||
app->InitHw();
|
||||
|
||||
// Send a dummy notification to unlock the lvgl display driver for the first iteration
|
||||
|
@ -148,7 +149,7 @@ void DisplayApp::Refresh() {
|
|||
}
|
||||
}
|
||||
|
||||
// lvgl.SetFullRefresh(Components::LittleVgl::FullRefreshDirections::Down);
|
||||
// lvgl.SetFullRefresh(components::LittleVgl::FullRefreshDirections::Down);
|
||||
// currentScreen.reset(nullptr);
|
||||
// if(toggle) {
|
||||
// currentScreen.reset(new Screens::Tile(this));
|
|
@ -3,21 +3,21 @@
|
|||
#include <task.h>
|
||||
#include <drivers/St7789.h>
|
||||
#include <drivers/SpiMaster.h>
|
||||
#include <Components/Gfx/Gfx.h>
|
||||
#include <bits/unique_ptr.h>
|
||||
#include <queue.h>
|
||||
#include <Components/Battery/BatteryController.h>
|
||||
#include <Components/Brightness/BrightnessController.h>
|
||||
#include <Components/Ble/BleController.h>
|
||||
#include <Components/DateTime/DateTimeController.h>
|
||||
#include "../drivers/Cst816s.h"
|
||||
#include "components/gfx/Gfx.h"
|
||||
#include "components/battery/BatteryController.h"
|
||||
#include "components/brightness/BrightnessController.h"
|
||||
#include "components/ble/BleController.h"
|
||||
#include "components/datetime/DateTimeController.h"
|
||||
#include "components/ble/NotificationManager.h"
|
||||
#include "components/firmwarevalidator/FirmwareValidator.h"
|
||||
#include "drivers/Cst816s.h"
|
||||
#include "LittleVgl.h"
|
||||
#include <date/date.h>
|
||||
#include <DisplayApp/Screens/Clock.h>
|
||||
#include "displayapp/screens/Clock.h"
|
||||
#include "displayapp/screens/Modal.h"
|
||||
#include <drivers/Watchdog.h>
|
||||
#include <DisplayApp/Screens/Modal.h>
|
||||
#include <Components/Ble/NotificationManager.h>
|
||||
#include <Components/FirmwareValidator/FirmwareValidator.h>
|
||||
#include "TouchEvents.h"
|
||||
#include "Apps.h"
|
||||
|
Before Width: | Height: | Size: 1.5 KiB After Width: | Height: | Size: 1.5 KiB |
Before Width: | Height: | Size: 1.8 KiB After Width: | Height: | Size: 1.8 KiB |
Before Width: | Height: | Size: 1.5 KiB After Width: | Height: | Size: 1.5 KiB |
Before Width: | Height: | Size: 1.5 KiB After Width: | Height: | Size: 1.5 KiB |
Before Width: | Height: | Size: 1.5 KiB After Width: | Height: | Size: 1.5 KiB |
Before Width: | Height: | Size: 1.5 KiB After Width: | Height: | Size: 1.5 KiB |
Before Width: | Height: | Size: 1.5 KiB After Width: | Height: | Size: 1.5 KiB |
Before Width: | Height: | Size: 1.5 KiB After Width: | Height: | Size: 1.5 KiB |
Before Width: | Height: | Size: 1.5 KiB After Width: | Height: | Size: 1.5 KiB |
Before Width: | Height: | Size: 1.5 KiB After Width: | Height: | Size: 1.5 KiB |
Before Width: | Height: | Size: 1.5 KiB After Width: | Height: | Size: 1.5 KiB |
Before Width: | Height: | Size: 2.1 KiB After Width: | Height: | Size: 2.1 KiB |
Before Width: | Height: | Size: 1.9 KiB After Width: | Height: | Size: 1.9 KiB |
Before Width: | Height: | Size: 1.9 KiB After Width: | Height: | Size: 1.9 KiB |
Before Width: | Height: | Size: 1.9 KiB After Width: | Height: | Size: 1.9 KiB |
Before Width: | Height: | Size: 2.0 KiB After Width: | Height: | Size: 2.0 KiB |
Before Width: | Height: | Size: 1.9 KiB After Width: | Height: | Size: 1.9 KiB |
Before Width: | Height: | Size: 2.0 KiB After Width: | Height: | Size: 2.0 KiB |
Before Width: | Height: | Size: 2.0 KiB After Width: | Height: | Size: 2.0 KiB |
Before Width: | Height: | Size: 2.0 KiB After Width: | Height: | Size: 2.0 KiB |
Before Width: | Height: | Size: 2.0 KiB After Width: | Height: | Size: 2.0 KiB |
Before Width: | Height: | Size: 2.1 KiB After Width: | Height: | Size: 2.1 KiB |
Before Width: | Height: | Size: 1.9 KiB After Width: | Height: | Size: 1.9 KiB |
Before Width: | Height: | Size: 2.2 KiB After Width: | Height: | Size: 2.2 KiB |
Before Width: | Height: | Size: 2.4 KiB After Width: | Height: | Size: 2.4 KiB |