summaryrefslogtreecommitdiff
path: root/src/main.cpp
diff options
context:
space:
mode:
authorJF <jf@codingfield.com>2019-12-07 17:11:50 +0100
committerJF <jf@codingfield.com>2019-12-07 17:11:50 +0100
commit6fbb6c8f70b2103fd88d8d9da3ce884a283b1bfd (patch)
tree000f0851f3517b9b8a40c16d4c6bf34fd834b24c /src/main.cpp
parent0db16bd8279826878e9d2d5ba63e21c4e15c35bf (diff)
Convert Spi and GFX to C++.
Diffstat (limited to 'src/main.cpp')
-rw-r--r--src/main.cpp24
1 files changed, 0 insertions, 24 deletions
diff --git a/src/main.cpp b/src/main.cpp
index c74eb71a..b5588fab 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -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();