From fb837a3018bf7673fb4004296fa2a07c6e0cdb41 Mon Sep 17 00:00:00 2001 From: Penguin Date: Thu, 21 May 2020 23:48:46 -0500 Subject: [PATCH] added lvgl --- .gitmodules | 3 +++ .../devices/display/p_ssd1963.c | 3 +++ .../devices/display/p_ssd1963.h | 7 +++++++ .../project_oracle_test_prj/main.c | 5 +++-- .../project_oracle_test_prj/oracle.c | 5 +++++ .../project_oracle_test_prj/oracle.h | 1 + .../project_oracle_test_prj.cproj | 13 ++++++------- .../project_oracle_test_prj/thirdparty/lvgl | 1 + 8 files changed, 29 insertions(+), 9 deletions(-) create mode 100644 .gitmodules create mode 160000 software/firmware/project_oracle_test_prj/project_oracle_test_prj/thirdparty/lvgl diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 00000000..e62a5de7 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "software/firmware/project_oracle_test_prj/project_oracle_test_prj/thirdparty/lvgl"] + path = software/firmware/project_oracle_test_prj/project_oracle_test_prj/thirdparty/lvgl + url = https://github.com/lvgl/lvgl.git diff --git a/software/firmware/project_oracle_test_prj/project_oracle_test_prj/devices/display/p_ssd1963.c b/software/firmware/project_oracle_test_prj/project_oracle_test_prj/devices/display/p_ssd1963.c index e69de29b..30ab3b33 100644 --- a/software/firmware/project_oracle_test_prj/project_oracle_test_prj/devices/display/p_ssd1963.c +++ b/software/firmware/project_oracle_test_prj/project_oracle_test_prj/devices/display/p_ssd1963.c @@ -0,0 +1,3 @@ +#include "p_ssd1963.h" + +void p_ssd1963_init(void); \ No newline at end of file diff --git a/software/firmware/project_oracle_test_prj/project_oracle_test_prj/devices/display/p_ssd1963.h b/software/firmware/project_oracle_test_prj/project_oracle_test_prj/devices/display/p_ssd1963.h index e69de29b..20319df1 100644 --- a/software/firmware/project_oracle_test_prj/project_oracle_test_prj/devices/display/p_ssd1963.h +++ b/software/firmware/project_oracle_test_prj/project_oracle_test_prj/devices/display/p_ssd1963.h @@ -0,0 +1,7 @@ +#ifndef _P_SSD1963_H_ +#define _P_SSD1963_H_ + + +void p_ssd1963_init(void); + +#endif \ No newline at end of file diff --git a/software/firmware/project_oracle_test_prj/project_oracle_test_prj/main.c b/software/firmware/project_oracle_test_prj/project_oracle_test_prj/main.c index 4a4fba39..56600bce 100644 --- a/software/firmware/project_oracle_test_prj/project_oracle_test_prj/main.c +++ b/software/firmware/project_oracle_test_prj/project_oracle_test_prj/main.c @@ -1,6 +1,7 @@ -#include +#include "oracle.h" + int main(void) { - proj_init(); + oracle_init(); } diff --git a/software/firmware/project_oracle_test_prj/project_oracle_test_prj/oracle.c b/software/firmware/project_oracle_test_prj/project_oracle_test_prj/oracle.c index 8525bc99..876f1274 100644 --- a/software/firmware/project_oracle_test_prj/project_oracle_test_prj/oracle.c +++ b/software/firmware/project_oracle_test_prj/project_oracle_test_prj/oracle.c @@ -19,4 +19,9 @@ void oracle_init(void) // time init // devices init +} + +void oracle_service(void) +{ + } \ No newline at end of file diff --git a/software/firmware/project_oracle_test_prj/project_oracle_test_prj/oracle.h b/software/firmware/project_oracle_test_prj/project_oracle_test_prj/oracle.h index ffd0d0d2..48616cd0 100644 --- a/software/firmware/project_oracle_test_prj/project_oracle_test_prj/oracle.h +++ b/software/firmware/project_oracle_test_prj/project_oracle_test_prj/oracle.h @@ -23,5 +23,6 @@ int p_qprint(const char* str, ...); int p_lprint(const char* str, ...); +void oracle_init(void); #endif \ No newline at end of file diff --git a/software/firmware/project_oracle_test_prj/project_oracle_test_prj/project_oracle_test_prj.cproj b/software/firmware/project_oracle_test_prj/project_oracle_test_prj/project_oracle_test_prj.cproj index 0edd5df8..dd2516d2 100644 --- a/software/firmware/project_oracle_test_prj/project_oracle_test_prj/project_oracle_test_prj.cproj +++ b/software/firmware/project_oracle_test_prj/project_oracle_test_prj/project_oracle_test_prj.cproj @@ -20,10 +20,10 @@ false true true - + 0x20000000 true - + exception_table 2 0 0 @@ -324,7 +324,6 @@ %24(PackRepoDir)\arm\CMSIS\5.4.0\CMSIS\Core\Include\ ../Config ../ - ../examples ../hal/include ../hal/utils/include ../hpl/cmcc @@ -342,6 +341,9 @@ ../hpl/tc ../hri %24(PackRepoDir)\atmel\SAME54_DFP\1.1.134\include + ../drivers + ../devices + ../devices/display Optimize (-O1) @@ -361,6 +363,7 @@ True + -Tsame54p20a_flash.ld @@ -496,9 +499,6 @@ compile - - compile - compile @@ -885,7 +885,6 @@ - diff --git a/software/firmware/project_oracle_test_prj/project_oracle_test_prj/thirdparty/lvgl b/software/firmware/project_oracle_test_prj/project_oracle_test_prj/thirdparty/lvgl new file mode 160000 index 00000000..2a78353c --- /dev/null +++ b/software/firmware/project_oracle_test_prj/project_oracle_test_prj/thirdparty/lvgl @@ -0,0 +1 @@ +Subproject commit 2a78353ca485e9d07e2aa5f5543db13e6370580a