Skip to content

Commit

Permalink
Fix rebase.
Browse files Browse the repository at this point in the history
  • Loading branch information
philmoz committed Jan 20, 2025
1 parent bc4ded5 commit 6c94744
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
1 change: 1 addition & 0 deletions radio/src/fonts/lvgl/lz4_font.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@
#include <stdio.h>
#include <stdlib.h>

#define __IRAM
#define LV_SKIP_DEFINES 1
#include "../../gui/colorlcd/lv_conf.h"
#define LV_CONF_SKIP 1
Expand Down
2 changes: 1 addition & 1 deletion radio/src/gui/colorlcd/lv_conf.h
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@
/* clang-format off */

#include <stdint.h>
#include "definitions.h"
#if !defined(LV_SKIP_DEFINES)
#include "definitions.h"
#include "hal.h"
#endif

Expand Down

0 comments on commit 6c94744

Please sign in to comment.