CCF_100/InfiniTime
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Convert Spi and GFX to C++.

Browse Source
This commit is contained in:
JF
2019-12-07 17:11:50 +01:00
parent 0db16bd827
commit 6fbb6c8f70
13 changed files with 308 additions and 564 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/main.cpp
View File

@@ -2,16 +2,11 @@
#include <task.h>
#include <libraries/log/nrf_log.h>
#include <BlinkApp/BlinkApp.h>
#include <boards.h>
#include <libraries/bsp/bsp.h>
#include <legacy/nrf_drv_clock.h>
#include <libraries/timer/app_timer.h>
#include <libraries/gpiote/app_gpiote.h>
#include <libraries/gfx/nrf_lcd.h>
#include <drivers/st7789.h>
#include <DisplayApp/DisplayApp.h>
#include "nrf_gfx.h"
#if NRF_LOG_ENABLED
#include "Logging/NrfLogger.h"
@@ -24,7 +19,6 @@ Pinetime::Logging::DummyLogger logger;
Pinetime::Applications::BlinkApp blinkApp;
Pinetime::Applications::DisplayApp displayApp;
TaskHandle_t systemThread;
//Pinetime::Drivers::st7789 lcd;
extern "C" {
void vApplicationIdleHook() {
@@ -48,26 +42,10 @@ static void bsp_event_handler(bsp_event_t event)
}
}
void SystemTask(void *) {
APP_GPIOTE_INIT(2);
app_timer_init();
nrf_gpio_cfg_output(14);
nrf_gpio_cfg_output(22);
nrf_gpio_cfg_output(23);
nrf_gpio_pin_clear(14);
nrf_gpio_pin_clear(22);
nrf_gpio_pin_clear(23);
// lcd.Init();
// lcd.FillRectangle(0,0,240,240,0xffaa);
// lcd.FillRectangle(10,10,50,50,0x011bb);
//
// lcd.FillRectangle(120,120,120,120,0x1212);
blinkApp.Start();
displayApp.Start();
@@ -76,8 +54,6 @@ void SystemTask(void *) {
}
}
int main(void) {
logger.Init();
nrf_drv_clock_init();