From 6eb4c7abfe4804382b8e87157da73a44d50374cb Mon Sep 17 00:00:00 2001
From: schneider <schneider@blinkenlichts.net>
Date: Fri, 31 Jan 2020 17:41:49 +0100
Subject: [PATCH] fix(mpconfig): Remove hard coded value for interrupt numbers
---
lib/micropython/gen-qstr.sh | 5 ++---
pycardium/meson.build | 2 +-
pycardium/mpconfigport.h | 4 +---
3 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/lib/micropython/gen-qstr.sh b/lib/micropython/gen-qstr.sh
index 78ecf8513..a22683352 100755
--- a/lib/micropython/gen-qstr.sh
+++ b/lib/micropython/gen-qstr.sh
@@ -11,9 +11,8 @@ shift 5
OUTPUT_DIR="$(dirname "$OUTPUT")"
-
# call gcc -E to generate qstr.i.last
-gcc -E -DNO_QSTR -I"$SOURCE_DIR/micropython" -I"$PROJECT_SRC" -I"$OUTPUT_DIR" "$@" >"$OUTPUT_DIR/qstr.i.last"
+gcc -E -DNO_QSTR -I"$SOURCE_DIR/micropython" -I"$PROJECT_SRC" -I"$PROJECT_SRC/../epicardium" -I"$OUTPUT_DIR" "$@" >"$OUTPUT_DIR/qstr.i.last"
# Remove previous artifacts
rm -rf "$OUTPUT_DIR/qstr"
@@ -30,7 +29,7 @@ rm -rf "$OUTPUT_DIR/qstr"
# the official make file. Seriously.
cat "$SOURCE_DIR/micropython/py/qstrdefs.h" "$CUSTOM_QSTR" "$OUTPUT_DIR/qstrdefs.collected.h" \
| sed 's/^Q(.*)/"&"/' \
- | gcc -E -DNO_QSTR -I"$SOURCE_DIR/micropython" -I"$PROJECT_SRC" -I"$OUTPUT_DIR" - \
+ | gcc -E -DNO_QSTR -I"$SOURCE_DIR/micropython" -I"$PROJECT_SRC" -I"$PROJECT_SRC/../epicardium" -I"$OUTPUT_DIR" - \
| sed 's/^\"\(Q(.*)\)\"/\1/' \
>"$OUTPUT_DIR/qstrdefs.preprocessed.h"
diff --git a/pycardium/meson.build b/pycardium/meson.build
index aa637280a..3007f7b0d 100644
--- a/pycardium/meson.build
+++ b/pycardium/meson.build
@@ -79,7 +79,7 @@ upy = static_library(
micropython_additional_sources,
micropython_extmod_sources,
mp_headers,
- include_directories: micropython_includes,
+ include_directories: [micropython_includes, include_directories('../epicardium')],
c_args: '-w',
)
diff --git a/pycardium/mpconfigport.h b/pycardium/mpconfigport.h
index 359bf799e..831b8360f 100644
--- a/pycardium/mpconfigport.h
+++ b/pycardium/mpconfigport.h
@@ -1,6 +1,4 @@
-// TODO: we need this define, but the header is not found...
-//#include "epicardium/epicardium.h"
-#define EPIC_INT_NUM 9
+#include "epicardium.h"
/* Hardware Name */
#define MICROPY_HW_BOARD_NAME "card10"
--
GitLab