From 55991532396e82dbf170702d44dc4c9bc33ea79d Mon Sep 17 00:00:00 2001
From: Rahix <rahix@rahix.de>
Date: Thu, 25 Jul 2019 17:47:54 +0200
Subject: [PATCH] chore(pycardium): Reorder includes
Signed-off-by: Rahix <rahix@rahix.de>
---
pycardium/main.c | 9 +++++----
pycardium/modules/interrupt.c | 10 ++++++----
pycardium/modules/leds.c | 4 ++--
pycardium/modules/light_sensor.c | 5 +++--
pycardium/modules/sys_display.c | 5 +++--
pycardium/modules/utime.c | 6 +++---
pycardium/modules/vibra.c | 5 +++--
pycardium/mphalport.c | 20 +++++++++++---------
8 files changed, 36 insertions(+), 28 deletions(-)
diff --git a/pycardium/main.c b/pycardium/main.c
index da08475b8..2d16dbb7b 100644
--- a/pycardium/main.c
+++ b/pycardium/main.c
@@ -1,10 +1,11 @@
-#include "py/runtime.h"
-#include "py/gc.h"
+#include "max32665.h"
+
#include "lib/utils/pyexec.h"
+#include "py/gc.h"
+#include "py/runtime.h"
#include "py/stackctrl.h"
-#include <stdio.h>
-#include "max32665.h"
+#include <stdio.h>
/* Defined in linker script */
extern void *__StackTop, *__StackLimit;
diff --git a/pycardium/modules/interrupt.c b/pycardium/modules/interrupt.c
index e5bc878eb..8a1a4c282 100644
--- a/pycardium/modules/interrupt.c
+++ b/pycardium/modules/interrupt.c
@@ -1,9 +1,11 @@
+#include "mphalport.h"
+
+#include "api/common.h"
+#include "epicardium.h"
+
+#include "py/builtin.h"
#include "py/obj.h"
#include "py/runtime.h"
-#include "py/builtin.h"
-#include "epicardium.h"
-#include "api/common.h"
-#include "mphalport.h"
// TODO: these should be intialized as mp_const_none
mp_obj_t callbacks[EPIC_INT_NUM] = {
diff --git a/pycardium/modules/leds.c b/pycardium/modules/leds.c
index a1dc47e85..7428069cc 100644
--- a/pycardium/modules/leds.c
+++ b/pycardium/modules/leds.c
@@ -1,9 +1,9 @@
+#include "epicardium.h"
+
#include "py/obj.h"
#include "py/objlist.h"
#include "py/runtime.h"
-#include "epicardium.h"
-
static mp_obj_t mp_leds_set(mp_obj_t led_in, mp_obj_t color_in)
{
int led = mp_obj_get_int(led_in);
diff --git a/pycardium/modules/light_sensor.c b/pycardium/modules/light_sensor.c
index daf156106..ce8343aa7 100644
--- a/pycardium/modules/light_sensor.c
+++ b/pycardium/modules/light_sensor.c
@@ -1,7 +1,8 @@
+#include "epicardium.h"
+
+#include "py/builtin.h"
#include "py/obj.h"
#include "py/runtime.h"
-#include "py/builtin.h"
-#include "epicardium.h"
static mp_obj_t mp_light_sensor_start()
{
diff --git a/pycardium/modules/sys_display.c b/pycardium/modules/sys_display.c
index 5d57be54c..cc550be6d 100644
--- a/pycardium/modules/sys_display.c
+++ b/pycardium/modules/sys_display.c
@@ -1,9 +1,10 @@
+#include "epicardium.h"
+
#include "py/obj.h"
-#include "py/objstr.h"
#include "py/objint.h"
+#include "py/objstr.h"
#include "py/runtime.h"
-#include "epicardium.h"
#include <stdio.h>
static uint16_t rgb888_to_rgb565(uint8_t *bytes)
diff --git a/pycardium/modules/utime.c b/pycardium/modules/utime.c
index 39972df4c..856ab9e22 100644
--- a/pycardium/modules/utime.c
+++ b/pycardium/modules/utime.c
@@ -1,8 +1,8 @@
-#include "py/mpconfig.h"
-#include "extmod/utime_mphal.h"
-
#include "mxc_delay.h"
+#include "extmod/utime_mphal.h"
+#include "py/mpconfig.h"
+
static const mp_rom_map_elem_t time_module_globals_table[] = {
{ MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_utime) },
{ MP_ROM_QSTR(MP_QSTR_sleep), MP_ROM_PTR(&mp_utime_sleep_obj) },
diff --git a/pycardium/modules/vibra.c b/pycardium/modules/vibra.c
index 9d753c0da..8e360a0d0 100644
--- a/pycardium/modules/vibra.c
+++ b/pycardium/modules/vibra.c
@@ -1,7 +1,8 @@
+#include "epicardium.h"
+
+#include "py/builtin.h"
#include "py/obj.h"
#include "py/runtime.h"
-#include "py/builtin.h"
-#include "epicardium.h"
static mp_obj_t mp_vibra_set(mp_obj_t state_obj)
{
diff --git a/pycardium/mphalport.c b/pycardium/mphalport.c
index bc029664b..9e0402779 100644
--- a/pycardium/mphalport.c
+++ b/pycardium/mphalport.c
@@ -1,7 +1,12 @@
-#include <stdint.h>
+#include "api/common.h"
+#include "epicardium.h"
+
+#include "max32665.h"
+#include "mxc_delay.h"
+#include "tmr.h"
+
+/* stdarg.h must be included before mpprint.h */
#include <stdarg.h>
-#include <stdio.h>
-#include <string.h>
#include "py/lexer.h"
#include "py/mpconfig.h"
@@ -11,12 +16,9 @@
#include "py/runtime.h"
#include "py/mpprint.h"
-#include "mxc_delay.h"
-#include "max32665.h"
-#include "tmr.h"
-
-#include "epicardium.h"
-#include "api/common.h"
+#include <stdint.h>
+#include <stdio.h>
+#include <string.h>
/******************************************************************************
* Serial Communication
--
GitLab