Merge branch 'rahix/leds' into 'master'

Implement leds

See merge request !7

epicardium/epicardium.h

@@ -12,4 +12,7 @@ API(API_UART_WRITE, void epic_uart_write_str(char*str, intptr_t length));
 #define API_UART_READ  0x2
 API(API_UART_READ, char epic_uart_read_chr(void));
 
+#define API_LEDS_SET  0x3
+API(API_LEDS_SET, void epic_leds_set(int led, uint8_t r, uint8_t g, uint8_t b));
+
 #endif /* _EPICARDIUM_H */

epicardium/main.c

@@ -15,6 +15,12 @@ char epic_uart_read_chr(void)
 	return UART_ReadByte(ConsoleUart);
 }
 
+void epic_leds_set(int led, uint8_t r, uint8_t g, uint8_t b)
+{
+	leds_set(led, r, g, b);
+	leds_update();
+}
+
 int main(void)
 {
 	card10_init();

pycardium/meson.build

 name = 'pycardium'
 
 modsrc = files(
+  'modules/utime.c',
+  'modules/leds.c',
 )
 
 #################################
@@ -24,7 +26,7 @@ qstr_h = custom_target(
   'qstrdefs.generated.h',
   output: 'qstrdefs.generated.h',
   input: [
-    # 'modules/qstrdefs.h',
+    'modules/qstrdefs.h',
     'mpconfigport.h',
     micropython_sources,
   ],
@@ -54,8 +56,8 @@ executable(
   mp_headers,
   include_directories: micropython_includes,
   dependencies: [max32665_startup_core1, board_card10, periphdriver, api_caller],
-  link_whole: [max32665_startup_core1_lib, board_card10_lib],
   link_with: upy,
+  link_whole: [max32665_startup_core1_lib, board_card10_lib],
   link_args: [
     '-Wl,-Map=' + meson.current_build_dir() + '/' + name + '.map',
   ],

pycardium/modules/leds.c

+#include "py/obj.h"
+#include "epicardium.h"
+
+static mp_obj_t mp_leds_set(size_t n_args, const mp_obj_t *args)
+{
+	int led   = mp_obj_get_int(args[0]);
+	uint8_t r = mp_obj_get_int(args[1]);
+	uint8_t g = mp_obj_get_int(args[2]);
+	uint8_t b = mp_obj_get_int(args[3]);
+
+	epic_leds_set(led, r, g, b);
+
+	return mp_const_none;
+}
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(leds_set_obj, 4, 4, mp_leds_set);
+
+static const mp_rom_map_elem_t leds_module_globals_table[] = {
+	{MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_leds)},
+	{MP_ROM_QSTR(MP_QSTR_set), MP_ROM_PTR(&leds_set_obj)},
+};
+static MP_DEFINE_CONST_DICT(leds_module_globals, leds_module_globals_table);
+
+const mp_obj_module_t leds_module = {
+	.base = { &mp_type_module },
+	.globals = (mp_obj_dict_t*)&leds_module_globals,
+};
+
+/* Register the module to make it available in Python */
+MP_REGISTER_MODULE(MP_QSTR_leds, leds_module, MODULE_LEDS_ENABLED);

pycardium/modules/qstrdefs.h

+#include "py/mpconfig.h"
+
+/* leds */
+Q(leds)
+
+/* utime */
+Q(utime)
+Q(sleep)
+Q(sleep_ms)
+Q(sleep_us)
+Q(ticks_ms)
+Q(ticks_us)
+Q(ticks_cpu)
+Q(ticks_add)
+Q(ticks_diff)

pycardium/modules/utime.c

+#include "py/mpconfig.h"
+#include "extmod/utime_mphal.h"
+
+#include "mxc_delay.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)},
+	{MP_ROM_QSTR(MP_QSTR_sleep_ms), MP_ROM_PTR(&mp_utime_sleep_ms_obj)},
+	{MP_ROM_QSTR(MP_QSTR_sleep_us), MP_ROM_PTR(&mp_utime_sleep_us_obj)},
+#if 0
+	/* TODO: Implement those */
+	{MP_ROM_QSTR(MP_QSTR_ticks_ms), MP_ROM_PTR(&mp_utime_ticks_ms_obj)},
+	{MP_ROM_QSTR(MP_QSTR_ticks_us), MP_ROM_PTR(&mp_utime_ticks_us_obj)},
+	{MP_ROM_QSTR(MP_QSTR_ticks_cpu), MP_ROM_PTR(&mp_utime_ticks_cpu_obj)},
+	{MP_ROM_QSTR(MP_QSTR_ticks_add), MP_ROM_PTR(&mp_utime_ticks_add_obj)},
+	{MP_ROM_QSTR(MP_QSTR_ticks_diff), MP_ROM_PTR(&mp_utime_ticks_diff_obj)},
+#endif
+};
+static MP_DEFINE_CONST_DICT(time_module_globals, time_module_globals_table);
+
+const mp_obj_module_t mp_module_utime = {
+	.base = { &mp_type_module },
+	.globals = (mp_obj_dict_t*)&time_module_globals,
+};
+
+/* Register the module to make it available in Python */
+MP_REGISTER_MODULE(MP_QSTR_utime, mp_module_utime, MODULE_UTIME_ENABLED);

pycardium/mpconfigport.h

@@ -17,6 +17,11 @@
 #define MICROPY_LONGINT_IMPL                (MICROPY_LONGINT_IMPL_LONGLONG)
 #define MICROPY_PY_BUILTINS_HELP            (1)
 #define MICROPY_PY_BUILTINS_HELP_MODULES    (1)
+#define MICROPY_PY_UTIME_MP_HAL             (1)
+
+/* Modules */
+#define MODULE_UTIME_ENABLED                (1)
+#define MODULE_LEDS_ENABLED                 (1)
 
 /*
  * This port is intended to be 32-bit, but unfortunately, int32_t for

pycardium/mphalport.c

@@ -24,6 +24,20 @@ void mp_hal_stdout_tx_strn(const char *str, mp_uint_t len)
 	epic_uart_write_str(str, len);
 }
 
+/******************************************************************************
+ * Time & Delay
+ */
+
+void mp_hal_delay_ms(mp_uint_t ms)
+{
+	mxc_delay(ms * 1000);
+}
+
+void mp_hal_delay_us(mp_uint_t us)
+{
+	mxc_delay(us);
+}
+
 /******************************************************************************
  * Fatal Errors
  */