Utilize hekate's BDK for hekate main and Nyx

2020-06-14 16:45:45 +03:00
parent 185526d134
commit 6e256d29c7
186 changed files with 1138 additions and 1016 deletions
--- a/bdk/libs/compr/blz.h
+++ b/bdk/libs/compr/blz.h
@@ -17,7 +17,7 @@
 #ifndef _BLZ_H_
 #define _BLZ_H_

-#include "../../utils/types.h"
+#include <utils/types.h>

 typedef struct _blz_footer
 {
--- a/bdk/libs/fatfs/diskio.h
+++ b/bdk/libs/fatfs/diskio.h
@@ -9,7 +9,7 @@
 extern "C" {
 #endif

-#include "../../utils/types.h"
+#include <utils/types.h>

 /* Status of Disk Functions */
 typedef BYTE	DSTATUS;
--- a/bdk/libs/fatfs/ff.c
+++ b/bdk/libs/fatfs/ff.c
@@ -38,7 +38,7 @@

 #include "ff.h"			/* Declarations of FatFs API */
 #include "diskio.h"		/* Declarations of device I/O functions */
-#include "../../gfx/gfx.h"
+#include <gfx_utils.h>

 #define EFSPRINTF(text, ...) print_error(); gfx_printf("%k"text"%k\n", 0xFFFFFF00, 0xFFFFFFFF);
 //#define EFSPRINTF(...)
--- a/bdk/libs/fatfs/ff.h
+++ b/bdk/libs/fatfs/ff.h
@@ -26,8 +26,8 @@
 extern "C" {
 #endif

-#include "../../utils/types.h"	/* Basic integer types */
-#include "ffconf.h"		/* FatFs configuration options */
+#include <utils/types.h>	/* Basic integer types */
+#include <fatfs_cfg.h>	/* FatFs configuration options */

 #if FF_DEFINED != FFCONF_DEF
 #error Wrong configuration file (ffconf.h).
--- a/bdk/libs/lv_conf.h
+++ b/bdk/libs/lv_conf.h
@@ -17,8 +17,8 @@
 #ifndef LV_CONF_H
 #define LV_CONF_H

-#include "../utils/types.h"
-#include "../../../common/memory_map.h"
+#include <utils/types.h>
+#include <memory_map.h>
 /*===================
   Dynamic memory
 *===================*/
@@ -32,7 +32,7 @@
 #  define LV_MEM_ADR          NYX_LV_MEM_ADR /*Set an address for memory pool instead of allocation it as an array. Can be in external SRAM too.*/
 #  define LV_MEM_AUTO_DEFRAG  1              /*Automatically defrag on free*/
 #else       /*LV_MEM_CUSTOM*/
-#  define LV_MEM_CUSTOM_INCLUDE "../../../mem/heap.h"   /*Header for the dynamic memory function*/
+#  define LV_MEM_CUSTOM_INCLUDE <mem/heap.h> /*Header for the dynamic memory function*/
 #  define LV_MEM_CUSTOM_ALLOC   malloc       /*Wrapper to malloc*/
 #  define LV_MEM_CUSTOM_FREE    free         /*Wrapper to free*/
 #endif     /*LV_MEM_CUSTOM*/
@@ -149,7 +149,7 @@
 /*HAL settings*/
 #define LV_TICK_CUSTOM               1                       /*1: use a custom tick source (removing the need to manually update the tick with `lv_tick_inc`) */
 #if LV_TICK_CUSTOM == 1
-#define LV_TICK_CUSTOM_INCLUDE       "../../../utils/util.h" /*Header for the sys time function*/
+#define LV_TICK_CUSTOM_INCLUDE       <utils/util.h>          /*Header for the sys time function*/
 #define LV_TICK_CUSTOM_SYS_TIME_EXPR (get_tmr_ms())          /*Expression evaluating to current systime in ms*/
 #endif     /*LV_TICK_CUSTOM*/

--- a/bdk/libs/lvgl/lv_fonts/hekate_symbol_120.c
+++ b/bdk/libs/lvgl/lv_fonts/hekate_symbol_120.c
@@ -16,7 +16,7 @@

 #include "../lv_misc/lv_font.h"

-#include "../../../../../common/memory_map.h"
+#include <memory_map.h>

 #if USE_HEKATE_SYMBOL_120 != 0	/*Can be enabled in lv_conf.h*/

--- a/bdk/libs/lvgl/lv_fonts/hekate_symbol_20.c
+++ b/bdk/libs/lvgl/lv_fonts/hekate_symbol_20.c
@@ -16,7 +16,7 @@

 #include "../lv_misc/lv_font.h"

-#include "../../../../../common/memory_map.h"
+#include <memory_map.h>

 #if USE_HEKATE_SYMBOL_20 != 0	/*Can be enabled in lv_conf.h*/

--- a/bdk/libs/lvgl/lv_fonts/hekate_symbol_30.c
+++ b/bdk/libs/lvgl/lv_fonts/hekate_symbol_30.c
@@ -16,7 +16,7 @@

 #include "../lv_misc/lv_font.h"

-#include "../../../../../common/memory_map.h"
+#include <memory_map.h>

 #if USE_HEKATE_SYMBOL_30 != 0	/*Can be enabled in lv_conf.h*/

--- a/bdk/libs/lvgl/lv_fonts/interui_20.c
+++ b/bdk/libs/lvgl/lv_fonts/interui_20.c
@@ -16,7 +16,7 @@

 #include "../lv_misc/lv_font.h"

-#include "../../../../../common/memory_map.h"
+#include <memory_map.h>

 #if USE_INTERUI_20 != 0	/*Can be enabled in lv_conf.h*/

--- a/bdk/libs/lvgl/lv_fonts/interui_30.c
+++ b/bdk/libs/lvgl/lv_fonts/interui_30.c
@@ -16,7 +16,7 @@

 #include "../lv_misc/lv_font.h"

-#include "../../../../../common/memory_map.h"
+#include <memory_map.h>

 #if USE_INTERUI_30 != 0	/*Can be enabled in lv_conf.h*/

--- a/bdk/libs/lvgl/lv_fonts/ubuntu_mono.c
+++ b/bdk/libs/lvgl/lv_fonts/ubuntu_mono.c
@@ -16,7 +16,7 @@

 #include "../lv_misc/lv_font.h"

-#include "../../../../../common/memory_map.h"
+#include <memory_map.h>

 #if USE_UBUNTU_MONO != 0	/*Can be enabled in lv_conf.h*/

--- a/bdk/libs/lvgl/lv_hal/lv_hal_indev.h
+++ b/bdk/libs/lvgl/lv_hal/lv_hal_indev.h
@@ -17,7 +17,7 @@ extern "C" {
 *********************/
 #include <stdint.h>
 #include "lv_hal.h"
-#include "../../../utils/types.h"
+#include <utils/types.h>
 #include "../lv_misc/lv_area.h"
 #include "../lv_core/lv_obj.h"

--- a/bdk/libs/lvgl/lv_misc/lv_area.h
+++ b/bdk/libs/lvgl/lv_misc/lv_area.h
@@ -15,7 +15,7 @@ extern "C" {
 *      INCLUDES
 *********************/
 #include <string.h>
-#include "../../../utils/types.h"
+#include <utils/types.h>

 /*********************
 *      DEFINES
--- a/bdk/libs/lvgl/lv_misc/lv_circ.h
+++ b/bdk/libs/lvgl/lv_misc/lv_circ.h
@@ -16,7 +16,7 @@ extern "C" {
 *********************/
 #include <stddef.h>
 #include "lv_area.h"
-#include "../../../utils/types.h"
+#include <utils/types.h>

 /*********************
 *      DEFINES
--- a/bdk/libs/lvgl/lv_misc/lv_log.c
+++ b/bdk/libs/lvgl/lv_misc/lv_log.c
@@ -11,9 +11,9 @@

 #if LV_LOG_PRINTF
 #include <string.h>
-#include "../../../mem/heap.h"
-#include "../../../soc/uart.h"
-#include "../../../utils/sprintf.h"
+#include <mem/heap.h>
+#include <soc/uart.h>
+#include <utils/sprintf.h>
 #endif
 /*********************
 *      DEFINES