diff options
| author | nickshl <nicolai.shlapunov@gmail.com> | 2019-05-01 06:00:45 +0300 |
|---|---|---|
| committer | nickshl <nicolai.shlapunov@gmail.com> | 2019-05-01 06:00:45 +0300 |
| commit | f1576a7fc32bfc5882396a9ae2d1823608234203 (patch) | |
| tree | c81b3c7999ff8e0aab1b1faf9e094a785b2a3558 | |
| parent | b13da5e81f02ea4ae2d21cc6278fda67224f8984 (diff) | |
Update because of DevCore update
| -rw-r--r-- | STM32F415APP/Application/AppMain.cpp | 26 | ||||
| -rw-r--r-- | STM32F415APP/Application/ExampleMsgTask.h | 4 | ||||
| -rw-r--r-- | STM32F415APP/Application/InputTest.cpp | 2 |
3 files changed, 28 insertions, 4 deletions
diff --git a/STM32F415APP/Application/AppMain.cpp b/STM32F415APP/Application/AppMain.cpp index 6c7b0e3..8ddc892 100644 --- a/STM32F415APP/Application/AppMain.cpp +++ b/STM32F415APP/Application/AppMain.cpp @@ -19,18 +19,42 @@ // *** Includes ************************************************************
// *****************************************************************************
#include "DevCfg.h"
+// Objects
+#include "StHalSpi.h"
+#include "StHalGpio.h"
+#include "ILI9341.h"
+#include "XPT2046.h"
+// Tasks
#include "DisplayDrv.h"
#include "InputDrv.h"
+#include "SoundDrv.h"
#include "ExampleMsgTask.h"
-
+// Application
#include "Application.h"
// *****************************************************************************
+// *** Objects *************************************************************
+// *****************************************************************************
+
+// GPIOs
+static StHalGpio display_cs(LCD_CS_GPIO_Port, LCD_CS_Pin, IGpio::OUTPUT);
+static StHalGpio display_dc(LCD_DC_GPIO_Port, LCD_DC_Pin, IGpio::OUTPUT);
+static StHalGpio touch_cs(TOUCH_CS_GPIO_Port, TOUCH_CS_Pin, IGpio::OUTPUT);
+static StHalGpio touch_irq(T_IRQ_GPIO_Port, T_IRQ_Pin, IGpio::INPUT);
+// Interfaces
+static StHalSpi spi1(hspi1);
+// Other
+static ILI9341 display(320, 240, spi1, display_cs, display_dc);
+static XPT2046 touch(spi1, touch_cs, touch_irq);
+
+// *****************************************************************************
// *** Main function *******************************************************
// *****************************************************************************
extern "C" void AppMain(void)
{
// Init Display Driver Task
+ DisplayDrv::GetInstance().SetDisplayDrv(&display);
+ DisplayDrv::GetInstance().SetTouchDrv(&touch);
DisplayDrv::GetInstance().InitTask();
// Init Input Driver Task
InputDrv::GetInstance().InitTask(nullptr, &hadc2);
diff --git a/STM32F415APP/Application/ExampleMsgTask.h b/STM32F415APP/Application/ExampleMsgTask.h index 6221113..e378634 100644 --- a/STM32F415APP/Application/ExampleMsgTask.h +++ b/STM32F415APP/Application/ExampleMsgTask.h @@ -15,8 +15,8 @@ //
//******************************************************************************
-#ifndef MsgTaskTest_h
-#define MsgTaskTest_h
+#ifndef ExampleMsgTask_h
+#define ExampleMsgTask_h
// *****************************************************************************
// *** Includes ************************************************************
diff --git a/STM32F415APP/Application/InputTest.cpp b/STM32F415APP/Application/InputTest.cpp index 1576231..0f91fbb 100644 --- a/STM32F415APP/Application/InputTest.cpp +++ b/STM32F415APP/Application/InputTest.cpp @@ -126,7 +126,7 @@ Result InputTest::Loop() RtosTick::DelayTicks(50U);
// Exit by touch
- if(display_drv.IsTouch() == true)
+ if(display_drv.IsTouched() == true)
{
break;
}
|