all: Reformat C and Python source code with tools/codeformat.py.
This is run with uncrustify 0.70.1, and black 19.10b0.
diff --git a/ports/bare-arm/main.c b/ports/bare-arm/main.c
index 4183944..df66c04 100644
--- a/ports/bare-arm/main.c
+++ b/ports/bare-arm/main.c
@@ -44,11 +44,15 @@
MP_DEFINE_CONST_FUN_OBJ_KW(mp_builtin_open_obj, 1, mp_builtin_open);
void nlr_jump_fail(void *val) {
- while (1);
+ while (1) {
+ ;
+ }
}
void NORETURN __fatal_error(const char *msg) {
- while (1);
+ while (1) {
+ ;
+ }
}
#ifndef NDEBUG
@@ -71,26 +75,63 @@
int _isatty() {return 0;}
*/
-void *malloc(size_t n) {return NULL;}
-void *calloc(size_t nmemb, size_t size) {return NULL;}
-void *realloc(void *ptr, size_t size) {return NULL;}
-void free(void *p) {}
-int printf(const char *m, ...) {return 0;}
-void *memcpy(void *dest, const void *src, size_t n) {return NULL;}
-int memcmp(const void *s1, const void *s2, size_t n) {return 0;}
-void *memmove(void *dest, const void *src, size_t n) {return NULL;}
-void *memset(void *s, int c, size_t n) {return NULL;}
-int strcmp(const char *s1, const char* s2) {return 0;}
-int strncmp(const char *s1, const char* s2, size_t n) {return 0;}
-size_t strlen(const char *s) {return 0;}
-char *strcat(char *dest, const char *src) {return NULL;}
-char *strchr(const char *dest, int c) {return NULL;}
+void *malloc(size_t n) {
+ return NULL;
+}
+void *calloc(size_t nmemb, size_t size) {
+ return NULL;
+}
+void *realloc(void *ptr, size_t size) {
+ return NULL;
+}
+void free(void *p) {
+}
+int printf(const char *m, ...) {
+ return 0;
+}
+void *memcpy(void *dest, const void *src, size_t n) {
+ return NULL;
+}
+int memcmp(const void *s1, const void *s2, size_t n) {
+ return 0;
+}
+void *memmove(void *dest, const void *src, size_t n) {
+ return NULL;
+}
+void *memset(void *s, int c, size_t n) {
+ return NULL;
+}
+int strcmp(const char *s1, const char *s2) {
+ return 0;
+}
+int strncmp(const char *s1, const char *s2, size_t n) {
+ return 0;
+}
+size_t strlen(const char *s) {
+ return 0;
+}
+char *strcat(char *dest, const char *src) {
+ return NULL;
+}
+char *strchr(const char *dest, int c) {
+ return NULL;
+}
#include <stdarg.h>
-int vprintf(const char *format, va_list ap) {return 0;}
-int vsnprintf(char *str, size_t size, const char *format, va_list ap) {return 0;}
+int vprintf(const char *format, va_list ap) {
+ return 0;
+}
+int vsnprintf(char *str, size_t size, const char *format, va_list ap) {
+ return 0;
+}
#undef putchar
-int putchar(int c) {return 0;}
-int puts(const char *s) {return 0;}
+int putchar(int c) {
+ return 0;
+}
+int puts(const char *s) {
+ return 0;
+}
-void _start(void) {main(0, NULL);}
+void _start(void) {
+ main(0, NULL);
+}
diff --git a/ports/bare-arm/mpconfigport.h b/ports/bare-arm/mpconfigport.h
index 395659a..273e214 100644
--- a/ports/bare-arm/mpconfigport.h
+++ b/ports/bare-arm/mpconfigport.h
@@ -49,7 +49,7 @@
// type definitions for the specific machine
-#define MICROPY_MAKE_POINTER_CALLABLE(p) ((void*)((mp_uint_t)(p) | 1))
+#define MICROPY_MAKE_POINTER_CALLABLE(p) ((void *)((mp_uint_t)(p) | 1))
#define UINT_FMT "%lu"
#define INT_FMT "%ld"
diff --git a/ports/cc3200/boards/make-pins.py b/ports/cc3200/boards/make-pins.py
index 30db4ac..a204561 100644
--- a/ports/cc3200/boards/make-pins.py
+++ b/ports/cc3200/boards/make-pins.py
@@ -8,20 +8,22 @@
import csv
-SUPPORTED_AFS = { 'UART': ('TX', 'RX', 'RTS', 'CTS'),
- 'SPI': ('CLK', 'MOSI', 'MISO', 'CS0'),
- #'I2S': ('CLK', 'FS', 'DAT0', 'DAT1'),
- 'I2C': ('SDA', 'SCL'),
- 'TIM': ('PWM'),
- 'SD': ('CLK', 'CMD', 'DAT0'),
- 'ADC': ('CH0', 'CH1', 'CH2', 'CH3')
- }
+SUPPORTED_AFS = {
+ "UART": ("TX", "RX", "RTS", "CTS"),
+ "SPI": ("CLK", "MOSI", "MISO", "CS0"),
+ #'I2S': ('CLK', 'FS', 'DAT0', 'DAT1'),
+ "I2C": ("SDA", "SCL"),
+ "TIM": ("PWM"),
+ "SD": ("CLK", "CMD", "DAT0"),
+ "ADC": ("CH0", "CH1", "CH2", "CH3"),
+}
+
def parse_port_pin(name_str):
"""Parses a string and returns a (port, gpio_bit) tuple."""
if len(name_str) < 3:
raise ValueError("Expecting pin name to be at least 3 characters")
- if name_str[:2] != 'GP':
+ if name_str[:2] != "GP":
raise ValueError("Expecting pin name to start with GP")
if not name_str[2:].isdigit():
raise ValueError("Expecting numeric GPIO number")
@@ -32,6 +34,7 @@
class AF:
"""Holds the description of an alternate function"""
+
def __init__(self, name, idx, fn, unit, type):
self.name = name
self.idx = idx
@@ -42,11 +45,16 @@
self.type = type
def print(self):
- print (' AF({:16s}, {:4d}, {:8s}, {:4d}, {:8s}), // {}'.format(self.name, self.idx, self.fn, self.unit, self.type, self.name))
+ print(
+ " AF({:16s}, {:4d}, {:8s}, {:4d}, {:8s}), // {}".format(
+ self.name, self.idx, self.fn, self.unit, self.type, self.name
+ )
+ )
class Pin:
"""Holds the information associated with a pin."""
+
def __init__(self, name, port, gpio_bit, pin_num):
self.name = name
self.port = port
@@ -59,25 +67,37 @@
self.afs.append(af)
def print(self):
- print('// {}'.format(self.name))
+ print("// {}".format(self.name))
if len(self.afs):
- print('const pin_af_t pin_{}_af[] = {{'.format(self.name))
+ print("const pin_af_t pin_{}_af[] = {{".format(self.name))
for af in self.afs:
af.print()
- print('};')
- print('pin_obj_t pin_{:4s} = PIN({:6s}, {:1d}, {:3d}, {:2d}, pin_{}_af, {});\n'.format(
- self.name, self.name, self.port, self.gpio_bit, self.pin_num, self.name, len(self.afs)))
+ print("};")
+ print(
+ "pin_obj_t pin_{:4s} = PIN({:6s}, {:1d}, {:3d}, {:2d}, pin_{}_af, {});\n".format(
+ self.name,
+ self.name,
+ self.port,
+ self.gpio_bit,
+ self.pin_num,
+ self.name,
+ len(self.afs),
+ )
+ )
else:
- print('pin_obj_t pin_{:4s} = PIN({:6s}, {:1d}, {:3d}, {:2d}, NULL, 0);\n'.format(
- self.name, self.name, self.port, self.gpio_bit, self.pin_num))
+ print(
+ "pin_obj_t pin_{:4s} = PIN({:6s}, {:1d}, {:3d}, {:2d}, NULL, 0);\n".format(
+ self.name, self.name, self.port, self.gpio_bit, self.pin_num
+ )
+ )
def print_header(self, hdr_file):
- hdr_file.write('extern pin_obj_t pin_{:s};\n'.format(self.name))
+ hdr_file.write("extern pin_obj_t pin_{:s};\n".format(self.name))
class Pins:
def __init__(self):
- self.board_pins = [] # list of pin objects
+ self.board_pins = [] # list of pin objects
def find_pin(self, port, gpio_bit):
for pin in self.board_pins:
@@ -95,7 +115,7 @@
return pin
def parse_af_file(self, filename, pin_col, pinname_col, af_start_col):
- with open(filename, 'r') as csvfile:
+ with open(filename, "r") as csvfile:
rows = csv.reader(csvfile)
for row in rows:
try:
@@ -103,16 +123,18 @@
except:
continue
if not row[pin_col].isdigit():
- raise ValueError("Invalid pin number {:s} in row {:s}".format(row[pin_col]), row)
+ raise ValueError(
+ "Invalid pin number {:s} in row {:s}".format(row[pin_col]), row
+ )
# Pin numbers must start from 0 when used with the TI API
- pin_num = int(row[pin_col]) - 1;
+ pin_num = int(row[pin_col]) - 1
pin = Pin(row[pinname_col], port_num, gpio_bit, pin_num)
self.board_pins.append(pin)
af_idx = 0
for af in row[af_start_col:]:
- af_splitted = af.split('_')
- fn_name = af_splitted[0].rstrip('0123456789')
- if fn_name in SUPPORTED_AFS:
+ af_splitted = af.split("_")
+ fn_name = af_splitted[0].rstrip("0123456789")
+ if fn_name in SUPPORTED_AFS:
type_name = af_splitted[1]
if type_name in SUPPORTED_AFS[fn_name]:
unit_idx = af_splitted[0][-1]
@@ -120,7 +142,7 @@
af_idx += 1
def parse_board_file(self, filename, cpu_pin_col):
- with open(filename, 'r') as csvfile:
+ with open(filename, "r") as csvfile:
rows = csv.reader(csvfile)
for row in rows:
# Pin numbers must start from 0 when used with the TI API
@@ -132,29 +154,39 @@
pin.board_pin = True
def print_named(self, label, pins):
- print('')
- print('STATIC const mp_rom_map_elem_t pin_{:s}_pins_locals_dict_table[] = {{'.format(label))
+ print("")
+ print(
+ "STATIC const mp_rom_map_elem_t pin_{:s}_pins_locals_dict_table[] = {{".format(label)
+ )
for pin in pins:
if pin.board_pin:
- print(' {{ MP_ROM_QSTR(MP_QSTR_{:6s}), MP_ROM_PTR(&pin_{:6s}) }},'.format(pin.name, pin.name))
- print('};')
- print('MP_DEFINE_CONST_DICT(pin_{:s}_pins_locals_dict, pin_{:s}_pins_locals_dict_table);'.format(label, label));
+ print(
+ " {{ MP_ROM_QSTR(MP_QSTR_{:6s}), MP_ROM_PTR(&pin_{:6s}) }},".format(
+ pin.name, pin.name
+ )
+ )
+ print("};")
+ print(
+ "MP_DEFINE_CONST_DICT(pin_{:s}_pins_locals_dict, pin_{:s}_pins_locals_dict_table);".format(
+ label, label
+ )
+ )
def print(self):
for pin in self.board_pins:
if pin.board_pin:
pin.print()
- self.print_named('board', self.board_pins)
- print('')
+ self.print_named("board", self.board_pins)
+ print("")
def print_header(self, hdr_filename):
- with open(hdr_filename, 'wt') as hdr_file:
+ with open(hdr_filename, "wt") as hdr_file:
for pin in self.board_pins:
if pin.board_pin:
pin.print_header(hdr_file)
def print_qstr(self, qstr_filename):
- with open(qstr_filename, 'wt') as qstr_file:
+ with open(qstr_filename, "wt") as qstr_file:
pin_qstr_set = set([])
af_qstr_set = set([])
for pin in self.board_pins:
@@ -162,67 +194,69 @@
pin_qstr_set |= set([pin.name])
for af in pin.afs:
af_qstr_set |= set([af.name])
- print('// Board pins', file=qstr_file)
+ print("// Board pins", file=qstr_file)
for qstr in sorted(pin_qstr_set):
- print('Q({})'.format(qstr), file=qstr_file)
- print('\n// Pin AFs', file=qstr_file)
+ print("Q({})".format(qstr), file=qstr_file)
+ print("\n// Pin AFs", file=qstr_file)
for qstr in sorted(af_qstr_set):
- print('Q({})'.format(qstr), file=qstr_file)
+ print("Q({})".format(qstr), file=qstr_file)
def main():
parser = argparse.ArgumentParser(
prog="make-pins.py",
usage="%(prog)s [options] [command]",
- description="Generate board specific pin file"
+ description="Generate board specific pin file",
)
parser.add_argument(
- "-a", "--af",
+ "-a",
+ "--af",
dest="af_filename",
help="Specifies the alternate function file for the chip",
- default="cc3200_af.csv"
+ default="cc3200_af.csv",
)
parser.add_argument(
- "-b", "--board",
- dest="board_filename",
- help="Specifies the board file",
+ "-b", "--board", dest="board_filename", help="Specifies the board file",
)
parser.add_argument(
- "-p", "--prefix",
+ "-p",
+ "--prefix",
dest="prefix_filename",
help="Specifies beginning portion of generated pins file",
- default="cc3200_prefix.c"
+ default="cc3200_prefix.c",
)
parser.add_argument(
- "-q", "--qstr",
+ "-q",
+ "--qstr",
dest="qstr_filename",
help="Specifies name of generated qstr header file",
- default="build/pins_qstr.h"
+ default="build/pins_qstr.h",
)
parser.add_argument(
- "-r", "--hdr",
+ "-r",
+ "--hdr",
dest="hdr_filename",
help="Specifies name of generated pin header file",
- default="build/pins.h"
+ default="build/pins.h",
)
args = parser.parse_args(sys.argv[1:])
pins = Pins()
- print('// This file was automatically generated by make-pins.py')
- print('//')
+ print("// This file was automatically generated by make-pins.py")
+ print("//")
if args.af_filename:
- print('// --af {:s}'.format(args.af_filename))
+ print("// --af {:s}".format(args.af_filename))
pins.parse_af_file(args.af_filename, 0, 1, 3)
if args.board_filename:
- print('// --board {:s}'.format(args.board_filename))
+ print("// --board {:s}".format(args.board_filename))
pins.parse_board_file(args.board_filename, 1)
if args.prefix_filename:
- print('// --prefix {:s}'.format(args.prefix_filename))
- print('')
- with open(args.prefix_filename, 'r') as prefix_file:
+ print("// --prefix {:s}".format(args.prefix_filename))
+ print("")
+ with open(args.prefix_filename, "r") as prefix_file:
print(prefix_file.read())
pins.print()
pins.print_qstr(args.qstr_filename)
diff --git a/ports/cc3200/fatfs_port.c b/ports/cc3200/fatfs_port.c
index 6cfc17c..993684d 100644
--- a/ports/cc3200/fatfs_port.c
+++ b/ports/cc3200/fatfs_port.c
@@ -68,7 +68,7 @@
timeutils_struct_time_t tm;
timeutils_seconds_since_2000_to_struct_time(pyb_rtc_get_seconds(), &tm);
- return ((tm.tm_year - 1980) << 25) | ((tm.tm_mon) << 21) |
- ((tm.tm_mday) << 16) | ((tm.tm_hour) << 11) |
- ((tm.tm_min) << 5) | (tm.tm_sec >> 1);
+ return ((tm.tm_year - 1980) << 25) | ((tm.tm_mon) << 21) |
+ ((tm.tm_mday) << 16) | ((tm.tm_hour) << 11) |
+ ((tm.tm_min) << 5) | (tm.tm_sec >> 1);
}
diff --git a/ports/cc3200/main.c b/ports/cc3200/main.c
index e2299e1..803bbee 100644
--- a/ports/cc3200/main.c
+++ b/ports/cc3200/main.c
@@ -58,7 +58,7 @@
DECLARE PUBLIC DATA
******************************************************************************/
#ifdef DEBUG
-OsiTaskHandle mpTaskHandle;
+OsiTaskHandle mpTaskHandle;
#endif
// This is the FreeRTOS heap, defined here so we can put it in a special segment
@@ -78,30 +78,31 @@
// Initialize the clocks and the interrupt system
HAL_SystemInit();
-#if MICROPY_HW_ANTENNA_DIVERSITY
+ #if MICROPY_HW_ANTENNA_DIVERSITY
// configure the antenna selection pins
antenna_init0();
-#endif
+ #endif
// Init the watchdog
pybwdt_init0();
-#ifndef DEBUG
+ #ifndef DEBUG
OsiTaskHandle mpTaskHandle;
-#endif
+ #endif
mpTaskHandle = xTaskCreateStatic(TASK_MicroPython, "MicroPy",
MICROPY_TASK_STACK_LEN, NULL, MICROPY_TASK_PRIORITY, mpTaskStack, &mpTaskTCB);
ASSERT(mpTaskHandle != NULL);
osi_start();
- for ( ; ; );
+ for ( ; ;) {;
+ }
}
// We need this when configSUPPORT_STATIC_ALLOCATION is enabled
void vApplicationGetIdleTaskMemory( StaticTask_t **ppxIdleTaskTCBBuffer,
- StackType_t **ppxIdleTaskStackBuffer,
- uint32_t *pulIdleTaskStackSize ) {
+ StackType_t **ppxIdleTaskStackBuffer,
+ uint32_t *pulIdleTaskStackSize ) {
*ppxIdleTaskTCBBuffer = &xIdleTaskTCB;
*ppxIdleTaskStackBuffer = uxIdleTaskStack;
*pulIdleTaskStackSize = configMINIMAL_STACK_SIZE;
diff --git a/ports/cc3200/mpconfigport.h b/ports/cc3200/mpconfigport.h
index d5c3c07..3bb10bf 100644
--- a/ports/cc3200/mpconfigport.h
+++ b/ports/cc3200/mpconfigport.h
@@ -187,15 +187,15 @@
// type definitions for the specific machine
-#define MICROPY_MAKE_POINTER_CALLABLE(p) ((void*)((mp_uint_t)(p) | 1))
+#define MICROPY_MAKE_POINTER_CALLABLE(p) ((void *)((mp_uint_t)(p) | 1))
#define MP_SSIZE_MAX (0x7FFFFFFF)
#define UINT_FMT "%u"
#define INT_FMT "%d"
-typedef int32_t mp_int_t; // must be pointer size
-typedef unsigned int mp_uint_t; // must be pointer size
-typedef long mp_off_t;
+typedef int32_t mp_int_t; // must be pointer size
+typedef unsigned int mp_uint_t; // must be pointer size
+typedef long mp_off_t;
#define MP_PLAT_PRINT_STRN(str, len) mp_hal_stdout_tx_strn_cooked(str, len)
diff --git a/ports/cc3200/mptask.c b/ports/cc3200/mptask.c
index c253804..b0c32c8 100644
--- a/ports/cc3200/mptask.c
+++ b/ports/cc3200/mptask.c
@@ -81,16 +81,16 @@
/******************************************************************************
DECLARE PRIVATE FUNCTIONS
******************************************************************************/
-STATIC void mptask_pre_init (void);
-STATIC void mptask_init_sflash_filesystem (void);
-STATIC void mptask_enter_ap_mode (void);
-STATIC void mptask_create_main_py (void);
+STATIC void mptask_pre_init(void);
+STATIC void mptask_init_sflash_filesystem(void);
+STATIC void mptask_enter_ap_mode(void);
+STATIC void mptask_create_main_py(void);
/******************************************************************************
DECLARE PUBLIC DATA
******************************************************************************/
#ifdef DEBUG
-OsiTaskHandle svTaskHandle;
+OsiTaskHandle svTaskHandle;
#endif
/******************************************************************************
@@ -100,12 +100,12 @@
static const char fresh_main_py[] = "# main.py -- put your code here!\r\n";
static const char fresh_boot_py[] = "# boot.py -- run on boot-up\r\n"
- "# can run arbitrary Python, but best to keep it minimal\r\n"
+ "# can run arbitrary Python, but best to keep it minimal\r\n"
#if MICROPY_STDIO_UART
- "import os, machine\r\n"
- "os.dupterm(machine.UART(0, " MP_STRINGIFY(MICROPY_STDIO_UART_BAUD) "))\r\n"
+ "import os, machine\r\n"
+ "os.dupterm(machine.UART(0, " MP_STRINGIFY(MICROPY_STDIO_UART_BAUD) "))\r\n"
#endif
- ;
+;
/******************************************************************************
DECLARE PUBLIC FUNCTIONS
@@ -118,9 +118,9 @@
bool safeboot = false;
mptask_pre_init();
-#ifndef DEBUG
+ #ifndef DEBUG
safeboot = PRCMGetSpecialBit(PRCM_SAFE_BOOT_BIT);
-#endif
+ #endif
soft_reset:
@@ -130,7 +130,7 @@
#endif
// initialise the stack pointer for the main thread (must be done after mp_thread_init)
- mp_stack_set_top((void*)sp);
+ mp_stack_set_top((void *)sp);
// GC init
gc_init(&_boot, &_eheap);
@@ -158,8 +158,7 @@
// when waking up from hibernate we just want
// to enable simplelink and leave it as is
wlan_first_start();
- }
- else {
+ } else {
// only if not comming out of hibernate or a soft reset
mptask_enter_ap_mode();
}
@@ -218,7 +217,7 @@
// main script is finished, so now go into REPL mode.
// the REPL mode can change, or it can request a soft reset.
- for ( ; ; ) {
+ for ( ; ;) {
if (pyexec_mode_kind == PYEXEC_MODE_RAW_REPL) {
if (pyexec_raw_repl() != 0) {
break;
@@ -286,9 +285,9 @@
//CRYPTOHASH_Init();
-#ifndef DEBUG
+ #ifndef DEBUG
OsiTaskHandle svTaskHandle;
-#endif
+ #endif
svTaskHandle = xTaskCreateStatic(TASK_Servers, "Servers",
SERVERS_STACK_LEN, NULL, SERVERS_PRIORITY, svTaskStack, &svTaskTCB);
ASSERT(svTaskHandle != NULL);
@@ -382,8 +381,8 @@
bool add_mac = !PRCMGetSpecialBit(PRCM_FIRST_BOOT_BIT);
// enable simplelink in ap mode (use the MAC address to make the ssid unique)
wlan_sl_init (ROLE_AP, MICROPY_PORT_WLAN_AP_SSID, strlen(MICROPY_PORT_WLAN_AP_SSID),
- MICROPY_PORT_WLAN_AP_SECURITY, MICROPY_PORT_WLAN_AP_KEY, strlen(MICROPY_PORT_WLAN_AP_KEY),
- MICROPY_PORT_WLAN_AP_CHANNEL, ANTENNA_TYPE_INTERNAL, add_mac);
+ MICROPY_PORT_WLAN_AP_SECURITY, MICROPY_PORT_WLAN_AP_KEY, strlen(MICROPY_PORT_WLAN_AP_KEY),
+ MICROPY_PORT_WLAN_AP_CHANNEL, ANTENNA_TYPE_INTERNAL, add_mac);
}
STATIC void mptask_create_main_py (void) {
diff --git a/ports/cc3200/mptask.h b/ports/cc3200/mptask.h
index a1c3eb2..2c9d6c4 100644
--- a/ports/cc3200/mptask.h
+++ b/ports/cc3200/mptask.h
@@ -41,6 +41,6 @@
/******************************************************************************
DECLARE PUBLIC FUNCTIONS
******************************************************************************/
-extern void TASK_MicroPython (void *pvParameters);
+extern void TASK_MicroPython(void *pvParameters);
#endif // MICROPY_INCLUDED_CC3200_MPTASK_H
diff --git a/ports/cc3200/mpthreadport.c b/ports/cc3200/mpthreadport.c
index f2fc76b..27d2386 100644
--- a/ports/cc3200/mpthreadport.c
+++ b/ports/cc3200/mpthreadport.c
@@ -68,7 +68,7 @@
void mp_thread_gc_others(void) {
mp_thread_mutex_lock(&thread_mutex, 1);
for (thread_t *th = thread; th != NULL; th = th->next) {
- gc_collect_root((void**)&th, 1);
+ gc_collect_root((void **)&th, 1);
gc_collect_root(&th->arg, 1); // probably not needed
if (th->id == xTaskGetCurrentTaskHandle()) {
continue;
@@ -100,7 +100,7 @@
mp_thread_mutex_unlock(&thread_mutex);
}
-STATIC void *(*ext_thread_entry)(void*) = NULL;
+STATIC void *(*ext_thread_entry)(void *) = NULL;
STATIC void freertos_entry(void *arg) {
if (ext_thread_entry) {
@@ -111,7 +111,7 @@
}
}
-void mp_thread_create(void *(*entry)(void*), void *arg, size_t *stack_size) {
+void mp_thread_create(void *(*entry)(void *), void *arg, size_t *stack_size) {
// store thread entry function into a global variable so we can access it
ext_thread_entry = entry;
@@ -129,7 +129,7 @@
mp_thread_mutex_lock(&thread_mutex, 1);
// create thread
- TaskHandle_t id = xTaskCreateStatic(freertos_entry, "Thread", *stack_size / sizeof(void*), arg, 2, stack, tcb);
+ TaskHandle_t id = xTaskCreateStatic(freertos_entry, "Thread", *stack_size / sizeof(void *), arg, 2, stack, tcb);
if (id == NULL) {
mp_thread_mutex_unlock(&thread_mutex);
mp_raise_msg(&mp_type_OSError, "can't create thread");
diff --git a/ports/cc3200/serverstask.c b/ports/cc3200/serverstask.c
index 100b8d3..1c7249e 100644
--- a/ports/cc3200/serverstask.c
+++ b/ports/cc3200/serverstask.c
@@ -88,7 +88,7 @@
telnet_init();
ftp_init();
- for ( ;; ) {
+ for ( ;;) {
if (servers_data.do_enable) {
// enable network services
@@ -97,16 +97,14 @@
// now set/clear the flags
servers_data.enabled = true;
servers_data.do_enable = false;
- }
- else if (servers_data.do_disable) {
+ } else if (servers_data.do_disable) {
// disable network services
telnet_disable();
ftp_disable();
// now clear the flags
servers_data.do_disable = false;
servers_data.enabled = false;
- }
- else if (servers_data.do_reset) {
+ } else if (servers_data.do_reset) {
// resetting the servers is needed to prevent half-open sockets
servers_data.do_reset = false;
if (servers_data.enabled) {
@@ -120,8 +118,7 @@
if (cycle) {
telnet_run();
- }
- else {
+ } else {
ftp_run();
}
diff --git a/ports/cc3200/serverstask.h b/ports/cc3200/serverstask.h
index c4533d7..612899d 100644
--- a/ports/cc3200/serverstask.h
+++ b/ports/cc3200/serverstask.h
@@ -60,16 +60,16 @@
/******************************************************************************
DECLARE PUBLIC FUNCTIONS
******************************************************************************/
-extern void TASK_Servers (void *pvParameters);
-extern void servers_start (void);
-extern void servers_stop (void);
-extern void servers_reset (void);
-extern void servers_wlan_cycle_power (void);
-extern bool servers_are_enabled (void);
-extern void servers_close_socket (int16_t *sd);
-extern void servers_set_login (char *user, char *pass);
-extern void server_sleep_sockets (void);
-extern void servers_set_timeout (uint32_t timeout);
-extern uint32_t servers_get_timeout (void);
+extern void TASK_Servers(void *pvParameters);
+extern void servers_start(void);
+extern void servers_stop(void);
+extern void servers_reset(void);
+extern void servers_wlan_cycle_power(void);
+extern bool servers_are_enabled(void);
+extern void servers_close_socket(int16_t *sd);
+extern void servers_set_login(char *user, char *pass);
+extern void server_sleep_sockets(void);
+extern void servers_set_timeout(uint32_t timeout);
+extern uint32_t servers_get_timeout(void);
#endif // MICROPY_INCLUDED_CC3200_SERVERSTASK_H
diff --git a/ports/cc3200/tools/smoke.py b/ports/cc3200/tools/smoke.py
index 3ade11c..4ccc700 100644
--- a/ports/cc3200/tools/smoke.py
+++ b/ports/cc3200/tools/smoke.py
@@ -12,55 +12,58 @@
pin_map = [23, 24, 11, 12, 13, 14, 15, 16, 17, 22, 28, 10, 9, 8, 7, 6, 30, 31, 3, 0, 4, 5]
test_bytes = os.urandom(1024)
-def test_pin_read (pull):
+
+def test_pin_read(pull):
# enable the pull resistor on all pins, then read the value
for p in pin_map:
- pin = Pin('GP' + str(p), mode=Pin.IN, pull=pull)
+ pin = Pin("GP" + str(p), mode=Pin.IN, pull=pull)
# read the pin value
print(pin())
-def test_pin_shorts (pull):
+
+def test_pin_shorts(pull):
if pull == Pin.PULL_UP:
pull_inverted = Pin.PULL_DOWN
else:
pull_inverted = Pin.PULL_UP
# enable all pulls of the specified type
for p in pin_map:
- pin = Pin('GP' + str(p), mode=Pin.IN, pull=pull_inverted)
+ pin = Pin("GP" + str(p), mode=Pin.IN, pull=pull_inverted)
# then change the pull one pin at a time and read its value
i = 0
while i < len(pin_map):
- pin = Pin('GP' + str(pin_map[i]), mode=Pin.IN, pull=pull)
- Pin('GP' + str(pin_map[i - 1]), mode=Pin.IN, pull=pull_inverted)
+ pin = Pin("GP" + str(pin_map[i]), mode=Pin.IN, pull=pull)
+ Pin("GP" + str(pin_map[i - 1]), mode=Pin.IN, pull=pull_inverted)
i += 1
# read the pin value
print(pin())
+
test_pin_read(Pin.PULL_UP)
test_pin_read(Pin.PULL_DOWN)
test_pin_shorts(Pin.PULL_UP)
test_pin_shorts(Pin.PULL_DOWN)
# create a test directory
-os.mkdir('/flash/test')
-os.chdir('/flash/test')
+os.mkdir("/flash/test")
+os.chdir("/flash/test")
print(os.getcwd())
# create a new file
-f = open('test.txt', 'w')
+f = open("test.txt", "w")
n_w = f.write(test_bytes)
print(n_w == len(test_bytes))
f.close()
-f = open('test.txt', 'r')
-r = bytes(f.read(), 'ascii')
+f = open("test.txt", "r")
+r = bytes(f.read(), "ascii")
# check that we can write and read it correctly
print(r == test_bytes)
f.close()
-os.remove('test.txt')
-os.chdir('..')
-os.rmdir('test')
+os.remove("test.txt")
+os.chdir("..")
+os.rmdir("test")
ls = os.listdir()
-print('test' not in ls)
+print("test" not in ls)
print(ls)
# test the real time clock
@@ -72,5 +75,4 @@
time.sleep_ms(1000)
time2 = rtc.now()
print(time2[5] - time1[5] == 1)
-print(time2[6] - time1[6] < 5000) # microseconds
-
+print(time2[6] - time1[6] < 5000) # microseconds
diff --git a/ports/cc3200/tools/uniflash.py b/ports/cc3200/tools/uniflash.py
index 21da46a..0ce9d07 100644
--- a/ports/cc3200/tools/uniflash.py
+++ b/ports/cc3200/tools/uniflash.py
@@ -19,7 +19,7 @@
def print_exception(e):
- print ('Exception: {}, on line {}'.format(e, sys.exc_info()[-1].tb_lineno))
+ print("Exception: {}, on line {}".format(e, sys.exc_info()[-1].tb_lineno))
def execute(command):
@@ -29,7 +29,7 @@
# Poll process for new output until finished
while True:
nextline = process.stdout.readline()
- if nextline == '' and process.poll() != None:
+ if nextline == "" and process.poll() != None:
break
sys.stdout.write(nextline)
sys.stdout.flush()
@@ -43,25 +43,58 @@
else:
raise ProcessException(command, exitCode, output)
+
def main():
- cmd_parser = argparse.ArgumentParser(description='Flash the WiPy and optionally run a small test on it.')
- cmd_parser.add_argument('-u', '--uniflash', default=None, help='the path to the uniflash cli executable')
- cmd_parser.add_argument('-c', '--config', default=None, help='the path to the uniflash config file')
- cmd_parser.add_argument('-p', '--port', default=8, help='the com serial port')
- cmd_parser.add_argument('-s', '--servicepack', default=None, help='the path to the servicepack file')
+ cmd_parser = argparse.ArgumentParser(
+ description="Flash the WiPy and optionally run a small test on it."
+ )
+ cmd_parser.add_argument(
+ "-u", "--uniflash", default=None, help="the path to the uniflash cli executable"
+ )
+ cmd_parser.add_argument(
+ "-c", "--config", default=None, help="the path to the uniflash config file"
+ )
+ cmd_parser.add_argument("-p", "--port", default=8, help="the com serial port")
+ cmd_parser.add_argument(
+ "-s", "--servicepack", default=None, help="the path to the servicepack file"
+ )
args = cmd_parser.parse_args()
output = ""
- com_port = 'com=' + str(args.port)
- servicepack_path = 'spPath=' + args.servicepack
+ com_port = "com=" + str(args.port)
+ servicepack_path = "spPath=" + args.servicepack
try:
if args.uniflash == None or args.config == None:
- raise ValueError('uniflash path and config path are mandatory')
+ raise ValueError("uniflash path and config path are mandatory")
if args.servicepack == None:
- output += execute([args.uniflash, '-config', args.config, '-setOptions', com_port, '-operations', 'format', 'program'])
+ output += execute(
+ [
+ args.uniflash,
+ "-config",
+ args.config,
+ "-setOptions",
+ com_port,
+ "-operations",
+ "format",
+ "program",
+ ]
+ )
else:
- output += execute([args.uniflash, '-config', args.config, '-setOptions', com_port, servicepack_path, '-operations', 'format', 'servicePackUpdate', 'program'])
+ output += execute(
+ [
+ args.uniflash,
+ "-config",
+ args.config,
+ "-setOptions",
+ com_port,
+ servicepack_path,
+ "-operations",
+ "format",
+ "servicePackUpdate",
+ "program",
+ ]
+ )
except Exception as e:
print_exception(e)
output = ""
@@ -77,5 +110,6 @@
print("======================================")
sys.exit(1)
+
if __name__ == "__main__":
main()
diff --git a/ports/cc3200/tools/update-wipy.py b/ports/cc3200/tools/update-wipy.py
index 2d5fe57..e0e1266 100644
--- a/ports/cc3200/tools/update-wipy.py
+++ b/ports/cc3200/tools/update-wipy.py
@@ -23,12 +23,12 @@
def print_exception(e):
- print ('Exception: {}, on line {}'.format(e, sys.exc_info()[-1].tb_lineno))
+ print("Exception: {}, on line {}".format(e, sys.exc_info()[-1].tb_lineno))
def ftp_directory_exists(ftpobj, directory_name):
filelist = []
- ftpobj.retrlines('LIST',filelist.append)
+ ftpobj.retrlines("LIST", filelist.append)
for f in filelist:
if f.split()[-1] == directory_name:
return True
@@ -37,34 +37,34 @@
def transfer_file(args):
with FTP(args.ip, timeout=20) as ftp:
- print ('FTP connection established')
+ print("FTP connection established")
- if '230' in ftp.login(args.user, args.password):
- print ('Login successful')
+ if "230" in ftp.login(args.user, args.password):
+ print("Login successful")
- if '250' in ftp.cwd('/flash'):
- if not ftp_directory_exists(ftp, 'sys'):
- print ('/flash/sys directory does not exist')
- if not '550' in ftp.mkd('sys'):
- print ('/flash/sys directory created')
+ if "250" in ftp.cwd("/flash"):
+ if not ftp_directory_exists(ftp, "sys"):
+ print("/flash/sys directory does not exist")
+ if not "550" in ftp.mkd("sys"):
+ print("/flash/sys directory created")
else:
- print ('Error: cannot create /flash/sys directory')
+ print("Error: cannot create /flash/sys directory")
return False
- if '250' in ftp.cwd('sys'):
- print ("Entered '/flash/sys' directory")
+ if "250" in ftp.cwd("sys"):
+ print("Entered '/flash/sys' directory")
with open(args.file, "rb") as fwfile:
- print ('Firmware image found, initiating transfer...')
- if '226' in ftp.storbinary("STOR " + 'mcuimg.bin', fwfile, 512):
- print ('File transfer complete')
+ print("Firmware image found, initiating transfer...")
+ if "226" in ftp.storbinary("STOR " + "mcuimg.bin", fwfile, 512):
+ print("File transfer complete")
return True
else:
- print ('Error: file transfer failed')
+ print("Error: file transfer failed")
else:
- print ('Error: cannot enter /flash/sys directory')
+ print("Error: cannot enter /flash/sys directory")
else:
- print ('Error: cannot enter /flash directory')
+ print("Error: cannot enter /flash directory")
else:
- print ('Error: ftp login failed')
+ print("Error: ftp login failed")
return False
@@ -76,20 +76,24 @@
tn = Telnet(args.ip, timeout=5)
print("Connected via Telnet, trying to login now")
- if b'Login as:' in tn.read_until(b"Login as:", timeout=5):
- tn.write(bytes(args.user, 'ascii') + b"\r\n")
+ if b"Login as:" in tn.read_until(b"Login as:", timeout=5):
+ tn.write(bytes(args.user, "ascii") + b"\r\n")
- if b'Password:' in tn.read_until(b"Password:", timeout=5):
+ if b"Password:" in tn.read_until(b"Password:", timeout=5):
# needed because of internal implementation details of the WiPy's telnet server
time.sleep(0.2)
- tn.write(bytes(args.password, 'ascii') + b"\r\n")
+ tn.write(bytes(args.password, "ascii") + b"\r\n")
- if b'Type "help()" for more information.' in tn.read_until(b'Type "help()" for more information.', timeout=5):
+ if b'Type "help()" for more information.' in tn.read_until(
+ b'Type "help()" for more information.', timeout=5
+ ):
print("Telnet login succeeded")
- tn.write(b'\r\x03\x03') # ctrl-C twice: interrupt any running program
+ tn.write(b"\r\x03\x03") # ctrl-C twice: interrupt any running program
time.sleep(1)
- tn.write(b'\r\x02') # ctrl-B: enter friendly REPL
- if b'Type "help()" for more information.' in tn.read_until(b'Type "help()" for more information.', timeout=5):
+ tn.write(b"\r\x02") # ctrl-B: enter friendly REPL
+ if b'Type "help()" for more information.' in tn.read_until(
+ b'Type "help()" for more information.', timeout=5
+ ):
tn.write(b"import machine\r\n")
tn.write(b"machine.reset()\r\n")
time.sleep(2)
@@ -112,9 +116,9 @@
def verify_update(args):
success = False
- firmware_tag = ''
+ firmware_tag = ""
- def find_tag (tag):
+ def find_tag(tag):
if tag in firmware_tag:
print("Verification passed")
return True
@@ -135,21 +139,26 @@
print("Timeout while connecting via telnet, retrying...")
retries += 1
else:
- print('Error: Telnet connection timed out!')
+ print("Error: Telnet connection timed out!")
return False
try:
- firmware_tag = tn.read_until (b'with CC3200')
- tag_file_path = args.file.rstrip('mcuimg.bin') + 'genhdr/mpversion.h'
-
+ firmware_tag = tn.read_until(b"with CC3200")
+ tag_file_path = args.file.rstrip("mcuimg.bin") + "genhdr/mpversion.h"
+
if args.tag is not None:
- success = find_tag(bytes(args.tag, 'ascii'))
+ success = find_tag(bytes(args.tag, "ascii"))
else:
with open(tag_file_path) as tag_file:
for line in tag_file:
- bline = bytes(line, 'ascii')
- if b'MICROPY_GIT_HASH' in bline:
- bline = bline.lstrip(b'#define MICROPY_GIT_HASH ').replace(b'"', b'').replace(b'\r', b'').replace(b'\n', b'')
+ bline = bytes(line, "ascii")
+ if b"MICROPY_GIT_HASH" in bline:
+ bline = (
+ bline.lstrip(b"#define MICROPY_GIT_HASH ")
+ .replace(b'"', b"")
+ .replace(b"\r", b"")
+ .replace(b"\n", b"")
+ )
success = find_tag(bline)
break
@@ -164,24 +173,28 @@
def main():
- cmd_parser = argparse.ArgumentParser(description='Update the WiPy firmware with the specified image file')
- cmd_parser.add_argument('-f', '--file', default=None, help='the path of the firmware file')
- cmd_parser.add_argument('-u', '--user', default='micro', help='the username')
- cmd_parser.add_argument('-p', '--password', default='python', help='the login password')
- cmd_parser.add_argument('--ip', default='192.168.1.1', help='the ip address of the WiPy')
- cmd_parser.add_argument('--verify', action='store_true', help='verify that the update succeeded')
- cmd_parser.add_argument('-t', '--tag', default=None, help='git tag of the firmware image')
+ cmd_parser = argparse.ArgumentParser(
+ description="Update the WiPy firmware with the specified image file"
+ )
+ cmd_parser.add_argument("-f", "--file", default=None, help="the path of the firmware file")
+ cmd_parser.add_argument("-u", "--user", default="micro", help="the username")
+ cmd_parser.add_argument("-p", "--password", default="python", help="the login password")
+ cmd_parser.add_argument("--ip", default="192.168.1.1", help="the ip address of the WiPy")
+ cmd_parser.add_argument(
+ "--verify", action="store_true", help="verify that the update succeeded"
+ )
+ cmd_parser.add_argument("-t", "--tag", default=None, help="git tag of the firmware image")
args = cmd_parser.parse_args()
result = 1
try:
if args.file is None:
- raise ValueError('the image file path must be specified')
+ raise ValueError("the image file path must be specified")
if transfer_file(args):
if reset_board(args):
if args.verify:
- print ('Waiting for the WiFi connection to come up again...')
+ print("Waiting for the WiFi connection to come up again...")
# this time is to allow the system's wireless network card to
# connect to the WiPy again.
time.sleep(5)
diff --git a/ports/cc3200/version.h b/ports/cc3200/version.h
index fccb95c..81a6999 100644
--- a/ports/cc3200/version.h
+++ b/ports/cc3200/version.h
@@ -1,31 +1,31 @@
-/*
- * This file is part of the MicroPython project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2015 Daniel Campora
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-#ifndef MICROPY_INCLUDED_CC3200_VERSION_H
-#define MICROPY_INCLUDED_CC3200_VERSION_H
-
-#define WIPY_SW_VERSION_NUMBER "1.2.0"
-
-#endif // MICROPY_INCLUDED_CC3200_VERSION_H
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2015 Daniel Campora
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+#ifndef MICROPY_INCLUDED_CC3200_VERSION_H
+#define MICROPY_INCLUDED_CC3200_VERSION_H
+
+#define WIPY_SW_VERSION_NUMBER "1.2.0"
+
+#endif // MICROPY_INCLUDED_CC3200_VERSION_H
diff --git a/ports/esp32/boards/TINYPICO/manifest.py b/ports/esp32/boards/TINYPICO/manifest.py
index 81fff1d..7ae2ed1 100644
--- a/ports/esp32/boards/TINYPICO/manifest.py
+++ b/ports/esp32/boards/TINYPICO/manifest.py
@@ -1,2 +1,2 @@
-include('$(PORT_DIR)/boards/manifest.py')
+include("$(PORT_DIR)/boards/manifest.py")
freeze("modules")
diff --git a/ports/esp32/boards/TINYPICO/modules/dotstar.py b/ports/esp32/boards/TINYPICO/modules/dotstar.py
index a848e8e..c362eb1 100644
--- a/ports/esp32/boards/TINYPICO/modules/dotstar.py
+++ b/ports/esp32/boards/TINYPICO/modules/dotstar.py
@@ -63,8 +63,7 @@
dotstar[0] = (128, 0, 0) # Red
"""
- def __init__(self, spi, n, *, brightness=1.0, auto_write=True,
- pixel_order=BGR):
+ def __init__(self, spi, n, *, brightness=1.0, auto_write=True, pixel_order=BGR):
self._spi = spi
self._n = n
# Supply one extra clock cycle for each two pixels in the strip.
@@ -79,10 +78,10 @@
self._buf[i] = 0x00
# Mark the beginnings of each pixel.
for i in range(START_HEADER_SIZE, self.end_header_index, 4):
- self._buf[i] = 0xff
+ self._buf[i] = 0xFF
# 0xff bytes at the end.
for i in range(self.end_header_index, len(self._buf)):
- self._buf[i] = 0xff
+ self._buf[i] = 0xFF
self._brightness = 1.0
# Set auto_write to False temporarily so brightness setter does _not_
# call show() while in __init__.
@@ -129,7 +128,7 @@
offset = index * 4 + START_HEADER_SIZE
rgb = value
if isinstance(value, int):
- rgb = (value >> 16, (value >> 8) & 0xff, value & 0xff)
+ rgb = (value >> 16, (value >> 8) & 0xFF, value & 0xFF)
if len(rgb) == 4:
brightness = value[3]
@@ -171,15 +170,15 @@
out = []
for in_i in range(*index.indices(self._n)):
out.append(
- tuple(self._buf[in_i * 4 + (3 - i) + START_HEADER_SIZE] for i in range(3)))
+ tuple(self._buf[in_i * 4 + (3 - i) + START_HEADER_SIZE] for i in range(3))
+ )
return out
if index < 0:
index += len(self)
if index >= self._n or index < 0:
raise IndexError
offset = index * 4
- return tuple(self._buf[offset + (3 - i) + START_HEADER_SIZE]
- for i in range(3))
+ return tuple(self._buf[offset + (3 - i) + START_HEADER_SIZE] for i in range(3))
def __len__(self):
return self._n
@@ -222,7 +221,7 @@
buf[i] = self._buf[i] if i % 4 == 0 else int(self._buf[i] * self._brightness)
# Four 0xff bytes at the end.
for i in range(self.end_header_index, len(buf)):
- buf[i] = 0xff
+ buf[i] = 0xFF
if self._spi:
self._spi.write(buf)
diff --git a/ports/esp32/boards/TINYPICO/modules/tinypico.py b/ports/esp32/boards/TINYPICO/modules/tinypico.py
index 2fc379c..846e079 100644
--- a/ports/esp32/boards/TINYPICO/modules/tinypico.py
+++ b/ports/esp32/boards/TINYPICO/modules/tinypico.py
@@ -29,11 +29,11 @@
SPI_CLK = const(18)
SPI_MISO = const(19)
-#I2C
+# I2C
I2C_SDA = const(21)
I2C_SCL = const(22)
-#DAC
+# DAC
DAC1 = const(25)
DAC2 = const(26)
@@ -47,12 +47,13 @@
Returns the current battery voltage. If no battery is connected, returns 3.7V
This is an approximation only, but useful to detect of the charge state of the battery is getting low.
"""
- adc = ADC(Pin(BAT_VOLTAGE)) # Assign the ADC pin to read
- measuredvbat = adc.read() # Read the value
- measuredvbat /= 4095 # divide by 4095 as we are using the default ADC voltage range of 0-1V
- measuredvbat *= 3.7 # Multiply by 3.7V, our reference voltage
+ adc = ADC(Pin(BAT_VOLTAGE)) # Assign the ADC pin to read
+ measuredvbat = adc.read() # Read the value
+ measuredvbat /= 4095 # divide by 4095 as we are using the default ADC voltage range of 0-1V
+ measuredvbat *= 3.7 # Multiply by 3.7V, our reference voltage
return measuredvbat
+
# Return the current charge state of the battery - we need to read the value multiple times
# to eliminate false negatives due to the charge IC not knowing the difference between no battery
# and a full battery not charging - This is why the charge LED flashes
@@ -61,13 +62,15 @@
Returns the current battery charging state.
This can trigger false positives as the charge IC can't tell the difference between a full battery or no battery connected.
"""
- measuredVal = 0 # start our reading at 0
- io = Pin(BAT_CHARGE, Pin.IN) # Assign the pin to read
+ measuredVal = 0 # start our reading at 0
+ io = Pin(BAT_CHARGE, Pin.IN) # Assign the pin to read
- for y in range(0, 10): # loop through 10 times adding the read values together to ensure no false positives
+ for y in range(
+ 0, 10
+ ): # loop through 10 times adding the read values together to ensure no false positives
measuredVal += io.value()
- return measuredVal == 0 # return True if the value is 0
+ return measuredVal == 0 # return True if the value is 0
# Power to the on-board Dotstar is controlled by a PNP transistor, so low is ON and high is OFF
@@ -80,16 +83,21 @@
"""Set the power for the on-board Dostar to allow no current draw when not needed."""
# Set the power pin to the inverse of state
if state:
- Pin(DOTSTAR_PWR, Pin.OUT, None) # Break the PULL_HOLD on the pin
- Pin(DOTSTAR_PWR).value(False) # Set the pin to LOW to enable the Transistor
+ Pin(DOTSTAR_PWR, Pin.OUT, None) # Break the PULL_HOLD on the pin
+ Pin(DOTSTAR_PWR).value(False) # Set the pin to LOW to enable the Transistor
else:
- Pin(13, Pin.IN, Pin.PULL_HOLD) # Set PULL_HOLD on the pin to allow the 3V3 pull-up to work
+ Pin(13, Pin.IN, Pin.PULL_HOLD) # Set PULL_HOLD on the pin to allow the 3V3 pull-up to work
- Pin(DOTSTAR_CLK, Pin.OUT if state else Pin.IN) # If power is on, set CLK to be output, otherwise input
- Pin(DOTSTAR_DATA, Pin.OUT if state else Pin.IN) # If power is on, set DATA to be output, otherwise input
+ Pin(
+ DOTSTAR_CLK, Pin.OUT if state else Pin.IN
+ ) # If power is on, set CLK to be output, otherwise input
+ Pin(
+ DOTSTAR_DATA, Pin.OUT if state else Pin.IN
+ ) # If power is on, set DATA to be output, otherwise input
# A small delay to let the IO change state
- time.sleep(.035)
+ time.sleep(0.035)
+
# Dotstar rainbow colour wheel
def dotstar_color_wheel(wheel_pos):
@@ -105,6 +113,7 @@
wheel_pos -= 170
return wheel_pos * 3, 255 - wheel_pos * 3, 0
+
# Go into deep sleep but shut down the APA first to save power
# Use this if you want lowest deep sleep current
def go_deepsleep(t):
diff --git a/ports/esp32/boards/manifest.py b/ports/esp32/boards/manifest.py
index bab2b61..bbd907a 100644
--- a/ports/esp32/boards/manifest.py
+++ b/ports/esp32/boards/manifest.py
@@ -1,6 +1,6 @@
-freeze('$(PORT_DIR)/modules')
-freeze('$(MPY_DIR)/tools', ('upip.py', 'upip_utarfile.py'))
-freeze('$(MPY_DIR)/ports/esp8266/modules', 'ntptime.py')
-freeze('$(MPY_DIR)/drivers/dht', 'dht.py')
-freeze('$(MPY_DIR)/drivers/onewire')
-include('$(MPY_DIR)/extmod/webrepl/manifest.py')
+freeze("$(PORT_DIR)/modules")
+freeze("$(MPY_DIR)/tools", ("upip.py", "upip_utarfile.py"))
+freeze("$(MPY_DIR)/ports/esp8266/modules", "ntptime.py")
+freeze("$(MPY_DIR)/drivers/dht", "dht.py")
+freeze("$(MPY_DIR)/drivers/onewire")
+include("$(MPY_DIR)/extmod/webrepl/manifest.py")
diff --git a/ports/esp32/boards/manifest_release.py b/ports/esp32/boards/manifest_release.py
index 9c898af..b5c7cd1 100644
--- a/ports/esp32/boards/manifest_release.py
+++ b/ports/esp32/boards/manifest_release.py
@@ -1,6 +1,6 @@
-include('manifest.py')
+include("manifest.py")
-freeze('$(MPY_LIB_DIR)/upysh', 'upysh.py')
-freeze('$(MPY_LIB_DIR)/urequests', 'urequests.py')
-freeze('$(MPY_LIB_DIR)/umqtt.simple', 'umqtt/simple.py')
-freeze('$(MPY_LIB_DIR)/umqtt.robust', 'umqtt/robust.py')
+freeze("$(MPY_LIB_DIR)/upysh", "upysh.py")
+freeze("$(MPY_LIB_DIR)/urequests", "urequests.py")
+freeze("$(MPY_LIB_DIR)/umqtt.simple", "umqtt/simple.py")
+freeze("$(MPY_LIB_DIR)/umqtt.robust", "umqtt/robust.py")
diff --git a/ports/esp32/esp32_partition.c b/ports/esp32/esp32_partition.c
index 50c2173..a1aa8c9 100644
--- a/ports/esp32/esp32_partition.c
+++ b/ports/esp32/esp32_partition.c
@@ -69,7 +69,7 @@
self->part->type, self->part->subtype,
self->part->address, self->part->size,
&self->part->label[0], self->part->encrypted
- );
+ );
}
STATIC mp_obj_t esp32_partition_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
@@ -180,17 +180,23 @@
esp32_partition_obj_t *self = MP_OBJ_TO_PTR(self_in);
mp_int_t cmd = mp_obj_get_int(cmd_in);
switch (cmd) {
- case MP_BLOCKDEV_IOCTL_INIT: return MP_OBJ_NEW_SMALL_INT(0);
- case MP_BLOCKDEV_IOCTL_DEINIT: return MP_OBJ_NEW_SMALL_INT(0);
- case MP_BLOCKDEV_IOCTL_SYNC: return MP_OBJ_NEW_SMALL_INT(0);
- case MP_BLOCKDEV_IOCTL_BLOCK_COUNT: return MP_OBJ_NEW_SMALL_INT(self->part->size / BLOCK_SIZE_BYTES);
- case MP_BLOCKDEV_IOCTL_BLOCK_SIZE: return MP_OBJ_NEW_SMALL_INT(BLOCK_SIZE_BYTES);
+ case MP_BLOCKDEV_IOCTL_INIT:
+ return MP_OBJ_NEW_SMALL_INT(0);
+ case MP_BLOCKDEV_IOCTL_DEINIT:
+ return MP_OBJ_NEW_SMALL_INT(0);
+ case MP_BLOCKDEV_IOCTL_SYNC:
+ return MP_OBJ_NEW_SMALL_INT(0);
+ case MP_BLOCKDEV_IOCTL_BLOCK_COUNT:
+ return MP_OBJ_NEW_SMALL_INT(self->part->size / BLOCK_SIZE_BYTES);
+ case MP_BLOCKDEV_IOCTL_BLOCK_SIZE:
+ return MP_OBJ_NEW_SMALL_INT(BLOCK_SIZE_BYTES);
case MP_BLOCKDEV_IOCTL_BLOCK_ERASE: {
uint32_t offset = mp_obj_get_int(arg_in) * BLOCK_SIZE_BYTES;
check_esp_err(esp_partition_erase_range(self->part, offset, BLOCK_SIZE_BYTES));
return MP_OBJ_NEW_SMALL_INT(0);
}
- default: return mp_const_none;
+ default:
+ return mp_const_none;
}
}
STATIC MP_DEFINE_CONST_FUN_OBJ_3(esp32_partition_ioctl_obj, esp32_partition_ioctl);
@@ -231,5 +237,5 @@
.name = MP_QSTR_Partition,
.print = esp32_partition_print,
.make_new = esp32_partition_make_new,
- .locals_dict = (mp_obj_dict_t*)&esp32_partition_locals_dict,
+ .locals_dict = (mp_obj_dict_t *)&esp32_partition_locals_dict,
};
diff --git a/ports/esp32/esp32_rmt.c b/ports/esp32/esp32_rmt.c
index 1356456..534b901 100644
--- a/ports/esp32/esp32_rmt.c
+++ b/ports/esp32/esp32_rmt.c
@@ -53,7 +53,7 @@
gpio_num_t pin;
uint8_t clock_div;
mp_uint_t num_items;
- rmt_item32_t* items;
+ rmt_item32_t *items;
} esp32_rmt_obj_t;
// Defined in machine_time.c; simply added the error message
@@ -69,7 +69,7 @@
STATIC mp_obj_t esp32_rmt_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
static const mp_arg_t allowed_args[] = {
- { MP_QSTR_id, MP_ARG_REQUIRED | MP_ARG_INT, {.u_int = -1} },
+ { MP_QSTR_id, MP_ARG_REQUIRED | MP_ARG_INT, {.u_int = -1} },
{ MP_QSTR_pin, MP_ARG_REQUIRED | MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_obj = mp_const_none} },
{ MP_QSTR_clock_div, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 8} }, // 100ns resolution
};
@@ -154,7 +154,7 @@
STATIC mp_obj_t esp32_rmt_wait_done(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
static const mp_arg_t allowed_args[] = {
{ MP_QSTR_self, MP_ARG_REQUIRED | MP_ARG_OBJ, {.u_obj = mp_const_none} },
- { MP_QSTR_timeout, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 0} },
+ { MP_QSTR_timeout, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 0} },
};
mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
@@ -178,7 +178,7 @@
static const mp_arg_t allowed_args[] = {
{ MP_QSTR_self, MP_ARG_REQUIRED | MP_ARG_OBJ, {.u_obj = mp_const_none} },
{ MP_QSTR_pulses, MP_ARG_REQUIRED | MP_ARG_OBJ, {.u_obj = mp_const_none} },
- { MP_QSTR_start, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 1} },
+ { MP_QSTR_start, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 1} },
};
mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
@@ -193,12 +193,12 @@
}
size_t pulses_length = 0;
- mp_obj_t* pulses_ptr = NULL;
+ mp_obj_t *pulses_ptr = NULL;
mp_obj_get_array(pulses, &pulses_length, &pulses_ptr);
mp_uint_t num_items = (pulses_length / 2) + (pulses_length % 2);
if (num_items > self->num_items) {
- self->items = (rmt_item32_t*)m_realloc(self->items, num_items * sizeof(rmt_item32_t *));
+ self->items = (rmt_item32_t *)m_realloc(self->items, num_items * sizeof(rmt_item32_t *));
self->num_items = num_items;
}
@@ -233,5 +233,5 @@
.name = MP_QSTR_RMT,
.print = esp32_rmt_print,
.make_new = esp32_rmt_make_new,
- .locals_dict = (mp_obj_dict_t*)&esp32_rmt_locals_dict,
+ .locals_dict = (mp_obj_dict_t *)&esp32_rmt_locals_dict,
};
diff --git a/ports/esp32/esp32_ulp.c b/ports/esp32/esp32_ulp.c
index bf11de3..4e9d768 100644
--- a/ports/esp32/esp32_ulp.c
+++ b/ports/esp32/esp32_ulp.c
@@ -51,7 +51,7 @@
mp_uint_t period_us = mp_obj_get_int(period_us_in);
int _errno = ulp_set_wakeup_period(period_index, period_us);
if (_errno != ESP_OK) {
- mp_raise_OSError(_errno);
+ mp_raise_OSError(_errno);
}
return mp_const_none;
}
@@ -63,9 +63,9 @@
mp_buffer_info_t bufinfo;
mp_get_buffer_raise(program_binary_in, &bufinfo, MP_BUFFER_READ);
- int _errno = ulp_load_binary(load_addr, bufinfo.buf, bufinfo.len/sizeof(uint32_t));
+ int _errno = ulp_load_binary(load_addr, bufinfo.buf, bufinfo.len / sizeof(uint32_t));
if (_errno != ESP_OK) {
- mp_raise_OSError(_errno);
+ mp_raise_OSError(_errno);
}
return mp_const_none;
}
@@ -73,9 +73,9 @@
STATIC mp_obj_t esp32_ulp_run(mp_obj_t self_in, mp_obj_t entry_point_in) {
mp_uint_t entry_point = mp_obj_get_int(entry_point_in);
- int _errno = ulp_run(entry_point/sizeof(uint32_t));
+ int _errno = ulp_run(entry_point / sizeof(uint32_t));
if (_errno != ESP_OK) {
- mp_raise_OSError(_errno);
+ mp_raise_OSError(_errno);
}
return mp_const_none;
}
diff --git a/ports/esp32/espneopixel.c b/ports/esp32/espneopixel.c
index 829c8b1..1736e2a 100644
--- a/ports/esp32/espneopixel.c
+++ b/ports/esp32/espneopixel.c
@@ -13,11 +13,11 @@
uint8_t *p, *end, pix, mask;
uint32_t t, time0, time1, period, c, startTime, pinMask;
- pinMask = 1 << pin;
- p = pixels;
- end = p + numBytes;
- pix = *p++;
- mask = 0x80;
+ pinMask = 1 << pin;
+ p = pixels;
+ end = p + numBytes;
+ pix = *p++;
+ mask = 0x80;
startTime = 0;
uint32_t fcpu = ets_get_cpu_frequency() * 1000000;
@@ -36,18 +36,28 @@
uint32_t irq_state = mp_hal_quiet_timing_enter();
for (t = time0;; t = time0) {
- if (pix & mask) t = time1; // Bit high duration
- while (((c = mp_hal_ticks_cpu()) - startTime) < period); // Wait for bit start
+ if (pix & mask) {
+ t = time1; // Bit high duration
+ }
+ while (((c = mp_hal_ticks_cpu()) - startTime) < period) {
+ ; // Wait for bit start
+ }
GPIO_REG_WRITE(GPIO_OUT_W1TS_REG, pinMask); // Set high
startTime = c; // Save start time
- while (((c = mp_hal_ticks_cpu()) - startTime) < t); // Wait high duration
+ while (((c = mp_hal_ticks_cpu()) - startTime) < t) {
+ ; // Wait high duration
+ }
GPIO_REG_WRITE(GPIO_OUT_W1TC_REG, pinMask); // Set low
if (!(mask >>= 1)) { // Next bit/byte
- if(p >= end) break;
- pix = *p++;
+ if (p >= end) {
+ break;
+ }
+ pix = *p++;
mask = 0x80;
}
}
- while ((mp_hal_ticks_cpu() - startTime) < period); // Wait for last bit
+ while ((mp_hal_ticks_cpu() - startTime) < period) {
+ ; // Wait for last bit
+ }
mp_hal_quiet_timing_exit(irq_state);
}
diff --git a/ports/esp32/fatfs_port.c b/ports/esp32/fatfs_port.c
index 880324e..779ba1c 100644
--- a/ports/esp32/fatfs_port.c
+++ b/ports/esp32/fatfs_port.c
@@ -36,6 +36,6 @@
timeutils_struct_time_t tm;
timeutils_seconds_since_2000_to_struct_time(tv.tv_sec, &tm);
- return (((DWORD)(tm.tm_year - 1980) << 25) | ((DWORD)tm.tm_mon << 21) | ((DWORD)tm.tm_mday << 16) |
- ((DWORD)tm.tm_hour << 11) | ((DWORD)tm.tm_min << 5) | ((DWORD)tm.tm_sec >> 1));
+ return ((DWORD)(tm.tm_year - 1980) << 25) | ((DWORD)tm.tm_mon << 21) | ((DWORD)tm.tm_mday << 16) |
+ ((DWORD)tm.tm_hour << 11) | ((DWORD)tm.tm_min << 5) | ((DWORD)tm.tm_sec >> 1);
}
diff --git a/ports/esp32/gccollect.c b/ports/esp32/gccollect.c
index 9843cef..7d5da57 100644
--- a/ports/esp32/gccollect.c
+++ b/ports/esp32/gccollect.c
@@ -49,7 +49,7 @@
if (level == XCHAL_NUM_AREGS / 8) {
// get the sp
volatile uint32_t sp = (uint32_t)get_sp();
- gc_collect_root((void**)sp, ((mp_uint_t)MP_STATE_THREAD(stack_top) - sp) / sizeof(uint32_t));
+ gc_collect_root((void **)sp, ((mp_uint_t)MP_STATE_THREAD(stack_top) - sp) / sizeof(uint32_t));
return;
}
diff --git a/ports/esp32/help.c b/ports/esp32/help.c
index 95d115c..2336d97 100644
--- a/ports/esp32/help.c
+++ b/ports/esp32/help.c
@@ -29,37 +29,37 @@
#include "py/builtin.h"
const char esp32_help_text[] =
-"Welcome to MicroPython on the ESP32!\n"
-"\n"
-"For generic online docs please visit http://docs.micropython.org/\n"
-"\n"
-"For access to the hardware use the 'machine' module:\n"
-"\n"
-"import machine\n"
-"pin12 = machine.Pin(12, machine.Pin.OUT)\n"
-"pin12.value(1)\n"
-"pin13 = machine.Pin(13, machine.Pin.IN, machine.Pin.PULL_UP)\n"
-"print(pin13.value())\n"
-"i2c = machine.I2C(scl=machine.Pin(21), sda=machine.Pin(22))\n"
-"i2c.scan()\n"
-"i2c.writeto(addr, b'1234')\n"
-"i2c.readfrom(addr, 4)\n"
-"\n"
-"Basic WiFi configuration:\n"
-"\n"
-"import network\n"
-"sta_if = network.WLAN(network.STA_IF); sta_if.active(True)\n"
-"sta_if.scan() # Scan for available access points\n"
-"sta_if.connect(\"<AP_name>\", \"<password>\") # Connect to an AP\n"
-"sta_if.isconnected() # Check for successful connection\n"
-"\n"
-"Control commands:\n"
-" CTRL-A -- on a blank line, enter raw REPL mode\n"
-" CTRL-B -- on a blank line, enter normal REPL mode\n"
-" CTRL-C -- interrupt a running program\n"
-" CTRL-D -- on a blank line, do a soft reset of the board\n"
-" CTRL-E -- on a blank line, enter paste mode\n"
-"\n"
-"For further help on a specific object, type help(obj)\n"
-"For a list of available modules, type help('modules')\n"
+ "Welcome to MicroPython on the ESP32!\n"
+ "\n"
+ "For generic online docs please visit http://docs.micropython.org/\n"
+ "\n"
+ "For access to the hardware use the 'machine' module:\n"
+ "\n"
+ "import machine\n"
+ "pin12 = machine.Pin(12, machine.Pin.OUT)\n"
+ "pin12.value(1)\n"
+ "pin13 = machine.Pin(13, machine.Pin.IN, machine.Pin.PULL_UP)\n"
+ "print(pin13.value())\n"
+ "i2c = machine.I2C(scl=machine.Pin(21), sda=machine.Pin(22))\n"
+ "i2c.scan()\n"
+ "i2c.writeto(addr, b'1234')\n"
+ "i2c.readfrom(addr, 4)\n"
+ "\n"
+ "Basic WiFi configuration:\n"
+ "\n"
+ "import network\n"
+ "sta_if = network.WLAN(network.STA_IF); sta_if.active(True)\n"
+ "sta_if.scan() # Scan for available access points\n"
+ "sta_if.connect(\"<AP_name>\", \"<password>\") # Connect to an AP\n"
+ "sta_if.isconnected() # Check for successful connection\n"
+ "\n"
+ "Control commands:\n"
+ " CTRL-A -- on a blank line, enter raw REPL mode\n"
+ " CTRL-B -- on a blank line, enter normal REPL mode\n"
+ " CTRL-C -- interrupt a running program\n"
+ " CTRL-D -- on a blank line, do a soft reset of the board\n"
+ " CTRL-E -- on a blank line, enter paste mode\n"
+ "\n"
+ "For further help on a specific object, type help(obj)\n"
+ "For a list of available modules, type help('modules')\n"
;
diff --git a/ports/esp32/machine_adc.c b/ports/esp32/machine_adc.c
index 63e4044..db70b78 100644
--- a/ports/esp32/machine_adc.c
+++ b/ports/esp32/machine_adc.c
@@ -56,7 +56,7 @@
STATIC uint8_t adc_bit_width;
STATIC mp_obj_t madc_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw,
- const mp_obj_t *args) {
+ const mp_obj_t *args) {
static int initialized = 0;
if (!initialized) {
@@ -69,11 +69,18 @@
gpio_num_t pin_id = machine_pin_get_id(args[0]);
const madc_obj_t *self = NULL;
for (int i = 0; i < MP_ARRAY_SIZE(madc_obj); i++) {
- if (pin_id == madc_obj[i].gpio_id) { self = &madc_obj[i]; break; }
+ if (pin_id == madc_obj[i].gpio_id) {
+ self = &madc_obj[i];
+ break;
+ }
}
- if (!self) mp_raise_ValueError("invalid Pin for ADC");
+ if (!self) {
+ mp_raise_ValueError("invalid Pin for ADC");
+ }
esp_err_t err = adc1_config_channel_atten(self->adc1_id, ADC_ATTEN_0db);
- if (err == ESP_OK) return MP_OBJ_FROM_PTR(self);
+ if (err == ESP_OK) {
+ return MP_OBJ_FROM_PTR(self);
+ }
mp_raise_ValueError("Parameter Error");
}
@@ -96,7 +103,9 @@
STATIC mp_obj_t madc_read(mp_obj_t self_in) {
madc_obj_t *self = self_in;
int val = adc1_get_raw(self->adc1_id);
- if (val == -1) mp_raise_ValueError("Parameter Error");
+ if (val == -1) {
+ mp_raise_ValueError("Parameter Error");
+ }
return MP_OBJ_NEW_SMALL_INT(val);
}
MP_DEFINE_CONST_FUN_OBJ_1(madc_read_obj, madc_read);
@@ -105,7 +114,9 @@
madc_obj_t *self = self_in;
adc_atten_t atten = mp_obj_get_int(atten_in);
esp_err_t err = adc1_config_channel_atten(self->adc1_id, atten);
- if (err == ESP_OK) return mp_const_none;
+ if (err == ESP_OK) {
+ return mp_const_none;
+ }
mp_raise_ValueError("Parameter Error");
}
MP_DEFINE_CONST_FUN_OBJ_2(madc_atten_obj, madc_atten);
@@ -117,11 +128,20 @@
mp_raise_ValueError("Parameter Error");
}
switch (width) {
- case ADC_WIDTH_9Bit: adc_bit_width = 9; break;
- case ADC_WIDTH_10Bit: adc_bit_width = 10; break;
- case ADC_WIDTH_11Bit: adc_bit_width = 11; break;
- case ADC_WIDTH_12Bit: adc_bit_width = 12; break;
- default: break;
+ case ADC_WIDTH_9Bit:
+ adc_bit_width = 9;
+ break;
+ case ADC_WIDTH_10Bit:
+ adc_bit_width = 10;
+ break;
+ case ADC_WIDTH_11Bit:
+ adc_bit_width = 11;
+ break;
+ case ADC_WIDTH_12Bit:
+ adc_bit_width = 12;
+ break;
+ default:
+ break;
}
return mp_const_none;
}
diff --git a/ports/esp32/machine_dac.c b/ports/esp32/machine_dac.c
index bd0804e..bb441c7 100644
--- a/ports/esp32/machine_dac.c
+++ b/ports/esp32/machine_dac.c
@@ -48,21 +48,28 @@
};
STATIC mp_obj_t mdac_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw,
- const mp_obj_t *args) {
+ const mp_obj_t *args) {
mp_arg_check_num(n_args, n_kw, 1, 1, true);
gpio_num_t pin_id = machine_pin_get_id(args[0]);
const mdac_obj_t *self = NULL;
for (int i = 0; i < MP_ARRAY_SIZE(mdac_obj); i++) {
- if (pin_id == mdac_obj[i].gpio_id) { self = &mdac_obj[i]; break; }
+ if (pin_id == mdac_obj[i].gpio_id) {
+ self = &mdac_obj[i];
+ break;
+ }
}
- if (!self) mp_raise_ValueError("invalid Pin for DAC");
+ if (!self) {
+ mp_raise_ValueError("invalid Pin for DAC");
+ }
esp_err_t err = dac_output_enable(self->dac_id);
if (err == ESP_OK) {
err = dac_output_voltage(self->dac_id, 0);
}
- if (err == ESP_OK) return MP_OBJ_FROM_PTR(self);
+ if (err == ESP_OK) {
+ return MP_OBJ_FROM_PTR(self);
+ }
mp_raise_ValueError("Parameter Error");
}
@@ -74,10 +81,14 @@
STATIC mp_obj_t mdac_write(mp_obj_t self_in, mp_obj_t value_in) {
mdac_obj_t *self = self_in;
int value = mp_obj_get_int(value_in);
- if (value < 0 || value > 255) mp_raise_ValueError("Value out of range");
+ if (value < 0 || value > 255) {
+ mp_raise_ValueError("Value out of range");
+ }
esp_err_t err = dac_output_voltage(self->dac_id, value);
- if (err == ESP_OK) return mp_const_none;
+ if (err == ESP_OK) {
+ return mp_const_none;
+ }
mp_raise_ValueError("Parameter Error");
}
MP_DEFINE_CONST_FUN_OBJ_2(mdac_write_obj, mdac_write);
diff --git a/ports/esp32/machine_hw_spi.c b/ports/esp32/machine_hw_spi.c
index af47711..163ca7b 100644
--- a/ports/esp32/machine_hw_spi.c
+++ b/ports/esp32/machine_hw_spi.c
@@ -94,16 +94,16 @@
}
STATIC void machine_hw_spi_init_internal(
- machine_hw_spi_obj_t *self,
- int8_t host,
- int32_t baudrate,
- int8_t polarity,
- int8_t phase,
- int8_t bits,
- int8_t firstbit,
- int8_t sck,
- int8_t mosi,
- int8_t miso) {
+ machine_hw_spi_obj_t *self,
+ int8_t host,
+ int32_t baudrate,
+ int8_t polarity,
+ int8_t phase,
+ int8_t bits,
+ int8_t firstbit,
+ int8_t sck,
+ int8_t mosi,
+ int8_t miso) {
// if we're not initialized, then we're
// implicitly 'changed', since this is the init routine
@@ -129,7 +129,7 @@
}
if (phase != -1 && phase != self->phase) {
- self->phase = phase;
+ self->phase = phase;
changed = true;
}
@@ -295,9 +295,9 @@
STATIC void machine_hw_spi_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
machine_hw_spi_obj_t *self = MP_OBJ_TO_PTR(self_in);
mp_printf(print, "SPI(id=%u, baudrate=%u, polarity=%u, phase=%u, bits=%u, firstbit=%u, sck=%d, mosi=%d, miso=%d)",
- self->host, self->baudrate, self->polarity,
- self->phase, self->bits, self->firstbit,
- self->sck, self->mosi, self->miso);
+ self->host, self->baudrate, self->polarity,
+ self->phase, self->bits, self->firstbit,
+ self->sck, self->mosi, self->miso);
}
STATIC void machine_hw_spi_init(mp_obj_base_t *self_in, size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
@@ -318,7 +318,7 @@
mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
mp_arg_parse_all(n_args, pos_args, kw_args, MP_ARRAY_SIZE(allowed_args),
- allowed_args, args);
+ allowed_args, args);
int8_t sck, mosi, miso;
if (args[ARG_sck].u_obj == MP_OBJ_NULL) {
@@ -346,8 +346,8 @@
}
machine_hw_spi_init_internal(self, args[ARG_id].u_int, args[ARG_baudrate].u_int,
- args[ARG_polarity].u_int, args[ARG_phase].u_int, args[ARG_bits].u_int,
- args[ARG_firstbit].u_int, sck, mosi, miso);
+ args[ARG_polarity].u_int, args[ARG_phase].u_int, args[ARG_bits].u_int,
+ args[ARG_firstbit].u_int, sck, mosi, miso);
}
mp_obj_t machine_hw_spi_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
diff --git a/ports/esp32/machine_i2c.c b/ports/esp32/machine_i2c.c
index 61a6807..67dae9c 100644
--- a/ports/esp32/machine_i2c.c
+++ b/ports/esp32/machine_i2c.c
@@ -134,7 +134,7 @@
}
// Get static peripheral object
- machine_hw_i2c_obj_t *self = (machine_hw_i2c_obj_t*)&machine_hw_i2c_obj[i2c_id];
+ machine_hw_i2c_obj_t *self = (machine_hw_i2c_obj_t *)&machine_hw_i2c_obj[i2c_id];
bool first_init = false;
if (self->base.type == NULL) {
@@ -175,5 +175,5 @@
.print = machine_hw_i2c_print,
.make_new = machine_hw_i2c_make_new,
.protocol = &machine_hw_i2c_p,
- .locals_dict = (mp_obj_dict_t*)&mp_machine_soft_i2c_locals_dict,
+ .locals_dict = (mp_obj_dict_t *)&mp_machine_soft_i2c_locals_dict,
};
diff --git a/ports/esp32/machine_pin.c b/ports/esp32/machine_pin.c
index cca7c0e..db853d0 100644
--- a/ports/esp32/machine_pin.c
+++ b/ports/esp32/machine_pin.c
@@ -202,7 +202,7 @@
int wanted_pin = mp_obj_get_int(args[0]);
const machine_pin_obj_t *self = NULL;
if (0 <= wanted_pin && wanted_pin < MP_ARRAY_SIZE(machine_pin_obj)) {
- self = (machine_pin_obj_t*)&machine_pin_obj[wanted_pin];
+ self = (machine_pin_obj_t *)&machine_pin_obj[wanted_pin];
}
if (self == NULL || self->base.type == NULL) {
mp_raise_ValueError("invalid pin");
@@ -316,7 +316,7 @@
gpio_isr_handler_remove(self->id);
MP_STATE_PORT(machine_pin_irq_handler)[self->id] = handler;
gpio_set_intr_type(self->id, trigger);
- gpio_isr_handler_add(self->id, machine_pin_isr_handler, (void*)self);
+ gpio_isr_handler_add(self->id, machine_pin_isr_handler, (void *)self);
}
}
@@ -365,7 +365,7 @@
STATIC MP_DEFINE_CONST_DICT(machine_pin_locals_dict, machine_pin_locals_dict_table);
STATIC const mp_pin_p_t pin_pin_p = {
- .ioctl = pin_ioctl,
+ .ioctl = pin_ioctl,
};
const mp_obj_type_t machine_pin_type = {
@@ -429,7 +429,7 @@
STATIC mp_obj_t machine_pin_irq_call(mp_obj_t self_in, size_t n_args, size_t n_kw, const mp_obj_t *args) {
machine_pin_irq_obj_t *self = self_in;
mp_arg_check_num(n_args, n_kw, 0, 0, false);
- machine_pin_isr_handler((void*)&machine_pin_obj[self->id]);
+ machine_pin_isr_handler((void *)&machine_pin_obj[self->id]);
return mp_const_none;
}
@@ -454,5 +454,5 @@
{ &mp_type_type },
.name = MP_QSTR_IRQ,
.call = machine_pin_irq_call,
- .locals_dict = (mp_obj_dict_t*)&machine_pin_irq_locals_dict,
+ .locals_dict = (mp_obj_dict_t *)&machine_pin_irq_locals_dict,
};
diff --git a/ports/esp32/machine_pwm.c b/ports/esp32/machine_pwm.c
index 6c66a66..c98b26c 100644
--- a/ports/esp32/machine_pwm.c
+++ b/ports/esp32/machine_pwm.c
@@ -120,7 +120,7 @@
}
STATIC void esp32_pwm_init_helper(esp32_pwm_obj_t *self,
- size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+ size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
enum { ARG_freq, ARG_duty };
static const mp_arg_t allowed_args[] = {
{ MP_QSTR_freq, MP_ARG_INT, {.u_int = -1} },
@@ -181,7 +181,7 @@
// Set duty cycle?
int dval = args[ARG_duty].u_int;
if (dval != -1) {
- dval &= ((1 << PWRES)-1);
+ dval &= ((1 << PWRES) - 1);
dval >>= PWRES - timer_cfg.duty_resolution;
ledc_set_duty(PWMODE, channel, dval);
ledc_update_duty(PWMODE, channel);
@@ -189,7 +189,7 @@
}
STATIC mp_obj_t esp32_pwm_make_new(const mp_obj_type_t *type,
- size_t n_args, size_t n_kw, const mp_obj_t *args) {
+ size_t n_args, size_t n_kw, const mp_obj_t *args) {
mp_arg_check_num(n_args, n_kw, 1, MP_OBJ_FUN_ARGS_MAX, true);
gpio_num_t pin_id = machine_pin_get_id(args[0]);
@@ -215,7 +215,7 @@
}
STATIC mp_obj_t esp32_pwm_init(size_t n_args,
- const mp_obj_t *args, mp_map_t *kw_args) {
+ const mp_obj_t *args, mp_map_t *kw_args) {
esp32_pwm_init_helper(args[0], n_args - 1, args + 1, kw_args);
return mp_const_none;
}
@@ -267,7 +267,7 @@
// set
duty = mp_obj_get_int(args[1]);
- duty &= ((1 << PWRES)-1);
+ duty &= ((1 << PWRES) - 1);
duty >>= PWRES - timer_cfg.duty_resolution;
ledc_set_duty(PWMODE, self->channel, duty);
ledc_update_duty(PWMODE, self->channel);
@@ -292,5 +292,5 @@
.name = MP_QSTR_PWM,
.print = esp32_pwm_print,
.make_new = esp32_pwm_make_new,
- .locals_dict = (mp_obj_dict_t*)&esp32_pwm_locals_dict,
+ .locals_dict = (mp_obj_dict_t *)&esp32_pwm_locals_dict,
};
diff --git a/ports/esp32/machine_rtc.c b/ports/esp32/machine_rtc.c
index eaa70e2..4498792 100644
--- a/ports/esp32/machine_rtc.c
+++ b/ports/esp32/machine_rtc.c
@@ -74,7 +74,7 @@
machine_rtc_config_t machine_rtc_config = {
.ext1_pins = 0,
.ext0_pin = -1
- };
+};
STATIC mp_obj_t machine_rtc_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
// check arguments
@@ -146,7 +146,7 @@
if (n_args == 1) {
// read RTC memory
uint8_t rtcram[MICROPY_HW_RTC_USER_MEM_MAX];
- memcpy((char*)rtcram, (char*)rtc_user_mem_data, rtc_user_mem_len);
+ memcpy((char *)rtcram, (char *)rtc_user_mem_data, rtc_user_mem_len);
return mp_obj_new_bytes(rtcram, rtc_user_mem_len);
} else {
// write RTC memory
diff --git a/ports/esp32/machine_rtc.h b/ports/esp32/machine_rtc.h
index e34deb9..6e70f74 100644
--- a/ports/esp32/machine_rtc.h
+++ b/ports/esp32/machine_rtc.h
@@ -4,7 +4,7 @@
* The MIT License (MIT)
*
* Copyright (c) 2017 "Eric Poulsen" <eric@zyxod.com>
- * Copyright (c) 2017 "Tom Manning" <tom@manningetal.com>
+ * Copyright (c) 2017 "Tom Manning" <tom@manningetal.com>
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
diff --git a/ports/esp32/machine_sdcard.c b/ports/esp32/machine_sdcard.c
index 8639e41..a11d0d6 100644
--- a/ports/esp32/machine_sdcard.c
+++ b/ports/esp32/machine_sdcard.c
@@ -72,18 +72,18 @@
#define _SECTOR_SIZE(self) (self->card.csd.sector_size)
STATIC esp_err_t check_esp_err(esp_err_t code) {
- switch(code) {
- case ESP_OK:
- return ESP_OK;
- case ESP_ERR_NO_MEM:
- code = MP_ENOMEM;
- break;
- case ESP_ERR_TIMEOUT:
- code = MP_ETIMEDOUT;
- break;
- case ESP_ERR_NOT_SUPPORTED:
- code = MP_EOPNOTSUPP;
- break;
+ switch (code) {
+ case ESP_OK:
+ return ESP_OK;
+ case ESP_ERR_NO_MEM:
+ code = MP_ENOMEM;
+ break;
+ case ESP_ERR_TIMEOUT:
+ code = MP_ETIMEDOUT;
+ break;
+ case ESP_ERR_NOT_SUPPORTED:
+ code = MP_EOPNOTSUPP;
+ break;
}
mp_raise_OSError(code);
@@ -100,7 +100,7 @@
#define SET_CONFIG_PIN(config, pin_var, arg_id) \
if (arg_vals[arg_id].u_obj != mp_const_none) \
- config.pin_var = pin_or_int(arg_vals[arg_id].u_obj)
+ config.pin_var = pin_or_int(arg_vals[arg_id].u_obj)
STATIC esp_err_t sdcard_ensure_card_init(sdcard_card_obj_t *self, bool force) {
if (force || !(self->flags & SDCARD_CARD_FLAGS_CARD_INIT_DONE)) {
@@ -165,15 +165,15 @@
mp_map_init_fixed_table(&kw_args, n_kw, args + n_args);
mp_arg_parse_all(n_args, args, &kw_args,
- MP_ARRAY_SIZE(allowed_args), allowed_args, arg_vals);
+ MP_ARRAY_SIZE(allowed_args), allowed_args, arg_vals);
DEBUG_printf(" slot=%d, width=%d, cd=%p, wp=%p",
- arg_vals[ARG_slot].u_int, arg_vals[ARG_width].u_int,
- arg_vals[ARG_cd].u_obj, arg_vals[ARG_wp].u_obj);
+ arg_vals[ARG_slot].u_int, arg_vals[ARG_width].u_int,
+ arg_vals[ARG_cd].u_obj, arg_vals[ARG_wp].u_obj);
DEBUG_printf(" miso=%p, mosi=%p, sck=%p, cs=%p",
- arg_vals[ARG_miso].u_obj, arg_vals[ARG_mosi].u_obj,
- arg_vals[ARG_sck].u_obj, arg_vals[ARG_cs].u_obj);
+ arg_vals[ARG_miso].u_obj, arg_vals[ARG_mosi].u_obj,
+ arg_vals[ARG_sck].u_obj, arg_vals[ARG_cs].u_obj);
int slot_num = arg_vals[ARG_slot].u_int;
if (slot_num < 0 || slot_num > 3) {
@@ -216,13 +216,14 @@
{
.gpio_miso = GPIO_NUM_19,
.gpio_mosi = GPIO_NUM_23,
- .gpio_sck = GPIO_NUM_18,
- .gpio_cs = GPIO_NUM_5,
- .gpio_cd = SDSPI_SLOT_NO_CD,
- .gpio_wp = SDSPI_SLOT_NO_WP,
+ .gpio_sck = GPIO_NUM_18,
+ .gpio_cs = GPIO_NUM_5,
+ .gpio_cd = SDSPI_SLOT_NO_CD,
+ .gpio_wp = SDSPI_SLOT_NO_WP,
.dma_channel = 2
},
- SDSPI_SLOT_CONFIG_DEFAULT() };
+ SDSPI_SLOT_CONFIG_DEFAULT()
+ };
DEBUG_printf(" Setting up SPI slot configuration");
sdspi_slot_config_t slot_config = slot_defaults[slot_num];
@@ -352,14 +353,16 @@
case MP_BLOCKDEV_IOCTL_BLOCK_COUNT:
err = sdcard_ensure_card_init(self, false);
- if (err != ESP_OK)
+ if (err != ESP_OK) {
return MP_OBJ_NEW_SMALL_INT(-1);
+ }
return MP_OBJ_NEW_SMALL_INT(self->card.csd.capacity);
case MP_BLOCKDEV_IOCTL_BLOCK_SIZE:
err = sdcard_ensure_card_init(self, false);
- if (err != ESP_OK)
+ if (err != ESP_OK) {
return MP_OBJ_NEW_SMALL_INT(-1);
+ }
return MP_OBJ_NEW_SMALL_INT(_SECTOR_SIZE(self));
default: // unknown command
@@ -384,7 +387,7 @@
{ &mp_type_type },
.name = MP_QSTR_SDCard,
.make_new = machine_sdcard_make_new,
- .locals_dict = (mp_obj_dict_t*)&machine_sdcard_locals_dict,
+ .locals_dict = (mp_obj_dict_t *)&machine_sdcard_locals_dict,
};
#endif // MICROPY_HW_ENABLE_SDCARD
diff --git a/ports/esp32/machine_timer.c b/ports/esp32/machine_timer.c
index c941d94..a4662c3 100644
--- a/ports/esp32/machine_timer.c
+++ b/ports/esp32/machine_timer.c
@@ -107,7 +107,7 @@
return t;
}
}
-
+
machine_timer_obj_t *self = m_new_obj(machine_timer_obj_t);
self->base.type = &machine_timer_type;
self->group = group;
@@ -160,7 +160,7 @@
check_esp_err(timer_set_counter_value(self->group, self->index, 0x00000000));
check_esp_err(timer_set_alarm_value(self->group, self->index, self->period));
check_esp_err(timer_enable_intr(self->group, self->index));
- check_esp_err(timer_isr_register(self->group, self->index, machine_timer_isr, (void*)self, TIMER_FLAGS, &self->handle));
+ check_esp_err(timer_isr_register(self->group, self->index, machine_timer_isr, (void *)self, TIMER_FLAGS, &self->handle));
check_esp_err(timer_start(self->group, self->index));
}
@@ -177,11 +177,11 @@
{ MP_QSTR_callback, MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_obj = mp_const_none} },
{ MP_QSTR_period, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 0xffffffff} },
{ MP_QSTR_tick_hz, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 1000} },
-#if MICROPY_PY_BUILTINS_FLOAT
+ #if MICROPY_PY_BUILTINS_FLOAT
{ MP_QSTR_freq, MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_obj = mp_const_none} },
-#else
+ #else
{ MP_QSTR_freq, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 0xffffffff} },
-#endif
+ #endif
};
machine_timer_disable(self);
@@ -189,15 +189,15 @@
mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
mp_arg_parse_all(n_args, pos_args, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
-#if MICROPY_PY_BUILTINS_FLOAT
+ #if MICROPY_PY_BUILTINS_FLOAT
if (args[ARG_freq].u_obj != mp_const_none) {
self->period = (uint64_t)(TIMER_SCALE / mp_obj_get_float(args[ARG_freq].u_obj));
}
-#else
+ #else
if (args[ARG_freq].u_int != 0xffffffff) {
self->period = TIMER_SCALE / ((uint64_t)args[ARG_freq].u_int);
}
-#endif
+ #endif
else {
self->period = (((uint64_t)args[ARG_period].u_int) * TIMER_SCALE) / args[ARG_tick_hz].u_int;
}
diff --git a/ports/esp32/machine_touchpad.c b/ports/esp32/machine_touchpad.c
index dd36bdd..63c06d2 100644
--- a/ports/esp32/machine_touchpad.c
+++ b/ports/esp32/machine_touchpad.c
@@ -56,15 +56,20 @@
};
STATIC mp_obj_t mtp_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw,
- const mp_obj_t *args) {
+ const mp_obj_t *args) {
mp_arg_check_num(n_args, n_kw, 1, 1, true);
gpio_num_t pin_id = machine_pin_get_id(args[0]);
const mtp_obj_t *self = NULL;
for (int i = 0; i < MP_ARRAY_SIZE(touchpad_obj); i++) {
- if (pin_id == touchpad_obj[i].gpio_id) { self = &touchpad_obj[i]; break; }
+ if (pin_id == touchpad_obj[i].gpio_id) {
+ self = &touchpad_obj[i];
+ break;
+ }
}
- if (!self) mp_raise_ValueError("invalid pin for touchpad");
+ if (!self) {
+ mp_raise_ValueError("invalid pin for touchpad");
+ }
static int initialized = 0;
if (!initialized) {
@@ -73,7 +78,9 @@
initialized = 1;
}
esp_err_t err = touch_pad_config(self->touchpad_id, 0);
- if (err == ESP_OK) return MP_OBJ_FROM_PTR(self);
+ if (err == ESP_OK) {
+ return MP_OBJ_FROM_PTR(self);
+ }
mp_raise_ValueError("Touch pad error");
}
@@ -81,7 +88,9 @@
mtp_obj_t *self = self_in;
uint16_t value = mp_obj_get_int(value_in);
esp_err_t err = touch_pad_config(self->touchpad_id, value);
- if (err == ESP_OK) return mp_const_none;
+ if (err == ESP_OK) {
+ return mp_const_none;
+ }
mp_raise_ValueError("Touch pad error");
}
MP_DEFINE_CONST_FUN_OBJ_2(mtp_config_obj, mtp_config);
@@ -90,7 +99,9 @@
mtp_obj_t *self = self_in;
uint16_t value;
esp_err_t err = touch_pad_read(self->touchpad_id, &value);
- if (err == ESP_OK) return MP_OBJ_NEW_SMALL_INT(value);
+ if (err == ESP_OK) {
+ return MP_OBJ_NEW_SMALL_INT(value);
+ }
mp_raise_ValueError("Touch pad error");
}
MP_DEFINE_CONST_FUN_OBJ_1(mtp_read_obj, mtp_read);
diff --git a/ports/esp32/machine_uart.c b/ports/esp32/machine_uart.c
index c62cd9c..15d4068 100644
--- a/ports/esp32/machine_uart.c
+++ b/ports/esp32/machine_uart.c
@@ -260,7 +260,7 @@
mp_raise_msg_varg(&mp_type_ValueError, "UART(%d) is disabled (dedicated to REPL)", uart_num);
}
- // Defaults
+ // Defaults
uart_config_t uartcfg = {
.baud_rate = 115200,
.data_bits = UART_DATA_8_BITS,
@@ -463,5 +463,5 @@
.getiter = mp_identity_getiter,
.iternext = mp_stream_unbuffered_iter,
.protocol = &uart_stream_p,
- .locals_dict = (mp_obj_dict_t*)&machine_uart_locals_dict,
+ .locals_dict = (mp_obj_dict_t *)&machine_uart_locals_dict,
};
diff --git a/ports/esp32/main.c b/ports/esp32/main.c
index d8705ee..8c416d0 100644
--- a/ports/esp32/main.c
+++ b/ports/esp32/main.c
@@ -79,7 +79,7 @@
#if CONFIG_ESP32_SPIRAM_SUPPORT || CONFIG_SPIRAM_SUPPORT
// Try to use the entire external SPIRAM directly for the heap
size_t mp_task_heap_size;
- void *mp_task_heap = (void*)0x3f800000;
+ void *mp_task_heap = (void *)0x3f800000;
switch (esp_spiram_get_chip_size()) {
case ESP_SPIRAM_SIZE_16MBITS:
mp_task_heap_size = 2 * 1024 * 1024;
diff --git a/ports/esp32/makeimg.py b/ports/esp32/makeimg.py
index aeedbff..9f27ed6 100644
--- a/ports/esp32/makeimg.py
+++ b/ports/esp32/makeimg.py
@@ -5,21 +5,21 @@
OFFSET_APPLICATION = 0x10000
files_in = [
- ('bootloader', OFFSET_BOOTLOADER, sys.argv[1]),
- ('partitions', OFFSET_PARTITIONS, sys.argv[2]),
- ('application', OFFSET_APPLICATION, sys.argv[3]),
+ ("bootloader", OFFSET_BOOTLOADER, sys.argv[1]),
+ ("partitions", OFFSET_PARTITIONS, sys.argv[2]),
+ ("application", OFFSET_APPLICATION, sys.argv[3]),
]
file_out = sys.argv[4]
cur_offset = OFFSET_BOOTLOADER
-with open(file_out, 'wb') as fout:
+with open(file_out, "wb") as fout:
for name, offset, file_in in files_in:
assert offset >= cur_offset
- fout.write(b'\xff' * (offset - cur_offset))
+ fout.write(b"\xff" * (offset - cur_offset))
cur_offset = offset
- with open(file_in, 'rb') as fin:
+ with open(file_in, "rb") as fin:
data = fin.read()
fout.write(data)
cur_offset += len(data)
- print('%-12s% 8d' % (name, len(data)))
- print('%-12s% 8d' % ('total', cur_offset))
+ print("%-12s% 8d" % (name, len(data)))
+ print("%-12s% 8d" % ("total", cur_offset))
diff --git a/ports/esp32/modesp.c b/ports/esp32/modesp.c
index 9584b78..369649c 100644
--- a/ports/esp32/modesp.c
+++ b/ports/esp32/modesp.c
@@ -119,7 +119,7 @@
mp_buffer_info_t bufinfo;
mp_get_buffer_raise(buf, &bufinfo, MP_BUFFER_READ);
esp_neopixel_write(mp_hal_get_pin_obj(pin),
- (uint8_t*)bufinfo.buf, bufinfo.len, mp_obj_get_int(timing));
+ (uint8_t *)bufinfo.buf, bufinfo.len, mp_obj_get_int(timing));
return mp_const_none;
}
STATIC MP_DEFINE_CONST_FUN_OBJ_3(esp_neopixel_write_obj, esp_neopixel_write_);
@@ -154,6 +154,6 @@
const mp_obj_module_t esp_module = {
.base = { &mp_type_module },
- .globals = (mp_obj_dict_t*)&esp_module_globals,
+ .globals = (mp_obj_dict_t *)&esp_module_globals,
};
diff --git a/ports/esp32/modesp32.c b/ports/esp32/modesp32.c
index 9597e0c..e6d9f80 100644
--- a/ports/esp32/modesp32.c
+++ b/ports/esp32/modesp32.c
@@ -166,5 +166,5 @@
const mp_obj_module_t esp32_module = {
.base = { &mp_type_module },
- .globals = (mp_obj_dict_t*)&esp32_module_globals,
+ .globals = (mp_obj_dict_t *)&esp32_module_globals,
};
diff --git a/ports/esp32/modesp32.h b/ports/esp32/modesp32.h
index f04bdba..f4c0491 100644
--- a/ports/esp32/modesp32.h
+++ b/ports/esp32/modesp32.h
@@ -2,10 +2,10 @@
#define MICROPY_INCLUDED_ESP32_MODESP32_H
#define RTC_VALID_EXT_PINS \
-( \
- (1ll << 0) | \
- (1ll << 2) | \
- (1ll << 4) | \
+ ( \
+ (1ll << 0) | \
+ (1ll << 2) | \
+ (1ll << 4) | \
(1ll << 12) | \
(1ll << 13) | \
(1ll << 14) | \
@@ -21,7 +21,7 @@
(1ll << 37) | \
(1ll << 38) | \
(1ll << 39) \
-)
+ )
#define RTC_LAST_EXT_PIN 39
#define RTC_IS_VALID_EXT_PIN(pin_id) ((1ll << (pin_id)) & RTC_VALID_EXT_PINS)
diff --git a/ports/esp32/modmachine.c b/ports/esp32/modmachine.c
index 234809f..f2af502 100644
--- a/ports/esp32/modmachine.c
+++ b/ports/esp32/modmachine.c
@@ -124,7 +124,7 @@
}
}
- switch(wake_type) {
+ switch (wake_type) {
case MACHINE_WAKE_SLEEP:
esp_light_sleep_start();
break;
@@ -146,7 +146,7 @@
STATIC MP_DEFINE_CONST_FUN_OBJ_KW(machine_deepsleep_obj, 0, machine_deepsleep);
STATIC mp_obj_t machine_reset_cause(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
- switch(rtc_get_reset_reason(0)) {
+ switch (rtc_get_reset_reason(0)) {
case POWERON_RESET:
return MP_OBJ_NEW_SMALL_INT(MP_PWRON_RESET);
break;
@@ -289,7 +289,7 @@
const mp_obj_module_t mp_module_machine = {
.base = { &mp_type_module },
- .globals = (mp_obj_dict_t*)&machine_module_globals,
+ .globals = (mp_obj_dict_t *)&machine_module_globals,
};
#endif // MICROPY_PY_MACHINE
diff --git a/ports/esp32/modnetwork.c b/ports/esp32/modnetwork.c
index 29d1ea3..c573b40 100644
--- a/ports/esp32/modnetwork.c
+++ b/ports/esp32/modnetwork.c
@@ -58,52 +58,54 @@
#define MODNETWORK_INCLUDE_CONSTANTS (1)
NORETURN void _esp_exceptions(esp_err_t e) {
- switch (e) {
- case ESP_ERR_WIFI_NOT_INIT:
- mp_raise_msg(&mp_type_OSError, "Wifi Not Initialized");
- case ESP_ERR_WIFI_NOT_STARTED:
- mp_raise_msg(&mp_type_OSError, "Wifi Not Started");
- case ESP_ERR_WIFI_NOT_STOPPED:
- mp_raise_msg(&mp_type_OSError, "Wifi Not Stopped");
- case ESP_ERR_WIFI_IF:
- mp_raise_msg(&mp_type_OSError, "Wifi Invalid Interface");
- case ESP_ERR_WIFI_MODE:
- mp_raise_msg(&mp_type_OSError, "Wifi Invalid Mode");
- case ESP_ERR_WIFI_STATE:
- mp_raise_msg(&mp_type_OSError, "Wifi Internal State Error");
- case ESP_ERR_WIFI_CONN:
- mp_raise_msg(&mp_type_OSError, "Wifi Internal Error");
- case ESP_ERR_WIFI_NVS:
- mp_raise_msg(&mp_type_OSError, "Wifi Internal NVS Error");
- case ESP_ERR_WIFI_MAC:
- mp_raise_msg(&mp_type_OSError, "Wifi Invalid MAC Address");
- case ESP_ERR_WIFI_SSID:
- mp_raise_msg(&mp_type_OSError, "Wifi SSID Invalid");
- case ESP_ERR_WIFI_PASSWORD:
- mp_raise_msg(&mp_type_OSError, "Wifi Invalid Password");
- case ESP_ERR_WIFI_TIMEOUT:
- mp_raise_OSError(MP_ETIMEDOUT);
- case ESP_ERR_WIFI_WAKE_FAIL:
- mp_raise_msg(&mp_type_OSError, "Wifi Wakeup Failure");
- case ESP_ERR_WIFI_WOULD_BLOCK:
- mp_raise_msg(&mp_type_OSError, "Wifi Would Block");
- case ESP_ERR_WIFI_NOT_CONNECT:
- mp_raise_msg(&mp_type_OSError, "Wifi Not Connected");
- case ESP_ERR_TCPIP_ADAPTER_INVALID_PARAMS:
- mp_raise_msg(&mp_type_OSError, "TCP/IP Invalid Parameters");
- case ESP_ERR_TCPIP_ADAPTER_IF_NOT_READY:
- mp_raise_msg(&mp_type_OSError, "TCP/IP IF Not Ready");
- case ESP_ERR_TCPIP_ADAPTER_DHCPC_START_FAILED:
- mp_raise_msg(&mp_type_OSError, "TCP/IP DHCP Client Start Failed");
- case ESP_ERR_TCPIP_ADAPTER_NO_MEM:
- mp_raise_OSError(MP_ENOMEM);
- default:
- mp_raise_msg_varg( &mp_type_RuntimeError, "Wifi Unknown Error 0x%04x", e);
- }
+ switch (e) {
+ case ESP_ERR_WIFI_NOT_INIT:
+ mp_raise_msg(&mp_type_OSError, "Wifi Not Initialized");
+ case ESP_ERR_WIFI_NOT_STARTED:
+ mp_raise_msg(&mp_type_OSError, "Wifi Not Started");
+ case ESP_ERR_WIFI_NOT_STOPPED:
+ mp_raise_msg(&mp_type_OSError, "Wifi Not Stopped");
+ case ESP_ERR_WIFI_IF:
+ mp_raise_msg(&mp_type_OSError, "Wifi Invalid Interface");
+ case ESP_ERR_WIFI_MODE:
+ mp_raise_msg(&mp_type_OSError, "Wifi Invalid Mode");
+ case ESP_ERR_WIFI_STATE:
+ mp_raise_msg(&mp_type_OSError, "Wifi Internal State Error");
+ case ESP_ERR_WIFI_CONN:
+ mp_raise_msg(&mp_type_OSError, "Wifi Internal Error");
+ case ESP_ERR_WIFI_NVS:
+ mp_raise_msg(&mp_type_OSError, "Wifi Internal NVS Error");
+ case ESP_ERR_WIFI_MAC:
+ mp_raise_msg(&mp_type_OSError, "Wifi Invalid MAC Address");
+ case ESP_ERR_WIFI_SSID:
+ mp_raise_msg(&mp_type_OSError, "Wifi SSID Invalid");
+ case ESP_ERR_WIFI_PASSWORD:
+ mp_raise_msg(&mp_type_OSError, "Wifi Invalid Password");
+ case ESP_ERR_WIFI_TIMEOUT:
+ mp_raise_OSError(MP_ETIMEDOUT);
+ case ESP_ERR_WIFI_WAKE_FAIL:
+ mp_raise_msg(&mp_type_OSError, "Wifi Wakeup Failure");
+ case ESP_ERR_WIFI_WOULD_BLOCK:
+ mp_raise_msg(&mp_type_OSError, "Wifi Would Block");
+ case ESP_ERR_WIFI_NOT_CONNECT:
+ mp_raise_msg(&mp_type_OSError, "Wifi Not Connected");
+ case ESP_ERR_TCPIP_ADAPTER_INVALID_PARAMS:
+ mp_raise_msg(&mp_type_OSError, "TCP/IP Invalid Parameters");
+ case ESP_ERR_TCPIP_ADAPTER_IF_NOT_READY:
+ mp_raise_msg(&mp_type_OSError, "TCP/IP IF Not Ready");
+ case ESP_ERR_TCPIP_ADAPTER_DHCPC_START_FAILED:
+ mp_raise_msg(&mp_type_OSError, "TCP/IP DHCP Client Start Failed");
+ case ESP_ERR_TCPIP_ADAPTER_NO_MEM:
+ mp_raise_OSError(MP_ENOMEM);
+ default:
+ mp_raise_msg_varg( &mp_type_RuntimeError, "Wifi Unknown Error 0x%04x", e);
+ }
}
static inline void esp_exceptions(esp_err_t e) {
- if (e != ESP_OK) _esp_exceptions(e);
+ if (e != ESP_OK) {
+ _esp_exceptions(e);
+ }
}
#define ESP_EXCEPTIONS(x) do { esp_exceptions(x); } while (0);
@@ -138,93 +140,93 @@
// This function is called by the system-event task and so runs in a different
// thread to the main MicroPython task. It must not raise any Python exceptions.
static esp_err_t event_handler(void *ctx, system_event_t *event) {
- switch(event->event_id) {
- case SYSTEM_EVENT_STA_START:
- ESP_LOGI("wifi", "STA_START");
- break;
- case SYSTEM_EVENT_STA_CONNECTED:
- ESP_LOGI("network", "CONNECTED");
- break;
- case SYSTEM_EVENT_STA_GOT_IP:
- ESP_LOGI("network", "GOT_IP");
- wifi_sta_connected = true;
- wifi_sta_disconn_reason = 0; // Success so clear error. (in case of new error will be replaced anyway)
- #if MICROPY_HW_ENABLE_MDNS_QUERIES || MICROPY_HW_ENABLE_MDNS_RESPONDER
- if (!mdns_initialised) {
- mdns_init();
- #if MICROPY_HW_ENABLE_MDNS_RESPONDER
- const char *hostname = NULL;
- if (tcpip_adapter_get_hostname(WIFI_IF_STA, &hostname) != ESP_OK || hostname == NULL) {
- hostname = "esp32";
+ switch (event->event_id) {
+ case SYSTEM_EVENT_STA_START:
+ ESP_LOGI("wifi", "STA_START");
+ break;
+ case SYSTEM_EVENT_STA_CONNECTED:
+ ESP_LOGI("network", "CONNECTED");
+ break;
+ case SYSTEM_EVENT_STA_GOT_IP:
+ ESP_LOGI("network", "GOT_IP");
+ wifi_sta_connected = true;
+ wifi_sta_disconn_reason = 0; // Success so clear error. (in case of new error will be replaced anyway)
+ #if MICROPY_HW_ENABLE_MDNS_QUERIES || MICROPY_HW_ENABLE_MDNS_RESPONDER
+ if (!mdns_initialised) {
+ mdns_init();
+ #if MICROPY_HW_ENABLE_MDNS_RESPONDER
+ const char *hostname = NULL;
+ if (tcpip_adapter_get_hostname(WIFI_IF_STA, &hostname) != ESP_OK || hostname == NULL) {
+ hostname = "esp32";
+ }
+ mdns_hostname_set(hostname);
+ mdns_instance_name_set(hostname);
+ #endif
+ mdns_initialised = true;
}
- mdns_hostname_set(hostname);
- mdns_instance_name_set(hostname);
#endif
- mdns_initialised = true;
- }
- #endif
- break;
- case SYSTEM_EVENT_STA_DISCONNECTED: {
- // This is a workaround as ESP32 WiFi libs don't currently
- // auto-reassociate.
- system_event_sta_disconnected_t *disconn = &event->event_info.disconnected;
- char *message = "";
- wifi_sta_disconn_reason = disconn->reason;
- switch (disconn->reason) {
- case WIFI_REASON_BEACON_TIMEOUT:
- // AP has dropped out; try to reconnect.
- message = "\nbeacon timeout";
- break;
- case WIFI_REASON_NO_AP_FOUND:
- // AP may not exist, or it may have momentarily dropped out; try to reconnect.
- message = "\nno AP found";
- break;
- case WIFI_REASON_AUTH_FAIL:
- // Password may be wrong, or it just failed to connect; try to reconnect.
- message = "\nauthentication failed";
- break;
- default:
- // Let other errors through and try to reconnect.
- break;
- }
- ESP_LOGI("wifi", "STA_DISCONNECTED, reason:%d%s", disconn->reason, message);
+ break;
+ case SYSTEM_EVENT_STA_DISCONNECTED: {
+ // This is a workaround as ESP32 WiFi libs don't currently
+ // auto-reassociate.
+ system_event_sta_disconnected_t *disconn = &event->event_info.disconnected;
+ char *message = "";
+ wifi_sta_disconn_reason = disconn->reason;
+ switch (disconn->reason) {
+ case WIFI_REASON_BEACON_TIMEOUT:
+ // AP has dropped out; try to reconnect.
+ message = "\nbeacon timeout";
+ break;
+ case WIFI_REASON_NO_AP_FOUND:
+ // AP may not exist, or it may have momentarily dropped out; try to reconnect.
+ message = "\nno AP found";
+ break;
+ case WIFI_REASON_AUTH_FAIL:
+ // Password may be wrong, or it just failed to connect; try to reconnect.
+ message = "\nauthentication failed";
+ break;
+ default:
+ // Let other errors through and try to reconnect.
+ break;
+ }
+ ESP_LOGI("wifi", "STA_DISCONNECTED, reason:%d%s", disconn->reason, message);
- wifi_sta_connected = false;
- if (wifi_sta_connect_requested) {
- wifi_mode_t mode;
- if (esp_wifi_get_mode(&mode) == ESP_OK) {
- if (mode & WIFI_MODE_STA) {
- // STA is active so attempt to reconnect.
- esp_err_t e = esp_wifi_connect();
- if (e != ESP_OK) {
- ESP_LOGI("wifi", "error attempting to reconnect: 0x%04x", e);
+ wifi_sta_connected = false;
+ if (wifi_sta_connect_requested) {
+ wifi_mode_t mode;
+ if (esp_wifi_get_mode(&mode) == ESP_OK) {
+ if (mode & WIFI_MODE_STA) {
+ // STA is active so attempt to reconnect.
+ esp_err_t e = esp_wifi_connect();
+ if (e != ESP_OK) {
+ ESP_LOGI("wifi", "error attempting to reconnect: 0x%04x", e);
+ }
}
}
}
+ break;
}
- break;
- }
- case SYSTEM_EVENT_GOT_IP6:
- ESP_LOGI("network", "Got IPv6");
- break;
- case SYSTEM_EVENT_ETH_START:
- ESP_LOGI("ethernet", "start");
- break;
- case SYSTEM_EVENT_ETH_STOP:
- ESP_LOGI("ethernet", "stop");
- break;
- case SYSTEM_EVENT_ETH_CONNECTED:
- ESP_LOGI("ethernet", "LAN cable connected");
- break;
- case SYSTEM_EVENT_ETH_DISCONNECTED:
- ESP_LOGI("ethernet", "LAN cable disconnected");
- break;
- case SYSTEM_EVENT_ETH_GOT_IP:
- ESP_LOGI("ethernet", "Got IP");
- break;
- default:
- ESP_LOGI("network", "event %d", event->event_id);
- break;
+ case SYSTEM_EVENT_GOT_IP6:
+ ESP_LOGI("network", "Got IPv6");
+ break;
+ case SYSTEM_EVENT_ETH_START:
+ ESP_LOGI("ethernet", "start");
+ break;
+ case SYSTEM_EVENT_ETH_STOP:
+ ESP_LOGI("ethernet", "stop");
+ break;
+ case SYSTEM_EVENT_ETH_CONNECTED:
+ ESP_LOGI("ethernet", "LAN cable connected");
+ break;
+ case SYSTEM_EVENT_ETH_DISCONNECTED:
+ ESP_LOGI("ethernet", "LAN cable disconnected");
+ break;
+ case SYSTEM_EVENT_ETH_GOT_IP:
+ ESP_LOGI("ethernet", "Got IP");
+ break;
+ default:
+ ESP_LOGI("network", "event %d", event->event_id);
+ break;
}
return ESP_OK;
}
@@ -409,7 +411,7 @@
require_if(args[0], WIFI_IF_AP);
wifi_sta_list_t station_list;
ESP_EXCEPTIONS(esp_wifi_ap_get_sta_list(&station_list));
- wifi_sta_info_t *stations = (wifi_sta_info_t*)station_list.sta;
+ wifi_sta_info_t *stations = (wifi_sta_info_t *)station_list.sta;
mp_obj_t list = mp_obj_new_list(0, NULL);
for (int i = 0; i < station_list.num; ++i) {
mp_obj_tuple_t *t = mp_obj_new_tuple(1, NULL);
@@ -493,10 +495,10 @@
if (n_args == 1) {
// get
mp_obj_t tuple[4] = {
- netutils_format_ipv4_addr((uint8_t*)&info.ip, NETUTILS_BIG),
- netutils_format_ipv4_addr((uint8_t*)&info.netmask, NETUTILS_BIG),
- netutils_format_ipv4_addr((uint8_t*)&info.gw, NETUTILS_BIG),
- netutils_format_ipv4_addr((uint8_t*)&dns_info.ip, NETUTILS_BIG),
+ netutils_format_ipv4_addr((uint8_t *)&info.ip, NETUTILS_BIG),
+ netutils_format_ipv4_addr((uint8_t *)&info.netmask, NETUTILS_BIG),
+ netutils_format_ipv4_addr((uint8_t *)&info.gw, NETUTILS_BIG),
+ netutils_format_ipv4_addr((uint8_t *)&dns_info.ip, NETUTILS_BIG),
};
return mp_obj_new_tuple(4, tuple);
} else {
@@ -504,28 +506,32 @@
if (mp_obj_is_type(args[1], &mp_type_tuple) || mp_obj_is_type(args[1], &mp_type_list)) {
mp_obj_t *items;
mp_obj_get_array_fixed_n(args[1], 4, &items);
- netutils_parse_ipv4_addr(items[0], (void*)&info.ip, NETUTILS_BIG);
+ netutils_parse_ipv4_addr(items[0], (void *)&info.ip, NETUTILS_BIG);
if (mp_obj_is_integer(items[1])) {
// allow numeric netmask, i.e.:
// 24 -> 255.255.255.0
// 16 -> 255.255.0.0
// etc...
- uint32_t* m = (uint32_t*)&info.netmask;
+ uint32_t *m = (uint32_t *)&info.netmask;
*m = htonl(0xffffffff << (32 - mp_obj_get_int(items[1])));
} else {
- netutils_parse_ipv4_addr(items[1], (void*)&info.netmask, NETUTILS_BIG);
+ netutils_parse_ipv4_addr(items[1], (void *)&info.netmask, NETUTILS_BIG);
}
- netutils_parse_ipv4_addr(items[2], (void*)&info.gw, NETUTILS_BIG);
- netutils_parse_ipv4_addr(items[3], (void*)&dns_info.ip, NETUTILS_BIG);
+ netutils_parse_ipv4_addr(items[2], (void *)&info.gw, NETUTILS_BIG);
+ netutils_parse_ipv4_addr(items[3], (void *)&dns_info.ip, NETUTILS_BIG);
// To set a static IP we have to disable DHCP first
if (self->if_id == WIFI_IF_STA || self->if_id == ESP_IF_ETH) {
esp_err_t e = tcpip_adapter_dhcpc_stop(self->if_id);
- if (e != ESP_OK && e != ESP_ERR_TCPIP_ADAPTER_DHCP_ALREADY_STOPPED) _esp_exceptions(e);
+ if (e != ESP_OK && e != ESP_ERR_TCPIP_ADAPTER_DHCP_ALREADY_STOPPED) {
+ _esp_exceptions(e);
+ }
ESP_EXCEPTIONS(tcpip_adapter_set_ip_info(self->if_id, &info));
ESP_EXCEPTIONS(tcpip_adapter_set_dns_info(self->if_id, TCPIP_ADAPTER_DNS_MAIN, &dns_info));
} else if (self->if_id == WIFI_IF_AP) {
esp_err_t e = tcpip_adapter_dhcps_stop(WIFI_IF_AP);
- if (e != ESP_OK && e != ESP_ERR_TCPIP_ADAPTER_DHCP_ALREADY_STOPPED) _esp_exceptions(e);
+ if (e != ESP_OK && e != ESP_ERR_TCPIP_ADAPTER_DHCP_ALREADY_STOPPED) {
+ _esp_exceptions(e);
+ }
ESP_EXCEPTIONS(tcpip_adapter_set_ip_info(WIFI_IF_AP, &info));
ESP_EXCEPTIONS(tcpip_adapter_set_dns_info(WIFI_IF_AP, TCPIP_ADAPTER_DNS_MAIN, &dns_info));
ESP_EXCEPTIONS(tcpip_adapter_dhcps_start(WIFI_IF_AP));
@@ -651,28 +657,28 @@
case QS(MP_QSTR_mac): {
uint8_t mac[6];
switch (self->if_id) {
- case WIFI_IF_AP: // fallthrough intentional
- case WIFI_IF_STA:
- ESP_EXCEPTIONS(esp_wifi_get_mac(self->if_id, mac));
- return mp_obj_new_bytes(mac, sizeof(mac));
+ case WIFI_IF_AP: // fallthrough intentional
+ case WIFI_IF_STA:
+ ESP_EXCEPTIONS(esp_wifi_get_mac(self->if_id, mac));
+ return mp_obj_new_bytes(mac, sizeof(mac));
- #if !MICROPY_ESP_IDF_4
- case ESP_IF_ETH:
- esp_eth_get_mac(mac);
- return mp_obj_new_bytes(mac, sizeof(mac));
- #endif
+ #if !MICROPY_ESP_IDF_4
+ case ESP_IF_ETH:
+ esp_eth_get_mac(mac);
+ return mp_obj_new_bytes(mac, sizeof(mac));
+ #endif
- default:
- goto unknown;
+ default:
+ goto unknown;
}
}
case QS(MP_QSTR_essid):
switch (self->if_id) {
case WIFI_IF_STA:
- val = mp_obj_new_str((char*)cfg.sta.ssid, strlen((char*)cfg.sta.ssid));
+ val = mp_obj_new_str((char *)cfg.sta.ssid, strlen((char *)cfg.sta.ssid));
break;
case WIFI_IF_AP:
- val = mp_obj_new_str((char*)cfg.ap.ssid, cfg.ap.ssid_len);
+ val = mp_obj_new_str((char *)cfg.ap.ssid, cfg.ap.ssid_len);
break;
default:
req_if = WIFI_IF_AP;
@@ -704,7 +710,7 @@
goto unknown;
}
- #undef QS
+#undef QS
// We post-check interface requirements to save on code size
if (req_if >= 0) {
@@ -753,7 +759,7 @@
#endif
{ MP_ROM_QSTR(MP_QSTR_phy_mode), MP_ROM_PTR(&esp_phy_mode_obj) },
-#if MODNETWORK_INCLUDE_CONSTANTS
+ #if MODNETWORK_INCLUDE_CONSTANTS
{ MP_ROM_QSTR(MP_QSTR_STA_IF), MP_ROM_INT(WIFI_IF_STA)},
{ MP_ROM_QSTR(MP_QSTR_AP_IF), MP_ROM_INT(WIFI_IF_AP)},
@@ -790,12 +796,12 @@
{ MP_ROM_QSTR(MP_QSTR_STAT_BEACON_TIMEOUT), MP_ROM_INT(WIFI_REASON_BEACON_TIMEOUT)},
{ MP_ROM_QSTR(MP_QSTR_STAT_ASSOC_FAIL), MP_ROM_INT(WIFI_REASON_ASSOC_FAIL)},
{ MP_ROM_QSTR(MP_QSTR_STAT_HANDSHAKE_TIMEOUT), MP_ROM_INT(WIFI_REASON_HANDSHAKE_TIMEOUT)},
-#endif
+ #endif
};
STATIC MP_DEFINE_CONST_DICT(mp_module_network_globals, mp_module_network_globals_table);
const mp_obj_module_t mp_module_network = {
.base = { &mp_type_module },
- .globals = (mp_obj_dict_t*)&mp_module_network_globals,
+ .globals = (mp_obj_dict_t *)&mp_module_network_globals,
};
diff --git a/ports/esp32/modsocket.c b/ports/esp32/modsocket.c
index be2a749..1252a18 100644
--- a/ports/esp32/modsocket.c
+++ b/ports/esp32/modsocket.c
@@ -184,7 +184,7 @@
struct ip4_addr addr = {0};
esp_err_t err = mdns_query_a(nodename_no_local, MDNS_QUERY_TIMEOUT_MS, &addr);
if (err != ESP_OK) {
- if (err == ESP_ERR_NOT_FOUND){
+ if (err == ESP_ERR_NOT_FOUND) {
*res = NULL;
return 0;
}
@@ -199,16 +199,16 @@
}
memset(ai, 0, sizeof(struct addrinfo) + sizeof(struct sockaddr_storage));
- struct sockaddr_in *sa = (struct sockaddr_in*)((uint8_t*)ai + sizeof(struct addrinfo));
+ struct sockaddr_in *sa = (struct sockaddr_in *)((uint8_t *)ai + sizeof(struct addrinfo));
inet_addr_from_ip4addr(&sa->sin_addr, &addr);
sa->sin_family = AF_INET;
sa->sin_len = sizeof(struct sockaddr_in);
sa->sin_port = lwip_htons((u16_t)atoi(servname));
ai->ai_family = AF_INET;
- ai->ai_canonname = ((char*)sa + sizeof(struct sockaddr_storage));
+ ai->ai_canonname = ((char *)sa + sizeof(struct sockaddr_storage));
memcpy(ai->ai_canonname, nodename, nodename_len + 1);
ai->ai_addrlen = sizeof(struct sockaddr_storage);
- ai->ai_addr = (struct sockaddr*)sa;
+ ai->ai_addr = (struct sockaddr *)sa;
*res = ai;
return 0;
@@ -293,7 +293,9 @@
_socket_getaddrinfo(arg1, &res);
int r = lwip_bind(self->fd, res->ai_addr, res->ai_addrlen);
lwip_freeaddrinfo(res);
- if (r < 0) exception_from_errno(errno);
+ if (r < 0) {
+ exception_from_errno(errno);
+ }
return mp_const_none;
}
STATIC MP_DEFINE_CONST_FUN_OBJ_2(socket_bind_obj, socket_bind);
@@ -302,7 +304,9 @@
socket_obj_t *self = MP_OBJ_TO_PTR(arg0);
int backlog = mp_obj_get_int(arg1);
int r = lwip_listen(self->fd, backlog);
- if (r < 0) exception_from_errno(errno);
+ if (r < 0) {
+ exception_from_errno(errno);
+ }
return mp_const_none;
}
STATIC MP_DEFINE_CONST_FUN_OBJ_2(socket_listen_obj, socket_listen);
@@ -314,12 +318,16 @@
socklen_t addr_len = sizeof(addr);
int new_fd = -1;
- for (int i=0; i<=self->retries; i++) {
+ for (int i = 0; i <= self->retries; i++) {
MP_THREAD_GIL_EXIT();
new_fd = lwip_accept(self->fd, &addr, &addr_len);
MP_THREAD_GIL_ENTER();
- if (new_fd >= 0) break;
- if (errno != EAGAIN) exception_from_errno(errno);
+ if (new_fd >= 0) {
+ break;
+ }
+ if (errno != EAGAIN) {
+ exception_from_errno(errno);
+ }
check_for_exceptions();
}
if (new_fd < 0) {
@@ -341,8 +349,8 @@
_socket_settimeout(sock, UINT64_MAX);
// make the return value
- uint8_t *ip = (uint8_t*)&((struct sockaddr_in*)&addr)->sin_addr;
- mp_uint_t port = lwip_ntohs(((struct sockaddr_in*)&addr)->sin_port);
+ uint8_t *ip = (uint8_t *)&((struct sockaddr_in *)&addr)->sin_addr;
+ mp_uint_t port = lwip_ntohs(((struct sockaddr_in *)&addr)->sin_port);
mp_obj_tuple_t *client = mp_obj_new_tuple(2, NULL);
client->items[0] = sock;
client->items[1] = netutils_format_inet_addr(ip, port, NETUTILS_BIG);
@@ -384,7 +392,7 @@
break;
}
- #if MICROPY_PY_USOCKET_EVENTS
+ #if MICROPY_PY_USOCKET_EVENTS
// level: SOL_SOCKET
// special "register callback" option
case 20: {
@@ -401,7 +409,7 @@
}
break;
}
- #endif
+ #endif
// level: IPPROTO_IP
case IP_ADD_MEMBERSHIP: {
@@ -412,7 +420,7 @@
}
// POSIX setsockopt has order: group addr, if addr, lwIP has it vice-versa
- err_t err = igmp_joingroup((const ip4_addr_t*)bufinfo.buf + 1, bufinfo.buf);
+ err_t err = igmp_joingroup((const ip4_addr_t *)bufinfo.buf + 1, bufinfo.buf);
if (err != ERR_OK) {
mp_raise_OSError(-err);
}
@@ -445,8 +453,9 @@
STATIC mp_obj_t socket_settimeout(const mp_obj_t arg0, const mp_obj_t arg1) {
socket_obj_t *self = MP_OBJ_TO_PTR(arg0);
- if (arg1 == mp_const_none) _socket_settimeout(self, UINT64_MAX);
- else {
+ if (arg1 == mp_const_none) {
+ _socket_settimeout(self, UINT64_MAX);
+ } else {
#if MICROPY_PY_BUILTINS_FLOAT
_socket_settimeout(self, mp_obj_get_float(arg1) * 1000L);
#else
@@ -459,8 +468,11 @@
STATIC mp_obj_t socket_setblocking(const mp_obj_t arg0, const mp_obj_t arg1) {
socket_obj_t *self = MP_OBJ_TO_PTR(arg0);
- if (mp_obj_is_true(arg1)) _socket_settimeout(self, UINT64_MAX);
- else _socket_settimeout(self, 0);
+ if (mp_obj_is_true(arg1)) {
+ _socket_settimeout(self, UINT64_MAX);
+ } else {
+ _socket_settimeout(self, 0);
+ }
return mp_const_none;
}
STATIC MP_DEFINE_CONST_FUN_OBJ_2(socket_setblocking_obj, socket_setblocking);
@@ -518,7 +530,7 @@
}
mp_obj_t _socket_recvfrom(mp_obj_t self_in, mp_obj_t len_in,
- struct sockaddr *from, socklen_t *from_len) {
+ struct sockaddr *from, socklen_t *from_len) {
size_t len = mp_obj_get_int(len_in);
vstr_t vstr;
vstr_init_len(&vstr, len);
@@ -545,8 +557,8 @@
mp_obj_t tuple[2];
tuple[0] = _socket_recvfrom(self_in, len_in, &from, &fromlen);
- uint8_t *ip = (uint8_t*)&((struct sockaddr_in*)&from)->sin_addr;
- mp_uint_t port = lwip_ntohs(((struct sockaddr_in*)&from)->sin_port);
+ uint8_t *ip = (uint8_t *)&((struct sockaddr_in *)&from)->sin_addr;
+ mp_uint_t port = lwip_ntohs(((struct sockaddr_in *)&from)->sin_port);
tuple[1] = netutils_format_inet_addr(ip, port, NETUTILS_BIG);
return mp_obj_new_tuple(2, tuple);
@@ -555,15 +567,21 @@
int _socket_send(socket_obj_t *sock, const char *data, size_t datalen) {
int sentlen = 0;
- for (int i=0; i<=sock->retries && sentlen < datalen; i++) {
+ for (int i = 0; i <= sock->retries && sentlen < datalen; i++) {
MP_THREAD_GIL_EXIT();
- int r = lwip_write(sock->fd, data+sentlen, datalen-sentlen);
+ int r = lwip_write(sock->fd, data + sentlen, datalen - sentlen);
MP_THREAD_GIL_ENTER();
- if (r < 0 && errno != EWOULDBLOCK) exception_from_errno(errno);
- if (r > 0) sentlen += r;
+ if (r < 0 && errno != EWOULDBLOCK) {
+ exception_from_errno(errno);
+ }
+ if (r > 0) {
+ sentlen += r;
+ }
check_for_exceptions();
}
- if (sentlen == 0) mp_raise_OSError(MP_ETIMEDOUT);
+ if (sentlen == 0) {
+ mp_raise_OSError(MP_ETIMEDOUT);
+ }
return sentlen;
}
@@ -583,7 +601,9 @@
mp_buffer_info_t bufinfo;
mp_get_buffer_raise(arg1, &bufinfo, MP_BUFFER_READ);
int r = _socket_send(sock, bufinfo.buf, bufinfo.len);
- if (r < bufinfo.len) mp_raise_OSError(MP_ETIMEDOUT);
+ if (r < bufinfo.len) {
+ mp_raise_OSError(MP_ETIMEDOUT);
+ }
return mp_const_none;
}
STATIC MP_DEFINE_CONST_FUN_OBJ_2(socket_sendall_obj, socket_sendall);
@@ -599,14 +619,16 @@
struct sockaddr_in to;
to.sin_len = sizeof(to);
to.sin_family = AF_INET;
- to.sin_port = lwip_htons(netutils_parse_inet_addr(addr_in, (uint8_t*)&to.sin_addr, NETUTILS_BIG));
+ to.sin_port = lwip_htons(netutils_parse_inet_addr(addr_in, (uint8_t *)&to.sin_addr, NETUTILS_BIG));
// send the data
- for (int i=0; i<=self->retries; i++) {
+ for (int i = 0; i <= self->retries; i++) {
MP_THREAD_GIL_EXIT();
- int ret = lwip_sendto(self->fd, bufinfo.buf, bufinfo.len, 0, (struct sockaddr*)&to, sizeof(to));
+ int ret = lwip_sendto(self->fd, bufinfo.buf, bufinfo.len, 0, (struct sockaddr *)&to, sizeof(to));
MP_THREAD_GIL_ENTER();
- if (ret > 0) return mp_obj_new_int_from_uint(ret);
+ if (ret > 0) {
+ return mp_obj_new_int_from_uint(ret);
+ }
if (ret == -1 && errno != EWOULDBLOCK) {
exception_from_errno(errno);
}
@@ -634,12 +656,17 @@
STATIC mp_uint_t socket_stream_write(mp_obj_t self_in, const void *buf, mp_uint_t size, int *errcode) {
socket_obj_t *sock = self_in;
- for (int i=0; i<=sock->retries; i++) {
+ for (int i = 0; i <= sock->retries; i++) {
MP_THREAD_GIL_EXIT();
int r = lwip_write(sock->fd, buf, size);
MP_THREAD_GIL_ENTER();
- if (r > 0) return r;
- if (r < 0 && errno != EWOULDBLOCK) { *errcode = errno; return MP_STREAM_ERROR; }
+ if (r > 0) {
+ return r;
+ }
+ if (r < 0 && errno != EWOULDBLOCK) {
+ *errcode = errno;
+ return MP_STREAM_ERROR;
+ }
check_for_exceptions();
}
*errcode = sock->retries == 0 ? MP_EWOULDBLOCK : MP_ETIMEDOUT;
@@ -647,27 +674,42 @@
}
STATIC mp_uint_t socket_stream_ioctl(mp_obj_t self_in, mp_uint_t request, uintptr_t arg, int *errcode) {
- socket_obj_t * socket = self_in;
+ socket_obj_t *socket = self_in;
if (request == MP_STREAM_POLL) {
- fd_set rfds; FD_ZERO(&rfds);
- fd_set wfds; FD_ZERO(&wfds);
- fd_set efds; FD_ZERO(&efds);
+ fd_set rfds;
+ FD_ZERO(&rfds);
+ fd_set wfds;
+ FD_ZERO(&wfds);
+ fd_set efds;
+ FD_ZERO(&efds);
struct timeval timeout = { .tv_sec = 0, .tv_usec = 0 };
- if (arg & MP_STREAM_POLL_RD) FD_SET(socket->fd, &rfds);
- if (arg & MP_STREAM_POLL_WR) FD_SET(socket->fd, &wfds);
- if (arg & MP_STREAM_POLL_HUP) FD_SET(socket->fd, &efds);
+ if (arg & MP_STREAM_POLL_RD) {
+ FD_SET(socket->fd, &rfds);
+ }
+ if (arg & MP_STREAM_POLL_WR) {
+ FD_SET(socket->fd, &wfds);
+ }
+ if (arg & MP_STREAM_POLL_HUP) {
+ FD_SET(socket->fd, &efds);
+ }
- int r = select((socket->fd)+1, &rfds, &wfds, &efds, &timeout);
+ int r = select((socket->fd) + 1, &rfds, &wfds, &efds, &timeout);
if (r < 0) {
*errcode = MP_EIO;
return MP_STREAM_ERROR;
}
mp_uint_t ret = 0;
- if (FD_ISSET(socket->fd, &rfds)) ret |= MP_STREAM_POLL_RD;
- if (FD_ISSET(socket->fd, &wfds)) ret |= MP_STREAM_POLL_WR;
- if (FD_ISSET(socket->fd, &efds)) ret |= MP_STREAM_POLL_HUP;
+ if (FD_ISSET(socket->fd, &rfds)) {
+ ret |= MP_STREAM_POLL_RD;
+ }
+ if (FD_ISSET(socket->fd, &wfds)) {
+ ret |= MP_STREAM_POLL_WR;
+ }
+ if (FD_ISSET(socket->fd, &efds)) {
+ ret |= MP_STREAM_POLL_HUP;
+ }
return ret;
} else if (request == MP_STREAM_CLOSE) {
if (socket->fd >= 0) {
@@ -761,7 +803,9 @@
mp_obj_list_append(ret_list, mp_obj_new_tuple(5, addrinfo_objs));
}
- if (res) lwip_freeaddrinfo(res);
+ if (res) {
+ lwip_freeaddrinfo(res);
+ }
return ret_list;
}
STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(esp_socket_getaddrinfo_obj, 2, 6, esp_socket_getaddrinfo);
@@ -800,5 +844,5 @@
const mp_obj_module_t mp_module_usocket = {
.base = { &mp_type_module },
- .globals = (mp_obj_dict_t*)&mp_module_socket_globals,
+ .globals = (mp_obj_dict_t *)&mp_module_socket_globals,
};
diff --git a/ports/esp32/modules/_boot.py b/ports/esp32/modules/_boot.py
index bf40ea3..a7d9813 100644
--- a/ports/esp32/modules/_boot.py
+++ b/ports/esp32/modules/_boot.py
@@ -4,9 +4,10 @@
try:
if bdev:
- uos.mount(bdev, '/')
+ uos.mount(bdev, "/")
except OSError:
import inisetup
+
vfs = inisetup.setup()
gc.collect()
diff --git a/ports/esp32/modules/flashbdev.py b/ports/esp32/modules/flashbdev.py
index 45b8686..bf4fec9 100644
--- a/ports/esp32/modules/flashbdev.py
+++ b/ports/esp32/modules/flashbdev.py
@@ -1,4 +1,4 @@
from esp32 import Partition
-bdev = Partition.find(Partition.TYPE_DATA, label='vfs')
+bdev = Partition.find(Partition.TYPE_DATA, label="vfs")
bdev = bdev[0] if bdev else None
diff --git a/ports/esp32/modules/inisetup.py b/ports/esp32/modules/inisetup.py
index 3196f0c..cb03fd7 100644
--- a/ports/esp32/modules/inisetup.py
+++ b/ports/esp32/modules/inisetup.py
@@ -1,41 +1,49 @@
import uos
from flashbdev import bdev
+
def check_bootsec():
- buf = bytearray(bdev.ioctl(5, 0)) # 5 is SEC_SIZE
+ buf = bytearray(bdev.ioctl(5, 0)) # 5 is SEC_SIZE
bdev.readblocks(0, buf)
empty = True
for b in buf:
- if b != 0xff:
+ if b != 0xFF:
empty = False
break
if empty:
return True
fs_corrupted()
+
def fs_corrupted():
import time
+
while 1:
- print("""\
+ print(
+ """\
FAT filesystem appears to be corrupted. If you had important data there, you
may want to make a flash snapshot to try to recover it. Otherwise, perform
factory reprogramming of MicroPython firmware (completely erase flash, followed
by firmware programming).
-""")
+"""
+ )
time.sleep(3)
+
def setup():
check_bootsec()
print("Performing initial setup")
uos.VfsFat.mkfs(bdev)
vfs = uos.VfsFat(bdev)
- uos.mount(vfs, '/')
+ uos.mount(vfs, "/")
with open("boot.py", "w") as f:
- f.write("""\
+ f.write(
+ """\
# This file is executed on every boot (including wake-boot from deepsleep)
#import esp
#esp.osdebug(None)
#import webrepl
#webrepl.start()
-""")
+"""
+ )
return vfs
diff --git a/ports/esp32/modules/neopixel.py b/ports/esp32/modules/neopixel.py
index 91f1d79..aa0de81 100644
--- a/ports/esp32/modules/neopixel.py
+++ b/ports/esp32/modules/neopixel.py
@@ -6,7 +6,7 @@
class NeoPixel:
ORDER = (1, 0, 2, 3)
-
+
def __init__(self, pin, n, bpp=3, timing=1):
self.pin = pin
self.n = n
@@ -22,8 +22,7 @@
def __getitem__(self, index):
offset = index * self.bpp
- return tuple(self.buf[offset + self.ORDER[i]]
- for i in range(self.bpp))
+ return tuple(self.buf[offset + self.ORDER[i]] for i in range(self.bpp))
def fill(self, color):
for i in range(self.n):
diff --git a/ports/esp32/moduos.c b/ports/esp32/moduos.c
index d68df28..50c0d7e 100644
--- a/ports/esp32/moduos.c
+++ b/ports/esp32/moduos.c
@@ -62,7 +62,7 @@
(mp_obj_t)&os_uname_info_release_obj,
(mp_obj_t)&os_uname_info_version_obj,
(mp_obj_t)&os_uname_info_machine_obj
-);
+ );
STATIC mp_obj_t os_uname(void) {
return (mp_obj_t)&os_uname_info_obj;
@@ -137,5 +137,5 @@
const mp_obj_module_t uos_module = {
.base = { &mp_type_module },
- .globals = (mp_obj_dict_t*)&os_module_globals,
+ .globals = (mp_obj_dict_t *)&os_module_globals,
};
diff --git a/ports/esp32/modutime.c b/ports/esp32/modutime.c
index 1d7583e..1b9e07f 100644
--- a/ports/esp32/modutime.c
+++ b/ports/esp32/modutime.c
@@ -70,8 +70,8 @@
}
return mp_obj_new_int_from_uint(timeutils_mktime(mp_obj_get_int(elem[0]),
- mp_obj_get_int(elem[1]), mp_obj_get_int(elem[2]), mp_obj_get_int(elem[3]),
- mp_obj_get_int(elem[4]), mp_obj_get_int(elem[5])));
+ mp_obj_get_int(elem[1]), mp_obj_get_int(elem[2]), mp_obj_get_int(elem[3]),
+ mp_obj_get_int(elem[4]), mp_obj_get_int(elem[5])));
}
STATIC MP_DEFINE_CONST_FUN_OBJ_1(time_mktime_obj, time_mktime);
@@ -102,5 +102,5 @@
const mp_obj_module_t utime_module = {
.base = { &mp_type_module },
- .globals = (mp_obj_dict_t*)&time_module_globals,
+ .globals = (mp_obj_dict_t *)&time_module_globals,
};
diff --git a/ports/esp32/mpconfigport.h b/ports/esp32/mpconfigport.h
index bca6853..3b6fb37 100644
--- a/ports/esp32/mpconfigport.h
+++ b/ports/esp32/mpconfigport.h
@@ -222,9 +222,9 @@
// type definitions for the specific machine
#define BYTES_PER_WORD (4)
-#define MICROPY_MAKE_POINTER_CALLABLE(p) ((void*)((mp_uint_t)(p)))
+#define MICROPY_MAKE_POINTER_CALLABLE(p) ((void *)((mp_uint_t)(p)))
#define MP_PLAT_PRINT_STRN(str, len) mp_hal_stdout_tx_strn_cooked(str, len)
-void *esp_native_code_commit(void*, size_t, void*);
+void *esp_native_code_commit(void *, size_t, void *);
#define MP_PLAT_COMMIT_EXEC(buf, len, reloc) esp_native_code_commit(buf, len, reloc)
#define MP_SSIZE_MAX (0x7fffffff)
@@ -256,7 +256,7 @@
extern void mp_handle_pending(bool); \
mp_handle_pending(true); \
MICROPY_PY_USOCKET_EVENTS_HANDLER \
- asm("waiti 0"); \
+ asm ("waiti 0"); \
} while (0);
#endif
diff --git a/ports/esp32/mphalport.h b/ports/esp32/mphalport.h
index 575cdbe..7cee3fb 100644
--- a/ports/esp32/mphalport.h
+++ b/ports/esp32/mphalport.h
@@ -44,9 +44,9 @@
uint32_t mp_hal_ticks_us(void);
__attribute__((always_inline)) static inline uint32_t mp_hal_ticks_cpu(void) {
- uint32_t ccount;
- __asm__ __volatile__("rsr %0,ccount":"=a" (ccount));
- return ccount;
+ uint32_t ccount;
+ __asm__ __volatile__ ("rsr %0,ccount" : "=a" (ccount));
+ return ccount;
}
void mp_hal_delay_us(uint32_t);
diff --git a/ports/esp32/mpthreadport.c b/ports/esp32/mpthreadport.c
index febd01a..7b391ad 100644
--- a/ports/esp32/mpthreadport.c
+++ b/ports/esp32/mpthreadport.c
@@ -75,7 +75,7 @@
void mp_thread_gc_others(void) {
mp_thread_mutex_lock(&thread_mutex, 1);
for (thread_t *th = thread; th != NULL; th = th->next) {
- gc_collect_root((void**)&th, 1);
+ gc_collect_root((void **)&th, 1);
gc_collect_root(&th->arg, 1); // probably not needed
if (th->id == xTaskGetCurrentTaskHandle()) {
continue;
@@ -107,17 +107,18 @@
mp_thread_mutex_unlock(&thread_mutex);
}
-STATIC void *(*ext_thread_entry)(void*) = NULL;
+STATIC void *(*ext_thread_entry)(void *) = NULL;
STATIC void freertos_entry(void *arg) {
if (ext_thread_entry) {
ext_thread_entry(arg);
}
vTaskDelete(NULL);
- for (;;);
+ for (;;) {;
+ }
}
-void mp_thread_create_ex(void *(*entry)(void*), void *arg, size_t *stack_size, int priority, char *name) {
+void mp_thread_create_ex(void *(*entry)(void *), void *arg, size_t *stack_size, int priority, char *name) {
// store thread entry function into a global variable so we can access it
ext_thread_entry = entry;
@@ -153,7 +154,7 @@
mp_thread_mutex_unlock(&thread_mutex);
}
-void mp_thread_create(void *(*entry)(void*), void *arg, size_t *stack_size) {
+void mp_thread_create(void *(*entry)(void *), void *arg, size_t *stack_size) {
mp_thread_create_ex(entry, arg, stack_size, MP_THREAD_PRIORITY, "mp_thread");
}
@@ -177,7 +178,7 @@
mp_thread_mutex_lock(&thread_mutex, 1);
for (thread_t *th = thread; th != NULL; prev = th, th = th->next) {
// unlink the node from the list
- if ((void*)th->id == tcb) {
+ if ((void *)th->id == tcb) {
if (prev != NULL) {
prev->next = th->next;
} else {
@@ -197,7 +198,7 @@
}
int mp_thread_mutex_lock(mp_thread_mutex_t *mutex, int wait) {
- return (pdTRUE == xSemaphoreTake(mutex->handle, wait ? portMAX_DELAY : 0));
+ return pdTRUE == xSemaphoreTake(mutex->handle, wait ? portMAX_DELAY : 0);
}
void mp_thread_mutex_unlock(mp_thread_mutex_t *mutex) {
diff --git a/ports/esp32/network_lan.c b/ports/esp32/network_lan.c
index 2910407..c2365e6 100644
--- a/ports/esp32/network_lan.c
+++ b/ports/esp32/network_lan.c
@@ -55,7 +55,7 @@
STATIC lan_if_obj_t lan_obj = {{&lan_if_type}, ESP_IF_ETH, false, false};
STATIC void phy_power_enable(bool enable) {
- lan_if_obj_t* self = &lan_obj;
+ lan_if_obj_t *self = &lan_obj;
if (self->phy_power_pin != -1) {
@@ -83,13 +83,13 @@
}
STATIC void init_lan_rmii() {
- lan_if_obj_t* self = &lan_obj;
+ lan_if_obj_t *self = &lan_obj;
phy_rmii_configure_data_interface_pins();
phy_rmii_smi_configure_pins(self->mdc_pin, self->mdio_pin);
}
STATIC mp_obj_t get_lan(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
- lan_if_obj_t* self = &lan_obj;
+ lan_if_obj_t *self = &lan_obj;
if (self->initialized) {
return MP_OBJ_FROM_PTR(&lan_obj);
@@ -215,7 +215,7 @@
const mp_obj_type_t lan_if_type = {
{ &mp_type_type },
.name = MP_QSTR_LAN,
- .locals_dict = (mp_obj_dict_t*)&lan_if_locals_dict,
+ .locals_dict = (mp_obj_dict_t *)&lan_if_locals_dict,
};
#endif // !MICROPY_ESP_IDF_4
diff --git a/ports/esp32/network_ppp.c b/ports/esp32/network_ppp.c
index eb2181e..506c689 100644
--- a/ports/esp32/network_ppp.c
+++ b/ports/esp32/network_ppp.c
@@ -60,7 +60,7 @@
const mp_obj_type_t ppp_if_type;
static void ppp_status_cb(ppp_pcb *pcb, int err_code, void *ctx) {
- ppp_if_obj_t* self = ctx;
+ ppp_if_obj_t *self = ctx;
struct netif *pppif = ppp_netif(self->pcb);
switch (err_code) {
@@ -101,14 +101,14 @@
}
static void pppos_client_task(void *self_in) {
- ppp_if_obj_t *self = (ppp_if_obj_t*)self_in;
+ ppp_if_obj_t *self = (ppp_if_obj_t *)self_in;
uint8_t buf[256];
while (ulTaskNotifyTake(pdTRUE, 0) == 0) {
int err;
int len = mp_stream_rw(self->stream, buf, sizeof(buf), &err, 0);
if (len > 0) {
- pppos_input_tcpip(self->pcb, (u8_t*)buf, len);
+ pppos_input_tcpip(self->pcb, (u8_t *)buf, len);
}
}
@@ -195,8 +195,8 @@
}
if (parsed_args[ARG_authmode].u_int != PPPAUTHTYPE_NONE) {
- const char* username_str = mp_obj_str_get_str(parsed_args[ARG_username].u_obj);
- const char* password_str = mp_obj_str_get_str(parsed_args[ARG_password].u_obj);
+ const char *username_str = mp_obj_str_get_str(parsed_args[ARG_username].u_obj);
+ const char *password_str = mp_obj_str_get_str(parsed_args[ARG_password].u_obj);
pppapi_set_auth(self->pcb, parsed_args[ARG_authmode].u_int, username_str, password_str);
}
if (pppapi_set_default(self->pcb) != ESP_OK) {
@@ -209,7 +209,7 @@
mp_raise_msg(&mp_type_OSError, "connect failed");
}
- if (xTaskCreatePinnedToCore(pppos_client_task, "ppp", 2048, self, 1, (TaskHandle_t*)&self->client_task_handle, MP_TASK_COREID) != pdPASS) {
+ if (xTaskCreatePinnedToCore(pppos_client_task, "ppp", 2048, self, 1, (TaskHandle_t *)&self->client_task_handle, MP_TASK_COREID) != pdPASS) {
mp_raise_msg(&mp_type_RuntimeError, "failed to create worker task");
}
@@ -218,7 +218,7 @@
MP_DEFINE_CONST_FUN_OBJ_KW(ppp_connect_obj, 1, ppp_connect_py);
STATIC mp_obj_t ppp_delete(mp_obj_t self_in) {
- ppp_if_obj_t* self = MP_OBJ_TO_PTR(self_in);
+ ppp_if_obj_t *self = MP_OBJ_TO_PTR(self_in);
mp_obj_t args[] = {self, mp_const_false};
ppp_active(2, args);
return mp_const_none;
@@ -234,10 +234,10 @@
dns = dns_getserver(0);
struct netif *pppif = ppp_netif(self->pcb);
mp_obj_t tuple[4] = {
- netutils_format_ipv4_addr((uint8_t*)&pppif->ip_addr, NETUTILS_BIG),
- netutils_format_ipv4_addr((uint8_t*)&pppif->gw, NETUTILS_BIG),
- netutils_format_ipv4_addr((uint8_t*)&pppif->netmask, NETUTILS_BIG),
- netutils_format_ipv4_addr((uint8_t*)&dns, NETUTILS_BIG),
+ netutils_format_ipv4_addr((uint8_t *)&pppif->ip_addr, NETUTILS_BIG),
+ netutils_format_ipv4_addr((uint8_t *)&pppif->gw, NETUTILS_BIG),
+ netutils_format_ipv4_addr((uint8_t *)&pppif->netmask, NETUTILS_BIG),
+ netutils_format_ipv4_addr((uint8_t *)&dns, NETUTILS_BIG),
};
return mp_obj_new_tuple(4, tuple);
} else {
@@ -247,7 +247,7 @@
} else {
mp_obj_t *items;
mp_obj_get_array_fixed_n(args[1], 4, &items);
- netutils_parse_ipv4_addr(items[3], (uint8_t*)&dns.u_addr.ip4, NETUTILS_BIG);
+ netutils_parse_ipv4_addr(items[3], (uint8_t *)&dns.u_addr.ip4, NETUTILS_BIG);
dns_setserver(0, &dns);
return mp_const_none;
}
@@ -281,7 +281,7 @@
const mp_obj_type_t ppp_if_type = {
{ &mp_type_type },
.name = MP_QSTR_PPP,
- .locals_dict = (mp_obj_dict_t*)&ppp_if_locals_dict,
+ .locals_dict = (mp_obj_dict_t *)&ppp_if_locals_dict,
};
#endif // !MICROPY_ESP_IDF_4
diff --git a/ports/esp32/nimble.c b/ports/esp32/nimble.c
index 3747ae0..7b62412 100644
--- a/ports/esp32/nimble.c
+++ b/ports/esp32/nimble.c
@@ -35,8 +35,8 @@
#include "nimble/nimble_port_freertos.h"
STATIC void ble_host_task(void *param) {
- nimble_port_run(); //This function will return only when nimble_port_stop() is executed.
- nimble_port_freertos_deinit();
+ nimble_port_run(); //This function will return only when nimble_port_stop() is executed.
+ nimble_port_freertos_deinit();
}
void mp_bluetooth_nimble_port_preinit(void) {
diff --git a/ports/esp8266/boards/manifest.py b/ports/esp8266/boards/manifest.py
index b6df53f..de719f8 100644
--- a/ports/esp8266/boards/manifest.py
+++ b/ports/esp8266/boards/manifest.py
@@ -1,5 +1,5 @@
-freeze('$(PORT_DIR)/modules')
-freeze('$(MPY_DIR)/tools', ('upip.py', 'upip_utarfile.py'))
-freeze('$(MPY_DIR)/drivers/dht', 'dht.py')
-freeze('$(MPY_DIR)/drivers/onewire')
-include('$(MPY_DIR)/extmod/webrepl/manifest.py')
+freeze("$(PORT_DIR)/modules")
+freeze("$(MPY_DIR)/tools", ("upip.py", "upip_utarfile.py"))
+freeze("$(MPY_DIR)/drivers/dht", "dht.py")
+freeze("$(MPY_DIR)/drivers/onewire")
+include("$(MPY_DIR)/extmod/webrepl/manifest.py")
diff --git a/ports/esp8266/boards/manifest_release.py b/ports/esp8266/boards/manifest_release.py
index f2788c8..ab86fa3 100644
--- a/ports/esp8266/boards/manifest_release.py
+++ b/ports/esp8266/boards/manifest_release.py
@@ -1,27 +1,27 @@
-include('manifest.py')
+include("manifest.py")
# drivers
-freeze('$(MPY_DIR)/drivers/display', 'ssd1306.py')
+freeze("$(MPY_DIR)/drivers/display", "ssd1306.py")
# file utilities
-freeze('$(MPY_LIB_DIR)/upysh', 'upysh.py')
+freeze("$(MPY_LIB_DIR)/upysh", "upysh.py")
# uasyncio
-freeze('$(MPY_LIB_DIR)/uasyncio', 'uasyncio/__init__.py')
-freeze('$(MPY_LIB_DIR)/uasyncio.core', 'uasyncio/core.py')
+freeze("$(MPY_LIB_DIR)/uasyncio", "uasyncio/__init__.py")
+freeze("$(MPY_LIB_DIR)/uasyncio.core", "uasyncio/core.py")
# requests
-freeze('$(MPY_LIB_DIR)/urequests', 'urequests.py')
-freeze('$(MPY_LIB_DIR)/urllib.urequest', 'urllib/urequest.py')
+freeze("$(MPY_LIB_DIR)/urequests", "urequests.py")
+freeze("$(MPY_LIB_DIR)/urllib.urequest", "urllib/urequest.py")
# umqtt with examples
-freeze('$(MPY_LIB_DIR)/umqtt.simple', 'umqtt/simple.py')
-freeze('$(MPY_LIB_DIR)/umqtt.robust', 'umqtt/robust.py')
-freeze('$(MPY_LIB_DIR)/umqtt.simple', 'example_pub_button.py')
-freeze('$(MPY_LIB_DIR)/umqtt.simple', 'example_sub_led.py')
+freeze("$(MPY_LIB_DIR)/umqtt.simple", "umqtt/simple.py")
+freeze("$(MPY_LIB_DIR)/umqtt.robust", "umqtt/robust.py")
+freeze("$(MPY_LIB_DIR)/umqtt.simple", "example_pub_button.py")
+freeze("$(MPY_LIB_DIR)/umqtt.simple", "example_sub_led.py")
# HTTP examples
-freeze('$(MPY_DIR)/examples/network', 'http_client.py')
-freeze('$(MPY_DIR)/examples/network', 'http_client_ssl.py')
-freeze('$(MPY_DIR)/examples/network', 'http_server.py')
-freeze('$(MPY_DIR)/examples/network', 'http_server_ssl.py')
+freeze("$(MPY_DIR)/examples/network", "http_client.py")
+freeze("$(MPY_DIR)/examples/network", "http_client_ssl.py")
+freeze("$(MPY_DIR)/examples/network", "http_server.py")
+freeze("$(MPY_DIR)/examples/network", "http_server_ssl.py")
diff --git a/ports/esp8266/esp_init_data.c b/ports/esp8266/esp_init_data.c
index b14de57..eb4d99e 100644
--- a/ports/esp8266/esp_init_data.c
+++ b/ports/esp8266/esp_init_data.c
@@ -36,20 +36,20 @@
extern char flashchip;
static const uint8_t default_init_data[] __attribute__((aligned(4))) = {
-0x05, 0x00, 0x04, 0x02, 0x05, 0x05, 0x05, 0x02, 0x05, 0x00, 0x04, 0x05, 0x05, 0x04, 0x05, 0x05,
-0x04, 0xfe, 0xfd, 0xff, 0xf0, 0xf0, 0xf0, 0xe0, 0xe0, 0xe0, 0xe1, 0x0a, 0xff, 0xff, 0xf8, 0x00,
-0xf8, 0xf8, 0x52, 0x4e, 0x4a, 0x44, 0x40, 0x38, 0x00, 0x00, 0x01, 0x01, 0x02, 0x03, 0x04, 0x05,
-0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0xe1, 0x0a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x93, 0x43, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+ 0x05, 0x00, 0x04, 0x02, 0x05, 0x05, 0x05, 0x02, 0x05, 0x00, 0x04, 0x05, 0x05, 0x04, 0x05, 0x05,
+ 0x04, 0xfe, 0xfd, 0xff, 0xf0, 0xf0, 0xf0, 0xe0, 0xe0, 0xe0, 0xe1, 0x0a, 0xff, 0xff, 0xf8, 0x00,
+ 0xf8, 0xf8, 0x52, 0x4e, 0x4a, 0x44, 0x40, 0x38, 0x00, 0x00, 0x01, 0x01, 0x02, 0x03, 0x04, 0x05,
+ 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0xe1, 0x0a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x93, 0x43, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
};
void firmware_start(void) {
// For SDK 1.5.2, either address has shifted and not mirrored in
// eagle.rom.addr.v6.ld, or extra initial member was added.
- SpiFlashChip *flash = (SpiFlashChip*)(&flashchip + 4);
+ SpiFlashChip *flash = (SpiFlashChip *)(&flashchip + 4);
char buf[128];
SPIRead(flash->chip_size - 4 * 0x1000, buf, sizeof(buf));
@@ -73,5 +73,5 @@
SPIWrite(flash->chip_size - 4 * 0x1000, buf, sizeof(buf));
}
- asm("j call_user_start");
+ asm ("j call_user_start");
}
diff --git a/ports/esp8266/esp_mphal.c b/ports/esp8266/esp_mphal.c
index d840cf0..d711345 100644
--- a/ports/esp8266/esp_mphal.c
+++ b/ports/esp8266/esp_mphal.c
@@ -74,7 +74,7 @@
#if 0
// Idles CPU but need more testing before enabling
if (!ets_loop_iter()) {
- asm("waiti 0");
+ asm ("waiti 0");
}
#else
mp_hal_delay_us(1);
@@ -189,7 +189,7 @@
void *ets_get_esf_buf_ctlblk(void) {
// Get literal ptr before start of esf_rx_buf_alloc func
extern void *esf_rx_buf_alloc();
- return ((void**)esf_rx_buf_alloc)[-1];
+ return ((void **)esf_rx_buf_alloc)[-1];
}
// Get number of esf_buf free buffers of given type, as encoded by index
@@ -198,10 +198,10 @@
// 1 - tx buffer, 5 - management frame tx buffer; 8 - rx buffer
int ets_esf_free_bufs(int idx) {
uint32_t *p = ets_get_esf_buf_ctlblk();
- uint32_t *b = (uint32_t*)p[idx];
+ uint32_t *b = (uint32_t *)p[idx];
int cnt = 0;
while (b) {
- b = (uint32_t*)b[0x20 / 4];
+ b = (uint32_t *)b[0x20 / 4];
cnt++;
}
return cnt;
diff --git a/ports/esp8266/esp_mphal.h b/ports/esp8266/esp_mphal.h
index 8712a2a..eaae18f 100644
--- a/ports/esp8266/esp_mphal.h
+++ b/ports/esp8266/esp_mphal.h
@@ -48,9 +48,9 @@
uint32_t mp_hal_ticks_us(void);
__attribute__((always_inline)) static inline uint32_t mp_hal_ticks_cpu(void) {
- uint32_t ccount;
- __asm__ __volatile__("rsr %0,ccount":"=a" (ccount));
- return ccount;
+ uint32_t ccount;
+ __asm__ __volatile__ ("rsr %0,ccount" : "=a" (ccount));
+ return ccount;
}
void mp_hal_delay_us(uint32_t);
@@ -86,16 +86,16 @@
#define mp_hal_pin_od_low(p) do { \
if ((p) == 16) { WRITE_PERI_REG(RTC_GPIO_ENABLE, (READ_PERI_REG(RTC_GPIO_ENABLE) & ~1) | 1); } \
else { gpio_output_set(0, 1 << (p), 1 << (p), 0); } \
- } while (0)
+} while (0)
#define mp_hal_pin_od_high(p) do { \
if ((p) == 16) { WRITE_PERI_REG(RTC_GPIO_ENABLE, (READ_PERI_REG(RTC_GPIO_ENABLE) & ~1)); } \
else { gpio_output_set(0, 0, 0, 1 << (p)); /* set as input to avoid glitches */ } \
- } while (0)
+} while (0)
// The DHT driver requires using the open-drain feature of the GPIO to get it to work reliably
#define mp_hal_pin_od_high_dht(p) do { \
if ((p) == 16) { WRITE_PERI_REG(RTC_GPIO_ENABLE, (READ_PERI_REG(RTC_GPIO_ENABLE) & ~1)); } \
else { gpio_output_set(1 << (p), 0, 1 << (p), 0); } \
- } while (0)
+} while (0)
#define mp_hal_pin_read(p) pin_get(p)
#define mp_hal_pin_write(p, v) pin_set((p), (v))
diff --git a/ports/esp8266/espapa102.c b/ports/esp8266/espapa102.c
index 4295fe4..2bea266 100644
--- a/ports/esp8266/espapa102.c
+++ b/ports/esp8266/espapa102.c
@@ -33,7 +33,7 @@
#include "user_interface.h"
#include "espapa102.h"
-#define NOP asm volatile(" nop \n\t")
+#define NOP asm volatile (" nop \n\t")
static inline void _esp_apa102_send_byte(uint32_t clockPinMask, uint32_t dataPinMask, uint8_t byte) {
for (uint32_t i = 0; i < 8; i++) {
diff --git a/ports/esp8266/espneopixel.c b/ports/esp8266/espneopixel.c
index 6c76591..d2166a8 100644
--- a/ports/esp8266/espneopixel.c
+++ b/ports/esp8266/espneopixel.c
@@ -18,48 +18,58 @@
void /*ICACHE_RAM_ATTR*/ esp_neopixel_write(uint8_t pin, uint8_t *pixels, uint32_t numBytes, bool is800KHz) {
- uint8_t *p, *end, pix, mask;
- uint32_t t, time0, time1, period, c, startTime, pinMask;
+ uint8_t *p, *end, pix, mask;
+ uint32_t t, time0, time1, period, c, startTime, pinMask;
- pinMask = 1 << pin;
- p = pixels;
- end = p + numBytes;
- pix = *p++;
- mask = 0x80;
- startTime = 0;
+ pinMask = 1 << pin;
+ p = pixels;
+ end = p + numBytes;
+ pix = *p++;
+ mask = 0x80;
+ startTime = 0;
- uint32_t fcpu = system_get_cpu_freq() * 1000000;
+ uint32_t fcpu = system_get_cpu_freq() * 1000000;
-#ifdef NEO_KHZ400
- if(is800KHz) {
-#endif
- time0 = fcpu / 2857143; // 0.35us
- time1 = fcpu / 1250000; // 0.8us
- period = fcpu / 800000; // 1.25us per bit
-#ifdef NEO_KHZ400
- } else { // 400 KHz bitstream
- time0 = fcpu / 2000000; // 0.5uS
- time1 = fcpu / 833333; // 1.2us
- period = fcpu / 400000; // 2.5us per bit
- }
-#endif
+ #ifdef NEO_KHZ400
+ if (is800KHz) {
+ #endif
+ time0 = fcpu / 2857143; // 0.35us
+ time1 = fcpu / 1250000; // 0.8us
+ period = fcpu / 800000; // 1.25us per bit
+ #ifdef NEO_KHZ400
+} else { // 400 KHz bitstream
+ time0 = fcpu / 2000000; // 0.5uS
+ time1 = fcpu / 833333; // 1.2us
+ period = fcpu / 400000; // 2.5us per bit
+}
+ #endif
- uint32_t irq_state = mp_hal_quiet_timing_enter();
- for(t = time0;; t = time0) {
- if(pix & mask) t = time1; // Bit high duration
- while(((c = mp_hal_ticks_cpu()) - startTime) < period); // Wait for bit start
- GPIO_REG_WRITE(GPIO_OUT_W1TS_ADDRESS, pinMask); // Set high
- startTime = c; // Save start time
- while(((c = mp_hal_ticks_cpu()) - startTime) < t); // Wait high duration
- GPIO_REG_WRITE(GPIO_OUT_W1TC_ADDRESS, pinMask); // Set low
- if(!(mask >>= 1)) { // Next bit/byte
- if(p >= end) break;
- pix = *p++;
- mask = 0x80;
+ uint32_t irq_state = mp_hal_quiet_timing_enter();
+ for (t = time0;; t = time0) {
+ if (pix & mask) {
+ t = time1; // Bit high duration
+ }
+ while (((c = mp_hal_ticks_cpu()) - startTime) < period) {
+ ; // Wait for bit start
+ }
+ GPIO_REG_WRITE(GPIO_OUT_W1TS_ADDRESS, pinMask); // Set high
+ startTime = c; // Save start time
+ while (((c = mp_hal_ticks_cpu()) - startTime) < t) {
+ ; // Wait high duration
+ }
+ GPIO_REG_WRITE(GPIO_OUT_W1TC_ADDRESS, pinMask); // Set low
+ if (!(mask >>= 1)) { // Next bit/byte
+ if (p >= end) {
+ break;
+ }
+ pix = *p++;
+ mask = 0x80;
+ }
}
- }
- while((mp_hal_ticks_cpu() - startTime) < period); // Wait for last bit
- mp_hal_quiet_timing_exit(irq_state);
+ while ((mp_hal_ticks_cpu() - startTime) < period) {
+ ; // Wait for last bit
+ }
+ mp_hal_quiet_timing_exit(irq_state);
}
#endif // MICROPY_ESP8266_NEOPIXEL
diff --git a/ports/esp8266/esppwm.c b/ports/esp8266/esppwm.c
index 33eaf3b..3759bb5 100644
--- a/ports/esp8266/esppwm.c
+++ b/ports/esp8266/esppwm.c
@@ -61,10 +61,10 @@
//XXX: 0xffffffff/(80000000/16)=35A
#define US_TO_RTC_TIMER_TICKS(t) \
((t) ? \
- (((t) > 0x35A) ? \
- (((t)>>2) * ((APB_CLK_FREQ>>4)/250000) + ((t)&0x3) * ((APB_CLK_FREQ>>4)/1000000)) : \
- (((t) *(APB_CLK_FREQ>>4)) / 1000000)) : \
- 0)
+ (((t) > 0x35A) ? \
+ (((t) >> 2) * ((APB_CLK_FREQ >> 4) / 250000) + ((t) & 0x3) * ((APB_CLK_FREQ >> 4) / 1000000)) : \
+ (((t) * (APB_CLK_FREQ >> 4)) / 1000000)) : \
+ 0)
//FRC1
#define FRC1_ENABLE_TIMER BIT7
@@ -81,8 +81,7 @@
} TIMER_INT_MODE;
STATIC void ICACHE_FLASH_ATTR
-pwm_insert_sort(struct pwm_single_param pwm[], uint8 n)
-{
+pwm_insert_sort(struct pwm_single_param pwm[], uint8 n) {
uint8 i;
for (i = 1; i < n; i++) {
@@ -109,17 +108,16 @@
STATIC volatile uint8 critical = 0;
#define LOCK_PWM(c) do { \
- while( (c)==1 ); \
- (c) = 1; \
+ while ( (c) == 1); \
+ (c) = 1; \
} while (0)
#define UNLOCK_PWM(c) do { \
- (c) = 0; \
+ (c) = 0; \
} while (0)
void ICACHE_FLASH_ATTR
-pwm_start(void)
-{
+pwm_start(void) {
uint8 i, j;
PWM_DBG("--Function pwm_start() is called\n");
PWM_DBG("pwm_gpio:%x,pwm_channel_num:%d\n",pwm_gpio,pwm_channel_num);
@@ -169,7 +167,7 @@
}
// step 5: last channel needs to clean
- local_single[*local_channel-1].gpio_clear = 0;
+ local_single[*local_channel - 1].gpio_clear = 0;
// step 6: if first channel duty is 0, remove it
if (local_single[0].h_time == 0) {
@@ -212,17 +210,17 @@
* Returns : NONE
*******************************************************************************/
void ICACHE_FLASH_ATTR
-pwm_set_duty(int16_t duty, uint8 channel)
-{
+pwm_set_duty(int16_t duty, uint8 channel) {
uint8 i;
- for(i=0;i<pwm_channel_num;i++){
- if(pwm_out_io_num[i] == channel){
+ for (i = 0; i < pwm_channel_num; i++) {
+ if (pwm_out_io_num[i] == channel) {
channel = i;
break;
}
}
- if(i==pwm_channel_num) // non found
+ if (i == pwm_channel_num) { // non found
return;
+ }
LOCK_PWM(critical); // enter critical
if (duty < 1) {
@@ -242,8 +240,7 @@
* Returns : NONE
*******************************************************************************/
void ICACHE_FLASH_ATTR
-pwm_set_freq(uint16 freq, uint8 channel)
-{
+pwm_set_freq(uint16 freq, uint8 channel) {
LOCK_PWM(critical); // enter critical
if (freq > PWM_FREQ_MAX) {
pwm.freq = PWM_FREQ_MAX;
@@ -264,17 +261,17 @@
* Returns : NONE
*******************************************************************************/
uint16 ICACHE_FLASH_ATTR
-pwm_get_duty(uint8 channel)
-{
+pwm_get_duty(uint8 channel) {
uint8 i;
- for(i=0;i<pwm_channel_num;i++){
- if(pwm_out_io_num[i] == channel){
+ for (i = 0; i < pwm_channel_num; i++) {
+ if (pwm_out_io_num[i] == channel) {
channel = i;
break;
}
}
- if(i==pwm_channel_num) // non found
+ if (i == pwm_channel_num) { // non found
return 0;
+ }
return pwm.duty[channel];
}
@@ -286,8 +283,7 @@
* Returns : uint16 : pwm frequency
*******************************************************************************/
uint16 ICACHE_FLASH_ATTR
-pwm_get_freq(uint8 channel)
-{
+pwm_get_freq(uint8 channel) {
return pwm.freq;
}
@@ -299,8 +295,7 @@
* Returns : NONE
*******************************************************************************/
STATIC void ICACHE_RAM_ATTR
-pwm_tim1_intr_handler(void *dummy)
-{
+pwm_tim1_intr_handler(void *dummy) {
(void)dummy;
uint8 local_toggle = pwm_toggle; // pwm_toggle may change outside
RTC_CLR_REG_MASK(FRC1_INT_ADDRESS, FRC1_INT_CLR_MASK);
@@ -310,17 +305,17 @@
pwm_channel = &pwm_channel_toggle[local_toggle];
gpio_output_set(pwm_single[*pwm_channel - 1].gpio_set,
- pwm_single[*pwm_channel - 1].gpio_clear,
- pwm_gpio,
- 0);
+ pwm_single[*pwm_channel - 1].gpio_clear,
+ pwm_gpio,
+ 0);
pwm_current_channel = 0;
RTC_REG_WRITE(FRC1_LOAD_ADDRESS, pwm_single[pwm_current_channel].h_time);
} else {
gpio_output_set(pwm_single[pwm_current_channel].gpio_set,
- pwm_single[pwm_current_channel].gpio_clear,
- pwm_gpio, 0);
+ pwm_single[pwm_current_channel].gpio_clear,
+ pwm_gpio, 0);
pwm_current_channel++;
RTC_REG_WRITE(FRC1_LOAD_ADDRESS, pwm_single[pwm_current_channel].h_time);
@@ -335,14 +330,13 @@
* Returns : NONE
*******************************************************************************/
void ICACHE_FLASH_ATTR
-pwm_init(void)
-{
+pwm_init(void) {
uint8 i;
RTC_REG_WRITE(FRC1_CTRL_ADDRESS, //FRC2_AUTO_RELOAD|
- DIVDED_BY_16
- | FRC1_ENABLE_TIMER
- | TM_EDGE_INT);
+ DIVDED_BY_16
+ | FRC1_ENABLE_TIMER
+ | TM_EDGE_INT);
RTC_REG_WRITE(FRC1_LOAD_ADDRESS, 0);
for (i = 0; i < PWM_CHANNEL; i++) {
@@ -359,7 +353,7 @@
}
int ICACHE_FLASH_ATTR
-pwm_add(uint8_t pin_id, uint32_t pin_mux, uint32_t pin_func){
+pwm_add(uint8_t pin_id, uint32_t pin_mux, uint32_t pin_func) {
PWM_DBG("--Function pwm_add() is called. channel:%d\n", channel);
PWM_DBG("pwm_gpio:%x,pwm_channel_num:%d\n",pwm_gpio,pwm_channel_num);
PWM_DBG("pwm_out_io_num[0]:%d,[1]:%d,[2]:%d\n",pwm_out_io_num[0],pwm_out_io_num[1],pwm_out_io_num[2]);
@@ -375,16 +369,17 @@
return -1;
}
uint8 i;
- for(i=0;i<PWM_CHANNEL;i++){
- if(pwm_out_io_num[i]==channel) // already exist
+ for (i = 0; i < PWM_CHANNEL; i++) {
+ if (pwm_out_io_num[i] == channel) { // already exist
return channel;
- if(pwm_out_io_num[i] == -1){ // empty exist
+ }
+ if (pwm_out_io_num[i] == -1) { // empty exist
LOCK_PWM(critical); // enter critical
pwm_out_io_num[i] = channel;
pwm.duty[i] = 0;
pwm_gpio |= (1 << pin_num[channel]);
PIN_FUNC_SELECT(pin_mux, pin_func);
- GPIO_REG_WRITE(GPIO_PIN_ADDR(GPIO_ID_PIN(pin_num[channel])), GPIO_REG_READ(GPIO_PIN_ADDR(GPIO_ID_PIN(pin_num[channel]))) & (~ GPIO_PIN_PAD_DRIVER_SET(GPIO_PAD_DRIVER_ENABLE))); //disable open drain;
+ GPIO_REG_WRITE(GPIO_PIN_ADDR(GPIO_ID_PIN(pin_num[channel])), GPIO_REG_READ(GPIO_PIN_ADDR(GPIO_ID_PIN(pin_num[channel]))) & (~GPIO_PIN_PAD_DRIVER_SET(GPIO_PAD_DRIVER_ENABLE))); //disable open drain;
pwm_channel_num++;
UNLOCK_PWM(critical); // leave critical
return channel;
@@ -394,23 +389,23 @@
}
bool ICACHE_FLASH_ATTR
-pwm_delete(uint8 channel){
+pwm_delete(uint8 channel) {
PWM_DBG("--Function pwm_delete() is called. channel:%d\n", channel);
PWM_DBG("pwm_gpio:%x,pwm_channel_num:%d\n",pwm_gpio,pwm_channel_num);
PWM_DBG("pwm_out_io_num[0]:%d,[1]:%d,[2]:%d\n",pwm_out_io_num[0],pwm_out_io_num[1],pwm_out_io_num[2]);
PWM_DBG("pwm.duty[0]:%d,[1]:%d,[2]:%d\n",pwm.duty[0],pwm.duty[1],pwm.duty[2]);
uint8 i,j;
- for(i=0;i<pwm_channel_num;i++){
- if(pwm_out_io_num[i]==channel){ // exist
+ for (i = 0; i < pwm_channel_num; i++) {
+ if (pwm_out_io_num[i] == channel) { // exist
LOCK_PWM(critical); // enter critical
pwm_out_io_num[i] = -1;
pwm_gpio &= ~(1 << pin_num[channel]); //clear the bit
- for(j=i;j<pwm_channel_num-1;j++){
- pwm_out_io_num[j] = pwm_out_io_num[j+1];
- pwm.duty[j] = pwm.duty[j+1];
+ for (j = i; j < pwm_channel_num - 1; j++) {
+ pwm_out_io_num[j] = pwm_out_io_num[j + 1];
+ pwm.duty[j] = pwm.duty[j + 1];
}
- pwm_out_io_num[pwm_channel_num-1] = -1;
- pwm.duty[pwm_channel_num-1] = 0;
+ pwm_out_io_num[pwm_channel_num - 1] = -1;
+ pwm.duty[pwm_channel_num - 1] = 0;
pwm_channel_num--;
UNLOCK_PWM(critical); // leave critical
return true;
diff --git a/ports/esp8266/ets_alt_task.c b/ports/esp8266/ets_alt_task.c
index 0b1615d..ce27758 100644
--- a/ports/esp8266/ets_alt_task.c
+++ b/ports/esp8266/ets_alt_task.c
@@ -25,9 +25,9 @@
static void *idle_arg;
#if ESP_SDK_VERSION >= 010500
-# define FIRST_PRIO 0
+#define FIRST_PRIO 0
#else
-# define FIRST_PRIO 0x14
+#define FIRST_PRIO 0x14
#endif
#define LAST_PRIO 0x20
#define PRIO2ID(prio) ((prio) - FIRST_PRIO)
@@ -38,7 +38,9 @@
int id = PRIO2ID(prio);
if (id < 0 || id >= MP_ARRAY_SIZE(emu_tasks)) {
printf("task prio out of range: %d\n", prio);
- while (1);
+ while (1) {
+ ;
+ }
}
return id;
}
@@ -62,9 +64,9 @@
bool ets_task(os_task_t task, uint8 prio, os_event_t *queue, uint8 qlen) {
static unsigned cnt;
printf("#%d ets_task(%p, %d, %p, %d)\n", cnt++, task, prio, queue, qlen);
-#if USE_ETS_TASK
+ #if USE_ETS_TASK
return _ets_task(task, prio, queue, qlen);
-#else
+ #else
int id = prio2id(prio);
emu_tasks[id].task = task;
emu_tasks[id].queue = queue;
@@ -72,14 +74,14 @@
emu_tasks[id].i_get = 0;
emu_tasks[id].i_put = 0;
return true;
-#endif
+ #endif
}
bool ets_post(uint8 prio, os_signal_t sig, os_param_t param) {
// static unsigned cnt; printf("#%d ets_post(%d, %x, %x)\n", cnt++, prio, sig, param);
-#if USE_ETS_TASK
+ #if USE_ETS_TASK
return _ets_post(prio, sig, param);
-#else
+ #else
ets_intr_lock();
const int id = prio2id(prio);
@@ -105,7 +107,7 @@
ets_intr_unlock();
return 0;
-#endif
+ #endif
}
int ets_loop_iter_disable = 0;
@@ -193,7 +195,7 @@
ets_isr_attach(10, my_timer_isr, NULL);
SET_PERI_REG_MASK(0x3FF00004, 4);
ETS_INTR_ENABLE(10);
- ets_task((os_task_t)0x40002E3C, 0x1f, (os_event_t*)0x3FFFDDC0, 4);
+ ets_task((os_task_t)0x40002E3C, 0x1f, (os_event_t *)0x3FFFDDC0, 4);
WRITE_PERI_REG(PERIPHS_TIMER_BASEDDR + 0x30, 0);
WRITE_PERI_REG(PERIPHS_TIMER_BASEDDR + 0x28, 0x88);
@@ -203,19 +205,19 @@
#endif
bool ets_run(void) {
-#if USE_ETS_TASK
+ #if USE_ETS_TASK
#if SDK_BELOW_1_1_1
ets_isr_attach(10, my_timer_isr, NULL);
#endif
_ets_run();
-#else
+ #else
// ets_timer_init();
- *(char*)0x3FFFC6FC = 0;
+ *(char *)0x3FFFC6FC = 0;
ets_intr_lock();
printf("ets_alt_task: ets_run\n");
-#if DEBUG
+ #if DEBUG
dump_tasks();
-#endif
+ #endif
ets_intr_unlock();
while (1) {
if (!ets_loop_iter()) {
@@ -224,11 +226,11 @@
if (idle_cb) {
idle_cb(idle_arg);
}
- asm("waiti 0");
+ asm ("waiti 0");
ets_intr_unlock();
}
}
-#endif
+ #endif
}
void ets_set_idle_cb(void (*handler)(void *), void *arg) {
diff --git a/ports/esp8266/etshal.h b/ports/esp8266/etshal.h
index 8d64573..f7b34b8 100644
--- a/ports/esp8266/etshal.h
+++ b/ports/esp8266/etshal.h
@@ -4,7 +4,7 @@
#include <os_type.h>
// see http://esp8266-re.foogod.com/wiki/Random_Number_Generator
-#define WDEV_HWRNG ((volatile uint32_t*)0x3ff20e44)
+#define WDEV_HWRNG ((volatile uint32_t *)0x3ff20e44)
void ets_delay_us(uint16_t us);
void ets_intr_lock(void);
diff --git a/ports/esp8266/fatfs_port.c b/ports/esp8266/fatfs_port.c
index a8865c8..8cef0ac 100644
--- a/ports/esp8266/fatfs_port.c
+++ b/ports/esp8266/fatfs_port.c
@@ -38,6 +38,6 @@
timeutils_struct_time_t tm;
timeutils_seconds_since_2000_to_struct_time(secs, &tm);
- return (((DWORD)(tm.tm_year - 1980) << 25) | ((DWORD)tm.tm_mon << 21) | ((DWORD)tm.tm_mday << 16) |
- ((DWORD)tm.tm_hour << 11) | ((DWORD)tm.tm_min << 5) | ((DWORD)tm.tm_sec >> 1));
+ return ((DWORD)(tm.tm_year - 1980) << 25) | ((DWORD)tm.tm_mon << 21) | ((DWORD)tm.tm_mday << 16) |
+ ((DWORD)tm.tm_hour << 11) | ((DWORD)tm.tm_min << 5) | ((DWORD)tm.tm_sec >> 1);
}
diff --git a/ports/esp8266/gccollect.c b/ports/esp8266/gccollect.c
index dbe7bc1..3618a56 100644
--- a/ports/esp8266/gccollect.c
+++ b/ports/esp8266/gccollect.c
@@ -44,7 +44,7 @@
mp_uint_t sp = gc_helper_get_regs_and_sp(regs);
// trace the stack, including the registers (since they live on the stack in this function)
- gc_collect_root((void**)sp, (STACK_END - sp) / sizeof(uint32_t));
+ gc_collect_root((void **)sp, (STACK_END - sp) / sizeof(uint32_t));
// end the GC
gc_collect_end();
diff --git a/ports/esp8266/help.c b/ports/esp8266/help.c
index 0a851f4..4dd586c 100644
--- a/ports/esp8266/help.c
+++ b/ports/esp8266/help.c
@@ -27,28 +27,28 @@
#include "py/builtin.h"
const char esp_help_text[] =
-"Welcome to MicroPython!\n"
-"\n"
-"For online docs please visit http://docs.micropython.org/en/latest/esp8266/ .\n"
-"For diagnostic information to include in bug reports execute 'import port_diag'.\n"
-"\n"
-"Basic WiFi configuration:\n"
-"\n"
-"import network\n"
-"sta_if = network.WLAN(network.STA_IF); sta_if.active(True)\n"
-"sta_if.scan() # Scan for available access points\n"
-"sta_if.connect(\"<AP_name>\", \"<password>\") # Connect to an AP\n"
-"sta_if.isconnected() # Check for successful connection\n"
-"# Change name/password of ESP8266's AP:\n"
-"ap_if = network.WLAN(network.AP_IF)\n"
-"ap_if.config(essid=\"<AP_NAME>\", authmode=network.AUTH_WPA_WPA2_PSK, password=\"<password>\")\n"
-"\n"
-"Control commands:\n"
-" CTRL-A -- on a blank line, enter raw REPL mode\n"
-" CTRL-B -- on a blank line, enter normal REPL mode\n"
-" CTRL-C -- interrupt a running program\n"
-" CTRL-D -- on a blank line, do a soft reset of the board\n"
-" CTRL-E -- on a blank line, enter paste mode\n"
-"\n"
-"For further help on a specific object, type help(obj)\n"
+ "Welcome to MicroPython!\n"
+ "\n"
+ "For online docs please visit http://docs.micropython.org/en/latest/esp8266/ .\n"
+ "For diagnostic information to include in bug reports execute 'import port_diag'.\n"
+ "\n"
+ "Basic WiFi configuration:\n"
+ "\n"
+ "import network\n"
+ "sta_if = network.WLAN(network.STA_IF); sta_if.active(True)\n"
+ "sta_if.scan() # Scan for available access points\n"
+ "sta_if.connect(\"<AP_name>\", \"<password>\") # Connect to an AP\n"
+ "sta_if.isconnected() # Check for successful connection\n"
+ "# Change name/password of ESP8266's AP:\n"
+ "ap_if = network.WLAN(network.AP_IF)\n"
+ "ap_if.config(essid=\"<AP_NAME>\", authmode=network.AUTH_WPA_WPA2_PSK, password=\"<password>\")\n"
+ "\n"
+ "Control commands:\n"
+ " CTRL-A -- on a blank line, enter raw REPL mode\n"
+ " CTRL-B -- on a blank line, enter normal REPL mode\n"
+ " CTRL-C -- interrupt a running program\n"
+ " CTRL-D -- on a blank line, do a soft reset of the board\n"
+ " CTRL-E -- on a blank line, enter paste mode\n"
+ "\n"
+ "For further help on a specific object, type help(obj)\n"
;
diff --git a/ports/esp8266/hspi.c b/ports/esp8266/hspi.c
index 554a504..cecf0b7 100644
--- a/ports/esp8266/hspi.c
+++ b/ports/esp8266/hspi.c
@@ -36,7 +36,7 @@
spi_tx_byte_order(spi_no, SPI_BYTE_ORDER_HIGH_TO_LOW);
spi_rx_byte_order(spi_no, SPI_BYTE_ORDER_HIGH_TO_LOW);
- SET_PERI_REG_MASK(SPI_USER(spi_no), SPI_CS_SETUP|SPI_CS_HOLD);
+ SET_PERI_REG_MASK(SPI_USER(spi_no), SPI_CS_SETUP | SPI_CS_HOLD);
CLEAR_PERI_REG_MASK(SPI_USER(spi_no), SPI_FLASH_MODE);
}
@@ -84,14 +84,14 @@
}
if (spi_no == SPI) {
// Set bit 8 if 80MHz sysclock required
- WRITE_PERI_REG(PERIPHS_IO_MUX, 0x005 | (clock_div_flag<<8));
+ WRITE_PERI_REG(PERIPHS_IO_MUX, 0x005 | (clock_div_flag << 8));
PIN_FUNC_SELECT(PERIPHS_IO_MUX_SD_CLK_U, 1);
PIN_FUNC_SELECT(PERIPHS_IO_MUX_SD_CMD_U, 1);
PIN_FUNC_SELECT(PERIPHS_IO_MUX_SD_DATA0_U, 1);
PIN_FUNC_SELECT(PERIPHS_IO_MUX_SD_DATA1_U, 1);
} else if (spi_no == HSPI) {
// Set bit 9 if 80MHz sysclock required
- WRITE_PERI_REG(PERIPHS_IO_MUX, 0x105 | (clock_div_flag<<9));
+ WRITE_PERI_REG(PERIPHS_IO_MUX, 0x105 | (clock_div_flag << 9));
// GPIO12 is HSPI MISO pin (Master Data In)
PIN_FUNC_SELECT(PERIPHS_IO_MUX_MTDI_U, 2);
// GPIO13 is HSPI MOSI pin (Master Data Out)
@@ -117,11 +117,11 @@
WRITE_PERI_REG(SPI_CLOCK(spi_no), SPI_CLK_EQU_SYSCLK);
} else {
WRITE_PERI_REG(SPI_CLOCK(spi_no),
- (((prediv - 1) & SPI_CLKDIV_PRE) << SPI_CLKDIV_PRE_S) |
- (((cntdiv - 1) & SPI_CLKCNT_N) << SPI_CLKCNT_N_S) |
- (((cntdiv >> 1) & SPI_CLKCNT_H) << SPI_CLKCNT_H_S) |
- ((0 & SPI_CLKCNT_L) << SPI_CLKCNT_L_S)
- );
+ (((prediv - 1) & SPI_CLKDIV_PRE) << SPI_CLKDIV_PRE_S) |
+ (((cntdiv - 1) & SPI_CLKCNT_N) << SPI_CLKCNT_N_S) |
+ (((cntdiv >> 1) & SPI_CLKCNT_H) << SPI_CLKCNT_H_S) |
+ ((0 & SPI_CLKCNT_L) << SPI_CLKCNT_L_S)
+ );
}
}
@@ -185,15 +185,17 @@
(for anything <32 bits).
*/
uint32_t spi_transaction(uint8_t spi_no, uint8_t cmd_bits, uint16_t cmd_data,
- uint32_t addr_bits, uint32_t addr_data,
- uint32_t dout_bits, uint32_t dout_data,
- uint32_t din_bits, uint32_t dummy_bits) {
- while (spi_busy(spi_no)) {}; // Wait for SPI to be ready
+ uint32_t addr_bits, uint32_t addr_data,
+ uint32_t dout_bits, uint32_t dout_data,
+ uint32_t din_bits, uint32_t dummy_bits) {
+ while (spi_busy(spi_no)) {
+ }
+ ; // Wait for SPI to be ready
// Enable SPI Functions
// Disable MOSI, MISO, ADDR, COMMAND, DUMMY in case previously set.
CLEAR_PERI_REG_MASK(SPI_USER(spi_no), SPI_USR_MOSI | SPI_USR_MISO |
- SPI_USR_COMMAND | SPI_USR_ADDR | SPI_USR_DUMMY);
+ SPI_USR_COMMAND | SPI_USR_ADDR | SPI_USR_DUMMY);
// Enable functions based on number of bits. 0 bits = disabled.
// This is rather inefficient but allows for a very generic function.
@@ -213,25 +215,25 @@
WRITE_PERI_REG(SPI_USER1(spi_no),
// Number of bits in Address
((addr_bits - 1) & SPI_USR_ADDR_BITLEN) << SPI_USR_ADDR_BITLEN_S |
- // Number of bits to Send
- ((dout_bits - 1) & SPI_USR_MOSI_BITLEN) << SPI_USR_MOSI_BITLEN_S |
- // Number of bits to receive
- ((din_bits - 1) & SPI_USR_MISO_BITLEN) << SPI_USR_MISO_BITLEN_S |
- // Number of Dummy bits to insert
- ((dummy_bits - 1) & SPI_USR_DUMMY_CYCLELEN) << SPI_USR_DUMMY_CYCLELEN_S);
+ // Number of bits to Send
+ ((dout_bits - 1) & SPI_USR_MOSI_BITLEN) << SPI_USR_MOSI_BITLEN_S |
+ // Number of bits to receive
+ ((din_bits - 1) & SPI_USR_MISO_BITLEN) << SPI_USR_MISO_BITLEN_S |
+ // Number of Dummy bits to insert
+ ((dummy_bits - 1) & SPI_USR_DUMMY_CYCLELEN) << SPI_USR_DUMMY_CYCLELEN_S);
// Setup Command Data
if (cmd_bits) {
// Enable COMMAND function in SPI module
SET_PERI_REG_MASK(SPI_USER(spi_no), SPI_USR_COMMAND);
// Align command data to high bits
- uint16_t command = cmd_data << (16-cmd_bits);
+ uint16_t command = cmd_data << (16 - cmd_bits);
// Swap byte order
- command = ((command>>8)&0xff) | ((command<<8)&0xff00);
+ command = ((command >> 8) & 0xff) | ((command << 8) & 0xff00);
WRITE_PERI_REG(SPI_USER2(spi_no), (
(((cmd_bits - 1) & SPI_USR_COMMAND_BITLEN) << SPI_USR_COMMAND_BITLEN_S) |
(command & SPI_USR_COMMAND_VALUE)
- ));
+ ));
}
// Setup Address Data
@@ -246,42 +248,44 @@
if (dout_bits) {
// Enable MOSI function in SPI module
SET_PERI_REG_MASK(SPI_USER(spi_no), SPI_USR_MOSI);
- // Copy data to W0
- if (READ_PERI_REG(SPI_USER(spi_no))&SPI_WR_BYTE_ORDER) {
- WRITE_PERI_REG(SPI_W0(spi_no), dout_data << (32 - dout_bits));
- } else {
- uint8_t dout_extra_bits = dout_bits%8;
-
- if (dout_extra_bits) {
- // If your data isn't a byte multiple (8/16/24/32 bits) and you
- // don't have SPI_WR_BYTE_ORDER set, you need this to move the
- // non-8bit remainder to the MSBs. Not sure if there's even a use
- // case for this, but it's here if you need it... For example,
- // 0xDA4 12 bits without SPI_WR_BYTE_ORDER would usually be output
- // as if it were 0x0DA4, of which 0xA4, and then 0x0 would be
- // shifted out (first 8 bits of low byte, then 4 MSB bits of high
- // byte - ie reverse byte order).
- // The code below shifts it out as 0xA4 followed by 0xD as you
- // might require.
- WRITE_PERI_REG(SPI_W0(spi_no), (
- (0xFFFFFFFF << (dout_bits - dout_extra_bits) & dout_data)
- << (8-dout_extra_bits) |
- ((0xFFFFFFFF >> (32 - (dout_bits - dout_extra_bits)))
- & dout_data)
- ));
+ // Copy data to W0
+ if (READ_PERI_REG(SPI_USER(spi_no)) & SPI_WR_BYTE_ORDER) {
+ WRITE_PERI_REG(SPI_W0(spi_no), dout_data << (32 - dout_bits));
} else {
- WRITE_PERI_REG(SPI_W0(spi_no), dout_data);
+ uint8_t dout_extra_bits = dout_bits % 8;
+
+ if (dout_extra_bits) {
+ // If your data isn't a byte multiple (8/16/24/32 bits) and you
+ // don't have SPI_WR_BYTE_ORDER set, you need this to move the
+ // non-8bit remainder to the MSBs. Not sure if there's even a use
+ // case for this, but it's here if you need it... For example,
+ // 0xDA4 12 bits without SPI_WR_BYTE_ORDER would usually be output
+ // as if it were 0x0DA4, of which 0xA4, and then 0x0 would be
+ // shifted out (first 8 bits of low byte, then 4 MSB bits of high
+ // byte - ie reverse byte order).
+ // The code below shifts it out as 0xA4 followed by 0xD as you
+ // might require.
+ WRITE_PERI_REG(SPI_W0(spi_no), (
+ (0xFFFFFFFF << (dout_bits - dout_extra_bits) & dout_data)
+ << (8 - dout_extra_bits) |
+ ((0xFFFFFFFF >> (32 - (dout_bits - dout_extra_bits)))
+ & dout_data)
+ ));
+ } else {
+ WRITE_PERI_REG(SPI_W0(spi_no), dout_data);
+ }
}
}
-}
// Begin SPI Transaction
SET_PERI_REG_MASK(SPI_CMD(spi_no), SPI_USR);
// Return DIN data
if (din_bits) {
- while (spi_busy(spi_no)) {}; // Wait for SPI transaction to complete
- if (READ_PERI_REG(SPI_USER(spi_no))&SPI_RD_BYTE_ORDER) {
+ while (spi_busy(spi_no)) {
+ }
+ ; // Wait for SPI transaction to complete
+ if (READ_PERI_REG(SPI_USER(spi_no)) & SPI_RD_BYTE_ORDER) {
// Assuming data in is written to MSB. TBC
return READ_PERI_REG(SPI_W0(spi_no)) >> (32 - din_bits);
} else {
@@ -301,19 +305,21 @@
Just do minimal work needed to send 8 bits.
*/
inline void spi_tx8fast(uint8_t spi_no, uint8_t dout_data) {
- while (spi_busy(spi_no)) {}; // Wait for SPI to be ready
+ while (spi_busy(spi_no)) {
+ }
+ ; // Wait for SPI to be ready
// Enable SPI Functions
// Disable MOSI, MISO, ADDR, COMMAND, DUMMY in case previously set.
CLEAR_PERI_REG_MASK(SPI_USER(spi_no), SPI_USR_MOSI | SPI_USR_MISO |
- SPI_USR_COMMAND | SPI_USR_ADDR | SPI_USR_DUMMY);
+ SPI_USR_COMMAND | SPI_USR_ADDR | SPI_USR_DUMMY);
// Setup Bitlengths
WRITE_PERI_REG(SPI_USER1(spi_no),
// Number of bits to Send
((8 - 1) & SPI_USR_MOSI_BITLEN) << SPI_USR_MOSI_BITLEN_S |
- // Number of bits to receive
- ((8 - 1) & SPI_USR_MISO_BITLEN) << SPI_USR_MISO_BITLEN_S);
+ // Number of bits to receive
+ ((8 - 1) & SPI_USR_MISO_BITLEN) << SPI_USR_MISO_BITLEN_S);
// Setup DOUT data
diff --git a/ports/esp8266/hspi.h b/ports/esp8266/hspi.h
index c68366e..aae9840 100644
--- a/ports/esp8266/hspi.h
+++ b/ports/esp8266/hspi.h
@@ -58,13 +58,13 @@
void spi_tx_byte_order(uint8_t spi_no, uint8_t byte_order);
void spi_rx_byte_order(uint8_t spi_no, uint8_t byte_order);
uint32_t spi_transaction(uint8_t spi_no, uint8_t cmd_bits, uint16_t cmd_data,
- uint32_t addr_bits, uint32_t addr_data,
- uint32_t dout_bits, uint32_t dout_data,
- uint32_t din_bits, uint32_t dummy_bits);
+ uint32_t addr_bits, uint32_t addr_data,
+ uint32_t dout_bits, uint32_t dout_data,
+ uint32_t din_bits, uint32_t dummy_bits);
void spi_tx8fast(uint8_t spi_no, uint8_t dout_data);
// Expansion Macros
-#define spi_busy(spi_no) READ_PERI_REG(SPI_CMD(spi_no))&SPI_USR
+#define spi_busy(spi_no) READ_PERI_REG(SPI_CMD(spi_no)) & SPI_USR
#define spi_txd(spi_no, bits, data) spi_transaction(spi_no, 0, 0, 0, 0, bits, (uint32_t) data, 0, 0)
#define spi_tx8(spi_no, data) spi_transaction(spi_no, 0, 0, 0, 0, 8, (uint32_t) data, 0, 0)
diff --git a/ports/esp8266/lexerstr32.c b/ports/esp8266/lexerstr32.c
index 6fb84bb..a921efb 100644
--- a/ports/esp8266/lexerstr32.c
+++ b/ports/esp8266/lexerstr32.c
@@ -36,7 +36,7 @@
} mp_lexer_str32_buf_t;
STATIC mp_uint_t str32_buf_next_byte(void *sb_in) {
- mp_lexer_str32_buf_t *sb = (mp_lexer_str32_buf_t*)sb_in;
+ mp_lexer_str32_buf_t *sb = (mp_lexer_str32_buf_t *)sb_in;
byte c = sb->val & 0xff;
if (c == 0) {
return MP_READER_EOF;
@@ -53,14 +53,14 @@
}
STATIC void str32_buf_free(void *sb_in) {
- mp_lexer_str32_buf_t *sb = (mp_lexer_str32_buf_t*)sb_in;
+ mp_lexer_str32_buf_t *sb = (mp_lexer_str32_buf_t *)sb_in;
m_del_obj(mp_lexer_str32_buf_t, sb);
}
mp_lexer_t *mp_lexer_new_from_str32(qstr src_name, const char *str, mp_uint_t len, mp_uint_t free_len) {
mp_lexer_str32_buf_t *sb = m_new_obj(mp_lexer_str32_buf_t);
sb->byte_off = (uint32_t)str & 3;
- sb->src_cur = (uint32_t*)(str - sb->byte_off);
+ sb->src_cur = (uint32_t *)(str - sb->byte_off);
sb->val = *sb->src_cur++ >> sb->byte_off * 8;
mp_reader_t reader = {sb, str32_buf_next_byte, str32_buf_free};
return mp_lexer_new(src_name, reader);
diff --git a/ports/esp8266/machine_adc.c b/ports/esp8266/machine_adc.c
index 2318239..b0b458a 100644
--- a/ports/esp8266/machine_adc.c
+++ b/ports/esp8266/machine_adc.c
@@ -59,12 +59,12 @@
mp_int_t chn = mp_obj_get_int(args[0]);
switch (chn) {
- case 0:
- return &machine_adc_adc;
- case 1:
- return &machine_adc_vdd3;
- default:
- mp_raise_msg_varg(&mp_type_ValueError, "ADC(%d) doesn't exist", chn);
+ case 0:
+ return &machine_adc_adc;
+ case 1:
+ return &machine_adc_vdd3;
+ default:
+ mp_raise_msg_varg(&mp_type_ValueError, "ADC(%d) doesn't exist", chn);
}
}
@@ -94,5 +94,5 @@
.name = MP_QSTR_ADC,
.print = machine_adc_print,
.make_new = machine_adc_make_new,
- .locals_dict = (mp_obj_dict_t*)&machine_adc_locals_dict,
+ .locals_dict = (mp_obj_dict_t *)&machine_adc_locals_dict,
};
diff --git a/ports/esp8266/machine_hspi.c b/ports/esp8266/machine_hspi.c
index 07770c8..11c95a3 100644
--- a/ports/esp8266/machine_hspi.c
+++ b/ports/esp8266/machine_hspi.c
@@ -101,7 +101,7 @@
}
STATIC void machine_hspi_init(mp_obj_base_t *self_in, size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
- machine_hspi_obj_t *self = (machine_hspi_obj_t*)self_in;
+ machine_hspi_obj_t *self = (machine_hspi_obj_t *)self_in;
enum { ARG_baudrate, ARG_polarity, ARG_phase };
static const mp_arg_t allowed_args[] = {
@@ -111,7 +111,7 @@
};
mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
mp_arg_parse_all(n_args, pos_args, kw_args, MP_ARRAY_SIZE(allowed_args),
- allowed_args, args);
+ allowed_args, args);
if (args[ARG_baudrate].u_int != -1) {
self->baudrate = args[ARG_baudrate].u_int;
@@ -143,10 +143,10 @@
spi_tx_byte_order(HSPI, SPI_BYTE_ORDER_HIGH_TO_LOW);
spi_rx_byte_order(HSPI, SPI_BYTE_ORDER_HIGH_TO_LOW);
CLEAR_PERI_REG_MASK(SPI_USER(HSPI), SPI_FLASH_MODE | SPI_USR_MISO |
- SPI_USR_ADDR | SPI_USR_COMMAND | SPI_USR_DUMMY);
+ SPI_USR_ADDR | SPI_USR_COMMAND | SPI_USR_DUMMY);
// Clear Dual or Quad lines transmission mode
CLEAR_PERI_REG_MASK(SPI_CTRL(HSPI), SPI_QIO_MODE | SPI_DIO_MODE |
- SPI_DOUT_MODE | SPI_QOUT_MODE);
+ SPI_DOUT_MODE | SPI_QOUT_MODE);
spi_mode(HSPI, self->phase, self->polarity);
}
@@ -165,7 +165,7 @@
self->phase = 0;
mp_map_t kw_args;
mp_map_init_fixed_table(&kw_args, n_kw, args + n_args);
- machine_hspi_init((mp_obj_base_t*)self, n_args - 1, args + 1, &kw_args);
+ machine_hspi_init((mp_obj_base_t *)self, n_args - 1, args + 1, &kw_args);
return MP_OBJ_FROM_PTR(self);
}
@@ -180,7 +180,7 @@
.print = machine_hspi_print,
.make_new = mp_machine_spi_make_new, // delegate to master constructor
.protocol = &machine_hspi_p,
- .locals_dict = (mp_obj_dict_t*)&mp_machine_spi_locals_dict,
+ .locals_dict = (mp_obj_dict_t *)&mp_machine_spi_locals_dict,
};
#endif // MICROPY_PY_MACHINE_SPI
diff --git a/ports/esp8266/machine_pin.c b/ports/esp8266/machine_pin.c
index 1200aa9..c77bd55 100644
--- a/ports/esp8266/machine_pin.c
+++ b/ports/esp8266/machine_pin.c
@@ -43,8 +43,8 @@
GPIO_PIN_INT_TYPE_GET(GPIO_REG_READ(GPIO_PIN_ADDR(phys_port)))
#define SET_TRIGGER(phys_port, trig) \
(GPIO_REG_WRITE(GPIO_PIN_ADDR(phys_port), \
- (GPIO_REG_READ(GPIO_PIN_ADDR(phys_port)) & ~GPIO_PIN_INT_TYPE_MASK) \
- | GPIO_PIN_INT_TYPE_SET(trig))) \
+ (GPIO_REG_READ(GPIO_PIN_ADDR(phys_port)) & ~GPIO_PIN_INT_TYPE_MASK) \
+ | GPIO_PIN_INT_TYPE_SET(trig))) \
#define GPIO_MODE_INPUT (0)
#define GPIO_MODE_OUTPUT (1)
@@ -315,7 +315,7 @@
int wanted_pin = mp_obj_get_int(args[0]);
pyb_pin_obj_t *pin = NULL;
if (0 <= wanted_pin && wanted_pin < MP_ARRAY_SIZE(pyb_pin_obj)) {
- pin = (pyb_pin_obj_t*)&pyb_pin_obj[wanted_pin];
+ pin = (pyb_pin_obj_t *)&pyb_pin_obj[wanted_pin];
}
if (pin == NULL || pin->base.type == NULL) {
mp_raise_ValueError("invalid pin");
@@ -458,7 +458,7 @@
.make_new = mp_pin_make_new,
.call = pyb_pin_call,
.protocol = &pin_pin_p,
- .locals_dict = (mp_obj_dict_t*)&pyb_pin_locals_dict,
+ .locals_dict = (mp_obj_dict_t *)&pyb_pin_locals_dict,
};
/******************************************************************************/
@@ -514,5 +514,5 @@
{ &mp_type_type },
.name = MP_QSTR_IRQ,
.call = pin_irq_call,
- .locals_dict = (mp_obj_dict_t*)&pin_irq_locals_dict,
+ .locals_dict = (mp_obj_dict_t *)&pin_irq_locals_dict,
};
diff --git a/ports/esp8266/machine_pwm.c b/ports/esp8266/machine_pwm.c
index 6bf8fc9..5325580 100644
--- a/ports/esp8266/machine_pwm.c
+++ b/ports/esp8266/machine_pwm.c
@@ -166,5 +166,5 @@
.name = MP_QSTR_PWM,
.print = pyb_pwm_print,
.make_new = pyb_pwm_make_new,
- .locals_dict = (mp_obj_dict_t*)&pyb_pwm_locals_dict,
+ .locals_dict = (mp_obj_dict_t *)&pyb_pwm_locals_dict,
};
diff --git a/ports/esp8266/machine_rtc.c b/ports/esp8266/machine_rtc.c
index bbfc172..3df2dfc 100644
--- a/ports/esp8266/machine_rtc.c
+++ b/ports/esp8266/machine_rtc.c
@@ -266,5 +266,5 @@
{ &mp_type_type },
.name = MP_QSTR_RTC,
.make_new = pyb_rtc_make_new,
- .locals_dict = (mp_obj_dict_t*)&pyb_rtc_locals_dict,
+ .locals_dict = (mp_obj_dict_t *)&pyb_rtc_locals_dict,
};
diff --git a/ports/esp8266/machine_uart.c b/ports/esp8266/machine_uart.c
index e4f77fb..735e01b 100644
--- a/ports/esp8266/machine_uart.c
+++ b/ports/esp8266/machine_uart.c
@@ -268,7 +268,7 @@
*buf++ = uart_rx_char();
if (--size == 0 || !uart_rx_wait(self->timeout_char * 1000)) {
// return number of bytes read
- return buf - (uint8_t*)buf_in;
+ return buf - (uint8_t *)buf_in;
}
}
}
@@ -328,5 +328,5 @@
.getiter = mp_identity_getiter,
.iternext = mp_stream_unbuffered_iter,
.protocol = &uart_stream_p,
- .locals_dict = (mp_obj_dict_t*)&pyb_uart_locals_dict,
+ .locals_dict = (mp_obj_dict_t *)&pyb_uart_locals_dict,
};
diff --git a/ports/esp8266/machine_wdt.c b/ports/esp8266/machine_wdt.c
index fad0b2e..9411e31 100644
--- a/ports/esp8266/machine_wdt.c
+++ b/ports/esp8266/machine_wdt.c
@@ -49,12 +49,12 @@
}
switch (id) {
- case 0:
- ets_loop_dont_feed_sw_wdt = 1;
- system_soft_wdt_feed();
- return &wdt_default;
- default:
- mp_raise_ValueError(NULL);
+ case 0:
+ ets_loop_dont_feed_sw_wdt = 1;
+ system_soft_wdt_feed();
+ return &wdt_default;
+ default:
+ mp_raise_ValueError(NULL);
}
}
@@ -82,5 +82,5 @@
{ &mp_type_type },
.name = MP_QSTR_WDT,
.make_new = machine_wdt_make_new,
- .locals_dict = (mp_obj_dict_t*)&machine_wdt_locals_dict,
+ .locals_dict = (mp_obj_dict_t *)&machine_wdt_locals_dict,
};
diff --git a/ports/esp8266/main.c b/ports/esp8266/main.c
index 8bfb2a0..aff5936 100644
--- a/ports/esp8266/main.c
+++ b/ports/esp8266/main.c
@@ -47,7 +47,7 @@
STATIC char heap[38 * 1024];
STATIC void mp_reset(void) {
- mp_stack_set_top((void*)0x40000000);
+ mp_stack_set_top((void *)0x40000000);
mp_stack_set_limit(8192);
mp_hal_init();
gc_init(heap, heap + sizeof(heap));
diff --git a/ports/esp8266/makeimg.py b/ports/esp8266/makeimg.py
index 091854f..a81b2d0 100644
--- a/ports/esp8266/makeimg.py
+++ b/ports/esp8266/makeimg.py
@@ -8,33 +8,33 @@
md5 = hashlib.md5()
-with open(sys.argv[3], 'wb') as fout:
+with open(sys.argv[3], "wb") as fout:
- with open(sys.argv[1], 'rb') as f:
+ with open(sys.argv[1], "rb") as f:
data_flash = f.read()
fout.write(data_flash)
# First 4 bytes include flash size, etc. which may be changed
# by esptool.py, etc.
md5.update(data_flash[4:])
- print('flash ', len(data_flash))
+ print("flash ", len(data_flash))
- with open(sys.argv[2], 'rb') as f:
+ with open(sys.argv[2], "rb") as f:
data_rom = f.read()
- pad = b'\xff' * (SEGS_MAX_SIZE - len(data_flash))
+ pad = b"\xff" * (SEGS_MAX_SIZE - len(data_flash))
assert len(pad) >= 4
fout.write(pad[:-4])
md5.update(pad[:-4])
len_data = struct.pack("I", SEGS_MAX_SIZE + len(data_rom))
fout.write(len_data)
md5.update(len_data)
- print('padding ', len(pad))
+ print("padding ", len(pad))
fout.write(data_rom)
md5.update(data_rom)
- print('irom0text', len(data_rom))
+ print("irom0text", len(data_rom))
fout.write(md5.digest())
- print('total ', SEGS_MAX_SIZE + len(data_rom))
- print('md5 ', md5.hexdigest())
+ print("total ", SEGS_MAX_SIZE + len(data_rom))
+ print("md5 ", md5.hexdigest())
diff --git a/ports/esp8266/modesp.c b/ports/esp8266/modesp.c
index 6f937e0..95566cd 100644
--- a/ports/esp8266/modesp.c
+++ b/ports/esp8266/modesp.c
@@ -101,7 +101,7 @@
}
// We know that allocation will be 4-byte aligned for sure
- SpiFlashOpResult res = spi_flash_read(offset, (uint32_t*)buf, len);
+ SpiFlashOpResult res = spi_flash_read(offset, (uint32_t *)buf, len);
if (res == SPI_FLASH_RESULT_OK) {
if (alloc_buf) {
return mp_obj_new_bytes(buf, len);
@@ -148,7 +148,7 @@
extern char flashchip;
// For SDK 1.5.2, either address has shifted and not mirrored in
// eagle.rom.addr.v6.ld, or extra initial member was added.
- SpiFlashChip *flash = (SpiFlashChip*)(&flashchip + 4);
+ SpiFlashChip *flash = (SpiFlashChip *)(&flashchip + 4);
#if 0
printf("deviceId: %x\n", flash->deviceId);
printf("chip_size: %u\n", flash->chip_size);
@@ -163,7 +163,7 @@
// If there's just 1 loadable segment at the start of flash,
// we assume there's a yaota8266 bootloader.
-#define IS_OTA_FIRMWARE() ((*(uint32_t*)0x40200000 & 0xff00) == 0x100)
+#define IS_OTA_FIRMWARE() ((*(uint32_t *)0x40200000 & 0xff00) == 0x100)
extern byte _firmware_size[];
@@ -174,13 +174,13 @@
STATIC mp_obj_t esp_check_fw(void) {
MD5_CTX ctx;
- char *fw_start = (char*)0x40200000;
+ char *fw_start = (char *)0x40200000;
if (IS_OTA_FIRMWARE()) {
// Skip yaota8266 bootloader
fw_start += 0x3c000;
}
- uint32_t size = *(uint32_t*)(fw_start + 0x8ffc);
+ uint32_t size = *(uint32_t *)(fw_start + 0x8ffc);
printf("size: %d\n", size);
if (size > 1024 * 1024) {
printf("Invalid size\n");
@@ -204,7 +204,7 @@
mp_buffer_info_t bufinfo;
mp_get_buffer_raise(buf, &bufinfo, MP_BUFFER_READ);
esp_neopixel_write(mp_obj_get_pin_obj(pin)->phys_port,
- (uint8_t*)bufinfo.buf, bufinfo.len, mp_obj_is_true(is800k));
+ (uint8_t *)bufinfo.buf, bufinfo.len, mp_obj_is_true(is800k));
return mp_const_none;
}
STATIC MP_DEFINE_CONST_FUN_OBJ_3(esp_neopixel_write_obj, esp_neopixel_write_);
@@ -215,7 +215,7 @@
mp_get_buffer_raise(buf, &bufinfo, MP_BUFFER_READ);
esp_apa102_write(mp_obj_get_pin_obj(clockPin)->phys_port,
mp_obj_get_pin_obj(dataPin)->phys_port,
- (uint8_t*)bufinfo.buf, bufinfo.len);
+ (uint8_t *)bufinfo.buf, bufinfo.len);
return mp_const_none;
}
STATIC MP_DEFINE_CONST_FUN_OBJ_3(esp_apa102_write_obj, esp_apa102_write_);
@@ -238,7 +238,7 @@
STATIC MP_DEFINE_CONST_FUN_OBJ_1(esp_malloc_obj, esp_malloc);
STATIC mp_obj_t esp_free(mp_obj_t addr_in) {
- os_free((void*)mp_obj_get_int(addr_in));
+ os_free((void *)mp_obj_get_int(addr_in));
return mp_const_none;
}
STATIC MP_DEFINE_CONST_FUN_OBJ_1(esp_free_obj, esp_free);
@@ -294,9 +294,9 @@
void *dest;
if (esp_native_code_location == ESP_NATIVE_CODE_IRAM1) {
- dest = (void*)esp_native_code_cur;
+ dest = (void *)esp_native_code_cur;
} else {
- dest = (void*)(FLASH_START + esp_native_code_cur);
+ dest = (void *)(FLASH_START + esp_native_code_cur);
}
if (reloc) {
mp_native_relocate(reloc, buf, (uintptr_t)dest);
@@ -381,16 +381,16 @@
{ MP_ROM_QSTR(MP_QSTR_set_native_code_location), MP_ROM_PTR(&esp_set_native_code_location_obj) },
#endif
-#if MODESP_INCLUDE_CONSTANTS
+ #if MODESP_INCLUDE_CONSTANTS
{ MP_ROM_QSTR(MP_QSTR_SLEEP_NONE), MP_ROM_INT(NONE_SLEEP_T) },
{ MP_ROM_QSTR(MP_QSTR_SLEEP_LIGHT), MP_ROM_INT(LIGHT_SLEEP_T) },
{ MP_ROM_QSTR(MP_QSTR_SLEEP_MODEM), MP_ROM_INT(MODEM_SLEEP_T) },
-#endif
+ #endif
};
STATIC MP_DEFINE_CONST_DICT(esp_module_globals, esp_module_globals_table);
const mp_obj_module_t esp_module = {
.base = { &mp_type_module },
- .globals = (mp_obj_dict_t*)&esp_module_globals,
+ .globals = (mp_obj_dict_t *)&esp_module_globals,
};
diff --git a/ports/esp8266/modmachine.c b/ports/esp8266/modmachine.c
index 35d4918..e6be0c1 100644
--- a/ports/esp8266/modmachine.c
+++ b/ports/esp8266/modmachine.c
@@ -84,13 +84,13 @@
STATIC mp_obj_t machine_unique_id(void) {
uint32_t id = system_get_chip_id();
- return mp_obj_new_bytes((byte*)&id, sizeof(id));
+ return mp_obj_new_bytes((byte *)&id, sizeof(id));
}
STATIC MP_DEFINE_CONST_FUN_OBJ_0(machine_unique_id_obj, machine_unique_id);
STATIC mp_obj_t machine_idle(void) {
uint32_t t = mp_hal_ticks_cpu();
- asm("waiti 0");
+ asm ("waiti 0");
t = mp_hal_ticks_cpu() - t;
ets_event_poll(); // handle any events after possibly a long wait (eg feed WDT)
return MP_OBJ_NEW_SMALL_INT(t);
@@ -112,7 +112,7 @@
ets_event_poll();
if (wifi_mode == NULL_MODE) {
// Can only idle if the wifi is off
- asm("waiti 0");
+ asm ("waiti 0");
}
}
return mp_const_none;
@@ -256,11 +256,11 @@
{ MP_QSTR_callback, MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_obj = mp_const_none} },
{ MP_QSTR_period, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 0xffffffff} },
{ MP_QSTR_tick_hz, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 1000} },
-#if MICROPY_PY_BUILTINS_FLOAT
+ #if MICROPY_PY_BUILTINS_FLOAT
{ MP_QSTR_freq, MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_obj = mp_const_none} },
-#else
+ #else
{ MP_QSTR_freq, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 0xffffffff} },
-#endif
+ #endif
};
// parse args
@@ -272,7 +272,7 @@
os_timer_disarm(&self->timer);
os_timer_setfn(&self->timer, esp_timer_cb, self);
-#if MICROPY_PY_BUILTINS_FLOAT
+ #if MICROPY_PY_BUILTINS_FLOAT
if (args[ARG_freq].u_obj != mp_const_none) {
mp_float_t freq = mp_obj_get_float(args[ARG_freq].u_obj);
if (freq < 0.001) {
@@ -281,11 +281,11 @@
esp_timer_arm_us(self, (mp_int_t)(1000000 / freq), args[ARG_mode].u_int);
}
}
-#else
+ #else
if (args[ARG_freq].u_int != 0xffffffff) {
esp_timer_arm_us(self, 1000000 / args[ARG_freq].u_int, args[ARG_mode].u_int);
}
-#endif
+ #endif
else {
mp_int_t period = args[ARG_period].u_int;
mp_int_t hz = args[ARG_tick_hz].u_int;
@@ -333,7 +333,7 @@
.name = MP_QSTR_Timer,
.print = esp_timer_print,
.make_new = esp_timer_make_new,
- .locals_dict = (mp_obj_dict_t*)&esp_timer_locals_dict,
+ .locals_dict = (mp_obj_dict_t *)&esp_timer_locals_dict,
};
// this bit is unused in the Xtensa PS register
@@ -434,7 +434,7 @@
const mp_obj_module_t mp_module_machine = {
.base = { &mp_type_module },
- .globals = (mp_obj_dict_t*)&machine_module_globals,
+ .globals = (mp_obj_dict_t *)&machine_module_globals,
};
#endif // MICROPY_PY_MACHINE
diff --git a/ports/esp8266/modnetwork.c b/ports/esp8266/modnetwork.c
index 6bdbe6e..ef3e02e 100644
--- a/ports/esp8266/modnetwork.c
+++ b/ports/esp8266/modnetwork.c
@@ -204,7 +204,7 @@
// but is present in SDK headers since 1.4.0
t->items[0] = mp_obj_new_bytes(bs->ssid, bs->ssid_len);
#else
- t->items[0] = mp_obj_new_bytes(bs->ssid, strlen((char*)bs->ssid));
+ t->items[0] = mp_obj_new_bytes(bs->ssid, strlen((char *)bs->ssid));
#endif
t->items[1] = mp_obj_new_bytes(bs->bssid, sizeof(bs->bssid));
t->items[2] = MP_OBJ_NEW_SMALL_INT(bs->channel);
@@ -280,10 +280,10 @@
// get
dns_addr = dns_getserver(0);
mp_obj_t tuple[4] = {
- netutils_format_ipv4_addr((uint8_t*)&info.ip, NETUTILS_BIG),
- netutils_format_ipv4_addr((uint8_t*)&info.netmask, NETUTILS_BIG),
- netutils_format_ipv4_addr((uint8_t*)&info.gw, NETUTILS_BIG),
- netutils_format_ipv4_addr((uint8_t*)&dns_addr, NETUTILS_BIG),
+ netutils_format_ipv4_addr((uint8_t *)&info.ip, NETUTILS_BIG),
+ netutils_format_ipv4_addr((uint8_t *)&info.netmask, NETUTILS_BIG),
+ netutils_format_ipv4_addr((uint8_t *)&info.gw, NETUTILS_BIG),
+ netutils_format_ipv4_addr((uint8_t *)&dns_addr, NETUTILS_BIG),
};
return mp_obj_new_tuple(4, tuple);
} else {
@@ -291,19 +291,19 @@
mp_obj_t *items;
bool restart_dhcp_server = false;
mp_obj_get_array_fixed_n(args[1], 4, &items);
- netutils_parse_ipv4_addr(items[0], (void*)&info.ip, NETUTILS_BIG);
+ netutils_parse_ipv4_addr(items[0], (void *)&info.ip, NETUTILS_BIG);
if (mp_obj_is_integer(items[1])) {
// allow numeric netmask, i.e.:
// 24 -> 255.255.255.0
// 16 -> 255.255.0.0
// etc...
- uint32_t* m = (uint32_t*)&info.netmask;
+ uint32_t *m = (uint32_t *)&info.netmask;
*m = htonl(0xffffffff << (32 - mp_obj_get_int(items[1])));
} else {
- netutils_parse_ipv4_addr(items[1], (void*)&info.netmask, NETUTILS_BIG);
+ netutils_parse_ipv4_addr(items[1], (void *)&info.netmask, NETUTILS_BIG);
}
- netutils_parse_ipv4_addr(items[2], (void*)&info.gw, NETUTILS_BIG);
- netutils_parse_ipv4_addr(items[3], (void*)&dns_addr, NETUTILS_BIG);
+ netutils_parse_ipv4_addr(items[2], (void *)&info.gw, NETUTILS_BIG);
+ netutils_parse_ipv4_addr(items[3], (void *)&dns_addr, NETUTILS_BIG);
// To set a static IP we have to disable DHCP first
if (self->if_id == STATION_IF) {
wifi_station_dhcpc_stop();
@@ -312,7 +312,7 @@
wifi_softap_dhcps_stop();
}
if (!wifi_set_ip_info(self->if_id, &info)) {
- mp_raise_msg(&mp_type_OSError, "wifi_set_ip_info() failed");
+ mp_raise_msg(&mp_type_OSError, "wifi_set_ip_info() failed");
}
dns_setserver(0, &dns_addr);
if (restart_dhcp_server) {
@@ -394,14 +394,14 @@
req_if = STATION_IF;
if (self->if_id == STATION_IF) {
const char *s = mp_obj_str_get_str(kwargs->table[i].value);
- wifi_station_set_hostname((char*)s);
+ wifi_station_set_hostname((char *)s);
}
break;
}
default:
goto unknown;
}
- #undef QS
+#undef QS
}
}
@@ -436,9 +436,9 @@
}
case MP_QSTR_essid:
if (self->if_id == STATION_IF) {
- val = mp_obj_new_str((char*)cfg.sta.ssid, strlen((char*)cfg.sta.ssid));
+ val = mp_obj_new_str((char *)cfg.sta.ssid, strlen((char *)cfg.sta.ssid));
} else {
- val = mp_obj_new_str((char*)cfg.ap.ssid, cfg.ap.ssid_len);
+ val = mp_obj_new_str((char *)cfg.ap.ssid, cfg.ap.ssid_len);
}
break;
case MP_QSTR_hidden:
@@ -455,7 +455,7 @@
break;
case MP_QSTR_dhcp_hostname: {
req_if = STATION_IF;
- char* s = wifi_station_get_hostname();
+ char *s = wifi_station_get_hostname();
if (s == NULL) {
val = MP_OBJ_NEW_QSTR(MP_QSTR_);
} else {
@@ -495,7 +495,7 @@
const mp_obj_type_t wlan_if_type = {
{ &mp_type_type },
.name = MP_QSTR_WLAN,
- .locals_dict = (mp_obj_dict_t*)&wlan_if_locals_dict,
+ .locals_dict = (mp_obj_dict_t *)&wlan_if_locals_dict,
};
STATIC mp_obj_t esp_phy_mode(size_t n_args, const mp_obj_t *args) {
@@ -513,7 +513,7 @@
{ MP_ROM_QSTR(MP_QSTR_WLAN), MP_ROM_PTR(&get_wlan_obj) },
{ MP_ROM_QSTR(MP_QSTR_phy_mode), MP_ROM_PTR(&esp_phy_mode_obj) },
-#if MODNETWORK_INCLUDE_CONSTANTS
+ #if MODNETWORK_INCLUDE_CONSTANTS
{ MP_ROM_QSTR(MP_QSTR_STA_IF), MP_ROM_INT(STATION_IF)},
{ MP_ROM_QSTR(MP_QSTR_AP_IF), MP_ROM_INT(SOFTAP_IF)},
@@ -533,12 +533,12 @@
{ MP_ROM_QSTR(MP_QSTR_AUTH_WPA_PSK), MP_ROM_INT(AUTH_WPA_PSK) },
{ MP_ROM_QSTR(MP_QSTR_AUTH_WPA2_PSK), MP_ROM_INT(AUTH_WPA2_PSK) },
{ MP_ROM_QSTR(MP_QSTR_AUTH_WPA_WPA2_PSK), MP_ROM_INT(AUTH_WPA_WPA2_PSK) },
-#endif
+ #endif
};
STATIC MP_DEFINE_CONST_DICT(mp_module_network_globals, mp_module_network_globals_table);
const mp_obj_module_t network_module = {
.base = { &mp_type_module },
- .globals = (mp_obj_dict_t*)&mp_module_network_globals,
+ .globals = (mp_obj_dict_t *)&mp_module_network_globals,
};
diff --git a/ports/esp8266/modules/_boot.py b/ports/esp8266/modules/_boot.py
index 4c2aa87..1f77d88 100644
--- a/ports/esp8266/modules/_boot.py
+++ b/ports/esp8266/modules/_boot.py
@@ -1,13 +1,15 @@
import gc
+
gc.threshold((gc.mem_free() + gc.mem_alloc()) // 4)
import uos
from flashbdev import bdev
if bdev:
try:
- uos.mount(bdev, '/')
+ uos.mount(bdev, "/")
except:
import inisetup
+
inisetup.setup()
gc.collect()
diff --git a/ports/esp8266/modules/flashbdev.py b/ports/esp8266/modules/flashbdev.py
index 4273b26..404cf36 100644
--- a/ports/esp8266/modules/flashbdev.py
+++ b/ports/esp8266/modules/flashbdev.py
@@ -1,29 +1,30 @@
import esp
+
class FlashBdev:
SEC_SIZE = 4096
RESERVED_SECS = 1
START_SEC = esp.flash_user_start() // SEC_SIZE + RESERVED_SECS
- NUM_BLK = 0x6b - RESERVED_SECS
+ NUM_BLK = 0x6B - RESERVED_SECS
def __init__(self, blocks=NUM_BLK):
self.blocks = blocks
def readblocks(self, n, buf, off=0):
- #print("readblocks(%s, %x(%d), %d)" % (n, id(buf), len(buf), off))
+ # print("readblocks(%s, %x(%d), %d)" % (n, id(buf), len(buf), off))
esp.flash_read((n + self.START_SEC) * self.SEC_SIZE + off, buf)
def writeblocks(self, n, buf, off=None):
- #print("writeblocks(%s, %x(%d), %d)" % (n, id(buf), len(buf), off))
- #assert len(buf) <= self.SEC_SIZE, len(buf)
+ # print("writeblocks(%s, %x(%d), %d)" % (n, id(buf), len(buf), off))
+ # assert len(buf) <= self.SEC_SIZE, len(buf)
if off is None:
esp.flash_erase(n + self.START_SEC)
off = 0
esp.flash_write((n + self.START_SEC) * self.SEC_SIZE + off, buf)
def ioctl(self, op, arg):
- #print("ioctl(%d, %r)" % (op, arg))
+ # print("ioctl(%d, %r)" % (op, arg))
if op == 4: # MP_BLOCKDEV_IOCTL_BLOCK_COUNT
return self.blocks
if op == 5: # MP_BLOCKDEV_IOCTL_BLOCK_SIZE
@@ -32,8 +33,9 @@
esp.flash_erase(arg + self.START_SEC)
return 0
+
size = esp.flash_size()
-if size < 1024*1024:
+if size < 1024 * 1024:
bdev = None
else:
# 20K at the flash end is reserved for SDK params storage
diff --git a/ports/esp8266/modules/inisetup.py b/ports/esp8266/modules/inisetup.py
index cb4fc04..1bbc3d0 100644
--- a/ports/esp8266/modules/inisetup.py
+++ b/ports/esp8266/modules/inisetup.py
@@ -2,45 +2,55 @@
import network
from flashbdev import bdev
+
def wifi():
import ubinascii
+
ap_if = network.WLAN(network.AP_IF)
essid = b"MicroPython-%s" % ubinascii.hexlify(ap_if.config("mac")[-3:])
ap_if.config(essid=essid, authmode=network.AUTH_WPA_WPA2_PSK, password=b"micropythoN")
+
def check_bootsec():
buf = bytearray(bdev.SEC_SIZE)
bdev.readblocks(0, buf)
empty = True
for b in buf:
- if b != 0xff:
+ if b != 0xFF:
empty = False
break
if empty:
return True
fs_corrupted()
+
def fs_corrupted():
import time
+
while 1:
- print("""\
+ print(
+ """\
The FAT filesystem starting at sector %d with size %d sectors appears to
be corrupted. If you had important data there, you may want to make a flash
snapshot to try to recover it. Otherwise, perform factory reprogramming
of MicroPython firmware (completely erase flash, followed by firmware
programming).
-""" % (bdev.START_SEC, bdev.blocks))
+"""
+ % (bdev.START_SEC, bdev.blocks)
+ )
time.sleep(3)
+
def setup():
check_bootsec()
print("Performing initial setup")
wifi()
uos.VfsFat.mkfs(bdev)
vfs = uos.VfsFat(bdev)
- uos.mount(vfs, '/')
+ uos.mount(vfs, "/")
with open("boot.py", "w") as f:
- f.write("""\
+ f.write(
+ """\
# This file is executed on every boot (including wake-boot from deepsleep)
#import esp
#esp.osdebug(None)
@@ -50,5 +60,6 @@
#import webrepl
#webrepl.start()
gc.collect()
-""")
+"""
+ )
return vfs
diff --git a/ports/esp8266/modules/neopixel.py b/ports/esp8266/modules/neopixel.py
index b13424d..be56ed1 100644
--- a/ports/esp8266/modules/neopixel.py
+++ b/ports/esp8266/modules/neopixel.py
@@ -21,8 +21,7 @@
def __getitem__(self, index):
offset = index * self.bpp
- return tuple(self.buf[offset + self.ORDER[i]]
- for i in range(self.bpp))
+ return tuple(self.buf[offset + self.ORDER[i]] for i in range(self.bpp))
def fill(self, color):
for i in range(self.n):
diff --git a/ports/esp8266/modules/ntptime.py b/ports/esp8266/modules/ntptime.py
index 0f51210..92ae6ab 100644
--- a/ports/esp8266/modules/ntptime.py
+++ b/ports/esp8266/modules/ntptime.py
@@ -13,9 +13,10 @@
# The NTP host can be configured at runtime by doing: ntptime.host = 'myhost.org'
host = "pool.ntp.org"
+
def time():
NTP_QUERY = bytearray(48)
- NTP_QUERY[0] = 0x1b
+ NTP_QUERY[0] = 0x1B
addr = socket.getaddrinfo(host, 123)[0][-1]
s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
try:
@@ -27,11 +28,13 @@
val = struct.unpack("!I", msg[40:44])[0]
return val - NTP_DELTA
+
# There's currently no timezone support in MicroPython, so
# utime.localtime() will return UTC time (as if it was .gmtime())
def settime():
t = time()
import machine
import utime
+
tm = utime.localtime(t)
machine.RTC().datetime((tm[0], tm[1], tm[2], tm[6] + 1, tm[3], tm[4], tm[5], 0))
diff --git a/ports/esp8266/modules/port_diag.py b/ports/esp8266/modules/port_diag.py
index ef88003..f2c69ec 100644
--- a/ports/esp8266/modules/port_diag.py
+++ b/ports/esp8266/modules/port_diag.py
@@ -10,13 +10,16 @@
fid = esp.flash_id()
print("FlashROM:")
- print("Flash ID: %x (Vendor: %x Device: %x)" % (fid, fid & 0xff, fid & 0xff00 | fid >> 16))
+ print("Flash ID: %x (Vendor: %x Device: %x)" % (fid, fid & 0xFF, fid & 0xFF00 | fid >> 16))
print("Flash bootloader data:")
SZ_MAP = {0: "512KB", 1: "256KB", 2: "1MB", 3: "2MB", 4: "4MB"}
- FREQ_MAP = {0: "40MHZ", 1: "26MHZ", 2: "20MHz", 0xf: "80MHz"}
+ FREQ_MAP = {0: "40MHZ", 1: "26MHZ", 2: "20MHz", 0xF: "80MHz"}
print("Byte @2: %02x" % ROM[2])
- print("Byte @3: %02x (Flash size: %s Flash freq: %s)" % (ROM[3], SZ_MAP.get(ROM[3] >> 4, "?"), FREQ_MAP.get(ROM[3] & 0xf)))
+ print(
+ "Byte @3: %02x (Flash size: %s Flash freq: %s)"
+ % (ROM[3], SZ_MAP.get(ROM[3] >> 4, "?"), FREQ_MAP.get(ROM[3] & 0xF))
+ )
print("Firmware checksum:")
print(esp.check_fw())
@@ -24,7 +27,9 @@
print("STA ifconfig:", network.WLAN(network.STA_IF).ifconfig())
print("AP ifconfig:", network.WLAN(network.AP_IF).ifconfig())
print("Free WiFi driver buffers of type:")
- for i, comm in enumerate(("1,2 TX", "4 Mngmt TX(len: 0x41-0x100)", "5 Mngmt TX (len: 0-0x40)", "7", "8 RX")):
+ for i, comm in enumerate(
+ ("1,2 TX", "4 Mngmt TX(len: 0x41-0x100)", "5 Mngmt TX (len: 0-0x40)", "7", "8 RX")
+ ):
print("%d: %d (%s)" % (i, esp.esf_free_bufs(i), comm))
print("lwIP PCBs:")
lwip.print_pcbs()
diff --git a/ports/esp8266/moduos.c b/ports/esp8266/moduos.c
index b66d5cc..f04094f 100644
--- a/ports/esp8266/moduos.c
+++ b/ports/esp8266/moduos.c
@@ -135,5 +135,5 @@
const mp_obj_module_t uos_module = {
.base = { &mp_type_module },
- .globals = (mp_obj_dict_t*)&os_module_globals,
+ .globals = (mp_obj_dict_t *)&os_module_globals,
};
diff --git a/ports/esp8266/modutime.c b/ports/esp8266/modutime.c
index f531984..915f193 100644
--- a/ports/esp8266/modutime.c
+++ b/ports/esp8266/modutime.c
@@ -92,8 +92,8 @@
}
return mp_obj_new_int_from_uint(timeutils_mktime(mp_obj_get_int(elem[0]),
- mp_obj_get_int(elem[1]), mp_obj_get_int(elem[2]), mp_obj_get_int(elem[3]),
- mp_obj_get_int(elem[4]), mp_obj_get_int(elem[5])));
+ mp_obj_get_int(elem[1]), mp_obj_get_int(elem[2]), mp_obj_get_int(elem[3]),
+ mp_obj_get_int(elem[4]), mp_obj_get_int(elem[5])));
}
MP_DEFINE_CONST_FUN_OBJ_1(time_mktime_obj, time_mktime);
@@ -125,5 +125,5 @@
const mp_obj_module_t utime_module = {
.base = { &mp_type_module },
- .globals = (mp_obj_dict_t*)&time_module_globals,
+ .globals = (mp_obj_dict_t *)&time_module_globals,
};
diff --git a/ports/esp8266/mpconfigport.h b/ports/esp8266/mpconfigport.h
index ba4b1d0..71c49cd 100644
--- a/ports/esp8266/mpconfigport.h
+++ b/ports/esp8266/mpconfigport.h
@@ -110,13 +110,13 @@
vm_hook_divisor = MICROPY_VM_HOOK_COUNT; \
extern void ets_loop_iter(void); \
ets_loop_iter(); \
- }
+}
#define MICROPY_VM_HOOK_LOOP MICROPY_VM_HOOK_POLL
#define MICROPY_VM_HOOK_RETURN MICROPY_VM_HOOK_POLL
// type definitions for the specific machine
-#define MICROPY_MAKE_POINTER_CALLABLE(p) ((void*)((mp_uint_t)(p)))
+#define MICROPY_MAKE_POINTER_CALLABLE(p) ((void *)((mp_uint_t)(p)))
#define MP_SSIZE_MAX (0x7fffffff)
@@ -131,7 +131,7 @@
#include <sys/types.h>
#define MP_PLAT_PRINT_STRN(str, len) mp_hal_stdout_tx_strn_cooked(str, len)
-void *esp_native_code_commit(void*, size_t, void*);
+void *esp_native_code_commit(void *, size_t, void *);
#define MP_PLAT_COMMIT_EXEC(buf, len, reloc) esp_native_code_commit(buf, len, reloc)
// printer for debugging output, goes to UART only
diff --git a/ports/esp8266/strtoll.c b/ports/esp8266/strtoll.c
index 4e8a4d0..f095f76 100644
--- a/ports/esp8266/strtoll.c
+++ b/ports/esp8266/strtoll.c
@@ -23,7 +23,7 @@
val = val * base + v;
}
- *endptr = (char*)nptr;
+ *endptr = (char *)nptr;
return val;
}
diff --git a/ports/esp8266/uart.c b/ports/esp8266/uart.c
index 61715f5..64bc78e 100644
--- a/ports/esp8266/uart.c
+++ b/ports/esp8266/uart.c
@@ -65,9 +65,9 @@
uart_div_modify(uart_no, UART_CLK_FREQ / (UartDev.baut_rate));
WRITE_PERI_REG(UART_CONF0(uart_no), UartDev.exist_parity
- | UartDev.parity
- | (UartDev.stop_bits << UART_STOP_BIT_NUM_S)
- | (UartDev.data_bits << UART_BIT_NUM_S));
+ | UartDev.parity
+ | (UartDev.stop_bits << UART_STOP_BIT_NUM_S)
+ | (UartDev.data_bits << UART_BIT_NUM_S));
// clear rx and tx fifo,not ready
SET_PERI_REG_MASK(UART_CONF0(uart_no), UART_RXFIFO_RST | UART_TXFIFO_RST);
@@ -76,16 +76,16 @@
if (uart_no == UART0) {
// set rx fifo trigger
WRITE_PERI_REG(UART_CONF1(uart_no),
- ((0x10 & UART_RXFIFO_FULL_THRHD) << UART_RXFIFO_FULL_THRHD_S) |
- ((0x10 & UART_RX_FLOW_THRHD) << UART_RX_FLOW_THRHD_S) |
- UART_RX_FLOW_EN |
- (0x02 & UART_RX_TOUT_THRHD) << UART_RX_TOUT_THRHD_S |
- UART_RX_TOUT_EN);
+ ((0x10 & UART_RXFIFO_FULL_THRHD) << UART_RXFIFO_FULL_THRHD_S) |
+ ((0x10 & UART_RX_FLOW_THRHD) << UART_RX_FLOW_THRHD_S) |
+ UART_RX_FLOW_EN |
+ (0x02 & UART_RX_TOUT_THRHD) << UART_RX_TOUT_THRHD_S |
+ UART_RX_TOUT_EN);
SET_PERI_REG_MASK(UART_INT_ENA(uart_no), UART_RXFIFO_TOUT_INT_ENA |
- UART_FRM_ERR_INT_ENA);
+ UART_FRM_ERR_INT_ENA);
} else {
WRITE_PERI_REG(UART_CONF1(uart_no),
- ((UartDev.rcv_buff.TrigLvl & UART_RXFIFO_FULL_THRHD) << UART_RXFIFO_FULL_THRHD_S));
+ ((UartDev.rcv_buff.TrigLvl & UART_RXFIFO_FULL_THRHD) << UART_RXFIFO_FULL_THRHD_S));
}
// clear all interrupt
@@ -103,7 +103,7 @@
*******************************************************************************/
void uart_tx_one_char(uint8 uart, uint8 TxChar) {
while (true) {
- uint32 fifo_cnt = READ_PERI_REG(UART_STATUS(uart)) & (UART_TXFIFO_CNT<<UART_TXFIFO_CNT_S);
+ uint32 fifo_cnt = READ_PERI_REG(UART_STATUS(uart)) & (UART_TXFIFO_CNT << UART_TXFIFO_CNT_S);
if ((fifo_cnt >> UART_TXFIFO_CNT_S & UART_TXFIFO_CNT) < 126) {
break;
}
@@ -113,7 +113,7 @@
void uart_flush(uint8 uart) {
while (true) {
- uint32 fifo_cnt = READ_PERI_REG(UART_STATUS(uart)) & (UART_TXFIFO_CNT<<UART_TXFIFO_CNT_S);
+ uint32 fifo_cnt = READ_PERI_REG(UART_STATUS(uart)) & (UART_TXFIFO_CNT << UART_TXFIFO_CNT_S);
if ((fifo_cnt >> UART_TXFIFO_CNT_S & UART_TXFIFO_CNT) == 0) {
break;
}
@@ -155,9 +155,9 @@
*******************************************************************************/
static void uart0_rx_intr_handler(void *para) {
- /* uart0 and uart1 intr combine togther, when interrupt occur, see reg 0x3ff20020, bit2, bit0 represents
- * uart1 and uart0 respectively
- */
+ /* uart0 and uart1 intr combine togther, when interrupt occur, see reg 0x3ff20020, bit2, bit0 represents
+ * uart1 and uart0 respectively
+ */
uint8 uart_no = UART_REPL;
@@ -170,7 +170,7 @@
// fifo full
goto read_chars;
} else if (UART_RXFIFO_TOUT_INT_ST == (READ_PERI_REG(UART_INT_ST(uart_no)) & UART_RXFIFO_TOUT_INT_ST)) {
- read_chars:
+ read_chars:
ETS_UART_INTR_DISABLE();
while (READ_PERI_REG(UART_STATUS(uart_no)) & (UART_RXFIFO_CNT << UART_RXFIFO_CNT_S)) {
diff --git a/ports/esp8266/uart.h b/ports/esp8266/uart.h
index 0e67783..f187c31 100644
--- a/ports/esp8266/uart.h
+++ b/ports/esp8266/uart.h
@@ -58,17 +58,17 @@
} RcvMsgBuffState;
typedef struct {
- uint32 RcvBuffSize;
- uint8 *pRcvMsgBuff;
- uint8 *pWritePos;
- uint8 *pReadPos;
- uint8 TrigLvl; //JLU: may need to pad
- RcvMsgBuffState BuffState;
+ uint32 RcvBuffSize;
+ uint8 *pRcvMsgBuff;
+ uint8 *pWritePos;
+ uint8 *pReadPos;
+ uint8 TrigLvl; //JLU: may need to pad
+ RcvMsgBuffState BuffState;
} RcvMsgBuff;
typedef struct {
- uint32 TrxBuffSize;
- uint8 *pTrxBuff;
+ uint32 TrxBuffSize;
+ uint8 *pTrxBuff;
} TrxMsgBuff;
typedef enum {
@@ -80,17 +80,17 @@
} RcvMsgState;
typedef struct {
- UartBautRate baut_rate;
- UartBitsNum4Char data_bits;
- UartExistParity exist_parity;
- UartParityMode parity; // chip size in byte
- UartStopBitsNum stop_bits;
- UartFlowCtrl flow_ctrl;
- RcvMsgBuff rcv_buff;
- TrxMsgBuff trx_buff;
- RcvMsgState rcv_state;
- int received;
- int buff_uart_no; //indicate which uart use tx/rx buffer
+ UartBautRate baut_rate;
+ UartBitsNum4Char data_bits;
+ UartExistParity exist_parity;
+ UartParityMode parity; // chip size in byte
+ UartStopBitsNum stop_bits;
+ UartFlowCtrl flow_ctrl;
+ RcvMsgBuff rcv_buff;
+ TrxMsgBuff trx_buff;
+ RcvMsgState rcv_state;
+ int received;
+ int buff_uart_no; //indicate which uart use tx/rx buffer
} UartDevice;
extern uint8 uart_ringbuf_array[UART0_STATIC_RXBUF_LEN];
diff --git a/ports/esp8266/uart_register.h b/ports/esp8266/uart_register.h
index 6398879..cdf0ba1 100644
--- a/ports/esp8266/uart_register.h
+++ b/ports/esp8266/uart_register.h
@@ -6,7 +6,7 @@
#ifndef UART_REGISTER_H_INCLUDED
#define UART_REGISTER_H_INCLUDED
-#define REG_UART_BASE( i ) (0x60000000+(i)*0xf00)
+#define REG_UART_BASE( i ) (0x60000000 + (i) * 0xf00)
//version value:32'h062000
#define UART_FIFO( i ) (REG_UART_BASE( i ) + 0x0)
diff --git a/ports/esp8266/xtirq.h b/ports/esp8266/xtirq.h
index 595052f..835f06b 100644
--- a/ports/esp8266/xtirq.h
+++ b/ports/esp8266/xtirq.h
@@ -31,7 +31,7 @@
// returns the value of "intlevel" from the PS register
static inline uint32_t query_irq(void) {
uint32_t ps;
- __asm__ volatile("rsr %0, ps" : "=a" (ps));
+ __asm__ volatile ("rsr %0, ps" : "=a" (ps));
return ps & 0xf;
}
@@ -45,7 +45,7 @@
// "ps" should be the value returned from raise_irq_pri
static inline void restore_irq_pri(uint32_t ps) {
- __asm__ volatile ("wsr %0, ps; rsync" :: "a" (ps));
+ __asm__ volatile ("wsr %0, ps; rsync" : : "a" (ps));
}
static inline uint32_t disable_irq(void) {
diff --git a/ports/javascript/main.c b/ports/javascript/main.c
index 77b8b87..5d295f9 100644
--- a/ports/javascript/main.c
+++ b/ports/javascript/main.c
@@ -82,10 +82,10 @@
void mp_js_init(int heap_size) {
int stack_dummy;
- stack_top = (char*)&stack_dummy;
+ stack_top = (char *)&stack_dummy;
#if MICROPY_ENABLE_GC
- char *heap = (char*)malloc(heap_size * sizeof(char));
+ char *heap = (char *)malloc(heap_size * sizeof(char));
gc_init(heap, heap + heap_size);
#endif
@@ -95,7 +95,7 @@
#endif
mp_init();
-
+
mp_obj_list_init(mp_sys_path, 0);
mp_obj_list_append(mp_sys_path, MP_OBJ_NEW_QSTR(MP_QSTR_));
mp_obj_list_init(mp_sys_argv, 0);
@@ -113,7 +113,7 @@
longjmp(dummy, 1);
}
gc_collect_start();
- gc_collect_root((void*)stack_top, ((mp_uint_t)(void*)(&dummy + 1) - (mp_uint_t)stack_top) / sizeof(mp_uint_t));
+ gc_collect_root((void *)stack_top, ((mp_uint_t)(void *)(&dummy + 1) - (mp_uint_t)stack_top) / sizeof(mp_uint_t));
gc_collect_end();
}
@@ -131,11 +131,15 @@
MP_DEFINE_CONST_FUN_OBJ_KW(mp_builtin_open_obj, 1, mp_builtin_open);
void nlr_jump_fail(void *val) {
- while (1);
+ while (1) {
+ ;
+ }
}
void NORETURN __fatal_error(const char *msg) {
- while (1);
+ while (1) {
+ ;
+ }
}
#ifndef NDEBUG
diff --git a/ports/javascript/modutime.c b/ports/javascript/modutime.c
index 6c6bdcf..d05d832 100644
--- a/ports/javascript/modutime.c
+++ b/ports/javascript/modutime.c
@@ -52,5 +52,5 @@
const mp_obj_module_t mp_module_utime = {
.base = { &mp_type_module },
- .globals = (mp_obj_dict_t*)&time_module_globals,
+ .globals = (mp_obj_dict_t *)&time_module_globals,
};
diff --git a/ports/javascript/mpconfigport.h b/ports/javascript/mpconfigport.h
index bc4e053..a9da57c 100644
--- a/ports/javascript/mpconfigport.h
+++ b/ports/javascript/mpconfigport.h
@@ -162,7 +162,7 @@
vm_hook_divisor = MICROPY_VM_HOOK_COUNT; \
extern void mp_js_hook(void); \
mp_js_hook(); \
- }
+}
#define MICROPY_VM_HOOK_LOOP MICROPY_VM_HOOK_POLL
#define MICROPY_VM_HOOK_RETURN MICROPY_VM_HOOK_POLL
diff --git a/ports/minimal/frozentest.py b/ports/minimal/frozentest.py
index 0f99b74..78cdd60 100644
--- a/ports/minimal/frozentest.py
+++ b/ports/minimal/frozentest.py
@@ -1,7 +1,7 @@
-print('uPy')
-print('a long string that is not interned')
-print('a string that has unicode αβγ chars')
-print(b'bytes 1234\x01')
+print("uPy")
+print("a long string that is not interned")
+print("a string that has unicode αβγ chars")
+print(b"bytes 1234\x01")
print(123456789)
for i in range(4):
print(i)
diff --git a/ports/minimal/main.c b/ports/minimal/main.c
index adc1dad..27ba9ed 100644
--- a/ports/minimal/main.c
+++ b/ports/minimal/main.c
@@ -33,7 +33,7 @@
int main(int argc, char **argv) {
int stack_dummy;
- stack_top = (char*)&stack_dummy;
+ stack_top = (char *)&stack_dummy;
#if MICROPY_ENABLE_GC
gc_init(heap, heap + sizeof(heap));
@@ -84,11 +84,15 @@
MP_DEFINE_CONST_FUN_OBJ_KW(mp_builtin_open_obj, 1, mp_builtin_open);
void nlr_jump_fail(void *val) {
- while (1);
+ while (1) {
+ ;
+ }
}
void NORETURN __fatal_error(const char *msg) {
- while (1);
+ while (1) {
+ ;
+ }
}
#ifndef NDEBUG
@@ -149,7 +153,7 @@
// when we get here: stack is initialised, bss is clear, data is copied
// SCB->CCR: enable 8-byte stack alignment for IRQ handlers, in accord with EABI
- *((volatile uint32_t*)0xe000ed14) |= 1 << 9;
+ *((volatile uint32_t *)0xe000ed14) |= 1 << 9;
// initialise the cpu and peripherals
#if MICROPY_MIN_USE_STM32_MCU
@@ -205,10 +209,10 @@
volatile uint32_t CR1;
} periph_uart_t;
-#define USART1 ((periph_uart_t*) 0x40011000)
-#define GPIOA ((periph_gpio_t*) 0x40020000)
-#define GPIOB ((periph_gpio_t*) 0x40020400)
-#define RCC ((periph_rcc_t*) 0x40023800)
+#define USART1 ((periph_uart_t *) 0x40011000)
+#define GPIOA ((periph_gpio_t *) 0x40020000)
+#define GPIOB ((periph_gpio_t *) 0x40020400)
+#define RCC ((periph_rcc_t *) 0x40023800)
// simple GPIO interface
#define GPIO_MODE_IN (0)
diff --git a/ports/minimal/mpconfigport.h b/ports/minimal/mpconfigport.h
index f2a4352..41e22cd 100644
--- a/ports/minimal/mpconfigport.h
+++ b/ports/minimal/mpconfigport.h
@@ -60,7 +60,7 @@
// type definitions for the specific machine
-#define MICROPY_MAKE_POINTER_CALLABLE(p) ((void*)((mp_uint_t)(p) | 1))
+#define MICROPY_MAKE_POINTER_CALLABLE(p) ((void *)((mp_uint_t)(p) | 1))
// This port is intended to be 32-bit, but unfortunately, int32_t for
// different targets may be defined in different ways - either as int
diff --git a/ports/minimal/mphalport.h b/ports/minimal/mphalport.h
index 60d68bd..5130d19 100644
--- a/ports/minimal/mphalport.h
+++ b/ports/minimal/mphalport.h
@@ -1,2 +1,5 @@
-static inline mp_uint_t mp_hal_ticks_ms(void) { return 0; }
-static inline void mp_hal_set_interrupt_char(char c) {}
+static inline mp_uint_t mp_hal_ticks_ms(void) {
+ return 0;
+}
+static inline void mp_hal_set_interrupt_char(char c) {
+}
diff --git a/ports/minimal/uart_core.c b/ports/minimal/uart_core.c
index d2d17b4..5b3797d 100644
--- a/ports/minimal/uart_core.c
+++ b/ports/minimal/uart_core.c
@@ -10,35 +10,35 @@
volatile uint32_t SR;
volatile uint32_t DR;
} periph_uart_t;
-#define USART1 ((periph_uart_t*)0x40011000)
+#define USART1 ((periph_uart_t *)0x40011000)
#endif
// Receive single character
int mp_hal_stdin_rx_chr(void) {
unsigned char c = 0;
-#if MICROPY_MIN_USE_STDOUT
+ #if MICROPY_MIN_USE_STDOUT
int r = read(0, &c, 1);
(void)r;
-#elif MICROPY_MIN_USE_STM32_MCU
+ #elif MICROPY_MIN_USE_STM32_MCU
// wait for RXNE
while ((USART1->SR & (1 << 5)) == 0) {
}
c = USART1->DR;
-#endif
+ #endif
return c;
}
// Send string of given length
void mp_hal_stdout_tx_strn(const char *str, mp_uint_t len) {
-#if MICROPY_MIN_USE_STDOUT
+ #if MICROPY_MIN_USE_STDOUT
int r = write(1, str, len);
(void)r;
-#elif MICROPY_MIN_USE_STM32_MCU
+ #elif MICROPY_MIN_USE_STM32_MCU
while (len--) {
// wait for TXE
while ((USART1->SR & (1 << 7)) == 0) {
}
USART1->DR = *str++;
}
-#endif
+ #endif
}
diff --git a/ports/nrf/boards/make-pins.py b/ports/nrf/boards/make-pins.py
index 1844a06..56c56ae 100644
--- a/ports/nrf/boards/make-pins.py
+++ b/ports/nrf/boards/make-pins.py
@@ -7,27 +7,27 @@
import sys
import csv
-SUPPORTED_FN = {
- 'UART' : ['RX', 'TX', 'CTS', 'RTS']
-}
+SUPPORTED_FN = {"UART": ["RX", "TX", "CTS", "RTS"]}
+
def parse_pin(name_str):
"""Parses a string and returns a pin-num."""
if len(name_str) < 1:
raise ValueError("Expecting pin name to be at least 4 charcters.")
- if name_str[0] != 'P':
+ if name_str[0] != "P":
raise ValueError("Expecting pin name to start with P")
- pin_str = name_str[1:].split('/')[0]
+ pin_str = name_str[1:].split("/")[0]
if not pin_str.isdigit():
raise ValueError("Expecting numeric pin number.")
return int(pin_str)
+
def split_name_num(name_num):
num = None
for num_idx in range(len(name_num) - 1, -1, -1):
if not name_num[num_idx].isdigit():
- name = name_num[0:num_idx + 1]
- num_str = name_num[num_idx + 1:]
+ name = name_num[0 : num_idx + 1]
+ num_str = name_num[num_idx + 1 :]
if len(num_str) > 0:
num = int(num_str)
break
@@ -41,12 +41,12 @@
self.idx = idx
self.af_str = af_str
- self.func = ''
+ self.func = ""
self.fn_num = None
- self.pin_type = ''
+ self.pin_type = ""
self.supported = False
- af_words = af_str.split('_', 1)
+ af_words = af_str.split("_", 1)
self.func, self.fn_num = split_name_num(af_words[0])
if len(af_words) > 1:
self.pin_type = af_words[1]
@@ -62,22 +62,25 @@
"""Returns the numbered function (i.e. USART6) for this AF."""
if self.fn_num is None:
return self.func
- return '{:s}{:d}'.format(self.func, self.fn_num)
+ return "{:s}{:d}".format(self.func, self.fn_num)
def mux_name(self):
- return 'AF{:d}_{:s}'.format(self.idx, self.ptr())
+ return "AF{:d}_{:s}".format(self.idx, self.ptr())
def print(self):
"""Prints the C representation of this AF."""
if self.supported:
- print(' AF', end='')
+ print(" AF", end="")
else:
- print(' //', end='')
+ print(" //", end="")
fn_num = self.fn_num
if fn_num is None:
fn_num = 0
- print('({:2d}, {:8s}, {:2d}, {:10s}, {:8s}), // {:s}'.format(self.idx,
- self.func, fn_num, self.pin_type, self.ptr(), self.af_str))
+ print(
+ "({:2d}, {:8s}, {:2d}, {:10s}, {:8s}), // {:s}".format(
+ self.idx, self.func, fn_num, self.pin_type, self.ptr(), self.af_str
+ )
+ )
def qstr_list(self):
return [self.mux_name()]
@@ -96,7 +99,7 @@
self.board_index = None
def cpu_pin_name(self):
- return '{:s}{:d}'.format("P", self.pin)
+ return "{:s}{:d}".format("P", self.pin)
def is_board_pin(self):
return self.board_pin
@@ -108,9 +111,9 @@
self.board_index = index
def parse_adc(self, adc_str):
- if (adc_str[:3] != 'ADC'):
+ if adc_str[:3] != "ADC":
return
- (adc,channel) = adc_str.split('_')
+ (adc, channel) = adc_str.split("_")
for idx in range(3, len(adc)):
self.adc_num = int(adc[idx])
self.adc_channel = int(channel[2:])
@@ -120,7 +123,7 @@
return
# If there is a slash, then the slash separates 2 aliases for the
# same alternate function.
- af_strs = af_strs_in.split('/')
+ af_strs = af_strs_in.split("/")
for af_str in af_strs:
alt_fn = AlternateFunction(af_idx, af_str)
self.alt_fn.append(alt_fn)
@@ -129,49 +132,55 @@
def alt_fn_name(self, null_if_0=False):
if null_if_0 and self.alt_fn_count == 0:
- return 'NULL'
- return 'pin_{:s}_af'.format(self.cpu_pin_name())
+ return "NULL"
+ return "pin_{:s}_af".format(self.cpu_pin_name())
def adc_num_str(self):
- str = ''
- for adc_num in range(1,4):
+ str = ""
+ for adc_num in range(1, 4):
if self.adc_num & (1 << (adc_num - 1)):
if len(str) > 0:
- str += ' | '
- str += 'PIN_ADC'
- str += chr(ord('0') + adc_num)
+ str += " | "
+ str += "PIN_ADC"
+ str += chr(ord("0") + adc_num)
if len(str) == 0:
- str = '0'
+ str = "0"
return str
def print_const_table_entry(self):
- print(' PIN({:d}, {:s}, {:s}, {:d}),'.format(
- self.pin,
- self.alt_fn_name(null_if_0=True),
- self.adc_num_str(), self.adc_channel))
+ print(
+ " PIN({:d}, {:s}, {:s}, {:d}),".format(
+ self.pin, self.alt_fn_name(null_if_0=True), self.adc_num_str(), self.adc_channel
+ )
+ )
def print(self):
if self.alt_fn_count == 0:
- print("// ", end='')
- print('const pin_af_obj_t {:s}[] = {{'.format(self.alt_fn_name()))
+ print("// ", end="")
+ print("const pin_af_obj_t {:s}[] = {{".format(self.alt_fn_name()))
for alt_fn in self.alt_fn:
alt_fn.print()
if self.alt_fn_count == 0:
- print("// ", end='')
- print('};')
- print('')
- print('const pin_obj_t pin_{:s} = PIN({:d}, {:s}, {:s}, {:d});'.format(
- self.cpu_pin_name(), self.pin,
- self.alt_fn_name(null_if_0=True),
- self.adc_num_str(), self.adc_channel))
- print('')
+ print("// ", end="")
+ print("};")
+ print("")
+ print(
+ "const pin_obj_t pin_{:s} = PIN({:d}, {:s}, {:s}, {:d});".format(
+ self.cpu_pin_name(),
+ self.pin,
+ self.alt_fn_name(null_if_0=True),
+ self.adc_num_str(),
+ self.adc_channel,
+ )
+ )
+ print("")
def print_header(self, hdr_file):
- hdr_file.write('extern const pin_obj_t pin_{:s};\n'.
- format(self.cpu_pin_name()))
+ hdr_file.write("extern const pin_obj_t pin_{:s};\n".format(self.cpu_pin_name()))
if self.alt_fn_count > 0:
- hdr_file.write('extern const pin_af_obj_t pin_{:s}_af[];\n'.
- format(self.cpu_pin_name()))
+ hdr_file.write(
+ "extern const pin_af_obj_t pin_{:s}_af[];\n".format(self.cpu_pin_name())
+ )
def qstr_list(self):
result = []
@@ -182,7 +191,6 @@
class NamedPin(object):
-
def __init__(self, name, pin):
self._name = name
self._pin = pin
@@ -195,10 +203,9 @@
class Pins(object):
-
def __init__(self):
- self.cpu_pins = [] # list of NamedPin objects
- self.board_pins = [] # list of NamedPin objects
+ self.cpu_pins = [] # list of NamedPin objects
+ self.board_pins = [] # list of NamedPin objects
def find_pin(self, pin_num):
for named_pin in self.cpu_pins:
@@ -207,7 +214,7 @@
return pin
def parse_af_file(self, filename, pinname_col, af_col, af_col_end):
- with open(filename, 'r') as csvfile:
+ with open(filename, "r") as csvfile:
rows = csv.reader(csvfile)
for row in rows:
try:
@@ -223,7 +230,7 @@
self.cpu_pins.append(NamedPin(pin.cpu_pin_name(), pin))
def parse_board_file(self, filename):
- with open(filename, 'r') as csvfile:
+ with open(filename, "r") as csvfile:
rows = csv.reader(csvfile)
for row in rows:
try:
@@ -236,13 +243,23 @@
self.board_pins.append(NamedPin(row[0], pin))
def print_named(self, label, named_pins):
- print('STATIC const mp_rom_map_elem_t pin_{:s}_pins_locals_dict_table[] = {{'.format(label))
+ print(
+ "STATIC const mp_rom_map_elem_t pin_{:s}_pins_locals_dict_table[] = {{".format(label)
+ )
for named_pin in named_pins:
pin = named_pin.pin()
if pin.is_board_pin():
- print(' {{ MP_ROM_QSTR(MP_QSTR_{:s}), MP_ROM_PTR(&machine_board_pin_obj[{:d}]) }},'.format(named_pin.name(), pin.board_index))
- print('};')
- print('MP_DEFINE_CONST_DICT(pin_{:s}_pins_locals_dict, pin_{:s}_pins_locals_dict_table);'.format(label, label));
+ print(
+ " {{ MP_ROM_QSTR(MP_QSTR_{:s}), MP_ROM_PTR(&machine_board_pin_obj[{:d}]) }},".format(
+ named_pin.name(), pin.board_index
+ )
+ )
+ print("};")
+ print(
+ "MP_DEFINE_CONST_DICT(pin_{:s}_pins_locals_dict, pin_{:s}_pins_locals_dict_table);".format(
+ label, label
+ )
+ )
def print_const_table(self):
num_board_pins = 0
@@ -251,50 +268,52 @@
if pin.is_board_pin():
pin.set_board_index(num_board_pins)
num_board_pins += 1
- print('')
- print('const uint8_t machine_pin_num_of_board_pins = {:d};'.format(num_board_pins))
- print('')
- print('const pin_obj_t machine_board_pin_obj[{:d}] = {{'.format(num_board_pins))
+ print("")
+ print("const uint8_t machine_pin_num_of_board_pins = {:d};".format(num_board_pins))
+ print("")
+ print("const pin_obj_t machine_board_pin_obj[{:d}] = {{".format(num_board_pins))
for named_pin in self.cpu_pins:
pin = named_pin.pin()
if pin.is_board_pin():
pin.print_const_table_entry()
- print('};');
+ print("};")
def print(self):
- self.print_named('cpu', self.cpu_pins)
- print('')
- self.print_named('board', self.board_pins)
+ self.print_named("cpu", self.cpu_pins)
+ print("")
+ self.print_named("board", self.board_pins)
def print_adc(self, adc_num):
- print('');
- print('const pin_obj_t * const pin_adc{:d}[] = {{'.format(adc_num))
+ print("")
+ print("const pin_obj_t * const pin_adc{:d}[] = {{".format(adc_num))
for channel in range(16):
adc_found = False
for named_pin in self.cpu_pins:
pin = named_pin.pin()
- if (pin.is_board_pin() and
- (pin.adc_num & (1 << (adc_num - 1))) and (pin.adc_channel == channel)):
- print(' &pin_{:s}, // {:d}'.format(pin.cpu_pin_name(), channel))
+ if (
+ pin.is_board_pin()
+ and (pin.adc_num & (1 << (adc_num - 1)))
+ and (pin.adc_channel == channel)
+ ):
+ print(" &pin_{:s}, // {:d}".format(pin.cpu_pin_name(), channel))
adc_found = True
break
if not adc_found:
- print(' NULL, // {:d}'.format(channel))
- print('};')
-
+ print(" NULL, // {:d}".format(channel))
+ print("};")
def print_header(self, hdr_filename):
- with open(hdr_filename, 'wt') as hdr_file:
+ with open(hdr_filename, "wt") as hdr_file:
for named_pin in self.cpu_pins:
pin = named_pin.pin()
if pin.is_board_pin():
pin.print_header(hdr_file)
- hdr_file.write('extern const pin_obj_t * const pin_adc1[];\n')
- hdr_file.write('extern const pin_obj_t * const pin_adc2[];\n')
- hdr_file.write('extern const pin_obj_t * const pin_adc3[];\n')
+ hdr_file.write("extern const pin_obj_t * const pin_adc1[];\n")
+ hdr_file.write("extern const pin_obj_t * const pin_adc2[];\n")
+ hdr_file.write("extern const pin_obj_t * const pin_adc3[];\n")
def print_qstr(self, qstr_filename):
- with open(qstr_filename, 'wt') as qstr_file:
+ with open(qstr_filename, "wt") as qstr_file:
qstr_set = set([])
for named_pin in self.cpu_pins:
pin = named_pin.pin()
@@ -304,11 +323,10 @@
for named_pin in self.board_pins:
qstr_set |= set([named_pin.name()])
for qstr in sorted(qstr_set):
- print('Q({})'.format(qstr), file=qstr_file)
-
+ print("Q({})".format(qstr), file=qstr_file)
def print_af_hdr(self, af_const_filename):
- with open(af_const_filename, 'wt') as af_const_file:
+ with open(af_const_filename, "wt") as af_const_file:
af_hdr_set = set([])
mux_name_width = 0
for named_pin in self.cpu_pins:
@@ -321,88 +339,89 @@
if len(mux_name) > mux_name_width:
mux_name_width = len(mux_name)
for mux_name in sorted(af_hdr_set):
- key = 'MP_ROM_QSTR(MP_QSTR_{}),'.format(mux_name)
- val = 'MP_ROM_INT(GPIO_{})'.format(mux_name)
- print(' { %-*s %s },' % (mux_name_width + 26, key, val),
- file=af_const_file)
+ key = "MP_ROM_QSTR(MP_QSTR_{}),".format(mux_name)
+ val = "MP_ROM_INT(GPIO_{})".format(mux_name)
+ print(" { %-*s %s }," % (mux_name_width + 26, key, val), file=af_const_file)
def print_af_py(self, af_py_filename):
- with open(af_py_filename, 'wt') as af_py_file:
- print('PINS_AF = (', file=af_py_file);
+ with open(af_py_filename, "wt") as af_py_file:
+ print("PINS_AF = (", file=af_py_file)
for named_pin in self.board_pins:
- print(" ('%s', " % named_pin.name(), end='', file=af_py_file)
+ print(" ('%s', " % named_pin.name(), end="", file=af_py_file)
for af in named_pin.pin().alt_fn:
if af.is_supported():
- print("(%d, '%s'), " % (af.idx, af.af_str), end='', file=af_py_file)
- print('),', file=af_py_file)
- print(')', file=af_py_file)
+ print("(%d, '%s'), " % (af.idx, af.af_str), end="", file=af_py_file)
+ print("),", file=af_py_file)
+ print(")", file=af_py_file)
def main():
parser = argparse.ArgumentParser(
prog="make-pins.py",
usage="%(prog)s [options] [command]",
- description="Generate board specific pin file"
+ description="Generate board specific pin file",
)
parser.add_argument(
- "-a", "--af",
+ "-a",
+ "--af",
dest="af_filename",
help="Specifies the alternate function file for the chip",
- default="nrf.csv"
+ default="nrf.csv",
)
parser.add_argument(
"--af-const",
dest="af_const_filename",
help="Specifies header file for alternate function constants.",
- default="build/pins_af_const.h"
+ default="build/pins_af_const.h",
)
parser.add_argument(
"--af-py",
dest="af_py_filename",
help="Specifies the filename for the python alternate function mappings.",
- default="build/pins_af.py"
+ default="build/pins_af.py",
)
parser.add_argument(
- "-b", "--board",
- dest="board_filename",
- help="Specifies the board file",
+ "-b", "--board", dest="board_filename", help="Specifies the board file",
)
parser.add_argument(
- "-p", "--prefix",
+ "-p",
+ "--prefix",
dest="prefix_filename",
help="Specifies beginning portion of generated pins file",
- default="nrf52_prefix.c"
+ default="nrf52_prefix.c",
)
parser.add_argument(
- "-q", "--qstr",
+ "-q",
+ "--qstr",
dest="qstr_filename",
help="Specifies name of generated qstr header file",
- default="build/pins_qstr.h"
+ default="build/pins_qstr.h",
)
parser.add_argument(
- "-r", "--hdr",
+ "-r",
+ "--hdr",
dest="hdr_filename",
help="Specifies name of generated pin header file",
- default="build/pins.h"
+ default="build/pins.h",
)
args = parser.parse_args(sys.argv[1:])
pins = Pins()
- print('// This file was automatically generated by make-pins.py')
- print('//')
+ print("// This file was automatically generated by make-pins.py")
+ print("//")
if args.af_filename:
- print('// --af {:s}'.format(args.af_filename))
+ print("// --af {:s}".format(args.af_filename))
pins.parse_af_file(args.af_filename, 1, 2, 2)
if args.board_filename:
- print('// --board {:s}'.format(args.board_filename))
+ print("// --board {:s}".format(args.board_filename))
pins.parse_board_file(args.board_filename)
if args.prefix_filename:
- print('// --prefix {:s}'.format(args.prefix_filename))
- print('')
- with open(args.prefix_filename, 'r') as prefix_file:
+ print("// --prefix {:s}".format(args.prefix_filename))
+ print("")
+ with open(args.prefix_filename, "r") as prefix_file:
print(prefix_file.read())
pins.print_const_table()
diff --git a/ports/nrf/examples/mountsd.py b/ports/nrf/examples/mountsd.py
index 037b325..315205c 100644
--- a/ports/nrf/examples/mountsd.py
+++ b/ports/nrf/examples/mountsd.py
@@ -24,12 +24,13 @@
from machine import SPI, Pin
from sdcard import SDCard
+
def mnt():
cs = Pin("P22", mode=Pin.OUT)
sd = SDCard(SPI(0), cs)
- os.mount(sd, '/')
+ os.mount(sd, "/")
+
def list():
files = os.listdir()
print(files)
-
diff --git a/ports/nrf/examples/musictest.py b/ports/nrf/examples/musictest.py
index 46276d3..8f45238 100644
--- a/ports/nrf/examples/musictest.py
+++ b/ports/nrf/examples/musictest.py
@@ -1,4 +1,4 @@
-#
+#
# Example usage where "P3" is the Buzzer pin.
#
# from musictest import play
@@ -8,6 +8,7 @@
from machine import Pin
import music
+
def play(pin_str):
p = Pin(pin_str, mode=Pin.OUT)
music.play(music.PRELUDE, pin=p)
diff --git a/ports/nrf/examples/nrf52_pwm.py b/ports/nrf/examples/nrf52_pwm.py
index b242ea9..ce3fa32 100644
--- a/ports/nrf/examples/nrf52_pwm.py
+++ b/ports/nrf/examples/nrf52_pwm.py
@@ -1,6 +1,7 @@
import time
from machine import PWM, Pin
+
def pulse():
for i in range(0, 101):
p = PWM(0, Pin("P17", mode=Pin.OUT), freq=PWM.FREQ_16MHZ, duty=i, period=16000)
@@ -9,7 +10,7 @@
p.deinit()
for i in range(0, 101):
- p = PWM(0, Pin("P17", mode=Pin.OUT), freq=PWM.FREQ_16MHZ, duty=100-i, period=16000)
+ p = PWM(0, Pin("P17", mode=Pin.OUT), freq=PWM.FREQ_16MHZ, duty=100 - i, period=16000)
p.init()
time.sleep_ms(10)
p.deinit()
diff --git a/ports/nrf/examples/nrf52_servo.py b/ports/nrf/examples/nrf52_servo.py
index baa8600..5506303 100644
--- a/ports/nrf/examples/nrf52_servo.py
+++ b/ports/nrf/examples/nrf52_servo.py
@@ -25,26 +25,34 @@
import time
from machine import PWM, Pin
-class Servo():
+
+class Servo:
def __init__(self, pin_name=""):
if pin_name:
self.pin = Pin(pin_name, mode=Pin.OUT, pull=Pin.PULL_DOWN)
else:
self.pin = Pin("P22", mode=Pin.OUT, pull=Pin.PULL_DOWN)
+
def left(self):
- p = PWM(0, self.pin, freq=PWM.FREQ_125KHZ, pulse_width=105, period=2500, mode=PWM.MODE_HIGH_LOW)
+ p = PWM(
+ 0, self.pin, freq=PWM.FREQ_125KHZ, pulse_width=105, period=2500, mode=PWM.MODE_HIGH_LOW
+ )
p.init()
time.sleep_ms(200)
p.deinit()
-
+
def center(self):
- p = PWM(0, self.pin, freq=PWM.FREQ_125KHZ, pulse_width=188, period=2500, mode=PWM.MODE_HIGH_LOW)
+ p = PWM(
+ 0, self.pin, freq=PWM.FREQ_125KHZ, pulse_width=188, period=2500, mode=PWM.MODE_HIGH_LOW
+ )
p.init()
time.sleep_ms(200)
p.deinit()
-
+
def right(self):
- p = PWM(0, self.pin, freq=PWM.FREQ_125KHZ, pulse_width=275, period=2500, mode=PWM.MODE_HIGH_LOW)
+ p = PWM(
+ 0, self.pin, freq=PWM.FREQ_125KHZ, pulse_width=275, period=2500, mode=PWM.MODE_HIGH_LOW
+ )
p.init()
time.sleep_ms(200)
p.deinit()
diff --git a/ports/nrf/examples/powerup.py b/ports/nrf/examples/powerup.py
index 6f14309..2ecc639 100644
--- a/ports/nrf/examples/powerup.py
+++ b/ports/nrf/examples/powerup.py
@@ -41,22 +41,25 @@
from machine import Pin
from ubluepy import Peripheral, Scanner, constants
+
def bytes_to_str(bytes):
string = ""
for b in bytes:
string += chr(b)
return string
+
def get_device_names(scan_entries):
dev_names = []
for e in scan_entries:
scan = e.getScanData()
if scan:
for s in scan:
- if s[0] == constants.ad_types.AD_TYPE_COMPLETE_LOCAL_NAME:
- dev_names.append((e, bytes_to_str(s[2])))
+ if s[0] == constants.ad_types.AD_TYPE_COMPLETE_LOCAL_NAME:
+ dev_names.append((e, bytes_to_str(s[2])))
return dev_names
+
def find_device_by_name(name):
s = Scanner()
scan_res = s.scan(500)
@@ -66,6 +69,7 @@
if name == dev[1]:
return dev[0]
+
class PowerUp3:
def __init__(self):
self.x_adc = ADC(1)
@@ -76,14 +80,14 @@
self.btn_speed_off = Pin("P16", mode=Pin.IN, pull=Pin.PULL_UP)
self.x_mid = 0
-
+
self.calibrate()
self.connect()
self.loop()
-
+
def read_stick_x(self):
return self.x_adc.value()
-
+
def button_speed_up(self):
return not bool(self.btn_speed_up.value())
@@ -146,7 +150,7 @@
self.angle(0)
def rudder_left(self, angle):
- steps = (angle // self.interval_size_left)
+ steps = angle // self.interval_size_left
new_angle = 60 - steps
if self.old_angle != new_angle:
@@ -154,7 +158,7 @@
self.old_angle = new_angle
def rudder_right(self, angle):
- steps = (angle // self.interval_size_right)
+ steps = angle // self.interval_size_right
new_angle = -steps
if self.old_angle != new_angle:
@@ -162,9 +166,9 @@
self.old_angle = new_angle
def throttle(self, speed):
- if (speed > 200):
+ if speed > 200:
speed = 200
- elif (speed < 0):
+ elif speed < 0:
speed = 0
if self.old_speed != speed:
@@ -188,10 +192,10 @@
# read out new angle
new_angle = self.read_stick_x()
- if (new_angle < 256):
- if (new_angle > right_threshold):
+ if new_angle < 256:
+ if new_angle > right_threshold:
self.rudder_right(new_angle - self.x_mid)
- elif (new_angle < left_threshold):
+ elif new_angle < left_threshold:
self.rudder_left(new_angle)
else:
self.rudder_center()
diff --git a/ports/nrf/examples/seeed_tft.py b/ports/nrf/examples/seeed_tft.py
index c5cd4cc..bf246be 100644
--- a/ports/nrf/examples/seeed_tft.py
+++ b/ports/nrf/examples/seeed_tft.py
@@ -51,24 +51,28 @@
from machine import SPI, Pin
from sdcard import SDCard
+
def mount_tf(self, mount_point="/"):
sd = SDCard(SPI(0), Pin("P15", mode=Pin.OUT))
os.mount(sd, mount_point)
+
class ILI9341:
def __init__(self, width, height):
self.width = width
self.height = height
self.pages = self.height // 8
self.buffer = bytearray(self.pages * self.width)
- self.framebuf = framebuf.FrameBuffer(self.buffer, self.width, self.height, framebuf.MONO_VLSB)
+ self.framebuf = framebuf.FrameBuffer(
+ self.buffer, self.width, self.height, framebuf.MONO_VLSB
+ )
self.spi = SPI(0)
# chip select
self.cs = Pin("P16", mode=Pin.OUT, pull=Pin.PULL_UP)
# command
self.dc = Pin("P17", mode=Pin.OUT, pull=Pin.PULL_UP)
-
+
# initialize all pins high
self.cs.high()
self.dc.high()
@@ -76,27 +80,26 @@
self.spi.init(baudrate=8000000, phase=0, polarity=0)
self.init_display()
-
def init_display(self):
time.sleep_ms(500)
-
+
self.write_cmd(0x01)
-
+
time.sleep_ms(200)
-
+
self.write_cmd(0xCF)
self.write_data(bytearray([0x00, 0x8B, 0x30]))
-
+
self.write_cmd(0xED)
self.write_data(bytearray([0x67, 0x03, 0x12, 0x81]))
self.write_cmd(0xE8)
self.write_data(bytearray([0x85, 0x10, 0x7A]))
-
+
self.write_cmd(0xCB)
self.write_data(bytearray([0x39, 0x2C, 0x00, 0x34, 0x02]))
-
+
self.write_cmd(0xF7)
self.write_data(bytearray([0x20]))
@@ -107,54 +110,94 @@
self.write_cmd(0xC0)
# VRH[5:0]
self.write_data(bytearray([0x1B]))
-
+
# Power control
self.write_cmd(0xC1)
# SAP[2:0];BT[3:0]
self.write_data(bytearray([0x10]))
-
+
# VCM control
self.write_cmd(0xC5)
self.write_data(bytearray([0x3F, 0x3C]))
-
+
# VCM control2
self.write_cmd(0xC7)
self.write_data(bytearray([0xB7]))
-
+
# Memory Access Control
self.write_cmd(0x36)
self.write_data(bytearray([0x08]))
-
+
self.write_cmd(0x3A)
self.write_data(bytearray([0x55]))
-
+
self.write_cmd(0xB1)
self.write_data(bytearray([0x00, 0x1B]))
-
+
# Display Function Control
self.write_cmd(0xB6)
self.write_data(bytearray([0x0A, 0xA2]))
-
+
# 3Gamma Function Disable
self.write_cmd(0xF2)
self.write_data(bytearray([0x00]))
-
+
# Gamma curve selected
self.write_cmd(0x26)
self.write_data(bytearray([0x01]))
-
+
# Set Gamma
self.write_cmd(0xE0)
- self.write_data(bytearray([0x0F, 0x2A, 0x28, 0x08, 0x0E, 0x08, 0x54, 0XA9, 0x43, 0x0A, 0x0F, 0x00, 0x00, 0x00, 0x00]))
-
+ self.write_data(
+ bytearray(
+ [
+ 0x0F,
+ 0x2A,
+ 0x28,
+ 0x08,
+ 0x0E,
+ 0x08,
+ 0x54,
+ 0xA9,
+ 0x43,
+ 0x0A,
+ 0x0F,
+ 0x00,
+ 0x00,
+ 0x00,
+ 0x00,
+ ]
+ )
+ )
+
# Set Gamma
- self.write_cmd(0XE1)
- self.write_data(bytearray([0x00, 0x15, 0x17, 0x07, 0x11, 0x06, 0x2B, 0x56, 0x3C, 0x05, 0x10, 0x0F, 0x3F, 0x3F, 0x0F]))
-
+ self.write_cmd(0xE1)
+ self.write_data(
+ bytearray(
+ [
+ 0x00,
+ 0x15,
+ 0x17,
+ 0x07,
+ 0x11,
+ 0x06,
+ 0x2B,
+ 0x56,
+ 0x3C,
+ 0x05,
+ 0x10,
+ 0x0F,
+ 0x3F,
+ 0x3F,
+ 0x0F,
+ ]
+ )
+ )
+
# Exit Sleep
self.write_cmd(0x11)
time.sleep_ms(120)
-
+
# Display on
self.write_cmd(0x29)
time.sleep_ms(500)
@@ -164,14 +207,14 @@
# set col
self.write_cmd(0x2A)
self.write_data(bytearray([0x00, 0x00]))
- self.write_data(bytearray([0x00, 0xef]))
-
- # set page
+ self.write_data(bytearray([0x00, 0xEF]))
+
+ # set page
self.write_cmd(0x2B)
self.write_data(bytearray([0x00, 0x00]))
- self.write_data(bytearray([0x01, 0x3f]))
+ self.write_data(bytearray([0x01, 0x3F]))
- self.write_cmd(0x2c);
+ self.write_cmd(0x2C)
num_of_pixels = self.height * self.width
@@ -201,10 +244,9 @@
self.cs.low()
self.spi.write(bytearray([cmd]))
self.cs.high()
-
+
def write_data(self, buf):
self.dc.high()
self.cs.low()
self.spi.write(buf)
self.cs.high()
-
diff --git a/ports/nrf/examples/ssd1306_mod.py b/ports/nrf/examples/ssd1306_mod.py
index d9614e5..b083a3a 100644
--- a/ports/nrf/examples/ssd1306_mod.py
+++ b/ports/nrf/examples/ssd1306_mod.py
@@ -20,11 +20,11 @@
from ssd1306 import SSD1306_I2C
-SET_COL_ADDR = const(0x21)
-SET_PAGE_ADDR = const(0x22)
+SET_COL_ADDR = const(0x21)
+SET_PAGE_ADDR = const(0x22)
+
class SSD1306_I2C_Mod(SSD1306_I2C):
-
def show(self):
x0 = 0
x1 = self.width - 1
@@ -39,16 +39,15 @@
self.write_cmd(0)
self.write_cmd(self.pages - 1)
- chunk_size = 254 # 255, excluding opcode.
+ chunk_size = 254 # 255, excluding opcode.
num_of_chunks = len(self.buffer) // chunk_size
leftover = len(self.buffer) - (num_of_chunks * chunk_size)
for i in range(0, num_of_chunks):
- self.write_data(self.buffer[chunk_size*i:chunk_size*(i+1)])
- if (leftover > 0):
- self.write_data(self.buffer[chunk_size * num_of_chunks:])
-
+ self.write_data(self.buffer[chunk_size * i : chunk_size * (i + 1)])
+ if leftover > 0:
+ self.write_data(self.buffer[chunk_size * num_of_chunks :])
def write_data(self, buf):
- buffer = bytearray([0x40]) + buf # Co=0, D/C#=1
+ buffer = bytearray([0x40]) + buf # Co=0, D/C#=1
self.i2c.writeto(self.addr, buffer)
diff --git a/ports/nrf/examples/ubluepy_eddystone.py b/ports/nrf/examples/ubluepy_eddystone.py
index c8abd5a..1ebb236 100644
--- a/ports/nrf/examples/ubluepy_eddystone.py
+++ b/ports/nrf/examples/ubluepy_eddystone.py
@@ -1,13 +1,16 @@
from ubluepy import Peripheral, constants
-BLE_GAP_ADV_FLAG_LE_GENERAL_DISC_MODE = const(0x02)
-BLE_GAP_ADV_FLAG_BR_EDR_NOT_SUPPORTED = const(0x04)
+BLE_GAP_ADV_FLAG_LE_GENERAL_DISC_MODE = const(0x02)
+BLE_GAP_ADV_FLAG_BR_EDR_NOT_SUPPORTED = const(0x04)
-BLE_GAP_ADV_FLAGS_LE_ONLY_GENERAL_DISC_MODE = const(BLE_GAP_ADV_FLAG_LE_GENERAL_DISC_MODE | BLE_GAP_ADV_FLAG_BR_EDR_NOT_SUPPORTED)
+BLE_GAP_ADV_FLAGS_LE_ONLY_GENERAL_DISC_MODE = const(
+ BLE_GAP_ADV_FLAG_LE_GENERAL_DISC_MODE | BLE_GAP_ADV_FLAG_BR_EDR_NOT_SUPPORTED
+)
-EDDYSTONE_FRAME_TYPE_URL = const(0x10)
-EDDYSTONE_URL_PREFIX_HTTP_WWW = const(0x00) # "http://www".
-EDDYSTONE_URL_SUFFIX_DOT_COM = const(0x01) # ".com"
+EDDYSTONE_FRAME_TYPE_URL = const(0x10)
+EDDYSTONE_URL_PREFIX_HTTP_WWW = const(0x00) # "http://www".
+EDDYSTONE_URL_SUFFIX_DOT_COM = const(0x01) # ".com"
+
def string_to_binarray(text):
b = bytearray([])
@@ -15,6 +18,7 @@
b.append(ord(c))
return b
+
def gen_ad_type_content(ad_type, data):
b = bytearray(1)
b.append(ad_type)
@@ -22,6 +26,7 @@
b[0] = len(b) - 1
return b
+
def generate_eddystone_adv_packet(url):
# flags
disc_mode = bytearray([BLE_GAP_ADV_FLAGS_LE_ONLY_GENERAL_DISC_MODE])
@@ -29,10 +34,12 @@
# 16-bit uuid
uuid = bytearray([0xAA, 0xFE])
- packet_uuid16 = gen_ad_type_content(constants.ad_types.AD_TYPE_16BIT_SERVICE_UUID_COMPLETE, uuid)
+ packet_uuid16 = gen_ad_type_content(
+ constants.ad_types.AD_TYPE_16BIT_SERVICE_UUID_COMPLETE, uuid
+ )
# eddystone data
- rssi = 0xEE # -18 dB, approx signal strength at 0m.
+ rssi = 0xEE # -18 dB, approx signal strength at 0m.
eddystone_data = bytearray([])
eddystone_data.append(EDDYSTONE_FRAME_TYPE_URL)
eddystone_data.append(rssi)
@@ -42,7 +49,9 @@
# service data
service_data = uuid + eddystone_data
- packet_service_data = gen_ad_type_content(constants.ad_types.AD_TYPE_SERVICE_DATA, service_data)
+ packet_service_data = gen_ad_type_content(
+ constants.ad_types.AD_TYPE_SERVICE_DATA, service_data
+ )
# generate advertisment packet
packet = bytearray([])
@@ -52,7 +61,8 @@
return packet
+
def start():
- adv_packet = generate_eddystone_adv_packet("micropython")
+ adv_packet = generate_eddystone_adv_packet("micropython")
p = Peripheral()
- p.advertise(data=adv_packet, connectable=False)
\ No newline at end of file
+ p.advertise(data=adv_packet, connectable=False)
diff --git a/ports/nrf/examples/ubluepy_scan.py b/ports/nrf/examples/ubluepy_scan.py
index ab11661..37daa6c 100644
--- a/ports/nrf/examples/ubluepy_scan.py
+++ b/ports/nrf/examples/ubluepy_scan.py
@@ -1,38 +1,42 @@
from ubluepy import Scanner, constants
+
def bytes_to_str(bytes):
string = ""
for b in bytes:
string += chr(b)
return string
+
def get_device_names(scan_entries):
dev_names = []
for e in scan_entries:
scan = e.getScanData()
if scan:
for s in scan:
- if s[0] == constants.ad_types.AD_TYPE_COMPLETE_LOCAL_NAME:
- dev_names.append((e, bytes_to_str(s[2])))
+ if s[0] == constants.ad_types.AD_TYPE_COMPLETE_LOCAL_NAME:
+ dev_names.append((e, bytes_to_str(s[2])))
return dev_names
+
def find_device_by_name(name):
s = Scanner()
scan_res = s.scan(100)
-
+
device_names = get_device_names(scan_res)
for dev in device_names:
if name == dev[1]:
return dev[0]
+
# >>> res = find_device_by_name("micr")
# >>> if res:
# ... print("address:", res.addr())
# ... print("address type:", res.addr_type())
# ... print("rssi:", res.rssi())
-# ...
-# ...
-# ...
+# ...
+# ...
+# ...
# address: c2:73:61:89:24:45
# address type: 1
# rssi: -26
diff --git a/ports/nrf/examples/ubluepy_temp.py b/ports/nrf/examples/ubluepy_temp.py
index 7df057b..f841849 100644
--- a/ports/nrf/examples/ubluepy_temp.py
+++ b/ports/nrf/examples/ubluepy_temp.py
@@ -26,12 +26,13 @@
from machine import RTCounter, Temp
from ubluepy import Service, Characteristic, UUID, Peripheral, constants
+
def event_handler(id, handle, data):
global rtc
global periph
global serv_env_sense
global notif_enabled
-
+
if id == constants.EVT_GAP_CONNECTED:
# indicated 'connected'
LED(1).on()
@@ -50,11 +51,12 @@
notif_enabled = True
# start low power timer
rtc.start()
- else:
+ else:
notif_enabled = False
# stop low power timer
rtc.stop()
+
def send_temp(timer_id):
global notif_enabled
global char_temp
@@ -62,26 +64,27 @@
if notif_enabled:
# measure chip temperature
temp = Temp.read()
- temp = temp * 100
+ temp = temp * 100
char_temp.write(bytearray([temp & 0xFF, temp >> 8]))
+
# start off with LED(1) off
LED(1).off()
-# use RTC1 as RTC0 is used by bluetooth stack
+# use RTC1 as RTC0 is used by bluetooth stack
# set up RTC callback every 5 second
rtc = RTCounter(1, period=50, mode=RTCounter.PERIODIC, callback=send_temp)
notif_enabled = False
-uuid_env_sense = UUID("0x181A") # Environmental Sensing service
-uuid_temp = UUID("0x2A6E") # Temperature characteristic
-
+uuid_env_sense = UUID("0x181A") # Environmental Sensing service
+uuid_temp = UUID("0x2A6E") # Temperature characteristic
+
serv_env_sense = Service(uuid_env_sense)
temp_props = Characteristic.PROP_NOTIFY | Characteristic.PROP_READ
temp_attrs = Characteristic.ATTR_CCCD
-char_temp = Characteristic(uuid_temp, props = temp_props, attrs = temp_attrs)
+char_temp = Characteristic(uuid_temp, props=temp_props, attrs=temp_attrs)
serv_env_sense.addCharacteristic(char_temp)
@@ -89,4 +92,3 @@
periph.addService(serv_env_sense)
periph.setConnectionHandler(event_handler)
periph.advertise(device_name="micr_temp", services=[serv_env_sense])
-
diff --git a/ports/nrf/freeze/test.py b/ports/nrf/freeze/test.py
index e64bbc9..ba05ae1 100644
--- a/ports/nrf/freeze/test.py
+++ b/ports/nrf/freeze/test.py
@@ -1,4 +1,5 @@
import sys
+
def hello():
print("Hello %s!" % sys.platform)
diff --git a/ports/nrf/gccollect.c b/ports/nrf/gccollect.c
index 68b8188..167825d 100644
--- a/ports/nrf/gccollect.c
+++ b/ports/nrf/gccollect.c
@@ -45,7 +45,7 @@
uintptr_t sp = get_sp();
// trace the stack, including the registers (since they live on the stack in this function)
- gc_collect_root((void**)sp, ((uint32_t)&_ram_end - sp) / sizeof(uint32_t));
+ gc_collect_root((void **)sp, ((uint32_t)&_ram_end - sp) / sizeof(uint32_t));
// end the GC
gc_collect_end();
diff --git a/ports/nrf/help.c b/ports/nrf/help.c
index 5856ef6..afc9791 100644
--- a/ports/nrf/help.c
+++ b/ports/nrf/help.c
@@ -32,23 +32,23 @@
#endif
const char nrf5_help_text[] =
-"Welcome to MicroPython!\n"
-"\n"
-"For online help please visit http://micropython.org/help/.\n"
-"\n"
-"Quick overview of commands for the board:\n"
+ "Welcome to MicroPython!\n"
+ "\n"
+ "For online help please visit http://micropython.org/help/.\n"
+ "\n"
+ "Quick overview of commands for the board:\n"
#if MICROPY_HW_HAS_LED
-" board.LED(n) -- create an LED object for LED n (n=" HELP_TEXT_BOARD_LED ")\n"
-"\n"
+ " board.LED(n) -- create an LED object for LED n (n=" HELP_TEXT_BOARD_LED ")\n"
+ "\n"
#endif
#if BLUETOOTH_SD
-HELP_TEXT_SD
+ HELP_TEXT_SD
#endif
-"Control commands:\n"
-" CTRL-A -- on a blank line, enter raw REPL mode\n"
-" CTRL-B -- on a blank line, enter normal REPL mode\n"
-" CTRL-D -- on a blank line, do a soft reset of the board\n"
-" CTRL-E -- on a blank line, enter paste mode\n"
-"\n"
-"For further help on a specific object, type help(obj)\n"
+ "Control commands:\n"
+ " CTRL-A -- on a blank line, enter raw REPL mode\n"
+ " CTRL-B -- on a blank line, enter normal REPL mode\n"
+ " CTRL-D -- on a blank line, do a soft reset of the board\n"
+ " CTRL-E -- on a blank line, enter paste mode\n"
+ "\n"
+ "For further help on a specific object, type help(obj)\n"
;
diff --git a/ports/nrf/main.c b/ports/nrf/main.c
index af59912..3c5d0a0 100644
--- a/ports/nrf/main.c
+++ b/ports/nrf/main.c
@@ -110,7 +110,7 @@
// Stack limit should be less than real stack size, so we have a chance
// to recover from limit hit. (Limit is measured in bytes.)
- mp_stack_set_limit((char*)&_ram_end - (char*)&_heap_end - 400);
+ mp_stack_set_limit((char *)&_ram_end - (char *)&_heap_end - 400);
machine_init();
@@ -124,35 +124,35 @@
readline_init0();
-#if MICROPY_PY_MACHINE_HW_SPI
+ #if MICROPY_PY_MACHINE_HW_SPI
spi_init0();
-#endif
+ #endif
-#if MICROPY_PY_MACHINE_I2C
+ #if MICROPY_PY_MACHINE_I2C
i2c_init0();
-#endif
+ #endif
-#if MICROPY_PY_MACHINE_ADC
+ #if MICROPY_PY_MACHINE_ADC
adc_init0();
-#endif
+ #endif
-#if MICROPY_PY_MACHINE_HW_PWM
+ #if MICROPY_PY_MACHINE_HW_PWM
pwm_init0();
-#endif
+ #endif
-#if MICROPY_PY_MACHINE_RTCOUNTER
+ #if MICROPY_PY_MACHINE_RTCOUNTER
rtc_init0();
-#endif
+ #endif
-#if MICROPY_PY_MACHINE_TIMER
+ #if MICROPY_PY_MACHINE_TIMER
timer_init0();
-#endif
+ #endif
-#if MICROPY_PY_MACHINE_UART
+ #if MICROPY_PY_MACHINE_UART
uart_init0();
-#endif
+ #endif
-#if (MICROPY_PY_BLE_NUS == 0) && (MICROPY_HW_USB_CDC == 0)
+ #if (MICROPY_PY_BLE_NUS == 0) && (MICROPY_HW_USB_CDC == 0)
{
mp_obj_t args[2] = {
MP_OBJ_NEW_SMALL_INT(0),
@@ -160,15 +160,15 @@
};
MP_STATE_PORT(board_stdio_uart) = machine_hard_uart_type.make_new((mp_obj_t)&machine_hard_uart_type, MP_ARRAY_SIZE(args), 0, args);
}
-#endif
+ #endif
-pin_init0();
+ pin_init0();
-#if MICROPY_MBFS
+ #if MICROPY_MBFS
microbit_filesystem_init();
-#endif
+ #endif
-#if MICROPY_HW_HAS_SDCARD
+ #if MICROPY_HW_HAS_SDCARD
// if an SD card is present then mount it on /sd/
if (sdcard_is_present()) {
// create vfs object
@@ -197,46 +197,46 @@
// use SD card as current directory
f_chdrive("/sd");
}
- no_mem_for_sd:;
+ no_mem_for_sd:;
}
-#endif
+ #endif
// Main script is finished, so now go into REPL mode.
// The REPL mode can change, or it can request a soft reset.
int ret_code = 0;
-#if MICROPY_PY_BLE_NUS
+ #if MICROPY_PY_BLE_NUS
ble_uart_init0();
-#endif
+ #endif
-#if MICROPY_PY_MACHINE_SOFT_PWM
+ #if MICROPY_PY_MACHINE_SOFT_PWM
ticker_init0();
softpwm_init0();
-#endif
+ #endif
-#if MICROPY_PY_MUSIC
+ #if MICROPY_PY_MUSIC
microbit_music_init0();
-#endif
-#if BOARD_SPECIFIC_MODULES
+ #endif
+ #if BOARD_SPECIFIC_MODULES
board_modules_init0();
-#endif
+ #endif
-#if MICROPY_PY_MACHINE_SOFT_PWM
+ #if MICROPY_PY_MACHINE_SOFT_PWM
ticker_start();
pwm_start();
-#endif
+ #endif
-led_state(1, 0);
+ led_state(1, 0);
-#if MICROPY_VFS || MICROPY_MBFS || MICROPY_MODULE_FROZEN
+ #if MICROPY_VFS || MICROPY_MBFS || MICROPY_MODULE_FROZEN
// run boot.py and main.py if they exist.
pyexec_file_if_exists("boot.py");
pyexec_file_if_exists("main.py");
-#endif
+ #endif
-#if MICROPY_HW_USB_CDC
+ #if MICROPY_HW_USB_CDC
usb_cdc_init();
-#endif
+ #endif
for (;;) {
if (pyexec_mode_kind == PYEXEC_MODE_RAW_REPL) {
@@ -255,9 +255,9 @@
printf("MPY: soft reboot\n");
-#if BLUETOOTH_SD
+ #if BLUETOOTH_SD
sd_softdevice_disable();
-#endif
+ #endif
goto soft_reset;
@@ -298,9 +298,8 @@
#endif
-void HardFault_Handler(void)
-{
-#if defined(NRF52_SERIES) || defined(NRF91_SERIES)
+void HardFault_Handler(void) {
+ #if defined(NRF52_SERIES) || defined(NRF91_SERIES)
static volatile uint32_t reg;
static volatile uint32_t reg2;
static volatile uint32_t bfar;
@@ -312,11 +311,13 @@
(void)reg2;
(void)bfar;
}
-#endif
+ #endif
}
void NORETURN __fatal_error(const char *msg) {
- while (1);
+ while (1) {
+ ;
+ }
}
void nlr_jump_fail(void *val) {
@@ -330,4 +331,6 @@
__fatal_error("Assertion failed");
}
-void _start(void) {main(0, NULL);}
+void _start(void) {
+ main(0, NULL);
+}
diff --git a/ports/nrf/mpconfigport.h b/ports/nrf/mpconfigport.h
index f0cc68a..2807611 100644
--- a/ports/nrf/mpconfigport.h
+++ b/ports/nrf/mpconfigport.h
@@ -195,7 +195,7 @@
#define BYTES_PER_WORD (4)
-#define MICROPY_MAKE_POINTER_CALLABLE(p) ((void*)((mp_uint_t)(p) | 1))
+#define MICROPY_MAKE_POINTER_CALLABLE(p) ((void *)((mp_uint_t)(p) | 1))
#define MP_SSIZE_MAX (0x7fffffff)
diff --git a/ports/nrf/mphalport.c b/ports/nrf/mphalport.c
index 57d61b0..bdedea9 100644
--- a/ports/nrf/mphalport.c
+++ b/ports/nrf/mphalport.c
@@ -93,16 +93,15 @@
mp_hal_stdout_tx_strn(str, strlen(str));
}
-void mp_hal_delay_us(mp_uint_t us)
-{
+void mp_hal_delay_us(mp_uint_t us) {
if (us == 0) {
return;
}
- register uint32_t delay __ASM ("r0") = us;
+ register uint32_t delay __ASM("r0") = us;
__ASM volatile (
-#ifdef NRF51
- ".syntax unified\n"
-#endif
+ #ifdef NRF51
+ ".syntax unified\n"
+ #endif
"1:\n"
" SUBS %0, %0, #1\n"
" NOP\n"
@@ -117,7 +116,7 @@
" NOP\n"
" NOP\n"
" NOP\n"
-#if defined(NRF52) || defined(NRF9160_XXAA)
+ #if defined(NRF52) || defined(NRF9160_XXAA)
" NOP\n"
" NOP\n"
" NOP\n"
@@ -164,13 +163,12 @@
" NOP\n"
" NOP\n"
" NOP\n"
-#endif
+ #endif
" BNE 1b\n"
: "+r" (delay));
}
-void mp_hal_delay_ms(mp_uint_t ms)
-{
+void mp_hal_delay_ms(mp_uint_t ms) {
for (mp_uint_t i = 0; i < ms; i++)
{
mp_hal_delay_us(999);
@@ -181,21 +179,21 @@
static const char nrfx_error_unknown[1] = "";
-static const char nrfx_error_success[] = "NRFX_SUCCESS";
-static const char nrfx_error_internal[] = "NRFX_ERROR_INTERNAL";
-static const char nrfx_error_no_mem[] = "NRFX_ERROR_NO_MEM";
-static const char nrfx_error_not_supported[] = "NRFX_ERROR_NOT_SUPPORTED";
-static const char nrfx_error_invalid_param[] = "NRFX_ERROR_INVALID_PARAM";
-static const char nrfx_error_invalid_state[] = "NRFX_ERROR_INVALID_STATE";
-static const char nrfx_error_invalid_length[] = "NRFX_ERROR_INVALID_LENGTH";
-static const char nrfx_error_timeout[] = "NRFX_ERROR_TIMEOUT";
-static const char nrfx_error_forbidden[] = "NRFX_ERROR_FORBIDDEN";
-static const char nrfx_error_null[] = "NRFX_ERROR_NULL";
-static const char nrfx_error_invalid_addr[] = "NRFX_ERROR_INVALID_ADDR";
-static const char nrfx_error_busy[] = "NRFX_ERROR_BUSY";
+static const char nrfx_error_success[] = "NRFX_SUCCESS";
+static const char nrfx_error_internal[] = "NRFX_ERROR_INTERNAL";
+static const char nrfx_error_no_mem[] = "NRFX_ERROR_NO_MEM";
+static const char nrfx_error_not_supported[] = "NRFX_ERROR_NOT_SUPPORTED";
+static const char nrfx_error_invalid_param[] = "NRFX_ERROR_INVALID_PARAM";
+static const char nrfx_error_invalid_state[] = "NRFX_ERROR_INVALID_STATE";
+static const char nrfx_error_invalid_length[] = "NRFX_ERROR_INVALID_LENGTH";
+static const char nrfx_error_timeout[] = "NRFX_ERROR_TIMEOUT";
+static const char nrfx_error_forbidden[] = "NRFX_ERROR_FORBIDDEN";
+static const char nrfx_error_null[] = "NRFX_ERROR_NULL";
+static const char nrfx_error_invalid_addr[] = "NRFX_ERROR_INVALID_ADDR";
+static const char nrfx_error_busy[] = "NRFX_ERROR_BUSY";
static const char nrfx_error_already_initalized[] = "NRFX_ERROR_ALREADY_INITIALIZED";
-static const char * nrfx_error_strings[13] = {
+static const char *nrfx_error_strings[13] = {
nrfx_error_success,
nrfx_error_internal,
nrfx_error_no_mem,
@@ -212,16 +210,16 @@
};
static const char nrfx_drv_error_twi_err_overrun[] = "NRFX_ERROR_DRV_TWI_ERR_OVERRUN";
-static const char nrfx_drv_error_twi_err_anack[] = "NRFX_ERROR_DRV_TWI_ERR_ANACK";
-static const char nrfx_drv_error_twi_err_dnack[] = "NRFX_ERROR_DRV_TWI_ERR_DNACK";
+static const char nrfx_drv_error_twi_err_anack[] = "NRFX_ERROR_DRV_TWI_ERR_ANACK";
+static const char nrfx_drv_error_twi_err_dnack[] = "NRFX_ERROR_DRV_TWI_ERR_DNACK";
-static const char * nrfx_drv_error_strings[3] = {
+static const char *nrfx_drv_error_strings[3] = {
nrfx_drv_error_twi_err_overrun,
nrfx_drv_error_twi_err_anack,
nrfx_drv_error_twi_err_dnack
};
-const char * nrfx_error_code_lookup(uint32_t err_code) {
+const char *nrfx_error_code_lookup(uint32_t err_code) {
if (err_code >= NRFX_ERROR_BASE_NUM && err_code <= NRFX_ERROR_BASE_NUM + 13) {
return nrfx_error_strings[err_code - NRFX_ERROR_BASE_NUM];
} else if (err_code >= NRFX_ERROR_DRIVERS_BASE_NUM && err_code <= NRFX_ERROR_DRIVERS_BASE_NUM + 3) {
diff --git a/ports/nrf/mphalport.h b/ports/nrf/mphalport.h
index 23df0c0..5614be2 100644
--- a/ports/nrf/mphalport.h
+++ b/ports/nrf/mphalport.h
@@ -35,10 +35,10 @@
typedef enum
{
- HAL_OK = 0x00,
- HAL_ERROR = 0x01,
- HAL_BUSY = 0x02,
- HAL_TIMEOUT = 0x03
+ HAL_OK = 0x00,
+ HAL_ERROR = 0x01,
+ HAL_BUSY = 0x02,
+ HAL_TIMEOUT = 0x03
} HAL_StatusTypeDef;
static inline uint32_t hal_tick_fake(void) {
@@ -58,9 +58,9 @@
void mp_hal_delay_ms(mp_uint_t ms);
void mp_hal_delay_us(mp_uint_t us);
-const char * nrfx_error_code_lookup(uint32_t err_code);
+const char *nrfx_error_code_lookup(uint32_t err_code);
-#define mp_hal_pin_obj_t const pin_obj_t*
+#define mp_hal_pin_obj_t const pin_obj_t *
#define mp_hal_get_pin_obj(o) pin_find(o)
#define mp_hal_pin_high(p) nrf_gpio_pin_set(p->pin)
#define mp_hal_pin_low(p) nrf_gpio_pin_clear(p->pin)
diff --git a/ports/nrf/nrfx_config.h b/ports/nrf/nrfx_config.h
index 65b37e6..6fe5aca 100644
--- a/ports/nrf/nrfx_config.h
+++ b/ports/nrf/nrfx_config.h
@@ -106,9 +106,9 @@
#define NRFX_SPIM0_ENABLED 1
#define NRFX_SPIM1_ENABLED 1
- // 0 NRF_GPIO_PIN_NOPULL
- // 1 NRF_GPIO_PIN_PULLDOWN
- // 3 NRF_GPIO_PIN_PULLUP
+// 0 NRF_GPIO_PIN_NOPULL
+// 1 NRF_GPIO_PIN_PULLDOWN
+// 3 NRF_GPIO_PIN_PULLUP
#define NRFX_SPIM_MISO_PULL_CFG 1
#endif // NRF51
diff --git a/ports/nrf/nrfx_glue.h b/ports/nrf/nrfx_glue.h
index ffd2cff..153403f 100644
--- a/ports/nrf/nrfx_glue.h
+++ b/ports/nrf/nrfx_glue.h
@@ -53,7 +53,7 @@
} else { \
NVIC_EnableIRQ(irq_number); \
} \
- } while(0)
+ } while (0)
#else
#define NRFX_IRQ_ENABLE(irq_number) sd_nvic_EnableIRQ(irq_number)
#endif
@@ -67,7 +67,7 @@
} else { \
NVIC_DisableIRQ(irq_number); \
} \
- } while(0)
+ } while (0)
#else
#define NRFX_IRQ_DISABLE(irq_number) sd_nvic_DisableIRQ(irq_number)
#endif
@@ -81,7 +81,7 @@
} else { \
NVIC_SetPriority(irq_number, priority); \
} \
- } while(0)
+ } while (0)
#else
#define NRFX_IRQ_PRIORITY_SET(irq_number, priority) sd_nvic_SetPriority(irq_number, priority)
#endif
@@ -95,7 +95,7 @@
} else { \
NVIC_SetPendingIRQ(irq_number); \
} \
- } while(0)
+ } while (0)
#else
#define NRFX_IRQ_PENDING_SET(irq_number) sd_nvic_SetPendingIRQ(irq_number)
#endif
@@ -109,7 +109,7 @@
} else { \
NVIC_ClearPendingIRQ(irq_number)(irq_number); \
} \
- } while(0)
+ } while (0)
#else
#define NRFX_IRQ_PENDING_CLEAR(irq_number) sd_nvic_ClearPendingIRQ(irq_number)
#endif
@@ -120,8 +120,8 @@
sd_nvic_critical_region_enter(&_is_nested_critical_region);
#define NRFX_CRITICAL_SECTION_EXIT() \
- sd_nvic_critical_region_exit(_is_nested_critical_region); \
- }
+ sd_nvic_critical_region_exit(_is_nested_critical_region); \
+}
#else // BLUETOOTH_SD
diff --git a/ports/nrf/nrfx_log.h b/ports/nrf/nrfx_log.h
index ca2fd58..8710d3f 100644
--- a/ports/nrf/nrfx_log.h
+++ b/ports/nrf/nrfx_log.h
@@ -33,7 +33,7 @@
#define LOG_TEST_UART 1
-#define TEST_MODULE_IMPL(x, y) LOG_TEST_ ## x == LOG_TEST_ ## y
+#define TEST_MODULE_IMPL(x, y) LOG_TEST_##x == LOG_TEST_##y
#define TEST_MODULE(x, y) TEST_MODULE_IMPL(x, y)
#if (!defined(NRFX_LOG_ENABLED) || (NRFX_LOG_ENABLED == 0)) || \
@@ -56,11 +56,11 @@
#define VALUE(x) VALUE_TO_STR(x)
#define LOG_PRINTF(fmt, ...) \
- do { \
- printf("%s: ", VALUE(NRFX_LOG_MODULE)); \
- printf(fmt, ##__VA_ARGS__); \
- printf("\n"); \
- } while (0)
+ do { \
+ printf("%s: ", VALUE(NRFX_LOG_MODULE)); \
+ printf(fmt,##__VA_ARGS__); \
+ printf("\n"); \
+ } while (0)
#define NRFX_LOG_DEBUG LOG_PRINTF
#define NRFX_LOG_ERROR LOG_PRINTF
@@ -77,7 +77,7 @@
#define NRFX_LOG_HEXDUMP_DEBUG(p_memory, length)
#define NRFX_LOG_ERROR_STRING_GET(error_code) \
- nrfx_error_code_lookup(error_code)
+ nrfx_error_code_lookup(error_code)
#endif // NRFX_LOG_ENABLED
diff --git a/ports/nrf/pin_defs_nrf5.h b/ports/nrf/pin_defs_nrf5.h
index fb2930d..a884c87 100644
--- a/ports/nrf/pin_defs_nrf5.h
+++ b/ports/nrf/pin_defs_nrf5.h
@@ -31,39 +31,39 @@
#include "nrf_gpio.h"
enum {
- PORT_A,
- PORT_B,
+ PORT_A,
+ PORT_B,
};
enum {
- AF_FN_UART,
- AF_FN_SPI,
+ AF_FN_UART,
+ AF_FN_SPI,
};
enum {
- AF_PIN_TYPE_UART_TX = 0,
- AF_PIN_TYPE_UART_RX,
- AF_PIN_TYPE_UART_CTS,
- AF_PIN_TYPE_UART_RTS,
+ AF_PIN_TYPE_UART_TX = 0,
+ AF_PIN_TYPE_UART_RX,
+ AF_PIN_TYPE_UART_CTS,
+ AF_PIN_TYPE_UART_RTS,
- AF_PIN_TYPE_SPI_MOSI = 0,
- AF_PIN_TYPE_SPI_MISO,
- AF_PIN_TYPE_SPI_SCK,
- AF_PIN_TYPE_SPI_NSS,
+ AF_PIN_TYPE_SPI_MOSI = 0,
+ AF_PIN_TYPE_SPI_MISO,
+ AF_PIN_TYPE_SPI_SCK,
+ AF_PIN_TYPE_SPI_NSS,
};
#if defined(NRF51) || defined(NRF52_SERIES)
#define PIN_DEFS_PORT_AF_UNION \
- NRF_UART_Type *UART;
+ NRF_UART_Type *UART;
// NRF_SPI_Type *SPIM;
// NRF_SPIS_Type *SPIS;
#elif defined(NRF91_SERIES)
#define PIN_DEFS_PORT_AF_UNION \
- NRF_UARTE_Type *UART;
+ NRF_UARTE_Type *UART;
#endif
enum {
- PIN_ADC1 = (1 << 0),
+ PIN_ADC1 = (1 << 0),
};
typedef NRF_GPIO_Type pin_gpio_t;
diff --git a/ports/pic16bit/board.c b/ports/pic16bit/board.c
index 0321b0e..977dd2c 100644
--- a/ports/pic16bit/board.c
+++ b/ports/pic16bit/board.c
@@ -79,17 +79,29 @@
void led_state(int led, int state) {
int val = state ? LED_ON : LED_OFF;
switch (led) {
- case 1: RED_LED = val; break;
- case 2: YELLOW_LED = val; break;
- case 3: GREEN_LED = val; break;
+ case 1:
+ RED_LED = val;
+ break;
+ case 2:
+ YELLOW_LED = val;
+ break;
+ case 3:
+ GREEN_LED = val;
+ break;
}
}
void led_toggle(int led) {
switch (led) {
- case 1: RED_LED ^= 1; break;
- case 2: YELLOW_LED ^= 1; break;
- case 3: GREEN_LED ^= 1; break;
+ case 1:
+ RED_LED ^= 1;
+ break;
+ case 2:
+ YELLOW_LED ^= 1;
+ break;
+ case 3:
+ GREEN_LED ^= 1;
+ break;
}
}
@@ -111,8 +123,12 @@
int switch_get(int sw) {
int val = 1;
switch (sw) {
- case 1: val = SWITCH_S1; break;
- case 2: val = SWITCH_S2; break;
+ case 1:
+ val = SWITCH_S1;
+ break;
+ case 2:
+ val = SWITCH_S2;
+ break;
}
return val == 0;
}
diff --git a/ports/pic16bit/main.c b/ports/pic16bit/main.c
index c96ac54..07db3f5 100644
--- a/ports/pic16bit/main.c
+++ b/ports/pic16bit/main.c
@@ -68,7 +68,7 @@
// init MicroPython runtime
int stack_dummy;
- MP_STATE_THREAD(stack_top) = (char*)&stack_dummy;
+ MP_STATE_THREAD(stack_top) = (char *)&stack_dummy;
gc_init(heap, heap + sizeof(heap));
mp_init();
mp_hal_init();
@@ -115,11 +115,15 @@
MP_DEFINE_CONST_FUN_OBJ_KW(mp_builtin_open_obj, 1, mp_builtin_open);
void nlr_jump_fail(void *val) {
- while (1);
+ while (1) {
+ ;
+ }
}
void NORETURN __fatal_error(const char *msg) {
- while (1);
+ while (1) {
+ ;
+ }
}
#ifndef NDEBUG
diff --git a/ports/pic16bit/modpyb.c b/ports/pic16bit/modpyb.c
index 6299146..a18b377 100644
--- a/ports/pic16bit/modpyb.c
+++ b/ports/pic16bit/modpyb.c
@@ -66,5 +66,5 @@
const mp_obj_module_t pyb_module = {
.base = { &mp_type_module },
- .globals = (mp_obj_dict_t*)&pyb_module_globals,
+ .globals = (mp_obj_dict_t *)&pyb_module_globals,
};
diff --git a/ports/pic16bit/mpconfigport.h b/ports/pic16bit/mpconfigport.h
index 59880dc..a63ff41 100644
--- a/ports/pic16bit/mpconfigport.h
+++ b/ports/pic16bit/mpconfigport.h
@@ -75,7 +75,7 @@
// 2-byte aligned pointers (see config setting above).
//#define MICROPY_OBJ_BASE_ALIGNMENT __attribute__((aligned(4)))
-#define MICROPY_MAKE_POINTER_CALLABLE(p) ((void*)((mp_uint_t)(p)))
+#define MICROPY_MAKE_POINTER_CALLABLE(p) ((void *)((mp_uint_t)(p)))
#define UINT_FMT "%u"
#define INT_FMT "%d"
diff --git a/ports/powerpc/frozentest.py b/ports/powerpc/frozentest.py
index 0f99b74..78cdd60 100644
--- a/ports/powerpc/frozentest.py
+++ b/ports/powerpc/frozentest.py
@@ -1,7 +1,7 @@
-print('uPy')
-print('a long string that is not interned')
-print('a string that has unicode αβγ chars')
-print(b'bytes 1234\x01')
+print("uPy")
+print("a long string that is not interned")
+print("a string that has unicode αβγ chars")
+print(b"bytes 1234\x01")
print(123456789)
for i in range(4):
print(i)
diff --git a/ports/powerpc/main.c b/ports/powerpc/main.c
index 9b164ac..421f9be 100644
--- a/ports/powerpc/main.c
+++ b/ports/powerpc/main.c
@@ -50,7 +50,8 @@
void __assert_fail(const char *__assertion, const char *__file,
unsigned int __line, const char *__function) {
printf("Assert at %s:%d:%s() \"%s\" failed\n", __file, __line, __function, __assertion);
- for (;;) ;
+ for (;;) {;
+ }
}
static char *stack_top;
@@ -62,7 +63,7 @@
int main(int argc, char **argv) {
int stack_dummy;
- stack_top = (char*)&stack_dummy;
+ stack_top = (char *)&stack_dummy;
// microwatt has argc/r3 = 0 whereas QEMU has r3 set in head.S
uart_init_ppc(argc);
@@ -124,11 +125,15 @@
MP_DEFINE_CONST_FUN_OBJ_KW(mp_builtin_open_obj, 1, mp_builtin_open);
void nlr_jump_fail(void *val) {
- while (1);
+ while (1) {
+ ;
+ }
}
void NORETURN __fatal_error(const char *msg) {
- while (1);
+ while (1) {
+ ;
+ }
}
#ifndef NDEBUG
diff --git a/ports/powerpc/mpconfigport.h b/ports/powerpc/mpconfigport.h
index 93ef699..1800b8c 100644
--- a/ports/powerpc/mpconfigport.h
+++ b/ports/powerpc/mpconfigport.h
@@ -93,7 +93,7 @@
// type definitions for the specific machine
-#define MICROPY_MAKE_POINTER_CALLABLE(p) ((void*)((mp_uint_t)(p) | 1))
+#define MICROPY_MAKE_POINTER_CALLABLE(p) ((void *)((mp_uint_t)(p) | 1))
// This port is 64-bit
#define UINT_FMT "%lu"
diff --git a/ports/powerpc/mphalport.h b/ports/powerpc/mphalport.h
index c6bf940..bb7fa34 100644
--- a/ports/powerpc/mphalport.h
+++ b/ports/powerpc/mphalport.h
@@ -25,7 +25,7 @@
*/
#define mftb() ({unsigned long rval; \
- __asm__ volatile("mftb %0" : "=r" (rval)); rval;})
+ __asm__ volatile ("mftb %0" : "=r" (rval)); rval;})
#define TBFREQ 512000000
diff --git a/ports/powerpc/uart_lpc_serial.c b/ports/powerpc/uart_lpc_serial.c
index 51a55cb..c15fc04 100644
--- a/ports/powerpc/uart_lpc_serial.c
+++ b/ports/powerpc/uart_lpc_serial.c
@@ -101,11 +101,15 @@
}
char lpc_uart_read(void) {
- while (lpc_uart_rx_empty()) ;
+ while (lpc_uart_rx_empty()) {
+ ;
+ }
return lpc_uart_reg_read(REG_THR);
}
void lpc_uart_write(char c) {
- while (lpc_uart_tx_full());
+ while (lpc_uart_tx_full()) {
+ ;
+ }
lpc_uart_reg_write(REG_RBR, c);
}
diff --git a/ports/powerpc/uart_potato.c b/ports/powerpc/uart_potato.c
index 18f89d4..4a487f3 100644
--- a/ports/powerpc/uart_potato.c
+++ b/ports/powerpc/uart_potato.c
@@ -105,7 +105,9 @@
char potato_uart_read(void) {
uint64_t val;
- while (potato_uart_rx_empty());
+ while (potato_uart_rx_empty()) {
+ ;
+ }
val = potato_uart_reg_read(POTATO_CONSOLE_RX);
return (char)(val & 0x000000ff);
@@ -116,6 +118,8 @@
val = c;
- while (potato_uart_tx_full());
+ while (potato_uart_tx_full()) {
+ ;
+ }
potato_uart_reg_write(POTATO_CONSOLE_TX, val);
}
diff --git a/ports/qemu-arm/main.c b/ports/qemu-arm/main.c
index 41bf945..8c49d0c 100644
--- a/ports/qemu-arm/main.c
+++ b/ports/qemu-arm/main.c
@@ -30,8 +30,8 @@
int main(int argc, char **argv) {
mp_stack_ctrl_init();
mp_stack_set_limit(10240);
- uint32_t heap[16*1024 / 4];
- gc_init(heap, (char*)heap + 16 * 1024);
+ uint32_t heap[16 * 1024 / 4];
+ gc_init(heap, (char *)heap + 16 * 1024);
mp_init();
do_str("print('hello world!')", MP_PARSE_SINGLE_INPUT);
mp_deinit();
diff --git a/ports/qemu-arm/modmachine.c b/ports/qemu-arm/modmachine.c
index 0f66349..728fd4f 100644
--- a/ports/qemu-arm/modmachine.c
+++ b/ports/qemu-arm/modmachine.c
@@ -43,5 +43,5 @@
const mp_obj_module_t mp_module_machine = {
.base = { &mp_type_module },
- .globals = (mp_obj_dict_t*)&machine_module_globals,
+ .globals = (mp_obj_dict_t *)&machine_module_globals,
};
diff --git a/ports/qemu-arm/moduos.c b/ports/qemu-arm/moduos.c
index a48b51d..23a1241 100644
--- a/ports/qemu-arm/moduos.c
+++ b/ports/qemu-arm/moduos.c
@@ -49,5 +49,5 @@
const mp_obj_module_t mp_module_uos = {
.base = { &mp_type_module },
- .globals = (mp_obj_dict_t*)&os_module_globals,
+ .globals = (mp_obj_dict_t *)&os_module_globals,
};
diff --git a/ports/qemu-arm/mpconfigport.h b/ports/qemu-arm/mpconfigport.h
index 3d4abd5..498ab3e 100644
--- a/ports/qemu-arm/mpconfigport.h
+++ b/ports/qemu-arm/mpconfigport.h
@@ -43,7 +43,7 @@
// type definitions for the specific machine
-#define MICROPY_MAKE_POINTER_CALLABLE(p) ((void*)((mp_uint_t)(p) | 1))
+#define MICROPY_MAKE_POINTER_CALLABLE(p) ((void *)((mp_uint_t)(p) | 1))
#define MP_SSIZE_MAX (0x7fffffff)
diff --git a/ports/qemu-arm/startup.c b/ports/qemu-arm/startup.c
index 5198d08..002d5ef 100644
--- a/ports/qemu-arm/startup.c
+++ b/ports/qemu-arm/startup.c
@@ -68,7 +68,7 @@
".notclean:\n"
"movs r0, #0x18\n" // SYS_EXIT
"bkpt 0xab\n"
- );
+ );
for (;;) {
}
}
diff --git a/ports/qemu-arm/test-frzmpy/native_frozen_align.py b/ports/qemu-arm/test-frzmpy/native_frozen_align.py
index 5c5c0e8..8675b8e 100644
--- a/ports/qemu-arm/test-frzmpy/native_frozen_align.py
+++ b/ports/qemu-arm/test-frzmpy/native_frozen_align.py
@@ -1,13 +1,16 @@
import micropython
+
@micropython.native
def native_x(x):
print(x + 1)
+
@micropython.native
def native_y(x):
print(x + 1)
+
@micropython.native
def native_z(x):
print(x + 1)
diff --git a/ports/qemu-arm/test_main.c b/ports/qemu-arm/test_main.c
index 3fd2c01..5fc5d4e 100644
--- a/ports/qemu-arm/test_main.c
+++ b/ports/qemu-arm/test_main.c
@@ -23,7 +23,7 @@
mp_stack_ctrl_init();
mp_stack_set_limit(10240);
static uint32_t heap[HEAP_SIZE / sizeof(uint32_t)];
- upytest_set_heap(heap, (char*)heap + HEAP_SIZE);
+ upytest_set_heap(heap, (char *)heap + HEAP_SIZE);
int r = tinytest_main(0, NULL, groups);
printf("status: %d\n", r);
return r;
@@ -37,7 +37,7 @@
uintptr_t sp = gc_helper_get_regs_and_sp(regs);
// trace the stack, including the registers (since they live on the stack in this function)
- gc_collect_root((void**)sp, ((uint32_t)MP_STATE_THREAD(stack_top) - (uint32_t)sp) / sizeof(uint32_t));
+ gc_collect_root((void **)sp, ((uint32_t)MP_STATE_THREAD(stack_top) - (uint32_t)sp) / sizeof(uint32_t));
gc_collect_end();
}
diff --git a/ports/qemu-arm/uart.c b/ports/qemu-arm/uart.c
index a0ce737..8710e9e 100644
--- a/ports/qemu-arm/uart.c
+++ b/ports/qemu-arm/uart.c
@@ -10,7 +10,7 @@
volatile uint32_t DR;
} UART_t;
-#define UART0 ((UART_t*)(0x40011000))
+#define UART0 ((UART_t *)(0x40011000))
void uart_init(void) {
}
@@ -32,7 +32,7 @@
volatile uint32_t TXD; // 0x51c
} UART_t;
-#define UART0 ((UART_t*)(0x40002000))
+#define UART0 ((UART_t *)(0x40002000))
void uart_init(void) {
UART0->ENABLE = 4;
@@ -60,7 +60,7 @@
volatile uint32_t BAUDDIV;
} UART_t;
-#define UART0 ((UART_t*)(0x40004000))
+#define UART0 ((UART_t *)(0x40004000))
void uart_init(void) {
UART0->BAUDDIV = 16;
diff --git a/ports/samd/main.c b/ports/samd/main.c
index a66bdfb..6c6b6f3 100644
--- a/ports/samd/main.c
+++ b/ports/samd/main.c
@@ -67,7 +67,7 @@
gc_collect_start();
uintptr_t regs[10];
uintptr_t sp = gc_helper_get_regs_and_sp(regs);
- gc_collect_root((void**)sp, ((uintptr_t)MP_STATE_THREAD(stack_top) - sp) / sizeof(uint32_t));
+ gc_collect_root((void **)sp, ((uintptr_t)MP_STATE_THREAD(stack_top) - sp) / sizeof(uint32_t));
gc_collect_end();
}
@@ -92,7 +92,7 @@
#ifndef NDEBUG
void MP_WEAK __assert_func(const char *file, int line, const char *func, const char *expr) {
mp_printf(MP_PYTHON_PRINTER, "Assertion '%s' failed, at file %s:%d\n", expr, file, line);
- for(;;) {
+ for (;;) {
}
}
#endif
diff --git a/ports/samd/modmachine.c b/ports/samd/modmachine.c
index 5362ef1..207e4c7 100644
--- a/ports/samd/modmachine.c
+++ b/ports/samd/modmachine.c
@@ -68,5 +68,5 @@
const mp_obj_module_t mp_module_machine = {
.base = { &mp_type_module },
- .globals = (mp_obj_dict_t*)&machine_module_globals,
+ .globals = (mp_obj_dict_t *)&machine_module_globals,
};
diff --git a/ports/samd/modutime.c b/ports/samd/modutime.c
index c3c152b..8d6a405 100644
--- a/ports/samd/modutime.c
+++ b/ports/samd/modutime.c
@@ -43,5 +43,5 @@
const mp_obj_module_t mp_module_utime = {
.base = { &mp_type_module },
- .globals = (mp_obj_dict_t*)&time_module_globals,
+ .globals = (mp_obj_dict_t *)&time_module_globals,
};
diff --git a/ports/samd/mpconfigport.h b/ports/samd/mpconfigport.h
index d77b9d5..ffb30bf 100644
--- a/ports/samd/mpconfigport.h
+++ b/ports/samd/mpconfigport.h
@@ -97,7 +97,7 @@
__WFI(); \
} while (0);
-#define MICROPY_MAKE_POINTER_CALLABLE(p) ((void*)((mp_uint_t)(p) | 1))
+#define MICROPY_MAKE_POINTER_CALLABLE(p) ((void *)((mp_uint_t)(p) | 1))
#define MP_PLAT_PRINT_STRN(str, len) mp_hal_stdout_tx_strn_cooked(str, len)
#define MP_SSIZE_MAX (0x7fffffff)
diff --git a/ports/samd/mphalport.c b/ports/samd/mphalport.c
index ebd9dcb..67fc2cb 100644
--- a/ports/samd/mphalport.c
+++ b/ports/samd/mphalport.c
@@ -93,7 +93,8 @@
}
}
while (len--) {
- while (!(USARTx->USART.INTFLAG.bit.DRE)) { }
+ while (!(USARTx->USART.INTFLAG.bit.DRE)) {
+ }
USARTx->USART.DATA.bit.DATA = *str++;
}
}
diff --git a/ports/samd/mphalport.h b/ports/samd/mphalport.h
index 5256265..fc7dbe9 100644
--- a/ports/samd/mphalport.h
+++ b/ports/samd/mphalport.h
@@ -32,8 +32,14 @@
void mp_hal_set_interrupt_char(int c);
-static inline mp_uint_t mp_hal_ticks_ms(void) { return systick_ms; }
-static inline mp_uint_t mp_hal_ticks_us(void) { return systick_ms * 1000; }
-static inline mp_uint_t mp_hal_ticks_cpu(void) { return 0; }
+static inline mp_uint_t mp_hal_ticks_ms(void) {
+ return systick_ms;
+}
+static inline mp_uint_t mp_hal_ticks_us(void) {
+ return systick_ms * 1000;
+}
+static inline mp_uint_t mp_hal_ticks_cpu(void) {
+ return 0;
+}
#endif // MICROPY_INCLUDED_SAMD_MPHALPORT_H
diff --git a/ports/samd/samd_isr.c b/ports/samd/samd_isr.c
index 8341df8..dcf80d2 100644
--- a/ports/samd/samd_isr.c
+++ b/ports/samd/samd_isr.c
@@ -59,10 +59,10 @@
#endif
// SCB->VTOR
- *((volatile uint32_t*)0xe000ed08) = (uint32_t)&isr_vector;
+ *((volatile uint32_t *)0xe000ed08) = (uint32_t)&isr_vector;
// SCB->CCR: enable 8-byte stack alignment for IRQ handlers, in accord with EABI
- *((volatile uint32_t*)0xe000ed14) |= 1 << 9;
+ *((volatile uint32_t *)0xe000ed14) |= 1 << 9;
// Initialise the cpu and peripherals
samd_init();
diff --git a/ports/samd/samd_soc.c b/ports/samd/samd_soc.c
index 569cd38..a08d0de 100644
--- a/ports/samd/samd_soc.c
+++ b/ports/samd/samd_soc.c
@@ -37,7 +37,8 @@
PM->APBCMASK.bit.SERCOM0_ = 1;
GCLK->CLKCTRL.reg = GCLK_CLKCTRL_CLKEN | GCLK_CLKCTRL_GEN_GCLK0 | GCLK_CLKCTRL_ID_SERCOM0_CORE;
- while (GCLK->STATUS.bit.SYNCBUSY) { }
+ while (GCLK->STATUS.bit.SYNCBUSY) {
+ }
uint32_t rxpo = 3;
uint32_t txpo = 1;
@@ -58,18 +59,21 @@
#endif
- while (USARTx->USART.SYNCBUSY.bit.SWRST) { }
+ while (USARTx->USART.SYNCBUSY.bit.SWRST) {
+ }
USARTx->USART.CTRLA.bit.SWRST = 1;
- while (USARTx->USART.SYNCBUSY.bit.SWRST) { }
+ while (USARTx->USART.SYNCBUSY.bit.SWRST) {
+ }
USARTx->USART.CTRLA.reg =
SERCOM_USART_CTRLA_DORD
| SERCOM_USART_CTRLA_RXPO(rxpo)
| SERCOM_USART_CTRLA_TXPO(txpo)
| SERCOM_USART_CTRLA_MODE(1)
- ;
+ ;
USARTx->USART.CTRLB.reg = SERCOM_USART_CTRLB_RXEN | SERCOM_USART_CTRLB_TXEN;
- while (USARTx->USART.SYNCBUSY.bit.CTRLB) { }
+ while (USARTx->USART.SYNCBUSY.bit.CTRLB) {
+ }
#if CPU_FREQ == 8000000
uint32_t baud = 50437; // 115200 baud; 65536*(1 - 16 * 115200/8e6)
#elif CPU_FREQ == 48000000
@@ -79,7 +83,8 @@
#endif
USARTx->USART.BAUD.bit.BAUD = baud;
USARTx->USART.CTRLA.bit.ENABLE = 1;
- while (USARTx->USART.SYNCBUSY.bit.ENABLE) { }
+ while (USARTx->USART.SYNCBUSY.bit.ENABLE) {
+ }
}
static void usb_init(void) {
@@ -91,7 +96,8 @@
uint8_t alt = 6; // alt G, USB
#elif defined(MCU_SAMD51)
GCLK->PCHCTRL[USB_GCLK_ID].reg = GCLK_PCHCTRL_CHEN | GCLK_PCHCTRL_GEN_GCLK1;
- while (GCLK->PCHCTRL[USB_GCLK_ID].bit.CHEN == 0) { }
+ while (GCLK->PCHCTRL[USB_GCLK_ID].bit.CHEN == 0) {
+ }
MCLK->AHBMASK.bit.USB_ = 1;
MCLK->APBBMASK.bit.USB_ = 1;
uint8_t alt = 7; // alt H, USB
@@ -115,10 +121,11 @@
// Enable DFLL48M
SYSCTRL->DFLLCTRL.reg = SYSCTRL_DFLLCTRL_ENABLE;
- while (!SYSCTRL->PCLKSR.bit.DFLLRDY) {}
+ while (!SYSCTRL->PCLKSR.bit.DFLLRDY) {
+ }
SYSCTRL->DFLLMUL.reg = SYSCTRL_DFLLMUL_CSTEP(1) | SYSCTRL_DFLLMUL_FSTEP(1)
| SYSCTRL_DFLLMUL_MUL(48000);
- uint32_t coarse = (*((uint32_t*)FUSES_DFLL48M_COARSE_CAL_ADDR) & FUSES_DFLL48M_COARSE_CAL_Msk)
+ uint32_t coarse = (*((uint32_t *)FUSES_DFLL48M_COARSE_CAL_ADDR) & FUSES_DFLL48M_COARSE_CAL_Msk)
>> FUSES_DFLL48M_COARSE_CAL_Pos;
if (coarse == 0x3f) {
coarse = 0x1f;
@@ -127,11 +134,13 @@
SYSCTRL->DFLLVAL.reg = SYSCTRL_DFLLVAL_COARSE(coarse) | SYSCTRL_DFLLVAL_FINE(fine);
SYSCTRL->DFLLCTRL.reg = SYSCTRL_DFLLCTRL_CCDIS | SYSCTRL_DFLLCTRL_USBCRM
| SYSCTRL_DFLLCTRL_MODE | SYSCTRL_DFLLCTRL_ENABLE;
- while (!SYSCTRL->PCLKSR.bit.DFLLRDY) {}
+ while (!SYSCTRL->PCLKSR.bit.DFLLRDY) {
+ }
GCLK->GENDIV.reg = GCLK_GENDIV_ID(0) | GCLK_GENDIV_DIV(1);
GCLK->GENCTRL.reg = GCLK_GENCTRL_GENEN | GCLK_GENCTRL_SRC_DFLL48M | GCLK_GENCTRL_ID(0);
- while (GCLK->STATUS.bit.SYNCBUSY) { }
+ while (GCLK->STATUS.bit.SYNCBUSY) {
+ }
// Configure PA10 as output for LED
PORT->Group[0].DIRSET.reg = 1 << 10;
@@ -139,7 +148,8 @@
#elif defined(MCU_SAMD51)
GCLK->GENCTRL[1].reg = 1 << GCLK_GENCTRL_DIV_Pos | GCLK_GENCTRL_GENEN | GCLK_GENCTRL_SRC_DFLL;
- while (GCLK->SYNCBUSY.bit.GENCTRL1) { }
+ while (GCLK->SYNCBUSY.bit.GENCTRL1) {
+ }
// Configure PA22 as output for LED
PORT->Group[0].DIRSET.reg = 1 << 22;
diff --git a/ports/samd/tusb_port.c b/ports/samd/tusb_port.c
index 23c242b..8f18e5e 100644
--- a/ports/samd/tusb_port.c
+++ b/ports/samd/tusb_port.c
@@ -50,19 +50,19 @@
// Note: descriptors returned from callbacks must exist long enough for transfer to complete
static const tusb_desc_device_t usbd_desc_device = {
- .bLength = sizeof(tusb_desc_device_t),
- .bDescriptorType = TUSB_DESC_DEVICE,
- .bcdUSB = 0x0200,
- .bDeviceClass = TUSB_CLASS_MISC,
- .bDeviceSubClass = MISC_SUBCLASS_COMMON,
- .bDeviceProtocol = MISC_PROTOCOL_IAD,
- .bMaxPacketSize0 = CFG_TUD_ENDOINT0_SIZE,
- .idVendor = USBD_VID,
- .idProduct = USBD_PID,
- .bcdDevice = 0x0100,
- .iManufacturer = USBD_STR_MANUF,
- .iProduct = USBD_STR_PRODUCT,
- .iSerialNumber = USBD_STR_SERIAL,
+ .bLength = sizeof(tusb_desc_device_t),
+ .bDescriptorType = TUSB_DESC_DEVICE,
+ .bcdUSB = 0x0200,
+ .bDeviceClass = TUSB_CLASS_MISC,
+ .bDeviceSubClass = MISC_SUBCLASS_COMMON,
+ .bDeviceProtocol = MISC_PROTOCOL_IAD,
+ .bMaxPacketSize0 = CFG_TUD_ENDOINT0_SIZE,
+ .idVendor = USBD_VID,
+ .idProduct = USBD_PID,
+ .bcdDevice = 0x0100,
+ .iManufacturer = USBD_STR_MANUF,
+ .iProduct = USBD_STR_PRODUCT,
+ .iSerialNumber = USBD_STR_SERIAL,
.bNumConfigurations = 1,
};
@@ -82,7 +82,7 @@
};
const uint8_t *tud_descriptor_device_cb(void) {
- return (const uint8_t*)&usbd_desc_device;
+ return (const uint8_t *)&usbd_desc_device;
}
const uint8_t *tud_descriptor_configuration_cb(uint8_t index) {
@@ -102,7 +102,7 @@
if (index >= sizeof(usbd_desc_str) / sizeof(usbd_desc_str[0])) {
return NULL;
}
- const char* str = usbd_desc_str[index];
+ const char *str = usbd_desc_str[index];
for (len = 0; len < DESC_STR_MAX - 1 && str[len]; ++len) {
desc_str[1 + len] = str[len];
}
diff --git a/ports/stm32/accel.c b/ports/stm32/accel.c
index eb55b5d..baf1112 100644
--- a/ports/stm32/accel.c
+++ b/ports/stm32/accel.c
@@ -234,7 +234,8 @@
const size_t DATA_SIZE = 5;
const size_t DATA_STRIDE = 2;
#endif
- uint8_t data[DATA_SIZE]; data[0] = ACCEL_REG_X;
+ uint8_t data[DATA_SIZE];
+ data[0] = ACCEL_REG_X;
i2c_writeto(I2C1, ACCEL_ADDR, data, 1, false);
i2c_readfrom(I2C1, ACCEL_ADDR, data, DATA_SIZE, true);
@@ -284,7 +285,7 @@
{ &mp_type_type },
.name = MP_QSTR_Accel,
.make_new = pyb_accel_make_new,
- .locals_dict = (mp_obj_dict_t*)&pyb_accel_locals_dict,
+ .locals_dict = (mp_obj_dict_t *)&pyb_accel_locals_dict,
};
#endif // MICROPY_HW_HAS_MMA7660 || MICROPY_HW_HAS_KXTJ3
diff --git a/ports/stm32/adc.c b/ports/stm32/adc.c
index 8abaa3b..8d89e1f 100644
--- a/ports/stm32/adc.c
+++ b/ports/stm32/adc.c
@@ -70,8 +70,8 @@
#define ADC_LAST_GPIO_CHANNEL (15)
#define ADC_SCALE_V (3.3f)
#define ADC_CAL_ADDRESS (0x1ffff7ba)
-#define ADC_CAL1 ((uint16_t*)0x1ffff7b8)
-#define ADC_CAL2 ((uint16_t*)0x1ffff7c2)
+#define ADC_CAL1 ((uint16_t *)0x1ffff7b8)
+#define ADC_CAL2 ((uint16_t *)0x1ffff7c2)
#define ADC_CAL_BITS (12)
#elif defined(STM32F4)
@@ -80,8 +80,8 @@
#define ADC_LAST_GPIO_CHANNEL (15)
#define ADC_SCALE_V (3.3f)
#define ADC_CAL_ADDRESS (0x1fff7a2a)
-#define ADC_CAL1 ((uint16_t*)(ADC_CAL_ADDRESS + 2))
-#define ADC_CAL2 ((uint16_t*)(ADC_CAL_ADDRESS + 4))
+#define ADC_CAL1 ((uint16_t *)(ADC_CAL_ADDRESS + 2))
+#define ADC_CAL2 ((uint16_t *)(ADC_CAL_ADDRESS + 4))
#define ADC_CAL_BITS (12)
#elif defined(STM32F7)
@@ -96,8 +96,8 @@
#define ADC_CAL_ADDRESS (0x1ff0f44a)
#endif
-#define ADC_CAL1 ((uint16_t*)(ADC_CAL_ADDRESS + 2))
-#define ADC_CAL2 ((uint16_t*)(ADC_CAL_ADDRESS + 4))
+#define ADC_CAL1 ((uint16_t *)(ADC_CAL_ADDRESS + 2))
+#define ADC_CAL2 ((uint16_t *)(ADC_CAL_ADDRESS + 4))
#define ADC_CAL_BITS (12)
#elif defined(STM32H7)
@@ -106,8 +106,8 @@
#define ADC_LAST_GPIO_CHANNEL (16)
#define ADC_SCALE_V (3.3f)
#define ADC_CAL_ADDRESS (0x1FF1E860)
-#define ADC_CAL1 ((uint16_t*)(0x1FF1E820))
-#define ADC_CAL2 ((uint16_t*)(0x1FF1E840))
+#define ADC_CAL1 ((uint16_t *)(0x1FF1E820))
+#define ADC_CAL2 ((uint16_t *)(0x1FF1E840))
#define ADC_CAL_BITS (16)
#elif defined(STM32L4)
@@ -116,8 +116,8 @@
#define ADC_LAST_GPIO_CHANNEL (16)
#define ADC_SCALE_V (3.0f)
#define ADC_CAL_ADDRESS (0x1fff75aa)
-#define ADC_CAL1 ((uint16_t*)(ADC_CAL_ADDRESS - 2))
-#define ADC_CAL2 ((uint16_t*)(ADC_CAL_ADDRESS + 0x20))
+#define ADC_CAL1 ((uint16_t *)(ADC_CAL_ADDRESS - 2))
+#define ADC_CAL2 ((uint16_t *)(ADC_CAL_ADDRESS + 0x20))
#define ADC_CAL_BITS (12)
#else
@@ -129,25 +129,25 @@
#if defined(STM32F091xC)
#define VBAT_DIV (2)
#elif defined(STM32F405xx) || defined(STM32F415xx) || \
- defined(STM32F407xx) || defined(STM32F417xx) || \
- defined(STM32F401xC) || defined(STM32F401xE)
+ defined(STM32F407xx) || defined(STM32F417xx) || \
+ defined(STM32F401xC) || defined(STM32F401xE)
#define VBAT_DIV (2)
#elif defined(STM32F411xE) || defined(STM32F413xx) || \
- defined(STM32F427xx) || defined(STM32F429xx) || \
- defined(STM32F437xx) || defined(STM32F439xx) || \
- defined(STM32F446xx)
+ defined(STM32F427xx) || defined(STM32F429xx) || \
+ defined(STM32F437xx) || defined(STM32F439xx) || \
+ defined(STM32F446xx)
#define VBAT_DIV (4)
#elif defined(STM32F722xx) || defined(STM32F723xx) || \
- defined(STM32F732xx) || defined(STM32F733xx) || \
- defined(STM32F746xx) || defined(STM32F765xx) || \
- defined(STM32F767xx) || defined(STM32F769xx)
+ defined(STM32F732xx) || defined(STM32F733xx) || \
+ defined(STM32F746xx) || defined(STM32F765xx) || \
+ defined(STM32F767xx) || defined(STM32F769xx)
#define VBAT_DIV (4)
#elif defined(STM32H743xx)
#define VBAT_DIV (4)
#elif defined(STM32L432xx) || \
- defined(STM32L451xx) || defined(STM32L452xx) || \
- defined(STM32L462xx) || defined(STM32L475xx) || \
- defined(STM32L476xx) || defined(STM32L496xx)
+ defined(STM32L451xx) || defined(STM32L452xx) || \
+ defined(STM32L462xx) || defined(STM32L475xx) || \
+ defined(STM32L476xx) || defined(STM32L496xx)
#define VBAT_DIV (3)
#else
#error Unsupported processor
@@ -167,8 +167,8 @@
#ifndef __HAL_ADC_IS_CHANNEL_INTERNAL
#define __HAL_ADC_IS_CHANNEL_INTERNAL(channel) \
(channel == ADC_CHANNEL_VBAT \
- || channel == ADC_CHANNEL_VREFINT \
- || channel == ADC_CHANNEL_TEMPSENSOR)
+ || channel == ADC_CHANNEL_VREFINT \
+ || channel == ADC_CHANNEL_TEMPSENSOR)
#endif
typedef struct _pyb_obj_adc_t {
@@ -191,32 +191,32 @@
}
STATIC bool is_adcx_channel(int channel) {
-#if defined(STM32F411xE)
+ #if defined(STM32F411xE)
// The HAL has an incorrect IS_ADC_CHANNEL macro for the F411 so we check for temp
return IS_ADC_CHANNEL(channel) || channel == ADC_CHANNEL_TEMPSENSOR;
-#elif defined(STM32F0) || defined(STM32F4) || defined(STM32F7)
+ #elif defined(STM32F0) || defined(STM32F4) || defined(STM32F7)
return IS_ADC_CHANNEL(channel);
-#elif defined(STM32H7)
+ #elif defined(STM32H7)
return __HAL_ADC_IS_CHANNEL_INTERNAL(channel)
- || IS_ADC_CHANNEL(__HAL_ADC_DECIMAL_NB_TO_CHANNEL(channel));
-#elif defined(STM32L4)
+ || IS_ADC_CHANNEL(__HAL_ADC_DECIMAL_NB_TO_CHANNEL(channel));
+ #elif defined(STM32L4)
ADC_HandleTypeDef handle;
handle.Instance = ADCx;
return IS_ADC_CHANNEL(&handle, channel);
-#else
+ #else
#error Unsupported processor
-#endif
+ #endif
}
STATIC void adc_wait_for_eoc_or_timeout(int32_t timeout) {
uint32_t tickstart = HAL_GetTick();
-#if defined(STM32F4) || defined(STM32F7)
+ #if defined(STM32F4) || defined(STM32F7)
while ((ADCx->SR & ADC_FLAG_EOC) != ADC_FLAG_EOC) {
-#elif defined(STM32F0) || defined(STM32H7) || defined(STM32L4)
+ #elif defined(STM32F0) || defined(STM32H7) || defined(STM32L4)
while (READ_BIT(ADCx->ISR, ADC_FLAG_EOC) != ADC_FLAG_EOC) {
-#else
+ #else
#error Unsupported processor
-#endif
+ #endif
if (((HAL_GetTick() - tickstart ) > timeout)) {
break; // timeout
}
@@ -224,58 +224,58 @@
}
STATIC void adcx_clock_enable(void) {
-#if defined(STM32F0) || defined(STM32F4) || defined(STM32F7)
+ #if defined(STM32F0) || defined(STM32F4) || defined(STM32F7)
ADCx_CLK_ENABLE();
-#elif defined(STM32H7)
+ #elif defined(STM32H7)
__HAL_RCC_ADC3_CLK_ENABLE();
__HAL_RCC_ADC_CONFIG(RCC_ADCCLKSOURCE_CLKP);
-#elif defined(STM32L4)
+ #elif defined(STM32L4)
__HAL_RCC_ADC_CLK_ENABLE();
-#else
+ #else
#error Unsupported processor
-#endif
+ #endif
}
STATIC void adcx_init_periph(ADC_HandleTypeDef *adch, uint32_t resolution) {
adcx_clock_enable();
- adch->Instance = ADCx;
- adch->Init.Resolution = resolution;
- adch->Init.ContinuousConvMode = DISABLE;
+ adch->Instance = ADCx;
+ adch->Init.Resolution = resolution;
+ adch->Init.ContinuousConvMode = DISABLE;
adch->Init.DiscontinuousConvMode = DISABLE;
#if !defined(STM32F0)
- adch->Init.NbrOfDiscConversion = 0;
- adch->Init.NbrOfConversion = 1;
+ adch->Init.NbrOfDiscConversion = 0;
+ adch->Init.NbrOfConversion = 1;
#endif
- adch->Init.EOCSelection = ADC_EOC_SINGLE_CONV;
- adch->Init.ExternalTrigConv = ADC_SOFTWARE_START;
- adch->Init.ExternalTrigConvEdge = ADC_EXTERNALTRIGCONVEDGE_NONE;
+ adch->Init.EOCSelection = ADC_EOC_SINGLE_CONV;
+ adch->Init.ExternalTrigConv = ADC_SOFTWARE_START;
+ adch->Init.ExternalTrigConvEdge = ADC_EXTERNALTRIGCONVEDGE_NONE;
#if defined(STM32F0)
- adch->Init.ClockPrescaler = ADC_CLOCK_SYNC_PCLK_DIV4; // 12MHz
- adch->Init.ScanConvMode = DISABLE;
- adch->Init.DataAlign = ADC_DATAALIGN_RIGHT;
+ adch->Init.ClockPrescaler = ADC_CLOCK_SYNC_PCLK_DIV4; // 12MHz
+ adch->Init.ScanConvMode = DISABLE;
+ adch->Init.DataAlign = ADC_DATAALIGN_RIGHT;
adch->Init.DMAContinuousRequests = DISABLE;
- adch->Init.SamplingTimeCommon = ADC_SAMPLETIME_55CYCLES_5; // ~4uS
+ adch->Init.SamplingTimeCommon = ADC_SAMPLETIME_55CYCLES_5; // ~4uS
#elif defined(STM32F4) || defined(STM32F7)
- adch->Init.ClockPrescaler = ADC_CLOCK_SYNC_PCLK_DIV2;
- adch->Init.ScanConvMode = DISABLE;
- adch->Init.DataAlign = ADC_DATAALIGN_RIGHT;
+ adch->Init.ClockPrescaler = ADC_CLOCK_SYNC_PCLK_DIV2;
+ adch->Init.ScanConvMode = DISABLE;
+ adch->Init.DataAlign = ADC_DATAALIGN_RIGHT;
adch->Init.DMAContinuousRequests = DISABLE;
#elif defined(STM32H7)
- adch->Init.ClockPrescaler = ADC_CLOCK_SYNC_PCLK_DIV4;
- adch->Init.ScanConvMode = DISABLE;
- adch->Init.LowPowerAutoWait = DISABLE;
- adch->Init.Overrun = ADC_OVR_DATA_OVERWRITTEN;
- adch->Init.OversamplingMode = DISABLE;
- adch->Init.LeftBitShift = ADC_LEFTBITSHIFT_NONE;
+ adch->Init.ClockPrescaler = ADC_CLOCK_SYNC_PCLK_DIV4;
+ adch->Init.ScanConvMode = DISABLE;
+ adch->Init.LowPowerAutoWait = DISABLE;
+ adch->Init.Overrun = ADC_OVR_DATA_OVERWRITTEN;
+ adch->Init.OversamplingMode = DISABLE;
+ adch->Init.LeftBitShift = ADC_LEFTBITSHIFT_NONE;
adch->Init.ConversionDataManagement = ADC_CONVERSIONDATA_DR;
#elif defined(STM32L4)
- adch->Init.ClockPrescaler = ADC_CLOCK_ASYNC_DIV1;
- adch->Init.ScanConvMode = ADC_SCAN_DISABLE;
- adch->Init.LowPowerAutoWait = DISABLE;
- adch->Init.Overrun = ADC_OVR_DATA_PRESERVED;
- adch->Init.OversamplingMode = DISABLE;
- adch->Init.DataAlign = ADC_DATAALIGN_RIGHT;
+ adch->Init.ClockPrescaler = ADC_CLOCK_ASYNC_DIV1;
+ adch->Init.ScanConvMode = ADC_SCAN_DISABLE;
+ adch->Init.LowPowerAutoWait = DISABLE;
+ adch->Init.Overrun = ADC_OVR_DATA_PRESERVED;
+ adch->Init.OversamplingMode = DISABLE;
+ adch->Init.DataAlign = ADC_DATAALIGN_RIGHT;
adch->Init.DMAContinuousRequests = DISABLE;
#else
#error Unsupported processor
@@ -301,14 +301,13 @@
adcx_init_periph(&adc_obj->handle, ADC_RESOLUTION_12B);
-#if defined(STM32L4) && defined(ADC_DUALMODE_REGSIMULT_INJECSIMULT)
+ #if defined(STM32L4) && defined(ADC_DUALMODE_REGSIMULT_INJECSIMULT)
ADC_MultiModeTypeDef multimode;
multimode.Mode = ADC_MODE_INDEPENDENT;
- if (HAL_ADCEx_MultiModeConfigChannel(&adc_obj->handle, &multimode) != HAL_OK)
- {
+ if (HAL_ADCEx_MultiModeConfigChannel(&adc_obj->handle, &multimode) != HAL_OK) {
mp_raise_msg_varg(&mp_type_ValueError, "Can not set multimode on ADC1 channel: %d", adc_obj->channel);
}
-#endif
+ #endif
}
STATIC void adc_config_channel(ADC_HandleTypeDef *adc_handle, uint32_t channel) {
@@ -324,11 +323,11 @@
#endif
sConfig.Channel = channel;
-#if defined(STM32F0)
+ #if defined(STM32F0)
sConfig.SamplingTime = ADC_SAMPLETIME_55CYCLES_5;
-#elif defined(STM32F4) || defined(STM32F7)
+ #elif defined(STM32F4) || defined(STM32F7)
sConfig.SamplingTime = ADC_SAMPLETIME_15CYCLES;
-#elif defined(STM32H7)
+ #elif defined(STM32H7)
if (__HAL_ADC_IS_CHANNEL_INTERNAL(channel)) {
sConfig.SamplingTime = ADC_SAMPLETIME_810CYCLES_5;
} else {
@@ -338,7 +337,7 @@
sConfig.OffsetNumber = ADC_OFFSET_NONE;
sConfig.OffsetRightShift = DISABLE;
sConfig.OffsetSignedSaturation = DISABLE;
-#elif defined(STM32L4)
+ #elif defined(STM32L4)
if (__HAL_ADC_IS_CHANNEL_INTERNAL(channel)) {
sConfig.SamplingTime = ADC_SAMPLETIME_247CYCLES_5;
} else {
@@ -347,9 +346,9 @@
sConfig.SingleDiff = ADC_SINGLE_ENDED;
sConfig.OffsetNumber = ADC_OFFSET_NONE;
sConfig.Offset = 0;
-#else
+ #else
#error Unsupported processor
-#endif
+ #endif
#if defined(STM32F0)
// On the STM32F0 we must select only one channel at a time to sample, so clear all
@@ -522,13 +521,13 @@
HAL_ADC_Start(&self->handle);
} else {
// for subsequent samples we can just set the "start sample" bit
-#if defined(STM32F4) || defined(STM32F7)
+ #if defined(STM32F4) || defined(STM32F7)
ADCx->CR2 |= (uint32_t)ADC_CR2_SWSTART;
-#elif defined(STM32F0) || defined(STM32H7) || defined(STM32L4)
+ #elif defined(STM32F0) || defined(STM32H7) || defined(STM32L4)
SET_BIT(ADCx->CR, ADC_CR_ADSTART);
-#else
+ #else
#error Unsupported processor
-#endif
+ #endif
}
// wait for sample to complete
@@ -675,7 +674,7 @@
.name = MP_QSTR_ADC,
.print = adc_print,
.make_new = adc_make_new,
- .locals_dict = (mp_obj_dict_t*)&adc_locals_dict,
+ .locals_dict = (mp_obj_dict_t *)&adc_locals_dict,
};
/******************************************************************************/
@@ -690,13 +689,23 @@
switch (resolution) {
#if !defined(STM32H7)
- case 6: resolution = ADC_RESOLUTION_6B; break;
+ case 6:
+ resolution = ADC_RESOLUTION_6B;
+ break;
#endif
- case 8: resolution = ADC_RESOLUTION_8B; break;
- case 10: resolution = ADC_RESOLUTION_10B; break;
- case 12: resolution = ADC_RESOLUTION_12B; break;
+ case 8:
+ resolution = ADC_RESOLUTION_8B;
+ break;
+ case 10:
+ resolution = ADC_RESOLUTION_10B;
+ break;
+ case 12:
+ resolution = ADC_RESOLUTION_12B;
+ break;
#if defined(STM32H7)
- case 16: resolution = ADC_RESOLUTION_16B; break;
+ case 16:
+ resolution = ADC_RESOLUTION_16B;
+ break;
#endif
default:
mp_raise_msg_varg(&mp_type_ValueError, "resolution %d not supported", resolution);
@@ -722,12 +731,16 @@
switch (res_reg) {
#if !defined(STM32H7)
- case ADC_RESOLUTION_6B: return 6;
+ case ADC_RESOLUTION_6B:
+ return 6;
#endif
- case ADC_RESOLUTION_8B: return 8;
- case ADC_RESOLUTION_10B: return 10;
+ case ADC_RESOLUTION_8B:
+ return 8;
+ case ADC_RESOLUTION_10B:
+ return 10;
#if defined(STM32H7)
- case ADC_RESOLUTION_16B: return 16;
+ case ADC_RESOLUTION_16B:
+ return 16;
#endif
}
return 12;
@@ -782,7 +795,7 @@
mp_int_t res = mp_obj_get_int(args[0]);
uint32_t en_mask = 0xffffffff;
if (n_args > 1) {
- en_mask = mp_obj_get_int(args[1]);
+ en_mask = mp_obj_get_int(args[1]);
}
adc_init_all(o, res, en_mask);
@@ -803,7 +816,7 @@
float data = adc_read_core_temp_float(&self->handle);
return mp_obj_new_float(data);
#else
- int data = adc_read_core_temp(&self->handle);
+ int data = adc_read_core_temp(&self->handle);
return mp_obj_new_int(data);
#endif
}
@@ -819,7 +832,7 @@
STATIC mp_obj_t adc_all_read_core_vref(mp_obj_t self_in) {
pyb_adc_all_obj_t *self = MP_OBJ_TO_PTR(self_in);
- float data = adc_read_core_vref(&self->handle);
+ float data = adc_read_core_vref(&self->handle);
return mp_obj_new_float(data);
}
STATIC MP_DEFINE_CONST_FUN_OBJ_1(adc_all_read_core_vref_obj, adc_all_read_core_vref);
@@ -835,11 +848,11 @@
STATIC const mp_rom_map_elem_t adc_all_locals_dict_table[] = {
{ MP_ROM_QSTR(MP_QSTR_read_channel), MP_ROM_PTR(&adc_all_read_channel_obj) },
{ MP_ROM_QSTR(MP_QSTR_read_core_temp), MP_ROM_PTR(&adc_all_read_core_temp_obj) },
-#if MICROPY_PY_BUILTINS_FLOAT
+ #if MICROPY_PY_BUILTINS_FLOAT
{ MP_ROM_QSTR(MP_QSTR_read_core_vbat), MP_ROM_PTR(&adc_all_read_core_vbat_obj) },
{ MP_ROM_QSTR(MP_QSTR_read_core_vref), MP_ROM_PTR(&adc_all_read_core_vref_obj) },
{ MP_ROM_QSTR(MP_QSTR_read_vref), MP_ROM_PTR(&adc_all_read_vref_obj) },
-#endif
+ #endif
};
STATIC MP_DEFINE_CONST_DICT(adc_all_locals_dict, adc_all_locals_dict_table);
@@ -848,7 +861,7 @@
{ &mp_type_type },
.name = MP_QSTR_ADCAll,
.make_new = adc_all_make_new,
- .locals_dict = (mp_obj_dict_t*)&adc_all_locals_dict,
+ .locals_dict = (mp_obj_dict_t *)&adc_all_locals_dict,
};
#endif // MICROPY_HW_ENABLE_ADC
diff --git a/ports/stm32/boards/PYBD_SF2/manifest.py b/ports/stm32/boards/PYBD_SF2/manifest.py
index 48cc2ce..3819aa0 100644
--- a/ports/stm32/boards/PYBD_SF2/manifest.py
+++ b/ports/stm32/boards/PYBD_SF2/manifest.py
@@ -1,2 +1,2 @@
-include('$(PORT_DIR)/boards/manifest.py')
-include('$(MPY_DIR)/extmod/webrepl/manifest.py')
+include("$(PORT_DIR)/boards/manifest.py")
+include("$(MPY_DIR)/extmod/webrepl/manifest.py")
diff --git a/ports/stm32/boards/STM32F4DISC/staccel.py b/ports/stm32/boards/STM32F4DISC/staccel.py
index 2f2561d..af77720 100644
--- a/ports/stm32/boards/STM32F4DISC/staccel.py
+++ b/ports/stm32/boards/STM32F4DISC/staccel.py
@@ -18,29 +18,30 @@
from pyb import Pin
from pyb import SPI
-READWRITE_CMD = const(0x80)
+READWRITE_CMD = const(0x80)
MULTIPLEBYTE_CMD = const(0x40)
-WHO_AM_I_ADDR = const(0x0f)
+WHO_AM_I_ADDR = const(0x0F)
OUT_X_ADDR = const(0x29)
-OUT_Y_ADDR = const(0x2b)
-OUT_Z_ADDR = const(0x2d)
-OUT_T_ADDR = const(0x0c)
+OUT_Y_ADDR = const(0x2B)
+OUT_Z_ADDR = const(0x2D)
+OUT_T_ADDR = const(0x0C)
-LIS302DL_WHO_AM_I_VAL = const(0x3b)
+LIS302DL_WHO_AM_I_VAL = const(0x3B)
LIS302DL_CTRL_REG1_ADDR = const(0x20)
# Configuration for 100Hz sampling rate, +-2g range
LIS302DL_CONF = const(0b01000111)
-LIS3DSH_WHO_AM_I_VAL = const(0x3f)
+LIS3DSH_WHO_AM_I_VAL = const(0x3F)
LIS3DSH_CTRL_REG4_ADDR = const(0x20)
LIS3DSH_CTRL_REG5_ADDR = const(0x24)
# Configuration for 100Hz sampling rate, +-2g range
LIS3DSH_CTRL_REG4_CONF = const(0b01100111)
LIS3DSH_CTRL_REG5_CONF = const(0b00000000)
+
class STAccel:
def __init__(self):
- self.cs_pin = Pin('PE3', Pin.OUT_PP, Pin.PULL_NONE)
+ self.cs_pin = Pin("PE3", Pin.OUT_PP, Pin.PULL_NONE)
self.cs_pin.high()
self.spi = SPI(1, SPI.MASTER, baudrate=328125, polarity=0, phase=1, bits=8)
@@ -54,7 +55,7 @@
self.write_bytes(LIS3DSH_CTRL_REG5_ADDR, bytearray([LIS3DSH_CTRL_REG5_CONF]))
self.sensitivity = 0.06 * 256
else:
- raise Exception('LIS302DL or LIS3DSH accelerometer not present')
+ raise Exception("LIS302DL or LIS3DSH accelerometer not present")
def convert_raw_to_g(self, x):
if x & 0x80:
@@ -68,7 +69,7 @@
addr |= READWRITE_CMD
self.cs_pin.low()
self.spi.send(addr)
- #buf = self.spi.send_recv(bytearray(nbytes * [0])) # read data, MSB first
+ # buf = self.spi.send_recv(bytearray(nbytes * [0])) # read data, MSB first
buf = self.spi.recv(nbytes)
self.cs_pin.high()
return buf
diff --git a/ports/stm32/boards/make-pins.py b/ports/stm32/boards/make-pins.py
index 3819b47..692387f 100755
--- a/ports/stm32/boards/make-pins.py
+++ b/ports/stm32/boards/make-pins.py
@@ -9,52 +9,54 @@
# Must have matching entries in AF_FN_* enum in ../pin_defs_stm32.h
SUPPORTED_FN = {
- 'TIM' : ['CH1', 'CH2', 'CH3', 'CH4',
- 'CH1N', 'CH2N', 'CH3N', 'CH1_ETR', 'ETR', 'BKIN'],
- 'I2C' : ['SDA', 'SCL'],
- 'I2S' : ['CK', 'MCK', 'SD', 'WS', 'EXTSD'],
- 'USART' : ['RX', 'TX', 'CTS', 'RTS', 'CK'],
- 'UART' : ['RX', 'TX', 'CTS', 'RTS'],
- 'SPI' : ['NSS', 'SCK', 'MISO', 'MOSI'],
- 'SDMMC' : ['CK', 'CMD', 'D0', 'D1', 'D2', 'D3'],
- 'CAN' : ['TX', 'RX'],
+ "TIM": ["CH1", "CH2", "CH3", "CH4", "CH1N", "CH2N", "CH3N", "CH1_ETR", "ETR", "BKIN"],
+ "I2C": ["SDA", "SCL"],
+ "I2S": ["CK", "MCK", "SD", "WS", "EXTSD"],
+ "USART": ["RX", "TX", "CTS", "RTS", "CK"],
+ "UART": ["RX", "TX", "CTS", "RTS"],
+ "SPI": ["NSS", "SCK", "MISO", "MOSI"],
+ "SDMMC": ["CK", "CMD", "D0", "D1", "D2", "D3"],
+ "CAN": ["TX", "RX"],
}
CONDITIONAL_VAR = {
- 'I2C' : 'MICROPY_HW_I2C{num}_SCL',
- 'I2S' : 'MICROPY_HW_ENABLE_I2S{num}',
- 'SPI' : 'MICROPY_HW_SPI{num}_SCK',
- 'UART' : 'MICROPY_HW_UART{num}_TX',
- 'USART' : 'MICROPY_HW_UART{num}_TX',
- 'SDMMC' : 'MICROPY_HW_SDMMC{num}_CK',
- 'CAN' : 'MICROPY_HW_CAN{num}_TX',
+ "I2C": "MICROPY_HW_I2C{num}_SCL",
+ "I2S": "MICROPY_HW_ENABLE_I2S{num}",
+ "SPI": "MICROPY_HW_SPI{num}_SCK",
+ "UART": "MICROPY_HW_UART{num}_TX",
+ "USART": "MICROPY_HW_UART{num}_TX",
+ "SDMMC": "MICROPY_HW_SDMMC{num}_CK",
+ "CAN": "MICROPY_HW_CAN{num}_TX",
}
+
def parse_port_pin(name_str):
"""Parses a string and returns a (port-num, pin-num) tuple."""
if len(name_str) < 3:
raise ValueError("Expecting pin name to be at least 3 charcters.")
- if name_str[0] != 'P':
+ if name_str[0] != "P":
raise ValueError("Expecting pin name to start with P")
- if name_str[1] < 'A' or name_str[1] > 'K':
+ if name_str[1] < "A" or name_str[1] > "K":
raise ValueError("Expecting pin port to be between A and K")
- port = ord(name_str[1]) - ord('A')
+ port = ord(name_str[1]) - ord("A")
pin_str = name_str[2:]
if not pin_str.isdigit():
raise ValueError("Expecting numeric pin number.")
return (port, int(pin_str))
+
def split_name_num(name_num):
num = None
for num_idx in range(len(name_num) - 1, -1, -1):
if not name_num[num_idx].isdigit():
- name = name_num[0:num_idx + 1]
- num_str = name_num[num_idx + 1:]
+ name = name_num[0 : num_idx + 1]
+ num_str = name_num[num_idx + 1 :]
if len(num_str) > 0:
num = int(num_str)
break
return name, num
+
def conditional_var(name_num):
# Try the specific instance first. For example, if name_num is UART4_RX
# then try UART4 first, and then try UART second.
@@ -66,19 +68,21 @@
var.append(CONDITIONAL_VAR[name_num])
return var
+
def print_conditional_if(cond_var, file=None):
if cond_var:
cond_str = []
for var in cond_var:
- if var.find('ENABLE') >= 0:
- cond_str.append('(defined({0}) && {0})'.format(var))
+ if var.find("ENABLE") >= 0:
+ cond_str.append("(defined({0}) && {0})".format(var))
else:
- cond_str.append('defined({0})'.format(var))
- print('#if ' + ' || '.join(cond_str), file=file)
+ cond_str.append("defined({0})".format(var))
+ print("#if " + " || ".join(cond_str), file=file)
+
def print_conditional_endif(cond_var, file=None):
if cond_var:
- print('#endif', file=file)
+ print("#endif", file=file)
class AlternateFunction(object):
@@ -88,16 +92,16 @@
self.idx = idx
# Special case. We change I2S2ext_SD into I2S2_EXTSD so that it parses
# the same way the other peripherals do.
- af_str = af_str.replace('ext_', '_EXT')
+ af_str = af_str.replace("ext_", "_EXT")
self.af_str = af_str
- self.func = ''
+ self.func = ""
self.fn_num = None
- self.pin_type = ''
+ self.pin_type = ""
self.supported = False
- af_words = af_str.split('_', 1)
+ af_words = af_str.split("_", 1)
self.func, self.fn_num = split_name_num(af_words[0])
if len(af_words) > 1:
self.pin_type = af_words[1]
@@ -113,25 +117,28 @@
"""Returns the numbered function (i.e. USART6) for this AF."""
if self.fn_num is None:
return self.func
- return '{:s}{:d}'.format(self.func, self.fn_num)
+ return "{:s}{:d}".format(self.func, self.fn_num)
def mux_name(self):
- return 'AF{:d}_{:s}'.format(self.idx, self.ptr())
+ return "AF{:d}_{:s}".format(self.idx, self.ptr())
def print(self):
"""Prints the C representation of this AF."""
cond_var = None
if self.supported:
- cond_var = conditional_var('{}{}'.format(self.func, self.fn_num))
+ cond_var = conditional_var("{}{}".format(self.func, self.fn_num))
print_conditional_if(cond_var)
- print(' AF', end='')
+ print(" AF", end="")
else:
- print(' //', end='')
+ print(" //", end="")
fn_num = self.fn_num
if fn_num is None:
fn_num = 0
- print('({:2d}, {:8s}, {:2d}, {:10s}, {:8s}), // {:s}'.format(self.idx,
- self.func, fn_num, self.pin_type, self.ptr(), self.af_str))
+ print(
+ "({:2d}, {:8s}, {:2d}, {:10s}, {:8s}), // {:s}".format(
+ self.idx, self.func, fn_num, self.pin_type, self.ptr(), self.af_str
+ )
+ )
print_conditional_endif(cond_var)
def qstr_list(self):
@@ -151,10 +158,10 @@
self.board_pin = False
def port_letter(self):
- return chr(self.port + ord('A'))
+ return chr(self.port + ord("A"))
def cpu_pin_name(self):
- return '{:s}{:d}'.format(self.port_letter(), self.pin)
+ return "{:s}{:d}".format(self.port_letter(), self.pin)
def is_board_pin(self):
return self.board_pin
@@ -163,16 +170,16 @@
self.board_pin = True
def parse_adc(self, adc_str):
- if (adc_str[:3] != 'ADC'):
+ if adc_str[:3] != "ADC":
return
- if adc_str.find('_INP') != -1:
+ if adc_str.find("_INP") != -1:
# STM32H7xx, entries have the form: ADCxx_IN[PN]yy/...
# for now just pick the entry with the most ADC periphs
adc, channel = None, None
- for ss in adc_str.split('/'):
- if ss.find('_INP') != -1:
- a, c = ss.split('_')
+ for ss in adc_str.split("/"):
+ if ss.find("_INP") != -1:
+ a, c = ss.split("_")
if adc is None or len(a) > len(adc):
adc, channel = a, c
if adc is None:
@@ -180,12 +187,12 @@
channel = channel[3:]
else:
# all other MCUs, entries have the form: ADCxx_INyy
- adc, channel = adc_str.split('_')
+ adc, channel = adc_str.split("_")
channel = channel[2:]
for idx in range(3, len(adc)):
- adc_num = int(adc[idx]) # 1, 2, or 3
- self.adc_num |= (1 << (adc_num - 1))
+ adc_num = int(adc[idx]) # 1, 2, or 3
+ self.adc_num |= 1 << (adc_num - 1)
self.adc_channel = int(channel)
def parse_af(self, af_idx, af_strs_in):
@@ -193,7 +200,7 @@
return
# If there is a slash, then the slash separates 2 aliases for the
# same alternate function.
- af_strs = af_strs_in.split('/')
+ af_strs = af_strs_in.split("/")
for af_str in af_strs:
alt_fn = AlternateFunction(af_idx, af_str)
self.alt_fn.append(alt_fn)
@@ -202,43 +209,49 @@
def alt_fn_name(self, null_if_0=False):
if null_if_0 and self.alt_fn_count == 0:
- return 'NULL'
- return 'pin_{:s}_af'.format(self.cpu_pin_name())
+ return "NULL"
+ return "pin_{:s}_af".format(self.cpu_pin_name())
def adc_num_str(self):
- str = ''
- for adc_num in range(1,4):
+ str = ""
+ for adc_num in range(1, 4):
if self.adc_num & (1 << (adc_num - 1)):
if len(str) > 0:
- str += ' | '
- str += 'PIN_ADC'
- str += chr(ord('0') + adc_num)
+ str += " | "
+ str += "PIN_ADC"
+ str += chr(ord("0") + adc_num)
if len(str) == 0:
- str = '0'
+ str = "0"
return str
def print(self):
if self.alt_fn_count == 0:
- print("// ", end='')
- print('const pin_af_obj_t {:s}[] = {{'.format(self.alt_fn_name()))
+ print("// ", end="")
+ print("const pin_af_obj_t {:s}[] = {{".format(self.alt_fn_name()))
for alt_fn in self.alt_fn:
alt_fn.print()
if self.alt_fn_count == 0:
- print("// ", end='')
- print('};')
- print('')
- print('const pin_obj_t pin_{:s}_obj = PIN({:s}, {:d}, {:s}, {:s}, {:d});'.format(
- self.cpu_pin_name(), self.port_letter(), self.pin,
- self.alt_fn_name(null_if_0=True),
- self.adc_num_str(), self.adc_channel))
- print('')
+ print("// ", end="")
+ print("};")
+ print("")
+ print(
+ "const pin_obj_t pin_{:s}_obj = PIN({:s}, {:d}, {:s}, {:s}, {:d});".format(
+ self.cpu_pin_name(),
+ self.port_letter(),
+ self.pin,
+ self.alt_fn_name(null_if_0=True),
+ self.adc_num_str(),
+ self.adc_channel,
+ )
+ )
+ print("")
def print_header(self, hdr_file):
n = self.cpu_pin_name()
- hdr_file.write('extern const pin_obj_t pin_{:s}_obj;\n'.format(n))
- hdr_file.write('#define pin_{:s} (&pin_{:s}_obj)\n'.format(n, n))
+ hdr_file.write("extern const pin_obj_t pin_{:s}_obj;\n".format(n))
+ hdr_file.write("#define pin_{:s} (&pin_{:s}_obj)\n".format(n, n))
if self.alt_fn_count > 0:
- hdr_file.write('extern const pin_af_obj_t pin_{:s}_af[];\n'.format(n))
+ hdr_file.write("extern const pin_af_obj_t pin_{:s}_af[];\n".format(n))
def qstr_list(self):
result = []
@@ -249,9 +262,8 @@
class NamedPin(object):
-
def __init__(self, name, pin):
- if name.startswith('-'):
+ if name.startswith("-"):
self._is_hidden = True
self._name = name[1:]
else:
@@ -270,10 +282,9 @@
class Pins(object):
-
def __init__(self):
- self.cpu_pins = [] # list of NamedPin objects
- self.board_pins = [] # list of NamedPin objects
+ self.cpu_pins = [] # list of NamedPin objects
+ self.board_pins = [] # list of NamedPin objects
def find_pin(self, port_num, pin_num):
for named_pin in self.cpu_pins:
@@ -282,7 +293,7 @@
return pin
def parse_af_file(self, filename, pinname_col, af_col):
- with open(filename, 'r') as csvfile:
+ with open(filename, "r") as csvfile:
rows = csv.reader(csvfile)
for row in rows:
try:
@@ -298,7 +309,7 @@
self.cpu_pins.append(NamedPin(pin.cpu_pin_name(), pin))
def parse_board_file(self, filename):
- with open(filename, 'r') as csvfile:
+ with open(filename, "r") as csvfile:
rows = csv.reader(csvfile)
for row in rows:
try:
@@ -308,64 +319,80 @@
pin = self.find_pin(port_num, pin_num)
if pin:
pin.set_is_board_pin()
- if row[0]: # Only add board pins that have a name
+ if row[0]: # Only add board pins that have a name
self.board_pins.append(NamedPin(row[0], pin))
def print_named(self, label, named_pins):
- print('STATIC const mp_rom_map_elem_t pin_{:s}_pins_locals_dict_table[] = {{'.format(label))
+ print(
+ "STATIC const mp_rom_map_elem_t pin_{:s}_pins_locals_dict_table[] = {{".format(label)
+ )
for named_pin in named_pins:
pin = named_pin.pin()
if pin.is_board_pin() and not named_pin.is_hidden():
- print(' {{ MP_ROM_QSTR(MP_QSTR_{:s}), MP_ROM_PTR(&pin_{:s}_obj) }},'.format(named_pin.name(), pin.cpu_pin_name()))
- print('};')
- print('MP_DEFINE_CONST_DICT(pin_{:s}_pins_locals_dict, pin_{:s}_pins_locals_dict_table);'.format(label, label))
+ print(
+ " {{ MP_ROM_QSTR(MP_QSTR_{:s}), MP_ROM_PTR(&pin_{:s}_obj) }},".format(
+ named_pin.name(), pin.cpu_pin_name()
+ )
+ )
+ print("};")
+ print(
+ "MP_DEFINE_CONST_DICT(pin_{:s}_pins_locals_dict, pin_{:s}_pins_locals_dict_table);".format(
+ label, label
+ )
+ )
def print(self):
for named_pin in self.cpu_pins:
pin = named_pin.pin()
if pin.is_board_pin():
pin.print()
- self.print_named('cpu', self.cpu_pins)
- print('')
- self.print_named('board', self.board_pins)
+ self.print_named("cpu", self.cpu_pins)
+ print("")
+ self.print_named("board", self.board_pins)
def print_adc(self, adc_num):
- print('')
- print('const pin_obj_t * const pin_adc{:d}[] = {{'.format(adc_num))
+ print("")
+ print("const pin_obj_t * const pin_adc{:d}[] = {{".format(adc_num))
for channel in range(17):
if channel == 16:
- print('#if defined(STM32L4)')
+ print("#if defined(STM32L4)")
adc_found = False
for named_pin in self.cpu_pins:
pin = named_pin.pin()
- if (pin.is_board_pin() and
- (pin.adc_num & (1 << (adc_num - 1))) and (pin.adc_channel == channel)):
- print(' &pin_{:s}_obj, // {:d}'.format(pin.cpu_pin_name(), channel))
+ if (
+ pin.is_board_pin()
+ and (pin.adc_num & (1 << (adc_num - 1)))
+ and (pin.adc_channel == channel)
+ ):
+ print(" &pin_{:s}_obj, // {:d}".format(pin.cpu_pin_name(), channel))
adc_found = True
break
if not adc_found:
- print(' NULL, // {:d}'.format(channel))
+ print(" NULL, // {:d}".format(channel))
if channel == 16:
- print('#endif')
- print('};')
-
+ print("#endif")
+ print("};")
def print_header(self, hdr_filename, obj_decls):
- with open(hdr_filename, 'wt') as hdr_file:
+ with open(hdr_filename, "wt") as hdr_file:
if obj_decls:
for named_pin in self.cpu_pins:
pin = named_pin.pin()
if pin.is_board_pin():
pin.print_header(hdr_file)
- hdr_file.write('extern const pin_obj_t * const pin_adc1[];\n')
- hdr_file.write('extern const pin_obj_t * const pin_adc2[];\n')
- hdr_file.write('extern const pin_obj_t * const pin_adc3[];\n')
+ hdr_file.write("extern const pin_obj_t * const pin_adc1[];\n")
+ hdr_file.write("extern const pin_obj_t * const pin_adc2[];\n")
+ hdr_file.write("extern const pin_obj_t * const pin_adc3[];\n")
# provide #define's mapping board to cpu name
for named_pin in self.board_pins:
- hdr_file.write("#define pyb_pin_{:s} pin_{:s}\n".format(named_pin.name(), named_pin.pin().cpu_pin_name()))
+ hdr_file.write(
+ "#define pyb_pin_{:s} pin_{:s}\n".format(
+ named_pin.name(), named_pin.pin().cpu_pin_name()
+ )
+ )
def print_qstr(self, qstr_filename):
- with open(qstr_filename, 'wt') as qstr_file:
+ with open(qstr_filename, "wt") as qstr_file:
qstr_set = set([])
for named_pin in self.cpu_pins:
pin = named_pin.pin()
@@ -377,15 +404,15 @@
qstr_set |= set([named_pin.name()])
for qstr in sorted(qstr_set):
cond_var = None
- if qstr.startswith('AF'):
- af_words = qstr.split('_')
+ if qstr.startswith("AF"):
+ af_words = qstr.split("_")
cond_var = conditional_var(af_words[1])
print_conditional_if(cond_var, file=qstr_file)
- print('Q({})'.format(qstr), file=qstr_file)
+ print("Q({})".format(qstr), file=qstr_file)
print_conditional_endif(cond_var, file=qstr_file)
def print_af_hdr(self, af_const_filename):
- with open(af_const_filename, 'wt') as af_const_file:
+ with open(af_const_filename, "wt") as af_const_file:
af_hdr_set = set([])
mux_name_width = 0
for named_pin in self.cpu_pins:
@@ -398,36 +425,37 @@
if len(mux_name) > mux_name_width:
mux_name_width = len(mux_name)
for mux_name in sorted(af_hdr_set):
- af_words = mux_name.split('_') # ex mux_name: AF9_I2C2
+ af_words = mux_name.split("_") # ex mux_name: AF9_I2C2
cond_var = conditional_var(af_words[1])
print_conditional_if(cond_var, file=af_const_file)
- key = 'MP_ROM_QSTR(MP_QSTR_{}),'.format(mux_name)
- val = 'MP_ROM_INT(GPIO_{})'.format(mux_name)
- print(' { %-*s %s },' % (mux_name_width + 26, key, val),
- file=af_const_file)
+ key = "MP_ROM_QSTR(MP_QSTR_{}),".format(mux_name)
+ val = "MP_ROM_INT(GPIO_{})".format(mux_name)
+ print(" { %-*s %s }," % (mux_name_width + 26, key, val), file=af_const_file)
print_conditional_endif(cond_var, file=af_const_file)
def print_af_defs(self, af_defs_filename, cmp_strings):
- with open(af_defs_filename, 'wt') as af_defs_file:
+ with open(af_defs_filename, "wt") as af_defs_file:
STATIC_AF_TOKENS = {}
for named_pin in self.board_pins:
for af in named_pin.pin().alt_fn:
func = "%s%d" % (af.func, af.fn_num) if af.fn_num else af.func
- pin_type = (af.pin_type or "NULL").split('(')[0]
+ pin_type = (af.pin_type or "NULL").split("(")[0]
tok = "#define STATIC_AF_%s_%s(pin_obj) ( \\" % (func, pin_type)
if tok not in STATIC_AF_TOKENS:
STATIC_AF_TOKENS[tok] = []
if cmp_strings:
pin_name = named_pin.pin().cpu_pin_name()
- cmp_str = ' ((strcmp( #pin_obj , "(&pin_%s_obj)") ' \
- ' & strcmp( #pin_obj , "((&pin_%s_obj))")) == 0) ? (%d) : \\' % (
- pin_name, pin_name, af.idx
- )
+ cmp_str = (
+ ' ((strcmp( #pin_obj , "(&pin_%s_obj)") '
+ ' & strcmp( #pin_obj , "((&pin_%s_obj))")) == 0) ? (%d) : \\'
+ % (pin_name, pin_name, af.idx)
+ )
else:
- cmp_str = ' ((pin_obj) == (pin_%s)) ? (%d) : \\' % (
- named_pin.pin().cpu_pin_name(), af.idx
- )
+ cmp_str = " ((pin_obj) == (pin_%s)) ? (%d) : \\" % (
+ named_pin.pin().cpu_pin_name(),
+ af.idx,
+ )
STATIC_AF_TOKENS[tok].append(cmp_str)
for tok, pins in STATIC_AF_TOKENS.items():
@@ -436,48 +464,49 @@
print(" (0xffffffffffffffffULL))\n", file=af_defs_file)
def print_af_py(self, af_py_filename):
- with open(af_py_filename, 'wt') as af_py_file:
- print('PINS_AF = (', file=af_py_file)
+ with open(af_py_filename, "wt") as af_py_file:
+ print("PINS_AF = (", file=af_py_file)
for named_pin in self.board_pins:
if named_pin.is_hidden():
continue
- print(" ('%s', " % named_pin.name(), end='', file=af_py_file)
+ print(" ('%s', " % named_pin.name(), end="", file=af_py_file)
for af in named_pin.pin().alt_fn:
if af.is_supported():
- print("(%d, '%s'), " % (af.idx, af.af_str), end='', file=af_py_file)
- print('),', file=af_py_file)
- print(')', file=af_py_file)
+ print("(%d, '%s'), " % (af.idx, af.af_str), end="", file=af_py_file)
+ print("),", file=af_py_file)
+ print(")", file=af_py_file)
def main():
parser = argparse.ArgumentParser(
prog="make-pins.py",
usage="%(prog)s [options] [command]",
- description="Generate board specific pin file"
+ description="Generate board specific pin file",
)
parser.add_argument(
- "-a", "--af",
+ "-a",
+ "--af",
dest="af_filename",
help="Specifies the alternate function file for the chip",
- default="stm32f4xx_af.csv"
+ default="stm32f4xx_af.csv",
)
parser.add_argument(
"--af-const",
dest="af_const_filename",
help="Specifies header file for alternate function constants.",
- default="build/pins_af_const.h"
+ default="build/pins_af_const.h",
)
parser.add_argument(
"--af-py",
dest="af_py_filename",
help="Specifies the filename for the python alternate function mappings.",
- default="build/pins_af.py"
+ default="build/pins_af.py",
)
parser.add_argument(
"--af-defs",
dest="af_defs_filename",
help="Specifies the filename for the alternate function defines.",
- default="build/pins_af_defs.h"
+ default="build/pins_af_defs.h",
)
parser.add_argument(
"--af-defs-cmp-strings",
@@ -486,52 +515,53 @@
action="store_true",
)
parser.add_argument(
- "-b", "--board",
- dest="board_filename",
- help="Specifies the board file",
+ "-b", "--board", dest="board_filename", help="Specifies the board file",
)
parser.add_argument(
- "-p", "--prefix",
+ "-p",
+ "--prefix",
dest="prefix_filename",
help="Specifies beginning portion of generated pins file",
- default="stm32f4xx_prefix.c"
+ default="stm32f4xx_prefix.c",
)
parser.add_argument(
- "-q", "--qstr",
+ "-q",
+ "--qstr",
dest="qstr_filename",
help="Specifies name of generated qstr header file",
- default="build/pins_qstr.h"
+ default="build/pins_qstr.h",
)
parser.add_argument(
- "-r", "--hdr",
+ "-r",
+ "--hdr",
dest="hdr_filename",
help="Specifies name of generated pin header file",
- default="build/pins.h"
+ default="build/pins.h",
)
parser.add_argument(
"--hdr-obj-decls",
dest="hdr_obj_decls",
help="Whether to include declarations for pin objects in pin header file",
- action="store_true"
+ action="store_true",
)
args = parser.parse_args(sys.argv[1:])
pins = Pins()
- print('// This file was automatically generated by make-pins.py')
- print('//')
+ print("// This file was automatically generated by make-pins.py")
+ print("//")
if args.af_filename:
- print('// --af {:s}'.format(args.af_filename))
+ print("// --af {:s}".format(args.af_filename))
pins.parse_af_file(args.af_filename, 1, 2)
if args.board_filename:
- print('// --board {:s}'.format(args.board_filename))
+ print("// --board {:s}".format(args.board_filename))
pins.parse_board_file(args.board_filename)
if args.prefix_filename:
- print('// --prefix {:s}'.format(args.prefix_filename))
- print('')
- with open(args.prefix_filename, 'r') as prefix_file:
+ print("// --prefix {:s}".format(args.prefix_filename))
+ print("")
+ with open(args.prefix_filename, "r") as prefix_file:
print(prefix_file.read())
pins.print()
pins.print_adc(1)
diff --git a/ports/stm32/boards/manifest.py b/ports/stm32/boards/manifest.py
index 41b728f..3390773 100644
--- a/ports/stm32/boards/manifest.py
+++ b/ports/stm32/boards/manifest.py
@@ -1,3 +1,3 @@
-freeze('$(MPY_DIR)/drivers/dht', 'dht.py')
-freeze('$(MPY_DIR)/drivers/display', ('lcd160cr.py', 'lcd160cr_test.py'))
-freeze('$(MPY_DIR)/drivers/onewire', 'onewire.py')
+freeze("$(MPY_DIR)/drivers/dht", "dht.py")
+freeze("$(MPY_DIR)/drivers/display", ("lcd160cr.py", "lcd160cr_test.py"))
+freeze("$(MPY_DIR)/drivers/onewire", "onewire.py")
diff --git a/ports/stm32/boards/pllvalues.py b/ports/stm32/boards/pllvalues.py
index 2d64876..59d6603 100644
--- a/ports/stm32/boards/pllvalues.py
+++ b/ports/stm32/boards/pllvalues.py
@@ -7,8 +7,11 @@
from __future__ import print_function
import re
+
class MCU:
- def __init__(self, range_sysclk, range_m, range_n, range_p, range_q, range_vco_in, range_vco_out):
+ def __init__(
+ self, range_sysclk, range_m, range_n, range_p, range_q, range_vco_in, range_vco_out
+ ):
self.range_sysclk = range_sysclk
self.range_m = range_m
self.range_n = range_n
@@ -17,6 +20,7 @@
self.range_vco_in = range_vco_in
self.range_vco_out = range_vco_out
+
mcu_default = MCU(
range_sysclk=range(2, 216 + 1, 2),
range_m=range(2, 63 + 1),
@@ -28,21 +32,23 @@
)
mcu_h7 = MCU(
- range_sysclk=range(2, 400 + 1, 2), # above 400MHz currently unsupported
+ range_sysclk=range(2, 400 + 1, 2), # above 400MHz currently unsupported
range_m=range(1, 63 + 1),
range_n=range(4, 512 + 1),
range_p=range(2, 128 + 1, 2),
range_q=range(1, 128 + 1),
range_vco_in=range(1, 16 + 1),
- range_vco_out=range(150, 960 + 1), # 150-420=medium, 192-960=wide
+ range_vco_out=range(150, 960 + 1), # 150-420=medium, 192-960=wide
)
+
def close_int(x):
return abs(x - round(x)) < 0.01
+
# original version that requires N/M to be an integer (for simplicity)
def compute_pll(hse, sys):
- for P in (2, 4, 6, 8): # allowed values of P
+ for P in (2, 4, 6, 8): # allowed values of P
Q = sys * P / 48
NbyM = sys * P / hse
# N/M and Q must be integers
@@ -69,6 +75,7 @@
# no valid values found
return None
+
# improved version that doesn't require N/M to be an integer
def compute_pll2(hse, sys, relax_pll48):
# Loop over the allowed values of P, looking for a valid PLL configuration
@@ -78,9 +85,9 @@
# VCO_OUT must be between 192MHz and 432MHz
if not sys * P in mcu.range_vco_out:
continue
- NbyM = float(sys * P) / hse # float for Python 2
+ NbyM = float(sys * P) / hse # float for Python 2
# scan M
- M_min = mcu.range_n[0] // int(round(NbyM)) # starting value
+ M_min = mcu.range_n[0] // int(round(NbyM)) # starting value
while mcu.range_vco_in[-1] * M_min < hse:
M_min += 1
# VCO_IN must be >=1MHz, but higher is better for stability so start high (low M)
@@ -94,7 +101,7 @@
# N is restricted
if N not in mcu.range_n:
continue
- Q = float(sys * P) / 48 # float for Python 2
+ Q = float(sys * P) / 48 # float for Python 2
# Q must be an integer in a set range
if close_int(Q) and round(Q) in mcu.range_q:
# found valid values
@@ -113,8 +120,9 @@
# no valid values found which give 48MHz on PLL48
return None
+
def compute_derived(hse, pll):
- hse = float(hse) # float for Python 2
+ hse = float(hse) # float for Python 2
M, N, P, Q = pll
vco_in = hse / M
vco_out = hse * N / M
@@ -122,6 +130,7 @@
pll48ck = hse / M * N / Q
return (vco_in, vco_out, pllck, pll48ck)
+
def verify_pll(hse, pll):
M, N, P, Q = pll
vco_in, vco_out, pllck, pll48ck = compute_derived(hse, pll)
@@ -140,6 +149,7 @@
assert mcu.range_vco_in[0] <= vco_in <= mcu.range_vco_in[-1]
assert mcu.range_vco_out[0] <= vco_out <= mcu.range_vco_out[-1]
+
def compute_pll_table(source_clk, relax_pll48):
valid_plls = []
for sysclk in mcu.range_sysclk:
@@ -149,22 +159,27 @@
valid_plls.append((sysclk, pll))
return valid_plls
+
def generate_c_table(hse, valid_plls):
valid_plls.sort()
- if mcu.range_sysclk[-1] <= 0xff and mcu.range_m[-1] <= 0x3f and mcu.range_p[-1] // 2 - 1 <= 0x3:
- typedef = 'uint16_t'
- sys_mask = 0xff
+ if (
+ mcu.range_sysclk[-1] <= 0xFF
+ and mcu.range_m[-1] <= 0x3F
+ and mcu.range_p[-1] // 2 - 1 <= 0x3
+ ):
+ typedef = "uint16_t"
+ sys_mask = 0xFF
m_shift = 10
- m_mask = 0x3f
+ m_mask = 0x3F
p_shift = 8
p_mask = 0x3
else:
- typedef = 'uint32_t'
- sys_mask = 0xffff
+ typedef = "uint32_t"
+ sys_mask = 0xFFFF
m_shift = 24
- m_mask = 0xff
+ m_mask = 0xFF
p_shift = 16
- p_mask = 0xff
+ p_mask = 0xFF
print("#define PLL_FREQ_TABLE_SYS(pll) ((pll) & %d)" % (sys_mask,))
print("#define PLL_FREQ_TABLE_M(pll) (((pll) >> %d) & %d)" % (m_shift, m_mask))
print("#define PLL_FREQ_TABLE_P(pll) (((((pll) >> %d) & %d) + 1) * 2)" % (p_shift, p_mask))
@@ -172,15 +187,18 @@
print("// (M, P/2-1, SYS) values for %u MHz source" % hse)
print("static const pll_freq_table_t pll_freq_table[%u] = {" % (len(valid_plls),))
for sys, (M, N, P, Q) in valid_plls:
- print(" (%u << %u) | (%u << %u) | %u," % (M, m_shift, P // 2 - 1, p_shift, sys), end='')
+ print(" (%u << %u) | (%u << %u) | %u," % (M, m_shift, P // 2 - 1, p_shift, sys), end="")
if M >= 2:
vco_in, vco_out, pllck, pll48ck = compute_derived(hse, (M, N, P, Q))
- print(" // M=%u N=%u P=%u Q=%u vco_in=%.2f vco_out=%.2f pll48=%.2f"
- % (M, N, P, Q, vco_in, vco_out, pll48ck), end=''
+ print(
+ " // M=%u N=%u P=%u Q=%u vco_in=%.2f vco_out=%.2f pll48=%.2f"
+ % (M, N, P, Q, vco_in, vco_out, pll48ck),
+ end="",
)
print()
print("};")
+
def print_table(hse, valid_plls):
print("HSE =", hse, "MHz")
print("sys : M N P Q : VCO_IN VCO_OUT PLLCK PLL48CK")
@@ -189,9 +207,10 @@
print(out_format % ((sys,) + pll + compute_derived(hse, pll)))
print("found %u valid configurations" % len(valid_plls))
+
def search_header_for_hsx_values(filename, vals):
regex_inc = re.compile(r'#include "(boards/[A-Za-z0-9_./]+)"')
- regex_def = re.compile(r'#define +(HSE_VALUE|HSI_VALUE) +\((\(uint32_t\))?([0-9]+)\)')
+ regex_def = re.compile(r"#define +(HSE_VALUE|HSI_VALUE) +\((\(uint32_t\))?([0-9]+)\)")
with open(filename) as f:
for line in f:
line = line.strip()
@@ -204,30 +223,32 @@
if m:
# Found HSE_VALUE or HSI_VALUE
val = int(m.group(3)) // 1000000
- if m.group(1) == 'HSE_VALUE':
+ if m.group(1) == "HSE_VALUE":
vals[0] = val
else:
vals[1] = val
return vals
+
def main():
global mcu
global out_format
# parse input args
import sys
+
argv = sys.argv[1:]
c_table = False
- mcu_series = 'f4'
+ mcu_series = "f4"
hse = None
hsi = None
while True:
- if argv[0] == '-c':
+ if argv[0] == "-c":
c_table = True
argv.pop(0)
- elif argv[0] == '-m':
+ elif argv[0] == "-m":
argv.pop(0)
mcu_series = argv.pop(0).lower()
else:
@@ -250,31 +271,32 @@
hse = int(argv[0])
# Select MCU parameters
- if mcu_series == 'h7':
+ if mcu_series == "h7":
mcu = mcu_h7
else:
mcu = mcu_default
# Relax constraight on PLLQ being 48MHz on F7 and H7 MCUs, which have separate PLLs for 48MHz
- relax_pll48 = mcu_series in ('f7', 'h7')
+ relax_pll48 = mcu_series in ("f7", "h7")
hse_valid_plls = compute_pll_table(hse, relax_pll48)
if hsi is not None:
hsi_valid_plls = compute_pll_table(hsi, relax_pll48)
if c_table:
- print('#if MICROPY_HW_CLK_USE_HSI')
+ print("#if MICROPY_HW_CLK_USE_HSI")
if hsi is not None:
hsi_valid_plls.append((hsi, (0, 0, 2, 0)))
generate_c_table(hsi, hsi_valid_plls)
- print('#else')
+ print("#else")
if hsi is not None:
hse_valid_plls.append((hsi, (0, 0, 2, 0)))
hse_valid_plls.append((hse, (1, 0, 2, 0)))
generate_c_table(hse, hse_valid_plls)
- print('#endif')
+ print("#endif")
else:
print_table(hse, hse_valid_plls)
+
if __name__ == "__main__":
main()
diff --git a/ports/stm32/can.c b/ports/stm32/can.c
index 1ee4649..e5fc55e 100644
--- a/ports/stm32/can.c
+++ b/ports/stm32/can.c
@@ -163,16 +163,16 @@
void can_clearfilter(pyb_can_obj_t *self, uint32_t f, uint8_t bank) {
CAN_FilterConfTypeDef filter;
- filter.FilterIdHigh = 0;
- filter.FilterIdLow = 0;
- filter.FilterMaskIdHigh = 0;
- filter.FilterMaskIdLow = 0;
+ filter.FilterIdHigh = 0;
+ filter.FilterIdLow = 0;
+ filter.FilterMaskIdHigh = 0;
+ filter.FilterMaskIdLow = 0;
filter.FilterFIFOAssignment = CAN_FILTER_FIFO0;
- filter.FilterNumber = f;
- filter.FilterMode = CAN_FILTERMODE_IDMASK;
- filter.FilterScale = CAN_FILTERSCALE_16BIT;
- filter.FilterActivation = DISABLE;
- filter.BankNumber = bank;
+ filter.FilterNumber = f;
+ filter.FilterMode = CAN_FILTERMODE_IDMASK;
+ filter.FilterScale = CAN_FILTERSCALE_16BIT;
+ filter.FilterActivation = DISABLE;
+ filter.BankNumber = bank;
HAL_CAN_ConfigFilter(NULL, &filter);
}
@@ -235,15 +235,15 @@
assert_param(IS_CAN_DLC(hcan->pTxMsg->DLC));
// Select one empty transmit mailbox
- if ((hcan->Instance->TSR&CAN_TSR_TME0) == CAN_TSR_TME0) {
+ if ((hcan->Instance->TSR & CAN_TSR_TME0) == CAN_TSR_TME0) {
transmitmailbox = CAN_TXMAILBOX_0;
rqcpflag = CAN_FLAG_RQCP0;
txokflag = CAN_FLAG_TXOK0;
- } else if ((hcan->Instance->TSR&CAN_TSR_TME1) == CAN_TSR_TME1) {
+ } else if ((hcan->Instance->TSR & CAN_TSR_TME1) == CAN_TSR_TME1) {
transmitmailbox = CAN_TXMAILBOX_1;
rqcpflag = CAN_FLAG_RQCP1;
txokflag = CAN_FLAG_TXOK1;
- } else if ((hcan->Instance->TSR&CAN_TSR_TME2) == CAN_TSR_TME2) {
+ } else if ((hcan->Instance->TSR & CAN_TSR_TME2) == CAN_TSR_TME2) {
transmitmailbox = CAN_TXMAILBOX_2;
rqcpflag = CAN_FLAG_RQCP2;
txokflag = CAN_FLAG_TXOK2;
@@ -257,12 +257,12 @@
if (hcan->pTxMsg->IDE == CAN_ID_STD) {
assert_param(IS_CAN_STDID(hcan->pTxMsg->StdId));
hcan->Instance->sTxMailBox[transmitmailbox].TIR |= ((hcan->pTxMsg->StdId << 21) | \
- hcan->pTxMsg->RTR);
+ hcan->pTxMsg->RTR);
} else {
assert_param(IS_CAN_EXTID(hcan->pTxMsg->ExtId));
hcan->Instance->sTxMailBox[transmitmailbox].TIR |= ((hcan->pTxMsg->ExtId << 3) | \
- hcan->pTxMsg->IDE | \
- hcan->pTxMsg->RTR);
+ hcan->pTxMsg->IDE | \
+ hcan->pTxMsg->RTR);
}
// Set up the DLC
@@ -272,13 +272,13 @@
// Set up the data field
hcan->Instance->sTxMailBox[transmitmailbox].TDLR = (((uint32_t)hcan->pTxMsg->Data[3] << 24) |
- ((uint32_t)hcan->pTxMsg->Data[2] << 16) |
- ((uint32_t)hcan->pTxMsg->Data[1] << 8) |
- ((uint32_t)hcan->pTxMsg->Data[0]));
+ ((uint32_t)hcan->pTxMsg->Data[2] << 16) |
+ ((uint32_t)hcan->pTxMsg->Data[1] << 8) |
+ ((uint32_t)hcan->pTxMsg->Data[0]));
hcan->Instance->sTxMailBox[transmitmailbox].TDHR = (((uint32_t)hcan->pTxMsg->Data[7] << 24) |
- ((uint32_t)hcan->pTxMsg->Data[6] << 16) |
- ((uint32_t)hcan->pTxMsg->Data[5] << 8) |
- ((uint32_t)hcan->pTxMsg->Data[4]));
+ ((uint32_t)hcan->pTxMsg->Data[6] << 16) |
+ ((uint32_t)hcan->pTxMsg->Data[5] << 8) |
+ ((uint32_t)hcan->pTxMsg->Data[4]));
// Request transmission
hcan->Instance->sTxMailBox[transmitmailbox].TIR |= CAN_TI0R_TXRQ;
diff --git a/ports/stm32/dac.c b/ports/stm32/dac.c
index 29f11db..c5c6172 100644
--- a/ports/stm32/dac.c
+++ b/ports/stm32/dac.c
@@ -153,7 +153,7 @@
base = (uint32_t)&DAC->DHR12R2;
#endif
}
- *(volatile uint32_t*)(base + align) = value;
+ *(volatile uint32_t *)(base + align) = value;
}
STATIC void dac_start(uint32_t dac_channel) {
@@ -500,7 +500,7 @@
.name = MP_QSTR_DAC,
.print = pyb_dac_print,
.make_new = pyb_dac_make_new,
- .locals_dict = (mp_obj_dict_t*)&pyb_dac_locals_dict,
+ .locals_dict = (mp_obj_dict_t *)&pyb_dac_locals_dict,
};
#endif // MICROPY_HW_ENABLE_DAC
diff --git a/ports/stm32/dma.c b/ports/stm32/dma.c
index 734cf2e..15919fa 100644
--- a/ports/stm32/dma.c
+++ b/ports/stm32/dma.c
@@ -96,22 +96,22 @@
// vary depending on the peripheral instance so they get passed separately
static const DMA_InitTypeDef dma_init_struct_spi_i2c = {
#if defined(STM32F4) || defined(STM32F7)
- .Channel = 0,
+ .Channel = 0,
#elif defined(STM32H7) || defined(STM32L0) || defined(STM32L4)
- .Request = 0,
+ .Request = 0,
#endif
- .Direction = 0,
- .PeriphInc = DMA_PINC_DISABLE,
- .MemInc = DMA_MINC_ENABLE,
+ .Direction = 0,
+ .PeriphInc = DMA_PINC_DISABLE,
+ .MemInc = DMA_MINC_ENABLE,
.PeriphDataAlignment = DMA_PDATAALIGN_BYTE,
- .MemDataAlignment = DMA_MDATAALIGN_BYTE,
- .Mode = DMA_NORMAL,
- .Priority = DMA_PRIORITY_LOW,
+ .MemDataAlignment = DMA_MDATAALIGN_BYTE,
+ .Mode = DMA_NORMAL,
+ .Priority = DMA_PRIORITY_LOW,
#if defined(STM32F4) || defined(STM32F7) || defined(STM32H7)
- .FIFOMode = DMA_FIFOMODE_DISABLE,
- .FIFOThreshold = DMA_FIFO_THRESHOLD_FULL,
- .MemBurst = DMA_MBURST_INC4,
- .PeriphBurst = DMA_PBURST_INC4
+ .FIFOMode = DMA_FIFOMODE_DISABLE,
+ .FIFOThreshold = DMA_FIFO_THRESHOLD_FULL,
+ .MemBurst = DMA_MBURST_INC4,
+ .PeriphBurst = DMA_PBURST_INC4
#endif
};
@@ -119,26 +119,26 @@
// Parameters to dma_init() for SDIO tx and rx.
static const DMA_InitTypeDef dma_init_struct_sdio = {
#if defined(STM32F4) || defined(STM32F7)
- .Channel = 0,
+ .Channel = 0,
#elif defined(STM32L0) || defined(STM32L4)
- .Request = 0,
+ .Request = 0,
#endif
- .Direction = 0,
- .PeriphInc = DMA_PINC_DISABLE,
- .MemInc = DMA_MINC_ENABLE,
+ .Direction = 0,
+ .PeriphInc = DMA_PINC_DISABLE,
+ .MemInc = DMA_MINC_ENABLE,
.PeriphDataAlignment = DMA_PDATAALIGN_WORD,
- .MemDataAlignment = DMA_MDATAALIGN_WORD,
+ .MemDataAlignment = DMA_MDATAALIGN_WORD,
#if defined(STM32F4) || defined(STM32F7)
- .Mode = DMA_PFCTRL,
+ .Mode = DMA_PFCTRL,
#elif defined(STM32L0) || defined(STM32L4)
- .Mode = DMA_NORMAL,
+ .Mode = DMA_NORMAL,
#endif
- .Priority = DMA_PRIORITY_VERY_HIGH,
+ .Priority = DMA_PRIORITY_VERY_HIGH,
#if defined(STM32F4) || defined(STM32F7)
- .FIFOMode = DMA_FIFOMODE_ENABLE,
- .FIFOThreshold = DMA_FIFO_THRESHOLD_FULL,
- .MemBurst = DMA_MBURST_INC4,
- .PeriphBurst = DMA_PBURST_INC4,
+ .FIFOMode = DMA_FIFOMODE_ENABLE,
+ .FIFOThreshold = DMA_FIFO_THRESHOLD_FULL,
+ .MemBurst = DMA_MBURST_INC4,
+ .PeriphBurst = DMA_PBURST_INC4,
#endif
};
#endif
@@ -147,22 +147,22 @@
// Default parameters to dma_init() for DAC tx
static const DMA_InitTypeDef dma_init_struct_dac = {
#if defined(STM32F4) || defined(STM32F7)
- .Channel = 0,
+ .Channel = 0,
#elif defined(STM32H7) || defined(STM32L0) || defined(STM32L4)
- .Request = 0,
+ .Request = 0,
#endif
- .Direction = 0,
- .PeriphInc = DMA_PINC_DISABLE,
- .MemInc = DMA_MINC_ENABLE,
+ .Direction = 0,
+ .PeriphInc = DMA_PINC_DISABLE,
+ .MemInc = DMA_MINC_ENABLE,
.PeriphDataAlignment = DMA_PDATAALIGN_BYTE,
- .MemDataAlignment = DMA_MDATAALIGN_BYTE,
- .Mode = DMA_NORMAL,
- .Priority = DMA_PRIORITY_HIGH,
+ .MemDataAlignment = DMA_MDATAALIGN_BYTE,
+ .Mode = DMA_NORMAL,
+ .Priority = DMA_PRIORITY_HIGH,
#if defined(STM32F4) || defined(STM32F7) || defined(STM32H7)
- .FIFOMode = DMA_FIFOMODE_DISABLE,
- .FIFOThreshold = DMA_FIFO_THRESHOLD_HALFFULL,
- .MemBurst = DMA_MBURST_SINGLE,
- .PeriphBurst = DMA_PBURST_SINGLE,
+ .FIFOMode = DMA_FIFOMODE_DISABLE,
+ .FIFOThreshold = DMA_FIFO_THRESHOLD_HALFFULL,
+ .MemBurst = DMA_MBURST_SINGLE,
+ .PeriphBurst = DMA_PBURST_SINGLE,
#endif
};
#endif
@@ -170,21 +170,21 @@
#if MICROPY_HW_ENABLE_DCMI
static const DMA_InitTypeDef dma_init_struct_dcmi = {
#if defined(STM32H7)
- .Request = DMA_REQUEST_DCMI,
+ .Request = DMA_REQUEST_DCMI,
#else
- .Channel = DMA_CHANNEL_1,
+ .Channel = DMA_CHANNEL_1,
#endif
- .Direction = DMA_PERIPH_TO_MEMORY,
- .PeriphInc = DMA_PINC_DISABLE,
- .MemInc = DMA_MINC_ENABLE,
+ .Direction = DMA_PERIPH_TO_MEMORY,
+ .PeriphInc = DMA_PINC_DISABLE,
+ .MemInc = DMA_MINC_ENABLE,
.PeriphDataAlignment = DMA_PDATAALIGN_WORD,
- .MemDataAlignment = DMA_MDATAALIGN_WORD,
- .Mode = DMA_NORMAL,
- .Priority = DMA_PRIORITY_HIGH,
- .FIFOMode = DMA_FIFOMODE_ENABLE,
- .FIFOThreshold = DMA_FIFO_THRESHOLD_FULL,
- .MemBurst = DMA_MBURST_INC4,
- .PeriphBurst = DMA_PBURST_SINGLE
+ .MemDataAlignment = DMA_MDATAALIGN_WORD,
+ .Mode = DMA_NORMAL,
+ .Priority = DMA_PRIORITY_HIGH,
+ .FIFOMode = DMA_FIFOMODE_ENABLE,
+ .FIFOThreshold = DMA_FIFO_THRESHOLD_FULL,
+ .MemBurst = DMA_MBURST_INC4,
+ .PeriphBurst = DMA_PBURST_SINGLE
};
#endif
@@ -566,22 +566,118 @@
#elif defined(STM32F4) || defined(STM32F7) || defined(STM32H7)
-void DMA1_Stream0_IRQHandler(void) { IRQ_ENTER(DMA1_Stream0_IRQn); if (dma_handle[dma_id_0] != NULL) { HAL_DMA_IRQHandler(dma_handle[dma_id_0]); } IRQ_EXIT(DMA1_Stream0_IRQn); }
-void DMA1_Stream1_IRQHandler(void) { IRQ_ENTER(DMA1_Stream1_IRQn); if (dma_handle[dma_id_1] != NULL) { HAL_DMA_IRQHandler(dma_handle[dma_id_1]); } IRQ_EXIT(DMA1_Stream1_IRQn); }
-void DMA1_Stream2_IRQHandler(void) { IRQ_ENTER(DMA1_Stream2_IRQn); if (dma_handle[dma_id_2] != NULL) { HAL_DMA_IRQHandler(dma_handle[dma_id_2]); } IRQ_EXIT(DMA1_Stream2_IRQn); }
-void DMA1_Stream3_IRQHandler(void) { IRQ_ENTER(DMA1_Stream3_IRQn); if (dma_handle[dma_id_3] != NULL) { HAL_DMA_IRQHandler(dma_handle[dma_id_3]); } IRQ_EXIT(DMA1_Stream3_IRQn); }
-void DMA1_Stream4_IRQHandler(void) { IRQ_ENTER(DMA1_Stream4_IRQn); if (dma_handle[dma_id_4] != NULL) { HAL_DMA_IRQHandler(dma_handle[dma_id_4]); } IRQ_EXIT(DMA1_Stream4_IRQn); }
-void DMA1_Stream5_IRQHandler(void) { IRQ_ENTER(DMA1_Stream5_IRQn); if (dma_handle[dma_id_5] != NULL) { HAL_DMA_IRQHandler(dma_handle[dma_id_5]); } IRQ_EXIT(DMA1_Stream5_IRQn); }
-void DMA1_Stream6_IRQHandler(void) { IRQ_ENTER(DMA1_Stream6_IRQn); if (dma_handle[dma_id_6] != NULL) { HAL_DMA_IRQHandler(dma_handle[dma_id_6]); } IRQ_EXIT(DMA1_Stream6_IRQn); }
-void DMA1_Stream7_IRQHandler(void) { IRQ_ENTER(DMA1_Stream7_IRQn); if (dma_handle[dma_id_7] != NULL) { HAL_DMA_IRQHandler(dma_handle[dma_id_7]); } IRQ_EXIT(DMA1_Stream7_IRQn); }
-void DMA2_Stream0_IRQHandler(void) { IRQ_ENTER(DMA2_Stream0_IRQn); if (dma_handle[dma_id_8] != NULL) { HAL_DMA_IRQHandler(dma_handle[dma_id_8]); } IRQ_EXIT(DMA2_Stream0_IRQn); }
-void DMA2_Stream1_IRQHandler(void) { IRQ_ENTER(DMA2_Stream1_IRQn); if (dma_handle[dma_id_9] != NULL) { HAL_DMA_IRQHandler(dma_handle[dma_id_9]); } IRQ_EXIT(DMA2_Stream1_IRQn); }
-void DMA2_Stream2_IRQHandler(void) { IRQ_ENTER(DMA2_Stream2_IRQn); if (dma_handle[dma_id_10] != NULL) { HAL_DMA_IRQHandler(dma_handle[dma_id_10]); } IRQ_EXIT(DMA2_Stream2_IRQn); }
-void DMA2_Stream3_IRQHandler(void) { IRQ_ENTER(DMA2_Stream3_IRQn); if (dma_handle[dma_id_11] != NULL) { HAL_DMA_IRQHandler(dma_handle[dma_id_11]); } IRQ_EXIT(DMA2_Stream3_IRQn); }
-void DMA2_Stream4_IRQHandler(void) { IRQ_ENTER(DMA2_Stream4_IRQn); if (dma_handle[dma_id_12] != NULL) { HAL_DMA_IRQHandler(dma_handle[dma_id_12]); } IRQ_EXIT(DMA2_Stream4_IRQn); }
-void DMA2_Stream5_IRQHandler(void) { IRQ_ENTER(DMA2_Stream5_IRQn); if (dma_handle[dma_id_13] != NULL) { HAL_DMA_IRQHandler(dma_handle[dma_id_13]); } IRQ_EXIT(DMA2_Stream5_IRQn); }
-void DMA2_Stream6_IRQHandler(void) { IRQ_ENTER(DMA2_Stream6_IRQn); if (dma_handle[dma_id_14] != NULL) { HAL_DMA_IRQHandler(dma_handle[dma_id_14]); } IRQ_EXIT(DMA2_Stream6_IRQn); }
-void DMA2_Stream7_IRQHandler(void) { IRQ_ENTER(DMA2_Stream7_IRQn); if (dma_handle[dma_id_15] != NULL) { HAL_DMA_IRQHandler(dma_handle[dma_id_15]); } IRQ_EXIT(DMA2_Stream7_IRQn); }
+void DMA1_Stream0_IRQHandler(void) {
+ IRQ_ENTER(DMA1_Stream0_IRQn);
+ if (dma_handle[dma_id_0] != NULL) {
+ HAL_DMA_IRQHandler(dma_handle[dma_id_0]);
+ }
+ IRQ_EXIT(DMA1_Stream0_IRQn);
+}
+void DMA1_Stream1_IRQHandler(void) {
+ IRQ_ENTER(DMA1_Stream1_IRQn);
+ if (dma_handle[dma_id_1] != NULL) {
+ HAL_DMA_IRQHandler(dma_handle[dma_id_1]);
+ }
+ IRQ_EXIT(DMA1_Stream1_IRQn);
+}
+void DMA1_Stream2_IRQHandler(void) {
+ IRQ_ENTER(DMA1_Stream2_IRQn);
+ if (dma_handle[dma_id_2] != NULL) {
+ HAL_DMA_IRQHandler(dma_handle[dma_id_2]);
+ }
+ IRQ_EXIT(DMA1_Stream2_IRQn);
+}
+void DMA1_Stream3_IRQHandler(void) {
+ IRQ_ENTER(DMA1_Stream3_IRQn);
+ if (dma_handle[dma_id_3] != NULL) {
+ HAL_DMA_IRQHandler(dma_handle[dma_id_3]);
+ }
+ IRQ_EXIT(DMA1_Stream3_IRQn);
+}
+void DMA1_Stream4_IRQHandler(void) {
+ IRQ_ENTER(DMA1_Stream4_IRQn);
+ if (dma_handle[dma_id_4] != NULL) {
+ HAL_DMA_IRQHandler(dma_handle[dma_id_4]);
+ }
+ IRQ_EXIT(DMA1_Stream4_IRQn);
+}
+void DMA1_Stream5_IRQHandler(void) {
+ IRQ_ENTER(DMA1_Stream5_IRQn);
+ if (dma_handle[dma_id_5] != NULL) {
+ HAL_DMA_IRQHandler(dma_handle[dma_id_5]);
+ }
+ IRQ_EXIT(DMA1_Stream5_IRQn);
+}
+void DMA1_Stream6_IRQHandler(void) {
+ IRQ_ENTER(DMA1_Stream6_IRQn);
+ if (dma_handle[dma_id_6] != NULL) {
+ HAL_DMA_IRQHandler(dma_handle[dma_id_6]);
+ }
+ IRQ_EXIT(DMA1_Stream6_IRQn);
+}
+void DMA1_Stream7_IRQHandler(void) {
+ IRQ_ENTER(DMA1_Stream7_IRQn);
+ if (dma_handle[dma_id_7] != NULL) {
+ HAL_DMA_IRQHandler(dma_handle[dma_id_7]);
+ }
+ IRQ_EXIT(DMA1_Stream7_IRQn);
+}
+void DMA2_Stream0_IRQHandler(void) {
+ IRQ_ENTER(DMA2_Stream0_IRQn);
+ if (dma_handle[dma_id_8] != NULL) {
+ HAL_DMA_IRQHandler(dma_handle[dma_id_8]);
+ }
+ IRQ_EXIT(DMA2_Stream0_IRQn);
+}
+void DMA2_Stream1_IRQHandler(void) {
+ IRQ_ENTER(DMA2_Stream1_IRQn);
+ if (dma_handle[dma_id_9] != NULL) {
+ HAL_DMA_IRQHandler(dma_handle[dma_id_9]);
+ }
+ IRQ_EXIT(DMA2_Stream1_IRQn);
+}
+void DMA2_Stream2_IRQHandler(void) {
+ IRQ_ENTER(DMA2_Stream2_IRQn);
+ if (dma_handle[dma_id_10] != NULL) {
+ HAL_DMA_IRQHandler(dma_handle[dma_id_10]);
+ }
+ IRQ_EXIT(DMA2_Stream2_IRQn);
+}
+void DMA2_Stream3_IRQHandler(void) {
+ IRQ_ENTER(DMA2_Stream3_IRQn);
+ if (dma_handle[dma_id_11] != NULL) {
+ HAL_DMA_IRQHandler(dma_handle[dma_id_11]);
+ }
+ IRQ_EXIT(DMA2_Stream3_IRQn);
+}
+void DMA2_Stream4_IRQHandler(void) {
+ IRQ_ENTER(DMA2_Stream4_IRQn);
+ if (dma_handle[dma_id_12] != NULL) {
+ HAL_DMA_IRQHandler(dma_handle[dma_id_12]);
+ }
+ IRQ_EXIT(DMA2_Stream4_IRQn);
+}
+void DMA2_Stream5_IRQHandler(void) {
+ IRQ_ENTER(DMA2_Stream5_IRQn);
+ if (dma_handle[dma_id_13] != NULL) {
+ HAL_DMA_IRQHandler(dma_handle[dma_id_13]);
+ }
+ IRQ_EXIT(DMA2_Stream5_IRQn);
+}
+void DMA2_Stream6_IRQHandler(void) {
+ IRQ_ENTER(DMA2_Stream6_IRQn);
+ if (dma_handle[dma_id_14] != NULL) {
+ HAL_DMA_IRQHandler(dma_handle[dma_id_14]);
+ }
+ IRQ_EXIT(DMA2_Stream6_IRQn);
+}
+void DMA2_Stream7_IRQHandler(void) {
+ IRQ_ENTER(DMA2_Stream7_IRQn);
+ if (dma_handle[dma_id_15] != NULL) {
+ HAL_DMA_IRQHandler(dma_handle[dma_id_15]);
+ }
+ IRQ_EXIT(DMA2_Stream7_IRQn);
+}
#elif defined(STM32L0)
@@ -623,20 +719,104 @@
#elif defined(STM32L4)
-void DMA1_Channel1_IRQHandler(void) { IRQ_ENTER(DMA1_Channel1_IRQn); if (dma_handle[dma_id_0] != NULL) { HAL_DMA_IRQHandler(dma_handle[dma_id_0]); } IRQ_EXIT(DMA1_Channel1_IRQn); }
-void DMA1_Channel2_IRQHandler(void) { IRQ_ENTER(DMA1_Channel2_IRQn); if (dma_handle[dma_id_1] != NULL) { HAL_DMA_IRQHandler(dma_handle[dma_id_1]); } IRQ_EXIT(DMA1_Channel2_IRQn); }
-void DMA1_Channel3_IRQHandler(void) { IRQ_ENTER(DMA1_Channel3_IRQn); if (dma_handle[dma_id_2] != NULL) { HAL_DMA_IRQHandler(dma_handle[dma_id_2]); } IRQ_EXIT(DMA1_Channel3_IRQn); }
-void DMA1_Channel4_IRQHandler(void) { IRQ_ENTER(DMA1_Channel4_IRQn); if (dma_handle[dma_id_3] != NULL) { HAL_DMA_IRQHandler(dma_handle[dma_id_3]); } IRQ_EXIT(DMA1_Channel4_IRQn); }
-void DMA1_Channel5_IRQHandler(void) { IRQ_ENTER(DMA1_Channel5_IRQn); if (dma_handle[dma_id_4] != NULL) { HAL_DMA_IRQHandler(dma_handle[dma_id_4]); } IRQ_EXIT(DMA1_Channel5_IRQn); }
-void DMA1_Channel6_IRQHandler(void) { IRQ_ENTER(DMA1_Channel6_IRQn); if (dma_handle[dma_id_5] != NULL) { HAL_DMA_IRQHandler(dma_handle[dma_id_5]); } IRQ_EXIT(DMA1_Channel6_IRQn); }
-void DMA1_Channel7_IRQHandler(void) { IRQ_ENTER(DMA1_Channel7_IRQn); if (dma_handle[dma_id_6] != NULL) { HAL_DMA_IRQHandler(dma_handle[dma_id_6]); } IRQ_EXIT(DMA1_Channel7_IRQn); }
-void DMA2_Channel1_IRQHandler(void) { IRQ_ENTER(DMA2_Channel1_IRQn); if (dma_handle[dma_id_7] != NULL) { HAL_DMA_IRQHandler(dma_handle[dma_id_7]); } IRQ_EXIT(DMA2_Channel1_IRQn); }
-void DMA2_Channel2_IRQHandler(void) { IRQ_ENTER(DMA2_Channel2_IRQn); if (dma_handle[dma_id_8] != NULL) { HAL_DMA_IRQHandler(dma_handle[dma_id_8]); } IRQ_EXIT(DMA2_Channel2_IRQn); }
-void DMA2_Channel3_IRQHandler(void) { IRQ_ENTER(DMA2_Channel3_IRQn); if (dma_handle[dma_id_9] != NULL) { HAL_DMA_IRQHandler(dma_handle[dma_id_9]); } IRQ_EXIT(DMA2_Channel3_IRQn); }
-void DMA2_Channel4_IRQHandler(void) { IRQ_ENTER(DMA2_Channel4_IRQn); if (dma_handle[dma_id_10] != NULL) { HAL_DMA_IRQHandler(dma_handle[dma_id_10]);} IRQ_EXIT(DMA2_Channel4_IRQn); }
-void DMA2_Channel5_IRQHandler(void) { IRQ_ENTER(DMA2_Channel5_IRQn); if (dma_handle[dma_id_11] != NULL) { HAL_DMA_IRQHandler(dma_handle[dma_id_11]);} IRQ_EXIT(DMA2_Channel5_IRQn); }
-void DMA2_Channel6_IRQHandler(void) { IRQ_ENTER(DMA2_Channel6_IRQn); if (dma_handle[dma_id_12] != NULL) { HAL_DMA_IRQHandler(dma_handle[dma_id_12]);} IRQ_EXIT(DMA2_Channel6_IRQn); }
-void DMA2_Channel7_IRQHandler(void) { IRQ_ENTER(DMA2_Channel7_IRQn); if (dma_handle[dma_id_13] != NULL) { HAL_DMA_IRQHandler(dma_handle[dma_id_13]);} IRQ_EXIT(DMA2_Channel7_IRQn); }
+void DMA1_Channel1_IRQHandler(void) {
+ IRQ_ENTER(DMA1_Channel1_IRQn);
+ if (dma_handle[dma_id_0] != NULL) {
+ HAL_DMA_IRQHandler(dma_handle[dma_id_0]);
+ }
+ IRQ_EXIT(DMA1_Channel1_IRQn);
+}
+void DMA1_Channel2_IRQHandler(void) {
+ IRQ_ENTER(DMA1_Channel2_IRQn);
+ if (dma_handle[dma_id_1] != NULL) {
+ HAL_DMA_IRQHandler(dma_handle[dma_id_1]);
+ }
+ IRQ_EXIT(DMA1_Channel2_IRQn);
+}
+void DMA1_Channel3_IRQHandler(void) {
+ IRQ_ENTER(DMA1_Channel3_IRQn);
+ if (dma_handle[dma_id_2] != NULL) {
+ HAL_DMA_IRQHandler(dma_handle[dma_id_2]);
+ }
+ IRQ_EXIT(DMA1_Channel3_IRQn);
+}
+void DMA1_Channel4_IRQHandler(void) {
+ IRQ_ENTER(DMA1_Channel4_IRQn);
+ if (dma_handle[dma_id_3] != NULL) {
+ HAL_DMA_IRQHandler(dma_handle[dma_id_3]);
+ }
+ IRQ_EXIT(DMA1_Channel4_IRQn);
+}
+void DMA1_Channel5_IRQHandler(void) {
+ IRQ_ENTER(DMA1_Channel5_IRQn);
+ if (dma_handle[dma_id_4] != NULL) {
+ HAL_DMA_IRQHandler(dma_handle[dma_id_4]);
+ }
+ IRQ_EXIT(DMA1_Channel5_IRQn);
+}
+void DMA1_Channel6_IRQHandler(void) {
+ IRQ_ENTER(DMA1_Channel6_IRQn);
+ if (dma_handle[dma_id_5] != NULL) {
+ HAL_DMA_IRQHandler(dma_handle[dma_id_5]);
+ }
+ IRQ_EXIT(DMA1_Channel6_IRQn);
+}
+void DMA1_Channel7_IRQHandler(void) {
+ IRQ_ENTER(DMA1_Channel7_IRQn);
+ if (dma_handle[dma_id_6] != NULL) {
+ HAL_DMA_IRQHandler(dma_handle[dma_id_6]);
+ }
+ IRQ_EXIT(DMA1_Channel7_IRQn);
+}
+void DMA2_Channel1_IRQHandler(void) {
+ IRQ_ENTER(DMA2_Channel1_IRQn);
+ if (dma_handle[dma_id_7] != NULL) {
+ HAL_DMA_IRQHandler(dma_handle[dma_id_7]);
+ }
+ IRQ_EXIT(DMA2_Channel1_IRQn);
+}
+void DMA2_Channel2_IRQHandler(void) {
+ IRQ_ENTER(DMA2_Channel2_IRQn);
+ if (dma_handle[dma_id_8] != NULL) {
+ HAL_DMA_IRQHandler(dma_handle[dma_id_8]);
+ }
+ IRQ_EXIT(DMA2_Channel2_IRQn);
+}
+void DMA2_Channel3_IRQHandler(void) {
+ IRQ_ENTER(DMA2_Channel3_IRQn);
+ if (dma_handle[dma_id_9] != NULL) {
+ HAL_DMA_IRQHandler(dma_handle[dma_id_9]);
+ }
+ IRQ_EXIT(DMA2_Channel3_IRQn);
+}
+void DMA2_Channel4_IRQHandler(void) {
+ IRQ_ENTER(DMA2_Channel4_IRQn);
+ if (dma_handle[dma_id_10] != NULL) {
+ HAL_DMA_IRQHandler(dma_handle[dma_id_10]);
+ }
+ IRQ_EXIT(DMA2_Channel4_IRQn);
+}
+void DMA2_Channel5_IRQHandler(void) {
+ IRQ_ENTER(DMA2_Channel5_IRQn);
+ if (dma_handle[dma_id_11] != NULL) {
+ HAL_DMA_IRQHandler(dma_handle[dma_id_11]);
+ }
+ IRQ_EXIT(DMA2_Channel5_IRQn);
+}
+void DMA2_Channel6_IRQHandler(void) {
+ IRQ_ENTER(DMA2_Channel6_IRQn);
+ if (dma_handle[dma_id_12] != NULL) {
+ HAL_DMA_IRQHandler(dma_handle[dma_id_12]);
+ }
+ IRQ_EXIT(DMA2_Channel6_IRQn);
+}
+void DMA2_Channel7_IRQHandler(void) {
+ IRQ_ENTER(DMA2_Channel7_IRQn);
+ if (dma_handle[dma_id_13] != NULL) {
+ HAL_DMA_IRQHandler(dma_handle[dma_id_13]);
+ }
+ IRQ_EXIT(DMA2_Channel7_IRQn);
+}
#endif
@@ -709,14 +889,14 @@
dma->Parent = data;
}
-void dma_init(DMA_HandleTypeDef *dma, const dma_descr_t *dma_descr, uint32_t dir, void *data){
+void dma_init(DMA_HandleTypeDef *dma, const dma_descr_t *dma_descr, uint32_t dir, void *data) {
// Some drivers allocate the DMA_HandleTypeDef from the stack
// (i.e. dac, i2c, spi) and for those cases we need to clear the
// structure so we don't get random values from the stack)
memset(dma, 0, sizeof(*dma));
if (dma_descr != NULL) {
- dma_id_t dma_id = dma_descr->id;
+ dma_id_t dma_id = dma_descr->id;
dma_init_handle(dma, dma_descr, dir, data);
// set global pointer for IRQ handler
@@ -802,7 +982,7 @@
return;
}
- static const uint32_t controller_mask[] = {
+ static const uint32_t controller_mask[] = {
DMA1_ENABLE_MASK,
#if defined(DMA2)
DMA2_ENABLE_MASK,
@@ -849,7 +1029,7 @@
| descr->init->MemInc // MINC
| descr->init->PeriphInc // PINC
| config // MSIZE | PSIZE | CIRC | DIR
- ;
+ ;
// Select channel that the DMA stream uses
#if defined(STM32F0)
@@ -859,7 +1039,7 @@
__HAL_DMA2_REMAP(descr->sub_instance);
}
#else
- DMA_Request_TypeDef *dma_ctrl = (void*)(((uint32_t)dma & ~0xff) + (DMA1_CSELR_BASE - DMA1_BASE)); // DMA1_CSELR or DMA2_CSELR
+ DMA_Request_TypeDef *dma_ctrl = (void *)(((uint32_t)dma & ~0xff) + (DMA1_CSELR_BASE - DMA1_BASE)); // DMA1_CSELR or DMA2_CSELR
uint32_t channel_number = (((uint32_t)dma & 0xff) - 0x08) / 20; // 0 through 6
uint32_t channel_pos = channel_number * 4;
dma_ctrl->CSELR = (dma_ctrl->CSELR & ~(0xf << channel_pos)) | (descr->sub_instance << channel_pos);
@@ -900,13 +1080,13 @@
| init->MemInc // MINC
| init->PeriphInc // PINC
| config // MSIZE | PSIZE | CIRC | DIR
- ;
+ ;
// Set FIFO control register
dma->FCR =
init->FIFOMode // DMDIS
| init->FIFOThreshold // FTH
- ;
+ ;
}
void dma_nohal_deinit(const dma_descr_t *descr) {
diff --git a/ports/stm32/eth.c b/ports/stm32/eth.c
index 756bb6d..33d2070 100644
--- a/ports/stm32/eth.c
+++ b/ports/stm32/eth.c
@@ -256,15 +256,15 @@
ETH->DMAIER =
ETH_DMAIER_NISE // enable normal interrupts
| ETH_DMAIER_RIE // enable RX interrupt
- ;
+ ;
// Configure RX descriptor lists
for (size_t i = 0; i < RX_BUF_NUM; ++i) {
eth_dma.rx_descr[i].rdes0 = 1 << RX_DESCR_0_OWN_Pos;
eth_dma.rx_descr[i].rdes1 =
1 << RX_DESCR_1_RCH_Pos // chained
- | RX_BUF_SIZE << RX_DESCR_1_RBS1_Pos
- ;
+ | RX_BUF_SIZE << RX_DESCR_1_RBS1_Pos
+ ;
eth_dma.rx_descr[i].rdes2 = (uint32_t)ð_dma.rx_buf[i * RX_BUF_SIZE];
eth_dma.rx_descr[i].rdes3 = (uint32_t)ð_dma.rx_descr[(i + 1) % RX_BUF_NUM];
}
@@ -285,13 +285,13 @@
ETH->DMAOMR =
ETH_DMAOMR_RSF // read from RX FIFO after a full frame is written
| ETH_DMAOMR_TSF // transmit when a full frame is in TX FIFO (needed by errata)
- ;
+ ;
mp_hal_delay_ms(2);
// Select MAC filtering options
ETH->MACFFR =
ETH_MACFFR_RA // pass all frames up
- ;
+ ;
mp_hal_delay_ms(2);
// Set MAC address
@@ -307,21 +307,21 @@
: (phy_scsr & PHY_SCSR_SPEED_Msk) == PHY_SCSR_SPEED_100HALF ? ETH_MACCR_FES
: (phy_scsr & PHY_SCSR_SPEED_Msk) == PHY_SCSR_SPEED_100FULL ? (ETH_MACCR_FES | ETH_MACCR_DM)
: 0
- ;
+ ;
mp_hal_delay_ms(2);
// Start MAC layer
ETH->MACCR |=
ETH_MACCR_TE // enable TX
| ETH_MACCR_RE // enable RX
- ;
+ ;
mp_hal_delay_ms(2);
// Start DMA layer
ETH->DMAOMR |=
ETH_DMAOMR_ST // start TX
| ETH_DMAOMR_SR // start RX
- ;
+ ;
mp_hal_delay_ms(2);
// Enable interrupts
@@ -373,11 +373,11 @@
// Schedule to send next outgoing frame
tx_descr->tdes0 =
1 << TX_DESCR_0_OWN_Pos // owned by DMA
- | 1 << TX_DESCR_0_LS_Pos // last segment
- | 1 << TX_DESCR_0_FS_Pos // first segment
- | 3 << TX_DESCR_0_CIC_Pos // enable all checksums inserted by hardware
- | 1 << TX_DESCR_0_TCH_Pos // TX descriptor is chained
- ;
+ | 1 << TX_DESCR_0_LS_Pos // last segment
+ | 1 << TX_DESCR_0_FS_Pos // first segment
+ | 3 << TX_DESCR_0_CIC_Pos // enable all checksums inserted by hardware
+ | 1 << TX_DESCR_0_TCH_Pos // TX descriptor is chained
+ ;
// Notify ETH DMA that there is a new TX descriptor for sending
__DMB();
@@ -398,8 +398,8 @@
// Schedule to get next incoming frame
rx_descr->rdes1 =
1 << RX_DESCR_1_RCH_Pos // RX descriptor is chained
- | RX_BUF_SIZE << RX_DESCR_1_RBS1_Pos // maximum buffer length
- ;
+ | RX_BUF_SIZE << RX_DESCR_1_RBS1_Pos // maximum buffer length
+ ;
rx_descr->rdes2 = (uint32_t)buf;
rx_descr->rdes3 = (uint32_t)ð_dma.rx_descr[eth_dma.rx_descr_idx];
rx_descr->rdes0 = 1 << RX_DESCR_0_OWN_Pos; // owned by DMA
@@ -424,7 +424,7 @@
// Get RX buffer containing new frame
size_t len = (rx_descr->rdes0 & RX_DESCR_0_FL_Msk) >> RX_DESCR_0_FL_Pos;
len -= 4; // discard CRC at end
- uint8_t *buf = (uint8_t*)rx_descr->rdes2;
+ uint8_t *buf = (uint8_t *)rx_descr->rdes2;
// Process frame
eth_process_frame(ð_instance, len, buf);
diff --git a/ports/stm32/extint.c b/ports/stm32/extint.c
index c4841f3..6c186f5 100644
--- a/ports/stm32/extint.c
+++ b/ports/stm32/extint.c
@@ -433,13 +433,13 @@
return;
}
// we need 0 to 1 transition to trigger the interrupt
-#if defined(STM32L4) || defined(STM32H7) || defined(STM32WB)
+ #if defined(STM32L4) || defined(STM32H7) || defined(STM32WB)
EXTI->SWIER1 &= ~(1 << line);
EXTI->SWIER1 |= (1 << line);
-#else
+ #else
EXTI->SWIER &= ~(1 << line);
EXTI->SWIER |= (1 << line);
-#endif
+ #endif
}
void extint_trigger_mode(uint line, uint32_t mode) {
@@ -624,7 +624,7 @@
.name = MP_QSTR_ExtInt,
.print = extint_obj_print,
.make_new = extint_make_new,
- .locals_dict = (mp_obj_dict_t*)&extint_locals_dict,
+ .locals_dict = (mp_obj_dict_t *)&extint_locals_dict,
};
void extint_init0(void) {
@@ -634,7 +634,7 @@
}
MP_STATE_PORT(pyb_extint_callback)[i] = mp_const_none;
pyb_extint_mode[i] = EXTI_Mode_Interrupt;
- }
+ }
}
// Interrupt handler
diff --git a/ports/stm32/factoryreset.c b/ports/stm32/factoryreset.c
index 513b521..0459110 100644
--- a/ports/stm32/factoryreset.c
+++ b/ports/stm32/factoryreset.c
@@ -35,21 +35,21 @@
#if MICROPY_HW_ENABLE_STORAGE
static const char fresh_boot_py[] =
-"# boot.py -- run on boot-up\r\n"
-"# can run arbitrary Python, but best to keep it minimal\r\n"
-"\r\n"
-"import machine\r\n"
-"import pyb\r\n"
-"pyb.country('US') # ISO 3166-1 Alpha-2 code, eg US, GB, DE, AU\r\n"
-"#pyb.main('main.py') # main script to run after this one\r\n"
+ "# boot.py -- run on boot-up\r\n"
+ "# can run arbitrary Python, but best to keep it minimal\r\n"
+ "\r\n"
+ "import machine\r\n"
+ "import pyb\r\n"
+ "pyb.country('US') # ISO 3166-1 Alpha-2 code, eg US, GB, DE, AU\r\n"
+ "#pyb.main('main.py') # main script to run after this one\r\n"
#if MICROPY_HW_ENABLE_USB
-"#pyb.usb_mode('VCP+MSC') # act as a serial and a storage device\r\n"
-"#pyb.usb_mode('VCP+HID') # act as a serial device and a mouse\r\n"
+ "#pyb.usb_mode('VCP+MSC') # act as a serial and a storage device\r\n"
+ "#pyb.usb_mode('VCP+HID') # act as a serial device and a mouse\r\n"
#endif
;
static const char fresh_main_py[] =
-"# main.py -- put your code here!\r\n"
+ "# main.py -- put your code here!\r\n"
;
#if MICROPY_HW_ENABLE_USB
@@ -58,18 +58,18 @@
;
static const char fresh_readme_txt[] =
-"This is a MicroPython board\r\n"
-"\r\n"
-"You can get started right away by writing your Python code in 'main.py'.\r\n"
-"\r\n"
-"For a serial prompt:\r\n"
-" - Windows: you need to go to 'Device manager', right click on the unknown device,\r\n"
-" then update the driver software, using the 'pybcdc.inf' file found on this drive.\r\n"
-" Then use a terminal program like Hyperterminal or putty.\r\n"
-" - Mac OS X: use the command: screen /dev/tty.usbmodem*\r\n"
-" - Linux: use the command: screen /dev/ttyACM0\r\n"
-"\r\n"
-"Please visit http://micropython.org/help/ for further help.\r\n"
+ "This is a MicroPython board\r\n"
+ "\r\n"
+ "You can get started right away by writing your Python code in 'main.py'.\r\n"
+ "\r\n"
+ "For a serial prompt:\r\n"
+ " - Windows: you need to go to 'Device manager', right click on the unknown device,\r\n"
+ " then update the driver software, using the 'pybcdc.inf' file found on this drive.\r\n"
+ " Then use a terminal program like Hyperterminal or putty.\r\n"
+ " - Mac OS X: use the command: screen /dev/tty.usbmodem*\r\n"
+ " - Linux: use the command: screen /dev/ttyACM0\r\n"
+ "\r\n"
+ "Please visit http://micropython.org/help/ for further help.\r\n"
;
#endif
diff --git a/ports/stm32/fdcan.c b/ports/stm32/fdcan.c
index 611ebe1..b3b1da9 100644
--- a/ports/stm32/fdcan.c
+++ b/ports/stm32/fdcan.c
@@ -65,13 +65,13 @@
if (can_obj->can_id == PYB_CAN_1) {
init->MessageRAMOffset = 0;
} else {
- init->MessageRAMOffset = 2560/2;
+ init->MessageRAMOffset = 2560 / 2;
}
init->StdFiltersNbr = 64; // 128 / 2
init->ExtFiltersNbr = 0; // Not used
- init->TxEventsNbr = 16; // 32 / 2
+ init->TxEventsNbr = 16; // 32 / 2
init->RxBuffersNbr = 32; // 64 / 2
init->TxBuffersNbr = 16; // 32 / 2
@@ -219,14 +219,14 @@
// Get pointer to incoming message
uint32_t index = (can->Instance->RXF0S & FDCAN_RXF0S_F0GI) >> 8;
- uint32_t *address = (uint32_t*)(can->msgRam.RxFIFO0SA + (index * can->Init.RxFifo0ElmtSize * 4));
+ uint32_t *address = (uint32_t *)(can->msgRam.RxFIFO0SA + (index * can->Init.RxFifo0ElmtSize * 4));
// Parse header of message
hdr->IdType = *address & FDCAN_ELEMENT_MASK_XTD;
- if(hdr->IdType == FDCAN_STANDARD_ID) {
- hdr->Identifier = (*address & FDCAN_ELEMENT_MASK_STDID) >> 18;
+ if (hdr->IdType == FDCAN_STANDARD_ID) {
+ hdr->Identifier = (*address & FDCAN_ELEMENT_MASK_STDID) >> 18;
} else {
- hdr->Identifier = *address & FDCAN_ELEMENT_MASK_EXTID;
+ hdr->Identifier = *address & FDCAN_ELEMENT_MASK_EXTID;
}
hdr->RxFrameType = *address & FDCAN_ELEMENT_MASK_RTR;
hdr->ErrorStateIndicator = *address++ & FDCAN_ELEMENT_MASK_ESI;
@@ -238,9 +238,9 @@
hdr->IsFilterMatchingFrame = (*address++ & FDCAN_ELEMENT_MASK_ANMF) >> 31;
// Copy data
- uint8_t *pdata = (uint8_t*)address;
- for(uint32_t i = 0; i < 8; ++i) { // TODO use DLCtoBytes[hdr->DataLength] for length > 8
- *data++ = *pdata++;
+ uint8_t *pdata = (uint8_t *)address;
+ for (uint32_t i = 0; i < 8; ++i) { // TODO use DLCtoBytes[hdr->DataLength] for length > 8
+ *data++ = *pdata++;
}
// Release (free) message from FIFO
@@ -268,7 +268,7 @@
switch (*state) {
case RX_STATE_FIFO_EMPTY:
__HAL_FDCAN_DISABLE_IT(&self->can, (fifo_id == FDCAN_RX_FIFO0) ?
- FDCAN_IT_RX_FIFO0_NEW_MESSAGE : FDCAN_IT_RX_FIFO1_NEW_MESSAGE);
+ FDCAN_IT_RX_FIFO0_NEW_MESSAGE : FDCAN_IT_RX_FIFO1_NEW_MESSAGE);
irq_reason = MP_OBJ_NEW_SMALL_INT(0);
*state = RX_STATE_MESSAGE_PENDING;
break;
@@ -280,9 +280,9 @@
break;
case RX_STATE_FIFO_FULL:
__HAL_FDCAN_DISABLE_IT(&self->can, (fifo_id == FDCAN_RX_FIFO0) ?
- FDCAN_IT_RX_FIFO0_MESSAGE_LOST : FDCAN_IT_RX_FIFO1_MESSAGE_LOST);
+ FDCAN_IT_RX_FIFO0_MESSAGE_LOST : FDCAN_IT_RX_FIFO1_MESSAGE_LOST);
__HAL_FDCAN_CLEAR_FLAG(&self->can, (fifo_id == FDCAN_RX_FIFO0) ?
- FDCAN_FLAG_RX_FIFO0_MESSAGE_LOST : FDCAN_FLAG_RX_FIFO1_MESSAGE_LOST);
+ FDCAN_FLAG_RX_FIFO0_MESSAGE_LOST : FDCAN_FLAG_RX_FIFO1_MESSAGE_LOST);
irq_reason = MP_OBJ_NEW_SMALL_INT(2);
*state = RX_STATE_FIFO_OVERFLOW;
break;
diff --git a/ports/stm32/flash.c b/ports/stm32/flash.c
index 49cbbe0..99c95f7 100644
--- a/ports/stm32/flash.c
+++ b/ports/stm32/flash.c
@@ -100,7 +100,7 @@
if (READ_BIT(FLASH->OPTCR, FLASH_OPTCR_SWAP_BANK) == 0) {
#else
if (READ_BIT(SYSCFG->MEMRMP, SYSCFG_MEMRMP_FB_MODE) == 0) {
- #endif
+ #endif
// no bank swap
if (addr < (FLASH_BASE + FLASH_BANK_SIZE)) {
return FLASH_BANK_1;
@@ -175,36 +175,37 @@
#if defined(STM32F0)
__HAL_FLASH_CLEAR_FLAG(FLASH_FLAG_EOP | FLASH_FLAG_WRPERR | FLASH_FLAG_PGERR);
- EraseInitStruct.TypeErase = FLASH_TYPEERASE_PAGES;
+ EraseInitStruct.TypeErase = FLASH_TYPEERASE_PAGES;
EraseInitStruct.PageAddress = flash_dest;
- EraseInitStruct.NbPages = (4 * num_word32 + FLASH_PAGE_SIZE - 4) / FLASH_PAGE_SIZE;
+ EraseInitStruct.NbPages = (4 * num_word32 + FLASH_PAGE_SIZE - 4) / FLASH_PAGE_SIZE;
#elif defined(STM32L0)
__HAL_FLASH_CLEAR_FLAG(FLASH_FLAG_EOP | FLASH_FLAG_WRPERR | FLASH_FLAG_PGAERR);
- EraseInitStruct.TypeErase = FLASH_TYPEERASE_PAGES;
+ EraseInitStruct.TypeErase = FLASH_TYPEERASE_PAGES;
EraseInitStruct.PageAddress = flash_dest;
- EraseInitStruct.NbPages = (4 * num_word32 + FLASH_PAGE_SIZE - 4) / FLASH_PAGE_SIZE;
+ EraseInitStruct.NbPages = (4 * num_word32 + FLASH_PAGE_SIZE - 4) / FLASH_PAGE_SIZE;
#elif (defined(STM32L4) && !defined(SYSCFG_MEMRMP_FB_MODE)) || defined(STM32WB)
__HAL_FLASH_CLEAR_FLAG(FLASH_FLAG_ALL_ERRORS);
- EraseInitStruct.TypeErase = FLASH_TYPEERASE_PAGES;
- EraseInitStruct.Page = get_page(flash_dest);
- EraseInitStruct.NbPages = (4 * num_word32 + FLASH_PAGE_SIZE - 4) / FLASH_PAGE_SIZE;
+ EraseInitStruct.TypeErase = FLASH_TYPEERASE_PAGES;
+ EraseInitStruct.Page = get_page(flash_dest);
+ EraseInitStruct.NbPages = (4 * num_word32 + FLASH_PAGE_SIZE - 4) / FLASH_PAGE_SIZE;
#elif defined(STM32L4)
__HAL_FLASH_CLEAR_FLAG(FLASH_FLAG_ALL_ERRORS);
// erase the sector(s)
// The sector returned by flash_get_sector_info can not be used
// as the flash has on each bank 0/1 pages 0..255
- EraseInitStruct.TypeErase = FLASH_TYPEERASE_PAGES;
- EraseInitStruct.Banks = get_bank(flash_dest);
- EraseInitStruct.Page = get_page(flash_dest);
- EraseInitStruct.NbPages = get_page(flash_dest + 4 * num_word32 - 1) - EraseInitStruct.Page + 1;;
+ EraseInitStruct.TypeErase = FLASH_TYPEERASE_PAGES;
+ EraseInitStruct.Banks = get_bank(flash_dest);
+ EraseInitStruct.Page = get_page(flash_dest);
+ EraseInitStruct.NbPages = get_page(flash_dest + 4 * num_word32 - 1) - EraseInitStruct.Page + 1;
+ ;
#else
// Clear pending flags (if any)
#if defined(STM32H7)
__HAL_FLASH_CLEAR_FLAG(FLASH_FLAG_ALL_ERRORS_BANK1 | FLASH_FLAG_ALL_ERRORS_BANK2);
#else
__HAL_FLASH_CLEAR_FLAG(FLASH_FLAG_EOP | FLASH_FLAG_OPERR | FLASH_FLAG_WRPERR |
- FLASH_FLAG_PGAERR | FLASH_FLAG_PGPERR | FLASH_FLAG_PGSERR);
+ FLASH_FLAG_PGAERR | FLASH_FLAG_PGPERR | FLASH_FLAG_PGSERR);
#endif
// erase the sector(s)
@@ -259,7 +260,7 @@
// program the flash uint64 by uint64
for (int i = 0; i < num_word32 / 2; i++) {
- uint64_t val = *(uint64_t*)src;
+ uint64_t val = *(uint64_t *)src;
if (HAL_FLASH_Program(FLASH_TYPEPROGRAM_DOUBLEWORD, flash_dest, val) != HAL_OK) {
// error occurred during flash write
HAL_FLASH_Lock(); // lock the flash
@@ -269,7 +270,7 @@
src += 2;
}
if ((num_word32 & 0x01) == 1) {
- uint64_t val = *(uint64_t*)flash_dest;
+ uint64_t val = *(uint64_t *)flash_dest;
val = (val & 0xffffffff00000000uL) | (*src);
if (HAL_FLASH_Program(FLASH_TYPEPROGRAM_DOUBLEWORD, flash_dest, val) != HAL_OK) {
// error occurred during flash write
diff --git a/ports/stm32/flashbdev.c b/ports/stm32/flashbdev.c
index beb28c4..bc3f6b0 100644
--- a/ports/stm32/flashbdev.c
+++ b/ports/stm32/flashbdev.c
@@ -111,9 +111,9 @@
#define FLASH_MEM_SEG1_NUM_BLOCKS (256) // Sector 1: 128k / 512b = 256 blocks
#elif defined(STM32L432xx) || \
- defined(STM32L451xx) || defined(STM32L452xx) || defined(STM32L462xx) || \
- defined(STM32L475xx) || defined(STM32L476xx) || defined(STM32L496xx) || \
- defined(STM32WB)
+ defined(STM32L451xx) || defined(STM32L452xx) || defined(STM32L462xx) || \
+ defined(STM32L475xx) || defined(STM32L476xx) || defined(STM32L496xx) || \
+ defined(STM32WB)
// The STM32L4xx doesn't have CCRAM, so we use SRAM2 for this, although
// actual location and size is defined by the linker script.
@@ -187,7 +187,7 @@
}
if (flash_cache_sector_id != flash_sector_id) {
flash_bdev_ioctl(BDEV_IOCTL_SYNC, 0);
- memcpy((void*)CACHE_MEM_START_ADDR, (const void*)flash_sector_start, flash_sector_size);
+ memcpy((void *)CACHE_MEM_START_ADDR, (const void *)flash_sector_start, flash_sector_size);
flash_cache_sector_id = flash_sector_id;
flash_cache_sector_start = flash_sector_start;
flash_cache_sector_size = flash_sector_size;
@@ -195,7 +195,7 @@
flash_flags |= FLASH_FLAG_DIRTY;
led_state(PYB_LED_RED, 1); // indicate a dirty cache with LED on
flash_tick_counter_last_write = HAL_GetTick();
- return (uint8_t*)CACHE_MEM_START_ADDR + flash_addr - flash_sector_start;
+ return (uint8_t *)CACHE_MEM_START_ADDR + flash_addr - flash_sector_start;
}
static uint8_t *flash_cache_get_addr_for_read(uint32_t flash_addr) {
@@ -204,10 +204,10 @@
uint32_t flash_sector_id = flash_get_sector_info(flash_addr, &flash_sector_start, &flash_sector_size);
if (flash_cache_sector_id == flash_sector_id) {
// in cache, copy from there
- return (uint8_t*)CACHE_MEM_START_ADDR + flash_addr - flash_sector_start;
+ return (uint8_t *)CACHE_MEM_START_ADDR + flash_addr - flash_sector_start;
}
// not in cache, copy straight from flash
- return (uint8_t*)flash_addr;
+ return (uint8_t *)flash_addr;
}
static uint32_t convert_block_to_flash_addr(uint32_t block) {
@@ -258,7 +258,7 @@
// On file close and flash unmount we get a forced write, so we can afford to wait a while
if ((flash_flags & FLASH_FLAG_FORCE_WRITE) || HAL_GetTick() - flash_tick_counter_last_write >= 5000) {
// sync the cache RAM buffer by writing it to the flash page
- flash_write(flash_cache_sector_start, (const uint32_t*)CACHE_MEM_START_ADDR, flash_cache_sector_size / 4);
+ flash_write(flash_cache_sector_start, (const uint32_t *)CACHE_MEM_START_ADDR, flash_cache_sector_size / 4);
// clear the flash flags now that we have a clean cache
flash_flags = 0;
// indicate a clean cache with LED off
diff --git a/ports/stm32/font_petme128_8x8.h b/ports/stm32/font_petme128_8x8.h
index cdc4e73..9963698 100644
--- a/ports/stm32/font_petme128_8x8.h
+++ b/ports/stm32/font_petme128_8x8.h
@@ -27,7 +27,7 @@
#define MICROPY_INCLUDED_STM32_FONT_PETME128_8X8_H
static const uint8_t font_petme128_8x8[] = {
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, // 32=
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, // 32=
0x00,0x00,0x00,0x4f,0x4f,0x00,0x00,0x00, // 33=!
0x00,0x07,0x07,0x00,0x00,0x07,0x07,0x00, // 34="
0x14,0x7f,0x7f,0x14,0x14,0x7f,0x7f,0x14, // 35=#
diff --git a/ports/stm32/gccollect.c b/ports/stm32/gccollect.c
index f5a49b7..cd7b22c 100644
--- a/ports/stm32/gccollect.c
+++ b/ports/stm32/gccollect.c
@@ -48,7 +48,7 @@
uintptr_t sp = gc_helper_get_regs_and_sp(regs);
// trace the stack, including the registers (since they live on the stack in this function)
- gc_collect_root((void**)sp, ((uint32_t)MP_STATE_THREAD(stack_top) - sp) / sizeof(uint32_t));
+ gc_collect_root((void **)sp, ((uint32_t)MP_STATE_THREAD(stack_top) - sp) / sizeof(uint32_t));
// trace root pointers from any threads
#if MICROPY_PY_THREAD
diff --git a/ports/stm32/help.c b/ports/stm32/help.c
index f9d97b7..fba0a69 100644
--- a/ports/stm32/help.c
+++ b/ports/stm32/help.c
@@ -27,45 +27,45 @@
#include "py/builtin.h"
const char stm32_help_text[] =
-"Welcome to MicroPython!\n"
-"\n"
-"For online help please visit http://micropython.org/help/.\n"
-"\n"
-"Quick overview of commands for the board:\n"
-" pyb.info() -- print some general information\n"
-" pyb.delay(n) -- wait for n milliseconds\n"
-" pyb.millis() -- get number of milliseconds since hard reset\n"
-" pyb.Switch() -- create a switch object\n"
-" Switch methods: (), callback(f)\n"
-" pyb.LED(n) -- create an LED object for LED n (n=1,2,3,4)\n"
-" LED methods: on(), off(), toggle(), intensity(<n>)\n"
-" pyb.Pin(pin) -- get a pin, eg pyb.Pin('X1')\n"
-" pyb.Pin(pin, m, [p]) -- get a pin and configure it for IO mode m, pull mode p\n"
-" Pin methods: init(..), value([v]), high(), low()\n"
-" pyb.ExtInt(pin, m, p, callback) -- create an external interrupt object\n"
-" pyb.ADC(pin) -- make an analog object from a pin\n"
-" ADC methods: read(), read_timed(buf, freq)\n"
-" pyb.DAC(port) -- make a DAC object\n"
-" DAC methods: triangle(freq), write(n), write_timed(buf, freq)\n"
-" pyb.RTC() -- make an RTC object; methods: datetime([val])\n"
-" pyb.rng() -- get a 30-bit hardware random number\n"
-" pyb.Servo(n) -- create Servo object for servo n (n=1,2,3,4)\n"
-" Servo methods: calibration(..), angle([x, [t]]), speed([x, [t]])\n"
-" pyb.Accel() -- create an Accelerometer object\n"
-" Accelerometer methods: x(), y(), z(), tilt(), filtered_xyz()\n"
-"\n"
-"Pins are numbered X1-X12, X17-X22, Y1-Y12, or by their MCU name\n"
-"Pin IO modes are: pyb.Pin.IN, pyb.Pin.OUT_PP, pyb.Pin.OUT_OD\n"
-"Pin pull modes are: pyb.Pin.PULL_NONE, pyb.Pin.PULL_UP, pyb.Pin.PULL_DOWN\n"
-"Additional serial bus objects: pyb.I2C(n), pyb.SPI(n), pyb.UART(n)\n"
-"\n"
-"Control commands:\n"
-" CTRL-A -- on a blank line, enter raw REPL mode\n"
-" CTRL-B -- on a blank line, enter normal REPL mode\n"
-" CTRL-C -- interrupt a running program\n"
-" CTRL-D -- on a blank line, do a soft reset of the board\n"
-" CTRL-E -- on a blank line, enter paste mode\n"
-"\n"
-"For further help on a specific object, type help(obj)\n"
-"For a list of available modules, type help('modules')\n"
+ "Welcome to MicroPython!\n"
+ "\n"
+ "For online help please visit http://micropython.org/help/.\n"
+ "\n"
+ "Quick overview of commands for the board:\n"
+ " pyb.info() -- print some general information\n"
+ " pyb.delay(n) -- wait for n milliseconds\n"
+ " pyb.millis() -- get number of milliseconds since hard reset\n"
+ " pyb.Switch() -- create a switch object\n"
+ " Switch methods: (), callback(f)\n"
+ " pyb.LED(n) -- create an LED object for LED n (n=1,2,3,4)\n"
+ " LED methods: on(), off(), toggle(), intensity(<n>)\n"
+ " pyb.Pin(pin) -- get a pin, eg pyb.Pin('X1')\n"
+ " pyb.Pin(pin, m, [p]) -- get a pin and configure it for IO mode m, pull mode p\n"
+ " Pin methods: init(..), value([v]), high(), low()\n"
+ " pyb.ExtInt(pin, m, p, callback) -- create an external interrupt object\n"
+ " pyb.ADC(pin) -- make an analog object from a pin\n"
+ " ADC methods: read(), read_timed(buf, freq)\n"
+ " pyb.DAC(port) -- make a DAC object\n"
+ " DAC methods: triangle(freq), write(n), write_timed(buf, freq)\n"
+ " pyb.RTC() -- make an RTC object; methods: datetime([val])\n"
+ " pyb.rng() -- get a 30-bit hardware random number\n"
+ " pyb.Servo(n) -- create Servo object for servo n (n=1,2,3,4)\n"
+ " Servo methods: calibration(..), angle([x, [t]]), speed([x, [t]])\n"
+ " pyb.Accel() -- create an Accelerometer object\n"
+ " Accelerometer methods: x(), y(), z(), tilt(), filtered_xyz()\n"
+ "\n"
+ "Pins are numbered X1-X12, X17-X22, Y1-Y12, or by their MCU name\n"
+ "Pin IO modes are: pyb.Pin.IN, pyb.Pin.OUT_PP, pyb.Pin.OUT_OD\n"
+ "Pin pull modes are: pyb.Pin.PULL_NONE, pyb.Pin.PULL_UP, pyb.Pin.PULL_DOWN\n"
+ "Additional serial bus objects: pyb.I2C(n), pyb.SPI(n), pyb.UART(n)\n"
+ "\n"
+ "Control commands:\n"
+ " CTRL-A -- on a blank line, enter raw REPL mode\n"
+ " CTRL-B -- on a blank line, enter normal REPL mode\n"
+ " CTRL-C -- interrupt a running program\n"
+ " CTRL-D -- on a blank line, do a soft reset of the board\n"
+ " CTRL-E -- on a blank line, enter paste mode\n"
+ "\n"
+ "For further help on a specific object, type help(obj)\n"
+ "For a list of available modules, type help('modules')\n"
;
diff --git a/ports/stm32/lcd.c b/ports/stm32/lcd.c
index 6dfda62..85bcc28 100644
--- a/ports/stm32/lcd.c
+++ b/ports/stm32/lcd.c
@@ -236,14 +236,23 @@
spi_clock = HAL_RCC_GetPCLK1Freq();
}
uint br_prescale = spi_clock / 16000000; // datasheet says LCD can run at 20MHz, but we go for 16MHz
- if (br_prescale <= 2) { init->BaudRatePrescaler = SPI_BAUDRATEPRESCALER_2; }
- else if (br_prescale <= 4) { init->BaudRatePrescaler = SPI_BAUDRATEPRESCALER_4; }
- else if (br_prescale <= 8) { init->BaudRatePrescaler = SPI_BAUDRATEPRESCALER_8; }
- else if (br_prescale <= 16) { init->BaudRatePrescaler = SPI_BAUDRATEPRESCALER_16; }
- else if (br_prescale <= 32) { init->BaudRatePrescaler = SPI_BAUDRATEPRESCALER_32; }
- else if (br_prescale <= 64) { init->BaudRatePrescaler = SPI_BAUDRATEPRESCALER_64; }
- else if (br_prescale <= 128) { init->BaudRatePrescaler = SPI_BAUDRATEPRESCALER_128; }
- else { init->BaudRatePrescaler = SPI_BAUDRATEPRESCALER_256; }
+ if (br_prescale <= 2) {
+ init->BaudRatePrescaler = SPI_BAUDRATEPRESCALER_2;
+ } else if (br_prescale <= 4) {
+ init->BaudRatePrescaler = SPI_BAUDRATEPRESCALER_4;
+ } else if (br_prescale <= 8) {
+ init->BaudRatePrescaler = SPI_BAUDRATEPRESCALER_8;
+ } else if (br_prescale <= 16) {
+ init->BaudRatePrescaler = SPI_BAUDRATEPRESCALER_16;
+ } else if (br_prescale <= 32) {
+ init->BaudRatePrescaler = SPI_BAUDRATEPRESCALER_32;
+ } else if (br_prescale <= 64) {
+ init->BaudRatePrescaler = SPI_BAUDRATEPRESCALER_64;
+ } else if (br_prescale <= 128) {
+ init->BaudRatePrescaler = SPI_BAUDRATEPRESCALER_128;
+ } else {
+ init->BaudRatePrescaler = SPI_BAUDRATEPRESCALER_256;
+ }
// data is sent bigendian, latches on rising clock
init->CLKPolarity = SPI_POLARITY_HIGH;
@@ -328,7 +337,7 @@
// send the data
for (uint i = 0; i < bufinfo.len; i++) {
- lcd_out(self, instr_data, ((byte*)bufinfo.buf)[i]);
+ lcd_out(self, instr_data, ((byte *)bufinfo.buf)[i]);
}
return mp_const_none;
@@ -452,7 +461,7 @@
// loop over chars
for (const char *top = data + len; data < top; data++) {
// get char and make sure its in range of font
- uint chr = *(byte*)data;
+ uint chr = *(byte *)data;
if (chr < 32 || chr > 127) {
chr = 127;
}
@@ -521,7 +530,7 @@
{ &mp_type_type },
.name = MP_QSTR_LCD,
.make_new = pyb_lcd_make_new,
- .locals_dict = (mp_obj_dict_t*)&pyb_lcd_locals_dict,
+ .locals_dict = (mp_obj_dict_t *)&pyb_lcd_locals_dict,
};
#endif // MICROPY_HW_HAS_LCD
diff --git a/ports/stm32/led.c b/ports/stm32/led.c
index e05849c..d04557f 100644
--- a/ports/stm32/led.c
+++ b/ports/stm32/led.c
@@ -52,15 +52,15 @@
STATIC const pyb_led_obj_t pyb_led_obj[] = {
{{&pyb_led_type}, 1, MICROPY_HW_LED1},
-#if defined(MICROPY_HW_LED2)
+ #if defined(MICROPY_HW_LED2)
{{&pyb_led_type}, 2, MICROPY_HW_LED2},
-#if defined(MICROPY_HW_LED3)
+ #if defined(MICROPY_HW_LED3)
{{&pyb_led_type}, 3, MICROPY_HW_LED3},
-#if defined(MICROPY_HW_LED4)
+ #if defined(MICROPY_HW_LED4)
{{&pyb_led_type}, 4, MICROPY_HW_LED4},
-#endif
-#endif
-#endif
+ #endif
+ #endif
+ #endif
};
#define NUM_LEDS MP_ARRAY_SIZE(pyb_led_obj)
@@ -102,7 +102,7 @@
#define LED_PWM_TIM_PERIOD (10000) // TIM runs at 1MHz and fires every 10ms
// this gives the address of the CCR register for channels 1-4
-#define LED_PWM_CCR(pwm_cfg) ((volatile uint32_t*)&(pwm_cfg)->tim->CCR1 + ((pwm_cfg)->tim_channel >> 2))
+#define LED_PWM_CCR(pwm_cfg) ((volatile uint32_t *)&(pwm_cfg)->tim->CCR1 + ((pwm_cfg)->tim_channel >> 2))
typedef struct _led_pwm_config_t {
TIM_TypeDef *tim;
@@ -135,10 +135,17 @@
// TIM configuration
switch (pwm_cfg->tim_id) {
- case 1: __TIM1_CLK_ENABLE(); break;
- case 2: __TIM2_CLK_ENABLE(); break;
- case 3: __TIM3_CLK_ENABLE(); break;
- default: assert(0);
+ case 1:
+ __TIM1_CLK_ENABLE();
+ break;
+ case 2:
+ __TIM2_CLK_ENABLE();
+ break;
+ case 3:
+ __TIM3_CLK_ENABLE();
+ break;
+ default:
+ assert(0);
}
TIM_HandleTypeDef tim = {0};
tim.Instance = pwm_cfg->tim;
@@ -361,7 +368,7 @@
.name = MP_QSTR_LED,
.print = led_obj_print,
.make_new = led_obj_make_new,
- .locals_dict = (mp_obj_dict_t*)&led_locals_dict,
+ .locals_dict = (mp_obj_dict_t *)&led_locals_dict,
};
#else
diff --git a/ports/stm32/machine_adc.c b/ports/stm32/machine_adc.c
index 9fe00bd..71ee537 100644
--- a/ports/stm32/machine_adc.c
+++ b/ports/stm32/machine_adc.c
@@ -446,5 +446,5 @@
.name = MP_QSTR_ADC,
.print = machine_adc_print,
.make_new = machine_adc_make_new,
- .locals_dict = (mp_obj_dict_t*)&machine_adc_locals_dict,
+ .locals_dict = (mp_obj_dict_t *)&machine_adc_locals_dict,
};
diff --git a/ports/stm32/machine_i2c.c b/ports/stm32/machine_i2c.c
index 6e08666..1c703b1 100644
--- a/ports/stm32/machine_i2c.c
+++ b/ports/stm32/machine_i2c.c
@@ -242,7 +242,7 @@
}
// get static peripheral object
- machine_hard_i2c_obj_t *self = (machine_hard_i2c_obj_t*)&machine_hard_i2c_obj[i2c_id - 1];
+ machine_hard_i2c_obj_t *self = (machine_hard_i2c_obj_t *)&machine_hard_i2c_obj[i2c_id - 1];
// here we would check the scl/sda pins and configure them, but it's not implemented
if (args[ARG_scl].u_obj != MP_OBJ_NULL || args[ARG_sda].u_obj != MP_OBJ_NULL) {
@@ -272,7 +272,7 @@
.print = machine_hard_i2c_print,
.make_new = machine_hard_i2c_make_new,
.protocol = &machine_hard_i2c_p,
- .locals_dict = (mp_obj_dict_t*)&mp_machine_soft_i2c_locals_dict,
+ .locals_dict = (mp_obj_dict_t *)&mp_machine_soft_i2c_locals_dict,
};
#endif // MICROPY_HW_ENABLE_HW_I2C
diff --git a/ports/stm32/machine_spi.c b/ports/stm32/machine_spi.c
index dedcafc..d012d70 100644
--- a/ports/stm32/machine_spi.c
+++ b/ports/stm32/machine_spi.c
@@ -95,7 +95,7 @@
}
STATIC void machine_hard_spi_init(mp_obj_base_t *self_in, size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
- machine_hard_spi_obj_t *self = (machine_hard_spi_obj_t*)self_in;
+ machine_hard_spi_obj_t *self = (machine_hard_spi_obj_t *)self_in;
enum { ARG_baudrate, ARG_polarity, ARG_phase, ARG_bits, ARG_firstbit };
static const mp_arg_t allowed_args[] = {
@@ -118,12 +118,12 @@
}
STATIC void machine_hard_spi_deinit(mp_obj_base_t *self_in) {
- machine_hard_spi_obj_t *self = (machine_hard_spi_obj_t*)self_in;
+ machine_hard_spi_obj_t *self = (machine_hard_spi_obj_t *)self_in;
spi_deinit(self->spi);
}
STATIC void machine_hard_spi_transfer(mp_obj_base_t *self_in, size_t len, const uint8_t *src, uint8_t *dest) {
- machine_hard_spi_obj_t *self = (machine_hard_spi_obj_t*)self_in;
+ machine_hard_spi_obj_t *self = (machine_hard_spi_obj_t *)self_in;
spi_transfer(self->spi, len, src, dest, SPI_TRANSFER_TIMEOUT(len));
}
@@ -139,5 +139,5 @@
.print = machine_hard_spi_print,
.make_new = mp_machine_spi_make_new, // delegate to master constructor
.protocol = &machine_hard_spi_p,
- .locals_dict = (mp_obj_dict_t*)&mp_machine_spi_locals_dict,
+ .locals_dict = (mp_obj_dict_t *)&mp_machine_spi_locals_dict,
};
diff --git a/ports/stm32/machine_timer.c b/ports/stm32/machine_timer.c
index 1e9be42..daaf51b 100644
--- a/ports/stm32/machine_timer.c
+++ b/ports/stm32/machine_timer.c
@@ -128,5 +128,5 @@
.name = MP_QSTR_Timer,
.print = machine_timer_print,
.make_new = machine_timer_make_new,
- .locals_dict = (mp_obj_dict_t*)&machine_timer_locals_dict,
+ .locals_dict = (mp_obj_dict_t *)&machine_timer_locals_dict,
};
diff --git a/ports/stm32/machine_uart.c b/ports/stm32/machine_uart.c
index 96cab07..f9fa321 100644
--- a/ports/stm32/machine_uart.c
+++ b/ports/stm32/machine_uart.c
@@ -188,7 +188,7 @@
if (cr3 & USART_CR3_RTSE) {
mp_print_str(print, "RTS");
if (cr3 & USART_CR3_CTSE) {
- mp_print_str(print, "|");
+ mp_print_str(print, "|");
}
}
if (cr3 & USART_CR3_CTSE) {
@@ -235,7 +235,7 @@
mp_arg_val_t baudrate, bits, parity, stop, flow, timeout, timeout_char, rxbuf, read_buf_len;
} args;
mp_arg_parse_all(n_args, pos_args, kw_args,
- MP_ARRAY_SIZE(allowed_args), allowed_args, (mp_arg_val_t*)&args);
+ MP_ARRAY_SIZE(allowed_args), allowed_args, (mp_arg_val_t *)&args);
// static UARTs are used for internal purposes and shouldn't be reconfigured
if (self->is_static) {
@@ -272,8 +272,12 @@
// stop bits
uint32_t stop;
switch (args.stop.u_int) {
- case 1: stop = UART_STOPBITS_1; break;
- default: stop = UART_STOPBITS_2; break;
+ case 1:
+ stop = UART_STOPBITS_1;
+ break;
+ default:
+ stop = UART_STOPBITS_2;
+ break;
}
// flow control
@@ -596,7 +600,7 @@
for (;;) {
int data = uart_rx_char(self);
if (self->char_width == CHAR_WIDTH_9BIT) {
- *(uint16_t*)buf = data;
+ *(uint16_t *)buf = data;
buf += 2;
} else {
*buf++ = data;
@@ -669,5 +673,5 @@
.getiter = mp_identity_getiter,
.iternext = mp_stream_unbuffered_iter,
.protocol = &uart_stream_p,
- .locals_dict = (mp_obj_dict_t*)&pyb_uart_locals_dict,
+ .locals_dict = (mp_obj_dict_t *)&pyb_uart_locals_dict,
};
diff --git a/ports/stm32/main.c b/ports/stm32/main.c
index 45bacbc..e221df0 100644
--- a/ports/stm32/main.c
+++ b/ports/stm32/main.c
@@ -166,7 +166,7 @@
mp_int_t ret = -MP_EIO;
if (nlr_push(&nlr) == 0) {
mp_obj_t args[] = { bdev, mount_point };
- mp_vfs_mount(2, args, (mp_map_t*)&mp_const_empty_map);
+ mp_vfs_mount(2, args, (mp_map_t *)&mp_const_empty_map);
mp_vfs_chdir(mount_point);
ret = 0; // success
nlr_pop();
@@ -203,7 +203,7 @@
#if MICROPY_VFS_LFS1
if (memcmp(&buf[40], "littlefs", 8) == 0) {
// LFS1
- lfs1_superblock_t *superblock = (void*)&buf[12];
+ lfs1_superblock_t *superblock = (void *)&buf[12];
uint32_t block_size = lfs1_fromle32(superblock->d.block_size);
uint32_t block_count = lfs1_fromle32(superblock->d.block_count);
len = block_count * block_size;
@@ -213,7 +213,7 @@
#if MICROPY_VFS_LFS2
if (memcmp(&buf[8], "littlefs", 8) == 0) {
// LFS2
- lfs2_superblock_t *superblock = (void*)&buf[20];
+ lfs2_superblock_t *superblock = (void *)&buf[20];
uint32_t block_size = lfs2_fromle32(superblock->block_size);
uint32_t block_count = lfs2_fromle32(superblock->block_count);
len = block_count * block_size;
@@ -473,20 +473,20 @@
__HAL_RCC_GPIOD_CLK_ENABLE();
#endif
- #if defined(STM32F4) || defined(STM32F7)
- #if defined(__HAL_RCC_DTCMRAMEN_CLK_ENABLE)
- // The STM32F746 doesn't really have CCM memory, but it does have DTCM,
- // which behaves more or less like normal SRAM.
- __HAL_RCC_DTCMRAMEN_CLK_ENABLE();
- #elif defined(CCMDATARAM_BASE)
- // enable the CCM RAM
- __HAL_RCC_CCMDATARAMEN_CLK_ENABLE();
- #endif
+ #if defined(STM32F4) || defined(STM32F7)
+ #if defined(__HAL_RCC_DTCMRAMEN_CLK_ENABLE)
+ // The STM32F746 doesn't really have CCM memory, but it does have DTCM,
+ // which behaves more or less like normal SRAM.
+ __HAL_RCC_DTCMRAMEN_CLK_ENABLE();
+ #elif defined(CCMDATARAM_BASE)
+ // enable the CCM RAM
+ __HAL_RCC_CCMDATARAMEN_CLK_ENABLE();
+ #endif
#elif defined(STM32H7)
- // Enable D2 SRAM1/2/3 clocks.
- __HAL_RCC_D2SRAM1_CLK_ENABLE();
- __HAL_RCC_D2SRAM2_CLK_ENABLE();
- __HAL_RCC_D2SRAM3_CLK_ENABLE();
+ // Enable D2 SRAM1/2/3 clocks.
+ __HAL_RCC_D2SRAM1_CLK_ENABLE();
+ __HAL_RCC_D2SRAM2_CLK_ENABLE();
+ __HAL_RCC_D2SRAM3_CLK_ENABLE();
#endif
@@ -549,9 +549,9 @@
cyw43_init(&cyw43_state);
uint8_t buf[8];
memcpy(&buf[0], "PYBD", 4);
- mp_hal_get_mac_ascii(MP_HAL_MAC_WLAN0, 8, 4, (char*)&buf[4]);
+ mp_hal_get_mac_ascii(MP_HAL_MAC_WLAN0, 8, 4, (char *)&buf[4]);
cyw43_wifi_ap_set_ssid(&cyw43_state, 8, buf);
- cyw43_wifi_ap_set_password(&cyw43_state, 8, (const uint8_t*)"pybd0123");
+ cyw43_wifi_ap_set_password(&cyw43_state, 8, (const uint8_t *)"pybd0123");
}
#endif
@@ -594,7 +594,7 @@
// to recover from limit hit. (Limit is measured in bytes.)
// Note: stack control relies on main thread being initialised above
mp_stack_set_top(&_estack);
- mp_stack_set_limit((char*)&_estack - (char*)&_sstack - 1024);
+ mp_stack_set_limit((char *)&_estack - (char *)&_sstack - 1024);
// GC init
gc_init(MICROPY_HEAP_START, MICROPY_HEAP_END);
diff --git a/ports/stm32/make-stmconst.py b/ports/stm32/make-stmconst.py
index 41ec9b5..1b3cc08 100644
--- a/ports/stm32/make-stmconst.py
+++ b/ports/stm32/make-stmconst.py
@@ -11,16 +11,23 @@
# Python 2/3 compatibility
import platform
-if platform.python_version_tuple()[0] == '2':
+
+if platform.python_version_tuple()[0] == "2":
+
def convert_bytes_to_str(b):
return b
-elif platform.python_version_tuple()[0] == '3':
+
+
+elif platform.python_version_tuple()[0] == "3":
+
def convert_bytes_to_str(b):
try:
- return str(b, 'utf8')
+ return str(b, "utf8")
except ValueError:
# some files have invalid utf8 bytes, so filter them out
- return ''.join(chr(l) for l in b if l <= 126)
+ return "".join(chr(l) for l in b if l <= 126)
+
+
# end compatibility code
# given a list of (name,regex) pairs, find the first one that matches the given line
@@ -31,29 +38,64 @@
return name, match
return None, None
+
class LexerError(Exception):
def __init__(self, line):
self.line = line
+
class Lexer:
- re_io_reg = r'__IO uint(?P<bits>8|16|32)_t +(?P<reg>[A-Z0-9]+)'
- re_comment = r'(?P<comment>[A-Za-z0-9 \-/_()&]+)'
- re_addr_offset = r'Address offset: (?P<offset>0x[0-9A-Z]{2,3})'
+ re_io_reg = r"__IO uint(?P<bits>8|16|32)_t +(?P<reg>[A-Z0-9]+)"
+ re_comment = r"(?P<comment>[A-Za-z0-9 \-/_()&]+)"
+ re_addr_offset = r"Address offset: (?P<offset>0x[0-9A-Z]{2,3})"
regexs = (
- ('#define hex', re.compile(r'#define +(?P<id>[A-Z0-9_]+) +\(?(\(uint32_t\))?(?P<hex>0x[0-9A-F]+)U?L?\)?($| */\*)')),
- ('#define X', re.compile(r'#define +(?P<id>[A-Z0-9_]+) +(?P<id2>[A-Z0-9_]+)($| +/\*)')),
- ('#define X+hex', re.compile(r'#define +(?P<id>[A-Za-z0-9_]+) +\(?(?P<id2>[A-Z0-9_]+) \+ (?P<hex>0x[0-9A-F]+)U?L?\)?($| +/\*)')),
- ('#define typedef', re.compile(r'#define +(?P<id>[A-Z0-9_]+(ext)?) +\(\([A-Za-z0-9_]+_TypeDef \*\) (?P<id2>[A-Za-z0-9_]+)\)($| +/\*)')),
- ('typedef struct', re.compile(r'typedef struct$')),
- ('{', re.compile(r'{$')),
- ('}', re.compile(r'}$')),
- ('} TypeDef', re.compile(r'} *(?P<id>[A-Z][A-Za-z0-9_]+)_(?P<global>([A-Za-z0-9_]+)?)TypeDef;$')),
- ('IO reg', re.compile(re_io_reg + r'; */\*!< *' + re_comment + r', +' + re_addr_offset + r' *\*/')),
- ('IO reg array', re.compile(re_io_reg + r'\[(?P<array>[2-8])\]; */\*!< *' + re_comment + r', +' + re_addr_offset + r'-(0x[0-9A-Z]{2,3}) *\*/')),
+ (
+ "#define hex",
+ re.compile(
+ r"#define +(?P<id>[A-Z0-9_]+) +\(?(\(uint32_t\))?(?P<hex>0x[0-9A-F]+)U?L?\)?($| */\*)"
+ ),
+ ),
+ ("#define X", re.compile(r"#define +(?P<id>[A-Z0-9_]+) +(?P<id2>[A-Z0-9_]+)($| +/\*)")),
+ (
+ "#define X+hex",
+ re.compile(
+ r"#define +(?P<id>[A-Za-z0-9_]+) +\(?(?P<id2>[A-Z0-9_]+) \+ (?P<hex>0x[0-9A-F]+)U?L?\)?($| +/\*)"
+ ),
+ ),
+ (
+ "#define typedef",
+ re.compile(
+ r"#define +(?P<id>[A-Z0-9_]+(ext)?) +\(\([A-Za-z0-9_]+_TypeDef \*\) (?P<id2>[A-Za-z0-9_]+)\)($| +/\*)"
+ ),
+ ),
+ ("typedef struct", re.compile(r"typedef struct$")),
+ ("{", re.compile(r"{$")),
+ ("}", re.compile(r"}$")),
+ (
+ "} TypeDef",
+ re.compile(r"} *(?P<id>[A-Z][A-Za-z0-9_]+)_(?P<global>([A-Za-z0-9_]+)?)TypeDef;$"),
+ ),
+ (
+ "IO reg",
+ re.compile(
+ re_io_reg + r"; */\*!< *" + re_comment + r", +" + re_addr_offset + r" *\*/"
+ ),
+ ),
+ (
+ "IO reg array",
+ re.compile(
+ re_io_reg
+ + r"\[(?P<array>[2-8])\]; */\*!< *"
+ + re_comment
+ + r", +"
+ + re_addr_offset
+ + r"-(0x[0-9A-Z]{2,3}) *\*/"
+ ),
+ ),
)
def __init__(self, filename):
- self.file = open(filename, 'rb')
+ self.file = open(filename, "rb")
self.line_number = 0
def next_match(self, strictly_next=False):
@@ -62,7 +104,7 @@
line = convert_bytes_to_str(line)
self.line_number += 1
if len(line) == 0:
- return ('EOF', None)
+ return ("EOF", None)
match = re_match_first(Lexer.regexs, line.strip())
if strictly_next or match[0] is not None:
return match
@@ -73,6 +115,7 @@
raise LexerError(self.line_number)
return match
+
def parse_file(filename):
lexer = Lexer(filename)
@@ -81,71 +124,75 @@
periphs = []
while True:
m = lexer.next_match()
- if m[0] == 'EOF':
+ if m[0] == "EOF":
break
- elif m[0] == '#define hex':
+ elif m[0] == "#define hex":
d = m[1].groupdict()
- consts[d['id']] = int(d['hex'], base=16)
- elif m[0] == '#define X':
+ consts[d["id"]] = int(d["hex"], base=16)
+ elif m[0] == "#define X":
d = m[1].groupdict()
- if d['id2'] in consts:
- consts[d['id']] = consts[d['id2']]
- elif m[0] == '#define X+hex':
+ if d["id2"] in consts:
+ consts[d["id"]] = consts[d["id2"]]
+ elif m[0] == "#define X+hex":
d = m[1].groupdict()
- if d['id2'] in consts:
- consts[d['id']] = consts[d['id2']] + int(d['hex'], base=16)
- elif m[0] == '#define typedef':
+ if d["id2"] in consts:
+ consts[d["id"]] = consts[d["id2"]] + int(d["hex"], base=16)
+ elif m[0] == "#define typedef":
d = m[1].groupdict()
- if d['id2'] in consts:
- periphs.append((d['id'], consts[d['id2']]))
- elif m[0] == 'typedef struct':
- lexer.must_match('{')
+ if d["id2"] in consts:
+ periphs.append((d["id"], consts[d["id2"]]))
+ elif m[0] == "typedef struct":
+ lexer.must_match("{")
m = lexer.next_match()
regs = []
- while m[0] in ('IO reg', 'IO reg array'):
+ while m[0] in ("IO reg", "IO reg array"):
d = m[1].groupdict()
- reg = d['reg']
- offset = int(d['offset'], base=16)
- bits = int(d['bits'])
- comment = d['comment']
- if m[0] == 'IO reg':
+ reg = d["reg"]
+ offset = int(d["offset"], base=16)
+ bits = int(d["bits"])
+ comment = d["comment"]
+ if m[0] == "IO reg":
regs.append((reg, offset, bits, comment))
else:
- for i in range(int(d['array'])):
+ for i in range(int(d["array"])):
regs.append((reg + str(i), offset + i * bits // 8, bits, comment))
m = lexer.next_match()
- if m[0] == '}':
+ if m[0] == "}":
pass
- elif m[0] == '} TypeDef':
- reg_defs[m[1].groupdict()['id']] = regs
+ elif m[0] == "} TypeDef":
+ reg_defs[m[1].groupdict()["id"]] = regs
else:
raise LexerError(lexer.line_number)
return periphs, reg_defs
+
def print_int_obj(val, needed_mpzs):
if -0x40000000 <= val < 0x40000000:
- print('MP_ROM_INT(%#x)' % val, end='')
+ print("MP_ROM_INT(%#x)" % val, end="")
else:
- print('MP_ROM_PTR(&mpz_%08x)' % val, end='')
+ print("MP_ROM_PTR(&mpz_%08x)" % val, end="")
needed_mpzs.add(val)
+
def print_periph(periph_name, periph_val, needed_qstrs, needed_mpzs):
qstr = periph_name.upper()
- print('{ MP_ROM_QSTR(MP_QSTR_%s), ' % qstr, end='')
+ print("{ MP_ROM_QSTR(MP_QSTR_%s), " % qstr, end="")
print_int_obj(periph_val, needed_mpzs)
- print(' },')
+ print(" },")
needed_qstrs.add(qstr)
+
def print_regs(reg_name, reg_defs, needed_qstrs, needed_mpzs):
reg_name = reg_name.upper()
for r in reg_defs:
- qstr = reg_name + '_' + r[0]
- print('{ MP_ROM_QSTR(MP_QSTR_%s), ' % qstr, end='')
+ qstr = reg_name + "_" + r[0]
+ print("{ MP_ROM_QSTR(MP_QSTR_%s), " % qstr, end="")
print_int_obj(r[1], needed_mpzs)
- print(' }, // %s-bits, %s' % (r[2], r[3]))
+ print(" }, // %s-bits, %s" % (r[2], r[3]))
needed_qstrs.add(qstr)
+
# This version of print regs groups registers together into submodules (eg GPIO submodule).
# This makes the qstrs shorter, and makes the list of constants more manageable (since
# they are not all in one big module) but it is then harder to compile the constants, and
@@ -154,21 +201,28 @@
# And for the number of constants we have, this function seems to use about the same amount
# of ROM as print_regs.
def print_regs_as_submodules(reg_name, reg_defs, modules, needed_qstrs):
- mod_name_lower = reg_name.lower() + '_'
+ mod_name_lower = reg_name.lower() + "_"
mod_name_upper = mod_name_lower.upper()
modules.append((mod_name_lower, mod_name_upper))
- print("""
+ print(
+ """
STATIC const mp_rom_map_elem_t stm_%s_globals_table[] = {
{ MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_%s) },
-""" % (mod_name_lower, mod_name_upper))
+"""
+ % (mod_name_lower, mod_name_upper)
+ )
needed_qstrs.add(mod_name_upper)
for r in reg_defs:
- print(' { MP_ROM_QSTR(MP_QSTR_%s), MP_ROM_INT(%#x) }, // %s-bits, %s' % (r[0], r[1], r[2], r[3]))
+ print(
+ " { MP_ROM_QSTR(MP_QSTR_%s), MP_ROM_INT(%#x) }, // %s-bits, %s"
+ % (r[0], r[1], r[2], r[3])
+ )
needed_qstrs.add(r[0])
- print("""};
+ print(
+ """};
STATIC MP_DEFINE_CONST_DICT(stm_%s_globals, stm_%s_globals_table);
@@ -177,23 +231,35 @@
.name = MP_QSTR_%s,
.globals = (mp_obj_dict_t*)&stm_%s_globals,
};
-""" % (mod_name_lower, mod_name_lower, mod_name_lower, mod_name_upper, mod_name_lower))
+"""
+ % (mod_name_lower, mod_name_lower, mod_name_lower, mod_name_upper, mod_name_lower)
+ )
+
def main():
- cmd_parser = argparse.ArgumentParser(description='Extract ST constants from a C header file.')
- cmd_parser.add_argument('file', nargs=1, help='input file')
- cmd_parser.add_argument('-q', '--qstr', dest='qstr_filename', default='build/stmconst_qstr.h',
- help='Specified the name of the generated qstr header file')
- cmd_parser.add_argument('--mpz', dest='mpz_filename', default='build/stmconst_mpz.h',
- help='the destination file of the generated mpz header')
+ cmd_parser = argparse.ArgumentParser(description="Extract ST constants from a C header file.")
+ cmd_parser.add_argument("file", nargs=1, help="input file")
+ cmd_parser.add_argument(
+ "-q",
+ "--qstr",
+ dest="qstr_filename",
+ default="build/stmconst_qstr.h",
+ help="Specified the name of the generated qstr header file",
+ )
+ cmd_parser.add_argument(
+ "--mpz",
+ dest="mpz_filename",
+ default="build/stmconst_mpz.h",
+ help="the destination file of the generated mpz header",
+ )
args = cmd_parser.parse_args()
periphs, reg_defs = parse_file(args.file[0])
# add legacy GPIO constants that were removed when upgrading CMSIS
- if 'GPIO' in reg_defs and 'stm32f4' in args.file[0]:
- reg_defs['GPIO'].append(['BSRRL', 0x18, 16, 'legacy register'])
- reg_defs['GPIO'].append(['BSRRH', 0x1a, 16, 'legacy register'])
+ if "GPIO" in reg_defs and "stm32f4" in args.file[0]:
+ reg_defs["GPIO"].append(["BSRRL", 0x18, 16, "legacy register"])
+ reg_defs["GPIO"].append(["BSRRH", 0x1A, 16, "legacy register"])
modules = []
needed_qstrs = set()
@@ -206,55 +272,60 @@
print_periph(periph_name, periph_val, needed_qstrs, needed_mpzs)
for reg in (
- 'ADC',
+ "ADC",
#'ADC_Common',
#'CAN_TxMailBox',
#'CAN_FIFOMailBox',
#'CAN_FilterRegister',
#'CAN',
- 'CRC',
- 'DAC',
- 'DBGMCU',
- 'DMA_Stream',
- 'DMA',
- 'EXTI',
- 'FLASH',
- 'GPIO',
- 'SYSCFG',
- 'I2C',
- 'IWDG',
- 'PWR',
- 'RCC',
- 'RTC',
+ "CRC",
+ "DAC",
+ "DBGMCU",
+ "DMA_Stream",
+ "DMA",
+ "EXTI",
+ "FLASH",
+ "GPIO",
+ "SYSCFG",
+ "I2C",
+ "IWDG",
+ "PWR",
+ "RCC",
+ "RTC",
#'SDIO',
- 'SPI',
- 'TIM',
- 'USART',
- 'WWDG',
- 'RNG',
- ):
+ "SPI",
+ "TIM",
+ "USART",
+ "WWDG",
+ "RNG",
+ ):
if reg in reg_defs:
print_regs(reg, reg_defs[reg], needed_qstrs, needed_mpzs)
- #print_regs_as_submodules(reg, reg_defs[reg], modules, needed_qstrs)
+ # print_regs_as_submodules(reg, reg_defs[reg], modules, needed_qstrs)
- #print("#define MOD_STM_CONST_MODULES \\")
- #for mod_lower, mod_upper in modules:
+ # print("#define MOD_STM_CONST_MODULES \\")
+ # for mod_lower, mod_upper in modules:
# print(" { MP_ROM_QSTR(MP_QSTR_%s), MP_ROM_PTR(&stm_%s_obj) }, \\" % (mod_upper, mod_lower))
print("")
- with open(args.qstr_filename, 'wt') as qstr_file:
- print('#if MICROPY_PY_STM', file=qstr_file)
+ with open(args.qstr_filename, "wt") as qstr_file:
+ print("#if MICROPY_PY_STM", file=qstr_file)
for qstr in sorted(needed_qstrs):
- print('Q({})'.format(qstr), file=qstr_file)
- print('#endif // MICROPY_PY_STM', file=qstr_file)
+ print("Q({})".format(qstr), file=qstr_file)
+ print("#endif // MICROPY_PY_STM", file=qstr_file)
- with open(args.mpz_filename, 'wt') as mpz_file:
+ with open(args.mpz_filename, "wt") as mpz_file:
for mpz in sorted(needed_mpzs):
- assert 0 <= mpz <= 0xffffffff
- print('STATIC const mp_obj_int_t mpz_%08x = {{&mp_type_int}, '
- '{.neg=0, .fixed_dig=1, .alloc=2, .len=2, ' '.dig=(uint16_t*)(const uint16_t[]){%#x, %#x}}};'
- % (mpz, mpz & 0xffff, (mpz >> 16) & 0xffff), file=mpz_file)
+ assert 0 <= mpz <= 0xFFFFFFFF
+ print(
+ "STATIC const mp_obj_int_t mpz_%08x = {{&mp_type_int}, "
+ "{.neg=0, .fixed_dig=1, .alloc=2, .len=2, "
+ ".dig=(uint16_t*)(const uint16_t[]){%#x, %#x}}};"
+ % (mpz, mpz & 0xFFFF, (mpz >> 16) & 0xFFFF),
+ file=mpz_file,
+ )
+
if __name__ == "__main__":
main()
diff --git a/ports/stm32/mboot/fwupdate.py b/ports/stm32/mboot/fwupdate.py
index b2690e8..b44ed77 100644
--- a/ports/stm32/mboot/fwupdate.py
+++ b/ports/stm32/mboot/fwupdate.py
@@ -6,7 +6,7 @@
FLASH_KEY1 = 0x45670123
-FLASH_KEY2 = 0xcdef89ab
+FLASH_KEY2 = 0xCDEF89AB
def check_mem_contains(addr, buf):
@@ -17,99 +17,100 @@
return False
return True
+
def check_mem_erased(addr, size):
mem16 = stm.mem16
r = range(0, size, 2)
for off in r:
- if mem16[addr + off] != 0xffff:
+ if mem16[addr + off] != 0xFFFF:
return False
return True
+
def dfu_read(filename):
- f = open(filename, 'rb')
+ f = open(filename, "rb")
hdr = f.read(3)
f.seek(0)
- if hdr == b'Dfu':
+ if hdr == b"Dfu":
pass
- elif hdr == b'\x1f\x8b\x08':
+ elif hdr == b"\x1f\x8b\x08":
f = uzlib.DecompIO(f, 16 + 15)
else:
- print('Invalid firmware', filename)
+ print("Invalid firmware", filename)
return None
elems = []
hdr = f.read(11)
- sig, ver, size, num_targ = struct.unpack('<5sBIB', hdr)
+ sig, ver, size, num_targ = struct.unpack("<5sBIB", hdr)
file_offset = 11
for i in range(num_targ):
hdr = f.read(274)
- sig, alt, has_name, name, t_size, num_elem = struct.unpack('<6sBi255sII', hdr)
+ sig, alt, has_name, name, t_size, num_elem = struct.unpack("<6sBi255sII", hdr)
file_offset += 274
file_offset_t = file_offset
for j in range(num_elem):
hdr = f.read(8)
- addr, e_size = struct.unpack('<II', hdr)
+ addr, e_size = struct.unpack("<II", hdr)
data = f.read(e_size)
elems.append((addr, data))
file_offset += 8 + e_size
if t_size != file_offset - file_offset_t:
- print('corrupt DFU', t_size, file_offset - file_offset_t)
+ print("corrupt DFU", t_size, file_offset - file_offset_t)
return None
if size != file_offset:
- print('corrupt DFU', size, file_offset)
+ print("corrupt DFU", size, file_offset)
return None
hdr = f.read(16)
- hdr = struct.unpack('<HHHH3sBI', hdr)
+ hdr = struct.unpack("<HHHH3sBI", hdr)
return elems
+
def flash_wait_not_busy():
while stm.mem32[stm.FLASH + stm.FLASH_SR] & 1 << 16:
machine.idle()
+
def flash_unlock():
stm.mem32[stm.FLASH + stm.FLASH_KEYR] = FLASH_KEY1
stm.mem32[stm.FLASH + stm.FLASH_KEYR] = FLASH_KEY2
+
def flash_lock():
- stm.mem32[stm.FLASH + stm.FLASH_CR] = 1 << 31 # LOCK
+ stm.mem32[stm.FLASH + stm.FLASH_CR] = 1 << 31 # LOCK
+
def flash_erase_sector(sector):
- assert 0 <= sector <= 7 # for F722
+ assert 0 <= sector <= 7 # for F722
flash_wait_not_busy()
- cr = (
- 2 << 8 # PSIZE = 32 bits
- | sector << 3 # SNB
- | 1 << 1 # SER
- )
+ cr = 2 << 8 | sector << 3 | 1 << 1 # PSIZE = 32 bits # SNB # SER
stm.mem32[stm.FLASH + stm.FLASH_CR] = cr
- stm.mem32[stm.FLASH + stm.FLASH_CR] = cr | 1 << 16 # STRT
+ stm.mem32[stm.FLASH + stm.FLASH_CR] = cr | 1 << 16 # STRT
flash_wait_not_busy()
stm.mem32[stm.FLASH + stm.FLASH_CR] = 0
+
def flash_write(addr, buf):
assert len(buf) % 4 == 0
flash_wait_not_busy()
- cr = (
- 2 << 8 # PSIZE = 32 bits
- | 1 << 0 # PG
- )
+ cr = 2 << 8 | 1 << 0 # PSIZE = 32 bits # PG
stm.mem32[stm.FLASH + stm.FLASH_CR] = cr
for off in range(0, len(buf), 4):
- stm.mem32[addr + off] = struct.unpack_from('I', buf, off)[0]
+ stm.mem32[addr + off] = struct.unpack_from("I", buf, off)[0]
flash_wait_not_busy()
stm.mem32[stm.FLASH + stm.FLASH_CR] = 0
+
def update_mboot(filename):
- print('Loading file', filename)
+ print("Loading file", filename)
mboot_fw = dfu_read(filename)
if mboot_fw is None:
@@ -122,14 +123,14 @@
# TODO: Validate firmware in a simple way
- print('Found Mboot data with size %u.' % len(mboot_fw))
+ print("Found Mboot data with size %u." % len(mboot_fw))
chk = check_mem_contains(mboot_addr, mboot_fw)
if chk:
- print('Supplied version of Mboot is already on device.')
+ print("Supplied version of Mboot is already on device.")
return
- print('Programming Mboot, do not turn off!')
+ print("Programming Mboot, do not turn off!")
time.sleep_ms(50)
irq = machine.disable_irq()
@@ -141,24 +142,25 @@
flash_lock()
machine.enable_irq(irq)
- print('New Mboot programmed.')
+ print("New Mboot programmed.")
if check_mem_contains(mboot_addr, mboot_fw):
- print('Verification of new Mboot succeeded.')
+ print("Verification of new Mboot succeeded.")
else:
- print('Verification of new Mboot FAILED! Try rerunning.')
+ print("Verification of new Mboot FAILED! Try rerunning.")
- print('Programming finished, can now reset or turn off.')
+ print("Programming finished, can now reset or turn off.")
+
def update_mpy(filename, fs_base, fs_len):
# Check firmware is of .dfu.gz type
try:
- with open(filename, 'rb') as f:
+ with open(filename, "rb") as f:
hdr = uzlib.DecompIO(f, 16 + 15).read(6)
except Exception:
hdr = None
- if hdr != b'DfuSe\x01':
- print('Firmware must be a .dfu.gz file.')
+ if hdr != b"DfuSe\x01":
+ print("Firmware must be a .dfu.gz file.")
return
ELEM_TYPE_END = 1
@@ -166,7 +168,11 @@
ELEM_TYPE_FSLOAD = 3
ELEM_MOUNT_FAT = 1
mount_point = 1
- mount = struct.pack('<BBBBLL', ELEM_TYPE_MOUNT, 10, mount_point, ELEM_MOUNT_FAT, fs_base, fs_len)
- fsup = struct.pack('<BBB', ELEM_TYPE_FSLOAD, 1 + len(filename), mount_point) + bytes(filename, 'ascii')
- end = struct.pack('<BB', ELEM_TYPE_END, 0)
+ mount = struct.pack(
+ "<BBBBLL", ELEM_TYPE_MOUNT, 10, mount_point, ELEM_MOUNT_FAT, fs_base, fs_len
+ )
+ fsup = struct.pack("<BBB", ELEM_TYPE_FSLOAD, 1 + len(filename), mount_point) + bytes(
+ filename, "ascii"
+ )
+ end = struct.pack("<BB", ELEM_TYPE_END, 0)
machine.bootloader(mount + fsup + end)
diff --git a/ports/stm32/mboot/mboot.py b/ports/stm32/mboot/mboot.py
index 39ae0f6..e0dab16 100644
--- a/ports/stm32/mboot/mboot.py
+++ b/ports/stm32/mboot/mboot.py
@@ -27,9 +27,9 @@
self.addr = addr
self.buf1 = bytearray(1)
try:
- self.i2c.writeto(addr, b'')
+ self.i2c.writeto(addr, b"")
except OSError:
- raise Exception('no I2C mboot device found')
+ raise Exception("no I2C mboot device found")
def wait_response(self):
start = time.ticks_ms()
@@ -41,47 +41,47 @@
except OSError as er:
time.sleep_us(500)
if time.ticks_diff(time.ticks_ms(), start) > 5000:
- raise Exception('timeout')
+ raise Exception("timeout")
if n >= 129:
raise Exception(n)
if n == 0:
- return b''
+ return b""
else:
return self.i2c.readfrom(self.addr, n)
def wait_empty_response(self):
ret = self.wait_response()
if ret:
- raise Exception('expected empty response got %r' % ret)
+ raise Exception("expected empty response got %r" % ret)
else:
return None
def echo(self, data):
- self.i2c.writeto(self.addr, struct.pack('<B', I2C_CMD_ECHO) + data)
+ self.i2c.writeto(self.addr, struct.pack("<B", I2C_CMD_ECHO) + data)
return self.wait_response()
def getid(self):
- self.i2c.writeto(self.addr, struct.pack('<B', I2C_CMD_GETID))
+ self.i2c.writeto(self.addr, struct.pack("<B", I2C_CMD_GETID))
ret = self.wait_response()
unique_id = ret[:12]
- mcu_name, board_name = ret[12:].split(b'\x00')
- return unique_id, str(mcu_name, 'ascii'), str(board_name, 'ascii')
+ mcu_name, board_name = ret[12:].split(b"\x00")
+ return unique_id, str(mcu_name, "ascii"), str(board_name, "ascii")
def reset(self):
- self.i2c.writeto(self.addr, struct.pack('<B', I2C_CMD_RESET))
+ self.i2c.writeto(self.addr, struct.pack("<B", I2C_CMD_RESET))
# we don't expect any response
def getlayout(self):
- self.i2c.writeto(self.addr, struct.pack('<B', I2C_CMD_GETLAYOUT))
+ self.i2c.writeto(self.addr, struct.pack("<B", I2C_CMD_GETLAYOUT))
layout = self.wait_response()
- id, flash_addr, layout = layout.split(b'/')
- assert id == b'@Internal Flash '
+ id, flash_addr, layout = layout.split(b"/")
+ assert id == b"@Internal Flash "
flash_addr = int(flash_addr, 16)
pages = []
- for chunk in layout.split(b','):
- n, sz = chunk.split(b'*')
+ for chunk in layout.split(b","):
+ n, sz = chunk.split(b"*")
n = int(n)
- assert sz.endswith(b'Kg')
+ assert sz.endswith(b"Kg")
sz = int(sz[:-2]) * 1024
for i in range(n):
pages.append((flash_addr, sz))
@@ -89,43 +89,43 @@
return pages
def pageerase(self, addr):
- self.i2c.writeto(self.addr, struct.pack('<BI', I2C_CMD_PAGEERASE, addr))
+ self.i2c.writeto(self.addr, struct.pack("<BI", I2C_CMD_PAGEERASE, addr))
self.wait_empty_response()
def setrdaddr(self, addr):
- self.i2c.writeto(self.addr, struct.pack('<BI', I2C_CMD_SETRDADDR, addr))
+ self.i2c.writeto(self.addr, struct.pack("<BI", I2C_CMD_SETRDADDR, addr))
self.wait_empty_response()
def setwraddr(self, addr):
- self.i2c.writeto(self.addr, struct.pack('<BI', I2C_CMD_SETWRADDR, addr))
+ self.i2c.writeto(self.addr, struct.pack("<BI", I2C_CMD_SETWRADDR, addr))
self.wait_empty_response()
def read(self, n):
- self.i2c.writeto(self.addr, struct.pack('<BB', I2C_CMD_READ, n))
+ self.i2c.writeto(self.addr, struct.pack("<BB", I2C_CMD_READ, n))
return self.wait_response()
def write(self, buf):
- self.i2c.writeto(self.addr, struct.pack('<B', I2C_CMD_WRITE) + buf)
+ self.i2c.writeto(self.addr, struct.pack("<B", I2C_CMD_WRITE) + buf)
self.wait_empty_response()
def calchash(self, n):
- self.i2c.writeto(self.addr, struct.pack('<BI', I2C_CMD_CALCHASH, n))
+ self.i2c.writeto(self.addr, struct.pack("<BI", I2C_CMD_CALCHASH, n))
return self.wait_response()
def markvalid(self):
- self.i2c.writeto(self.addr, struct.pack('<B', I2C_CMD_MARKVALID))
+ self.i2c.writeto(self.addr, struct.pack("<B", I2C_CMD_MARKVALID))
self.wait_empty_response()
def deployfile(self, filename, addr):
pages = self.getlayout()
page_erased = [False] * len(pages)
- buf = bytearray(128) # maximum payload supported by I2C protocol
+ buf = bytearray(128) # maximum payload supported by I2C protocol
start_addr = addr
self.setwraddr(addr)
fsize = os.stat(filename)[6]
local_sha = hashlib.sha256()
- print('Deploying %s to location 0x%08x' % (filename, addr))
- with open(filename, 'rb') as f:
+ print("Deploying %s to location 0x%08x" % (filename, addr))
+ with open(filename, "rb") as f:
t0 = time.ticks_ms()
while True:
n = f.readinto(buf)
@@ -137,12 +137,16 @@
if p[0] <= addr < p[0] + p[1]:
# found page
if not page_erased[i]:
- print('\r% 3u%% erase 0x%08x' % (100 * (addr - start_addr) // fsize, addr), end='')
+ print(
+ "\r% 3u%% erase 0x%08x"
+ % (100 * (addr - start_addr) // fsize, addr),
+ end="",
+ )
self.pageerase(addr)
page_erased[i] = True
break
else:
- raise Exception('address 0x%08x not valid' % addr)
+ raise Exception("address 0x%08x not valid" % addr)
# write the data
self.write(buf)
@@ -158,20 +162,20 @@
addr += n
ntotal = addr - start_addr
if ntotal % 2048 == 0 or ntotal == fsize:
- print('\r% 3u%% % 7u bytes ' % (100 * ntotal // fsize, ntotal), end='')
+ print("\r% 3u%% % 7u bytes " % (100 * ntotal // fsize, ntotal), end="")
t1 = time.ticks_ms()
print()
- print('rate: %.2f KiB/sec' % (1024 * ntotal / (t1 - t0) / 1000))
+ print("rate: %.2f KiB/sec" % (1024 * ntotal / (t1 - t0) / 1000))
local_sha = local_sha.digest()
- print('Local SHA256: ', ''.join('%02x' % x for x in local_sha))
+ print("Local SHA256: ", "".join("%02x" % x for x in local_sha))
self.setrdaddr(start_addr)
remote_sha = self.calchash(ntotal)
- print('Remote SHA256:', ''.join('%02x' % x for x in remote_sha))
+ print("Remote SHA256:", "".join("%02x" % x for x in remote_sha))
if local_sha == remote_sha:
- print('Marking app firmware as valid')
+ print("Marking app firmware as valid")
self.markvalid()
self.reset()
diff --git a/ports/stm32/modmachine.c b/ports/stm32/modmachine.c
index 8ea136b..02496a0 100644
--- a/ports/stm32/modmachine.c
+++ b/ports/stm32/modmachine.c
@@ -124,10 +124,10 @@
if (state & RCC_SR_IWDGRSTF || state & RCC_SR_WWDGRSTF) {
reset_cause = PYB_RESET_WDT;
} else if (state & RCC_SR_PORRSTF
- #if !defined(STM32F0)
- || state & RCC_SR_BORRSTF
- #endif
- ) {
+ #if !defined(STM32F0)
+ || state & RCC_SR_BORRSTF
+ #endif
+ ) {
reset_cause = PYB_RESET_POWER_ON;
} else if (state & RCC_SR_PINRSTF) {
reset_cause = PYB_RESET_HARD;
@@ -150,7 +150,7 @@
STATIC mp_obj_t machine_info(size_t n_args, const mp_obj_t *args) {
// get and print unique id; 96 bits
{
- byte *id = (byte*)MP_HAL_UNIQUE_ID_ADDRESS;
+ byte *id = (byte *)MP_HAL_UNIQUE_ID_ADDRESS;
printf("ID=%02x%02x%02x%02x:%02x%02x%02x%02x:%02x%02x%02x%02x\n", id[0], id[1], id[2], id[3], id[4], id[5], id[6], id[7], id[8], id[9], id[10], id[11]);
}
@@ -159,15 +159,15 @@
{
#if defined(STM32F0)
printf("S=%u\nH=%u\nP1=%u\n",
- (unsigned int)HAL_RCC_GetSysClockFreq(),
- (unsigned int)HAL_RCC_GetHCLKFreq(),
- (unsigned int)HAL_RCC_GetPCLK1Freq());
+ (unsigned int)HAL_RCC_GetSysClockFreq(),
+ (unsigned int)HAL_RCC_GetHCLKFreq(),
+ (unsigned int)HAL_RCC_GetPCLK1Freq());
#else
printf("S=%u\nH=%u\nP1=%u\nP2=%u\n",
- (unsigned int)HAL_RCC_GetSysClockFreq(),
- (unsigned int)HAL_RCC_GetHCLKFreq(),
- (unsigned int)HAL_RCC_GetPCLK1Freq(),
- (unsigned int)HAL_RCC_GetPCLK2Freq());
+ (unsigned int)HAL_RCC_GetSysClockFreq(),
+ (unsigned int)HAL_RCC_GetHCLKFreq(),
+ (unsigned int)HAL_RCC_GetPCLK1Freq(),
+ (unsigned int)HAL_RCC_GetPCLK2Freq());
#endif
}
@@ -235,7 +235,7 @@
// Returns a string of 12 bytes (96 bits), which is the unique ID for the MCU.
STATIC mp_obj_t machine_unique_id(void) {
- byte *id = (byte*)MP_HAL_UNIQUE_ID_ADDRESS;
+ byte *id = (byte *)MP_HAL_UNIQUE_ID_ADDRESS;
return mp_obj_new_bytes(id, 12);
}
MP_DEFINE_CONST_FUN_OBJ_0(machine_unique_id_obj, machine_unique_id);
@@ -274,7 +274,7 @@
// With a string/bytes given, pass its data to the custom bootloader
size_t len;
const char *data = mp_obj_str_get_data(args[0], &len);
- void *mboot_region = (void*)*((volatile uint32_t*)0x08000000);
+ void *mboot_region = (void *)*((volatile uint32_t *)0x08000000);
memmove(mboot_region, data, len);
powerctrl_enter_bootloader(0x70ad0080, 0x08000000);
}
@@ -286,7 +286,9 @@
powerctrl_enter_bootloader(0, 0x00000000);
#endif
- while (1);
+ while (1) {
+ ;
+ }
}
MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(machine_bootloader_obj, 0, 1, machine_bootloader);
@@ -295,12 +297,12 @@
if (n_args == 0) {
// get
mp_obj_t tuple[] = {
- mp_obj_new_int(HAL_RCC_GetSysClockFreq()),
- mp_obj_new_int(HAL_RCC_GetHCLKFreq()),
- mp_obj_new_int(HAL_RCC_GetPCLK1Freq()),
- #if !defined(STM32F0)
- mp_obj_new_int(HAL_RCC_GetPCLK2Freq()),
- #endif
+ mp_obj_new_int(HAL_RCC_GetSysClockFreq()),
+ mp_obj_new_int(HAL_RCC_GetHCLKFreq()),
+ mp_obj_new_int(HAL_RCC_GetPCLK1Freq()),
+ #if !defined(STM32F0)
+ mp_obj_new_int(HAL_RCC_GetPCLK2Freq()),
+ #endif
};
return mp_obj_new_tuple(MP_ARRAY_SIZE(tuple), tuple);
} else {
@@ -372,17 +374,17 @@
{ MP_ROM_QSTR(MP_QSTR_soft_reset), MP_ROM_PTR(&machine_soft_reset_obj) },
{ MP_ROM_QSTR(MP_QSTR_bootloader), MP_ROM_PTR(&machine_bootloader_obj) },
{ MP_ROM_QSTR(MP_QSTR_freq), MP_ROM_PTR(&machine_freq_obj) },
-#if MICROPY_HW_ENABLE_RNG
+ #if MICROPY_HW_ENABLE_RNG
{ MP_ROM_QSTR(MP_QSTR_rng), MP_ROM_PTR(&pyb_rng_get_obj) },
-#endif
+ #endif
{ MP_ROM_QSTR(MP_QSTR_idle), MP_ROM_PTR(&pyb_wfi_obj) },
{ MP_ROM_QSTR(MP_QSTR_sleep), MP_ROM_PTR(&machine_lightsleep_obj) },
{ MP_ROM_QSTR(MP_QSTR_lightsleep), MP_ROM_PTR(&machine_lightsleep_obj) },
{ MP_ROM_QSTR(MP_QSTR_deepsleep), MP_ROM_PTR(&machine_deepsleep_obj) },
{ MP_ROM_QSTR(MP_QSTR_reset_cause), MP_ROM_PTR(&machine_reset_cause_obj) },
-#if 0
+ #if 0
{ MP_ROM_QSTR(MP_QSTR_wake_reason), MP_ROM_PTR(&machine_wake_reason_obj) },
-#endif
+ #endif
{ MP_ROM_QSTR(MP_QSTR_disable_irq), MP_ROM_PTR(&pyb_disable_irq_obj) },
{ MP_ROM_QSTR(MP_QSTR_enable_irq), MP_ROM_PTR(&pyb_enable_irq_obj) },
@@ -398,14 +400,14 @@
{ MP_ROM_QSTR(MP_QSTR_RTC), MP_ROM_PTR(&pyb_rtc_type) },
{ MP_ROM_QSTR(MP_QSTR_ADC), MP_ROM_PTR(&machine_adc_type) },
-#if MICROPY_PY_MACHINE_I2C
+ #if MICROPY_PY_MACHINE_I2C
{ MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&machine_i2c_type) },
-#endif
+ #endif
{ MP_ROM_QSTR(MP_QSTR_SPI), MP_ROM_PTR(&machine_hard_spi_type) },
{ MP_ROM_QSTR(MP_QSTR_UART), MP_ROM_PTR(&pyb_uart_type) },
{ MP_ROM_QSTR(MP_QSTR_WDT), MP_ROM_PTR(&pyb_wdt_type) },
{ MP_ROM_QSTR(MP_QSTR_Timer), MP_ROM_PTR(&machine_timer_type) },
-#if 0
+ #if 0
{ MP_ROM_QSTR(MP_QSTR_HeartBeat), MP_ROM_PTR(&pyb_heartbeat_type) },
{ MP_ROM_QSTR(MP_QSTR_SD), MP_ROM_PTR(&pyb_sd_type) },
@@ -413,23 +415,23 @@
{ MP_ROM_QSTR(MP_QSTR_IDLE), MP_ROM_INT(PYB_PWR_MODE_ACTIVE) },
{ MP_ROM_QSTR(MP_QSTR_SLEEP), MP_ROM_INT(PYB_PWR_MODE_LPDS) },
{ MP_ROM_QSTR(MP_QSTR_DEEPSLEEP), MP_ROM_INT(PYB_PWR_MODE_HIBERNATE) },
-#endif
+ #endif
{ MP_ROM_QSTR(MP_QSTR_PWRON_RESET), MP_ROM_INT(PYB_RESET_POWER_ON) },
{ MP_ROM_QSTR(MP_QSTR_HARD_RESET), MP_ROM_INT(PYB_RESET_HARD) },
{ MP_ROM_QSTR(MP_QSTR_WDT_RESET), MP_ROM_INT(PYB_RESET_WDT) },
{ MP_ROM_QSTR(MP_QSTR_DEEPSLEEP_RESET), MP_ROM_INT(PYB_RESET_DEEPSLEEP) },
{ MP_ROM_QSTR(MP_QSTR_SOFT_RESET), MP_ROM_INT(PYB_RESET_SOFT) },
-#if 0
+ #if 0
{ MP_ROM_QSTR(MP_QSTR_WLAN_WAKE), MP_ROM_INT(PYB_SLP_WAKED_BY_WLAN) },
{ MP_ROM_QSTR(MP_QSTR_PIN_WAKE), MP_ROM_INT(PYB_SLP_WAKED_BY_GPIO) },
{ MP_ROM_QSTR(MP_QSTR_RTC_WAKE), MP_ROM_INT(PYB_SLP_WAKED_BY_RTC) },
-#endif
+ #endif
};
STATIC MP_DEFINE_CONST_DICT(machine_module_globals, machine_module_globals_table);
const mp_obj_module_t machine_module = {
.base = { &mp_type_module },
- .globals = (mp_obj_dict_t*)&machine_module_globals,
+ .globals = (mp_obj_dict_t *)&machine_module_globals,
};
diff --git a/ports/stm32/modnetwork.c b/ports/stm32/modnetwork.c
index 4b0f77f..8f10612 100644
--- a/ports/stm32/modnetwork.c
+++ b/ports/stm32/modnetwork.c
@@ -157,7 +157,7 @@
const mp_obj_module_t mp_module_network = {
.base = { &mp_type_module },
- .globals = (mp_obj_dict_t*)&mp_module_network_globals,
+ .globals = (mp_obj_dict_t *)&mp_module_network_globals,
};
/*******************************************************************************/
@@ -170,10 +170,10 @@
// Get IP addresses
const ip_addr_t *dns = dns_getserver(0);
mp_obj_t tuple[4] = {
- netutils_format_ipv4_addr((uint8_t*)&netif->ip_addr, NETUTILS_BIG),
- netutils_format_ipv4_addr((uint8_t*)&netif->netmask, NETUTILS_BIG),
- netutils_format_ipv4_addr((uint8_t*)&netif->gw, NETUTILS_BIG),
- netutils_format_ipv4_addr((uint8_t*)dns, NETUTILS_BIG),
+ netutils_format_ipv4_addr((uint8_t *)&netif->ip_addr, NETUTILS_BIG),
+ netutils_format_ipv4_addr((uint8_t *)&netif->netmask, NETUTILS_BIG),
+ netutils_format_ipv4_addr((uint8_t *)&netif->gw, NETUTILS_BIG),
+ netutils_format_ipv4_addr((uint8_t *)dns, NETUTILS_BIG),
};
return mp_obj_new_tuple(4, tuple);
} else if (args[0] == MP_OBJ_NEW_QSTR(MP_QSTR_dhcp)) {
@@ -202,11 +202,11 @@
// Set static IP addresses
mp_obj_t *items;
mp_obj_get_array_fixed_n(args[0], 4, &items);
- netutils_parse_ipv4_addr(items[0], (uint8_t*)&netif->ip_addr, NETUTILS_BIG);
- netutils_parse_ipv4_addr(items[1], (uint8_t*)&netif->netmask, NETUTILS_BIG);
- netutils_parse_ipv4_addr(items[2], (uint8_t*)&netif->gw, NETUTILS_BIG);
+ netutils_parse_ipv4_addr(items[0], (uint8_t *)&netif->ip_addr, NETUTILS_BIG);
+ netutils_parse_ipv4_addr(items[1], (uint8_t *)&netif->netmask, NETUTILS_BIG);
+ netutils_parse_ipv4_addr(items[2], (uint8_t *)&netif->gw, NETUTILS_BIG);
ip_addr_t dns;
- netutils_parse_ipv4_addr(items[3], (uint8_t*)&dns, NETUTILS_BIG);
+ netutils_parse_ipv4_addr(items[3], (uint8_t *)&dns, NETUTILS_BIG);
dns_setserver(0, &dns);
return mp_const_none;
}
diff --git a/ports/stm32/modnwcc3k.c b/ports/stm32/modnwcc3k.c
index e5ca52e..92e680e 100644
--- a/ports/stm32/modnwcc3k.c
+++ b/ports/stm32/modnwcc3k.c
@@ -52,8 +52,8 @@
#include "patch_prog.h"
#define MAX_ADDRSTRLEN (128)
-#define MAX_RX_PACKET (CC3000_RX_BUFFER_SIZE-CC3000_MINIMAL_RX_SIZE-1)
-#define MAX_TX_PACKET (CC3000_TX_BUFFER_SIZE-CC3000_MINIMAL_TX_SIZE-1)
+#define MAX_RX_PACKET (CC3000_RX_BUFFER_SIZE - CC3000_MINIMAL_RX_SIZE - 1)
+#define MAX_TX_PACKET (CC3000_TX_BUFFER_SIZE - CC3000_MINIMAL_TX_SIZE - 1)
#define MAKE_SOCKADDR(addr, ip, port) \
sockaddr addr; \
@@ -115,7 +115,7 @@
STATIC int cc3k_gethostbyname(mp_obj_t nic, const char *name, mp_uint_t len, uint8_t *out_ip) {
uint32_t ip;
// CC3000 gethostbyname is unreliable and usually returns -95 on first call
- for (int retry = 5; CC3000_EXPORT(gethostbyname)((char*)name, len, &ip) < 0; retry--) {
+ for (int retry = 5; CC3000_EXPORT(gethostbyname)((char *)name, len, &ip) < 0; retry--) {
if (retry == 0 || CC3000_EXPORT(errno) != -95) {
return CC3000_EXPORT(errno);
}
@@ -143,10 +143,18 @@
mp_uint_t type;
switch (socket->u_param.type) {
- case MOD_NETWORK_SOCK_STREAM: type = SOCK_STREAM; break;
- case MOD_NETWORK_SOCK_DGRAM: type = SOCK_DGRAM; break;
- case MOD_NETWORK_SOCK_RAW: type = SOCK_RAW; break;
- default: *_errno = MP_EINVAL; return -1;
+ case MOD_NETWORK_SOCK_STREAM:
+ type = SOCK_STREAM;
+ break;
+ case MOD_NETWORK_SOCK_DGRAM:
+ type = SOCK_DGRAM;
+ break;
+ case MOD_NETWORK_SOCK_RAW:
+ type = SOCK_RAW;
+ break;
+ default:
+ *_errno = MP_EINVAL;
+ return -1;
}
// open socket
@@ -247,7 +255,7 @@
mp_int_t bytes = 0;
while (bytes < len) {
int n = MIN((len - bytes), MAX_TX_PACKET);
- n = CC3000_EXPORT(send)(socket->u_state, (uint8_t*)buf + bytes, n, 0);
+ n = CC3000_EXPORT(send)(socket->u_state, (uint8_t *)buf + bytes, n, 0);
if (n <= 0) {
*_errno = CC3000_EXPORT(errno);
return -1;
@@ -291,7 +299,7 @@
STATIC mp_uint_t cc3k_socket_sendto(mod_network_socket_obj_t *socket, const byte *buf, mp_uint_t len, byte *ip, mp_uint_t port, int *_errno) {
MAKE_SOCKADDR(addr, ip, port)
- int ret = CC3000_EXPORT(sendto)(socket->u_state, (byte*)buf, len, 0, (sockaddr*)&addr, sizeof(addr));
+ int ret = CC3000_EXPORT(sendto)(socket->u_state, (byte *)buf, len, 0, (sockaddr *)&addr, sizeof(addr));
if (ret < 0) {
*_errno = CC3000_EXPORT(errno);
return -1;
@@ -416,7 +424,7 @@
mp_obj_base_t base;
} cc3k_obj_t;
-STATIC const cc3k_obj_t cc3k_obj = {{(mp_obj_type_t*)&mod_network_nic_type_cc3k}};
+STATIC const cc3k_obj_t cc3k_obj = {{(mp_obj_type_t *)&mod_network_nic_type_cc3k}};
// \classmethod \constructor(spi, pin_cs, pin_en, pin_irq)
// Initialise the CC3000 using the given SPI bus and pins and return a CC3K object.
@@ -436,11 +444,11 @@
pin_find(args[1]),
pin_find(args[2]),
pin_find(args[3])
- );
+ );
// initialize and start the module
wlan_init(cc3k_callback, NULL, NULL, NULL,
- ReadWlanInterruptPin, SpiResumeSpi, SpiPauseSpi, WriteWlanPin);
+ ReadWlanInterruptPin, SpiResumeSpi, SpiPauseSpi, WriteWlanPin);
if (wlan_start(0) != 0) {
mp_raise_msg(&mp_type_OSError, "failed to init CC3000 module");
@@ -450,10 +458,10 @@
// wlan_ioctl_set_connection_policy(0, 0, 0);
// Mask out all non-required events from the CC3000
- wlan_set_event_mask(HCI_EVNT_WLAN_KEEPALIVE|
- HCI_EVNT_WLAN_UNSOL_INIT|
- HCI_EVNT_WLAN_ASYNC_PING_REPORT|
- HCI_EVNT_WLAN_ASYNC_SIMPLE_CONFIG_DONE);
+ wlan_set_event_mask(HCI_EVNT_WLAN_KEEPALIVE |
+ HCI_EVNT_WLAN_UNSOL_INIT |
+ HCI_EVNT_WLAN_ASYNC_PING_REPORT |
+ HCI_EVNT_WLAN_ASYNC_SIMPLE_CONFIG_DONE);
// register with network module
mod_network_register_nic((mp_obj_t)&cc3k_obj);
@@ -494,7 +502,7 @@
}
// connect to AP
- if (wlan_connect(sec, (char*)ssid, ssid_len, (uint8_t*)bssid, (uint8_t*)key, key_len) != 0) {
+ if (wlan_connect(sec, (char *)ssid, ssid_len, (uint8_t *)bssid, (uint8_t *)key, key_len) != 0) {
mp_raise_msg_varg(&mp_type_OSError, "could not connect to ssid=%s, sec=%d, key=%s\n", ssid, sec, key);
}
@@ -531,7 +539,7 @@
netutils_format_ipv4_addr(ipconfig.aucDNSServer, NETUTILS_LITTLE),
netutils_format_ipv4_addr(ipconfig.aucDHCPServer, NETUTILS_LITTLE),
mp_obj_new_str(mac_vstr.buf, mac_vstr.len),
- mp_obj_new_str((const char*)ipconfig.uaSSID, strlen((const char*)ipconfig.uaSSID)),
+ mp_obj_new_str((const char *)ipconfig.uaSSID, strlen((const char *)ipconfig.uaSSID)),
};
return mp_obj_new_tuple(MP_ARRAY_SIZE(tuple), tuple);
}
@@ -581,7 +589,7 @@
{ &mp_type_type },
.name = MP_QSTR_CC3K,
.make_new = cc3k_make_new,
- .locals_dict = (mp_obj_dict_t*)&cc3k_locals_dict,
+ .locals_dict = (mp_obj_dict_t *)&cc3k_locals_dict,
},
.gethostbyname = cc3k_gethostbyname,
.socket = cc3k_socket_socket,
diff --git a/ports/stm32/modnwwiznet5k.c b/ports/stm32/modnwwiznet5k.c
index bf4b72f..db7bc8b 100644
--- a/ports/stm32/modnwwiznet5k.c
+++ b/ports/stm32/modnwwiznet5k.c
@@ -79,7 +79,7 @@
}
STATIC void wiz_spi_write(const uint8_t *buf, uint32_t len) {
- HAL_StatusTypeDef status = HAL_SPI_Transmit(wiznet5k_obj.spi->spi, (uint8_t*)buf, len, 5000);
+ HAL_StatusTypeDef status = HAL_SPI_Transmit(wiznet5k_obj.spi->spi, (uint8_t *)buf, len, 5000);
(void)status;
}
@@ -87,7 +87,7 @@
uint8_t dns_ip[MOD_NETWORK_IPADDR_BUF_SIZE] = {8, 8, 8, 8};
uint8_t *buf = m_new(uint8_t, MAX_DNS_BUF_SIZE);
DNS_init(0, buf);
- mp_int_t ret = DNS_run(dns_ip, (uint8_t*)name, out_ip);
+ mp_int_t ret = DNS_run(dns_ip, (uint8_t *)name, out_ip);
m_del(uint8_t, buf, MAX_DNS_BUF_SIZE);
if (ret == 1) {
// success
@@ -105,9 +105,15 @@
}
switch (socket->u_param.type) {
- case MOD_NETWORK_SOCK_STREAM: socket->u_param.type = Sn_MR_TCP; break;
- case MOD_NETWORK_SOCK_DGRAM: socket->u_param.type = Sn_MR_UDP; break;
- default: *_errno = MP_EINVAL; return -1;
+ case MOD_NETWORK_SOCK_STREAM:
+ socket->u_param.type = Sn_MR_TCP;
+ break;
+ case MOD_NETWORK_SOCK_DGRAM:
+ socket->u_param.type = Sn_MR_UDP;
+ break;
+ default:
+ *_errno = MP_EINVAL;
+ return -1;
}
if (socket->u_param.fileno == -1) {
@@ -226,7 +232,7 @@
STATIC mp_uint_t wiznet5k_socket_send(mod_network_socket_obj_t *socket, const byte *buf, mp_uint_t len, int *_errno) {
MP_THREAD_GIL_EXIT();
- mp_int_t ret = WIZCHIP_EXPORT(send)(socket->u_param.fileno, (byte*)buf, len);
+ mp_int_t ret = WIZCHIP_EXPORT(send)(socket->u_param.fileno, (byte *)buf, len);
MP_THREAD_GIL_ENTER();
// TODO convert Wiz errno's to POSIX ones
@@ -261,7 +267,7 @@
}
MP_THREAD_GIL_EXIT();
- mp_int_t ret = WIZCHIP_EXPORT(sendto)(socket->u_param.fileno, (byte*)buf, len, ip, port);
+ mp_int_t ret = WIZCHIP_EXPORT(sendto)(socket->u_param.fileno, (byte *)buf, len, ip, port);
MP_THREAD_GIL_ENTER();
if (ret < 0) {
@@ -344,7 +350,7 @@
mp_arg_check_num(n_args, n_kw, 3, 3, false);
// init the wiznet5k object
- wiznet5k_obj.base.type = (mp_obj_type_t*)&mod_network_nic_type_wiznet5k;
+ wiznet5k_obj.base.type = (mp_obj_type_t *)&mod_network_nic_type_wiznet5k;
wiznet5k_obj.cris_state = 0;
wiznet5k_obj.spi = spi_from_mp_obj(args[0]);
wiznet5k_obj.cs = pin_find(args[1]);
@@ -390,7 +396,7 @@
.dns = {8, 8, 8, 8}, // Google public DNS
.dhcp = NETINFO_STATIC,
};
- ctlnetwork(CN_SET_NETINFO, (void*)&netinfo);
+ ctlnetwork(CN_SET_NETINFO, (void *)&netinfo);
// seems we need a small delay after init
mp_hal_delay_ms(250);
@@ -484,7 +490,7 @@
{ &mp_type_type },
.name = MP_QSTR_WIZNET5K,
.make_new = wiznet5k_make_new,
- .locals_dict = (mp_obj_dict_t*)&wiznet5k_locals_dict,
+ .locals_dict = (mp_obj_dict_t *)&wiznet5k_locals_dict,
},
.gethostbyname = wiznet5k_gethostbyname,
.socket = wiznet5k_socket_socket,
diff --git a/ports/stm32/modpyb.c b/ports/stm32/modpyb.c
index 6dbfb1e..dd24798 100644
--- a/ports/stm32/modpyb.c
+++ b/ports/stm32/modpyb.c
@@ -194,74 +194,74 @@
{ MP_ROM_QSTR(MP_QSTR_Timer), MP_ROM_PTR(&pyb_timer_type) },
-#if MICROPY_HW_ENABLE_RNG
+ #if MICROPY_HW_ENABLE_RNG
{ MP_ROM_QSTR(MP_QSTR_rng), MP_ROM_PTR(&pyb_rng_get_obj) },
-#endif
+ #endif
-#if MICROPY_HW_ENABLE_RTC
+ #if MICROPY_HW_ENABLE_RTC
{ MP_ROM_QSTR(MP_QSTR_RTC), MP_ROM_PTR(&pyb_rtc_type) },
-#endif
+ #endif
{ MP_ROM_QSTR(MP_QSTR_Pin), MP_ROM_PTR(&pin_type) },
{ MP_ROM_QSTR(MP_QSTR_ExtInt), MP_ROM_PTR(&extint_type) },
-#if MICROPY_HW_ENABLE_SERVO
+ #if MICROPY_HW_ENABLE_SERVO
{ MP_ROM_QSTR(MP_QSTR_pwm), MP_ROM_PTR(&pyb_pwm_set_obj) },
{ MP_ROM_QSTR(MP_QSTR_servo), MP_ROM_PTR(&pyb_servo_set_obj) },
{ MP_ROM_QSTR(MP_QSTR_Servo), MP_ROM_PTR(&pyb_servo_type) },
-#endif
+ #endif
-#if MICROPY_HW_HAS_SWITCH
+ #if MICROPY_HW_HAS_SWITCH
{ MP_ROM_QSTR(MP_QSTR_Switch), MP_ROM_PTR(&pyb_switch_type) },
-#endif
+ #endif
-#if MICROPY_HW_HAS_FLASH
+ #if MICROPY_HW_HAS_FLASH
{ MP_ROM_QSTR(MP_QSTR_Flash), MP_ROM_PTR(&pyb_flash_type) },
-#endif
+ #endif
-#if MICROPY_HW_ENABLE_SDCARD
+ #if MICROPY_HW_ENABLE_SDCARD
#if MICROPY_PY_PYB_LEGACY
{ MP_ROM_QSTR(MP_QSTR_SD), MP_ROM_PTR(&pyb_sdcard_obj) }, // now obsolete
#endif
{ MP_ROM_QSTR(MP_QSTR_SDCard), MP_ROM_PTR(&pyb_sdcard_type) },
-#endif
+ #endif
#if MICROPY_HW_ENABLE_MMCARD
{ MP_ROM_QSTR(MP_QSTR_MMCard), MP_ROM_PTR(&pyb_mmcard_type) },
#endif
-#if defined(MICROPY_HW_LED1)
+ #if defined(MICROPY_HW_LED1)
{ MP_ROM_QSTR(MP_QSTR_LED), MP_ROM_PTR(&pyb_led_type) },
-#endif
+ #endif
#if MICROPY_PY_PYB_LEGACY && MICROPY_HW_ENABLE_HW_I2C
{ MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&pyb_i2c_type) },
#endif
{ MP_ROM_QSTR(MP_QSTR_SPI), MP_ROM_PTR(&pyb_spi_type) },
{ MP_ROM_QSTR(MP_QSTR_UART), MP_ROM_PTR(&pyb_uart_type) },
-#if MICROPY_HW_ENABLE_CAN
+ #if MICROPY_HW_ENABLE_CAN
{ MP_ROM_QSTR(MP_QSTR_CAN), MP_ROM_PTR(&pyb_can_type) },
-#endif
+ #endif
#if MICROPY_HW_ENABLE_ADC
{ MP_ROM_QSTR(MP_QSTR_ADC), MP_ROM_PTR(&pyb_adc_type) },
{ MP_ROM_QSTR(MP_QSTR_ADCAll), MP_ROM_PTR(&pyb_adc_all_type) },
#endif
-#if MICROPY_HW_ENABLE_DAC
+ #if MICROPY_HW_ENABLE_DAC
{ MP_ROM_QSTR(MP_QSTR_DAC), MP_ROM_PTR(&pyb_dac_type) },
-#endif
+ #endif
-#if MICROPY_HW_HAS_MMA7660 || MICROPY_HW_HAS_KXTJ3
+ #if MICROPY_HW_HAS_MMA7660 || MICROPY_HW_HAS_KXTJ3
{ MP_ROM_QSTR(MP_QSTR_Accel), MP_ROM_PTR(&pyb_accel_type) },
-#endif
+ #endif
-#if MICROPY_HW_HAS_LCD
+ #if MICROPY_HW_HAS_LCD
{ MP_ROM_QSTR(MP_QSTR_LCD), MP_ROM_PTR(&pyb_lcd_type) },
-#endif
+ #endif
};
STATIC MP_DEFINE_CONST_DICT(pyb_module_globals, pyb_module_globals_table);
const mp_obj_module_t pyb_module = {
.base = { &mp_type_module },
- .globals = (mp_obj_dict_t*)&pyb_module_globals,
+ .globals = (mp_obj_dict_t *)&pyb_module_globals,
};
diff --git a/ports/stm32/modstm.c b/ports/stm32/modstm.c
index 3fae3a5..418b8bd 100644
--- a/ports/stm32/modstm.c
+++ b/ports/stm32/modstm.c
@@ -43,14 +43,14 @@
{ MP_ROM_QSTR(MP_QSTR_mem16), MP_ROM_PTR(&machine_mem16_obj) },
{ MP_ROM_QSTR(MP_QSTR_mem32), MP_ROM_PTR(&machine_mem32_obj) },
-#include "genhdr/modstm_const.h"
+ #include "genhdr/modstm_const.h"
};
STATIC MP_DEFINE_CONST_DICT(stm_module_globals, stm_module_globals_table);
const mp_obj_module_t stm_module = {
.base = { &mp_type_module },
- .globals = (mp_obj_dict_t*)&stm_module_globals,
+ .globals = (mp_obj_dict_t *)&stm_module_globals,
};
#endif // MICROPY_PY_STM
diff --git a/ports/stm32/moduos.c b/ports/stm32/moduos.c
index cafe2fe..6f9740c 100644
--- a/ports/stm32/moduos.c
+++ b/ports/stm32/moduos.c
@@ -74,7 +74,7 @@
MP_ROM_PTR(&os_uname_info_release_obj),
MP_ROM_PTR(&os_uname_info_version_obj),
MP_ROM_PTR(&os_uname_info_machine_obj)
-);
+ );
STATIC mp_obj_t os_uname(void) {
return MP_OBJ_FROM_PTR(&os_uname_info_obj);
@@ -113,10 +113,10 @@
bool mp_uos_dupterm_is_builtin_stream(mp_const_obj_t stream) {
const mp_obj_type_t *type = mp_obj_get_type(stream);
return type == &pyb_uart_type
- #if MICROPY_HW_ENABLE_USB
- || type == &pyb_usb_vcp_type
- #endif
- ;
+ #if MICROPY_HW_ENABLE_USB
+ || type == &pyb_usb_vcp_type
+ #endif
+ ;
}
STATIC mp_obj_t uos_dupterm(size_t n_args, const mp_obj_t *args) {
@@ -164,9 +164,9 @@
/// \constant sep - separation character used in paths
{ MP_ROM_QSTR(MP_QSTR_sep), MP_ROM_QSTR(MP_QSTR__slash_) },
-#if MICROPY_HW_ENABLE_RNG
+ #if MICROPY_HW_ENABLE_RNG
{ MP_ROM_QSTR(MP_QSTR_urandom), MP_ROM_PTR(&os_urandom_obj) },
-#endif
+ #endif
// these are MicroPython extensions
{ MP_ROM_QSTR(MP_QSTR_dupterm), MP_ROM_PTR(&uos_dupterm_obj) },
@@ -187,5 +187,5 @@
const mp_obj_module_t mp_module_uos = {
.base = { &mp_type_module },
- .globals = (mp_obj_dict_t*)&os_module_globals,
+ .globals = (mp_obj_dict_t *)&os_module_globals,
};
diff --git a/ports/stm32/modusocket.c b/ports/stm32/modusocket.c
index 9af6e37..b7cb337 100644
--- a/ports/stm32/modusocket.c
+++ b/ports/stm32/modusocket.c
@@ -71,7 +71,7 @@
if (self->nic == MP_OBJ_NULL) {
// select NIC based on IP
self->nic = mod_network_find_nic(ip);
- self->nic_type = (mod_network_nic_type_t*)mp_obj_get_type(self->nic);
+ self->nic_type = (mod_network_nic_type_t *)mp_obj_get_type(self->nic);
// call the NIC to open the socket
int _errno;
@@ -208,7 +208,7 @@
vstr_t vstr;
vstr_init_len(&vstr, len);
int _errno;
- mp_uint_t ret = self->nic_type->recv(self, (byte*)vstr.buf, len, &_errno);
+ mp_uint_t ret = self->nic_type->recv(self, (byte *)vstr.buf, len, &_errno);
if (ret == -1) {
mp_raise_OSError(_errno);
}
@@ -258,7 +258,7 @@
byte ip[4];
mp_uint_t port;
int _errno;
- mp_int_t ret = self->nic_type->recvfrom(self, (byte*)vstr.buf, vstr.len, ip, &port, &_errno);
+ mp_int_t ret = self->nic_type->recvfrom(self, (byte *)vstr.buf, vstr.len, ip, &port, &_errno);
if (ret == -1) {
mp_raise_OSError(_errno);
}
@@ -389,7 +389,7 @@
.name = MP_QSTR_socket,
.make_new = socket_make_new,
.protocol = &socket_stream_p,
- .locals_dict = (mp_obj_dict_t*)&socket_locals_dict,
+ .locals_dict = (mp_obj_dict_t *)&socket_locals_dict,
};
/******************************************************************************/
@@ -419,7 +419,7 @@
// find a NIC that can do a name lookup
for (mp_uint_t i = 0; i < MP_STATE_PORT(mod_network_nic_list).len; i++) {
mp_obj_t nic = MP_STATE_PORT(mod_network_nic_list).items[i];
- mod_network_nic_type_t *nic_type = (mod_network_nic_type_t*)mp_obj_get_type(nic);
+ mod_network_nic_type_t *nic_type = (mod_network_nic_type_t *)mp_obj_get_type(nic);
if (nic_type->gethostbyname != NULL) {
int ret = nic_type->gethostbyname(nic, host, hlen, out_ip);
if (ret != 0) {
@@ -441,7 +441,7 @@
tuple->items[2] = MP_OBJ_NEW_SMALL_INT(0);
tuple->items[3] = MP_OBJ_NEW_QSTR(MP_QSTR_);
tuple->items[4] = netutils_format_inet_addr(out_ip, port, NETUTILS_BIG);
- return mp_obj_new_list(1, (mp_obj_t*)&tuple);
+ return mp_obj_new_list(1, (mp_obj_t *)&tuple);
}
STATIC MP_DEFINE_CONST_FUN_OBJ_2(mod_usocket_getaddrinfo_obj, mod_usocket_getaddrinfo);
@@ -474,7 +474,7 @@
const mp_obj_module_t mp_module_usocket = {
.base = { &mp_type_module },
- .globals = (mp_obj_dict_t*)&mp_module_usocket_globals,
+ .globals = (mp_obj_dict_t *)&mp_module_usocket_globals,
};
#endif // MICROPY_PY_USOCKET && !MICROPY_PY_LWIP
diff --git a/ports/stm32/modutime.c b/ports/stm32/modutime.c
index 695e6cf..54758de 100644
--- a/ports/stm32/modutime.c
+++ b/ports/stm32/modutime.c
@@ -110,8 +110,8 @@
}
return mp_obj_new_int_from_uint(timeutils_mktime(mp_obj_get_int(elem[0]),
- mp_obj_get_int(elem[1]), mp_obj_get_int(elem[2]), mp_obj_get_int(elem[3]),
- mp_obj_get_int(elem[4]), mp_obj_get_int(elem[5])));
+ mp_obj_get_int(elem[1]), mp_obj_get_int(elem[2]), mp_obj_get_int(elem[3]),
+ mp_obj_get_int(elem[4]), mp_obj_get_int(elem[5])));
}
MP_DEFINE_CONST_FUN_OBJ_1(time_mktime_obj, time_mktime);
@@ -149,5 +149,5 @@
const mp_obj_module_t mp_module_utime = {
.base = { &mp_type_module },
- .globals = (mp_obj_dict_t*)&time_module_globals,
+ .globals = (mp_obj_dict_t *)&time_module_globals,
};
diff --git a/ports/stm32/mpconfigboard_common.h b/ports/stm32/mpconfigboard_common.h
index ce5c715..127696b 100644
--- a/ports/stm32/mpconfigboard_common.h
+++ b/ports/stm32/mpconfigboard_common.h
@@ -314,11 +314,11 @@
// D-cache clean/invalidate helpers
#if __DCACHE_PRESENT == 1
#define MP_HAL_CLEANINVALIDATE_DCACHE(addr, size) \
- (SCB_CleanInvalidateDCache_by_Addr((uint32_t*)((uint32_t)addr & ~0x1f), \
- ((uint32_t)((uint8_t*)addr + size + 0x1f) & ~0x1f) - ((uint32_t)addr & ~0x1f)))
+ (SCB_CleanInvalidateDCache_by_Addr((uint32_t *)((uint32_t)addr & ~0x1f), \
+ ((uint32_t)((uint8_t *)addr + size + 0x1f) & ~0x1f) - ((uint32_t)addr & ~0x1f)))
#define MP_HAL_CLEAN_DCACHE(addr, size) \
- (SCB_CleanDCache_by_Addr((uint32_t*)((uint32_t)addr & ~0x1f), \
- ((uint32_t)((uint8_t*)addr + size + 0x1f) & ~0x1f) - ((uint32_t)addr & ~0x1f)))
+ (SCB_CleanDCache_by_Addr((uint32_t *)((uint32_t)addr & ~0x1f), \
+ ((uint32_t)((uint8_t *)addr + size + 0x1f) & ~0x1f) - ((uint32_t)addr & ~0x1f)))
#else
#define MP_HAL_CLEANINVALIDATE_DCACHE(addr, size)
#define MP_HAL_CLEAN_DCACHE(addr, size)
diff --git a/ports/stm32/mpconfigport.h b/ports/stm32/mpconfigport.h
index 4e9118e..ada4ce5 100644
--- a/ports/stm32/mpconfigport.h
+++ b/ports/stm32/mpconfigport.h
@@ -301,11 +301,11 @@
mp_obj_list_t mod_network_nic_list; \
\
MICROPY_PORT_ROOT_POINTER_MBEDTLS \
- MICROPY_PORT_ROOT_POINTER_BLUETOOTH_NIMBLE \
+ MICROPY_PORT_ROOT_POINTER_BLUETOOTH_NIMBLE \
// type definitions for the specific machine
-#define MICROPY_MAKE_POINTER_CALLABLE(p) ((void*)((uint32_t)(p) | 1))
+#define MICROPY_MAKE_POINTER_CALLABLE(p) ((void *)((uint32_t)(p) | 1))
#define MP_SSIZE_MAX (0x7fffffff)
diff --git a/ports/stm32/mphalport.c b/ports/stm32/mphalport.c
index c8d83be..0e40911 100644
--- a/ports/stm32/mphalport.c
+++ b/ports/stm32/mphalport.c
@@ -33,15 +33,15 @@
MP_WEAK int mp_hal_stdin_rx_chr(void) {
for (;;) {
-#if 0
-#ifdef USE_HOST_MODE
+ #if 0
+ #ifdef USE_HOST_MODE
pyb_usb_host_process();
int c = pyb_usb_host_get_keyboard();
if (c != 0) {
return c;
}
-#endif
-#endif
+ #endif
+ #endif
if (MP_STATE_PORT(pyb_stdio_uart) != NULL && uart_rx_any(MP_STATE_PORT(pyb_stdio_uart))) {
return uart_rx_char(MP_STATE_PORT(pyb_stdio_uart));
}
@@ -61,9 +61,9 @@
if (MP_STATE_PORT(pyb_stdio_uart) != NULL) {
uart_tx_strn(MP_STATE_PORT(pyb_stdio_uart), str, len);
}
-#if 0 && defined(USE_HOST_MODE) && MICROPY_HW_HAS_LCD
+ #if 0 && defined(USE_HOST_MODE) && MICROPY_HW_HAS_LCD
lcd_print_strn(str, len);
-#endif
+ #endif
mp_uos_dupterm_tx_strn(str, len);
}
diff --git a/ports/stm32/mphalport.h b/ports/stm32/mphalport.h
index ce3c51f..fe9378a 100644
--- a/ports/stm32/mphalport.h
+++ b/ports/stm32/mphalport.h
@@ -57,7 +57,7 @@
#define MP_HAL_PIN_SPEED_HIGH (GPIO_SPEED_FREQ_HIGH)
#define MP_HAL_PIN_SPEED_VERY_HIGH (GPIO_SPEED_FREQ_VERY_HIGH)
-#define mp_hal_pin_obj_t const pin_obj_t*
+#define mp_hal_pin_obj_t const pin_obj_t *
#define mp_hal_get_pin_obj(o) pin_find(o)
#define mp_hal_pin_name(p) ((p)->name)
#define mp_hal_pin_input(p) mp_hal_pin_config((p), MP_HAL_PIN_MODE_INPUT, MP_HAL_PIN_PULL_NONE, 0)
diff --git a/ports/stm32/mpthreadport.c b/ports/stm32/mpthreadport.c
index 4e1ebf0..48c2c3b 100644
--- a/ports/stm32/mpthreadport.c
+++ b/ports/stm32/mpthreadport.c
@@ -44,7 +44,7 @@
void mp_thread_gc_others(void) {
mp_thread_mutex_lock(&thread_mutex, 1);
for (pyb_thread_t *th = pyb_thread_all; th != NULL; th = th->all_next) {
- gc_collect_root((void**)&th, 1);
+ gc_collect_root((void **)&th, 1);
gc_collect_root(&th->arg, 1);
gc_collect_root(&th->stack, 1);
if (th != pyb_thread_cur) {
@@ -54,7 +54,7 @@
mp_thread_mutex_unlock(&thread_mutex);
}
-void mp_thread_create(void *(*entry)(void*), void *arg, size_t *stack_size) {
+void mp_thread_create(void *(*entry)(void *), void *arg, size_t *stack_size) {
if (*stack_size == 0) {
*stack_size = 4096; // default stack size
} else if (*stack_size < 2048) {
diff --git a/ports/stm32/mpu.h b/ports/stm32/mpu.h
index 74ba814..ff51f38 100644
--- a/ports/stm32/mpu.h
+++ b/ports/stm32/mpu.h
@@ -36,39 +36,39 @@
#define MPU_REGION_SDRAM2 (MPU_REGION_NUMBER5)
#define MPU_CONFIG_DISABLE(srd, size) ( \
- MPU_INSTRUCTION_ACCESS_DISABLE << MPU_RASR_XN_Pos \
- | MPU_REGION_NO_ACCESS << MPU_RASR_AP_Pos \
- | MPU_TEX_LEVEL0 << MPU_RASR_TEX_Pos \
- | MPU_ACCESS_NOT_SHAREABLE << MPU_RASR_S_Pos \
- | MPU_ACCESS_NOT_CACHEABLE << MPU_RASR_C_Pos \
- | MPU_ACCESS_NOT_BUFFERABLE << MPU_RASR_B_Pos \
- | (srd) << MPU_RASR_SRD_Pos \
- | (size) << MPU_RASR_SIZE_Pos \
- | MPU_REGION_ENABLE << MPU_RASR_ENABLE_Pos \
+ MPU_INSTRUCTION_ACCESS_DISABLE << MPU_RASR_XN_Pos \
+ | MPU_REGION_NO_ACCESS << MPU_RASR_AP_Pos \
+ | MPU_TEX_LEVEL0 << MPU_RASR_TEX_Pos \
+ | MPU_ACCESS_NOT_SHAREABLE << MPU_RASR_S_Pos \
+ | MPU_ACCESS_NOT_CACHEABLE << MPU_RASR_C_Pos \
+ | MPU_ACCESS_NOT_BUFFERABLE << MPU_RASR_B_Pos \
+ | (srd) << MPU_RASR_SRD_Pos \
+ | (size) << MPU_RASR_SIZE_Pos \
+ | MPU_REGION_ENABLE << MPU_RASR_ENABLE_Pos \
)
#define MPU_CONFIG_ETH(size) ( \
- MPU_INSTRUCTION_ACCESS_DISABLE << MPU_RASR_XN_Pos \
- | MPU_REGION_FULL_ACCESS << MPU_RASR_AP_Pos \
- | MPU_TEX_LEVEL1 << MPU_RASR_TEX_Pos \
- | MPU_ACCESS_SHAREABLE << MPU_RASR_S_Pos \
- | MPU_ACCESS_NOT_CACHEABLE << MPU_RASR_C_Pos \
- | MPU_ACCESS_NOT_BUFFERABLE << MPU_RASR_B_Pos \
- | 0x00 << MPU_RASR_SRD_Pos \
- | (size) << MPU_RASR_SIZE_Pos \
- | MPU_REGION_ENABLE << MPU_RASR_ENABLE_Pos \
+ MPU_INSTRUCTION_ACCESS_DISABLE << MPU_RASR_XN_Pos \
+ | MPU_REGION_FULL_ACCESS << MPU_RASR_AP_Pos \
+ | MPU_TEX_LEVEL1 << MPU_RASR_TEX_Pos \
+ | MPU_ACCESS_SHAREABLE << MPU_RASR_S_Pos \
+ | MPU_ACCESS_NOT_CACHEABLE << MPU_RASR_C_Pos \
+ | MPU_ACCESS_NOT_BUFFERABLE << MPU_RASR_B_Pos \
+ | 0x00 << MPU_RASR_SRD_Pos \
+ | (size) << MPU_RASR_SIZE_Pos \
+ | MPU_REGION_ENABLE << MPU_RASR_ENABLE_Pos \
)
#define MPU_CONFIG_SDRAM(size) ( \
- MPU_INSTRUCTION_ACCESS_ENABLE << MPU_RASR_XN_Pos \
- | MPU_REGION_FULL_ACCESS << MPU_RASR_AP_Pos \
- | MPU_TEX_LEVEL1 << MPU_RASR_TEX_Pos \
- | MPU_ACCESS_NOT_SHAREABLE << MPU_RASR_S_Pos \
- | MPU_ACCESS_CACHEABLE << MPU_RASR_C_Pos \
- | MPU_ACCESS_BUFFERABLE << MPU_RASR_B_Pos \
- | 0x00 << MPU_RASR_SRD_Pos \
- | (size) << MPU_RASR_SIZE_Pos \
- | MPU_REGION_ENABLE << MPU_RASR_ENABLE_Pos \
+ MPU_INSTRUCTION_ACCESS_ENABLE << MPU_RASR_XN_Pos \
+ | MPU_REGION_FULL_ACCESS << MPU_RASR_AP_Pos \
+ | MPU_TEX_LEVEL1 << MPU_RASR_TEX_Pos \
+ | MPU_ACCESS_NOT_SHAREABLE << MPU_RASR_S_Pos \
+ | MPU_ACCESS_CACHEABLE << MPU_RASR_C_Pos \
+ | MPU_ACCESS_BUFFERABLE << MPU_RASR_B_Pos \
+ | 0x00 << MPU_RASR_SRD_Pos \
+ | (size) << MPU_RASR_SIZE_Pos \
+ | MPU_REGION_ENABLE << MPU_RASR_ENABLE_Pos \
)
static inline void mpu_init(void) {
diff --git a/ports/stm32/network_lan.c b/ports/stm32/network_lan.c
index d89c237..8b2104a 100644
--- a/ports/stm32/network_lan.c
+++ b/ports/stm32/network_lan.c
@@ -50,7 +50,7 @@
netif->ip_addr.addr >> 8 & 0xff,
netif->ip_addr.addr >> 16 & 0xff,
netif->ip_addr.addr >> 24
- );
+ );
}
STATIC mp_obj_t network_lan_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
@@ -159,7 +159,7 @@
.name = MP_QSTR_LAN,
.print = network_lan_print,
.make_new = network_lan_make_new,
- .locals_dict = (mp_obj_dict_t*)&network_lan_locals_dict,
+ .locals_dict = (mp_obj_dict_t *)&network_lan_locals_dict,
};
#endif // defined(MICROPY_HW_ETH_MDC)
diff --git a/ports/stm32/network_wiznet5k.c b/ports/stm32/network_wiznet5k.c
index 796b555..f57f6a8 100644
--- a/ports/stm32/network_wiznet5k.c
+++ b/ports/stm32/network_wiznet5k.c
@@ -86,7 +86,7 @@
}
STATIC void wiz_spi_write(const uint8_t *buf, uint32_t len) {
- HAL_StatusTypeDef status = HAL_SPI_Transmit(wiznet5k_obj.spi->spi, (uint8_t*)buf, len, 5000);
+ HAL_StatusTypeDef status = HAL_SPI_Transmit(wiznet5k_obj.spi->spi, (uint8_t *)buf, len, 5000);
(void)status;
}
@@ -156,7 +156,7 @@
STATIC void wiznet5k_send_ethernet(wiznet5k_obj_t *self, size_t len, const uint8_t *buf) {
uint8_t ip[4] = {1, 1, 1, 1}; // dummy
- int ret = WIZCHIP_EXPORT(sendto)(0, (byte*)buf, len, ip, 11); // dummy port
+ int ret = WIZCHIP_EXPORT(sendto)(0, (byte *)buf, len, ip, 11); // dummy port
if (ret != len) {
printf("wiznet5k_send_ethernet: fatal error %d\n", ret);
netif_set_link_down(&self->netif);
@@ -271,7 +271,7 @@
// Access the existing object, if it has been constructed with the same hardware interface
if (wiznet5k_obj.base.type == &mod_network_nic_type_wiznet5k) {
if (!(wiznet5k_obj.spi == spi && wiznet5k_obj.cs == cs && wiznet5k_obj.rst == rst
- && wiznet5k_obj.netif.flags != 0)) {
+ && wiznet5k_obj.netif.flags != 0)) {
wiznet5k_deinit();
}
}
@@ -327,7 +327,7 @@
wizphy_getphylink() == PHY_LINK_ON
&& (self->netif.flags & NETIF_FLAG_UP)
&& self->netif.ip_addr.addr != 0
- );
+ );
}
STATIC MP_DEFINE_CONST_FUN_OBJ_1(wiznet5k_isconnected_obj, wiznet5k_isconnected);
@@ -459,7 +459,7 @@
{ &mp_type_type },
.name = MP_QSTR_WIZNET5K,
.make_new = wiznet5k_make_new,
- .locals_dict = (mp_obj_dict_t*)&wiznet5k_locals_dict,
+ .locals_dict = (mp_obj_dict_t *)&wiznet5k_locals_dict,
};
#endif // MICROPY_PY_WIZNET5K && MICROPY_PY_LWIP
diff --git a/ports/stm32/nimble_hci_uart.c b/ports/stm32/nimble_hci_uart.c
index e2ba00c..1160855 100644
--- a/ports/stm32/nimble_hci_uart.c
+++ b/ports/stm32/nimble_hci_uart.c
@@ -61,7 +61,7 @@
void nimble_hci_uart_tx_strn(const char *str, uint len) {
MICROPY_PY_LWIP_ENTER
- rfcore_ble_hci_cmd(len, (const uint8_t*)str);
+ rfcore_ble_hci_cmd(len, (const uint8_t *)str);
MICROPY_PY_LWIP_EXIT
}
diff --git a/ports/stm32/pendsv.c b/ports/stm32/pendsv.c
index 2979dc4..60b8709 100644
--- a/ports/stm32/pendsv.c
+++ b/ports/stm32/pendsv.c
@@ -180,5 +180,5 @@
#endif
"pendsv_object_ptr: .word pendsv_object\n"
"nlr_jump_ptr: .word nlr_jump\n"
- );
+ );
}
diff --git a/ports/stm32/pin.c b/ports/stm32/pin.c
index 93b5c34..2a2228f 100644
--- a/ports/stm32/pin.c
+++ b/ports/stm32/pin.c
@@ -564,7 +564,7 @@
{ MP_ROM_QSTR(MP_QSTR_AF_OD), MP_ROM_INT(GPIO_MODE_AF_OD) },
{ MP_ROM_QSTR(MP_QSTR_PULL_NONE), MP_ROM_INT(GPIO_NOPULL) },
-#include "genhdr/pins_af_const.h"
+ #include "genhdr/pins_af_const.h"
};
STATIC MP_DEFINE_CONST_DICT(pin_locals_dict, pin_locals_dict_table);
@@ -596,7 +596,7 @@
.make_new = mp_pin_make_new,
.call = pin_call,
.protocol = &pin_pin_p,
- .locals_dict = (mp_obj_dict_t*)&pin_locals_dict,
+ .locals_dict = (mp_obj_dict_t *)&pin_locals_dict,
};
/// \moduleref pyb
@@ -670,5 +670,5 @@
{ &mp_type_type },
.name = MP_QSTR_PinAF,
.print = pin_af_obj_print,
- .locals_dict = (mp_obj_dict_t*)&pin_af_locals_dict,
+ .locals_dict = (mp_obj_dict_t *)&pin_af_locals_dict,
};
diff --git a/ports/stm32/pin.h b/ports/stm32/pin.h
index ea57b0a..969298a 100644
--- a/ports/stm32/pin.h
+++ b/ports/stm32/pin.h
@@ -33,26 +33,26 @@
#include "py/obj.h"
typedef struct {
- mp_obj_base_t base;
- qstr name;
- uint8_t idx;
- uint8_t fn;
- uint8_t unit;
- uint8_t type;
- void *reg; // The peripheral associated with this AF
+ mp_obj_base_t base;
+ qstr name;
+ uint8_t idx;
+ uint8_t fn;
+ uint8_t unit;
+ uint8_t type;
+ void *reg; // The peripheral associated with this AF
} pin_af_obj_t;
typedef struct {
- mp_obj_base_t base;
- qstr name;
- uint32_t port : 4;
- uint32_t pin : 5; // Some ARM processors use 32 bits/PORT
- uint32_t num_af : 4;
- uint32_t adc_channel : 5; // Some ARM processors use 32 bits/PORT
- uint32_t adc_num : 3; // 1 bit per ADC
- uint32_t pin_mask;
- pin_gpio_t *gpio;
- const pin_af_obj_t *af;
+ mp_obj_base_t base;
+ qstr name;
+ uint32_t port : 4;
+ uint32_t pin : 5; // Some ARM processors use 32 bits/PORT
+ uint32_t num_af : 4;
+ uint32_t adc_channel : 5; // Some ARM processors use 32 bits/PORT
+ uint32_t adc_num : 3; // 1 bit per ADC
+ uint32_t pin_mask;
+ pin_gpio_t *gpio;
+ const pin_af_obj_t *af;
} pin_obj_t;
extern const mp_obj_type_t pin_type;
@@ -62,8 +62,8 @@
#include "genhdr/pins.h"
typedef struct {
- const char *name;
- const pin_obj_t *pin;
+ const char *name;
+ const pin_obj_t *pin;
} pin_named_pin_t;
extern const pin_named_pin_t pin_board_pins[];
diff --git a/ports/stm32/pin_defs_stm32.h b/ports/stm32/pin_defs_stm32.h
index 739083d..33a1790 100644
--- a/ports/stm32/pin_defs_stm32.h
+++ b/ports/stm32/pin_defs_stm32.h
@@ -28,76 +28,76 @@
// This file should only ever be #included by pin.h and not directly.
enum {
- PORT_A,
- PORT_B,
- PORT_C,
- PORT_D,
- PORT_E,
- PORT_F,
- PORT_G,
- PORT_H,
- PORT_I,
- PORT_J,
- PORT_K,
+ PORT_A,
+ PORT_B,
+ PORT_C,
+ PORT_D,
+ PORT_E,
+ PORT_F,
+ PORT_G,
+ PORT_H,
+ PORT_I,
+ PORT_J,
+ PORT_K,
};
// Must have matching entries in SUPPORTED_FN in boards/make-pins.py
enum {
- AF_FN_TIM,
- AF_FN_I2C,
- AF_FN_USART,
- AF_FN_UART = AF_FN_USART,
- AF_FN_SPI,
- AF_FN_I2S,
- AF_FN_SDMMC,
- AF_FN_CAN,
+ AF_FN_TIM,
+ AF_FN_I2C,
+ AF_FN_USART,
+ AF_FN_UART = AF_FN_USART,
+ AF_FN_SPI,
+ AF_FN_I2S,
+ AF_FN_SDMMC,
+ AF_FN_CAN,
};
enum {
- AF_PIN_TYPE_TIM_CH1 = 0,
- AF_PIN_TYPE_TIM_CH2,
- AF_PIN_TYPE_TIM_CH3,
- AF_PIN_TYPE_TIM_CH4,
- AF_PIN_TYPE_TIM_CH1N,
- AF_PIN_TYPE_TIM_CH2N,
- AF_PIN_TYPE_TIM_CH3N,
- AF_PIN_TYPE_TIM_CH1_ETR,
- AF_PIN_TYPE_TIM_ETR,
- AF_PIN_TYPE_TIM_BKIN,
+ AF_PIN_TYPE_TIM_CH1 = 0,
+ AF_PIN_TYPE_TIM_CH2,
+ AF_PIN_TYPE_TIM_CH3,
+ AF_PIN_TYPE_TIM_CH4,
+ AF_PIN_TYPE_TIM_CH1N,
+ AF_PIN_TYPE_TIM_CH2N,
+ AF_PIN_TYPE_TIM_CH3N,
+ AF_PIN_TYPE_TIM_CH1_ETR,
+ AF_PIN_TYPE_TIM_ETR,
+ AF_PIN_TYPE_TIM_BKIN,
- AF_PIN_TYPE_I2C_SDA = 0,
- AF_PIN_TYPE_I2C_SCL,
+ AF_PIN_TYPE_I2C_SDA = 0,
+ AF_PIN_TYPE_I2C_SCL,
- AF_PIN_TYPE_USART_TX = 0,
- AF_PIN_TYPE_USART_RX,
- AF_PIN_TYPE_USART_CTS,
- AF_PIN_TYPE_USART_RTS,
- AF_PIN_TYPE_USART_CK,
- AF_PIN_TYPE_UART_TX = AF_PIN_TYPE_USART_TX,
- AF_PIN_TYPE_UART_RX = AF_PIN_TYPE_USART_RX,
- AF_PIN_TYPE_UART_CTS = AF_PIN_TYPE_USART_CTS,
- AF_PIN_TYPE_UART_RTS = AF_PIN_TYPE_USART_RTS,
+ AF_PIN_TYPE_USART_TX = 0,
+ AF_PIN_TYPE_USART_RX,
+ AF_PIN_TYPE_USART_CTS,
+ AF_PIN_TYPE_USART_RTS,
+ AF_PIN_TYPE_USART_CK,
+ AF_PIN_TYPE_UART_TX = AF_PIN_TYPE_USART_TX,
+ AF_PIN_TYPE_UART_RX = AF_PIN_TYPE_USART_RX,
+ AF_PIN_TYPE_UART_CTS = AF_PIN_TYPE_USART_CTS,
+ AF_PIN_TYPE_UART_RTS = AF_PIN_TYPE_USART_RTS,
- AF_PIN_TYPE_SPI_MOSI = 0,
- AF_PIN_TYPE_SPI_MISO,
- AF_PIN_TYPE_SPI_SCK,
- AF_PIN_TYPE_SPI_NSS,
+ AF_PIN_TYPE_SPI_MOSI = 0,
+ AF_PIN_TYPE_SPI_MISO,
+ AF_PIN_TYPE_SPI_SCK,
+ AF_PIN_TYPE_SPI_NSS,
- AF_PIN_TYPE_I2S_CK = 0,
- AF_PIN_TYPE_I2S_MCK,
- AF_PIN_TYPE_I2S_SD,
- AF_PIN_TYPE_I2S_WS,
- AF_PIN_TYPE_I2S_EXTSD,
+ AF_PIN_TYPE_I2S_CK = 0,
+ AF_PIN_TYPE_I2S_MCK,
+ AF_PIN_TYPE_I2S_SD,
+ AF_PIN_TYPE_I2S_WS,
+ AF_PIN_TYPE_I2S_EXTSD,
- AF_PIN_TYPE_SDMMC_CK = 0,
- AF_PIN_TYPE_SDMMC_CMD,
- AF_PIN_TYPE_SDMMC_D0,
- AF_PIN_TYPE_SDMMC_D1,
- AF_PIN_TYPE_SDMMC_D2,
- AF_PIN_TYPE_SDMMC_D3,
+ AF_PIN_TYPE_SDMMC_CK = 0,
+ AF_PIN_TYPE_SDMMC_CMD,
+ AF_PIN_TYPE_SDMMC_D0,
+ AF_PIN_TYPE_SDMMC_D1,
+ AF_PIN_TYPE_SDMMC_D2,
+ AF_PIN_TYPE_SDMMC_D3,
- AF_PIN_TYPE_CAN_TX = 0,
- AF_PIN_TYPE_CAN_RX,
+ AF_PIN_TYPE_CAN_TX = 0,
+ AF_PIN_TYPE_CAN_RX,
};
// The HAL uses a slightly different naming than we chose, so we provide
@@ -123,9 +123,9 @@
#endif
enum {
- PIN_ADC1 = (1 << 0),
- PIN_ADC2 = (1 << 1),
- PIN_ADC3 = (1 << 2),
+ PIN_ADC1 = (1 << 0),
+ PIN_ADC2 = (1 << 1),
+ PIN_ADC3 = (1 << 2),
};
typedef GPIO_TypeDef pin_gpio_t;
diff --git a/ports/stm32/pin_named_pins.c b/ports/stm32/pin_named_pins.c
index 1c7e643..3a8e0f9 100644
--- a/ports/stm32/pin_named_pins.c
+++ b/ports/stm32/pin_named_pins.c
@@ -34,18 +34,18 @@
const mp_obj_type_t pin_cpu_pins_obj_type = {
{ &mp_type_type },
.name = MP_QSTR_cpu,
- .locals_dict = (mp_obj_dict_t*)&pin_cpu_pins_locals_dict,
+ .locals_dict = (mp_obj_dict_t *)&pin_cpu_pins_locals_dict,
};
const mp_obj_type_t pin_board_pins_obj_type = {
{ &mp_type_type },
.name = MP_QSTR_board,
- .locals_dict = (mp_obj_dict_t*)&pin_board_pins_locals_dict,
+ .locals_dict = (mp_obj_dict_t *)&pin_board_pins_locals_dict,
};
const pin_obj_t *pin_find_named_pin(const mp_obj_dict_t *named_pins, mp_obj_t name) {
const mp_map_t *named_map = &named_pins->map;
- mp_map_elem_t *named_elem = mp_map_lookup((mp_map_t*)named_map, name, MP_MAP_LOOKUP);
+ mp_map_elem_t *named_elem = mp_map_lookup((mp_map_t *)named_map, name, MP_MAP_LOOKUP);
if (named_elem != NULL && named_elem->value != MP_OBJ_NULL) {
return MP_OBJ_TO_PTR(named_elem->value);
}
diff --git a/ports/stm32/pin_static_af.h b/ports/stm32/pin_static_af.h
index f5f4e6f..49580a2 100644
--- a/ports/stm32/pin_static_af.h
+++ b/ports/stm32/pin_static_af.h
@@ -32,18 +32,18 @@
#if 0 // Enable to test if AF's are statically compiled
#define mp_hal_pin_config_alt_static(pin_obj, mode, pull, fn_type) \
- mp_hal_pin_config(pin_obj, mode, pull, fn_type(pin_obj)); \
- _Static_assert(fn_type(pin_obj) != -1, ""); \
- _Static_assert(__builtin_constant_p(fn_type(pin_obj)) == 1, "")
+ mp_hal_pin_config(pin_obj, mode, pull, fn_type(pin_obj)); \
+ _Static_assert(fn_type(pin_obj) != -1, ""); \
+ _Static_assert(__builtin_constant_p(fn_type(pin_obj)) == 1, "")
#else
#define mp_hal_pin_config_alt_static(pin_obj, mode, pull, fn_type) \
- mp_hal_pin_config(pin_obj, mode, pull, fn_type(pin_obj)) /* Overflow Error => alt func not found */
+ mp_hal_pin_config(pin_obj, mode, pull, fn_type(pin_obj)) /* Overflow Error => alt func not found */
#define mp_hal_pin_config_alt_static_speed(pin_obj, mode, pull, speed, fn_type) \
- mp_hal_pin_config(pin_obj, mode, pull, fn_type(pin_obj)); /* Overflow Error => alt func not found */ \
- mp_hal_pin_config_speed(pin_obj, speed)
+ mp_hal_pin_config(pin_obj, mode, pull, fn_type(pin_obj)); /* Overflow Error => alt func not found */ \
+ mp_hal_pin_config_speed(pin_obj, speed)
#endif
diff --git a/ports/stm32/powerctrl.c b/ports/stm32/powerctrl.c
index 0b26e2a..e11de8b 100644
--- a/ports/stm32/powerctrl.c
+++ b/ports/stm32/powerctrl.c
@@ -42,7 +42,7 @@
// Location in RAM of bootloader state (just after the top of the stack)
extern uint32_t _estack[];
-#define BL_STATE ((uint32_t*)&_estack)
+#define BL_STATE ((uint32_t *)&_estack)
static inline void powerctrl_disable_hsi_if_unused(void) {
#if !MICROPY_HW_CLK_USE_HSI && (defined(STM32F4) || defined(STM32F7) || defined(STM32H7))
@@ -74,7 +74,7 @@
"msr msp, r2\n" // get stack pointer
"ldr r2, [r1, #4]\n" // get address of destination
"bx r2\n" // branch to bootloader
- );
+ );
}
void powerctrl_check_enter_bootloader(void) {
@@ -205,51 +205,89 @@
STATIC uint32_t calc_ahb_div(uint32_t wanted_div) {
#if defined(STM32H7)
- if (wanted_div <= 1) { return RCC_HCLK_DIV1; }
- else if (wanted_div <= 2) { return RCC_HCLK_DIV2; }
- else if (wanted_div <= 4) { return RCC_HCLK_DIV4; }
- else if (wanted_div <= 8) { return RCC_HCLK_DIV8; }
- else if (wanted_div <= 16) { return RCC_HCLK_DIV16; }
- else if (wanted_div <= 64) { return RCC_HCLK_DIV64; }
- else if (wanted_div <= 128) { return RCC_HCLK_DIV128; }
- else if (wanted_div <= 256) { return RCC_HCLK_DIV256; }
- else { return RCC_HCLK_DIV512; }
+ if (wanted_div <= 1) {
+ return RCC_HCLK_DIV1;
+ } else if (wanted_div <= 2) {
+ return RCC_HCLK_DIV2;
+ } else if (wanted_div <= 4) {
+ return RCC_HCLK_DIV4;
+ } else if (wanted_div <= 8) {
+ return RCC_HCLK_DIV8;
+ } else if (wanted_div <= 16) {
+ return RCC_HCLK_DIV16;
+ } else if (wanted_div <= 64) {
+ return RCC_HCLK_DIV64;
+ } else if (wanted_div <= 128) {
+ return RCC_HCLK_DIV128;
+ } else if (wanted_div <= 256) {
+ return RCC_HCLK_DIV256;
+ } else {
+ return RCC_HCLK_DIV512;
+ }
#else
- if (wanted_div <= 1) { return RCC_SYSCLK_DIV1; }
- else if (wanted_div <= 2) { return RCC_SYSCLK_DIV2; }
- else if (wanted_div <= 4) { return RCC_SYSCLK_DIV4; }
- else if (wanted_div <= 8) { return RCC_SYSCLK_DIV8; }
- else if (wanted_div <= 16) { return RCC_SYSCLK_DIV16; }
- else if (wanted_div <= 64) { return RCC_SYSCLK_DIV64; }
- else if (wanted_div <= 128) { return RCC_SYSCLK_DIV128; }
- else if (wanted_div <= 256) { return RCC_SYSCLK_DIV256; }
- else { return RCC_SYSCLK_DIV512; }
+ if (wanted_div <= 1) {
+ return RCC_SYSCLK_DIV1;
+ } else if (wanted_div <= 2) {
+ return RCC_SYSCLK_DIV2;
+ } else if (wanted_div <= 4) {
+ return RCC_SYSCLK_DIV4;
+ } else if (wanted_div <= 8) {
+ return RCC_SYSCLK_DIV8;
+ } else if (wanted_div <= 16) {
+ return RCC_SYSCLK_DIV16;
+ } else if (wanted_div <= 64) {
+ return RCC_SYSCLK_DIV64;
+ } else if (wanted_div <= 128) {
+ return RCC_SYSCLK_DIV128;
+ } else if (wanted_div <= 256) {
+ return RCC_SYSCLK_DIV256;
+ } else {
+ return RCC_SYSCLK_DIV512;
+ }
#endif
}
STATIC uint32_t calc_apb1_div(uint32_t wanted_div) {
#if defined(STM32H7)
- if (wanted_div <= 1) { return RCC_APB1_DIV1; }
- else if (wanted_div <= 2) { return RCC_APB1_DIV2; }
- else if (wanted_div <= 4) { return RCC_APB1_DIV4; }
- else if (wanted_div <= 8) { return RCC_APB1_DIV8; }
- else { return RCC_APB1_DIV16; }
+ if (wanted_div <= 1) {
+ return RCC_APB1_DIV1;
+ } else if (wanted_div <= 2) {
+ return RCC_APB1_DIV2;
+ } else if (wanted_div <= 4) {
+ return RCC_APB1_DIV4;
+ } else if (wanted_div <= 8) {
+ return RCC_APB1_DIV8;
+ } else {
+ return RCC_APB1_DIV16;
+ }
#else
- if (wanted_div <= 1) { return RCC_HCLK_DIV1; }
- else if (wanted_div <= 2) { return RCC_HCLK_DIV2; }
- else if (wanted_div <= 4) { return RCC_HCLK_DIV4; }
- else if (wanted_div <= 8) { return RCC_HCLK_DIV8; }
- else { return RCC_HCLK_DIV16; }
+ if (wanted_div <= 1) {
+ return RCC_HCLK_DIV1;
+ } else if (wanted_div <= 2) {
+ return RCC_HCLK_DIV2;
+ } else if (wanted_div <= 4) {
+ return RCC_HCLK_DIV4;
+ } else if (wanted_div <= 8) {
+ return RCC_HCLK_DIV8;
+ } else {
+ return RCC_HCLK_DIV16;
+ }
#endif
}
STATIC uint32_t calc_apb2_div(uint32_t wanted_div) {
#if defined(STM32H7)
- if (wanted_div <= 1) { return RCC_APB2_DIV1; }
- else if (wanted_div <= 2) { return RCC_APB2_DIV2; }
- else if (wanted_div <= 4) { return RCC_APB2_DIV4; }
- else if (wanted_div <= 8) { return RCC_APB2_DIV8; }
- else { return RCC_APB2_DIV16; }
+ if (wanted_div <= 1) {
+ return RCC_APB2_DIV1;
+ } else if (wanted_div <= 2) {
+ return RCC_APB2_DIV2;
+ } else if (wanted_div <= 4) {
+ return RCC_APB2_DIV4;
+ } else if (wanted_div <= 8) {
+ return RCC_APB2_DIV8;
+ } else {
+ return RCC_APB2_DIV16;
+ }
#else
return calc_apb1_div(wanted_div);
#endif
@@ -326,7 +364,7 @@
RCC_ClkInitStruct.APB1CLKDivider = calc_apb1_div(ahb / apb1);
RCC_ClkInitStruct.APB2CLKDivider = calc_apb2_div(ahb / apb2);
#if defined(STM32H7)
- RCC_ClkInitStruct.SYSCLKDivider = RCC_SYSCLK_DIV1;
+ RCC_ClkInitStruct.SYSCLKDivider = RCC_SYSCLK_DIV1;
RCC_ClkInitStruct.APB3CLKDivider = RCC_APB3_DIV2;
RCC_ClkInitStruct.APB4CLKDivider = RCC_APB4_DIV2;
#endif
@@ -438,9 +476,9 @@
HAL_PWREx_EnableFlashPowerDown();
#endif
- # if defined(STM32F7)
+ #if defined(STM32F7)
HAL_PWR_EnterSTOPMode((PWR_CR1_LPDS | PWR_CR1_LPUDS | PWR_CR1_FPDS | PWR_CR1_UDEN), PWR_STOPENTRY_WFI);
- # else
+ #else
HAL_PWR_EnterSTOPMode(PWR_LOWPOWERREGULATOR_ON, PWR_STOPENTRY_WFI);
#endif
diff --git a/ports/stm32/powerctrlboot.c b/ports/stm32/powerctrlboot.c
index acc33f1..749cb55 100644
--- a/ports/stm32/powerctrlboot.c
+++ b/ports/stm32/powerctrlboot.c
@@ -166,10 +166,10 @@
#define PLLR (3) // f_R = 64MHz
RCC->PLLCFGR =
(PLLR - 1) << RCC_PLLCFGR_PLLR_Pos | RCC_PLLCFGR_PLLREN
- | (PLLQ - 1) << RCC_PLLCFGR_PLLQ_Pos | RCC_PLLCFGR_PLLQEN
- | PLLN << RCC_PLLCFGR_PLLN_Pos
- | (PLLM - 1) << RCC_PLLCFGR_PLLM_Pos
- | 3 << RCC_PLLCFGR_PLLSRC_Pos;
+ | (PLLQ - 1) << RCC_PLLCFGR_PLLQ_Pos | RCC_PLLCFGR_PLLQEN
+ | PLLN << RCC_PLLCFGR_PLLN_Pos
+ | (PLLM - 1) << RCC_PLLCFGR_PLLM_Pos
+ | 3 << RCC_PLLCFGR_PLLSRC_Pos;
RCC->CR |= RCC_CR_PLLON;
while (!(RCC->CR & RCC_CR_PLLRDY)) {
// Wait for PLL to lock
diff --git a/ports/stm32/pyb_can.c b/ports/stm32/pyb_can.c
index 2faa450..fa577e7 100644
--- a/ports/stm32/pyb_can.c
+++ b/ports/stm32/pyb_can.c
@@ -113,10 +113,19 @@
} else {
qstr mode;
switch (self->can.Init.Mode) {
- case CAN_MODE_NORMAL: mode = MP_QSTR_NORMAL; break;
- case CAN_MODE_LOOPBACK: mode = MP_QSTR_LOOPBACK; break;
- case CAN_MODE_SILENT: mode = MP_QSTR_SILENT; break;
- case CAN_MODE_SILENT_LOOPBACK: default: mode = MP_QSTR_SILENT_LOOPBACK; break;
+ case CAN_MODE_NORMAL:
+ mode = MP_QSTR_NORMAL;
+ break;
+ case CAN_MODE_LOOPBACK:
+ mode = MP_QSTR_LOOPBACK;
+ break;
+ case CAN_MODE_SILENT:
+ mode = MP_QSTR_SILENT;
+ break;
+ case CAN_MODE_SILENT_LOOPBACK:
+ default:
+ mode = MP_QSTR_SILENT_LOOPBACK;
+ break;
}
mp_printf(print, "CAN(%u, CAN.%q, extframe=%q, auto_restart=%q)",
self->can_id,
@@ -125,9 +134,9 @@
#if MICROPY_HW_ENABLE_FDCAN
(self->can.Instance->CCCR & FDCAN_CCCR_DAR) ? MP_QSTR_True : MP_QSTR_False
#else
- (self->can.Instance->MCR & CAN_MCR_ABOM) ? MP_QSTR_True : MP_QSTR_False
+ (self->can.Instance->MCR & CAN_MCR_ABOM) ? MP_QSTR_True : MP_QSTR_False
#endif
- );
+ );
}
}
@@ -135,12 +144,12 @@
STATIC mp_obj_t pyb_can_init_helper(pyb_can_obj_t *self, size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
enum { ARG_mode, ARG_extframe, ARG_prescaler, ARG_sjw, ARG_bs1, ARG_bs2, ARG_auto_restart };
static const mp_arg_t allowed_args[] = {
- { MP_QSTR_mode, MP_ARG_REQUIRED | MP_ARG_INT, {.u_int = CAN_MODE_NORMAL} },
+ { MP_QSTR_mode, MP_ARG_REQUIRED | MP_ARG_INT, {.u_int = CAN_MODE_NORMAL} },
{ MP_QSTR_extframe, MP_ARG_BOOL, {.u_bool = false} },
- { MP_QSTR_prescaler, MP_ARG_INT, {.u_int = CAN_DEFAULT_PRESCALER} },
- { MP_QSTR_sjw, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = CAN_DEFAULT_SJW} },
- { MP_QSTR_bs1, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = CAN_DEFAULT_BS1} },
- { MP_QSTR_bs2, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = CAN_DEFAULT_BS2} },
+ { MP_QSTR_prescaler, MP_ARG_INT, {.u_int = CAN_DEFAULT_PRESCALER} },
+ { MP_QSTR_sjw, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = CAN_DEFAULT_SJW} },
+ { MP_QSTR_bs1, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = CAN_DEFAULT_BS1} },
+ { MP_QSTR_bs2, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = CAN_DEFAULT_BS2} },
{ MP_QSTR_auto_restart, MP_ARG_KW_ONLY | MP_ARG_BOOL, {.u_bool = false} },
};
@@ -396,7 +405,7 @@
}
if (args[ARG_rtr].u_bool == false) {
tx_msg.TxFrameType = FDCAN_DATA_FRAME;
- } else {
+ } else {
tx_msg.TxFrameType = FDCAN_REMOTE_FRAME;
}
#else
@@ -412,13 +421,13 @@
}
if (args[ARG_rtr].u_bool == false) {
tx_msg.RTR = CAN_RTR_DATA;
- } else {
+ } else {
tx_msg.RTR = CAN_RTR_REMOTE;
}
#endif
for (mp_uint_t i = 0; i < bufinfo.len; i++) {
- tx_data[i] = ((byte*)bufinfo.buf)[i];
+ tx_data[i] = ((byte *)bufinfo.buf)[i];
}
HAL_StatusTypeDef status;
@@ -485,24 +494,24 @@
byte *state = (fifo == CAN_FIFO0) ? &self->rx_state0 : &self->rx_state1;
switch (*state) {
- case RX_STATE_FIFO_EMPTY:
- break;
- case RX_STATE_MESSAGE_PENDING:
- if (__HAL_CAN_MSG_PENDING(&self->can, fifo) == 0) {
- // Fifo is empty
- __HAL_CAN_ENABLE_IT(&self->can, (fifo == CAN_FIFO0) ? CAN_IT_FIFO0_PENDING : CAN_IT_FIFO1_PENDING);
- *state = RX_STATE_FIFO_EMPTY;
- }
- break;
- case RX_STATE_FIFO_FULL:
- __HAL_CAN_ENABLE_IT(&self->can, (fifo == CAN_FIFO0) ? CAN_IT_FIFO0_FULL : CAN_IT_FIFO1_FULL);
- *state = RX_STATE_MESSAGE_PENDING;
- break;
- case RX_STATE_FIFO_OVERFLOW:
- __HAL_CAN_ENABLE_IT(&self->can, (fifo == CAN_FIFO0) ? CAN_IT_FIFO0_OVRF : CAN_IT_FIFO1_OVRF);
- __HAL_CAN_ENABLE_IT(&self->can, (fifo == CAN_FIFO0) ? CAN_IT_FIFO0_FULL : CAN_IT_FIFO1_FULL);
- *state = RX_STATE_MESSAGE_PENDING;
- break;
+ case RX_STATE_FIFO_EMPTY:
+ break;
+ case RX_STATE_MESSAGE_PENDING:
+ if (__HAL_CAN_MSG_PENDING(&self->can, fifo) == 0) {
+ // Fifo is empty
+ __HAL_CAN_ENABLE_IT(&self->can, (fifo == CAN_FIFO0) ? CAN_IT_FIFO0_PENDING : CAN_IT_FIFO1_PENDING);
+ *state = RX_STATE_FIFO_EMPTY;
+ }
+ break;
+ case RX_STATE_FIFO_FULL:
+ __HAL_CAN_ENABLE_IT(&self->can, (fifo == CAN_FIFO0) ? CAN_IT_FIFO0_FULL : CAN_IT_FIFO1_FULL);
+ *state = RX_STATE_MESSAGE_PENDING;
+ break;
+ case RX_STATE_FIFO_OVERFLOW:
+ __HAL_CAN_ENABLE_IT(&self->can, (fifo == CAN_FIFO0) ? CAN_IT_FIFO0_OVRF : CAN_IT_FIFO1_OVRF);
+ __HAL_CAN_ENABLE_IT(&self->can, (fifo == CAN_FIFO0) ? CAN_IT_FIFO0_FULL : CAN_IT_FIFO1_FULL);
+ *state = RX_STATE_MESSAGE_PENDING;
+ break;
}
}
@@ -512,7 +521,7 @@
mp_obj_t *items;
if (ret_obj == mp_const_none) {
ret_obj = mp_obj_new_tuple(4, NULL);
- items = ((mp_obj_tuple_t*)MP_OBJ_TO_PTR(ret_obj))->items;
+ items = ((mp_obj_tuple_t *)MP_OBJ_TO_PTR(ret_obj))->items;
items[3] = mp_obj_new_bytes(rx_data, rx_dlc);
} else {
// User should provide a list of length at least 4 to hold the values
@@ -531,7 +540,7 @@
}
mp_obj_array_t *mv = MP_OBJ_TO_PTR(items[3]);
if (!(mv->typecode == (MP_OBJ_ARRAY_TYPECODE_FLAG_RW | BYTEARRAY_TYPECODE)
- || (mv->typecode | 0x20) == (MP_OBJ_ARRAY_TYPECODE_FLAG_RW | 'b'))) {
+ || (mv->typecode | 0x20) == (MP_OBJ_ARRAY_TYPECODE_FLAG_RW | 'b'))) {
mp_raise_ValueError(NULL);
}
mv->len = rx_dlc;
@@ -590,7 +599,7 @@
{ MP_QSTR_mode, MP_ARG_REQUIRED | MP_ARG_INT, {.u_int = 0} },
{ MP_QSTR_fifo, MP_ARG_REQUIRED | MP_ARG_INT, {.u_int = CAN_FILTER_FIFO0} },
{ MP_QSTR_params, MP_ARG_REQUIRED | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} },
- { MP_QSTR_rtr, MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} },
+ { MP_QSTR_rtr, MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} },
};
// parse args
@@ -606,7 +615,7 @@
// Check filter mode
if (((args[ARG_mode].u_int != FDCAN_FILTER_RANGE) &&
- (args[ARG_mode].u_int != FDCAN_FILTER_DUAL) &&
+ (args[ARG_mode].u_int != FDCAN_FILTER_DUAL) &&
(args[ARG_mode].u_int != FDCAN_FILTER_MASK))) {
goto error;
}
@@ -639,7 +648,7 @@
mp_obj_t *rtr_flags;
mp_obj_t *params;
mp_obj_get_array(args[ARG_params].u_obj, &len, ¶ms);
- if (args[ARG_rtr].u_obj != MP_OBJ_NULL){
+ if (args[ARG_rtr].u_obj != MP_OBJ_NULL) {
mp_obj_get_array(args[ARG_rtr].u_obj, &rtr_len, &rtr_flags);
}
@@ -663,9 +672,9 @@
rtr_masks[3] = mp_obj_get_int(rtr_flags[3]) ? 0x02 : 0;
}
}
- filter.FilterIdLow = EXTENDED_ID_TO_16BIT_FILTER(mp_obj_get_int(params[0])) | rtr_masks[0]; // id1
- filter.FilterMaskIdLow = EXTENDED_ID_TO_16BIT_FILTER(mp_obj_get_int(params[1])) | rtr_masks[1]; // mask1
- filter.FilterIdHigh = EXTENDED_ID_TO_16BIT_FILTER(mp_obj_get_int(params[2])) | rtr_masks[2]; // id2
+ filter.FilterIdLow = EXTENDED_ID_TO_16BIT_FILTER(mp_obj_get_int(params[0])) | rtr_masks[0]; // id1
+ filter.FilterMaskIdLow = EXTENDED_ID_TO_16BIT_FILTER(mp_obj_get_int(params[1])) | rtr_masks[1]; // mask1
+ filter.FilterIdHigh = EXTENDED_ID_TO_16BIT_FILTER(mp_obj_get_int(params[2])) | rtr_masks[2]; // id2
filter.FilterMaskIdHigh = EXTENDED_ID_TO_16BIT_FILTER(mp_obj_get_int(params[3])) | rtr_masks[3]; // mask2
} else { // Basic frames
if (args[ARG_rtr].u_obj != MP_OBJ_NULL) {
@@ -681,19 +690,18 @@
rtr_masks[3] = mp_obj_get_int(rtr_flags[3]) ? 0x10 : 0;
}
}
- filter.FilterIdLow = (mp_obj_get_int(params[0]) << 5) | rtr_masks[0]; // id1
- filter.FilterMaskIdLow = (mp_obj_get_int(params[1]) << 5) | rtr_masks[1]; // mask1
- filter.FilterIdHigh = (mp_obj_get_int(params[2]) << 5) | rtr_masks[2]; // id2
+ filter.FilterIdLow = (mp_obj_get_int(params[0]) << 5) | rtr_masks[0]; // id1
+ filter.FilterMaskIdLow = (mp_obj_get_int(params[1]) << 5) | rtr_masks[1]; // mask1
+ filter.FilterIdHigh = (mp_obj_get_int(params[2]) << 5) | rtr_masks[2]; // id2
filter.FilterMaskIdHigh = (mp_obj_get_int(params[3]) << 5) | rtr_masks[3]; // mask2
}
if (args[ARG_mode].u_int == MASK16) {
- filter.FilterMode = CAN_FILTERMODE_IDMASK;
+ filter.FilterMode = CAN_FILTERMODE_IDMASK;
}
if (args[ARG_mode].u_int == LIST16) {
- filter.FilterMode = CAN_FILTERMODE_IDLIST;
+ filter.FilterMode = CAN_FILTERMODE_IDLIST;
}
- }
- else if (args[ARG_mode].u_int == MASK32 || args[ARG_mode].u_int == LIST32) {
+ } else if (args[ARG_mode].u_int == MASK32 || args[ARG_mode].u_int == LIST32) {
if (len != 2) {
goto error;
}
@@ -707,15 +715,15 @@
rtr_masks[1] = mp_obj_get_int(rtr_flags[1]) ? 0x02 : 0;
}
}
- filter.FilterIdHigh = (mp_obj_get_int(params[0]) & 0x1FFFE000) >> 13;
- filter.FilterIdLow = (((mp_obj_get_int(params[0]) & 0x00001FFF) << 3) | 4) | rtr_masks[0];
+ filter.FilterIdHigh = (mp_obj_get_int(params[0]) & 0x1FFFE000) >> 13;
+ filter.FilterIdLow = (((mp_obj_get_int(params[0]) & 0x00001FFF) << 3) | 4) | rtr_masks[0];
filter.FilterMaskIdHigh = (mp_obj_get_int(params[1]) & 0x1FFFE000 ) >> 13;
- filter.FilterMaskIdLow = (((mp_obj_get_int(params[1]) & 0x00001FFF) << 3) | 4) | rtr_masks[1];
+ filter.FilterMaskIdLow = (((mp_obj_get_int(params[1]) & 0x00001FFF) << 3) | 4) | rtr_masks[1];
if (args[ARG_mode].u_int == MASK32) {
- filter.FilterMode = CAN_FILTERMODE_IDMASK;
+ filter.FilterMode = CAN_FILTERMODE_IDMASK;
}
if (args[ARG_mode].u_int == LIST32) {
- filter.FilterMode = CAN_FILTERMODE_IDLIST;
+ filter.FilterMode = CAN_FILTERMODE_IDLIST;
}
} else {
goto error;
@@ -895,7 +903,7 @@
.print = pyb_can_print,
.make_new = pyb_can_make_new,
.protocol = &can_stream_p,
- .locals_dict = (mp_obj_dict_t*)&pyb_can_locals_dict,
+ .locals_dict = (mp_obj_dict_t *)&pyb_can_locals_dict,
};
#endif // MICROPY_HW_ENABLE_CAN
diff --git a/ports/stm32/pyb_i2c.c b/ports/stm32/pyb_i2c.c
index 7034897..09e5328 100644
--- a/ports/stm32/pyb_i2c.c
+++ b/ports/stm32/pyb_i2c.c
@@ -145,7 +145,7 @@
{PYB_I2C_SPEED_STANDARD, 0x40912732}, \
{PYB_I2C_SPEED_FULL, 0x10911823}, \
{PYB_I2C_SPEED_FAST, 0x00611116}, \
- }
+}
#define MICROPY_HW_I2C_BAUDRATE_DEFAULT (PYB_I2C_SPEED_FULL)
#define MICROPY_HW_I2C_BAUDRATE_MAX (PYB_I2C_SPEED_FAST)
@@ -159,7 +159,7 @@
{PYB_I2C_SPEED_STANDARD, 0xb0420f13}, \
{PYB_I2C_SPEED_FULL, 0x70330309}, \
{PYB_I2C_SPEED_FAST, 0x50100103}, \
- }
+}
#define MICROPY_HW_I2C_BAUDRATE_DEFAULT (PYB_I2C_SPEED_FULL)
#define MICROPY_HW_I2C_BAUDRATE_MAX (PYB_I2C_SPEED_FAST)
@@ -170,7 +170,7 @@
{PYB_I2C_SPEED_STANDARD, 0x40604E73}, \
{PYB_I2C_SPEED_FULL, 0x00901954}, \
{PYB_I2C_SPEED_FAST, 0x10810915}, \
- }
+}
#define MICROPY_HW_I2C_BAUDRATE_DEFAULT (PYB_I2C_SPEED_FULL)
#define MICROPY_HW_I2C_BAUDRATE_MAX (PYB_I2C_SPEED_FAST)
@@ -187,8 +187,8 @@
#endif
STATIC const struct {
- uint32_t baudrate;
- uint32_t timing;
+ uint32_t baudrate;
+ uint32_t timing;
} pyb_i2c_baudrate_timing[] = MICROPY_HW_I2C_BAUDRATE_TIMING;
#define NUM_BAUDRATE_TIMINGS MP_ARRAY_SIZE(pyb_i2c_baudrate_timing)
@@ -379,12 +379,12 @@
void pyb_i2c_init_freq(const pyb_i2c_obj_t *self, mp_int_t freq) {
I2C_InitTypeDef *init = &self->i2c->Init;
- init->AddressingMode = I2C_ADDRESSINGMODE_7BIT;
- init->DualAddressMode = I2C_DUALADDRESS_DISABLED;
- init->GeneralCallMode = I2C_GENERALCALL_DISABLED;
- init->NoStretchMode = I2C_NOSTRETCH_DISABLE;
- init->OwnAddress1 = PYB_I2C_MASTER_ADDRESS;
- init->OwnAddress2 = 0; // unused
+ init->AddressingMode = I2C_ADDRESSINGMODE_7BIT;
+ init->DualAddressMode = I2C_DUALADDRESS_DISABLED;
+ init->GeneralCallMode = I2C_GENERALCALL_DISABLED;
+ init->NoStretchMode = I2C_NOSTRETCH_DISABLE;
+ init->OwnAddress1 = PYB_I2C_MASTER_ADDRESS;
+ init->OwnAddress2 = 0; // unused
if (freq != -1) {
i2c_set_baudrate(init, MIN(freq, MICROPY_HW_I2C_BAUDRATE_MAX));
}
@@ -543,24 +543,35 @@
/******************************************************************************/
/* MicroPython bindings */
-static inline bool in_master_mode(pyb_i2c_obj_t *self) { return self->i2c->Init.OwnAddress1 == PYB_I2C_MASTER_ADDRESS; }
+static inline bool in_master_mode(pyb_i2c_obj_t *self) {
+ return self->i2c->Init.OwnAddress1 == PYB_I2C_MASTER_ADDRESS;
+}
STATIC void pyb_i2c_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
pyb_i2c_obj_t *self = MP_OBJ_TO_PTR(self_in);
uint i2c_num = 0;
- if (0) { }
+ if (0) {
+ }
#if defined(MICROPY_HW_I2C1_SCL)
- else if (self->i2c->Instance == I2C1) { i2c_num = 1; }
+ else if (self->i2c->Instance == I2C1) {
+ i2c_num = 1;
+ }
#endif
#if defined(MICROPY_HW_I2C2_SCL)
- else if (self->i2c->Instance == I2C2) { i2c_num = 2; }
+ else if (self->i2c->Instance == I2C2) {
+ i2c_num = 2;
+ }
#endif
#if defined(MICROPY_HW_I2C3_SCL)
- else if (self->i2c->Instance == I2C3) { i2c_num = 3; }
+ else if (self->i2c->Instance == I2C3) {
+ i2c_num = 3;
+ }
#endif
#if defined(MICROPY_HW_I2C4_SCL)
- else if (self->i2c->Instance == I2C4) { i2c_num = 4; }
+ else if (self->i2c->Instance == I2C4) {
+ i2c_num = 4;
+ }
#endif
if (self->i2c->State == HAL_I2C_STATE_RESET) {
@@ -575,7 +586,7 @@
#if PYB_I2C_TIMINGR
, self->i2c->Init.Timing
#endif
- );
+ );
} else {
mp_printf(print, "I2C(%u, I2C.SLAVE, addr=0x%02x)", i2c_num, (self->i2c->Instance->OAR1 >> 1) & 0x7f);
}
@@ -626,11 +637,11 @@
i2c_set_baudrate(init, MIN(args[2].u_int, MICROPY_HW_I2C_BAUDRATE_MAX));
}
- init->AddressingMode = I2C_ADDRESSINGMODE_7BIT;
+ init->AddressingMode = I2C_ADDRESSINGMODE_7BIT;
init->DualAddressMode = I2C_DUALADDRESS_DISABLED;
init->GeneralCallMode = args[3].u_bool ? I2C_GENERALCALL_ENABLED : I2C_GENERALCALL_DISABLED;
- init->OwnAddress2 = 0; // unused
- init->NoStretchMode = I2C_NOSTRETCH_DISABLE;
+ init->OwnAddress2 = 0; // unused
+ init->NoStretchMode = I2C_NOSTRETCH_DISABLE;
*self->use_dma = args[4].u_bool;
@@ -883,17 +894,17 @@
}
mp_uint_t i2c_addr = args[1].u_int << 1;
if (!use_dma) {
- status = HAL_I2C_Master_Receive(self->i2c, i2c_addr, (uint8_t*)vstr.buf, vstr.len, args[2].u_int);
+ status = HAL_I2C_Master_Receive(self->i2c, i2c_addr, (uint8_t *)vstr.buf, vstr.len, args[2].u_int);
} else {
MP_HAL_CLEANINVALIDATE_DCACHE(vstr.buf, vstr.len);
- status = HAL_I2C_Master_Receive_DMA(self->i2c, i2c_addr, (uint8_t*)vstr.buf, vstr.len);
+ status = HAL_I2C_Master_Receive_DMA(self->i2c, i2c_addr, (uint8_t *)vstr.buf, vstr.len);
}
} else {
if (!use_dma) {
- status = HAL_I2C_Slave_Receive(self->i2c, (uint8_t*)vstr.buf, vstr.len, args[2].u_int);
+ status = HAL_I2C_Slave_Receive(self->i2c, (uint8_t *)vstr.buf, vstr.len, args[2].u_int);
} else {
MP_HAL_CLEANINVALIDATE_DCACHE(vstr.buf, vstr.len);
- status = HAL_I2C_Slave_Receive_DMA(self->i2c, (uint8_t*)vstr.buf, vstr.len);
+ status = HAL_I2C_Slave_Receive_DMA(self->i2c, (uint8_t *)vstr.buf, vstr.len);
}
}
@@ -967,14 +978,14 @@
HAL_StatusTypeDef status;
if (!use_dma) {
- status = HAL_I2C_Mem_Read(self->i2c, i2c_addr, mem_addr, mem_addr_size, (uint8_t*)vstr.buf, vstr.len, args[3].u_int);
+ status = HAL_I2C_Mem_Read(self->i2c, i2c_addr, mem_addr, mem_addr_size, (uint8_t *)vstr.buf, vstr.len, args[3].u_int);
} else {
DMA_HandleTypeDef rx_dma;
dma_init(&rx_dma, self->rx_dma_descr, DMA_PERIPH_TO_MEMORY, self->i2c);
self->i2c->hdmatx = NULL;
self->i2c->hdmarx = &rx_dma;
MP_HAL_CLEANINVALIDATE_DCACHE(vstr.buf, vstr.len);
- status = HAL_I2C_Mem_Read_DMA(self->i2c, i2c_addr, mem_addr, mem_addr_size, (uint8_t*)vstr.buf, vstr.len);
+ status = HAL_I2C_Mem_Read_DMA(self->i2c, i2c_addr, mem_addr, mem_addr_size, (uint8_t *)vstr.buf, vstr.len);
if (status == HAL_OK) {
status = i2c_wait_dma_finished(self->i2c, args[3].u_int);
}
@@ -1084,7 +1095,7 @@
.name = MP_QSTR_I2C,
.print = pyb_i2c_print,
.make_new = pyb_i2c_make_new,
- .locals_dict = (mp_obj_dict_t*)&pyb_i2c_locals_dict,
+ .locals_dict = (mp_obj_dict_t *)&pyb_i2c_locals_dict,
};
#endif // MICROPY_PY_PYB_LEGACY && MICROPY_HW_ENABLE_HW_I2C
diff --git a/ports/stm32/pyb_spi.c b/ports/stm32/pyb_spi.c
index a3cacea..4e7a4a6 100644
--- a/ports/stm32/pyb_spi.c
+++ b/ports/stm32/pyb_spi.c
@@ -223,7 +223,7 @@
mp_obj_t o_ret = pyb_buf_get_for_recv(args[0].u_obj, &vstr);
// receive the data
- spi_transfer(self->spi, vstr.len, NULL, (uint8_t*)vstr.buf, args[1].u_int);
+ spi_transfer(self->spi, vstr.len, NULL, (uint8_t *)vstr.buf, args[1].u_int);
// return the received data
if (o_ret != MP_OBJ_NULL) {
@@ -339,7 +339,7 @@
STATIC MP_DEFINE_CONST_DICT(pyb_spi_locals_dict, pyb_spi_locals_dict_table);
STATIC void spi_transfer_machine(mp_obj_base_t *self_in, size_t len, const uint8_t *src, uint8_t *dest) {
- pyb_spi_obj_t *self = (pyb_spi_obj_t*)self_in;
+ pyb_spi_obj_t *self = (pyb_spi_obj_t *)self_in;
spi_transfer(self->spi, len, src, dest, SPI_TRANSFER_TIMEOUT(len));
}
@@ -353,5 +353,5 @@
.print = pyb_spi_print,
.make_new = pyb_spi_make_new,
.protocol = &pyb_spi_p,
- .locals_dict = (mp_obj_dict_t*)&pyb_spi_locals_dict,
+ .locals_dict = (mp_obj_dict_t *)&pyb_spi_locals_dict,
};
diff --git a/ports/stm32/pybthread.c b/ports/stm32/pybthread.c
index d6e9a3f..603bc2e 100644
--- a/ports/stm32/pybthread.c
+++ b/ports/stm32/pybthread.c
@@ -34,15 +34,15 @@
#if MICROPY_PY_THREAD
-#define PYB_MUTEX_UNLOCKED ((void*)0)
-#define PYB_MUTEX_LOCKED ((void*)1)
+#define PYB_MUTEX_UNLOCKED ((void *)0)
+#define PYB_MUTEX_LOCKED ((void *)1)
// These macros are used when we only need to protect against a thread
// switch; other interrupts are still allowed to proceed.
#define RAISE_IRQ_PRI() raise_irq_pri(IRQ_PRI_PENDSV)
#define RESTORE_IRQ_PRI(state) restore_irq_pri(state)
-extern void __fatal_error(const char*);
+extern void __fatal_error(const char *);
volatile int pyb_thread_enabled;
pyb_thread_t *volatile pyb_thread_all;
@@ -94,7 +94,7 @@
// take current thread off the run list
pyb_thread_remove_from_runable(thread);
// take current thread off the list of all threads
- for (pyb_thread_t **n = (pyb_thread_t**)&pyb_thread_all;; n = &(*n)->all_next) {
+ for (pyb_thread_t **n = (pyb_thread_t **)&pyb_thread_all;; n = &(*n)->all_next) {
if (*n == thread) {
*n = thread->all_next;
break;
@@ -116,7 +116,7 @@
}
uint32_t pyb_thread_new(pyb_thread_t *thread, void *stack, size_t stack_len, void *entry, void *arg) {
- uint32_t *stack_top = (uint32_t*)stack + stack_len; // stack is full descending
+ uint32_t *stack_top = (uint32_t *)stack + stack_len; // stack is full descending
*--stack_top = 0x01000000; // xPSR (thumb bit set)
*--stack_top = (uint32_t)entry & 0xfffffffe; // pc (must have bit 0 cleared, even for thumb code)
*--stack_top = (uint32_t)pyb_thread_terminate; // lr
diff --git a/ports/stm32/pybthread.h b/ports/stm32/pybthread.h
index 4230050..8e5ce25 100644
--- a/ports/stm32/pybthread.h
+++ b/ports/stm32/pybthread.h
@@ -59,7 +59,7 @@
}
static inline void *pyb_thread_get_local(void) {
- return (void*)pyb_thread_cur->local_state;
+ return (void *)pyb_thread_cur->local_state;
}
static inline void pyb_thread_yield(void) {
diff --git a/ports/stm32/qspi.c b/ports/stm32/qspi.c
index 20cdafb..b82d3d8 100644
--- a/ports/stm32/qspi.c
+++ b/ports/stm32/qspi.c
@@ -101,7 +101,7 @@
QUADSPI->CR =
(MICROPY_HW_QSPI_PRESCALER - 1) << QUADSPI_CR_PRESCALER_Pos
- | 3 << QUADSPI_CR_FTHRES_Pos // 4 bytes must be available to read/write
+ | 3 << QUADSPI_CR_FTHRES_Pos // 4 bytes must be available to read/write
#if defined(QUADSPI_CR_FSEL_Pos)
| 0 << QUADSPI_CR_FSEL_Pos // FLASH 1 selected
#endif
@@ -109,15 +109,15 @@
| 0 << QUADSPI_CR_DFM_Pos // dual-flash mode disabled
#endif
| MICROPY_HW_QSPI_SAMPLE_SHIFT << QUADSPI_CR_SSHIFT_Pos
- | MICROPY_HW_QSPI_TIMEOUT_COUNTER << QUADSPI_CR_TCEN_Pos
- | 1 << QUADSPI_CR_EN_Pos // enable the peripheral
- ;
+ | MICROPY_HW_QSPI_TIMEOUT_COUNTER << QUADSPI_CR_TCEN_Pos
+ | 1 << QUADSPI_CR_EN_Pos // enable the peripheral
+ ;
QUADSPI->DCR =
(MICROPY_HW_QSPIFLASH_SIZE_BITS_LOG2 - 3 - 1) << QUADSPI_DCR_FSIZE_Pos
- | (MICROPY_HW_QSPI_CS_HIGH_CYCLES - 1) << QUADSPI_DCR_CSHT_Pos
- | 0 << QUADSPI_DCR_CKMODE_Pos // CLK idles at low state
- ;
+ | (MICROPY_HW_QSPI_CS_HIGH_CYCLES - 1) << QUADSPI_DCR_CSHT_Pos
+ | 0 << QUADSPI_DCR_CKMODE_Pos // CLK idles at low state
+ ;
}
void qspi_memory_map(void) {
@@ -127,17 +127,17 @@
QUADSPI->CCR =
0 << QUADSPI_CCR_DDRM_Pos // DDR mode disabled
- | 0 << QUADSPI_CCR_SIOO_Pos // send instruction every transaction
- | 3 << QUADSPI_CCR_FMODE_Pos // memory-mapped mode
- | 3 << QUADSPI_CCR_DMODE_Pos // data on 4 lines
- | 4 << QUADSPI_CCR_DCYC_Pos // 4 dummy cycles
- | 0 << QUADSPI_CCR_ABSIZE_Pos // 8-bit alternate byte
- | 3 << QUADSPI_CCR_ABMODE_Pos // alternate byte on 4 lines
- | QSPI_ADSIZE << QUADSPI_CCR_ADSIZE_Pos
- | 3 << QUADSPI_CCR_ADMODE_Pos // address on 4 lines
- | 1 << QUADSPI_CCR_IMODE_Pos // instruction on 1 line
- | QSPI_CMD << QUADSPI_CCR_INSTRUCTION_Pos
- ;
+ | 0 << QUADSPI_CCR_SIOO_Pos // send instruction every transaction
+ | 3 << QUADSPI_CCR_FMODE_Pos // memory-mapped mode
+ | 3 << QUADSPI_CCR_DMODE_Pos // data on 4 lines
+ | 4 << QUADSPI_CCR_DCYC_Pos // 4 dummy cycles
+ | 0 << QUADSPI_CCR_ABSIZE_Pos // 8-bit alternate byte
+ | 3 << QUADSPI_CCR_ABMODE_Pos // alternate byte on 4 lines
+ | QSPI_ADSIZE << QUADSPI_CCR_ADSIZE_Pos
+ | 3 << QUADSPI_CCR_ADMODE_Pos // address on 4 lines
+ | 1 << QUADSPI_CCR_IMODE_Pos // instruction on 1 line
+ | QSPI_CMD << QUADSPI_CCR_INSTRUCTION_Pos
+ ;
qspi_mpu_enable_mapped();
}
@@ -174,32 +174,32 @@
if (len == 0) {
QUADSPI->CCR =
0 << QUADSPI_CCR_DDRM_Pos // DDR mode disabled
- | 0 << QUADSPI_CCR_SIOO_Pos // send instruction every transaction
- | 0 << QUADSPI_CCR_FMODE_Pos // indirect write mode
- | 0 << QUADSPI_CCR_DMODE_Pos // no data
- | 0 << QUADSPI_CCR_DCYC_Pos // 0 dummy cycles
- | 0 << QUADSPI_CCR_ABMODE_Pos // no alternate byte
- | 0 << QUADSPI_CCR_ADMODE_Pos // no address
- | 1 << QUADSPI_CCR_IMODE_Pos // instruction on 1 line
- | cmd << QUADSPI_CCR_INSTRUCTION_Pos // write opcode
- ;
+ | 0 << QUADSPI_CCR_SIOO_Pos // send instruction every transaction
+ | 0 << QUADSPI_CCR_FMODE_Pos // indirect write mode
+ | 0 << QUADSPI_CCR_DMODE_Pos // no data
+ | 0 << QUADSPI_CCR_DCYC_Pos // 0 dummy cycles
+ | 0 << QUADSPI_CCR_ABMODE_Pos // no alternate byte
+ | 0 << QUADSPI_CCR_ADMODE_Pos // no address
+ | 1 << QUADSPI_CCR_IMODE_Pos // instruction on 1 line
+ | cmd << QUADSPI_CCR_INSTRUCTION_Pos // write opcode
+ ;
} else {
QUADSPI->DLR = len - 1;
QUADSPI->CCR =
0 << QUADSPI_CCR_DDRM_Pos // DDR mode disabled
- | 0 << QUADSPI_CCR_SIOO_Pos // send instruction every transaction
- | 0 << QUADSPI_CCR_FMODE_Pos // indirect write mode
- | 1 << QUADSPI_CCR_DMODE_Pos // data on 1 line
- | 0 << QUADSPI_CCR_DCYC_Pos // 0 dummy cycles
- | 0 << QUADSPI_CCR_ABMODE_Pos // no alternate byte
- | 0 << QUADSPI_CCR_ADMODE_Pos // no address
- | 1 << QUADSPI_CCR_IMODE_Pos // instruction on 1 line
- | cmd << QUADSPI_CCR_INSTRUCTION_Pos // write opcode
- ;
+ | 0 << QUADSPI_CCR_SIOO_Pos // send instruction every transaction
+ | 0 << QUADSPI_CCR_FMODE_Pos // indirect write mode
+ | 1 << QUADSPI_CCR_DMODE_Pos // data on 1 line
+ | 0 << QUADSPI_CCR_DCYC_Pos // 0 dummy cycles
+ | 0 << QUADSPI_CCR_ABMODE_Pos // no alternate byte
+ | 0 << QUADSPI_CCR_ADMODE_Pos // no address
+ | 1 << QUADSPI_CCR_IMODE_Pos // instruction on 1 line
+ | cmd << QUADSPI_CCR_INSTRUCTION_Pos // write opcode
+ ;
// This assumes len==2
- *(uint16_t*)&QUADSPI->DR = data;
+ *(uint16_t *)&QUADSPI->DR = data;
}
// Wait for write to finish
@@ -219,16 +219,16 @@
if (len == 0) {
QUADSPI->CCR =
0 << QUADSPI_CCR_DDRM_Pos // DDR mode disabled
- | 0 << QUADSPI_CCR_SIOO_Pos // send instruction every transaction
- | 0 << QUADSPI_CCR_FMODE_Pos // indirect write mode
- | 0 << QUADSPI_CCR_DMODE_Pos // no data
- | 0 << QUADSPI_CCR_DCYC_Pos // 0 dummy cycles
- | 0 << QUADSPI_CCR_ABMODE_Pos // no alternate byte
- | adsize << QUADSPI_CCR_ADSIZE_Pos // 32/24-bit address size
- | 1 << QUADSPI_CCR_ADMODE_Pos // address on 1 line
- | 1 << QUADSPI_CCR_IMODE_Pos // instruction on 1 line
- | cmd << QUADSPI_CCR_INSTRUCTION_Pos // write opcode
- ;
+ | 0 << QUADSPI_CCR_SIOO_Pos // send instruction every transaction
+ | 0 << QUADSPI_CCR_FMODE_Pos // indirect write mode
+ | 0 << QUADSPI_CCR_DMODE_Pos // no data
+ | 0 << QUADSPI_CCR_DCYC_Pos // 0 dummy cycles
+ | 0 << QUADSPI_CCR_ABMODE_Pos // no alternate byte
+ | adsize << QUADSPI_CCR_ADSIZE_Pos // 32/24-bit address size
+ | 1 << QUADSPI_CCR_ADMODE_Pos // address on 1 line
+ | 1 << QUADSPI_CCR_IMODE_Pos // instruction on 1 line
+ | cmd << QUADSPI_CCR_INSTRUCTION_Pos // write opcode
+ ;
QUADSPI->AR = addr;
} else {
@@ -236,16 +236,16 @@
QUADSPI->CCR =
0 << QUADSPI_CCR_DDRM_Pos // DDR mode disabled
- | 0 << QUADSPI_CCR_SIOO_Pos // send instruction every transaction
- | 0 << QUADSPI_CCR_FMODE_Pos // indirect write mode
- | 1 << QUADSPI_CCR_DMODE_Pos // data on 1 line
- | 0 << QUADSPI_CCR_DCYC_Pos // 0 dummy cycles
- | 0 << QUADSPI_CCR_ABMODE_Pos // no alternate byte
- | adsize << QUADSPI_CCR_ADSIZE_Pos // 32/24-bit address size
- | 1 << QUADSPI_CCR_ADMODE_Pos // address on 1 line
- | 1 << QUADSPI_CCR_IMODE_Pos // instruction on 1 line
- | cmd << QUADSPI_CCR_INSTRUCTION_Pos // write opcode
- ;
+ | 0 << QUADSPI_CCR_SIOO_Pos // send instruction every transaction
+ | 0 << QUADSPI_CCR_FMODE_Pos // indirect write mode
+ | 1 << QUADSPI_CCR_DMODE_Pos // data on 1 line
+ | 0 << QUADSPI_CCR_DCYC_Pos // 0 dummy cycles
+ | 0 << QUADSPI_CCR_ABMODE_Pos // no alternate byte
+ | adsize << QUADSPI_CCR_ADSIZE_Pos // 32/24-bit address size
+ | 1 << QUADSPI_CCR_ADMODE_Pos // address on 1 line
+ | 1 << QUADSPI_CCR_IMODE_Pos // instruction on 1 line
+ | cmd << QUADSPI_CCR_INSTRUCTION_Pos // write opcode
+ ;
QUADSPI->AR = addr;
@@ -253,7 +253,7 @@
while (len) {
while (!(QUADSPI->SR & QUADSPI_SR_FTF)) {
}
- *(volatile uint8_t*)&QUADSPI->DR = *src++;
+ *(volatile uint8_t *)&QUADSPI->DR = *src++;
--len;
}
}
@@ -274,15 +274,15 @@
QUADSPI->CCR =
0 << QUADSPI_CCR_DDRM_Pos // DDR mode disabled
- | 0 << QUADSPI_CCR_SIOO_Pos // send instruction every transaction
- | 1 << QUADSPI_CCR_FMODE_Pos // indirect read mode
- | 1 << QUADSPI_CCR_DMODE_Pos // data on 1 line
- | 0 << QUADSPI_CCR_DCYC_Pos // 0 dummy cycles
- | 0 << QUADSPI_CCR_ABMODE_Pos // no alternate byte
- | 0 << QUADSPI_CCR_ADMODE_Pos // no address
- | 1 << QUADSPI_CCR_IMODE_Pos // instruction on 1 line
- | cmd << QUADSPI_CCR_INSTRUCTION_Pos // read opcode
- ;
+ | 0 << QUADSPI_CCR_SIOO_Pos // send instruction every transaction
+ | 1 << QUADSPI_CCR_FMODE_Pos // indirect read mode
+ | 1 << QUADSPI_CCR_DMODE_Pos // data on 1 line
+ | 0 << QUADSPI_CCR_DCYC_Pos // 0 dummy cycles
+ | 0 << QUADSPI_CCR_ABMODE_Pos // no alternate byte
+ | 0 << QUADSPI_CCR_ADMODE_Pos // no address
+ | 1 << QUADSPI_CCR_IMODE_Pos // instruction on 1 line
+ | cmd << QUADSPI_CCR_INSTRUCTION_Pos // read opcode
+ ;
// Wait for read to finish
while (!(QUADSPI->SR & QUADSPI_SR_TCF)) {
@@ -305,17 +305,17 @@
QUADSPI->CCR =
0 << QUADSPI_CCR_DDRM_Pos // DDR mode disabled
- | 0 << QUADSPI_CCR_SIOO_Pos // send instruction every transaction
- | 1 << QUADSPI_CCR_FMODE_Pos // indirect read mode
- | 3 << QUADSPI_CCR_DMODE_Pos // data on 4 lines
- | 4 << QUADSPI_CCR_DCYC_Pos // 4 dummy cycles
- | 0 << QUADSPI_CCR_ABSIZE_Pos // 8-bit alternate byte
- | 3 << QUADSPI_CCR_ABMODE_Pos // alternate byte on 4 lines
- | adsize << QUADSPI_CCR_ADSIZE_Pos // 32 or 24-bit address size
- | 3 << QUADSPI_CCR_ADMODE_Pos // address on 4 lines
- | 1 << QUADSPI_CCR_IMODE_Pos // instruction on 1 line
- | cmd << QUADSPI_CCR_INSTRUCTION_Pos // quad read opcode
- ;
+ | 0 << QUADSPI_CCR_SIOO_Pos // send instruction every transaction
+ | 1 << QUADSPI_CCR_FMODE_Pos // indirect read mode
+ | 3 << QUADSPI_CCR_DMODE_Pos // data on 4 lines
+ | 4 << QUADSPI_CCR_DCYC_Pos // 4 dummy cycles
+ | 0 << QUADSPI_CCR_ABSIZE_Pos // 8-bit alternate byte
+ | 3 << QUADSPI_CCR_ABMODE_Pos // alternate byte on 4 lines
+ | adsize << QUADSPI_CCR_ADSIZE_Pos // 32 or 24-bit address size
+ | 3 << QUADSPI_CCR_ADMODE_Pos // address on 4 lines
+ | 1 << QUADSPI_CCR_IMODE_Pos // instruction on 1 line
+ | cmd << QUADSPI_CCR_INSTRUCTION_Pos // quad read opcode
+ ;
QUADSPI->ABR = 0; // alternate byte: disable continuous read mode
QUADSPI->AR = addr; // addres to read from
@@ -325,7 +325,7 @@
while (len >= 4) {
while (!(QUADSPI->SR & QUADSPI_SR_FTF)) {
}
- *(uint32_t*)dest = QUADSPI->DR;
+ *(uint32_t *)dest = QUADSPI->DR;
dest += 4;
len -= 4;
}
@@ -335,7 +335,7 @@
while (len) {
while (!((QUADSPI->SR >> QUADSPI_SR_FLEVEL_Pos) & 0x3f)) {
}
- *dest++ = *(volatile uint8_t*)&QUADSPI->DR;
+ *dest++ = *(volatile uint8_t *)&QUADSPI->DR;
--len;
}
diff --git a/ports/stm32/rfcore.c b/ports/stm32/rfcore.c
index 2b45bb2..8221527 100644
--- a/ports/stm32/rfcore.c
+++ b/ports/stm32/rfcore.c
@@ -56,7 +56,7 @@
} tl_list_node_t;
typedef struct _parse_hci_info_t {
- int (*cb_fun)(void*, uint8_t);
+ int (*cb_fun)(void *, uint8_t);
void *cb_env;
bool was_hci_reset_evt;
} parse_hci_info_t;
@@ -106,11 +106,11 @@
// IPCC interface
STATIC uint32_t get_ipccdba(void) {
- return *(uint32_t*)(OPTION_BYTE_BASE + 0x68) & 0x3fff;
+ return *(uint32_t *)(OPTION_BYTE_BASE + 0x68) & 0x3fff;
}
STATIC volatile void **get_buffer_table(void) {
- return (volatile void**)(SRAM2A_BASE + get_ipccdba());
+ return (volatile void **)(SRAM2A_BASE + get_ipccdba());
}
void ipcc_init(uint32_t irq_pri) {
@@ -255,10 +255,10 @@
volatile tl_list_node_t *cur = head->next;
bool free = false;
while (cur != head) {
- tl_parse_hci_msg((uint8_t*)cur->body, parse);
+ tl_parse_hci_msg((uint8_t *)cur->body, parse);
volatile tl_list_node_t *next = tl_list_unlink(cur);
- if ((void*)&ipcc_mem_memmgr_evt_pool[0] <= (void*)cur
- && (void*)cur < (void*)&ipcc_mem_memmgr_evt_pool[MP_ARRAY_SIZE(ipcc_mem_memmgr_evt_pool)]) {
+ if ((void *)&ipcc_mem_memmgr_evt_pool[0] <= (void *)cur
+ && (void *)cur < (void *)&ipcc_mem_memmgr_evt_pool[MP_ARRAY_SIZE(ipcc_mem_memmgr_evt_pool)]) {
// Place memory back in free pool
tl_list_append(&ipcc_mem_memmgr_free_buf_queue, cur);
free = true;
@@ -275,7 +275,7 @@
}
STATIC void tl_hci_cmd(uint8_t *cmd, unsigned int ch, uint8_t hdr, uint16_t opcode, size_t len, const uint8_t *buf) {
- tl_list_node_t *n = (tl_list_node_t*)cmd;
+ tl_list_node_t *n = (tl_list_node_t *)cmd;
n->next = n;
n->prev = n;
cmd[8] = hdr;
@@ -294,12 +294,12 @@
}
STATIC void tl_sys_hci_cmd_resp(uint16_t opcode, size_t len, const uint8_t *buf) {
- tl_hci_cmd((uint8_t*)&ipcc_mem_sys_cmd_buf, IPCC_CH_SYS, 0x10, opcode, len, buf);
- tl_sys_wait_resp((uint8_t*)&ipcc_mem_sys_cmd_buf, IPCC_CH_SYS);
+ tl_hci_cmd((uint8_t *)&ipcc_mem_sys_cmd_buf, IPCC_CH_SYS, 0x10, opcode, len, buf);
+ tl_sys_wait_resp((uint8_t *)&ipcc_mem_sys_cmd_buf, IPCC_CH_SYS);
}
STATIC void tl_ble_hci_cmd_resp(uint16_t opcode, size_t len, const uint8_t *buf) {
- tl_hci_cmd((uint8_t*)&ipcc_mem_ble_cmd_buf[0], IPCC_CH_BLE, 0x01, opcode, len, buf);
+ tl_hci_cmd((uint8_t *)&ipcc_mem_ble_cmd_buf[0], IPCC_CH_BLE, 0x01, opcode, len, buf);
ipcc_wait_msg(IPCC_CH_BLE, 250);
tl_check_msg(&ipcc_mem_ble_evt_queue, IPCC_CH_BLE, NULL);
}
@@ -324,7 +324,7 @@
}
static const struct {
- uint8_t* pBleBufferAddress; // unused
+ uint8_t *pBleBufferAddress; // unused
uint32_t BleBufferSize; // unused
uint16_t NumAttrRecord;
uint16_t NumAttrServ;
@@ -369,7 +369,7 @@
tl_check_msg(&ipcc_mem_ble_evt_queue, IPCC_CH_BLE, NULL);
// Configure and reset the BLE controller
- tl_sys_hci_cmd_resp(HCI_OPCODE(OGF_VENDOR, OCF_BLE_INIT), sizeof(ble_init_params), (const uint8_t*)&ble_init_params);
+ tl_sys_hci_cmd_resp(HCI_OPCODE(OGF_VENDOR, OCF_BLE_INIT), sizeof(ble_init_params), (const uint8_t *)&ble_init_params);
tl_ble_hci_cmd_resp(HCI_OPCODE(0x03, 0x0003), 0, NULL);
}
@@ -385,10 +385,10 @@
tl_list_node_t *n;
uint32_t ch;
if (src[0] == 0x01) {
- n = (tl_list_node_t*)&ipcc_mem_ble_cmd_buf[0];
+ n = (tl_list_node_t *)&ipcc_mem_ble_cmd_buf[0];
ch = IPCC_CH_BLE;
} else if (src[0] == 0x02) {
- n = (tl_list_node_t*)&ipcc_mem_ble_hci_acl_data_buf[0];
+ n = (tl_list_node_t *)&ipcc_mem_ble_hci_acl_data_buf[0];
ch = IPCC_CH_HCI_ACL;
} else {
printf("** UNEXPECTED HCI HDR: 0x%02x **\n", src[0]);
@@ -403,7 +403,7 @@
IPCC->C1SCR = ch << 16;
}
-void rfcore_ble_check_msg(int (*cb)(void*, uint8_t), void *env) {
+void rfcore_ble_check_msg(int (*cb)(void *, uint8_t), void *env) {
parse_hci_info_t parse = { cb, env, false };
tl_check_msg(&ipcc_mem_ble_evt_queue, IPCC_CH_BLE, &parse);
@@ -413,12 +413,13 @@
buf[0] = 0; // config offset
buf[1] = 6; // config length
mp_hal_get_mac(MP_HAL_MAC_BDADDR, &buf[2]);
- #define SWAP_UINT8(a, b) { uint8_t temp = a; a = b; b = temp; }
+ #define SWAP_UINT8(a, b) { uint8_t temp = a; a = b; b = temp; \
+}
SWAP_UINT8(buf[2], buf[7]);
SWAP_UINT8(buf[3], buf[6]);
SWAP_UINT8(buf[4], buf[5]);
tl_ble_hci_cmd_resp(HCI_OPCODE(OGF_VENDOR, OCF_WRITE_CONFIG), 8, buf); // set BDADDR
- tl_ble_hci_cmd_resp(HCI_OPCODE(OGF_VENDOR, OCF_SET_TX_POWER), 2, (const uint8_t*)"\x00\x06"); // 0 dBm
+ tl_ble_hci_cmd_resp(HCI_OPCODE(OGF_VENDOR, OCF_SET_TX_POWER), 2, (const uint8_t *)"\x00\x06"); // 0 dBm
}
}
diff --git a/ports/stm32/rfcore.h b/ports/stm32/rfcore.h
index ef12707..8a04075 100644
--- a/ports/stm32/rfcore.h
+++ b/ports/stm32/rfcore.h
@@ -32,6 +32,6 @@
void rfcore_ble_init(void);
void rfcore_ble_hci_cmd(size_t len, const uint8_t *src);
-void rfcore_ble_check_msg(int (*cb)(void*, uint8_t), void *env);
+void rfcore_ble_check_msg(int (*cb)(void *, uint8_t), void *env);
#endif // MICROPY_INCLUDED_STM32_RFCORE_H
diff --git a/ports/stm32/rtc.c b/ports/stm32/rtc.c
index 4019617..92b669d 100644
--- a/ports/stm32/rtc.c
+++ b/ports/stm32/rtc.c
@@ -125,7 +125,7 @@
rtc_info |= 0x40000 | (RCC->BDCR & 7) | (RCC->CSR & 3) << 8;
return;
} else if ((bdcr & (RCC_BDCR_RTCEN | RCC_BDCR_RTCSEL))
- == (RCC_BDCR_RTCEN | RCC_BDCR_RTCSEL_1)) {
+ == (RCC_BDCR_RTCEN | RCC_BDCR_RTCSEL_1)) {
// LSI configured as the RTC clock source --> no need to (re-)init RTC
// remove Backup Domain write protection
HAL_PWR_EnableBkUpAccess();
@@ -186,14 +186,14 @@
// fresh reset; configure RTC Calendar
RTC_CalendarConfig();
#if defined(STM32L4) || defined(STM32WB)
- if(__HAL_RCC_GET_FLAG(RCC_FLAG_BORRST) != RESET) {
+ if (__HAL_RCC_GET_FLAG(RCC_FLAG_BORRST) != RESET) {
#else
- if(__HAL_RCC_GET_FLAG(RCC_FLAG_PORRST) != RESET) {
- #endif
+ if (__HAL_RCC_GET_FLAG(RCC_FLAG_PORRST) != RESET) {
+ #endif
// power on reset occurred
rtc_info |= 0x10000;
}
- if(__HAL_RCC_GET_FLAG(RCC_FLAG_PINRST) != RESET) {
+ if (__HAL_RCC_GET_FLAG(RCC_FLAG_PINRST) != RESET) {
// external reset occurred
rtc_info |= 0x20000;
}
@@ -202,7 +202,7 @@
rtc_need_init_finalise = false;
}
-STATIC HAL_StatusTypeDef PYB_RCC_OscConfig(RCC_OscInitTypeDef *RCC_OscInitStruct) {
+STATIC HAL_StatusTypeDef PYB_RCC_OscConfig(RCC_OscInitTypeDef *RCC_OscInitStruct) {
/*------------------------------ LSI Configuration -------------------------*/
if ((RCC_OscInitStruct->OscillatorType & RCC_OSCILLATORTYPE_LSI) == RCC_OSCILLATORTYPE_LSI) {
// Check the LSI State
@@ -295,7 +295,7 @@
return HAL_ERROR;
} else {
// Clear RTC_CR FMT, OSEL and POL Bits
- hrtc->Instance->CR &= ((uint32_t)~(RTC_CR_FMT | RTC_CR_OSEL | RTC_CR_POL));
+ hrtc->Instance->CR &= ((uint32_t) ~(RTC_CR_FMT | RTC_CR_OSEL | RTC_CR_POL));
// Set RTC_CR register
hrtc->Instance->CR |= (uint32_t)(hrtc->Init.HourFormat | hrtc->Init.OutPut | hrtc->Init.OutPutPolarity);
@@ -304,16 +304,16 @@
hrtc->Instance->PRER |= (uint32_t)(hrtc->Init.AsynchPrediv << 16);
// Exit Initialization mode
- hrtc->Instance->ISR &= (uint32_t)~RTC_ISR_INIT;
+ hrtc->Instance->ISR &= (uint32_t) ~RTC_ISR_INIT;
#if defined(STM32L0) || defined(STM32L4) || defined(STM32H7) || defined(STM32WB)
- hrtc->Instance->OR &= (uint32_t)~RTC_OR_ALARMOUTTYPE;
+ hrtc->Instance->OR &= (uint32_t) ~RTC_OR_ALARMOUTTYPE;
hrtc->Instance->OR |= (uint32_t)(hrtc->Init.OutPutType);
#elif defined(STM32F7)
- hrtc->Instance->OR &= (uint32_t)~RTC_OR_ALARMTYPE;
+ hrtc->Instance->OR &= (uint32_t) ~RTC_OR_ALARMTYPE;
hrtc->Instance->OR |= (uint32_t)(hrtc->Init.OutPutType);
#else
- hrtc->Instance->TAFCR &= (uint32_t)~RTC_TAFCR_ALARMOUTTYPE;
+ hrtc->Instance->TAFCR &= (uint32_t) ~RTC_TAFCR_ALARMOUTTYPE;
hrtc->Instance->TAFCR |= (uint32_t)(hrtc->Init.OutPutType);
#endif
@@ -340,7 +340,7 @@
// configuration variable is set. Otherwise it uses LSI (internal osc).
RCC_OscInitTypeDef RCC_OscInitStruct;
- RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_LSI | RCC_OSCILLATORTYPE_LSE;
+ RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_LSI | RCC_OSCILLATORTYPE_LSE;
RCC_OscInitStruct.PLL.PLLState = RCC_PLL_NONE;
#if MICROPY_HW_RTC_USE_BYPASS
if (rtc_use_byp) {
@@ -422,7 +422,7 @@
date.Date = 1;
date.WeekDay = RTC_WEEKDAY_THURSDAY;
- if(HAL_RTC_SetDate(&RTCHandle, &date, RTC_FORMAT_BIN) != HAL_OK) {
+ if (HAL_RTC_SetDate(&RTCHandle, &date, RTC_FORMAT_BIN) != HAL_OK) {
// init error
return;
}
@@ -714,7 +714,7 @@
cal = mp_obj_get_int(args[1]);
mp_uint_t cal_p, cal_m;
if (cal < -511 || cal > 512) {
-#if defined(MICROPY_HW_RTC_USE_CALOUT) && MICROPY_HW_RTC_USE_CALOUT
+ #if defined(MICROPY_HW_RTC_USE_CALOUT) && MICROPY_HW_RTC_USE_CALOUT
if ((cal & 0xfffe) == 0x0ffe) {
// turn on/off X18 (PC13) 512Hz output
// Note:
@@ -728,9 +728,9 @@
} else {
mp_raise_ValueError("calibration value out of range");
}
-#else
+ #else
mp_raise_ValueError("calibration value out of range");
-#endif
+ #endif
}
if (cal > 0) {
cal_p = RTC_SMOOTHCALIB_PLUSPULSES_SET;
@@ -767,5 +767,5 @@
{ &mp_type_type },
.name = MP_QSTR_RTC,
.make_new = pyb_rtc_make_new,
- .locals_dict = (mp_obj_dict_t*)&pyb_rtc_locals_dict,
+ .locals_dict = (mp_obj_dict_t *)&pyb_rtc_locals_dict,
};
diff --git a/ports/stm32/sdcard.c b/ports/stm32/sdcard.c
index 632ea43..c0d9df8 100644
--- a/ports/stm32/sdcard.c
+++ b/ports/stm32/sdcard.c
@@ -244,14 +244,14 @@
STATIC HAL_StatusTypeDef sdmmc_init_sd(void) {
// SD device interface configuration
sdmmc_handle.sd.Instance = SDIO;
- sdmmc_handle.sd.Init.ClockEdge = SDIO_CLOCK_EDGE_RISING;
+ sdmmc_handle.sd.Init.ClockEdge = SDIO_CLOCK_EDGE_RISING;
#ifndef STM32H7
- sdmmc_handle.sd.Init.ClockBypass = SDIO_CLOCK_BYPASS_DISABLE;
+ sdmmc_handle.sd.Init.ClockBypass = SDIO_CLOCK_BYPASS_DISABLE;
#endif
- sdmmc_handle.sd.Init.ClockPowerSave = SDIO_CLOCK_POWER_SAVE_ENABLE;
- sdmmc_handle.sd.Init.BusWide = SDIO_BUS_WIDE_1B;
+ sdmmc_handle.sd.Init.ClockPowerSave = SDIO_CLOCK_POWER_SAVE_ENABLE;
+ sdmmc_handle.sd.Init.BusWide = SDIO_BUS_WIDE_1B;
sdmmc_handle.sd.Init.HardwareFlowControl = SDIO_HARDWARE_FLOW_CONTROL_DISABLE;
- sdmmc_handle.sd.Init.ClockDiv = SDIO_TRANSFER_CLK_DIV;
+ sdmmc_handle.sd.Init.ClockDiv = SDIO_TRANSFER_CLK_DIV;
// init the SD interface, with retry if it's not ready yet
HAL_StatusTypeDef status;
@@ -279,14 +279,14 @@
STATIC HAL_StatusTypeDef sdmmc_init_mmc(void) {
// MMC device interface configuration
sdmmc_handle.mmc.Instance = SDIO;
- sdmmc_handle.mmc.Init.ClockEdge = SDIO_CLOCK_EDGE_RISING;
+ sdmmc_handle.mmc.Init.ClockEdge = SDIO_CLOCK_EDGE_RISING;
#ifndef STM32H7
- sdmmc_handle.mmc.Init.ClockBypass = SDIO_CLOCK_BYPASS_DISABLE;
+ sdmmc_handle.mmc.Init.ClockBypass = SDIO_CLOCK_BYPASS_DISABLE;
#endif
- sdmmc_handle.mmc.Init.ClockPowerSave = SDIO_CLOCK_POWER_SAVE_ENABLE;
- sdmmc_handle.mmc.Init.BusWide = SDIO_BUS_WIDE_1B;
+ sdmmc_handle.mmc.Init.ClockPowerSave = SDIO_CLOCK_POWER_SAVE_ENABLE;
+ sdmmc_handle.mmc.Init.BusWide = SDIO_BUS_WIDE_1B;
sdmmc_handle.mmc.Init.HardwareFlowControl = SDIO_HARDWARE_FLOW_CONTROL_DISABLE;
- sdmmc_handle.mmc.Init.ClockDiv = SDIO_TRANSFER_CLK_DIV;
+ sdmmc_handle.mmc.Init.ClockDiv = SDIO_TRANSFER_CLK_DIV;
// Init the SDIO interface
HAL_StatusTypeDef status = HAL_MMC_Init(&sdmmc_handle.mmc);
@@ -503,8 +503,8 @@
// bytes at the aligned location should be able to be changed for the
// duration of this function call.
orig_dest = dest;
- dest = (uint8_t*)((uint32_t)dest & ~3);
- saved_word = *(uint32_t*)dest;
+ dest = (uint8_t *)((uint32_t)dest & ~3);
+ saved_word = *(uint32_t *)dest;
}
if (query_irq() == IRQ_STATE_ENABLED) {
@@ -626,11 +626,11 @@
sdcard_reset_periph();
#if MICROPY_HW_ENABLE_MMCARD
if (pyb_sdmmc_flags & PYB_SDMMC_FLAG_MMC) {
- err = HAL_MMC_WriteBlocks_DMA(&sdmmc_handle.mmc, (uint8_t*)src, block_num, num_blocks);
+ err = HAL_MMC_WriteBlocks_DMA(&sdmmc_handle.mmc, (uint8_t *)src, block_num, num_blocks);
} else
#endif
{
- err = HAL_SD_WriteBlocks_DMA(&sdmmc_handle.sd, (uint8_t*)src, block_num, num_blocks);
+ err = HAL_SD_WriteBlocks_DMA(&sdmmc_handle.sd, (uint8_t *)src, block_num, num_blocks);
}
if (err == HAL_OK) {
err = sdcard_wait_finished(60000);
@@ -652,11 +652,11 @@
} else {
#if MICROPY_HW_ENABLE_MMCARD
if (pyb_sdmmc_flags & PYB_SDMMC_FLAG_MMC) {
- err = HAL_MMC_WriteBlocks(&sdmmc_handle.mmc, (uint8_t*)src, block_num, num_blocks, 60000);
+ err = HAL_MMC_WriteBlocks(&sdmmc_handle.mmc, (uint8_t *)src, block_num, num_blocks, 60000);
} else
#endif
{
- err = HAL_SD_WriteBlocks(&sdmmc_handle.sd, (uint8_t*)src, block_num, num_blocks, 60000);
+ err = HAL_SD_WriteBlocks(&sdmmc_handle.sd, (uint8_t *)src, block_num, num_blocks, 60000);
}
if (err == HAL_OK) {
err = sdcard_wait_finished(60000);
@@ -857,7 +857,7 @@
{ &mp_type_type },
.name = MP_QSTR_SDCard,
.make_new = pyb_sdcard_make_new,
- .locals_dict = (mp_obj_dict_t*)&pyb_sdcard_locals_dict,
+ .locals_dict = (mp_obj_dict_t *)&pyb_sdcard_locals_dict,
};
#endif
@@ -866,7 +866,7 @@
{ &mp_type_type },
.name = MP_QSTR_MMCard,
.make_new = pyb_mmcard_make_new,
- .locals_dict = (mp_obj_dict_t*)&pyb_sdcard_locals_dict,
+ .locals_dict = (mp_obj_dict_t *)&pyb_sdcard_locals_dict,
};
#endif
diff --git a/ports/stm32/sdio.c b/ports/stm32/sdio.c
index 12d8326..79cc9c9 100644
--- a/ports/stm32/sdio.c
+++ b/ports/stm32/sdio.c
@@ -125,7 +125,7 @@
#if defined(STM32H7)
if (!sdmmc_dma) {
while (sdmmc_buf_cur < sdmmc_buf_top && (SDMMC1->STA & SDMMC_STA_DPSMACT) && !(SDMMC1->STA & SDMMC_STA_RXFIFOE)) {
- *(uint32_t*)sdmmc_buf_cur = SDMMC1->FIFO;
+ *(uint32_t *)sdmmc_buf_cur = SDMMC1->FIFO;
sdmmc_buf_cur += 4;
}
}
@@ -145,8 +145,8 @@
| (sdmmc_dma << SDMMC_DCTRL_DMAEN_Pos)
#endif
| (!sdmmc_write) << SDMMC_DCTRL_DTDIR_Pos
- | SDMMC_DCTRL_DTEN
- ;
+ | SDMMC_DCTRL_DTEN
+ ;
if (!sdmmc_dma) {
SDMMC1->MASK |= SDMMC_MASK_TXFIFOHEIE;
}
@@ -160,7 +160,7 @@
// check if there is some remaining data in RXFIFO
if (!sdmmc_dma) {
while (SDMMC1->STA & SDMMC_STA_RXDAVL) {
- *(uint32_t*)sdmmc_buf_cur = SDMMC1->FIFO;
+ *(uint32_t *)sdmmc_buf_cur = SDMMC1->FIFO;
sdmmc_buf_cur += 4;
}
}
@@ -174,7 +174,7 @@
if (!sdmmc_dma && sdmmc_write) {
// write up to 8 words to fifo
for (size_t i = 8; i && sdmmc_buf_cur < sdmmc_buf_top; --i) {
- SDMMC1->FIFO = *(uint32_t*)sdmmc_buf_cur;
+ SDMMC1->FIFO = *(uint32_t *)sdmmc_buf_cur;
sdmmc_buf_cur += 4;
}
if (sdmmc_buf_cur >= sdmmc_buf_top) {
@@ -186,7 +186,7 @@
if (!sdmmc_dma && !sdmmc_write) {
// read up to 8 words from fifo
for (size_t i = 8; i && sdmmc_buf_cur < sdmmc_buf_top; --i) {
- *(uint32_t*)sdmmc_buf_cur = SDMMC1->FIFO;
+ *(uint32_t *)sdmmc_buf_cur = SDMMC1->FIFO;
sdmmc_buf_cur += 4;
}
}
@@ -336,7 +336,7 @@
| write << 6 // DIR mem-to-periph
| 1 << 5 // PFCTRL periph is flow controller
| 1 << 0 // EN
- ;
+ ;
#else
SDMMC1->IDMABASE0 = (uint32_t)buf;
SDMMC1->IDMACTRL = SDMMC_IDMA_IDMAEN;
@@ -360,8 +360,8 @@
| (dma << SDMMC_DCTRL_DMAEN_Pos)
#endif
| (!write) << SDMMC_DCTRL_DTDIR_Pos
- | SDMMC_DCTRL_DTEN
- ;
+ | SDMMC_DCTRL_DTEN
+ ;
}
SDMMC1->ARG = arg;
@@ -372,8 +372,8 @@
sdmmc_write = write;
sdmmc_dma = dma;
sdmmc_error = 0;
- sdmmc_buf_cur = (uint8_t*)buf;
- sdmmc_buf_top = (uint8_t*)buf + len;
+ sdmmc_buf_cur = (uint8_t *)buf;
+ sdmmc_buf_top = (uint8_t *)buf + len;
SDMMC1->MASK = (SDMMC1->MASK & SDMMC_MASK_SDIOITIE) | SDMMC_MASK_CMDRENDIE | SDMMC_MASK_DATAENDIE | SDMMC_MASK_RXFIFOHFIE | 0x3f;
// wait to complete transfer
diff --git a/ports/stm32/sdram.c b/ports/stm32/sdram.c
index 5c32c6a..0aae74e 100644
--- a/ports/stm32/sdram.c
+++ b/ports/stm32/sdram.c
@@ -50,7 +50,7 @@
#ifdef FMC_SDRAM_BANK
static void sdram_init_seq(SDRAM_HandleTypeDef
- *hsdram, FMC_SDRAM_CommandTypeDef *command);
+ *hsdram, FMC_SDRAM_CommandTypeDef *command);
extern void __fatal_error(const char *msg);
bool sdram_init(void) {
@@ -135,36 +135,36 @@
hsdram.Instance = FMC_SDRAM_DEVICE;
/* Timing configuration for 90 Mhz of SD clock frequency (180Mhz/2) */
/* TMRD: 2 Clock cycles */
- SDRAM_Timing.LoadToActiveDelay = MICROPY_HW_SDRAM_TIMING_TMRD;
+ SDRAM_Timing.LoadToActiveDelay = MICROPY_HW_SDRAM_TIMING_TMRD;
/* TXSR: min=70ns (6x11.90ns) */
SDRAM_Timing.ExitSelfRefreshDelay = MICROPY_HW_SDRAM_TIMING_TXSR;
/* TRAS */
- SDRAM_Timing.SelfRefreshTime = MICROPY_HW_SDRAM_TIMING_TRAS;
+ SDRAM_Timing.SelfRefreshTime = MICROPY_HW_SDRAM_TIMING_TRAS;
/* TRC */
- SDRAM_Timing.RowCycleDelay = MICROPY_HW_SDRAM_TIMING_TRC;
+ SDRAM_Timing.RowCycleDelay = MICROPY_HW_SDRAM_TIMING_TRC;
/* TWR */
- SDRAM_Timing.WriteRecoveryTime = MICROPY_HW_SDRAM_TIMING_TWR;
+ SDRAM_Timing.WriteRecoveryTime = MICROPY_HW_SDRAM_TIMING_TWR;
/* TRP */
- SDRAM_Timing.RPDelay = MICROPY_HW_SDRAM_TIMING_TRP;
+ SDRAM_Timing.RPDelay = MICROPY_HW_SDRAM_TIMING_TRP;
/* TRCD */
- SDRAM_Timing.RCDDelay = MICROPY_HW_SDRAM_TIMING_TRCD;
+ SDRAM_Timing.RCDDelay = MICROPY_HW_SDRAM_TIMING_TRCD;
- #define _FMC_INIT(x, n) x ## _ ## n
+ #define _FMC_INIT(x, n) x##_##n
#define FMC_INIT(x, n) _FMC_INIT(x, n)
- hsdram.Init.SDBank = FMC_SDRAM_BANK;
- hsdram.Init.ColumnBitsNumber = FMC_INIT(FMC_SDRAM_COLUMN_BITS_NUM, MICROPY_HW_SDRAM_COLUMN_BITS_NUM);
- hsdram.Init.RowBitsNumber = FMC_INIT(FMC_SDRAM_ROW_BITS_NUM, MICROPY_HW_SDRAM_ROW_BITS_NUM);
- hsdram.Init.MemoryDataWidth = FMC_INIT(FMC_SDRAM_MEM_BUS_WIDTH, MICROPY_HW_SDRAM_MEM_BUS_WIDTH);
+ hsdram.Init.SDBank = FMC_SDRAM_BANK;
+ hsdram.Init.ColumnBitsNumber = FMC_INIT(FMC_SDRAM_COLUMN_BITS_NUM, MICROPY_HW_SDRAM_COLUMN_BITS_NUM);
+ hsdram.Init.RowBitsNumber = FMC_INIT(FMC_SDRAM_ROW_BITS_NUM, MICROPY_HW_SDRAM_ROW_BITS_NUM);
+ hsdram.Init.MemoryDataWidth = FMC_INIT(FMC_SDRAM_MEM_BUS_WIDTH, MICROPY_HW_SDRAM_MEM_BUS_WIDTH);
hsdram.Init.InternalBankNumber = FMC_INIT(FMC_SDRAM_INTERN_BANKS_NUM, MICROPY_HW_SDRAM_INTERN_BANKS_NUM);
- hsdram.Init.CASLatency = FMC_INIT(FMC_SDRAM_CAS_LATENCY, MICROPY_HW_SDRAM_CAS_LATENCY);
- hsdram.Init.SDClockPeriod = FMC_INIT(FMC_SDRAM_CLOCK_PERIOD, MICROPY_HW_SDRAM_CLOCK_PERIOD);
- hsdram.Init.ReadPipeDelay = FMC_INIT(FMC_SDRAM_RPIPE_DELAY, MICROPY_HW_SDRAM_RPIPE_DELAY);
- hsdram.Init.ReadBurst = (MICROPY_HW_SDRAM_RBURST) ? FMC_SDRAM_RBURST_ENABLE : FMC_SDRAM_RBURST_DISABLE;
- hsdram.Init.WriteProtection = (MICROPY_HW_SDRAM_WRITE_PROTECTION) ? FMC_SDRAM_WRITE_PROTECTION_ENABLE : FMC_SDRAM_WRITE_PROTECTION_DISABLE;
+ hsdram.Init.CASLatency = FMC_INIT(FMC_SDRAM_CAS_LATENCY, MICROPY_HW_SDRAM_CAS_LATENCY);
+ hsdram.Init.SDClockPeriod = FMC_INIT(FMC_SDRAM_CLOCK_PERIOD, MICROPY_HW_SDRAM_CLOCK_PERIOD);
+ hsdram.Init.ReadPipeDelay = FMC_INIT(FMC_SDRAM_RPIPE_DELAY, MICROPY_HW_SDRAM_RPIPE_DELAY);
+ hsdram.Init.ReadBurst = (MICROPY_HW_SDRAM_RBURST) ? FMC_SDRAM_RBURST_ENABLE : FMC_SDRAM_RBURST_DISABLE;
+ hsdram.Init.WriteProtection = (MICROPY_HW_SDRAM_WRITE_PROTECTION) ? FMC_SDRAM_WRITE_PROTECTION_ENABLE : FMC_SDRAM_WRITE_PROTECTION_DISABLE;
/* Initialize the SDRAM controller */
- if(HAL_SDRAM_Init(&hsdram, &SDRAM_Timing) != HAL_OK) {
+ if (HAL_SDRAM_Init(&hsdram, &SDRAM_Timing) != HAL_OK) {
return false;
}
@@ -173,23 +173,22 @@
}
void *sdram_start(void) {
- return (void*)SDRAM_START_ADDRESS;
+ return (void *)SDRAM_START_ADDRESS;
}
void *sdram_end(void) {
- return (void*)(SDRAM_START_ADDRESS + MICROPY_HW_SDRAM_SIZE);
+ return (void *)(SDRAM_START_ADDRESS + MICROPY_HW_SDRAM_SIZE);
}
static void sdram_init_seq(SDRAM_HandleTypeDef
- *hsdram, FMC_SDRAM_CommandTypeDef *command)
-{
+ *hsdram, FMC_SDRAM_CommandTypeDef *command) {
/* Program the SDRAM external device */
- __IO uint32_t tmpmrd =0;
+ __IO uint32_t tmpmrd = 0;
/* Step 3: Configure a clock configuration enable command */
- command->CommandMode = FMC_SDRAM_CMD_CLK_ENABLE;
- command->CommandTarget = FMC_SDRAM_CMD_TARGET_BANK;
- command->AutoRefreshNumber = 1;
+ command->CommandMode = FMC_SDRAM_CMD_CLK_ENABLE;
+ command->CommandTarget = FMC_SDRAM_CMD_TARGET_BANK;
+ command->AutoRefreshNumber = 1;
command->ModeRegisterDefinition = 0;
/* Send the command */
@@ -199,18 +198,18 @@
HAL_Delay(100);
/* Step 5: Configure a PALL (precharge all) command */
- command->CommandMode = FMC_SDRAM_CMD_PALL;
- command->CommandTarget = FMC_SDRAM_CMD_TARGET_BANK;
- command->AutoRefreshNumber = 1;
+ command->CommandMode = FMC_SDRAM_CMD_PALL;
+ command->CommandTarget = FMC_SDRAM_CMD_TARGET_BANK;
+ command->AutoRefreshNumber = 1;
command->ModeRegisterDefinition = 0;
/* Send the command */
HAL_SDRAM_SendCommand(hsdram, command, 0x1000);
/* Step 6 : Configure a Auto-Refresh command */
- command->CommandMode = FMC_SDRAM_CMD_AUTOREFRESH_MODE;
- command->CommandTarget = FMC_SDRAM_CMD_TARGET_BANK;
- command->AutoRefreshNumber = MICROPY_HW_SDRAM_AUTOREFRESH_NUM;
+ command->CommandMode = FMC_SDRAM_CMD_AUTOREFRESH_MODE;
+ command->CommandTarget = FMC_SDRAM_CMD_TARGET_BANK;
+ command->AutoRefreshNumber = MICROPY_HW_SDRAM_AUTOREFRESH_NUM;
command->ModeRegisterDefinition = 0;
/* Send the command */
@@ -218,14 +217,14 @@
/* Step 7: Program the external memory mode register */
tmpmrd = (uint32_t)FMC_INIT(SDRAM_MODEREG_BURST_LENGTH, MICROPY_HW_SDRAM_BURST_LENGTH) |
- SDRAM_MODEREG_BURST_TYPE_SEQUENTIAL |
+ SDRAM_MODEREG_BURST_TYPE_SEQUENTIAL |
FMC_INIT(SDRAM_MODEREG_CAS_LATENCY, MICROPY_HW_SDRAM_CAS_LATENCY) |
SDRAM_MODEREG_OPERATING_MODE_STANDARD |
SDRAM_MODEREG_WRITEBURST_MODE_SINGLE;
- command->CommandMode = FMC_SDRAM_CMD_LOAD_MODE;
- command->CommandTarget = FMC_SDRAM_CMD_TARGET_BANK;
- command->AutoRefreshNumber = 1;
+ command->CommandMode = FMC_SDRAM_CMD_LOAD_MODE;
+ command->CommandTarget = FMC_SDRAM_CMD_TARGET_BANK;
+ command->AutoRefreshNumber = 1;
command->ModeRegisterDefinition = tmpmrd;
/* Send the command */
@@ -258,7 +257,7 @@
bool sdram_test(bool fast) {
uint8_t const pattern = 0xaa;
uint8_t const antipattern = 0x55;
- uint8_t *const mem_base = (uint8_t*)sdram_start();
+ uint8_t *const mem_base = (uint8_t *)sdram_start();
/* test data bus */
for (uint8_t i = 1; i; i <<= 1) {
diff --git a/ports/stm32/servo.c b/ports/stm32/servo.c
index b239880..a368b57 100644
--- a/ports/stm32/servo.c
+++ b/ports/stm32/servo.c
@@ -125,7 +125,7 @@
STATIC void servo_init_channel(pyb_servo_obj_t *s) {
static const uint8_t channel_table[4] =
- {TIM_CHANNEL_1, TIM_CHANNEL_2, TIM_CHANNEL_3, TIM_CHANNEL_4};
+ {TIM_CHANNEL_1, TIM_CHANNEL_2, TIM_CHANNEL_3, TIM_CHANNEL_4};
uint32_t channel = channel_table[s->pin->pin];
// GPIO configuration
@@ -153,13 +153,25 @@
STATIC mp_obj_t pyb_servo_set(mp_obj_t port, mp_obj_t value) {
int p = mp_obj_get_int(port);
int v = mp_obj_get_int(value);
- if (v < 50) { v = 50; }
- if (v > 250) { v = 250; }
+ if (v < 50) {
+ v = 50;
+ }
+ if (v > 250) {
+ v = 250;
+ }
switch (p) {
- case 1: TIM5->CCR1 = v; break;
- case 2: TIM5->CCR2 = v; break;
- case 3: TIM5->CCR3 = v; break;
- case 4: TIM5->CCR4 = v; break;
+ case 1:
+ TIM5->CCR1 = v;
+ break;
+ case 2:
+ TIM5->CCR2 = v;
+ break;
+ case 3:
+ TIM5->CCR3 = v;
+ break;
+ case 4:
+ TIM5->CCR4 = v;
+ break;
}
return mp_const_none;
}
@@ -265,11 +277,11 @@
// get angle
return mp_obj_new_int((self->pulse_cur - self->pulse_centre) * 90 / self->pulse_angle_90);
} else {
-#if MICROPY_PY_BUILTINS_FLOAT
+ #if MICROPY_PY_BUILTINS_FLOAT
self->pulse_dest = self->pulse_centre + self->pulse_angle_90 * mp_obj_get_float(args[1]) / 90.0;
-#else
+ #else
self->pulse_dest = self->pulse_centre + self->pulse_angle_90 * mp_obj_get_int(args[1]) / 90;
-#endif
+ #endif
if (n_args == 2) {
// set angle immediately
self->time_left = 0;
@@ -295,11 +307,11 @@
// get speed
return mp_obj_new_int((self->pulse_cur - self->pulse_centre) * 100 / self->pulse_speed_100);
} else {
-#if MICROPY_PY_BUILTINS_FLOAT
+ #if MICROPY_PY_BUILTINS_FLOAT
self->pulse_dest = self->pulse_centre + self->pulse_speed_100 * mp_obj_get_float(args[1]) / 100.0;
-#else
+ #else
self->pulse_dest = self->pulse_centre + self->pulse_speed_100 * mp_obj_get_int(args[1]) / 100;
-#endif
+ #endif
if (n_args == 2) {
// set speed immediately
self->time_left = 0;
@@ -329,7 +341,7 @@
.name = MP_QSTR_Servo,
.print = pyb_servo_print,
.make_new = pyb_servo_make_new,
- .locals_dict = (mp_obj_dict_t*)&pyb_servo_locals_dict,
+ .locals_dict = (mp_obj_dict_t *)&pyb_servo_locals_dict,
};
#endif // MICROPY_HW_ENABLE_SERVO
diff --git a/ports/stm32/softtimer.c b/ports/stm32/softtimer.c
index 60c2709..ae87e1f 100644
--- a/ports/stm32/softtimer.c
+++ b/ports/stm32/softtimer.c
@@ -41,8 +41,8 @@
}
STATIC int soft_timer_lt(mp_pairheap_t *n1, mp_pairheap_t *n2) {
- soft_timer_entry_t *e1 = (soft_timer_entry_t*)n1;
- soft_timer_entry_t *e2 = (soft_timer_entry_t*)n2;
+ soft_timer_entry_t *e1 = (soft_timer_entry_t *)n1;
+ soft_timer_entry_t *e2 = (soft_timer_entry_t *)n2;
return TICKS_DIFF(e1->expiry_ms, e2->expiry_ms) < 0;
}
@@ -63,11 +63,11 @@
soft_timer_entry_t *heap = MP_STATE_PORT(soft_timer_heap);
while (heap != NULL && TICKS_DIFF(heap->expiry_ms, ticks_ms) <= 0) {
soft_timer_entry_t *entry = heap;
- heap = (soft_timer_entry_t*)mp_pairheap_pop(soft_timer_lt, &heap->pairheap);
+ heap = (soft_timer_entry_t *)mp_pairheap_pop(soft_timer_lt, &heap->pairheap);
mp_sched_schedule(entry->callback, MP_OBJ_FROM_PTR(entry));
if (entry->mode == SOFT_TIMER_MODE_PERIODIC) {
entry->expiry_ms += entry->delta_ms;
- heap = (soft_timer_entry_t*)mp_pairheap_push(soft_timer_lt, &heap->pairheap, &entry->pairheap);
+ heap = (soft_timer_entry_t *)mp_pairheap_push(soft_timer_lt, &heap->pairheap, &entry->pairheap);
}
}
MP_STATE_PORT(soft_timer_heap) = heap;
@@ -82,7 +82,7 @@
void soft_timer_insert(soft_timer_entry_t *entry) {
uint32_t irq_state = raise_irq_pri(IRQ_PRI_PENDSV);
- MP_STATE_PORT(soft_timer_heap) = (soft_timer_entry_t*)mp_pairheap_push(soft_timer_lt, &MP_STATE_PORT(soft_timer_heap)->pairheap, &entry->pairheap);
+ MP_STATE_PORT(soft_timer_heap) = (soft_timer_entry_t *)mp_pairheap_push(soft_timer_lt, &MP_STATE_PORT(soft_timer_heap)->pairheap, &entry->pairheap);
if (entry == MP_STATE_PORT(soft_timer_heap)) {
// This new timer became the earliest one so set soft_timer_next
soft_timer_schedule_systick(entry->expiry_ms);
@@ -92,6 +92,6 @@
void soft_timer_remove(soft_timer_entry_t *entry) {
uint32_t irq_state = raise_irq_pri(IRQ_PRI_PENDSV);
- MP_STATE_PORT(soft_timer_heap) = (soft_timer_entry_t*)mp_pairheap_delete(soft_timer_lt, &MP_STATE_PORT(soft_timer_heap)->pairheap, &entry->pairheap);
+ MP_STATE_PORT(soft_timer_heap) = (soft_timer_entry_t *)mp_pairheap_delete(soft_timer_lt, &MP_STATE_PORT(soft_timer_heap)->pairheap, &entry->pairheap);
restore_irq_pri(irq_state);
}
diff --git a/ports/stm32/spi.c b/ports/stm32/spi.c
index 1095e96..50cebff 100644
--- a/ports/stm32/spi.c
+++ b/ports/stm32/spi.c
@@ -100,22 +100,46 @@
#if defined(STM32H7)
// STM32H7 HAL requires SPI IRQs to be enabled and handled.
#if defined(MICROPY_HW_SPI1_SCK)
-void SPI1_IRQHandler(void) { IRQ_ENTER(SPI1_IRQn); HAL_SPI_IRQHandler(&SPIHandle1); IRQ_EXIT(SPI1_IRQn); }
+void SPI1_IRQHandler(void) {
+ IRQ_ENTER(SPI1_IRQn);
+ HAL_SPI_IRQHandler(&SPIHandle1);
+ IRQ_EXIT(SPI1_IRQn);
+}
#endif
#if defined(MICROPY_HW_SPI2_SCK)
-void SPI2_IRQHandler(void) { IRQ_ENTER(SPI2_IRQn); HAL_SPI_IRQHandler(&SPIHandle2); IRQ_EXIT(SPI2_IRQn); }
+void SPI2_IRQHandler(void) {
+ IRQ_ENTER(SPI2_IRQn);
+ HAL_SPI_IRQHandler(&SPIHandle2);
+ IRQ_EXIT(SPI2_IRQn);
+}
#endif
#if defined(MICROPY_HW_SPI3_SCK)
-void SPI3_IRQHandler(void) { IRQ_ENTER(SPI3_IRQn); HAL_SPI_IRQHandler(&SPIHandle3); IRQ_EXIT(SPI3_IRQn); }
+void SPI3_IRQHandler(void) {
+ IRQ_ENTER(SPI3_IRQn);
+ HAL_SPI_IRQHandler(&SPIHandle3);
+ IRQ_EXIT(SPI3_IRQn);
+}
#endif
#if defined(MICROPY_HW_SPI4_SCK)
-void SPI4_IRQHandler(void) { IRQ_ENTER(SPI4_IRQn); HAL_SPI_IRQHandler(&SPIHandle4); IRQ_EXIT(SPI4_IRQn); }
+void SPI4_IRQHandler(void) {
+ IRQ_ENTER(SPI4_IRQn);
+ HAL_SPI_IRQHandler(&SPIHandle4);
+ IRQ_EXIT(SPI4_IRQn);
+}
#endif
#if defined(MICROPY_HW_SPI5_SCK)
-void SPI5_IRQHandler(void) { IRQ_ENTER(SPI5_IRQn); HAL_SPI_IRQHandler(&SPIHandle5); IRQ_EXIT(SPI5_IRQn); }
+void SPI5_IRQHandler(void) {
+ IRQ_ENTER(SPI5_IRQn);
+ HAL_SPI_IRQHandler(&SPIHandle5);
+ IRQ_EXIT(SPI5_IRQn);
+}
#endif
#if defined(MICROPY_HW_SPI6_SCK)
-void SPI6_IRQHandler(void) { IRQ_ENTER(SPI6_IRQn); HAL_SPI_IRQHandler(&SPIHandle6); IRQ_EXIT(SPI6_IRQn); }
+void SPI6_IRQHandler(void) {
+ IRQ_ENTER(SPI6_IRQn);
+ HAL_SPI_IRQHandler(&SPIHandle6);
+ IRQ_EXIT(SPI6_IRQn);
+}
#endif
#endif
@@ -227,14 +251,23 @@
// prescaler not given, so select one that yields at most the requested baudrate
prescale = (spi_get_source_freq(spi) + baudrate - 1) / baudrate;
}
- if (prescale <= 2) { init->BaudRatePrescaler = SPI_BAUDRATEPRESCALER_2; }
- else if (prescale <= 4) { init->BaudRatePrescaler = SPI_BAUDRATEPRESCALER_4; }
- else if (prescale <= 8) { init->BaudRatePrescaler = SPI_BAUDRATEPRESCALER_8; }
- else if (prescale <= 16) { init->BaudRatePrescaler = SPI_BAUDRATEPRESCALER_16; }
- else if (prescale <= 32) { init->BaudRatePrescaler = SPI_BAUDRATEPRESCALER_32; }
- else if (prescale <= 64) { init->BaudRatePrescaler = SPI_BAUDRATEPRESCALER_64; }
- else if (prescale <= 128) { init->BaudRatePrescaler = SPI_BAUDRATEPRESCALER_128; }
- else { init->BaudRatePrescaler = SPI_BAUDRATEPRESCALER_256; }
+ if (prescale <= 2) {
+ init->BaudRatePrescaler = SPI_BAUDRATEPRESCALER_2;
+ } else if (prescale <= 4) {
+ init->BaudRatePrescaler = SPI_BAUDRATEPRESCALER_4;
+ } else if (prescale <= 8) {
+ init->BaudRatePrescaler = SPI_BAUDRATEPRESCALER_8;
+ } else if (prescale <= 16) {
+ init->BaudRatePrescaler = SPI_BAUDRATEPRESCALER_16;
+ } else if (prescale <= 32) {
+ init->BaudRatePrescaler = SPI_BAUDRATEPRESCALER_32;
+ } else if (prescale <= 64) {
+ init->BaudRatePrescaler = SPI_BAUDRATEPRESCALER_64;
+ } else if (prescale <= 128) {
+ init->BaudRatePrescaler = SPI_BAUDRATEPRESCALER_128;
+ } else {
+ init->BaudRatePrescaler = SPI_BAUDRATEPRESCALER_256;
+ }
}
if (polarity != -1) {
@@ -378,9 +411,9 @@
#if defined(STM32H7)
NVIC_SetPriority(irqn, IRQ_PRI_SPI);
HAL_NVIC_EnableIRQ(irqn);
- #else
+ #else
(void)irqn;
- #endif
+ #endif
}
void spi_deinit(const spi_t *spi_obj) {
@@ -462,7 +495,7 @@
if (dest == NULL) {
// send only
if (len == 1 || query_irq() == IRQ_STATE_DISABLED) {
- status = HAL_SPI_Transmit(self->spi, (uint8_t*)src, len, timeout);
+ status = HAL_SPI_Transmit(self->spi, (uint8_t *)src, len, timeout);
} else {
DMA_HandleTypeDef tx_dma;
dma_init(&tx_dma, self->tx_dma_descr, DMA_MEMORY_TO_PERIPH, self->spi);
@@ -472,7 +505,7 @@
uint32_t t_start = HAL_GetTick();
do {
uint32_t l = MIN(len, 65535);
- status = HAL_SPI_Transmit_DMA(self->spi, (uint8_t*)src, l);
+ status = HAL_SPI_Transmit_DMA(self->spi, (uint8_t *)src, l);
if (status != HAL_OK) {
break;
}
@@ -523,7 +556,7 @@
} else {
// send and receive
if (len == 1 || query_irq() == IRQ_STATE_DISABLED) {
- status = HAL_SPI_TransmitReceive(self->spi, (uint8_t*)src, dest, len, timeout);
+ status = HAL_SPI_TransmitReceive(self->spi, (uint8_t *)src, dest, len, timeout);
} else {
DMA_HandleTypeDef tx_dma, rx_dma;
dma_init(&tx_dma, self->tx_dma_descr, DMA_MEMORY_TO_PERIPH, self->spi);
@@ -535,7 +568,7 @@
uint32_t t_start = HAL_GetTick();
do {
uint32_t l = MIN(len, 65535);
- status = HAL_SPI_TransmitReceive_DMA(self->spi, (uint8_t*)src, dest, l);
+ status = HAL_SPI_TransmitReceive_DMA(self->spi, (uint8_t *)src, dest, l);
if (status != HAL_OK) {
break;
}
@@ -561,21 +594,32 @@
SPI_HandleTypeDef *spi = spi_obj->spi;
uint spi_num = 1; // default to SPI1
- if (0) { }
+ if (0) {
+ }
#if defined(SPI2)
- else if (spi->Instance == SPI2) { spi_num = 2; }
+ else if (spi->Instance == SPI2) {
+ spi_num = 2;
+ }
#endif
#if defined(SPI3)
- else if (spi->Instance == SPI3) { spi_num = 3; }
+ else if (spi->Instance == SPI3) {
+ spi_num = 3;
+ }
#endif
#if defined(SPI4)
- else if (spi->Instance == SPI4) { spi_num = 4; }
+ else if (spi->Instance == SPI4) {
+ spi_num = 4;
+ }
#endif
#if defined(SPI5)
- else if (spi->Instance == SPI5) { spi_num = 5; }
+ else if (spi->Instance == SPI5) {
+ spi_num = 5;
+ }
#endif
#if defined(SPI6)
- else if (spi->Instance == SPI6) { spi_num = 6; }
+ else if (spi->Instance == SPI6) {
+ spi_num = 6;
+ }
#endif
mp_printf(print, "SPI(%u", spi_num);
@@ -618,7 +662,7 @@
// Implementation of low-level SPI C protocol
STATIC int spi_proto_ioctl(void *self_in, uint32_t cmd) {
- spi_proto_cfg_t *self = (spi_proto_cfg_t*)self_in;
+ spi_proto_cfg_t *self = (spi_proto_cfg_t *)self_in;
switch (cmd) {
case MP_SPI_IOCTL_INIT:
@@ -641,7 +685,7 @@
}
STATIC void spi_proto_transfer(void *self_in, size_t len, const uint8_t *src, uint8_t *dest) {
- spi_proto_cfg_t *self = (spi_proto_cfg_t*)self_in;
+ spi_proto_cfg_t *self = (spi_proto_cfg_t *)self_in;
spi_transfer(self->spi, len, src, dest, SPI_TRANSFER_TIMEOUT(len));
}
diff --git a/ports/stm32/spibdev.c b/ports/stm32/spibdev.c
index 97ce885..05c8819 100644
--- a/ports/stm32/spibdev.c
+++ b/ports/stm32/spibdev.c
@@ -35,7 +35,7 @@
int32_t spi_bdev_ioctl(spi_bdev_t *bdev, uint32_t op, uint32_t arg) {
switch (op) {
case BDEV_IOCTL_INIT:
- bdev->spiflash.config = (const mp_spiflash_config_t*)arg;
+ bdev->spiflash.config = (const mp_spiflash_config_t *)arg;
mp_spiflash_init(&bdev->spiflash);
bdev->flash_tick_counter_last_write = 0;
return 0;
diff --git a/ports/stm32/stm32_it.c b/ports/stm32/stm32_it.c
index 1a22272..b84f4ad 100644
--- a/ports/stm32/stm32_it.c
+++ b/ports/stm32/stm32_it.c
@@ -83,7 +83,7 @@
#include "i2c.h"
#include "usb.h"
-extern void __fatal_error(const char*);
+extern void __fatal_error(const char *);
#if defined(MICROPY_HW_USB_FS)
extern PCD_HandleTypeDef pcd_fs_handle;
#endif
@@ -107,9 +107,9 @@
buf[2] = hexDig[(val >> 20) & 0x0f];
buf[3] = hexDig[(val >> 16) & 0x0f];
buf[4] = hexDig[(val >> 12) & 0x0f];
- buf[5] = hexDig[(val >> 8) & 0x0f];
- buf[6] = hexDig[(val >> 4) & 0x0f];
- buf[7] = hexDig[(val >> 0) & 0x0f];
+ buf[5] = hexDig[(val >> 8) & 0x0f];
+ buf[6] = hexDig[(val >> 4) & 0x0f];
+ buf[7] = hexDig[(val >> 0) & 0x0f];
buf[8] = '\0';
return buf;
@@ -137,7 +137,7 @@
// // stack: R0, R1, R2, R3, R12, LR, PC, XPSR
typedef struct {
- uint32_t r0, r1, r2, r3, r12, lr, pc, xpsr;
+ uint32_t r0, r1, r2, r3, r12, lr, pc, xpsr;
} ExceptionRegisters_t;
int pyb_hard_fault_debug = 0;
@@ -178,14 +178,14 @@
}
#endif
- if ((void*)&_ram_start <= (void*)regs && (void*)regs < (void*)&_ram_end) {
+ if ((void *)&_ram_start <= (void *)regs && (void *)regs < (void *)&_ram_end) {
mp_hal_stdout_tx_str("Stack:\r\n");
uint32_t *stack_top = &_estack;
- if ((void*)regs < (void*)&_sstack) {
+ if ((void *)regs < (void *)&_sstack) {
// stack not in static stack area so limit the amount we print
- stack_top = (uint32_t*)regs + 32;
+ stack_top = (uint32_t *)regs + 32;
}
- for (uint32_t *sp = (uint32_t*)regs; sp < stack_top; ++sp) {
+ for (uint32_t *sp = (uint32_t *)regs; sp < stack_top; ++sp) {
print_hex_hex(" ", (uint32_t)sp, *sp);
}
}
@@ -210,23 +210,23 @@
// was stacked up using the process stack pointer (aka PSP).
#if __CORTEX_M == 0
- __asm volatile(
- " mov r0, lr \n"
- " lsr r0, r0, #3 \n" // Shift Bit 3 into carry to see which stack pointer we should use.
- " mrs r0, msp \n" // Make R0 point to main stack pointer
- " bcc .use_msp \n" // Keep MSP in R0 if SPSEL (carry) is 0
- " mrs r0, psp \n" // Make R0 point to process stack pointer
- " .use_msp: \n"
- " b HardFault_C_Handler \n" // Off to C land
- );
+ __asm volatile (
+ " mov r0, lr \n"
+ " lsr r0, r0, #3 \n" // Shift Bit 3 into carry to see which stack pointer we should use.
+ " mrs r0, msp \n" // Make R0 point to main stack pointer
+ " bcc .use_msp \n" // Keep MSP in R0 if SPSEL (carry) is 0
+ " mrs r0, psp \n" // Make R0 point to process stack pointer
+ " .use_msp: \n"
+ " b HardFault_C_Handler \n" // Off to C land
+ );
#else
- __asm volatile(
- " tst lr, #4 \n" // Test Bit 3 to see which stack pointer we should use.
- " ite eq \n" // Tell the assembler that the nest 2 instructions are if-then-else
- " mrseq r0, msp \n" // Make R0 point to main stack pointer
- " mrsne r0, psp \n" // Make R0 point to process stack pointer
- " b HardFault_C_Handler \n" // Off to C land
- );
+ __asm volatile (
+ " tst lr, #4 \n" // Test Bit 3 to see which stack pointer we should use.
+ " ite eq \n" // Tell the assembler that the nest 2 instructions are if-then-else
+ " mrseq r0, msp \n" // Make R0 point to main stack pointer
+ " mrsne r0, psp \n" // Make R0 point to process stack pointer
+ " b HardFault_C_Handler \n" // Off to C land
+ );
#endif
}
@@ -343,43 +343,43 @@
*/
STATIC void OTG_CMD_WKUP_Handler(PCD_HandleTypeDef *pcd_handle) {
- if (pcd_handle->Init.low_power_enable) {
- /* Reset SLEEPDEEP bit of Cortex System Control Register */
- SCB->SCR &= (uint32_t)~((uint32_t)(SCB_SCR_SLEEPDEEP_Msk | SCB_SCR_SLEEPONEXIT_Msk));
+ if (pcd_handle->Init.low_power_enable) {
+ /* Reset SLEEPDEEP bit of Cortex System Control Register */
+ SCB->SCR &= (uint32_t) ~((uint32_t)(SCB_SCR_SLEEPDEEP_Msk | SCB_SCR_SLEEPONEXIT_Msk));
- /* Configures system clock after wake-up from STOP: enable HSE/HSI, PLL and select
- PLL as system clock source (HSE/HSI and PLL are disabled in STOP mode) */
+ /* Configures system clock after wake-up from STOP: enable HSE/HSI, PLL and select
+ PLL as system clock source (HSE/HSI and PLL are disabled in STOP mode) */
- __HAL_RCC_HSE_CONFIG(MICROPY_HW_RCC_HSE_STATE);
- #if MICROPY_HW_CLK_USE_HSI
- __HAL_RCC_HSI_ENABLE();
- #endif
+ __HAL_RCC_HSE_CONFIG(MICROPY_HW_RCC_HSE_STATE);
+ #if MICROPY_HW_CLK_USE_HSI
+ __HAL_RCC_HSI_ENABLE();
+ #endif
- /* Wait till HSE/HSI is ready */
- while(__HAL_RCC_GET_FLAG(MICROPY_HW_RCC_FLAG_HSxRDY) == RESET)
- {}
+ /* Wait till HSE/HSI is ready */
+ while (__HAL_RCC_GET_FLAG(MICROPY_HW_RCC_FLAG_HSxRDY) == RESET) {
+ }
- /* Enable the main PLL. */
- __HAL_RCC_PLL_ENABLE();
+ /* Enable the main PLL. */
+ __HAL_RCC_PLL_ENABLE();
- /* Wait till PLL is ready */
- while(__HAL_RCC_GET_FLAG(RCC_FLAG_PLLRDY) == RESET)
- {}
+ /* Wait till PLL is ready */
+ while (__HAL_RCC_GET_FLAG(RCC_FLAG_PLLRDY) == RESET) {
+ }
- /* Select PLL as SYSCLK */
- MODIFY_REG(RCC->CFGR, RCC_CFGR_SW, RCC_SYSCLKSOURCE_PLLCLK);
+ /* Select PLL as SYSCLK */
+ MODIFY_REG(RCC->CFGR, RCC_CFGR_SW, RCC_SYSCLKSOURCE_PLLCLK);
- #if defined(STM32H7)
- while (__HAL_RCC_GET_SYSCLK_SOURCE() != RCC_CFGR_SWS_PLL1)
- {}
- #else
- while (__HAL_RCC_GET_SYSCLK_SOURCE() != RCC_CFGR_SWS_PLL)
- {}
- #endif
+ #if defined(STM32H7)
+ while (__HAL_RCC_GET_SYSCLK_SOURCE() != RCC_CFGR_SWS_PLL1) {
+ }
+ #else
+ while (__HAL_RCC_GET_SYSCLK_SOURCE() != RCC_CFGR_SWS_PLL) {
+ }
+ #endif
- /* ungate PHY clock */
- __HAL_PCD_UNGATE_PHYCLOCK(pcd_handle);
- }
+ /* ungate PHY clock */
+ __HAL_PCD_UNGATE_PHYCLOCK(pcd_handle);
+ }
}
#endif
@@ -393,12 +393,12 @@
void OTG_FS_WKUP_IRQHandler(void) {
IRQ_ENTER(OTG_FS_WKUP_IRQn);
- OTG_CMD_WKUP_Handler(&pcd_fs_handle);
+ OTG_CMD_WKUP_Handler(&pcd_fs_handle);
- #if !defined(STM32H7)
- /* Clear EXTI pending Bit*/
- __HAL_USB_FS_EXTI_CLEAR_FLAG();
- #endif
+ #if !defined(STM32H7)
+ /* Clear EXTI pending Bit*/
+ __HAL_USB_FS_EXTI_CLEAR_FLAG();
+ #endif
IRQ_EXIT(OTG_FS_WKUP_IRQn);
}
@@ -413,12 +413,12 @@
void OTG_HS_WKUP_IRQHandler(void) {
IRQ_ENTER(OTG_HS_WKUP_IRQn);
- OTG_CMD_WKUP_Handler(&pcd_hs_handle);
+ OTG_CMD_WKUP_Handler(&pcd_hs_handle);
- #if !defined(STM32H7)
- /* Clear EXTI pending Bit*/
- __HAL_USB_HS_EXTI_CLEAR_FLAG();
- #endif
+ #if !defined(STM32H7)
+ /* Clear EXTI pending Bit*/
+ __HAL_USB_HS_EXTI_CLEAR_FLAG();
+ #endif
IRQ_EXIT(OTG_HS_WKUP_IRQn);
}
@@ -512,7 +512,7 @@
}
#if defined(ETH) // The 407 has ETH, the 405 doesn't
-void ETH_WKUP_IRQHandler(void) {
+void ETH_WKUP_IRQHandler(void) {
IRQ_ENTER(ETH_WKUP_IRQn);
Handle_EXTI_Irq(EXTI_ETH_WAKEUP);
IRQ_EXIT(ETH_WKUP_IRQn);
diff --git a/ports/stm32/storage.c b/ports/stm32/storage.c
index 7e131f0..0fa3750 100644
--- a/ports/stm32/storage.c
+++ b/ports/stm32/storage.c
@@ -384,8 +384,12 @@
}
return MP_OBJ_NEW_SMALL_INT(ret);
}
- case MP_BLOCKDEV_IOCTL_DEINIT: storage_flush(); return MP_OBJ_NEW_SMALL_INT(0); // TODO properly
- case MP_BLOCKDEV_IOCTL_SYNC: storage_flush(); return MP_OBJ_NEW_SMALL_INT(0);
+ case MP_BLOCKDEV_IOCTL_DEINIT:
+ storage_flush();
+ return MP_OBJ_NEW_SMALL_INT(0); // TODO properly
+ case MP_BLOCKDEV_IOCTL_SYNC:
+ storage_flush();
+ return MP_OBJ_NEW_SMALL_INT(0);
case MP_BLOCKDEV_IOCTL_BLOCK_COUNT: {
mp_int_t n;
@@ -423,7 +427,8 @@
return MP_OBJ_NEW_SMALL_INT(ret);
}
- default: return mp_const_none;
+ default:
+ return mp_const_none;
}
}
STATIC MP_DEFINE_CONST_FUN_OBJ_3(pyb_flash_ioctl_obj, pyb_flash_ioctl);
@@ -441,7 +446,7 @@
.name = MP_QSTR_Flash,
.print = pyb_flash_print,
.make_new = pyb_flash_make_new,
- .locals_dict = (mp_obj_dict_t*)&pyb_flash_locals_dict,
+ .locals_dict = (mp_obj_dict_t *)&pyb_flash_locals_dict,
};
void pyb_flash_init_vfs(fs_user_mount_t *vfs) {
diff --git a/ports/stm32/system_stm32.c b/ports/stm32/system_stm32.c
index 46dd58b..30c8bfd 100644
--- a/ports/stm32/system_stm32.c
+++ b/ports/stm32/system_stm32.c
@@ -163,8 +163,7 @@
*
* Timers run from APBx if APBx_PRESC=1, else 2x APBx
*/
-void SystemClock_Config(void)
-{
+void SystemClock_Config(void) {
#if defined(STM32F7)
// The DFU bootloader changes the clocksource register from its default power
// on reset value, so we set it back here, so the clocksources are the same
@@ -225,7 +224,7 @@
RCC_OscInitStruct.PLL.PLLR = MICROPY_HW_CLK_PLLR;
RCC_OscInitStruct.MSIState = RCC_MSI_OFF;
#else
- RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_LSE|RCC_OSCILLATORTYPE_MSI;
+ RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_LSE | RCC_OSCILLATORTYPE_MSI;
RCC_OscInitStruct.MSIState = RCC_MSI_ON;
RCC_OscInitStruct.MSICalibrationValue = RCC_MSICALIBRATION_DEFAULT;
RCC_OscInitStruct.MSIClockRange = RCC_MSIRANGE_6;
@@ -247,7 +246,7 @@
RCC_ClkInitStruct.ClockType |= (RCC_CLOCKTYPE_D3PCLK1 | RCC_CLOCKTYPE_D1PCLK1);
#endif
-#if defined(MICROPY_HW_CLK_LAST_FREQ) && MICROPY_HW_CLK_LAST_FREQ
+ #if defined(MICROPY_HW_CLK_LAST_FREQ) && MICROPY_HW_CLK_LAST_FREQ
#if defined(STM32F7)
#define FREQ_BKP BKP31R
#elif defined(STM32L4)
@@ -265,7 +264,7 @@
uint32_t b1 = (m >> 26) & 0x7;
uint32_t b2 = (m >> 29) & 0x7;
q = (m >> 18) & 0xf;
- p = (((m >> 16) & 0x03)+1)*2;
+ p = (((m >> 16) & 0x03) + 1) * 2;
n = (m >> 6) & 0x3ff;
m &= 0x3f;
if ((q < 2) || (q > 15) || (p > 8) || (p < 2) || (n < 192) || (n >= 433) || (m < 2)) {
@@ -289,7 +288,7 @@
RCC_ClkInitStruct.AHBCLKDivider = h; //RCC_SYSCLK_DIV1;
RCC_ClkInitStruct.APB1CLKDivider = b1; //RCC_HCLK_DIV4;
RCC_ClkInitStruct.APB2CLKDivider = b2; //RCC_HCLK_DIV2;
-#else // defined(MICROPY_HW_CLK_LAST_FREQ) && MICROPY_HW_CLK_LAST_FREQ
+ #else // defined(MICROPY_HW_CLK_LAST_FREQ) && MICROPY_HW_CLK_LAST_FREQ
RCC_OscInitStruct.PLL.PLLM = MICROPY_HW_CLK_PLLM;
RCC_OscInitStruct.PLL.PLLN = MICROPY_HW_CLK_PLLN;
RCC_OscInitStruct.PLL.PLLP = MICROPY_HW_CLK_PLLP;
@@ -305,28 +304,28 @@
#endif
#if defined(STM32F4) || defined(STM32F7)
- RCC_ClkInitStruct.AHBCLKDivider = RCC_SYSCLK_DIV1;
+ RCC_ClkInitStruct.AHBCLKDivider = RCC_SYSCLK_DIV1;
RCC_ClkInitStruct.APB1CLKDivider = RCC_HCLK_DIV4;
RCC_ClkInitStruct.APB2CLKDivider = RCC_HCLK_DIV2;
#elif defined(STM32L4)
- RCC_ClkInitStruct.AHBCLKDivider = RCC_SYSCLK_DIV1;
+ RCC_ClkInitStruct.AHBCLKDivider = RCC_SYSCLK_DIV1;
RCC_ClkInitStruct.APB1CLKDivider = RCC_HCLK_DIV1;
RCC_ClkInitStruct.APB2CLKDivider = RCC_HCLK_DIV1;
#elif defined(STM32H7)
- RCC_ClkInitStruct.SYSCLKDivider = RCC_SYSCLK_DIV1;
- RCC_ClkInitStruct.AHBCLKDivider = RCC_HCLK_DIV2;
+ RCC_ClkInitStruct.SYSCLKDivider = RCC_SYSCLK_DIV1;
+ RCC_ClkInitStruct.AHBCLKDivider = RCC_HCLK_DIV2;
RCC_ClkInitStruct.APB3CLKDivider = RCC_APB3_DIV2;
RCC_ClkInitStruct.APB1CLKDivider = RCC_APB1_DIV2;
RCC_ClkInitStruct.APB2CLKDivider = RCC_APB2_DIV2;
RCC_ClkInitStruct.APB4CLKDivider = RCC_APB4_DIV2;
#endif
-#endif
+ #endif
- if(HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK) {
- __fatal_error("HAL_RCC_OscConfig");
+ if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK) {
+ __fatal_error("HAL_RCC_OscConfig");
}
-#if defined(STM32H7)
+ #if defined(STM32H7)
/* PLL3 for USB Clock */
PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_USB;
PeriphClkInitStruct.UsbClockSelection = RCC_USBCLKSOURCE_PLL3;
@@ -341,15 +340,14 @@
if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) {
__fatal_error("HAL_RCCEx_PeriphCLKConfig");
}
-#endif
+ #endif
-#if defined(STM32F7)
- /* Activate the OverDrive to reach the 200 MHz Frequency */
- if (HAL_PWREx_EnableOverDrive() != HAL_OK)
- {
- __fatal_error("HAL_PWREx_EnableOverDrive");
- }
-#endif
+ #if defined(STM32F7)
+ /* Activate the OverDrive to reach the 200 MHz Frequency */
+ if (HAL_PWREx_EnableOverDrive() != HAL_OK) {
+ __fatal_error("HAL_PWREx_EnableOverDrive");
+ }
+ #endif
uint32_t vco_out = RCC_OscInitStruct.PLL.PLLN * (MICROPY_HW_CLK_VALUE / 1000000) / RCC_OscInitStruct.PLL.PLLM;
uint32_t sysclk_mhz = vco_out / RCC_OscInitStruct.PLL.PLLP;
@@ -358,28 +356,28 @@
__fatal_error("HAL_RCC_ClockConfig");
}
-#if defined(STM32H7)
- /* Activate CSI clock mandatory for I/O Compensation Cell*/
- __HAL_RCC_CSI_ENABLE() ;
+ #if defined(STM32H7)
+ /* Activate CSI clock mandatory for I/O Compensation Cell*/
+ __HAL_RCC_CSI_ENABLE();
- /* Enable SYSCFG clock mandatory for I/O Compensation Cell */
- __HAL_RCC_SYSCFG_CLK_ENABLE() ;
+ /* Enable SYSCFG clock mandatory for I/O Compensation Cell */
+ __HAL_RCC_SYSCFG_CLK_ENABLE();
- /* Enable the I/O Compensation Cell */
- HAL_EnableCompensationCell();
+ /* Enable the I/O Compensation Cell */
+ HAL_EnableCompensationCell();
- /* Enable the USB voltage level detector */
- HAL_PWREx_EnableUSBVoltageDetector();
-#endif
+ /* Enable the USB voltage level detector */
+ HAL_PWREx_EnableUSBVoltageDetector();
+ #endif
-#if defined(STM32L4)
+ #if defined(STM32L4)
// Enable MSI-Hardware auto calibration mode with LSE
HAL_RCCEx_EnableMSIPLLMode();
RCC_PeriphCLKInitTypeDef PeriphClkInitStruct;
- PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_SAI1|RCC_PERIPHCLK_I2C1
- |RCC_PERIPHCLK_USB |RCC_PERIPHCLK_ADC
- |RCC_PERIPHCLK_RNG |RCC_PERIPHCLK_RTC;
+ PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_SAI1 | RCC_PERIPHCLK_I2C1
+ | RCC_PERIPHCLK_USB | RCC_PERIPHCLK_ADC
+ | RCC_PERIPHCLK_RNG | RCC_PERIPHCLK_RTC;
PeriphClkInitStruct.I2c1ClockSelection = RCC_I2C1CLKSOURCE_PCLK1;
PeriphClkInitStruct.Sai1ClockSelection = RCC_SAI1CLKSOURCE_PLLSAI1;
@@ -412,11 +410,10 @@
PeriphClkInitStruct.PLLSAI1.PLLSAI1R = RCC_PLLR_DIV2;
#endif
PeriphClkInitStruct.PLLSAI1.PLLSAI1ClockOut = RCC_PLLSAI1_SAI1CLK
- |RCC_PLLSAI1_48M2CLK
- |RCC_PLLSAI1_ADC1CLK;
+ | RCC_PLLSAI1_48M2CLK
+ | RCC_PLLSAI1_ADC1CLK;
- if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK)
- {
+ if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) {
__fatal_error("HAL_RCCEx_PeriphCLKConfig");
}
@@ -424,10 +421,10 @@
HAL_PWREx_ControlVoltageScaling(PWR_REGULATOR_VOLTAGE_SCALE1);
- HAL_SYSTICK_Config(HAL_RCC_GetHCLKFreq()/1000);
+ HAL_SYSTICK_Config(HAL_RCC_GetHCLKFreq() / 1000);
HAL_SYSTICK_CLKSourceConfig(SYSTICK_CLKSOURCE_HCLK);
NVIC_SetPriority(SysTick_IRQn, NVIC_EncodePriority(NVIC_PRIORITYGROUP_4, TICK_INT_PRIORITY, 0));
-#endif
+ #endif
}
#endif
diff --git a/ports/stm32/systick.c b/ports/stm32/systick.c
index 85c99b9..d70fc00 100644
--- a/ports/stm32/systick.c
+++ b/ports/stm32/systick.c
@@ -154,7 +154,7 @@
mp_uint_t irq_state = disable_irq();
uint32_t counter = SysTick->VAL;
uint32_t milliseconds = HAL_GetTick();
- uint32_t status = SysTick->CTRL;
+ uint32_t status = SysTick->CTRL;
enable_irq(irq_state);
// It's still possible for the countflag bit to get set if the counter was
diff --git a/ports/stm32/timer.c b/ports/stm32/timer.c
index 0c120e7..1b32d8a 100644
--- a/ports/stm32/timer.c
+++ b/ports/stm32/timer.c
@@ -94,8 +94,8 @@
} pyb_channel_mode;
STATIC const struct {
- qstr name;
- uint32_t oc_mode;
+ qstr name;
+ uint32_t oc_mode;
} channel_mode_info[] = {
{ MP_QSTR_PWM, TIM_OCMODE_PWM1 },
{ MP_QSTR_PWM_INVERTED, TIM_OCMODE_PWM2 },
@@ -295,7 +295,7 @@
mp_int_t freq = mp_obj_get_int(freq_in);
if (freq <= 0) {
goto bad_freq;
- bad_freq:
+ bad_freq:
mp_raise_ValueError("must have positive freq");
}
period = source_freq / freq;
@@ -471,19 +471,19 @@
STATIC void config_deadtime(pyb_timer_obj_t *self, mp_int_t ticks, mp_int_t brk) {
TIM_BreakDeadTimeConfigTypeDef deadTimeConfig;
- deadTimeConfig.OffStateRunMode = TIM_OSSR_DISABLE;
+ deadTimeConfig.OffStateRunMode = TIM_OSSR_DISABLE;
deadTimeConfig.OffStateIDLEMode = TIM_OSSI_DISABLE;
- deadTimeConfig.LockLevel = TIM_LOCKLEVEL_OFF;
- deadTimeConfig.DeadTime = compute_dtg_from_ticks(ticks);
- deadTimeConfig.BreakState = brk == BRK_OFF ? TIM_BREAK_DISABLE : TIM_BREAK_ENABLE;
- deadTimeConfig.BreakPolarity = brk == BRK_LOW ? TIM_BREAKPOLARITY_LOW : TIM_BREAKPOLARITY_HIGH;
+ deadTimeConfig.LockLevel = TIM_LOCKLEVEL_OFF;
+ deadTimeConfig.DeadTime = compute_dtg_from_ticks(ticks);
+ deadTimeConfig.BreakState = brk == BRK_OFF ? TIM_BREAK_DISABLE : TIM_BREAK_ENABLE;
+ deadTimeConfig.BreakPolarity = brk == BRK_LOW ? TIM_BREAKPOLARITY_LOW : TIM_BREAKPOLARITY_HIGH;
#if defined(STM32F7) || defined(STM32H7) | defined(STM32L4)
- deadTimeConfig.BreakFilter = 0;
- deadTimeConfig.Break2State = TIM_BREAK_DISABLE;
- deadTimeConfig.Break2Polarity = TIM_BREAKPOLARITY_LOW;
- deadTimeConfig.Break2Filter = 0;
+ deadTimeConfig.BreakFilter = 0;
+ deadTimeConfig.Break2State = TIM_BREAK_DISABLE;
+ deadTimeConfig.Break2Polarity = TIM_BREAKPOLARITY_LOW;
+ deadTimeConfig.Break2Filter = 0;
#endif
- deadTimeConfig.AutomaticOutput = TIM_AUTOMATICOUTPUT_DISABLE;
+ deadTimeConfig.AutomaticOutput = TIM_AUTOMATICOUTPUT_DISABLE;
HAL_TIMEx_ConfigBreakDeadTime(&self->tim, &deadTimeConfig);
}
@@ -632,8 +632,8 @@
}
init->ClockDivision = args[ARG_div].u_int == 2 ? TIM_CLOCKDIVISION_DIV2 :
- args[ARG_div].u_int == 4 ? TIM_CLOCKDIVISION_DIV4 :
- TIM_CLOCKDIVISION_DIV1;
+ args[ARG_div].u_int == 4 ? TIM_CLOCKDIVISION_DIV4 :
+ TIM_CLOCKDIVISION_DIV1;
#if !defined(STM32L0)
init->RepetitionCounter = 0;
@@ -642,68 +642,112 @@
// enable TIM clock
switch (self->tim_id) {
#if defined(TIM1)
- case 1: __HAL_RCC_TIM1_CLK_ENABLE(); break;
+ case 1:
+ __HAL_RCC_TIM1_CLK_ENABLE();
+ break;
#endif
- case 2: __HAL_RCC_TIM2_CLK_ENABLE(); break;
+ case 2:
+ __HAL_RCC_TIM2_CLK_ENABLE();
+ break;
#if defined(TIM3)
- case 3: __HAL_RCC_TIM3_CLK_ENABLE(); break;
+ case 3:
+ __HAL_RCC_TIM3_CLK_ENABLE();
+ break;
#endif
#if defined(TIM4)
- case 4: __HAL_RCC_TIM4_CLK_ENABLE(); break;
+ case 4:
+ __HAL_RCC_TIM4_CLK_ENABLE();
+ break;
#endif
#if defined(TIM5)
- case 5: __HAL_RCC_TIM5_CLK_ENABLE(); break;
+ case 5:
+ __HAL_RCC_TIM5_CLK_ENABLE();
+ break;
#endif
#if defined(TIM6)
- case 6: __HAL_RCC_TIM6_CLK_ENABLE(); break;
+ case 6:
+ __HAL_RCC_TIM6_CLK_ENABLE();
+ break;
#endif
#if defined(TIM7)
- case 7: __HAL_RCC_TIM7_CLK_ENABLE(); break;
+ case 7:
+ __HAL_RCC_TIM7_CLK_ENABLE();
+ break;
#endif
#if defined(TIM8)
- case 8: __HAL_RCC_TIM8_CLK_ENABLE(); break;
+ case 8:
+ __HAL_RCC_TIM8_CLK_ENABLE();
+ break;
#endif
#if defined(TIM9)
- case 9: __HAL_RCC_TIM9_CLK_ENABLE(); break;
+ case 9:
+ __HAL_RCC_TIM9_CLK_ENABLE();
+ break;
#endif
#if defined(TIM10)
- case 10: __HAL_RCC_TIM10_CLK_ENABLE(); break;
+ case 10:
+ __HAL_RCC_TIM10_CLK_ENABLE();
+ break;
#endif
#if defined(TIM11)
- case 11: __HAL_RCC_TIM11_CLK_ENABLE(); break;
+ case 11:
+ __HAL_RCC_TIM11_CLK_ENABLE();
+ break;
#endif
#if defined(TIM12)
- case 12: __HAL_RCC_TIM12_CLK_ENABLE(); break;
+ case 12:
+ __HAL_RCC_TIM12_CLK_ENABLE();
+ break;
#endif
#if defined(TIM13)
- case 13: __HAL_RCC_TIM13_CLK_ENABLE(); break;
+ case 13:
+ __HAL_RCC_TIM13_CLK_ENABLE();
+ break;
#endif
#if defined(TIM14)
- case 14: __HAL_RCC_TIM14_CLK_ENABLE(); break;
+ case 14:
+ __HAL_RCC_TIM14_CLK_ENABLE();
+ break;
#endif
#if defined(TIM15)
- case 15: __HAL_RCC_TIM15_CLK_ENABLE(); break;
+ case 15:
+ __HAL_RCC_TIM15_CLK_ENABLE();
+ break;
#endif
#if defined(TIM16)
- case 16: __HAL_RCC_TIM16_CLK_ENABLE(); break;
+ case 16:
+ __HAL_RCC_TIM16_CLK_ENABLE();
+ break;
#endif
#if defined(TIM17)
- case 17: __HAL_RCC_TIM17_CLK_ENABLE(); break;
+ case 17:
+ __HAL_RCC_TIM17_CLK_ENABLE();
+ break;
#endif
#if defined(TIM18)
- case 18: __HAL_RCC_TIM18_CLK_ENABLE(); break;
+ case 18:
+ __HAL_RCC_TIM18_CLK_ENABLE();
+ break;
#endif
#if defined(TIM19)
- case 19: __HAL_RCC_TIM19_CLK_ENABLE(); break;
+ case 19:
+ __HAL_RCC_TIM19_CLK_ENABLE();
+ break;
#endif
#if defined(TIM20)
- case 20: __HAL_RCC_TIM20_CLK_ENABLE(); break;
+ case 20:
+ __HAL_RCC_TIM20_CLK_ENABLE();
+ break;
#endif
#if defined(TIM21)
- case 21: __HAL_RCC_TIM21_CLK_ENABLE(); break;
+ case 21:
+ __HAL_RCC_TIM21_CLK_ENABLE();
+ break;
#endif
#if defined(TIM22)
- case 22: __HAL_RCC_TIM22_CLK_ENABLE(); break;
+ case 22:
+ __HAL_RCC_TIM22_CLK_ENABLE();
+ break;
#endif
}
@@ -730,7 +774,7 @@
if (IS_TIM_BREAK_INSTANCE(self->tim.Instance)) {
#else
if (0) {
- #endif
+ #endif
config_deadtime(self, args[ARG_deadtime].u_int, args[ARG_brk].u_int);
}
@@ -858,7 +902,7 @@
tim->is_32bit = tim_id == 2 || tim_id == 5;
tim->callback = mp_const_none;
uint32_t ti = tim_instance_table[tim_id - 1];
- tim->tim.Instance = (TIM_TypeDef*)(ti & 0xffffff00);
+ tim->tim.Instance = (TIM_TypeDef *)(ti & 0xffffff00);
tim->irqn = ti & 0xff;
MP_STATE_PORT(pyb_timer_obj_all)[tim_id - 1] = tim;
} else {
@@ -1085,11 +1129,11 @@
// use absolute pulse width value (defaults to 0 if nothing given)
oc_config.Pulse = args[3].u_int;
}
- oc_config.OCPolarity = TIM_OCPOLARITY_HIGH;
- oc_config.OCFastMode = TIM_OCFAST_DISABLE;
+ oc_config.OCPolarity = TIM_OCPOLARITY_HIGH;
+ oc_config.OCFastMode = TIM_OCFAST_DISABLE;
#if !defined(STM32L0)
- oc_config.OCNPolarity = TIM_OCNPOLARITY_HIGH;
- oc_config.OCIdleState = TIM_OCIDLESTATE_SET;
+ oc_config.OCNPolarity = TIM_OCNPOLARITY_HIGH;
+ oc_config.OCIdleState = TIM_OCIDLESTATE_SET;
oc_config.OCNIdleState = TIM_OCNIDLESTATE_SET;
#endif
@@ -1115,20 +1159,20 @@
case CHANNEL_MODE_OC_FORCED_ACTIVE:
case CHANNEL_MODE_OC_FORCED_INACTIVE: {
TIM_OC_InitTypeDef oc_config;
- oc_config.OCMode = channel_mode_info[chan->mode].oc_mode;
- oc_config.Pulse = args[5].u_int;
- oc_config.OCPolarity = args[6].u_int;
+ oc_config.OCMode = channel_mode_info[chan->mode].oc_mode;
+ oc_config.Pulse = args[5].u_int;
+ oc_config.OCPolarity = args[6].u_int;
if (oc_config.OCPolarity == 0xffffffff) {
oc_config.OCPolarity = TIM_OCPOLARITY_HIGH;
}
- oc_config.OCFastMode = TIM_OCFAST_DISABLE;
+ oc_config.OCFastMode = TIM_OCFAST_DISABLE;
#if !defined(STM32L0)
if (oc_config.OCPolarity == TIM_OCPOLARITY_HIGH) {
- oc_config.OCNPolarity = TIM_OCNPOLARITY_HIGH;
+ oc_config.OCNPolarity = TIM_OCNPOLARITY_HIGH;
} else {
- oc_config.OCNPolarity = TIM_OCNPOLARITY_LOW;
+ oc_config.OCNPolarity = TIM_OCNPOLARITY_LOW;
}
- oc_config.OCIdleState = TIM_OCIDLESTATE_SET;
+ oc_config.OCIdleState = TIM_OCIDLESTATE_SET;
oc_config.OCNIdleState = TIM_OCNIDLESTATE_SET;
#endif
@@ -1153,13 +1197,13 @@
case CHANNEL_MODE_IC: {
TIM_IC_InitTypeDef ic_config;
- ic_config.ICPolarity = args[6].u_int;
+ ic_config.ICPolarity = args[6].u_int;
if (ic_config.ICPolarity == 0xffffffff) {
ic_config.ICPolarity = TIM_ICPOLARITY_RISING;
}
ic_config.ICSelection = TIM_ICSELECTION_DIRECTTI;
ic_config.ICPrescaler = TIM_ICPSC_DIV1;
- ic_config.ICFilter = 0;
+ ic_config.ICFilter = 0;
if (!IS_TIM_IC_POLARITY(ic_config.ICPolarity)) {
mp_raise_msg_varg(&mp_type_ValueError, "invalid polarity (%d)", ic_config.ICPolarity);
@@ -1179,41 +1223,41 @@
TIM_Encoder_InitTypeDef enc_config;
enc_config.EncoderMode = channel_mode_info[chan->mode].oc_mode;
- enc_config.IC1Polarity = args[6].u_int;
+ enc_config.IC1Polarity = args[6].u_int;
if (enc_config.IC1Polarity == 0xffffffff) {
enc_config.IC1Polarity = TIM_ICPOLARITY_RISING;
}
- enc_config.IC2Polarity = enc_config.IC1Polarity;
+ enc_config.IC2Polarity = enc_config.IC1Polarity;
enc_config.IC1Selection = TIM_ICSELECTION_DIRECTTI;
enc_config.IC2Selection = TIM_ICSELECTION_DIRECTTI;
enc_config.IC1Prescaler = TIM_ICPSC_DIV1;
enc_config.IC2Prescaler = TIM_ICPSC_DIV1;
- enc_config.IC1Filter = 0;
- enc_config.IC2Filter = 0;
+ enc_config.IC1Filter = 0;
+ enc_config.IC2Filter = 0;
if (!IS_TIM_IC_POLARITY(enc_config.IC1Polarity)) {
mp_raise_msg_varg(&mp_type_ValueError, "invalid polarity (%d)", enc_config.IC1Polarity);
}
// Only Timers 1, 2, 3, 4, 5, and 8 support encoder mode
if (
- #if defined(TIM1)
+ #if defined(TIM1)
self->tim.Instance != TIM1
- &&
- #endif
+ &&
+ #endif
self->tim.Instance != TIM2
- #if defined(TIM3)
- && self->tim.Instance != TIM3
- #endif
- #if defined(TIM4)
- && self->tim.Instance != TIM4
- #endif
- #if defined(TIM5)
- && self->tim.Instance != TIM5
- #endif
- #if defined(TIM8)
- && self->tim.Instance != TIM8
- #endif
- ) {
+ #if defined(TIM3)
+ && self->tim.Instance != TIM3
+ #endif
+ #if defined(TIM4)
+ && self->tim.Instance != TIM4
+ #endif
+ #if defined(TIM5)
+ && self->tim.Instance != TIM5
+ #endif
+ #if defined(TIM8)
+ && self->tim.Instance != TIM8
+ #endif
+ ) {
mp_raise_msg_varg(&mp_type_ValueError, "encoder not supported on timer %d", self->tim_id);
}
@@ -1394,7 +1438,7 @@
.name = MP_QSTR_Timer,
.print = pyb_timer_print,
.make_new = pyb_timer_make_new,
- .locals_dict = (mp_obj_dict_t*)&pyb_timer_locals_dict,
+ .locals_dict = (mp_obj_dict_t *)&pyb_timer_locals_dict,
};
/// \moduleref pyb
@@ -1407,9 +1451,9 @@
pyb_timer_channel_obj_t *self = MP_OBJ_TO_PTR(self_in);
mp_printf(print, "TimerChannel(timer=%u, channel=%u, mode=%s)",
- self->timer->tim_id,
- self->channel,
- qstr_str(channel_mode_info[self->mode].name));
+ self->timer->tim_id,
+ self->channel,
+ qstr_str(channel_mode_info[self->mode].name));
}
/// \method capture([value])
@@ -1529,7 +1573,7 @@
{ &mp_type_type },
.name = MP_QSTR_TimerChannel,
.print = pyb_timer_channel_print,
- .locals_dict = (mp_obj_dict_t*)&pyb_timer_channel_locals_dict,
+ .locals_dict = (mp_obj_dict_t *)&pyb_timer_channel_locals_dict,
};
STATIC void timer_handle_irq_channel(pyb_timer_obj_t *tim, uint8_t channel, mp_obj_t callback) {
diff --git a/ports/stm32/uart.c b/ports/stm32/uart.c
index d2d234a..8693813 100644
--- a/ports/stm32/uart.c
+++ b/ports/stm32/uart.c
@@ -130,46 +130,57 @@
}
switch (uart_id) {
#if defined(MICROPY_HW_UART1_TX) && defined(MICROPY_HW_UART1_RX)
- case PYB_UART_1: return true;
+ case PYB_UART_1:
+ return true;
#endif
#if defined(MICROPY_HW_UART2_TX) && defined(MICROPY_HW_UART2_RX)
- case PYB_UART_2: return true;
+ case PYB_UART_2:
+ return true;
#endif
#if defined(MICROPY_HW_UART3_TX) && defined(MICROPY_HW_UART3_RX)
- case PYB_UART_3: return true;
+ case PYB_UART_3:
+ return true;
#endif
#if defined(MICROPY_HW_UART4_TX) && defined(MICROPY_HW_UART4_RX)
- case PYB_UART_4: return true;
+ case PYB_UART_4:
+ return true;
#endif
#if defined(MICROPY_HW_UART5_TX) && defined(MICROPY_HW_UART5_RX)
- case PYB_UART_5: return true;
+ case PYB_UART_5:
+ return true;
#endif
#if defined(MICROPY_HW_UART6_TX) && defined(MICROPY_HW_UART6_RX)
- case PYB_UART_6: return true;
+ case PYB_UART_6:
+ return true;
#endif
#if defined(MICROPY_HW_UART7_TX) && defined(MICROPY_HW_UART7_RX)
- case PYB_UART_7: return true;
+ case PYB_UART_7:
+ return true;
#endif
#if defined(MICROPY_HW_UART8_TX) && defined(MICROPY_HW_UART8_RX)
- case PYB_UART_8: return true;
+ case PYB_UART_8:
+ return true;
#endif
#if defined(MICROPY_HW_UART9_TX) && defined(MICROPY_HW_UART9_RX)
- case PYB_UART_9: return true;
+ case PYB_UART_9:
+ return true;
#endif
#if defined(MICROPY_HW_UART10_TX) && defined(MICROPY_HW_UART10_RX)
- case PYB_UART_10: return true;
+ case PYB_UART_10:
+ return true;
#endif
- default: return false;
+ default:
+ return false;
}
}
@@ -661,7 +672,7 @@
// buffering via IRQ
int data;
if (self->char_width == CHAR_WIDTH_9BIT) {
- data = ((uint16_t*)self->read_buf)[self->read_buf_tail];
+ data = ((uint16_t *)self->read_buf)[self->read_buf_tail];
} else {
data = self->read_buf[self->read_buf_tail];
}
@@ -744,7 +755,7 @@
timeout = 2 * self->timeout_char;
}
- const uint8_t *src = (const uint8_t*)src_in;
+ const uint8_t *src = (const uint8_t *)src_in;
size_t num_tx = 0;
USART_TypeDef *uart = self->uartx;
@@ -755,7 +766,7 @@
}
uint32_t data;
if (self->char_width == CHAR_WIDTH_9BIT) {
- data = *((uint16_t*)src) & 0x1ff;
+ data = *((uint16_t *)src) & 0x1ff;
src += 2;
} else {
data = *src++;
@@ -811,7 +822,7 @@
pendsv_kbd_intr();
} else {
if (self->char_width == CHAR_WIDTH_9BIT) {
- ((uint16_t*)self->read_buf)[self->read_buf_head] = data;
+ ((uint16_t *)self->read_buf)[self->read_buf_head] = data;
} else {
self->read_buf[self->read_buf_head] = data;
}
diff --git a/ports/stm32/usb.c b/ports/stm32/usb.c
index 432d55a..5c8b105 100644
--- a/ports/stm32/usb.c
+++ b/ports/stm32/usb.c
@@ -238,8 +238,8 @@
// set up the USBD state
USBD_HandleTypeDef *usbd = &usb_dev->hUSBDDevice;
usbd->id = dev_id;
- usbd->dev_state = USBD_STATE_DEFAULT;
- usbd->pDesc = (USBD_DescriptorsTypeDef*)&USBD_Descriptors;
+ usbd->dev_state = USBD_STATE_DEFAULT;
+ usbd->pDesc = (USBD_DescriptorsTypeDef *)&USBD_Descriptors;
usbd->pClass = &USBD_CDC_MSC_HID;
usb_dev->usbd_cdc_msc_hid_state.pdev = usbd;
for (int i = 0; i < MICROPY_HW_USB_CDC_NUM; ++i) {
@@ -275,7 +275,7 @@
}
}
usbd_msc_init_lu(msc_n, msc_unit);
- USBD_MSC_RegisterStorage(&usb_dev->usbd_cdc_msc_hid_state, (USBD_StorageTypeDef*)&usbd_msc_fops);
+ USBD_MSC_RegisterStorage(&usb_dev->usbd_cdc_msc_hid_state, (USBD_StorageTypeDef *)&usbd_msc_fops);
#endif
const uint8_t *fifo_size = usbd_fifo_size_cdc1;
@@ -331,7 +331,7 @@
void usb_vcp_send_strn(const char *str, int len) {
if (usb_device.enabled) {
- usbd_cdc_tx_always(&usb_device.usbd_cdc_itf[0], (const uint8_t*)str, len);
+ usbd_cdc_tx_always(&usb_device.usbd_cdc_itf[0], (const uint8_t *)str, len);
}
}
@@ -399,9 +399,9 @@
// fetch the current usb mode -> pyb.usb_mode()
if (n_args == 0) {
- #if defined(USE_HOST_MODE)
+ #if defined(USE_HOST_MODE)
return MP_OBJ_NEW_QSTR(MP_QSTR_host);
- #else
+ #else
uint8_t mode = USBD_GetMode(&usb_device.usbd_cdc_msc_hid_state);
switch (mode & USBD_MODE_IFACE_MASK) {
case USBD_MODE_CDC:
@@ -419,7 +419,7 @@
default:
return mp_const_none;
}
- #endif
+ #endif
}
// parse args
@@ -439,7 +439,7 @@
// get mode string
const char *mode_str = mp_obj_str_get_str(args[ARG_mode].u_obj);
-#if defined(USE_HOST_MODE)
+ #if defined(USE_HOST_MODE)
// hardware configured for USB host mode
@@ -449,7 +449,7 @@
goto bad_mode;
}
-#else
+ #else
// hardware configured for USB device mode
@@ -587,7 +587,7 @@
goto bad_mode;
}
-#endif
+ #endif
return mp_const_none;
@@ -628,7 +628,7 @@
}
STATIC void pyb_usb_vcp_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
- int id = ((pyb_usb_vcp_obj_t*)MP_OBJ_TO_PTR(self_in))->cdc_itf - &usb_device.usbd_cdc_itf[0];
+ int id = ((pyb_usb_vcp_obj_t *)MP_OBJ_TO_PTR(self_in))->cdc_itf - &usb_device.usbd_cdc_itf[0];
mp_printf(print, "USB_VCP(%u)", id);
}
@@ -761,7 +761,7 @@
mp_obj_t o_ret = pyb_buf_get_for_recv(vals[0].u_obj, &vstr);
// receive the data
- int ret = usbd_cdc_rx(self->cdc_itf, (uint8_t*)vstr.buf, vstr.len, vals[1].u_int);
+ int ret = usbd_cdc_rx(self->cdc_itf, (uint8_t *)vstr.buf, vstr.len, vals[1].u_int);
// return the received data
if (o_ret != MP_OBJ_NULL) {
@@ -804,7 +804,7 @@
STATIC mp_uint_t pyb_usb_vcp_read(mp_obj_t self_in, void *buf, mp_uint_t size, int *errcode) {
pyb_usb_vcp_obj_t *self = MP_OBJ_TO_PTR(self_in);
- int ret = usbd_cdc_rx(self->cdc_itf, (byte*)buf, size, 0);
+ int ret = usbd_cdc_rx(self->cdc_itf, (byte *)buf, size, 0);
if (ret == 0) {
// return EAGAIN error to indicate non-blocking
*errcode = MP_EAGAIN;
@@ -815,7 +815,7 @@
STATIC mp_uint_t pyb_usb_vcp_write(mp_obj_t self_in, const void *buf, mp_uint_t size, int *errcode) {
pyb_usb_vcp_obj_t *self = MP_OBJ_TO_PTR(self_in);
- int ret = usbd_cdc_tx_flow(self->cdc_itf, (const byte*)buf, size);
+ int ret = usbd_cdc_tx_flow(self->cdc_itf, (const byte *)buf, size);
if (ret == 0) {
// return EAGAIN error to indicate non-blocking
*errcode = MP_EAGAIN;
@@ -857,7 +857,7 @@
.getiter = mp_identity_getiter,
.iternext = mp_stream_unbuffered_iter,
.protocol = &pyb_usb_vcp_stream_p,
- .locals_dict = (mp_obj_dict_t*)&pyb_usb_vcp_locals_dict,
+ .locals_dict = (mp_obj_dict_t *)&pyb_usb_vcp_locals_dict,
};
/******************************************************************************/
@@ -908,7 +908,7 @@
mp_obj_t o_ret = pyb_buf_get_for_recv(vals[0].u_obj, &vstr);
// receive the data
- int ret = usbd_hid_rx(&self->usb_dev->usbd_hid_itf, vstr.len, (uint8_t*)vstr.buf, vals[1].u_int);
+ int ret = usbd_hid_rx(&self->usb_dev->usbd_hid_itf, vstr.len, (uint8_t *)vstr.buf, vals[1].u_int);
if (ret < 0) {
// error, just return 0/empty bytes
@@ -995,7 +995,7 @@
.name = MP_QSTR_USB_HID,
.make_new = pyb_usb_hid_make_new,
.protocol = &pyb_usb_hid_stream_p,
- .locals_dict = (mp_obj_dict_t*)&pyb_usb_hid_locals_dict,
+ .locals_dict = (mp_obj_dict_t *)&pyb_usb_hid_locals_dict,
};
#endif // MICROPY_HW_USB_HID
@@ -1012,7 +1012,7 @@
#include "usbh_hid_keybd.h"
#include "usbh_hid_mouse.h"
-__ALIGN_BEGIN USBH_HOST USB_Host __ALIGN_END ;
+__ALIGN_BEGIN USBH_HOST USB_Host __ALIGN_END;
static int host_is_enabled = 0;
diff --git a/ports/stm32/usb.h b/ports/stm32/usb.h
index 457c731..f69af86 100644
--- a/ports/stm32/usb.h
+++ b/ports/stm32/usb.h
@@ -74,7 +74,7 @@
void pyb_usb_dev_deinit(void);
bool usb_vcp_is_enabled(void);
int usb_vcp_recv_byte(uint8_t *c); // if a byte is available, return 1 and put the byte in *c, else return 0
-void usb_vcp_send_strn(const char* str, int len);
+void usb_vcp_send_strn(const char *str, int len);
void usb_vcp_attach_to_repl(const pyb_usb_vcp_obj_t *self, bool attached);
void pyb_usb_host_init(void);
diff --git a/ports/stm32/usbd_cdc_interface.c b/ports/stm32/usbd_cdc_interface.c
index bdd7a4e..1fc7af1 100644
--- a/ports/stm32/usbd_cdc_interface.c
+++ b/ports/stm32/usbd_cdc_interface.c
@@ -62,7 +62,7 @@
static uint8_t usbd_cdc_connect_tx_timer;
uint8_t *usbd_cdc_init(usbd_cdc_state_t *cdc_in) {
- usbd_cdc_itf_t *cdc = (usbd_cdc_itf_t*)cdc_in;
+ usbd_cdc_itf_t *cdc = (usbd_cdc_itf_t *)cdc_in;
// Reset the CDC state due to a new USB host connection
// Note: we don't reset tx_buf_ptr_* in order to allow the output buffer to
@@ -86,7 +86,7 @@
}
void usbd_cdc_deinit(usbd_cdc_state_t *cdc_in) {
- usbd_cdc_itf_t *cdc = (usbd_cdc_itf_t*)cdc_in;
+ usbd_cdc_itf_t *cdc = (usbd_cdc_itf_t *)cdc_in;
cdc->connect_state = USBD_CDC_CONNECT_STATE_DISCONNECTED;
}
@@ -95,8 +95,8 @@
// pbuf: buffer containing command data (request parameters)
// length: number of data to be sent (in bytes)
// Returns USBD_OK if all operations are OK else USBD_FAIL
-int8_t usbd_cdc_control(usbd_cdc_state_t *cdc_in, uint8_t cmd, uint8_t* pbuf, uint16_t length) {
- usbd_cdc_itf_t *cdc = (usbd_cdc_itf_t*)cdc_in;
+int8_t usbd_cdc_control(usbd_cdc_state_t *cdc_in, uint8_t cmd, uint8_t *pbuf, uint16_t length) {
+ usbd_cdc_itf_t *cdc = (usbd_cdc_itf_t *)cdc_in;
switch (cmd) {
case CDC_SEND_ENCAPSULATED_COMMAND:
@@ -121,11 +121,11 @@
case CDC_SET_LINE_CODING:
#if 0
- LineCoding.bitrate = (uint32_t)(pbuf[0] | (pbuf[1] << 8) |\
- (pbuf[2] << 16) | (pbuf[3] << 24));
- LineCoding.format = pbuf[4];
+ LineCoding.bitrate = (uint32_t)(pbuf[0] | (pbuf[1] << 8) | \
+ (pbuf[2] << 16) | (pbuf[3] << 24));
+ LineCoding.format = pbuf[4];
LineCoding.paritytype = pbuf[5];
- LineCoding.datatype = pbuf[6];
+ LineCoding.datatype = pbuf[6];
/* Set the new configuration */
#endif
break;
@@ -175,7 +175,7 @@
// (cdc.base.tx_in_progress must be 0)
void usbd_cdc_tx_ready(usbd_cdc_state_t *cdc_in) {
- usbd_cdc_itf_t *cdc = (usbd_cdc_itf_t*)cdc_in;
+ usbd_cdc_itf_t *cdc = (usbd_cdc_itf_t *)cdc_in;
cdc->tx_buf_ptr_out = cdc->tx_buf_ptr_out_shadow;
if (cdc->tx_buf_ptr_out == cdc->tx_buf_ptr_in && !cdc->tx_need_empty_packet) {
@@ -224,14 +224,14 @@
if (usbd_cdc_connect_tx_timer > 0) {
--usbd_cdc_connect_tx_timer;
} else {
- usbd_cdc_msc_hid_state_t *usbd = ((USBD_HandleTypeDef*)hpcd->pData)->pClassData;
+ usbd_cdc_msc_hid_state_t *usbd = ((USBD_HandleTypeDef *)hpcd->pData)->pClassData;
#if !MICROPY_HW_USB_IS_MULTI_OTG
USB->CNTR &= ~USB_CNTR_SOFM;
#else
hpcd->Instance->GINTMSK &= ~USB_OTG_GINTMSK_SOFM;
#endif
for (int i = 0; i < MICROPY_HW_USB_CDC_NUM; ++i) {
- usbd_cdc_itf_t *cdc = (usbd_cdc_itf_t*)usbd->cdc[i];
+ usbd_cdc_itf_t *cdc = (usbd_cdc_itf_t *)usbd->cdc[i];
if (cdc->connect_state == USBD_CDC_CONNECT_STATE_CONNECTING) {
cdc->connect_state = USBD_CDC_CONNECT_STATE_CONNECTED;
usbd_cdc_try_tx(cdc);
@@ -263,7 +263,7 @@
// len: number of bytes received into the buffer we passed to USBD_CDC_ReceivePacket
// Returns USBD_OK if all operations are OK else USBD_FAIL
int8_t usbd_cdc_receive(usbd_cdc_state_t *cdc_in, size_t len) {
- usbd_cdc_itf_t *cdc = (usbd_cdc_itf_t*)cdc_in;
+ usbd_cdc_itf_t *cdc = (usbd_cdc_itf_t *)cdc_in;
// copy the incoming data into the circular buffer
for (const uint8_t *src = cdc->rx_packet_buf, *top = cdc->rx_packet_buf + len; src < top; ++src) {
@@ -318,7 +318,7 @@
// Wait until the device is connected and the buffer has space, with a given timeout
uint32_t start = HAL_GetTick();
while (cdc->connect_state == USBD_CDC_CONNECT_STATE_DISCONNECTED
- || ((cdc->tx_buf_ptr_in + 1) & (USBD_CDC_TX_DATA_SIZE - 1)) == cdc->tx_buf_ptr_out) {
+ || ((cdc->tx_buf_ptr_in + 1) & (USBD_CDC_TX_DATA_SIZE - 1)) == cdc->tx_buf_ptr_out) {
usbd_cdc_try_tx(cdc);
// Wraparound of tick is taken care of by 2's complement arithmetic.
if (HAL_GetTick() - start >= timeout) {
diff --git a/ports/stm32/usbd_conf.c b/ports/stm32/usbd_conf.c
index c2edbb7..d24881d 100644
--- a/ports/stm32/usbd_conf.c
+++ b/ports/stm32/usbd_conf.c
@@ -363,7 +363,7 @@
*/
USBD_StatusTypeDef USBD_LL_Init(USBD_HandleTypeDef *pdev, int high_speed, const uint8_t *fifo_size) {
#if MICROPY_HW_USB_FS
- if (pdev->id == USB_PHY_FS_ID) {
+ if (pdev->id == USB_PHY_FS_ID) {
#if defined(STM32WB)
PWR->CR2 |= PWR_CR2_USV; // USB supply is valid
#endif
@@ -631,7 +631,7 @@
* @param ep_addr: Endpoint Number
* @retval Recived Data Size
*/
-uint32_t USBD_LL_GetRxDataSize(USBD_HandleTypeDef *pdev, uint8_t ep_addr) {
+uint32_t USBD_LL_GetRxDataSize(USBD_HandleTypeDef *pdev, uint8_t ep_addr) {
return HAL_PCD_EP_GetRxCount(pdev->pData, ep_addr);
}
diff --git a/ports/stm32/usbd_desc.c b/ports/stm32/usbd_desc.c
index d28f9ae..aa68371 100644
--- a/ports/stm32/usbd_desc.c
+++ b/ports/stm32/usbd_desc.c
@@ -119,7 +119,7 @@
* @retval Pointer to descriptor buffer
*/
STATIC uint8_t *USBD_DeviceDescriptor(USBD_HandleTypeDef *pdev, uint16_t *length) {
- uint8_t *dev_desc = ((usbd_cdc_msc_hid_state_t*)pdev->pClassData)->usbd_device_desc;
+ uint8_t *dev_desc = ((usbd_cdc_msc_hid_state_t *)pdev->pClassData)->usbd_device_desc;
*length = USB_LEN_DEV_DESC;
return dev_desc;
}
@@ -137,7 +137,7 @@
switch (idx) {
case USBD_IDX_LANGID_STR:
*length = sizeof(USBD_LangIDDesc);
- return (uint8_t*)USBD_LangIDDesc; // the data should only be read from this buf
+ return (uint8_t *)USBD_LangIDDesc; // the data should only be read from this buf
case USBD_IDX_MFC_STR:
str = USBD_MANUFACTURER_STRING;
@@ -193,8 +193,8 @@
return NULL;
}
- uint8_t *str_desc = ((usbd_cdc_msc_hid_state_t*)pdev->pClassData)->usbd_str_desc;
- USBD_GetString((uint8_t*)str, str_desc, length);
+ uint8_t *str_desc = ((usbd_cdc_msc_hid_state_t *)pdev->pClassData)->usbd_str_desc;
+ USBD_GetString((uint8_t *)str, str_desc, length);
return str_desc;
}
diff --git a/ports/stm32/usbd_hid_interface.c b/ports/stm32/usbd_hid_interface.c
index 8dc39f5..c167fb3 100644
--- a/ports/stm32/usbd_hid_interface.c
+++ b/ports/stm32/usbd_hid_interface.c
@@ -34,14 +34,14 @@
#if MICROPY_HW_USB_HID
uint8_t *usbd_hid_init(usbd_hid_state_t *hid_in) {
- usbd_hid_itf_t *hid = (usbd_hid_itf_t*)hid_in;
+ usbd_hid_itf_t *hid = (usbd_hid_itf_t *)hid_in;
hid->report_in_len = USBD_HID_REPORT_INVALID;
return &hid->report_in_buf[0]; // location to place first incoming report
}
int8_t usbd_hid_receive(usbd_hid_state_t *hid_in, size_t len) {
// Incoming report: save the length but don't schedule next report until user reads this one
- usbd_hid_itf_t *hid = (usbd_hid_itf_t*)hid_in;
+ usbd_hid_itf_t *hid = (usbd_hid_itf_t *)hid_in;
hid->report_in_len = len;
return USBD_OK;
}
diff --git a/ports/stm32/usbd_msc_interface.c b/ports/stm32/usbd_msc_interface.c
index 2f5e7aa..62fe32b 100644
--- a/ports/stm32/usbd_msc_interface.c
+++ b/ports/stm32/usbd_msc_interface.c
@@ -102,13 +102,13 @@
'M', 'i', 'c', 'r', 'o', 'P', 'y', ' ', // Manufacturer : 8 bytes
'p', 'y', 'b', 'o', 'a', 'r', 'd', ' ', // Product : 16 Bytes
'F', 'l', 'a', 's', 'h', ' ', ' ', ' ',
- '1', '.', '0' ,'0', // Version : 4 Bytes
+ '1', '.', '0','0', // Version : 4 Bytes
};
// Set the logical units that will be exposed over MSC
void usbd_msc_init_lu(size_t lu_n, const void *lu_data) {
usbd_msc_lu_num = MIN(lu_n, USBD_MSC_MAX_LUN);
- memcpy(usbd_msc_lu_data, lu_data, sizeof(void*) * usbd_msc_lu_num);
+ memcpy(usbd_msc_lu_data, lu_data, sizeof(void *) * usbd_msc_lu_num);
usbd_msc_lu_flags = 0;
}
@@ -139,10 +139,10 @@
}
#if MICROPY_HW_ENABLE_SDCARD
} else if (lu == &pyb_sdcard_type
- #if MICROPY_HW_ENABLE_MMCARD
- || lu == &pyb_mmcard_type
- #endif
- ) {
+ #if MICROPY_HW_ENABLE_MMCARD
+ || lu == &pyb_mmcard_type
+ #endif
+ ) {
switch (op) {
case MP_BLOCKDEV_IOCTL_INIT:
if (!sdcard_power_on()) {
@@ -290,10 +290,10 @@
return 0;
#if MICROPY_HW_ENABLE_SDCARD
} else if (lu == &pyb_sdcard_type
- #if MICROPY_HW_ENABLE_MMCARD
- || lu == &pyb_mmcard_type
- #endif
- ) {
+ #if MICROPY_HW_ENABLE_MMCARD
+ || lu == &pyb_mmcard_type
+ #endif
+ ) {
if (sdcard_read_blocks(buf, blk_addr, blk_len) == 0) {
return 0;
}
@@ -314,10 +314,10 @@
return 0;
#if MICROPY_HW_ENABLE_SDCARD
} else if (lu == &pyb_sdcard_type
- #if MICROPY_HW_ENABLE_MMCARD
- || lu == &pyb_mmcard_type
- #endif
- ) {
+ #if MICROPY_HW_ENABLE_MMCARD
+ || lu == &pyb_mmcard_type
+ #endif
+ ) {
if (sdcard_write_blocks(buf, blk_addr, blk_len) == 0) {
return 0;
}
diff --git a/ports/stm32/usrsw.c b/ports/stm32/usrsw.c
index 4519f80..596efba 100644
--- a/ports/stm32/usrsw.c
+++ b/ports/stm32/usrsw.c
@@ -119,10 +119,10 @@
// may have been disabled by an exception in the interrupt, or the
// user disabling the line explicitly.
extint_register(MP_OBJ_FROM_PTR(MICROPY_HW_USRSW_PIN),
- MICROPY_HW_USRSW_EXTI_MODE,
- MICROPY_HW_USRSW_PULL,
- callback == mp_const_none ? mp_const_none : MP_OBJ_FROM_PTR(&switch_callback_obj),
- true);
+ MICROPY_HW_USRSW_EXTI_MODE,
+ MICROPY_HW_USRSW_PULL,
+ callback == mp_const_none ? mp_const_none : MP_OBJ_FROM_PTR(&switch_callback_obj),
+ true);
return mp_const_none;
}
STATIC MP_DEFINE_CONST_FUN_OBJ_2(pyb_switch_callback_obj, pyb_switch_callback);
@@ -140,7 +140,7 @@
.print = pyb_switch_print,
.make_new = pyb_switch_make_new,
.call = pyb_switch_call,
- .locals_dict = (mp_obj_dict_t*)&pyb_switch_locals_dict,
+ .locals_dict = (mp_obj_dict_t *)&pyb_switch_locals_dict,
};
#endif // MICROPY_HW_HAS_SWITCH
diff --git a/ports/stm32/wdt.c b/ports/stm32/wdt.c
index d2aa811..1452fd6 100644
--- a/ports/stm32/wdt.c
+++ b/ports/stm32/wdt.c
@@ -106,5 +106,5 @@
{ &mp_type_type },
.name = MP_QSTR_WDT,
.make_new = pyb_wdt_make_new,
- .locals_dict = (mp_obj_dict_t*)&pyb_wdt_locals_dict,
+ .locals_dict = (mp_obj_dict_t *)&pyb_wdt_locals_dict,
};
diff --git a/ports/teensy/hal_ftm.c b/ports/teensy/hal_ftm.c
index 3c031bf..47dc3e8 100644
--- a/ports/teensy/hal_ftm.c
+++ b/ports/teensy/hal_ftm.c
@@ -43,7 +43,7 @@
FTMx->MOD = hftm->Init.Period;
uint32_t sc = FTM_SC_PS(hftm->Init.PrescalerShift);
if (hftm->Init.CounterMode == FTM_COUNTERMODE_CENTER) {
- sc |= FTM_SC_CPWMS;
+ sc |= FTM_SC_CPWMS;
}
FTMx->SC = sc;
@@ -89,7 +89,7 @@
HAL_FTM_Base_Init(hftm);
}
-void HAL_FTM_OC_ConfigChannel(FTM_HandleTypeDef *hftm, FTM_OC_InitTypeDef* sConfig, uint32_t channel) {
+void HAL_FTM_OC_ConfigChannel(FTM_HandleTypeDef *hftm, FTM_OC_InitTypeDef *sConfig, uint32_t channel) {
FTM_TypeDef *FTMx = hftm->Instance;
assert_param(IS_FTM_INSTANCE(FTMx));
assert_param(IS_FTM_CHANNEL(channel));
@@ -100,11 +100,11 @@
hftm->State = HAL_FTM_STATE_BUSY;
FTMx->channel[channel].CSC = sConfig->OCMode;
- FTMx->channel[channel].CV = sConfig->Pulse;
+ FTMx->channel[channel].CV = sConfig->Pulse;
if (sConfig->OCPolarity & 1) {
- FTMx->POL |= (1 << channel);
+ FTMx->POL |= (1 << channel);
} else {
- FTMx->POL &= ~(1 << channel);
+ FTMx->POL &= ~(1 << channel);
}
hftm->State = HAL_FTM_STATE_READY;
@@ -129,7 +129,7 @@
HAL_FTM_Base_Init(hftm);
}
-void HAL_FTM_PWM_ConfigChannel(FTM_HandleTypeDef *hftm, FTM_OC_InitTypeDef* sConfig, uint32_t channel) {
+void HAL_FTM_PWM_ConfigChannel(FTM_HandleTypeDef *hftm, FTM_OC_InitTypeDef *sConfig, uint32_t channel) {
FTM_TypeDef *FTMx = hftm->Instance;
assert_param(IS_FTM_INSTANCE(FTMx));
assert_param(IS_FTM_CHANNEL(channel));
@@ -140,11 +140,11 @@
hftm->State = HAL_FTM_STATE_BUSY;
FTMx->channel[channel].CSC = sConfig->OCMode;
- FTMx->channel[channel].CV = sConfig->Pulse;
+ FTMx->channel[channel].CV = sConfig->Pulse;
if (sConfig->OCPolarity & 1) {
- FTMx->POL |= (1 << channel);
+ FTMx->POL |= (1 << channel);
} else {
- FTMx->POL &= ~(1 << channel);
+ FTMx->POL &= ~(1 << channel);
}
hftm->State = HAL_FTM_STATE_READY;
@@ -169,7 +169,7 @@
HAL_FTM_Base_Init(hftm);
}
-void HAL_FTM_IC_ConfigChannel(FTM_HandleTypeDef *hftm, FTM_IC_InitTypeDef* sConfig, uint32_t channel) {
+void HAL_FTM_IC_ConfigChannel(FTM_HandleTypeDef *hftm, FTM_IC_InitTypeDef *sConfig, uint32_t channel) {
FTM_TypeDef *FTMx = hftm->Instance;
assert_param(IS_FTM_INSTANCE(FTMx));
assert_param(IS_FTM_CHANNEL(channel));
diff --git a/ports/teensy/hal_ftm.h b/ports/teensy/hal_ftm.h
index 84fae83..2ddcd02 100644
--- a/ports/teensy/hal_ftm.h
+++ b/ports/teensy/hal_ftm.h
@@ -31,64 +31,64 @@
#define FTM2 ((FTM_TypeDef *)&FTM2_SC)
typedef struct {
- volatile uint32_t CSC; // Channel x Status And Control
- volatile uint32_t CV; // Channel x Value
+ volatile uint32_t CSC; // Channel x Status And Control
+ volatile uint32_t CV; // Channel x Value
} FTM_ChannelTypeDef;
typedef struct {
- volatile uint32_t SC; // Status And Control
- volatile uint32_t CNT; // Counter
- volatile uint32_t MOD; // Modulo
+ volatile uint32_t SC; // Status And Control
+ volatile uint32_t CNT; // Counter
+ volatile uint32_t MOD; // Modulo
FTM_ChannelTypeDef channel[8];
- volatile uint32_t CNTIN; // Counter Initial Value
- volatile uint32_t STATUS; // Capture And Compare Status
- volatile uint32_t MODE; // Features Mode Selection
- volatile uint32_t SYNC; // Synchronization
+ volatile uint32_t CNTIN; // Counter Initial Value
+ volatile uint32_t STATUS; // Capture And Compare Status
+ volatile uint32_t MODE; // Features Mode Selection
+ volatile uint32_t SYNC; // Synchronization
volatile uint32_t OUTINIT; // Initial State For Channels Output
- volatile uint32_t OUTMASK; // Output Mask
- volatile uint32_t COMBINE; // Function For Linked Channels
+ volatile uint32_t OUTMASK; // Output Mask
+ volatile uint32_t COMBINE; // Function For Linked Channels
volatile uint32_t DEADTIME; // Deadtime Insertion Control
- volatile uint32_t EXTTRIG; // FTM External Trigger
- volatile uint32_t POL; // Channels Polarity
- volatile uint32_t FMS; // Fault Mode Status
- volatile uint32_t FILTER; // Input Capture Filter Control
- volatile uint32_t FLTCTRL; // Fault Control
- volatile uint32_t QDCTRL; // Quadrature Decoder Control And Status
- volatile uint32_t CONF; // Configuration
- volatile uint32_t FLTPOL; // FTM Fault Input Polarity
- volatile uint32_t SYNCONF; // Synchronization Configuration
- volatile uint32_t INVCTRL; // FTM Inverting Control
- volatile uint32_t SWOCTRL; // FTM Software Output Control
+ volatile uint32_t EXTTRIG; // FTM External Trigger
+ volatile uint32_t POL; // Channels Polarity
+ volatile uint32_t FMS; // Fault Mode Status
+ volatile uint32_t FILTER; // Input Capture Filter Control
+ volatile uint32_t FLTCTRL; // Fault Control
+ volatile uint32_t QDCTRL; // Quadrature Decoder Control And Status
+ volatile uint32_t CONF; // Configuration
+ volatile uint32_t FLTPOL; // FTM Fault Input Polarity
+ volatile uint32_t SYNCONF; // Synchronization Configuration
+ volatile uint32_t INVCTRL; // FTM Inverting Control
+ volatile uint32_t SWOCTRL; // FTM Software Output Control
volatile uint32_t PWMLOAD; // FTM PWM Load
} FTM_TypeDef;
typedef struct {
- uint32_t PrescalerShift; // Sets the prescaler to 1 << PrescalerShift
- uint32_t CounterMode; // One of FTM_COUNTERMODE_xxx
- uint32_t Period; // Specifies the Period for determining timer overflow
+ uint32_t PrescalerShift; // Sets the prescaler to 1 << PrescalerShift
+ uint32_t CounterMode; // One of FTM_COUNTERMODE_xxx
+ uint32_t Period; // Specifies the Period for determining timer overflow
} FTM_Base_InitTypeDef;
typedef struct {
- uint32_t OCMode; // One of FTM_OCMODE_xxx
- uint32_t Pulse; // Specifies initial pulse width (0-0xffff)
- uint32_t OCPolarity; // One of FTM_OCPOLRITY_xxx
+ uint32_t OCMode; // One of FTM_OCMODE_xxx
+ uint32_t Pulse; // Specifies initial pulse width (0-0xffff)
+ uint32_t OCPolarity; // One of FTM_OCPOLRITY_xxx
} FTM_OC_InitTypeDef;
typedef struct {
- uint32_t ICPolarity; // Specifies Rising/Falling/Both
+ uint32_t ICPolarity; // Specifies Rising/Falling/Both
} FTM_IC_InitTypeDef;
-#define IS_FTM_INSTANCE(INSTANCE) (((INSTANCE) == FTM0) || \
- ((INSTANCE) == FTM1) || \
- ((INSTANCE) == FTM2))
+#define IS_FTM_INSTANCE(INSTANCE) (((INSTANCE) == FTM0) || \
+ ((INSTANCE) == FTM1) || \
+ ((INSTANCE) == FTM2))
-#define IS_FTM_PRESCALERSHIFT(PRESCALERSHIFT) (((PRESCALERSHIFT) & ~7) == 0)
+#define IS_FTM_PRESCALERSHIFT(PRESCALERSHIFT) (((PRESCALERSHIFT) &~7) == 0)
#define FTM_COUNTERMODE_UP (0)
#define FTM_COUNTERMODE_CENTER (FTM_SC_CPWMS)
-#define IS_FTM_COUNTERMODE(MODE) (((MODE) == FTM_COUNTERMODE_UP) ||\
- ((MODE) == FTM_COUNTERMODE_CENTER))
+#define IS_FTM_COUNTERMODE(MODE) (((MODE) == FTM_COUNTERMODE_UP) || \
+ ((MODE) == FTM_COUNTERMODE_CENTER))
#define IS_FTM_PERIOD(PERIOD) (((PERIOD) & 0xFFFF0000) == 0)
@@ -108,12 +108,12 @@
#define FTM_OCMODE_PWM2 (FTM_CSC_MSB | FTM_CSC_ELSA)
#define IS_FTM_OC_MODE(mode) ((mode) == FTM_OCMODE_TIMING || \
- (mode) == FTM_OCMODE_ACTIVE || \
- (mode) == FTM_OCMODE_INACTIVE || \
- (mode) == FTM_OCMODE_TOGGLE )
+ (mode) == FTM_OCMODE_ACTIVE || \
+ (mode) == FTM_OCMODE_INACTIVE || \
+ (mode) == FTM_OCMODE_TOGGLE )
#define IS_FTM_PWM_MODE(mode) ((mode) == FTM_OCMODE_PWM1 || \
- (mode) == FTM_OCMODE_PWM2)
+ (mode) == FTM_OCMODE_PWM2)
#define IS_FTM_CHANNEL(channel) (((channel) & ~7) == 0)
@@ -122,16 +122,16 @@
#define FTM_OCPOLARITY_HIGH (0)
#define FTM_OCPOLARITY_LOW (1)
-#define IS_FTM_OC_POLARITY(polarity) ((polarity) == FTM_OCPOLARITY_HIGH || \
- (polarity) == FTM_OCPOLARITY_LOW)
+#define IS_FTM_OC_POLARITY(polarity) ((polarity) == FTM_OCPOLARITY_HIGH || \
+ (polarity) == FTM_OCPOLARITY_LOW)
#define FTM_ICPOLARITY_RISING (FTM_CSC_ELSA)
#define FTM_ICPOLARITY_FALLING (FTM_CSC_ELSB)
#define FTM_ICPOLARITY_BOTH (FTM_CSC_ELSA | FTM_CSC_ELSB)
-#define IS_FTM_IC_POLARITY(polarity) ((polarity) == FTM_ICPOLARITY_RISING || \
- (polarity) == FTM_ICPOLARITY_FALLING || \
- (polarity) == FTM_ICPOLARITY_BOTH)
+#define IS_FTM_IC_POLARITY(polarity) ((polarity) == FTM_ICPOLARITY_RISING || \
+ (polarity) == FTM_ICPOLARITY_FALLING || \
+ (polarity) == FTM_ICPOLARITY_BOTH)
typedef enum {
HAL_FTM_STATE_RESET = 0x00,
@@ -140,9 +140,9 @@
} HAL_FTM_State;
typedef struct {
- FTM_TypeDef *Instance;
- FTM_Base_InitTypeDef Init;
- HAL_FTM_State State;
+ FTM_TypeDef *Instance;
+ FTM_Base_InitTypeDef Init;
+ HAL_FTM_State State;
} FTM_HandleTypeDef;
@@ -166,19 +166,19 @@
void HAL_FTM_Base_DeInit(FTM_HandleTypeDef *hftm);
void HAL_FTM_OC_Init(FTM_HandleTypeDef *hftm);
-void HAL_FTM_OC_ConfigChannel(FTM_HandleTypeDef *hftm, FTM_OC_InitTypeDef* sConfig, uint32_t channel);
+void HAL_FTM_OC_ConfigChannel(FTM_HandleTypeDef *hftm, FTM_OC_InitTypeDef *sConfig, uint32_t channel);
void HAL_FTM_OC_Start(FTM_HandleTypeDef *hftm, uint32_t channel);
void HAL_FTM_OC_Start_IT(FTM_HandleTypeDef *hftm, uint32_t channel);
void HAL_FTM_OC_DeInit(FTM_HandleTypeDef *hftm);
void HAL_FTM_PWM_Init(FTM_HandleTypeDef *hftm);
-void HAL_FTM_PWM_ConfigChannel(FTM_HandleTypeDef *hftm, FTM_OC_InitTypeDef* sConfig, uint32_t channel);
+void HAL_FTM_PWM_ConfigChannel(FTM_HandleTypeDef *hftm, FTM_OC_InitTypeDef *sConfig, uint32_t channel);
void HAL_FTM_PWM_Start(FTM_HandleTypeDef *hftm, uint32_t channel);
void HAL_FTM_PWM_Start_IT(FTM_HandleTypeDef *hftm, uint32_t channel);
void HAL_FTM_PWM_DeInit(FTM_HandleTypeDef *hftm);
void HAL_FTM_IC_Init(FTM_HandleTypeDef *hftm);
-void HAL_FTM_IC_ConfigChannel(FTM_HandleTypeDef *hftm, FTM_IC_InitTypeDef* sConfig, uint32_t channel);
+void HAL_FTM_IC_ConfigChannel(FTM_HandleTypeDef *hftm, FTM_IC_InitTypeDef *sConfig, uint32_t channel);
void HAL_FTM_IC_Start(FTM_HandleTypeDef *hftm, uint32_t channel);
void HAL_FTM_IC_Start_IT(FTM_HandleTypeDef *hftm, uint32_t channel);
void HAL_FTM_IC_DeInit(FTM_HandleTypeDef *hftm);
diff --git a/ports/teensy/hal_gpio.c b/ports/teensy/hal_gpio.c
index f9e1376..e8bc1eb 100644
--- a/ports/teensy/hal_gpio.c
+++ b/ports/teensy/hal_gpio.c
@@ -4,8 +4,7 @@
#define GPIO_NUMBER 32
-void HAL_GPIO_Init(GPIO_TypeDef *GPIOx, GPIO_InitTypeDef *GPIO_Init)
-{
+void HAL_GPIO_Init(GPIO_TypeDef *GPIOx, GPIO_InitTypeDef *GPIO_Init) {
/* Check the parameters */
assert_param(IS_GPIO_PIN(GPIO_Init->Pin));
assert_param(IS_GPIO_MODE(GPIO_Init->Mode));
@@ -24,11 +23,9 @@
if ((GPIO_Init->Mode == GPIO_MODE_AF_PP) || (GPIO_Init->Mode == GPIO_MODE_AF_OD)) {
/* Check the Alternate function parameter */
assert_param(IS_GPIO_AF(GPIO_Init->Alternate));
- }
- else if (GPIO_Init->Mode == GPIO_MODE_ANALOG) {
+ } else if (GPIO_Init->Mode == GPIO_MODE_ANALOG) {
GPIO_Init->Alternate = 0;
- }
- else {
+ } else {
GPIO_Init->Alternate = 1;
}
@@ -80,44 +77,39 @@
}
}
-#if 0
+ #if 0
/*--------------------- EXTI Mode Configuration ------------------------*/
/* Configure the External Interrupt or event for the current IO */
- if((GPIO_Init->Mode & EXTI_MODE) == EXTI_MODE)
- {
- /* Enable SYSCFG Clock */
- __SYSCFG_CLK_ENABLE();
+ if ((GPIO_Init->Mode & EXTI_MODE) == EXTI_MODE) {
+ /* Enable SYSCFG Clock */
+ __SYSCFG_CLK_ENABLE();
- temp = ((uint32_t)0x0F) << (4 * (position & 0x03));
- SYSCFG->EXTICR[position >> 2] &= ~temp;
- SYSCFG->EXTICR[position >> 2] |= ((uint32_t)(__HAL_GET_GPIO_SOURCE(GPIOx)) << (4 * (position & 0x03)));
+ temp = ((uint32_t)0x0F) << (4 * (position & 0x03));
+ SYSCFG->EXTICR[position >> 2] &= ~temp;
+ SYSCFG->EXTICR[position >> 2] |= ((uint32_t)(__HAL_GET_GPIO_SOURCE(GPIOx)) << (4 * (position & 0x03)));
- /* Clear EXTI line configuration */
- EXTI->IMR &= ~((uint32_t)iocurrent);
- EXTI->EMR &= ~((uint32_t)iocurrent);
+ /* Clear EXTI line configuration */
+ EXTI->IMR &= ~((uint32_t)iocurrent);
+ EXTI->EMR &= ~((uint32_t)iocurrent);
- if((GPIO_Init->Mode & GPIO_MODE_IT) == GPIO_MODE_IT)
- {
- EXTI->IMR |= iocurrent;
- }
- if((GPIO_Init->Mode & GPIO_MODE_EVT) == GPIO_MODE_EVT)
- {
- EXTI->EMR |= iocurrent;
- }
+ if ((GPIO_Init->Mode & GPIO_MODE_IT) == GPIO_MODE_IT) {
+ EXTI->IMR |= iocurrent;
+ }
+ if ((GPIO_Init->Mode & GPIO_MODE_EVT) == GPIO_MODE_EVT) {
+ EXTI->EMR |= iocurrent;
+ }
- /* Clear Rising Falling edge configuration */
- EXTI->RTSR &= ~((uint32_t)iocurrent);
- EXTI->FTSR &= ~((uint32_t)iocurrent);
+ /* Clear Rising Falling edge configuration */
+ EXTI->RTSR &= ~((uint32_t)iocurrent);
+ EXTI->FTSR &= ~((uint32_t)iocurrent);
- if((GPIO_Init->Mode & RISING_EDGE) == RISING_EDGE)
- {
- EXTI->RTSR |= iocurrent;
- }
- if((GPIO_Init->Mode & FALLING_EDGE) == FALLING_EDGE)
- {
- EXTI->FTSR |= iocurrent;
- }
+ if ((GPIO_Init->Mode & RISING_EDGE) == RISING_EDGE) {
+ EXTI->RTSR |= iocurrent;
+ }
+ if ((GPIO_Init->Mode & FALLING_EDGE) == FALLING_EDGE) {
+ EXTI->FTSR |= iocurrent;
+ }
}
-#endif
+ #endif
}
}
diff --git a/ports/teensy/help.c b/ports/teensy/help.c
index a2370c0..11625af 100644
--- a/ports/teensy/help.c
+++ b/ports/teensy/help.c
@@ -27,43 +27,43 @@
#include "py/builtin.h"
const char teensy_help_text[] =
-"Welcome to MicroPython!\n"
-"\n"
-"For online help please visit http://micropython.org/help/.\n"
-"\n"
-"Quick overview of commands for the board:\n"
-" pyb.info() -- print some general information\n"
-" pyb.gc() -- run the garbage collector\n"
-" pyb.delay(n) -- wait for n milliseconds\n"
-" pyb.Switch() -- create a switch object\n"
-" Switch methods: (), callback(f)\n"
-" pyb.LED(n) -- create an LED object for LED n (n=1,2,3,4)\n"
-" LED methods: on(), off(), toggle(), intensity(<n>)\n"
-" pyb.Pin(pin) -- get a pin, eg pyb.Pin('X1')\n"
-" pyb.Pin(pin, m, [p]) -- get a pin and configure it for IO mode m, pull mode p\n"
-" Pin methods: init(..), value([v]), high(), low()\n"
-" pyb.ExtInt(pin, m, p, callback) -- create an external interrupt object\n"
-" pyb.ADC(pin) -- make an analog object from a pin\n"
-" ADC methods: read(), read_timed(buf, freq)\n"
-" pyb.DAC(port) -- make a DAC object\n"
-" DAC methods: triangle(freq), write(n), write_timed(buf, freq)\n"
-" pyb.RTC() -- make an RTC object; methods: datetime([val])\n"
-" pyb.rng() -- get a 30-bit hardware random number\n"
-" pyb.Servo(n) -- create Servo object for servo n (n=1,2,3,4)\n"
-" Servo methods: calibration(..), angle([x, [t]]), speed([x, [t]])\n"
-" pyb.Accel() -- create an Accelerometer object\n"
-" Accelerometer methods: x(), y(), z(), tilt(), filtered_xyz()\n"
-"\n"
-"Pins are numbered X1-X12, X17-X22, Y1-Y12, or by their MCU name\n"
-"Pin IO modes are: pyb.Pin.IN, pyb.Pin.OUT_PP, pyb.Pin.OUT_OD\n"
-"Pin pull modes are: pyb.Pin.PULL_NONE, pyb.Pin.PULL_UP, pyb.Pin.PULL_DOWN\n"
-"Additional serial bus objects: pyb.I2C(n), pyb.SPI(n), pyb.UART(n)\n"
-"\n"
-"Control commands:\n"
-" CTRL-A -- on a blank line, enter raw REPL mode\n"
-" CTRL-B -- on a blank line, enter normal REPL mode\n"
-" CTRL-C -- interrupt a running program\n"
-" CTRL-D -- on a blank line, do a soft reset of the board\n"
-"\n"
-"For further help on a specific object, type help(obj)\n"
+ "Welcome to MicroPython!\n"
+ "\n"
+ "For online help please visit http://micropython.org/help/.\n"
+ "\n"
+ "Quick overview of commands for the board:\n"
+ " pyb.info() -- print some general information\n"
+ " pyb.gc() -- run the garbage collector\n"
+ " pyb.delay(n) -- wait for n milliseconds\n"
+ " pyb.Switch() -- create a switch object\n"
+ " Switch methods: (), callback(f)\n"
+ " pyb.LED(n) -- create an LED object for LED n (n=1,2,3,4)\n"
+ " LED methods: on(), off(), toggle(), intensity(<n>)\n"
+ " pyb.Pin(pin) -- get a pin, eg pyb.Pin('X1')\n"
+ " pyb.Pin(pin, m, [p]) -- get a pin and configure it for IO mode m, pull mode p\n"
+ " Pin methods: init(..), value([v]), high(), low()\n"
+ " pyb.ExtInt(pin, m, p, callback) -- create an external interrupt object\n"
+ " pyb.ADC(pin) -- make an analog object from a pin\n"
+ " ADC methods: read(), read_timed(buf, freq)\n"
+ " pyb.DAC(port) -- make a DAC object\n"
+ " DAC methods: triangle(freq), write(n), write_timed(buf, freq)\n"
+ " pyb.RTC() -- make an RTC object; methods: datetime([val])\n"
+ " pyb.rng() -- get a 30-bit hardware random number\n"
+ " pyb.Servo(n) -- create Servo object for servo n (n=1,2,3,4)\n"
+ " Servo methods: calibration(..), angle([x, [t]]), speed([x, [t]])\n"
+ " pyb.Accel() -- create an Accelerometer object\n"
+ " Accelerometer methods: x(), y(), z(), tilt(), filtered_xyz()\n"
+ "\n"
+ "Pins are numbered X1-X12, X17-X22, Y1-Y12, or by their MCU name\n"
+ "Pin IO modes are: pyb.Pin.IN, pyb.Pin.OUT_PP, pyb.Pin.OUT_OD\n"
+ "Pin pull modes are: pyb.Pin.PULL_NONE, pyb.Pin.PULL_UP, pyb.Pin.PULL_DOWN\n"
+ "Additional serial bus objects: pyb.I2C(n), pyb.SPI(n), pyb.UART(n)\n"
+ "\n"
+ "Control commands:\n"
+ " CTRL-A -- on a blank line, enter raw REPL mode\n"
+ " CTRL-B -- on a blank line, enter normal REPL mode\n"
+ " CTRL-C -- interrupt a running program\n"
+ " CTRL-D -- on a blank line, do a soft reset of the board\n"
+ "\n"
+ "For further help on a specific object, type help(obj)\n"
;
diff --git a/ports/teensy/led.c b/ports/teensy/led.c
index f1a7b32..7c2f3d2 100644
--- a/ports/teensy/led.c
+++ b/ports/teensy/led.c
@@ -16,15 +16,15 @@
STATIC const pyb_led_obj_t pyb_led_obj[] = {
{{&pyb_led_type}, 1, &MICROPY_HW_LED1},
-#if defined(MICROPY_HW_LED2)
+ #if defined(MICROPY_HW_LED2)
{{&pyb_led_type}, 2, &MICROPY_HW_LED2},
-#if defined(MICROPY_HW_LED3)
+ #if defined(MICROPY_HW_LED3)
{{&pyb_led_type}, 3, &MICROPY_HW_LED3},
-#if defined(MICROPY_HW_LED4)
+ #if defined(MICROPY_HW_LED4)
{{&pyb_led_type}, 4, &MICROPY_HW_LED4},
-#endif
-#endif
-#endif
+ #endif
+ #endif
+ #endif
};
#define NUM_LEDS MP_ARRAY_SIZE(pyb_led_obj)
diff --git a/ports/teensy/main.c b/ports/teensy/main.c
index 021ca54..142f710 100644
--- a/ports/teensy/main.c
+++ b/ports/teensy/main.c
@@ -93,7 +93,7 @@
static mp_obj_t pyb_info(void) {
// get and print unique id; 96 bits
{
- byte *id = (byte*)0x40048058;
+ byte *id = (byte *)0x40048058;
printf("ID=%02x%02x%02x%02x:%02x%02x%02x%02x:%02x%02x%02x%02x\n", id[0], id[1], id[2], id[3], id[4], id[5], id[6], id[7], id[8], id[9], id[10], id[11]);
}
@@ -121,7 +121,7 @@
printf(" 1=%u 2=%u m=%u\n", info.num_1block, info.num_2block, info.max_block);
}
-#if 0
+ #if 0
// free space on flash
{
DWORD nclst;
@@ -129,7 +129,7 @@
f_getfree("0:", &nclst, &fatfs);
printf("LFS free: %u bytes\n", (uint)(nclst * fatfs->csize * 512));
}
-#endif
+ #endif
return mp_const_none;
}
@@ -162,7 +162,7 @@
pinMode(pin, INPUT);
return MP_OBJ_NEW_SMALL_INT(digitalRead(pin));
}
-
+
// set pin
pinMode(pin, OUTPUT);
digitalWrite(pin, mp_obj_is_true(args[1]));
@@ -264,7 +264,7 @@
led_state(PYB_LED_BUILTIN, 1);
// GC init
- gc_init(&_heap_start, (void*)HEAP_END);
+ gc_init(&_heap_start, (void *)HEAP_END);
// MicroPython init
mp_init();
@@ -276,7 +276,7 @@
pin_init0();
-#if 0
+ #if 0
// add some functions to the python namespace
{
mp_store_name(MP_QSTR_help, mp_make_function_n(0, pyb_help));
@@ -297,23 +297,23 @@
mp_store_attr(m, MP_QSTR_Servo, mp_make_function_n(0, pyb_Servo));
mp_store_name(MP_QSTR_pyb, m);
}
-#endif
+ #endif
-#if MICROPY_MODULE_FROZEN
+ #if MICROPY_MODULE_FROZEN
pyexec_frozen_module("boot.py");
-#else
+ #else
if (!pyexec_file_if_exists("/boot.py")) {
flash_error(4);
}
-#endif
+ #endif
// Turn bootup LED off
led_state(PYB_LED_BUILTIN, 0);
// run main script
-#if MICROPY_MODULE_FROZEN
+ #if MICROPY_MODULE_FROZEN
pyexec_frozen_module("main.py");
-#else
+ #else
{
vstr_t *vstr = vstr_new(16);
vstr_add_str(vstr, "/");
@@ -327,7 +327,7 @@
}
vstr_free(vstr);
}
-#endif
+ #endif
// enter REPL
// REPL mode can change, or it can request a soft reset
@@ -358,24 +358,25 @@
// ultoa is used by usb_init_serialnumber. Normally ultoa would be provided
// by nonstd.c from the teensy core, but it conflicts with some of the
// MicroPython functions in string0.c, so we provide ultoa here.
-char * ultoa(unsigned long val, char *buf, int radix)
-{
- unsigned digit;
- int i=0, j;
- char t;
+char *ultoa(unsigned long val, char *buf, int radix) {
+ unsigned digit;
+ int i = 0, j;
+ char t;
- while (1) {
- digit = val % radix;
- buf[i] = ((digit < 10) ? '0' + digit : 'A' + digit - 10);
- val /= radix;
- if (val == 0) break;
- i++;
- }
- buf[i + 1] = 0;
- for (j=0; j < i; j++, i--) {
- t = buf[j];
- buf[j] = buf[i];
- buf[i] = t;
- }
- return buf;
+ while (1) {
+ digit = val % radix;
+ buf[i] = ((digit < 10) ? '0' + digit : 'A' + digit - 10);
+ val /= radix;
+ if (val == 0) {
+ break;
+ }
+ i++;
+ }
+ buf[i + 1] = 0;
+ for (j = 0; j < i; j++, i--) {
+ t = buf[j];
+ buf[j] = buf[i];
+ buf[i] = t;
+ }
+ return buf;
}
diff --git a/ports/teensy/make-pins.py b/ports/teensy/make-pins.py
index 0f6c5f2..ddefae8 100755
--- a/ports/teensy/make-pins.py
+++ b/ports/teensy/make-pins.py
@@ -8,33 +8,34 @@
import csv
SUPPORTED_FN = {
- 'FTM' : ['CH0', 'CH1', 'CH2', 'CH3', 'CH4', 'CH5', 'CH6', 'CH7',
- 'QD_PHA', 'QD_PHB'],
- 'I2C' : ['SDA', 'SCL'],
- 'UART' : ['RX', 'TX', 'CTS', 'RTS'],
- 'SPI' : ['NSS', 'SCK', 'MISO', 'MOSI']
+ "FTM": ["CH0", "CH1", "CH2", "CH3", "CH4", "CH5", "CH6", "CH7", "QD_PHA", "QD_PHB"],
+ "I2C": ["SDA", "SCL"],
+ "UART": ["RX", "TX", "CTS", "RTS"],
+ "SPI": ["NSS", "SCK", "MISO", "MOSI"],
}
+
def parse_port_pin(name_str):
"""Parses a string and returns a (port-num, pin-num) tuple."""
if len(name_str) < 4:
raise ValueError("Expecting pin name to be at least 4 charcters.")
- if name_str[0:2] != 'PT':
+ if name_str[0:2] != "PT":
raise ValueError("Expecting pin name to start with PT")
- if name_str[2] not in ('A', 'B', 'C', 'D', 'E', 'Z'):
+ if name_str[2] not in ("A", "B", "C", "D", "E", "Z"):
raise ValueError("Expecting pin port to be between A and E or Z")
- port = ord(name_str[2]) - ord('A')
- pin_str = name_str[3:].split('/')[0]
+ port = ord(name_str[2]) - ord("A")
+ pin_str = name_str[3:].split("/")[0]
if not pin_str.isdigit():
raise ValueError("Expecting numeric pin number.")
return (port, int(pin_str))
+
def split_name_num(name_num):
num = None
for num_idx in range(len(name_num) - 1, -1, -1):
if not name_num[num_idx].isdigit():
- name = name_num[0:num_idx + 1]
- num_str = name_num[num_idx + 1:]
+ name = name_num[0 : num_idx + 1]
+ num_str = name_num[num_idx + 1 :]
if len(num_str) > 0:
num = int(num_str)
break
@@ -48,12 +49,12 @@
self.idx = idx
self.af_str = af_str
- self.func = ''
+ self.func = ""
self.fn_num = None
- self.pin_type = ''
+ self.pin_type = ""
self.supported = False
- af_words = af_str.split('_', 1)
+ af_words = af_str.split("_", 1)
self.func, self.fn_num = split_name_num(af_words[0])
if len(af_words) > 1:
self.pin_type = af_words[1]
@@ -69,22 +70,25 @@
"""Returns the numbered function (i.e. USART6) for this AF."""
if self.fn_num is None:
return self.func
- return '{:s}{:d}'.format(self.func, self.fn_num)
+ return "{:s}{:d}".format(self.func, self.fn_num)
def mux_name(self):
- return 'AF{:d}_{:s}'.format(self.idx, self.ptr())
+ return "AF{:d}_{:s}".format(self.idx, self.ptr())
def print(self):
"""Prints the C representation of this AF."""
if self.supported:
- print(' AF', end='')
+ print(" AF", end="")
else:
- print(' //', end='')
+ print(" //", end="")
fn_num = self.fn_num
if fn_num is None:
fn_num = 0
- print('({:2d}, {:8s}, {:2d}, {:10s}, {:8s}), // {:s}'.format(self.idx,
- self.func, fn_num, self.pin_type, self.ptr(), self.af_str))
+ print(
+ "({:2d}, {:8s}, {:2d}, {:10s}, {:8s}), // {:s}".format(
+ self.idx, self.func, fn_num, self.pin_type, self.ptr(), self.af_str
+ )
+ )
def qstr_list(self):
return [self.mux_name()]
@@ -103,10 +107,10 @@
self.board_pin = False
def port_letter(self):
- return chr(self.port + ord('A'))
+ return chr(self.port + ord("A"))
def cpu_pin_name(self):
- return '{:s}{:d}'.format(self.port_letter(), self.pin)
+ return "{:s}{:d}".format(self.port_letter(), self.pin)
def is_board_pin(self):
return self.board_pin
@@ -115,12 +119,12 @@
self.board_pin = True
def parse_adc(self, adc_str):
- if (adc_str[:3] != 'ADC'):
+ if adc_str[:3] != "ADC":
return
- (adc,channel) = adc_str.split('_')
+ (adc, channel) = adc_str.split("_")
for idx in range(3, len(adc)):
- adc_num = int(adc[idx]) # 1, 2, or 3
- self.adc_num |= (1 << (adc_num - 1))
+ adc_num = int(adc[idx]) # 1, 2, or 3
+ self.adc_num |= 1 << (adc_num - 1)
self.adc_channel = int(channel[2:])
def parse_af(self, af_idx, af_strs_in):
@@ -128,7 +132,7 @@
return
# If there is a slash, then the slash separates 2 aliases for the
# same alternate function.
- af_strs = af_strs_in.split('/')
+ af_strs = af_strs_in.split("/")
for af_str in af_strs:
alt_fn = AlternateFunction(af_idx, af_str)
self.alt_fn.append(alt_fn)
@@ -137,43 +141,50 @@
def alt_fn_name(self, null_if_0=False):
if null_if_0 and self.alt_fn_count == 0:
- return 'NULL'
- return 'pin_{:s}_af'.format(self.cpu_pin_name())
+ return "NULL"
+ return "pin_{:s}_af".format(self.cpu_pin_name())
def adc_num_str(self):
- str = ''
- for adc_num in range(1,4):
+ str = ""
+ for adc_num in range(1, 4):
if self.adc_num & (1 << (adc_num - 1)):
if len(str) > 0:
- str += ' | '
- str += 'PIN_ADC'
- str += chr(ord('0') + adc_num)
+ str += " | "
+ str += "PIN_ADC"
+ str += chr(ord("0") + adc_num)
if len(str) == 0:
- str = '0'
+ str = "0"
return str
def print(self):
if self.alt_fn_count == 0:
- print("// ", end='')
- print('const pin_af_obj_t {:s}[] = {{'.format(self.alt_fn_name()))
+ print("// ", end="")
+ print("const pin_af_obj_t {:s}[] = {{".format(self.alt_fn_name()))
for alt_fn in self.alt_fn:
alt_fn.print()
if self.alt_fn_count == 0:
- print("// ", end='')
- print('};')
- print('')
- print('const pin_obj_t pin_{:s} = PIN({:s}, {:d}, {:d}, {:s}, {:s}, {:d});'.format(
- self.cpu_pin_name(), self.port_letter(), self.pin,
- self.alt_fn_count, self.alt_fn_name(null_if_0=True),
- self.adc_num_str(), self.adc_channel))
- print('')
+ print("// ", end="")
+ print("};")
+ print("")
+ print(
+ "const pin_obj_t pin_{:s} = PIN({:s}, {:d}, {:d}, {:s}, {:s}, {:d});".format(
+ self.cpu_pin_name(),
+ self.port_letter(),
+ self.pin,
+ self.alt_fn_count,
+ self.alt_fn_name(null_if_0=True),
+ self.adc_num_str(),
+ self.adc_channel,
+ )
+ )
+ print("")
def print_header(self, hdr_file):
- hdr_file.write('extern const pin_obj_t pin_{:s};\n'.
- format(self.cpu_pin_name()))
+ hdr_file.write("extern const pin_obj_t pin_{:s};\n".format(self.cpu_pin_name()))
if self.alt_fn_count > 0:
- hdr_file.write('extern const pin_af_obj_t pin_{:s}_af[];\n'.
- format(self.cpu_pin_name()))
+ hdr_file.write(
+ "extern const pin_af_obj_t pin_{:s}_af[];\n".format(self.cpu_pin_name())
+ )
def qstr_list(self):
result = []
@@ -184,7 +195,6 @@
class NamedPin(object):
-
def __init__(self, name, pin):
self._name = name
self._pin = pin
@@ -197,10 +207,9 @@
class Pins(object):
-
def __init__(self):
- self.cpu_pins = [] # list of NamedPin objects
- self.board_pins = [] # list of NamedPin objects
+ self.cpu_pins = [] # list of NamedPin objects
+ self.board_pins = [] # list of NamedPin objects
def find_pin(self, port_num, pin_num):
for named_pin in self.cpu_pins:
@@ -209,7 +218,7 @@
return pin
def parse_af_file(self, filename, pinname_col, af_col):
- with open(filename, 'r') as csvfile:
+ with open(filename, "r") as csvfile:
rows = csv.reader(csvfile)
for row in rows:
try:
@@ -223,7 +232,7 @@
self.cpu_pins.append(NamedPin(pin.cpu_pin_name(), pin))
def parse_board_file(self, filename):
- with open(filename, 'r') as csvfile:
+ with open(filename, "r") as csvfile:
rows = csv.reader(csvfile)
for row in rows:
try:
@@ -236,52 +245,64 @@
self.board_pins.append(NamedPin(row[0], pin))
def print_named(self, label, named_pins):
- print('STATIC const mp_rom_map_elem_t pin_{:s}_pins_locals_dict_table[] = {{'.format(label))
+ print(
+ "STATIC const mp_rom_map_elem_t pin_{:s}_pins_locals_dict_table[] = {{".format(label)
+ )
for named_pin in named_pins:
pin = named_pin.pin()
if pin.is_board_pin():
- print(' {{ MP_ROM_QSTR(MP_QSTR_{:s}), MP_ROM_PTR(&pin_{:s}) }},'.format(named_pin.name(), pin.cpu_pin_name()))
- print('};')
- print('MP_DEFINE_CONST_DICT(pin_{:s}_pins_locals_dict, pin_{:s}_pins_locals_dict_table);'.format(label, label));
+ print(
+ " {{ MP_ROM_QSTR(MP_QSTR_{:s}), MP_ROM_PTR(&pin_{:s}) }},".format(
+ named_pin.name(), pin.cpu_pin_name()
+ )
+ )
+ print("};")
+ print(
+ "MP_DEFINE_CONST_DICT(pin_{:s}_pins_locals_dict, pin_{:s}_pins_locals_dict_table);".format(
+ label, label
+ )
+ )
def print(self):
for named_pin in self.cpu_pins:
pin = named_pin.pin()
if pin.is_board_pin():
pin.print()
- self.print_named('cpu', self.cpu_pins)
- print('')
- self.print_named('board', self.board_pins)
+ self.print_named("cpu", self.cpu_pins)
+ print("")
+ self.print_named("board", self.board_pins)
def print_adc(self, adc_num):
- print('');
- print('const pin_obj_t * const pin_adc{:d}[] = {{'.format(adc_num))
+ print("")
+ print("const pin_obj_t * const pin_adc{:d}[] = {{".format(adc_num))
for channel in range(16):
adc_found = False
for named_pin in self.cpu_pins:
pin = named_pin.pin()
- if (pin.is_board_pin() and
- (pin.adc_num & (1 << (adc_num - 1))) and (pin.adc_channel == channel)):
- print(' &pin_{:s}, // {:d}'.format(pin.cpu_pin_name(), channel))
+ if (
+ pin.is_board_pin()
+ and (pin.adc_num & (1 << (adc_num - 1)))
+ and (pin.adc_channel == channel)
+ ):
+ print(" &pin_{:s}, // {:d}".format(pin.cpu_pin_name(), channel))
adc_found = True
break
if not adc_found:
- print(' NULL, // {:d}'.format(channel))
- print('};')
-
+ print(" NULL, // {:d}".format(channel))
+ print("};")
def print_header(self, hdr_filename):
- with open(hdr_filename, 'wt') as hdr_file:
+ with open(hdr_filename, "wt") as hdr_file:
for named_pin in self.cpu_pins:
pin = named_pin.pin()
if pin.is_board_pin():
pin.print_header(hdr_file)
- hdr_file.write('extern const pin_obj_t * const pin_adc1[];\n')
- hdr_file.write('extern const pin_obj_t * const pin_adc2[];\n')
- hdr_file.write('extern const pin_obj_t * const pin_adc3[];\n')
+ hdr_file.write("extern const pin_obj_t * const pin_adc1[];\n")
+ hdr_file.write("extern const pin_obj_t * const pin_adc2[];\n")
+ hdr_file.write("extern const pin_obj_t * const pin_adc3[];\n")
def print_qstr(self, qstr_filename):
- with open(qstr_filename, 'wt') as qstr_file:
+ with open(qstr_filename, "wt") as qstr_file:
qstr_set = set([])
for named_pin in self.cpu_pins:
pin = named_pin.pin()
@@ -291,11 +312,10 @@
for named_pin in self.board_pins:
qstr_set |= set([named_pin.name()])
for qstr in sorted(qstr_set):
- print('Q({})'.format(qstr), file=qstr_file)
-
+ print("Q({})".format(qstr), file=qstr_file)
def print_af_hdr(self, af_const_filename):
- with open(af_const_filename, 'wt') as af_const_file:
+ with open(af_const_filename, "wt") as af_const_file:
af_hdr_set = set([])
mux_name_width = 0
for named_pin in self.cpu_pins:
@@ -308,88 +328,89 @@
if len(mux_name) > mux_name_width:
mux_name_width = len(mux_name)
for mux_name in sorted(af_hdr_set):
- key = 'MP_OBJ_NEW_QSTR(MP_QSTR_{}),'.format(mux_name)
- val = 'MP_OBJ_NEW_SMALL_INT(GPIO_{})'.format(mux_name)
- print(' { %-*s %s },' % (mux_name_width + 26, key, val),
- file=af_const_file)
+ key = "MP_OBJ_NEW_QSTR(MP_QSTR_{}),".format(mux_name)
+ val = "MP_OBJ_NEW_SMALL_INT(GPIO_{})".format(mux_name)
+ print(" { %-*s %s }," % (mux_name_width + 26, key, val), file=af_const_file)
def print_af_py(self, af_py_filename):
- with open(af_py_filename, 'wt') as af_py_file:
- print('PINS_AF = (', file=af_py_file);
+ with open(af_py_filename, "wt") as af_py_file:
+ print("PINS_AF = (", file=af_py_file)
for named_pin in self.board_pins:
- print(" ('%s', " % named_pin.name(), end='', file=af_py_file)
+ print(" ('%s', " % named_pin.name(), end="", file=af_py_file)
for af in named_pin.pin().alt_fn:
if af.is_supported():
- print("(%d, '%s'), " % (af.idx, af.af_str), end='', file=af_py_file)
- print('),', file=af_py_file)
- print(')', file=af_py_file)
+ print("(%d, '%s'), " % (af.idx, af.af_str), end="", file=af_py_file)
+ print("),", file=af_py_file)
+ print(")", file=af_py_file)
def main():
parser = argparse.ArgumentParser(
prog="make-pins.py",
usage="%(prog)s [options] [command]",
- description="Generate board specific pin file"
+ description="Generate board specific pin file",
)
parser.add_argument(
- "-a", "--af",
+ "-a",
+ "--af",
dest="af_filename",
help="Specifies the alternate function file for the chip",
- default="mk20dx256_af.csv"
+ default="mk20dx256_af.csv",
)
parser.add_argument(
"--af-const",
dest="af_const_filename",
help="Specifies header file for alternate function constants.",
- default="build/pins_af_const.h"
+ default="build/pins_af_const.h",
)
parser.add_argument(
"--af-py",
dest="af_py_filename",
help="Specifies the filename for the python alternate function mappings.",
- default="build/pins_af.py"
+ default="build/pins_af.py",
)
parser.add_argument(
- "-b", "--board",
- dest="board_filename",
- help="Specifies the board file",
+ "-b", "--board", dest="board_filename", help="Specifies the board file",
)
parser.add_argument(
- "-p", "--prefix",
+ "-p",
+ "--prefix",
dest="prefix_filename",
help="Specifies beginning portion of generated pins file",
- default="mk20dx256_prefix.c"
+ default="mk20dx256_prefix.c",
)
parser.add_argument(
- "-q", "--qstr",
+ "-q",
+ "--qstr",
dest="qstr_filename",
help="Specifies name of generated qstr header file",
- default="build/pins_qstr.h"
+ default="build/pins_qstr.h",
)
parser.add_argument(
- "-r", "--hdr",
+ "-r",
+ "--hdr",
dest="hdr_filename",
help="Specifies name of generated pin header file",
- default="build/pins.h"
+ default="build/pins.h",
)
args = parser.parse_args(sys.argv[1:])
pins = Pins()
- print('// This file was automatically generated by make-pins.py')
- print('//')
+ print("// This file was automatically generated by make-pins.py")
+ print("//")
if args.af_filename:
- print('// --af {:s}'.format(args.af_filename))
+ print("// --af {:s}".format(args.af_filename))
pins.parse_af_file(args.af_filename, 4, 3)
if args.board_filename:
- print('// --board {:s}'.format(args.board_filename))
+ print("// --board {:s}".format(args.board_filename))
pins.parse_board_file(args.board_filename)
if args.prefix_filename:
- print('// --prefix {:s}'.format(args.prefix_filename))
- print('')
- with open(args.prefix_filename, 'r') as prefix_file:
+ print("// --prefix {:s}".format(args.prefix_filename))
+ print("")
+ with open(args.prefix_filename, "r") as prefix_file:
print(prefix_file.read())
pins.print()
pins.print_adc(1)
diff --git a/ports/teensy/memzip_files/boot.py b/ports/teensy/memzip_files/boot.py
index 6dd5516..e227989 100644
--- a/ports/teensy/memzip_files/boot.py
+++ b/ports/teensy/memzip_files/boot.py
@@ -1,12 +1,15 @@
import pyb
+
print("Executing boot.py")
+
def pins():
for pin_name in dir(pyb.Pin.board):
pin = pyb.Pin(pin_name)
- print('{:10s} {:s}'.format(pin_name, str(pin)))
+ print("{:10s} {:s}".format(pin_name, str(pin)))
+
def af():
for pin_name in dir(pyb.Pin.board):
pin = pyb.Pin(pin_name)
- print('{:10s} {:s}'.format(pin_name, str(pin.af_list())))
+ print("{:10s} {:s}".format(pin_name, str(pin.af_list())))
diff --git a/ports/teensy/memzip_files/main.py b/ports/teensy/memzip_files/main.py
index b652377..a3b3904 100644
--- a/ports/teensy/memzip_files/main.py
+++ b/ports/teensy/memzip_files/main.py
@@ -11,5 +11,3 @@
led.on()
pyb.delay(100)
led.off()
-
-
diff --git a/ports/teensy/mk20dx256_prefix.c b/ports/teensy/mk20dx256_prefix.c
index 58ab07d..4790bb8 100644
--- a/ports/teensy/mk20dx256_prefix.c
+++ b/ports/teensy/mk20dx256_prefix.c
@@ -8,26 +8,26 @@
#include "pin.h"
#define AF(af_idx, af_fn, af_unit, af_type, af_ptr) \
-{ \
- { &pin_af_type }, \
- .name = MP_QSTR_AF ## af_idx ## _ ## af_fn ## af_unit, \
- .idx = (af_idx), \
- .fn = AF_FN_ ## af_fn, \
- .unit = (af_unit), \
- .type = AF_PIN_TYPE_ ## af_fn ## _ ## af_type, \
- .reg = (af_ptr) \
-}
+ { \
+ { &pin_af_type }, \
+ .name = MP_QSTR_AF##af_idx##_##af_fn##af_unit, \
+ .idx = (af_idx), \
+ .fn = AF_FN_##af_fn, \
+ .unit = (af_unit), \
+ .type = AF_PIN_TYPE_##af_fn##_##af_type, \
+ .reg = (af_ptr) \
+ }
#define PIN(p_port, p_pin, p_num_af, p_af, p_adc_num, p_adc_channel) \
-{ \
- { &pin_type }, \
- .name = MP_QSTR_ ## p_port ## p_pin, \
- .port = PORT_ ## p_port, \
- .pin = (p_pin), \
- .num_af = (p_num_af), \
- .pin_mask = (1 << (p_pin)), \
- .gpio = GPIO ## p_port, \
- .af = p_af, \
- .adc_num = p_adc_num, \
- .adc_channel = p_adc_channel, \
-}
+ { \
+ { &pin_type }, \
+ .name = MP_QSTR_##p_port##p_pin, \
+ .port = PORT_##p_port, \
+ .pin = (p_pin), \
+ .num_af = (p_num_af), \
+ .pin_mask = (1 << (p_pin)), \
+ .gpio = GPIO##p_port, \
+ .af = p_af, \
+ .adc_num = p_adc_num, \
+ .adc_channel = p_adc_channel, \
+ }
diff --git a/ports/teensy/modpyb.c b/ports/teensy/modpyb.c
index 6d637a7..d1970d7 100644
--- a/ports/teensy/modpyb.c
+++ b/ports/teensy/modpyb.c
@@ -74,7 +74,7 @@
STATIC mp_obj_t pyb_info(uint n_args, const mp_obj_t *args) {
// get and print unique id; 96 bits
{
- byte *id = (byte*)0x40048058;
+ byte *id = (byte *)0x40048058;
printf("ID=%02x%02x%02x%02x:%02x%02x%02x%02x:%02x%02x%02x%02x\n", id[0], id[1], id[2], id[3], id[4], id[5], id[6], id[7], id[8], id[9], id[10], id[11]);
}
@@ -125,7 +125,7 @@
/// \function unique_id()
/// Returns a string of 12 bytes (96 bits), which is the unique ID for the MCU.
STATIC mp_obj_t pyb_unique_id(void) {
- byte *id = (byte*)0x40048058;
+ byte *id = (byte *)0x40048058;
return mp_obj_new_bytes(id, 12);
}
STATIC MP_DEFINE_CONST_FUN_OBJ_0(pyb_unique_id_obj, pyb_unique_id);
@@ -135,9 +135,9 @@
// TODO should also be able to set frequency via this function
STATIC mp_obj_t pyb_freq(void) {
mp_obj_t tuple[3] = {
- mp_obj_new_int(F_CPU),
- mp_obj_new_int(F_BUS),
- mp_obj_new_int(F_MEM),
+ mp_obj_new_int(F_CPU),
+ mp_obj_new_int(F_BUS),
+ mp_obj_new_int(F_MEM),
};
return mp_obj_new_tuple(3, tuple);
}
@@ -256,9 +256,9 @@
/// Takes a 4-tuple (or list) and sends it to the USB host (the PC) to
/// signal a HID mouse-motion event.
STATIC mp_obj_t pyb_hid_send_report(mp_obj_t arg) {
-#if 1
+ #if 1
printf("hid_send_report not currently implemented\n");
-#else
+ #else
mp_obj_t *items;
mp_obj_get_array_fixed_n(arg, 4, &items);
uint8_t data[4];
@@ -267,7 +267,7 @@
data[2] = mp_obj_get_int(items[2]);
data[3] = mp_obj_get_int(items[3]);
usb_hid_send_report(data);
-#endif
+ #endif
return mp_const_none;
}
STATIC MP_DEFINE_CONST_FUN_OBJ_1(pyb_hid_send_report_obj, pyb_hid_send_report);
@@ -321,15 +321,15 @@
{ MP_ROM_QSTR(MP_QSTR_Pin), MP_ROM_PTR(&pin_type) },
// { MP_ROM_QSTR(MP_QSTR_ExtInt), MP_ROM_PTR(&extint_type) },
-#if MICROPY_HW_ENABLE_SERVO
+ #if MICROPY_HW_ENABLE_SERVO
{ MP_ROM_QSTR(MP_QSTR_pwm), MP_ROM_PTR(&pyb_pwm_set_obj) },
{ MP_ROM_QSTR(MP_QSTR_servo), MP_ROM_PTR(&pyb_servo_set_obj) },
{ MP_ROM_QSTR(MP_QSTR_Servo), MP_ROM_PTR(&pyb_servo_type) },
-#endif
+ #endif
-#if MICROPY_HW_HAS_SWITCH
+ #if MICROPY_HW_HAS_SWITCH
{ MP_ROM_QSTR(MP_QSTR_Switch), MP_ROM_PTR(&pyb_switch_type) },
-#endif
+ #endif
//#if MICROPY_HW_HAS_SDCARD
// { MP_ROM_QSTR(MP_QSTR_SD), MP_ROM_PTR(&pyb_sdcard_obj) },
@@ -356,5 +356,5 @@
const mp_obj_module_t pyb_module = {
.base = { &mp_type_module },
- .globals = (mp_obj_dict_t*)&pyb_module_globals,
+ .globals = (mp_obj_dict_t *)&pyb_module_globals,
};
diff --git a/ports/teensy/mpconfigport.h b/ports/teensy/mpconfigport.h
index a75bd68..661941f 100644
--- a/ports/teensy/mpconfigport.h
+++ b/ports/teensy/mpconfigport.h
@@ -73,13 +73,13 @@
// to know the machine-specific values, see irq.h.
#ifndef __disable_irq
-#define __disable_irq() __asm__ volatile("CPSID i");
+#define __disable_irq() __asm__ volatile ("CPSID i");
#endif
__attribute__(( always_inline )) static inline uint32_t __get_PRIMASK(void) {
uint32_t result;
__asm volatile ("MRS %0, primask" : "=r" (result));
- return(result);
+ return result;
}
__attribute__(( always_inline )) static inline void __set_PRIMASK(uint32_t priMask) {
diff --git a/ports/teensy/pin_defs_teensy.c b/ports/teensy/pin_defs_teensy.c
index e7af1e9..9041a37 100644
--- a/ports/teensy/pin_defs_teensy.c
+++ b/ports/teensy/pin_defs_teensy.c
@@ -43,7 +43,7 @@
// Analog only pin
return GPIO_NOPULL;
}
- volatile uint32_t *port_pcr = GPIO_PIN_TO_PORT_PCR(pin->gpio, pin->pin);
+ volatile uint32_t *port_pcr = GPIO_PIN_TO_PORT_PCR(pin->gpio, pin->pin);
uint32_t pcr = *port_pcr;
uint32_t af = (pcr & PORT_PCR_MUX_MASK) >> 8;
diff --git a/ports/teensy/pin_defs_teensy.h b/ports/teensy/pin_defs_teensy.h
index d3a700b..fa24848 100644
--- a/ports/teensy/pin_defs_teensy.h
+++ b/ports/teensy/pin_defs_teensy.h
@@ -1,10 +1,10 @@
enum {
- PORT_A,
- PORT_B,
- PORT_C,
- PORT_D,
- PORT_E,
- PORT_Z,
+ PORT_A,
+ PORT_B,
+ PORT_C,
+ PORT_D,
+ PORT_E,
+ PORT_Z,
};
enum {
diff --git a/ports/teensy/reg.c b/ports/teensy/reg.c
index 4f1fd52..97a9e60 100644
--- a/ports/teensy/reg.c
+++ b/ports/teensy/reg.c
@@ -11,7 +11,7 @@
for (mp_uint_t reg_idx = 0; reg_idx < num_regs; reg_idx++, reg++) {
printf(" %-8s @0x%08x = 0x%08lx\n",
- reg->name, (mp_uint_t)base + reg->offset, *(uint32_t *)((uint8_t *)base + reg->offset));
+ reg->name, (mp_uint_t)base + reg->offset, *(uint32_t *)((uint8_t *)base + reg->offset));
}
return mp_const_none;
}
diff --git a/ports/teensy/reg.h b/ports/teensy/reg.h
index 0da6378..8202b53 100644
--- a/ports/teensy/reg.h
+++ b/ports/teensy/reg.h
@@ -3,7 +3,7 @@
typedef struct {
const char *name;
- mp_uint_t offset;
+ mp_uint_t offset;
} reg_t;
#define REG_ENTRY(st, name) { #name, offsetof(st, name) }
diff --git a/ports/teensy/servo.c b/ports/teensy/servo.c
index 09155f9..33fb0c0 100644
--- a/ports/teensy/servo.c
+++ b/ports/teensy/servo.c
@@ -17,7 +17,7 @@
#define REFRESH_INTERVAL 20000 // minumim time to refresh servos in microseconds
#define PDB_CONFIG (PDB_SC_TRGSEL(15) | PDB_SC_PDBEN | PDB_SC_PDBIE \
- | PDB_SC_CONT | PDB_SC_PRESCALER(2) | PDB_SC_MULT(0))
+ | PDB_SC_CONT | PDB_SC_PRESCALER(2) | PDB_SC_MULT(0))
#define PDB_PRESCALE 4
#define usToTicks(us) ((us) * (F_BUS / 1000) / PDB_PRESCALE / 1000)
#define ticksToUs(ticks) ((ticks) * PDB_PRESCALE * 1000 / (F_BUS / 1000))
@@ -36,14 +36,12 @@
#define clamp(v, min_val, max_val) ((v) < (min_val) ? (min_val) : (v) > (max_val) ? (max_val) : (v))
-static float map_uint_to_float(uint x, uint in_min, uint in_max, float out_min, float out_max)
-{
- return (float)(x - in_min) * (out_max - out_min) / (float)(in_max - in_min) + (float)out_min;
+static float map_uint_to_float(uint x, uint in_min, uint in_max, float out_min, float out_max) {
+ return (float)(x - in_min) * (out_max - out_min) / (float)(in_max - in_min) + (float)out_min;
}
-static uint map_float_to_uint(float x, float in_min, float in_max, uint out_min, uint out_max)
-{
- return (int)((x - in_min) * (float)(out_max - out_min) / (in_max - in_min) + (float)out_min);
+static uint map_float_to_uint(float x, float in_min, float in_max, uint out_min, uint out_max) {
+ return (int)((x - in_min) * (float)(out_max - out_min) / (in_max - in_min) + (float)out_min);
}
static mp_obj_t servo_obj_attach(mp_obj_t self_in, mp_obj_t pin_obj) {
@@ -110,9 +108,9 @@
if (n_args == 1) {
// get
float angle = map_uint_to_float(servo_ticks[self->servo_id],
- usToTicks(self->min_usecs),
- usToTicks(self->max_usecs),
- 0.0, 180.0);
+ usToTicks(self->min_usecs),
+ usToTicks(self->max_usecs),
+ 0.0, 180.0);
return mp_obj_new_float(angle);
}
// Set
@@ -124,9 +122,9 @@
angle = 180.0F;
}
servo_ticks[self->servo_id] = map_float_to_uint(angle,
- 0.0F, 180.0F,
- usToTicks(self->min_usecs),
- usToTicks(self->max_usecs));
+ 0.0F, 180.0F,
+ usToTicks(self->min_usecs),
+ usToTicks(self->max_usecs));
return mp_const_none;
}
@@ -207,7 +205,7 @@
/* Find an unallocated servo id */
self->servo_id = 0;
- for (mask=1; mask < (1<<MAX_SERVOS); mask <<= 1) {
+ for (mask = 1; mask < (1 << MAX_SERVOS); mask <<= 1) {
if (!(servo_allocated_mask & mask)) {
servo_allocated_mask |= mask;
servo_active_mask &= ~mask;
@@ -221,45 +219,47 @@
return mp_const_none;
}
-void pdb_isr(void)
-{
- static int8_t channel = 0, channel_high = MAX_SERVOS;
- static uint32_t tick_accum = 0;
- uint32_t ticks;
- int32_t wait_ticks;
+void pdb_isr(void) {
+ static int8_t channel = 0, channel_high = MAX_SERVOS;
+ static uint32_t tick_accum = 0;
+ uint32_t ticks;
+ int32_t wait_ticks;
- // first, if any channel was left high from the previous
- // run, now is the time to shut it off
- if (servo_active_mask & (1 << channel_high)) {
- digitalWrite(servo_pin[channel_high], LOW);
- channel_high = MAX_SERVOS;
- }
- // search for the next channel to turn on
- while (channel < MAX_SERVOS) {
- if (servo_active_mask & (1 << channel)) {
- digitalWrite(servo_pin[channel], HIGH);
- channel_high = channel;
- ticks = servo_ticks[channel];
- tick_accum += ticks;
- PDB0_IDLY += ticks;
- PDB0_SC = PDB_CONFIG | PDB_SC_LDOK;
- channel++;
- return;
- }
- channel++;
- }
- // when all channels have output, wait for the
- // minimum refresh interval
- wait_ticks = usToTicks(REFRESH_INTERVAL) - tick_accum;
- if (wait_ticks < usToTicks(100)) wait_ticks = usToTicks(100);
- else if (wait_ticks > 60000) wait_ticks = 60000;
- tick_accum += wait_ticks;
- PDB0_IDLY += wait_ticks;
- PDB0_SC = PDB_CONFIG | PDB_SC_LDOK;
- // if this wait is enough to satisfy the refresh
- // interval, next time begin again at channel zero
- if (tick_accum >= usToTicks(REFRESH_INTERVAL)) {
- tick_accum = 0;
- channel = 0;
- }
+ // first, if any channel was left high from the previous
+ // run, now is the time to shut it off
+ if (servo_active_mask & (1 << channel_high)) {
+ digitalWrite(servo_pin[channel_high], LOW);
+ channel_high = MAX_SERVOS;
+ }
+ // search for the next channel to turn on
+ while (channel < MAX_SERVOS) {
+ if (servo_active_mask & (1 << channel)) {
+ digitalWrite(servo_pin[channel], HIGH);
+ channel_high = channel;
+ ticks = servo_ticks[channel];
+ tick_accum += ticks;
+ PDB0_IDLY += ticks;
+ PDB0_SC = PDB_CONFIG | PDB_SC_LDOK;
+ channel++;
+ return;
+ }
+ channel++;
+ }
+ // when all channels have output, wait for the
+ // minimum refresh interval
+ wait_ticks = usToTicks(REFRESH_INTERVAL) - tick_accum;
+ if (wait_ticks < usToTicks(100)) {
+ wait_ticks = usToTicks(100);
+ } else if (wait_ticks > 60000) {
+ wait_ticks = 60000;
+ }
+ tick_accum += wait_ticks;
+ PDB0_IDLY += wait_ticks;
+ PDB0_SC = PDB_CONFIG | PDB_SC_LDOK;
+ // if this wait is enough to satisfy the refresh
+ // interval, next time begin again at channel zero
+ if (tick_accum >= usToTicks(REFRESH_INTERVAL)) {
+ tick_accum = 0;
+ channel = 0;
+ }
}
diff --git a/ports/teensy/teensy_hal.c b/ports/teensy/teensy_hal.c
index e9cc677..342e7c6 100644
--- a/ports/teensy/teensy_hal.c
+++ b/ports/teensy/teensy_hal.c
@@ -9,17 +9,17 @@
#include "Arduino.h"
mp_uint_t mp_hal_ticks_ms(void) {
- return millis();
+ return millis();
}
void mp_hal_delay_ms(mp_uint_t ms) {
- delay(ms);
+ delay(ms);
}
void mp_hal_set_interrupt_char(int c) {
- // The teensy 3.1 usb stack doesn't currently have the notion of generating
- // an exception when a certain character is received. That just means that
- // you can't press Control-C and get your python script to stop.
+ // The teensy 3.1 usb stack doesn't currently have the notion of generating
+ // an exception when a certain character is received. That just means that
+ // you can't press Control-C and get your python script to stop.
}
uintptr_t mp_hal_stdio_poll(uintptr_t poll_flags) {
diff --git a/ports/teensy/teensy_hal.h b/ports/teensy/teensy_hal.h
index f2e6682..c4cdcc1 100644
--- a/ports/teensy/teensy_hal.h
+++ b/ports/teensy/teensy_hal.h
@@ -3,7 +3,7 @@
#ifdef USE_FULL_ASSERT
#define assert_param(expr) ((expr) ? (void)0 : assert_failed((uint8_t *)__FILE__, __LINE__))
- void assert_failed(uint8_t* file, uint32_t line);
+void assert_failed(uint8_t *file, uint32_t line);
#else
#define assert_param(expr) ((void)0)
#endif /* USE_FULL_ASSERT */
@@ -41,12 +41,12 @@
} SPI_TypeDef;
typedef struct {
- volatile uint32_t PDOR; // Output register
- volatile uint32_t PSOR; // Set output register
- volatile uint32_t PCOR; // Clear output register
- volatile uint32_t PTOR; // Toggle output register
- volatile uint32_t PDIR; // Data Input register
- volatile uint32_t PDDR; // Data Direction register
+ volatile uint32_t PDOR; // Output register
+ volatile uint32_t PSOR; // Set output register
+ volatile uint32_t PCOR; // Clear output register
+ volatile uint32_t PTOR; // Toggle output register
+ volatile uint32_t PDIR; // Data Input register
+ volatile uint32_t PDDR; // Data Direction register
} GPIO_TypeDef;
#define GPIO_OUTPUT_TYPE ((uint32_t)0x00000010) // Indicates OD
@@ -60,19 +60,19 @@
#define GPIO_MODE_IT_RISING ((uint32_t)1)
#define GPIO_MODE_IT_FALLING ((uint32_t)2)
-#define IS_GPIO_MODE(MODE) (((MODE) == GPIO_MODE_INPUT) ||\
- ((MODE) == GPIO_MODE_OUTPUT_PP) ||\
- ((MODE) == GPIO_MODE_OUTPUT_OD) ||\
- ((MODE) == GPIO_MODE_AF_PP) ||\
- ((MODE) == GPIO_MODE_AF_OD) ||\
- ((MODE) == GPIO_MODE_ANALOG))
+#define IS_GPIO_MODE(MODE) (((MODE) == GPIO_MODE_INPUT) || \
+ ((MODE) == GPIO_MODE_OUTPUT_PP) || \
+ ((MODE) == GPIO_MODE_OUTPUT_OD) || \
+ ((MODE) == GPIO_MODE_AF_PP) || \
+ ((MODE) == GPIO_MODE_AF_OD) || \
+ ((MODE) == GPIO_MODE_ANALOG))
#define GPIO_NOPULL ((uint32_t)0)
#define GPIO_PULLUP ((uint32_t)1)
#define GPIO_PULLDOWN ((uint32_t)2)
#define IS_GPIO_PULL(PULL) (((PULL) == GPIO_NOPULL) || ((PULL) == GPIO_PULLUP) || \
- ((PULL) == GPIO_PULLDOWN))
+ ((PULL) == GPIO_PULLDOWN))
#define GPIO_SPEED_FREQ_LOW ((uint32_t)0)
#define GPIO_SPEED_FREQ_MEDIUM ((uint32_t)1)
@@ -82,11 +82,11 @@
#define IS_GPIO_AF(af) ((af) >= 0 && (af) <= 7)
typedef struct {
- uint32_t Pin;
- uint32_t Mode;
- uint32_t Pull;
- uint32_t Speed;
- uint32_t Alternate;
+ uint32_t Pin;
+ uint32_t Mode;
+ uint32_t Pull;
+ uint32_t Speed;
+ uint32_t Alternate;
} GPIO_InitTypeDef;
#define GPIO_PORT_TO_PORT_NUM(GPIOx) \
@@ -111,7 +111,7 @@
#define GPIO_AF7_FTM1 7
__attribute__(( always_inline )) static inline void __WFI(void) {
- __asm volatile ("wfi");
+ __asm volatile ("wfi");
}
void mp_hal_set_interrupt_char(int c);
@@ -121,7 +121,7 @@
void HAL_GPIO_Init(GPIO_TypeDef *GPIOx, GPIO_InitTypeDef *init);
struct _pin_obj_t;
-#define mp_hal_pin_obj_t const struct _pin_obj_t*
+#define mp_hal_pin_obj_t const struct _pin_obj_t *
#define mp_hal_pin_high(p) (((p)->gpio->PSOR) = (p)->pin_mask)
#define mp_hal_pin_low(p) (((p)->gpio->PCOR) = (p)->pin_mask)
#define mp_hal_pin_read(p) (((p)->gpio->PDIR >> (p)->pin) & 1)
diff --git a/ports/teensy/timer.c b/ports/teensy/timer.c
index 88e960c..08dc13f 100644
--- a/ports/teensy/timer.c
+++ b/ports/teensy/timer.c
@@ -49,8 +49,8 @@
} pyb_channel_mode;
STATIC const struct {
- qstr name;
- uint32_t oc_mode;
+ qstr name;
+ uint32_t oc_mode;
} channel_mode_info[] = {
{ MP_QSTR_PWM, FTM_OCMODE_PWM1 },
{ MP_QSTR_PWM_INVERTED, FTM_OCMODE_PWM2 },
@@ -195,8 +195,8 @@
mp_printf(print, "Timer(%u, prescaler=%u, period=%u, mode=%s)",
self->tim_id,
1 << (self->ftm.Instance->SC & 7),
- self->ftm.Instance->MOD & 0xffff,
- self->ftm.Init.CounterMode == FTM_COUNTERMODE_UP ? "UP" : "CENTER");
+ self->ftm.Instance->MOD & 0xffff,
+ self->ftm.Init.CounterMode == FTM_COUNTERMODE_UP ? "UP" : "CENTER");
}
}
@@ -319,10 +319,20 @@
tim->tim_id = mp_obj_get_int(args[0]);
switch (tim->tim_id) {
- case 0: tim->ftm.Instance = FTM0; tim->irqn = IRQ_FTM0; break;
- case 1: tim->ftm.Instance = FTM1; tim->irqn = IRQ_FTM1; break;
- case 2: tim->ftm.Instance = FTM2; tim->irqn = IRQ_FTM2; break;
- default: mp_raise_msg_varg(&mp_type_ValueError, "Timer %d does not exist", tim->tim_id);
+ case 0:
+ tim->ftm.Instance = FTM0;
+ tim->irqn = IRQ_FTM0;
+ break;
+ case 1:
+ tim->ftm.Instance = FTM1;
+ tim->irqn = IRQ_FTM1;
+ break;
+ case 2:
+ tim->ftm.Instance = FTM2;
+ tim->irqn = IRQ_FTM2;
+ break;
+ default:
+ mp_raise_msg_varg(&mp_type_ValueError, "Timer %d does not exist", tim->tim_id);
}
if (n_args > 1 || n_kw > 0) {
@@ -551,9 +561,9 @@
case CHANNEL_MODE_OC_INACTIVE:
case CHANNEL_MODE_OC_TOGGLE: {
FTM_OC_InitTypeDef oc_config;
- oc_config.OCMode = channel_mode_info[chan->mode].oc_mode;
- oc_config.Pulse = vals[4].u_int;
- oc_config.OCPolarity = vals[5].u_int;
+ oc_config.OCMode = channel_mode_info[chan->mode].oc_mode;
+ oc_config.Pulse = vals[4].u_int;
+ oc_config.OCPolarity = vals[5].u_int;
if (oc_config.OCPolarity == 0xffffffff) {
oc_config.OCPolarity = FTM_OCPOLARITY_HIGH;
}
@@ -573,7 +583,7 @@
case CHANNEL_MODE_IC: {
FTM_IC_InitTypeDef ic_config;
- ic_config.ICPolarity = vals[5].u_int;
+ ic_config.ICPolarity = vals[5].u_int;
if (ic_config.ICPolarity == 0xffffffff) {
ic_config.ICPolarity = FTM_ICPOLARITY_RISING;
}
@@ -716,9 +726,9 @@
{ MP_ROM_QSTR(MP_QSTR_prescaler), MP_ROM_PTR(&pyb_timer_prescaler_obj) },
{ MP_ROM_QSTR(MP_QSTR_period), MP_ROM_PTR(&pyb_timer_period_obj) },
{ MP_ROM_QSTR(MP_QSTR_callback), MP_ROM_PTR(&pyb_timer_callback_obj) },
-#if MICROPY_TIMER_REG
+ #if MICROPY_TIMER_REG
{ MP_ROM_QSTR(MP_QSTR_reg), MP_ROM_PTR(&pyb_timer_reg_obj) },
-#endif
+ #endif
{ MP_ROM_QSTR(MP_QSTR_UP), MP_ROM_INT(FTM_COUNTERMODE_UP) },
{ MP_ROM_QSTR(MP_QSTR_CENTER), MP_ROM_INT(FTM_COUNTERMODE_CENTER) },
{ MP_ROM_QSTR(MP_QSTR_PWM), MP_ROM_INT(CHANNEL_MODE_PWM_NORMAL) },
@@ -754,9 +764,9 @@
pyb_timer_channel_obj_t *self = self_in;
mp_printf(print, "TimerChannel(timer=%u, channel=%u, mode=%s)",
- self->timer->tim_id,
- self->channel,
- qstr_str(channel_mode_info[self->mode].name));
+ self->timer->tim_id,
+ self->channel,
+ qstr_str(channel_mode_info[self->mode].name));
}
/// \method capture([value])
@@ -773,7 +783,7 @@
/// Get or set the pulse width value associated with a channel.
/// capture, compare, and pulse_width are all aliases for the same function.
/// pulse_width is the logical name to use when the channel is in PWM mode.
-///
+///
/// In edge aligned mode, a pulse_width of `period + 1` corresponds to a duty cycle of 100%
/// In center aligned mode, a pulse width of `period` corresponds to a duty cycle of 100%
STATIC mp_obj_t pyb_timer_channel_capture_compare(size_t n_args, const mp_obj_t *args) {
@@ -860,8 +870,8 @@
mp_obj_t pyb_timer_channel_reg(uint n_args, const mp_obj_t *args) {
pyb_timer_channel_obj_t *self = args[0];
return reg_cmd(&self->timer->ftm.Instance->channel[self->channel],
- timer_channel_reg, MP_ARRAY_SIZE(timer_channel_reg),
- n_args - 1, args + 1);
+ timer_channel_reg, MP_ARRAY_SIZE(timer_channel_reg),
+ n_args - 1, args + 1);
}
STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(pyb_timer_channel_reg_obj, 1, 3, pyb_timer_channel_reg);
#endif
@@ -873,9 +883,9 @@
{ MP_ROM_QSTR(MP_QSTR_pulse_width_percent), MP_ROM_PTR(&pyb_timer_channel_pulse_width_percent_obj) },
{ MP_ROM_QSTR(MP_QSTR_capture), MP_ROM_PTR(&pyb_timer_channel_capture_compare_obj) },
{ MP_ROM_QSTR(MP_QSTR_compare), MP_ROM_PTR(&pyb_timer_channel_capture_compare_obj) },
-#if MICROPY_TIMER_REG
+ #if MICROPY_TIMER_REG
{ MP_ROM_QSTR(MP_QSTR_reg), MP_ROM_PTR(&pyb_timer_channel_reg_obj) },
-#endif
+ #endif
};
STATIC MP_DEFINE_CONST_DICT(pyb_timer_channel_locals_dict, pyb_timer_channel_locals_dict_table);
@@ -906,10 +916,10 @@
self->callback = mp_const_none;
if (channel == 0xffffffff) {
printf("Uncaught exception in Timer(" UINT_FMT
- ") interrupt handler\n", self->tim_id);
+ ") interrupt handler\n", self->tim_id);
} else {
printf("Uncaught exception in Timer(" UINT_FMT ") channel "
- UINT_FMT " interrupt handler\n", self->tim_id, channel);
+ UINT_FMT " interrupt handler\n", self->tim_id, channel);
}
mp_obj_print_exception(&mp_plat_print, (mp_obj_t)nlr.ret_val);
}
@@ -956,7 +966,7 @@
} else {
__HAL_FTM_DISABLE_CH_IT(&self->ftm, chan->channel);
printf("No callback for Timer %d channel %u (now disabled)\n",
- self->tim_id, chan->channel);
+ self->tim_id, chan->channel);
}
}
chan = chan->next;
@@ -971,7 +981,7 @@
__HAL_FTM_CLEAR_CH_FLAG(&self->ftm, channel);
__HAL_FTM_DISABLE_CH_IT(&self->ftm, channel);
printf("Unhandled interrupt Timer %d channel %u (now disabled)\n",
- tim_id, channel);
+ tim_id, channel);
}
}
}
diff --git a/ports/teensy/uart.c b/ports/teensy/uart.c
index 95ed073..1d27359 100644
--- a/ports/teensy/uart.c
+++ b/ports/teensy/uart.c
@@ -62,12 +62,12 @@
// assumes Init parameters have been set up correctly
bool uart_init2(pyb_uart_obj_t *uart_obj) {
-#if 0
+ #if 0
USART_TypeDef *UARTx = NULL;
uint32_t GPIO_Pin = 0;
- uint8_t GPIO_AF_UARTx = 0;
- GPIO_TypeDef* GPIO_Port = NULL;
+ uint8_t GPIO_AF_UARTx = 0;
+ GPIO_TypeDef *GPIO_Port = NULL;
switch (uart_obj->uart_id) {
// USART1 is on PA9/PA10 (CK on PA8), PB6/PB7
@@ -75,13 +75,13 @@
UARTx = USART1;
GPIO_AF_UARTx = GPIO_AF7_USART1;
-#if defined (PYBV4) || defined(PYBV10)
+ #if defined (PYBV4) || defined(PYBV10)
GPIO_Port = GPIOB;
GPIO_Pin = GPIO_PIN_6 | GPIO_PIN_7;
-#else
+ #else
GPIO_Port = GPIOA;
GPIO_Pin = GPIO_PIN_9 | GPIO_PIN_10;
-#endif
+ #endif
__USART1_CLK_ENABLE();
break;
@@ -102,13 +102,13 @@
UARTx = USART3;
GPIO_AF_UARTx = GPIO_AF7_USART3;
-#if defined(PYBV3) || defined(PYBV4) | defined(PYBV10)
+ #if defined(PYBV3) || defined(PYBV4) | defined(PYBV10)
GPIO_Port = GPIOB;
GPIO_Pin = GPIO_PIN_10 | GPIO_PIN_11;
-#else
+ #else
GPIO_Port = GPIOD;
GPIO_Pin = GPIO_PIN_8 | GPIO_PIN_9;
-#endif
+ #endif
__USART3_CLK_ENABLE();
break;
@@ -152,12 +152,12 @@
HAL_UART_Init(&uart_obj->uart);
uart_obj->is_enabled = true;
-#endif
+ #endif
return true;
}
bool uart_init(pyb_uart_obj_t *uart_obj, uint32_t baudrate) {
-#if 0
+ #if 0
UART_HandleTypeDef *uh = &uart_obj->uart;
memset(uh, 0, sizeof(*uh));
uh->Init.BaudRate = baudrate;
@@ -167,47 +167,47 @@
uh->Init.Mode = UART_MODE_TX_RX;
uh->Init.HwFlowCtl = UART_HWCONTROL_NONE;
uh->Init.OverSampling = UART_OVERSAMPLING_16;
-#endif
+ #endif
return uart_init2(uart_obj);
}
mp_uint_t uart_rx_any(pyb_uart_obj_t *uart_obj) {
-#if 0
+ #if 0
return __HAL_UART_GET_FLAG(&uart_obj->uart, UART_FLAG_RXNE);
-#else
+ #else
return 0;
-#endif
+ #endif
}
int uart_rx_char(pyb_uart_obj_t *uart_obj) {
uint8_t ch;
-#if 0
+ #if 0
if (HAL_UART_Receive(&uart_obj->uart, &ch, 1, 0) != HAL_OK) {
ch = 0;
}
-#else
+ #else
ch = 'A';
-#endif
+ #endif
return ch;
}
void uart_tx_char(pyb_uart_obj_t *uart_obj, int c) {
-#if 0
+ #if 0
uint8_t ch = c;
HAL_UART_Transmit(&uart_obj->uart, &ch, 1, 100000);
-#endif
+ #endif
}
void uart_tx_str(pyb_uart_obj_t *uart_obj, const char *str) {
-#if 0
- HAL_UART_Transmit(&uart_obj->uart, (uint8_t*)str, strlen(str), 100000);
-#endif
+ #if 0
+ HAL_UART_Transmit(&uart_obj->uart, (uint8_t *)str, strlen(str), 100000);
+ #endif
}
void uart_tx_strn(pyb_uart_obj_t *uart_obj, const char *str, uint len) {
-#if 0
- HAL_UART_Transmit(&uart_obj->uart, (uint8_t*)str, len, 100000);
-#endif
+ #if 0
+ HAL_UART_Transmit(&uart_obj->uart, (uint8_t *)str, len, 100000);
+ #endif
}
void uart_tx_strn_cooked(pyb_uart_obj_t *uart_obj, const char *str, uint len) {
@@ -227,7 +227,7 @@
if (!self->is_enabled) {
mp_printf(print, "UART(%lu)", self->uart_id);
} else {
-#if 0
+ #if 0
mp_printf(print, "UART(%lu, baudrate=%u, bits=%u, stop=%u",
self->uart_id, self->uart.Init.BaudRate,
self->uart.Init.WordLength == UART_WORDLENGTH_8B ? 8 : 9,
@@ -237,7 +237,7 @@
} else {
mp_printf(print, ", parity=%u)", self->uart.Init.Parity == UART_PARITY_EVEN ? 0 : 1);
}
-#endif
+ #endif
}
}
@@ -261,15 +261,19 @@
// parse args
mp_arg_val_t vals[PYB_UART_INIT_NUM_ARGS];
mp_arg_parse_all(n_args, args, kw_args, PYB_UART_INIT_NUM_ARGS, pyb_uart_init_args, vals);
-#if 0
+ #if 0
// set the UART configuration values
memset(&self->uart, 0, sizeof(self->uart));
UART_InitTypeDef *init = &self->uart.Init;
init->BaudRate = vals[0].u_int;
init->WordLength = vals[1].u_int == 8 ? UART_WORDLENGTH_8B : UART_WORDLENGTH_9B;
switch (vals[2].u_int) {
- case 1: init->StopBits = UART_STOPBITS_1; break;
- default: init->StopBits = UART_STOPBITS_2; break;
+ case 1:
+ init->StopBits = UART_STOPBITS_1;
+ break;
+ default:
+ init->StopBits = UART_STOPBITS_2;
+ break;
}
if (vals[3].u_obj == mp_const_none) {
init->Parity = UART_PARITY_NONE;
@@ -285,7 +289,7 @@
if (!uart_init2(self)) {
mp_raise_msg_varg(&mp_type_ValueError, "UART port %d does not exist", self->uart_id);
}
-#endif
+ #endif
return mp_const_none;
}
@@ -315,11 +319,11 @@
// work out port
o->uart_id = 0;
-#if 0
+ #if 0
if (mp_obj_is_str(args[0])) {
const char *port = mp_obj_str_get_str(args[0]);
if (0) {
-#if defined(PYBV10)
+ #if defined(PYBV10)
} else if (strcmp(port, "XA") == 0) {
o->uart_id = PYB_UART_XA;
} else if (strcmp(port, "XB") == 0) {
@@ -328,14 +332,14 @@
o->uart_id = PYB_UART_YA;
} else if (strcmp(port, "YB") == 0) {
o->uart_id = PYB_UART_YB;
-#endif
+ #endif
} else {
mp_raise_msg_varg(&mp_type_ValueError, "UART port %s does not exist", port);
}
} else {
o->uart_id = mp_obj_get_int(args[0]);
}
-#endif
+ #endif
if (n_args > 1 || n_kw > 0) {
// start the peripheral
@@ -395,7 +399,7 @@
mp_arg_val_t vals[PYB_UART_SEND_NUM_ARGS];
mp_arg_parse_all(n_args - 1, args + 1, kw_args, PYB_UART_SEND_NUM_ARGS, pyb_uart_send_args, vals);
-#if 0
+ #if 0
// get the buffer to send from
mp_buffer_info_t bufinfo;
uint8_t data[1];
@@ -408,9 +412,9 @@
// TODO really need a HardwareError object, or something
mp_raise_msg_varg(&mp_type_Exception, "HAL_UART_Transmit failed with code %d", status);
}
-#else
+ #else
(void)self;
-#endif
+ #endif
return mp_const_none;
}
@@ -439,7 +443,7 @@
pyb_uart_obj_t *self = args[0];
-#if 0
+ #if 0
// parse args
mp_arg_val_t vals[PYB_UART_RECV_NUM_ARGS];
mp_arg_parse_all(n_args - 1, args + 1, kw_args, PYB_UART_RECV_NUM_ARGS, pyb_uart_recv_args, vals);
@@ -462,10 +466,10 @@
} else {
return mp_obj_str_builder_end(o_ret);
}
-#else
+ #else
(void)self;
return mp_const_none;
-#endif
+ #endif
}
STATIC MP_DEFINE_CONST_FUN_OBJ_KW(pyb_uart_recv_obj, 1, pyb_uart_recv);
diff --git a/ports/teensy/usb.c b/ports/teensy/usb.c
index ed96826..a906f912 100644
--- a/ports/teensy/usb.c
+++ b/ports/teensy/usb.c
@@ -7,46 +7,40 @@
#include "usb.h"
#include "usb_serial.h"
-bool usb_vcp_is_connected(void)
-{
- return usb_configuration && (usb_cdc_line_rtsdtr & (USB_SERIAL_DTR | USB_SERIAL_RTS));
+bool usb_vcp_is_connected(void) {
+ return usb_configuration && (usb_cdc_line_rtsdtr & (USB_SERIAL_DTR | USB_SERIAL_RTS));
}
-bool usb_vcp_is_enabled(void)
-{
- return true;
+bool usb_vcp_is_enabled(void) {
+ return true;
}
int usb_vcp_rx_num(void) {
- return usb_serial_available();
+ return usb_serial_available();
}
-int usb_vcp_recv_byte(uint8_t *ptr)
-{
- int ch = usb_serial_getchar();
- if (ch < 0) {
- return 0;
- }
- *ptr = ch;
- return 1;
-}
-
-void usb_vcp_send_str(const char* str)
-{
- usb_vcp_send_strn(str, strlen(str));
-}
-
-void usb_vcp_send_strn(const char* str, int len)
-{
- usb_serial_write(str, len);
-}
-
-void usb_vcp_send_strn_cooked(const char *str, int len)
-{
- for (const char *top = str + len; str < top; str++) {
- if (*str == '\n') {
- usb_serial_putchar('\r');
+int usb_vcp_recv_byte(uint8_t *ptr) {
+ int ch = usb_serial_getchar();
+ if (ch < 0) {
+ return 0;
}
- usb_serial_putchar(*str);
- }
+ *ptr = ch;
+ return 1;
+}
+
+void usb_vcp_send_str(const char *str) {
+ usb_vcp_send_strn(str, strlen(str));
+}
+
+void usb_vcp_send_strn(const char *str, int len) {
+ usb_serial_write(str, len);
+}
+
+void usb_vcp_send_strn_cooked(const char *str, int len) {
+ for (const char *top = str + len; str < top; str++) {
+ if (*str == '\n') {
+ usb_serial_putchar('\r');
+ }
+ usb_serial_putchar(*str);
+ }
}
diff --git a/ports/teensy/usb.h b/ports/teensy/usb.h
index 50fb3ff..7ca0eac 100644
--- a/ports/teensy/usb.h
+++ b/ports/teensy/usb.h
@@ -5,8 +5,8 @@
bool usb_vcp_is_enabled(void);
int usb_vcp_rx_num(void);
int usb_vcp_recv_byte(uint8_t *ptr);
-void usb_vcp_send_str(const char* str);
-void usb_vcp_send_strn(const char* str, int len);
+void usb_vcp_send_str(const char *str);
+void usb_vcp_send_strn(const char *str, int len);
void usb_vcp_send_strn_cooked(const char *str, int len);
#endif // MICROPY_INCLUDED_TEENSY_USB_H
diff --git a/ports/unix/alloc.c b/ports/unix/alloc.c
index ca12d02..7fe7b4d 100644
--- a/ports/unix/alloc.c
+++ b/ports/unix/alloc.c
@@ -69,7 +69,7 @@
munmap(ptr, size);
// unlink the mmap'd region from the list
- for (mmap_region_t **rg = (mmap_region_t**)&MP_STATE_VM(mmap_region_head); *rg != NULL; *rg = (*rg)->next) {
+ for (mmap_region_t **rg = (mmap_region_t **)&MP_STATE_VM(mmap_region_head); *rg != NULL; *rg = (*rg)->next) {
if ((*rg)->ptr == ptr) {
mmap_region_t *next = (*rg)->next;
m_del_obj(mmap_region_t, *rg);
diff --git a/ports/unix/coverage.c b/ports/unix/coverage.c
index 8978931..59fcf55 100644
--- a/ports/unix/coverage.c
+++ b/ports/unix/coverage.c
@@ -108,7 +108,7 @@
STATIC const mp_obj_type_t mp_type_stest_fileio = {
{ &mp_type_type },
.protocol = &fileio_stream_p,
- .locals_dict = (mp_obj_dict_t*)&rawfile_locals_dict,
+ .locals_dict = (mp_obj_dict_t *)&rawfile_locals_dict,
};
// stream read returns non-blocking error
@@ -135,12 +135,12 @@
STATIC const mp_obj_type_t mp_type_stest_textio2 = {
{ &mp_type_type },
.protocol = &textio_stream_p2,
- .locals_dict = (mp_obj_dict_t*)&rawfile_locals_dict2,
+ .locals_dict = (mp_obj_dict_t *)&rawfile_locals_dict2,
};
// str/bytes objects without a valid hash
-STATIC const mp_obj_str_t str_no_hash_obj = {{&mp_type_str}, 0, 10, (const byte*)"0123456789"};
-STATIC const mp_obj_str_t bytes_no_hash_obj = {{&mp_type_bytes}, 0, 10, (const byte*)"0123456789"};
+STATIC const mp_obj_str_t str_no_hash_obj = {{&mp_type_str}, 0, 10, (const byte *)"0123456789"};
+STATIC const mp_obj_str_t bytes_no_hash_obj = {{&mp_type_bytes}, 0, 10, (const byte *)"0123456789"};
STATIC int pairheap_lt(mp_pairheap_t *a, mp_pairheap_t *b) {
return (uintptr_t)a < (uintptr_t)b;
@@ -160,12 +160,14 @@
if (mp_pairheap_is_empty(pairheap_lt, heap)) {
mp_printf(&mp_plat_print, " -");
} else {
- mp_printf(&mp_plat_print, " %d", mp_pairheap_peek(pairheap_lt, heap) - &node[0]);;
+ mp_printf(&mp_plat_print, " %d", mp_pairheap_peek(pairheap_lt, heap) - &node[0]);
+ ;
}
}
printf("\npop all:");
while (!mp_pairheap_is_empty(pairheap_lt, heap)) {
- mp_printf(&mp_plat_print, " %d", mp_pairheap_peek(pairheap_lt, heap) - &node[0]);;
+ mp_printf(&mp_plat_print, " %d", mp_pairheap_peek(pairheap_lt, heap) - &node[0]);
+ ;
heap = mp_pairheap_pop(pairheap_lt, heap);
}
printf("\n");
@@ -438,10 +440,10 @@
// call mp_execute_bytecode with invalide bytecode (should raise NotImplementedError)
mp_obj_fun_bc_t fun_bc;
- fun_bc.bytecode = (const byte*)"\x01"; // just needed for n_state
+ fun_bc.bytecode = (const byte *)"\x01"; // just needed for n_state
mp_code_state_t *code_state = m_new_obj_var(mp_code_state_t, mp_obj_t, 1);
code_state->fun_bc = &fun_bc;
- code_state->ip = (const byte*)"\x00"; // just needed for an invalid opcode
+ code_state->ip = (const byte *)"\x00"; // just needed for an invalid opcode
code_state->sp = &code_state->state[0];
code_state->exc_sp_idx = 0;
code_state->old_globals = NULL;
diff --git a/ports/unix/file.c b/ports/unix/file.c
index 8a16528..0fe4f98 100644
--- a/ports/unix/file.c
+++ b/ports/unix/file.c
@@ -110,7 +110,7 @@
check_fd_is_open(o);
switch (request) {
case MP_STREAM_SEEK: {
- struct mp_stream_seek_t *s = (struct mp_stream_seek_t*)arg;
+ struct mp_stream_seek_t *s = (struct mp_stream_seek_t *)arg;
MP_THREAD_GIL_EXIT();
off_t off = lseek(o->fd, s->offset, s->whence);
MP_THREAD_GIL_ENTER();
@@ -190,7 +190,7 @@
case '+':
mode_rw = O_RDWR;
break;
- #if MICROPY_PY_IO_FILEIO
+ #if MICROPY_PY_IO_FILEIO
// If we don't have io.FileIO, then files are in text mode implicitly
case 'b':
type = &mp_type_fileio;
@@ -198,7 +198,7 @@
case 't':
type = &mp_type_textio;
break;
- #endif
+ #endif
}
}
@@ -260,7 +260,7 @@
.getiter = mp_identity_getiter,
.iternext = mp_stream_unbuffered_iter,
.protocol = &fileio_stream_p,
- .locals_dict = (mp_obj_dict_t*)&rawfile_locals_dict,
+ .locals_dict = (mp_obj_dict_t *)&rawfile_locals_dict,
};
#endif
@@ -279,7 +279,7 @@
.getiter = mp_identity_getiter,
.iternext = mp_stream_unbuffered_iter,
.protocol = &textio_stream_p,
- .locals_dict = (mp_obj_dict_t*)&rawfile_locals_dict,
+ .locals_dict = (mp_obj_dict_t *)&rawfile_locals_dict,
};
// Factory function for I/O stream classes
@@ -291,7 +291,7 @@
}
MP_DEFINE_CONST_FUN_OBJ_KW(mp_builtin_open_obj, 1, mp_builtin_open);
-const mp_obj_fdfile_t mp_sys_stdin_obj = { .base = {&mp_type_textio}, .fd = STDIN_FILENO };
+const mp_obj_fdfile_t mp_sys_stdin_obj = { .base = {&mp_type_textio}, .fd = STDIN_FILENO };
const mp_obj_fdfile_t mp_sys_stdout_obj = { .base = {&mp_type_textio}, .fd = STDOUT_FILENO };
const mp_obj_fdfile_t mp_sys_stderr_obj = { .base = {&mp_type_textio}, .fd = STDERR_FILENO };
diff --git a/ports/unix/gccollect.c b/ports/unix/gccollect.c
index ddc2d92..7a92f5f 100644
--- a/ports/unix/gccollect.c
+++ b/ports/unix/gccollect.c
@@ -49,20 +49,20 @@
register long r13 asm ("r13");
register long r14 asm ("r14");
register long r15 asm ("r15");
-#ifdef __clang__
+ #ifdef __clang__
// TODO:
// This is dirty workaround for Clang. It tries to get around
// uncompliant (wrt to GCC) behavior of handling register variables.
// Application of this patch here is random, and done only to unbreak
// MacOS build. Better, cross-arch ways to deal with Clang issues should
// be found.
- asm("" : "=r"(rbx));
- asm("" : "=r"(rbp));
- asm("" : "=r"(r12));
- asm("" : "=r"(r13));
- asm("" : "=r"(r14));
- asm("" : "=r"(r15));
-#endif
+ asm ("" : "=r" (rbx));
+ asm ("" : "=r" (rbp));
+ asm ("" : "=r" (r12));
+ asm ("" : "=r" (r13));
+ asm ("" : "=r" (r14));
+ asm ("" : "=r" (r15));
+ #endif
arr[0] = rbx;
arr[1] = rbp;
arr[2] = r12;
@@ -80,18 +80,18 @@
register long esi asm ("esi");
register long edi asm ("edi");
register long ebp asm ("ebp");
-#ifdef __clang__
+ #ifdef __clang__
// TODO:
// This is dirty workaround for Clang. It tries to get around
// uncompliant (wrt to GCC) behavior of handling register variables.
// Application of this patch here is random, and done only to unbreak
// MacOS build. Better, cross-arch ways to deal with Clang issues should
// be found.
- asm("" : "=r"(ebx));
- asm("" : "=r"(esi));
- asm("" : "=r"(edi));
- asm("" : "=r"(ebp));
-#endif
+ asm ("" : "=r" (ebx));
+ asm ("" : "=r" (esi));
+ asm ("" : "=r" (edi));
+ asm ("" : "=r" (ebp));
+ #endif
arr[0] = ebx;
arr[1] = esi;
arr[2] = edi;
@@ -160,7 +160,7 @@
regs_t regs;
gc_helper_get_regs(regs);
// GC stack (and regs because we captured them)
- void **regs_ptr = (void**)(void*)®s;
+ void **regs_ptr = (void **)(void *)®s;
gc_collect_root(regs_ptr, ((uintptr_t)MP_STATE_THREAD(stack_top) - (uintptr_t)®s) / sizeof(uintptr_t));
}
diff --git a/ports/unix/input.c b/ports/unix/input.c
index 7d60b46..a33c020 100644
--- a/ports/unix/input.c
+++ b/ports/unix/input.c
@@ -59,7 +59,7 @@
#endif
void prompt_read_history(void) {
-#if MICROPY_USE_READLINE_HISTORY
+ #if MICROPY_USE_READLINE_HISTORY
#if MICROPY_USE_READLINE == 1
readline_init0(); // will clear history pointers
char *home = getenv("HOME");
@@ -91,11 +91,11 @@
vstr_clear(&vstr);
}
#endif
-#endif
+ #endif
}
void prompt_write_history(void) {
-#if MICROPY_USE_READLINE_HISTORY
+ #if MICROPY_USE_READLINE_HISTORY
#if MICROPY_USE_READLINE == 1
char *home = getenv("HOME");
if (home != NULL) {
@@ -117,5 +117,5 @@
}
}
#endif
-#endif
+ #endif
}
diff --git a/ports/unix/main.c b/ports/unix/main.c
index 3f464d5..cab3f38 100644
--- a/ports/unix/main.c
+++ b/ports/unix/main.c
@@ -59,7 +59,7 @@
#if MICROPY_ENABLE_GC
// Heap size of GC heap (if enabled)
// Make it larger on a 64 bit machine, because pointers are larger.
-long heap_size = 1024*1024 * (sizeof(mp_uint_t) / 4);
+long heap_size = 1024 * 1024 * (sizeof(mp_uint_t) / 4);
#endif
STATIC void stderr_print_strn(void *env, const char *str, size_t len) {
@@ -116,7 +116,7 @@
const vstr_t *vstr = source;
lex = mp_lexer_new_from_str_len(MP_QSTR__lt_stdin_gt_, vstr->buf, vstr->len, false);
} else if (source_kind == LEX_SRC_FILENAME) {
- lex = mp_lexer_new_from_file((const char*)source);
+ lex = mp_lexer_new_from_file((const char *)source);
} else { // LEX_SRC_STDIN
lex = mp_lexer_new_from_fd(MP_QSTR__lt_stdin_gt_, 0, false);
}
@@ -301,33 +301,33 @@
STATIC void print_help(char **argv) {
printf(
-"usage: %s [<opts>] [-X <implopt>] [-c <command> | -m <module> | <filename>]\n"
-"Options:\n"
-"-h : print this help message\n"
-"-i : enable inspection via REPL after running command/module/file\n"
-#if MICROPY_DEBUG_PRINTERS
-"-v : verbose (trace various operations); can be multiple\n"
-#endif
-"-O[N] : apply bytecode optimizations of level N\n"
-"\n"
-"Implementation specific options (-X):\n", argv[0]
-);
+ "usage: %s [<opts>] [-X <implopt>] [-c <command> | -m <module> | <filename>]\n"
+ "Options:\n"
+ "-h : print this help message\n"
+ "-i : enable inspection via REPL after running command/module/file\n"
+ #if MICROPY_DEBUG_PRINTERS
+ "-v : verbose (trace various operations); can be multiple\n"
+ #endif
+ "-O[N] : apply bytecode optimizations of level N\n"
+ "\n"
+ "Implementation specific options (-X):\n", argv[0]
+ );
int impl_opts_cnt = 0;
printf(
-" compile-only -- parse and compile only\n"
-#if MICROPY_EMIT_NATIVE
-" emit={bytecode,native,viper} -- set the default code emitter\n"
-#else
-" emit=bytecode -- set the default code emitter\n"
-#endif
-);
+ " compile-only -- parse and compile only\n"
+ #if MICROPY_EMIT_NATIVE
+ " emit={bytecode,native,viper} -- set the default code emitter\n"
+ #else
+ " emit=bytecode -- set the default code emitter\n"
+ #endif
+ );
impl_opts_cnt++;
-#if MICROPY_ENABLE_GC
+ #if MICROPY_ENABLE_GC
printf(
-" heapsize=<n>[w][K|M] -- set the heap size for the GC (default %ld)\n"
-, heap_size);
+ " heapsize=<n>[w][K|M] -- set the heap size for the GC (default %ld)\n"
+ , heap_size);
impl_opts_cnt++;
-#endif
+ #endif
if (impl_opts_cnt == 0) {
printf(" (none)\n");
@@ -362,7 +362,7 @@
} else if (strcmp(argv[a + 1], "emit=viper") == 0) {
emit_opt = MP_EMIT_OPT_VIPER;
#endif
-#if MICROPY_ENABLE_GC
+ #if MICROPY_ENABLE_GC
} else if (strncmp(argv[a + 1], "heapsize=", sizeof("heapsize=") - 1) == 0) {
char *end;
heap_size = strtol(argv[a + 1] + sizeof("heapsize=") - 1, &end, 0);
@@ -395,9 +395,9 @@
if (heap_size < 700) {
goto invalid_arg;
}
-#endif
+ #endif
} else {
-invalid_arg:
+ invalid_arg:
exit(invalid_args());
}
a++;
@@ -452,10 +452,10 @@
pre_process_options(argc, argv);
-#if MICROPY_ENABLE_GC
+ #if MICROPY_ENABLE_GC
char *heap = malloc(heap_size);
gc_init(heap, heap + heap_size);
-#endif
+ #endif
#if MICROPY_ENABLE_PYSTACK
static mp_obj_t pystack[1024];
@@ -478,7 +478,7 @@
mp_type_vfs_posix.make_new(&mp_type_vfs_posix, 0, 0, NULL),
MP_OBJ_NEW_QSTR(MP_QSTR__slash_),
};
- mp_vfs_mount(2, args, (mp_map_t*)&mp_const_empty_map);
+ mp_vfs_mount(2, args, (mp_map_t *)&mp_const_empty_map);
MP_STATE_VM(vfs_cur) = MP_STATE_VM(vfs_mount_table);
}
#endif
@@ -507,25 +507,25 @@
mp_obj_list_get(mp_sys_path, &path_num, &path_items);
path_items[0] = MP_OBJ_NEW_QSTR(MP_QSTR_);
{
- char *p = path;
- for (mp_uint_t i = 1; i < path_num; i++) {
- char *p1 = strchr(p, PATHLIST_SEP_CHAR);
- if (p1 == NULL) {
- p1 = p + strlen(p);
+ char *p = path;
+ for (mp_uint_t i = 1; i < path_num; i++) {
+ char *p1 = strchr(p, PATHLIST_SEP_CHAR);
+ if (p1 == NULL) {
+ p1 = p + strlen(p);
+ }
+ if (p[0] == '~' && p[1] == '/' && home != NULL) {
+ // Expand standalone ~ to $HOME
+ int home_l = strlen(home);
+ vstr_t vstr;
+ vstr_init(&vstr, home_l + (p1 - p - 1) + 1);
+ vstr_add_strn(&vstr, home, home_l);
+ vstr_add_strn(&vstr, p + 1, p1 - p - 1);
+ path_items[i] = mp_obj_new_str_from_vstr(&mp_type_str, &vstr);
+ } else {
+ path_items[i] = mp_obj_new_str_via_qstr(p, p1 - p);
+ }
+ p = p1 + 1;
}
- if (p[0] == '~' && p[1] == '/' && home != NULL) {
- // Expand standalone ~ to $HOME
- int home_l = strlen(home);
- vstr_t vstr;
- vstr_init(&vstr, home_l + (p1 - p - 1) + 1);
- vstr_add_strn(&vstr, home, home_l);
- vstr_add_strn(&vstr, p + 1, p1 - p - 1);
- path_items[i] = mp_obj_new_str_from_vstr(&mp_type_str, &vstr);
- } else {
- path_items[i] = mp_obj_new_str_via_qstr(p, p1 - p);
- }
- p = p1 + 1;
- }
}
mp_obj_list_init(MP_OBJ_TO_PTR(mp_sys_argv), 0);
@@ -627,7 +627,8 @@
MP_STATE_VM(mp_optimise_value) = argv[a][2] & 0xf;
} else {
MP_STATE_VM(mp_optimise_value) = 0;
- for (char *p = argv[a] + 1; *p && *p == 'O'; p++, MP_STATE_VM(mp_optimise_value)++);
+ for (char *p = argv[a] + 1; *p && *p == 'O'; p++, MP_STATE_VM(mp_optimise_value)++) {;
+ }
}
} else {
return invalid_args();
@@ -694,11 +695,11 @@
mp_deinit();
-#if MICROPY_ENABLE_GC && !defined(NDEBUG)
+ #if MICROPY_ENABLE_GC && !defined(NDEBUG)
// We don't really need to free memory since we are about to exit the
// process, but doing so helps to find memory leaks.
free(heap);
-#endif
+ #endif
//printf("total bytes = %d\n", m_get_total_bytes_allocated());
return ret & 0xff;
diff --git a/ports/unix/modffi.c b/ports/unix/modffi.c
index 75d70e2..1cc10bd 100644
--- a/ports/unix/modffi.c
+++ b/ports/unix/modffi.c
@@ -97,35 +97,48 @@
STATIC const mp_obj_type_t fficallback_type;
STATIC const mp_obj_type_t ffivar_type;
-STATIC ffi_type *char2ffi_type(char c)
-{
+STATIC ffi_type *char2ffi_type(char c) {
switch (c) {
- case 'b': return &ffi_type_schar;
- case 'B': return &ffi_type_uchar;
- case 'h': return &ffi_type_sshort;
- case 'H': return &ffi_type_ushort;
- case 'i': return &ffi_type_sint;
- case 'I': return &ffi_type_uint;
- case 'l': return &ffi_type_slong;
- case 'L': return &ffi_type_ulong;
- case 'q': return &ffi_type_sint64;
- case 'Q': return &ffi_type_uint64;
+ case 'b':
+ return &ffi_type_schar;
+ case 'B':
+ return &ffi_type_uchar;
+ case 'h':
+ return &ffi_type_sshort;
+ case 'H':
+ return &ffi_type_ushort;
+ case 'i':
+ return &ffi_type_sint;
+ case 'I':
+ return &ffi_type_uint;
+ case 'l':
+ return &ffi_type_slong;
+ case 'L':
+ return &ffi_type_ulong;
+ case 'q':
+ return &ffi_type_sint64;
+ case 'Q':
+ return &ffi_type_uint64;
#if MICROPY_PY_BUILTINS_FLOAT
- case 'f': return &ffi_type_float;
- case 'd': return &ffi_type_double;
+ case 'f':
+ return &ffi_type_float;
+ case 'd':
+ return &ffi_type_double;
#endif
case 'O': // mp_obj_t
case 'C': // (*)()
case 'P': // const void*
case 'p': // void*
- case 's': return &ffi_type_pointer;
- case 'v': return &ffi_type_void;
- default: return NULL;
+ case 's':
+ return &ffi_type_pointer;
+ case 'v':
+ return &ffi_type_void;
+ default:
+ return NULL;
}
}
-STATIC ffi_type *get_ffi_type(mp_obj_t o_in)
-{
+STATIC ffi_type *get_ffi_type(mp_obj_t o_in) {
if (mp_obj_is_str(o_in)) {
const char *s = mp_obj_str_get_str(o_in);
ffi_type *t = char2ffi_type(*s);
@@ -138,8 +151,7 @@
mp_raise_TypeError("Unknown type");
}
-STATIC mp_obj_t return_ffi_value(ffi_arg val, char type)
-{
+STATIC mp_obj_t return_ffi_value(ffi_arg val, char type) {
switch (type) {
case 's': {
const char *s = (const char *)(intptr_t)val;
@@ -152,11 +164,13 @@
return mp_const_none;
#if MICROPY_PY_BUILTINS_FLOAT
case 'f': {
- union { ffi_arg ffi; float flt; } val_union = { .ffi = val };
+ union { ffi_arg ffi;
+ float flt;
+ } val_union = { .ffi = val };
return mp_obj_new_float(val_union.flt);
}
case 'd': {
- double *p = (double*)&val;
+ double *p = (double *)&val;
return mp_obj_new_float(*p);
}
#endif
@@ -187,7 +201,7 @@
const char *argtypes = mp_obj_str_get_str(argtypes_in);
mp_int_t nparams = MP_OBJ_SMALL_INT_VALUE(mp_obj_len_maybe(argtypes_in));
- mp_obj_ffifunc_t *o = m_new_obj_var(mp_obj_ffifunc_t, ffi_type*, nparams);
+ mp_obj_ffifunc_t *o = m_new_obj_var(mp_obj_ffifunc_t, ffi_type *, nparams);
o->base.type = &ffifunc_type;
o->func = func;
@@ -224,20 +238,20 @@
MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(ffimod_func_obj, 4, 4, ffimod_func);
STATIC mp_obj_t mod_ffi_func(mp_obj_t rettype, mp_obj_t addr_in, mp_obj_t argtypes) {
- void *addr = (void*)MP_OBJ_TO_PTR(mp_obj_int_get_truncated(addr_in));
+ void *addr = (void *)MP_OBJ_TO_PTR(mp_obj_int_get_truncated(addr_in));
return make_func(rettype, addr, argtypes);
}
MP_DEFINE_CONST_FUN_OBJ_3(mod_ffi_func_obj, mod_ffi_func);
-STATIC void call_py_func(ffi_cif *cif, void *ret, void** args, void *func) {
+STATIC void call_py_func(ffi_cif *cif, void *ret, void **args, void *func) {
mp_obj_t pyargs[cif->nargs];
for (uint i = 0; i < cif->nargs; i++) {
- pyargs[i] = mp_obj_new_int(*(mp_int_t*)args[i]);
+ pyargs[i] = mp_obj_new_int(*(mp_int_t *)args[i]);
}
mp_obj_t res = mp_call_function_n_kw(MP_OBJ_FROM_PTR(func), cif->nargs, 0, pyargs);
if (res != mp_const_none) {
- *(ffi_arg*)ret = mp_obj_int_get_truncated(res);
+ *(ffi_arg *)ret = mp_obj_int_get_truncated(res);
}
}
@@ -245,7 +259,7 @@
const char *rettype = mp_obj_str_get_str(rettype_in);
mp_int_t nparams = MP_OBJ_SMALL_INT_VALUE(mp_obj_len_maybe(paramtypes_in));
- mp_obj_fficallback_t *o = m_new_obj_var(mp_obj_fficallback_t, ffi_type*, nparams);
+ mp_obj_fficallback_t *o = m_new_obj_var(mp_obj_fficallback_t, ffi_type *, nparams);
o->base.type = &fficallback_type;
o->clo = ffi_closure_alloc(sizeof(ffi_closure), &o->func);
@@ -337,7 +351,7 @@
.name = MP_QSTR_ffimod,
.print = ffimod_print,
.make_new = ffimod_make_new,
- .locals_dict = (mp_obj_dict_t*)&ffimod_locals_dict,
+ .locals_dict = (mp_obj_dict_t *)&ffimod_locals_dict,
};
// FFI function
@@ -363,10 +377,10 @@
values[i] = (ffi_arg)(intptr_t)a;
#if MICROPY_PY_BUILTINS_FLOAT
} else if (*argtype == 'f') {
- float *p = (float*)&values[i];
+ float *p = (float *)&values[i];
*p = mp_obj_get_float(a);
} else if (*argtype == 'd') {
- double *p = (double*)&values[i];
+ double *p = (double *)&values[i];
*p = mp_obj_get_float(a);
#endif
} else if (a == mp_const_none) {
@@ -376,8 +390,8 @@
} else if (mp_obj_is_str(a)) {
const char *s = mp_obj_str_get_str(a);
values[i] = (ffi_arg)(intptr_t)s;
- } else if (((mp_obj_base_t*)MP_OBJ_TO_PTR(a))->type->buffer_p.get_buffer != NULL) {
- mp_obj_base_t *o = (mp_obj_base_t*)MP_OBJ_TO_PTR(a);
+ } else if (((mp_obj_base_t *)MP_OBJ_TO_PTR(a))->type->buffer_p.get_buffer != NULL) {
+ mp_obj_base_t *o = (mp_obj_base_t *)MP_OBJ_TO_PTR(a);
mp_buffer_info_t bufinfo;
int ret = o->type->buffer_p.get_buffer(MP_OBJ_FROM_PTR(o), &bufinfo, MP_BUFFER_READ); // TODO: MP_BUFFER_READ?
if (ret != 0) {
@@ -441,7 +455,7 @@
(void)kind;
mp_obj_ffivar_t *self = MP_OBJ_TO_PTR(self_in);
// Variable value printed as cast to int
- mp_printf(print, "<ffivar @%p: 0x%x>", self->var, *(int*)self->var);
+ mp_printf(print, "<ffivar @%p: 0x%x>", self->var, *(int *)self->var);
}
STATIC mp_obj_t ffivar_get(mp_obj_t self_in) {
@@ -468,7 +482,7 @@
{ &mp_type_type },
.name = MP_QSTR_ffivar,
.print = ffivar_print,
- .locals_dict = (mp_obj_dict_t*)&ffivar_locals_dict,
+ .locals_dict = (mp_obj_dict_t *)&ffivar_locals_dict,
};
// Generic opaque storage object (unused)
@@ -487,7 +501,7 @@
MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mod_ffi_open_obj, 1, 2, mod_ffi_open);
STATIC mp_obj_t mod_ffi_as_bytearray(mp_obj_t ptr, mp_obj_t size) {
- return mp_obj_new_bytearray_by_ref(mp_obj_int_get_truncated(size), (void*)(uintptr_t)mp_obj_int_get_truncated(ptr));
+ return mp_obj_new_bytearray_by_ref(mp_obj_int_get_truncated(size), (void *)(uintptr_t)mp_obj_int_get_truncated(ptr));
}
MP_DEFINE_CONST_FUN_OBJ_2(mod_ffi_as_bytearray_obj, mod_ffi_as_bytearray);
@@ -503,5 +517,5 @@
const mp_obj_module_t mp_module_ffi = {
.base = { &mp_type_module },
- .globals = (mp_obj_dict_t*)&mp_module_ffi_globals,
+ .globals = (mp_obj_dict_t *)&mp_module_ffi_globals,
};
diff --git a/ports/unix/modjni.c b/ports/unix/modjni.c
index 902c34f..f5dbd9c 100644
--- a/ports/unix/modjni.c
+++ b/ports/unix/modjni.c
@@ -179,7 +179,7 @@
.print = jclass_print,
.attr = jclass_attr,
.call = jclass_call,
- .locals_dict = (mp_obj_dict_t*)&jclass_locals_dict,
+ .locals_dict = (mp_obj_dict_t *)&jclass_locals_dict,
};
STATIC mp_obj_t new_jclass(jclass jc) {
@@ -288,7 +288,7 @@
}
-return MP_OBJ_NULL;
+ return MP_OBJ_NULL;
}
STATIC mp_obj_t jobject_unary_op(mp_unary_op_t op, mp_obj_t self_in) {
@@ -364,10 +364,10 @@
#define IMATCH(s, static) ((!strncmp(s, static, sizeof(static) - 1)) && (s += sizeof(static) - 1))
#define CHECK_TYPE(java_type_name) \
- if (strncmp(arg_type, java_type_name, sizeof(java_type_name) - 1) != 0) { \
- return false; \
- } \
- arg_type += sizeof(java_type_name) - 1;
+ if (strncmp(arg_type, java_type_name, sizeof(java_type_name) - 1) != 0) { \
+ return false; \
+ } \
+ arg_type += sizeof(java_type_name) - 1;
STATIC const char *strprev(const char *s, char c) {
while (*s != c) {
@@ -481,7 +481,7 @@
ret_type = strprev(ret_type, ' ') + 1;
int name_len = strlen(name);
- if (strncmp(name, meth_name, name_len/*arg_types - meth_name - 1*/) || meth_name[name_len] != '('/*(*/) {
+ if (strncmp(name, meth_name, name_len /*arg_types - meth_name - 1*/) || meth_name[name_len] != '(' /*(*/) {
goto next_method;
}
}
@@ -541,7 +541,7 @@
}
}
-next_method:
+ next_method:
JJ(ReleaseStringUTFChars, name_o, decl);
JJ(DeleteLocalRef, name_o);
JJ(DeleteLocalRef, meth);
@@ -601,9 +601,9 @@
if (!libjvm) {
mp_raise_msg(&mp_type_OSError, "unable to load libjvm.so, use LD_LIBRARY_PATH");
}
- int (*_JNI_CreateJavaVM)(void*, void**, void*) = dlsym(libjvm, "JNI_CreateJavaVM");
+ int (*_JNI_CreateJavaVM)(void *, void **, void *) = dlsym(libjvm, "JNI_CreateJavaVM");
- int st = _JNI_CreateJavaVM(&jvm, (void**)&env, &args);
+ int st = _JNI_CreateJavaVM(&jvm, (void **)&env, &args);
if (st < 0 || !env) {
mp_raise_msg(&mp_type_OSError, "unable to create JVM");
}
@@ -614,26 +614,26 @@
jclass Object_class = JJ(FindClass, "java/lang/Object");
Object_toString_mid = JJ(GetMethodID, Object_class, "toString",
- "()Ljava/lang/String;");
+ "()Ljava/lang/String;");
Class_getName_mid = (*env)->GetMethodID(env, Class_class, "getName",
- "()Ljava/lang/String;");
+ "()Ljava/lang/String;");
Class_getField_mid = (*env)->GetMethodID(env, Class_class, "getField",
- "(Ljava/lang/String;)Ljava/lang/reflect/Field;");
+ "(Ljava/lang/String;)Ljava/lang/reflect/Field;");
Class_getMethods_mid = (*env)->GetMethodID(env, Class_class, "getMethods",
- "()[Ljava/lang/reflect/Method;");
+ "()[Ljava/lang/reflect/Method;");
Class_getConstructors_mid = (*env)->GetMethodID(env, Class_class, "getConstructors",
- "()[Ljava/lang/reflect/Constructor;");
+ "()[Ljava/lang/reflect/Constructor;");
Method_getName_mid = (*env)->GetMethodID(env, method_class, "getName",
- "()Ljava/lang/String;");
+ "()Ljava/lang/String;");
List_class = JJ(FindClass, "java/util/List");
List_get_mid = JJ(GetMethodID, List_class, "get",
- "(I)Ljava/lang/Object;");
+ "(I)Ljava/lang/Object;");
List_set_mid = JJ(GetMethodID, List_class, "set",
- "(ILjava/lang/Object;)Ljava/lang/Object;");
+ "(ILjava/lang/Object;)Ljava/lang/Object;");
List_size_mid = JJ(GetMethodID, List_class, "size",
- "()I");
+ "()I");
IndexException_class = JJ(FindClass, "java/lang/IndexOutOfBoundsException");
}
@@ -715,5 +715,5 @@
const mp_obj_module_t mp_module_jni = {
.base = { &mp_type_module },
- .globals = (mp_obj_dict_t*)&mp_module_jni_globals,
+ .globals = (mp_obj_dict_t *)&mp_module_jni_globals,
};
diff --git a/ports/unix/modmachine.c b/ports/unix/modmachine.c
index a3e5751..492b49c 100644
--- a/ports/unix/modmachine.c
+++ b/ports/unix/modmachine.c
@@ -95,7 +95,7 @@
const mp_obj_module_t mp_module_machine = {
.base = { &mp_type_module },
- .globals = (mp_obj_dict_t*)&machine_module_globals,
+ .globals = (mp_obj_dict_t *)&machine_module_globals,
};
#endif // MICROPY_PY_MACHINE
diff --git a/ports/unix/modos.c b/ports/unix/modos.c
index 5b70aee..1414f87 100644
--- a/ports/unix/modos.c
+++ b/ports/unix/modos.c
@@ -331,5 +331,5 @@
const mp_obj_module_t mp_module_os = {
.base = { &mp_type_module },
- .globals = (mp_obj_dict_t*)&mp_module_os_globals,
+ .globals = (mp_obj_dict_t *)&mp_module_os_globals,
};
diff --git a/ports/unix/modtermios.c b/ports/unix/modtermios.c
index 85eabf3..7a578be 100644
--- a/ports/unix/modtermios.c
+++ b/ports/unix/modtermios.c
@@ -58,7 +58,7 @@
// but no way unicode chars could be there, if c_cc is defined to be a
// a "char". But it's type is actually cc_t, which can be anything.
// TODO: For now, we still deal with it like that.
- cc->items[i] = mp_obj_new_bytes((byte*)&term.c_cc[i], 1);
+ cc->items[i] = mp_obj_new_bytes((byte *)&term.c_cc[i], 1);
}
}
return MP_OBJ_FROM_PTR(r);
@@ -129,7 +129,7 @@
{ MP_ROM_QSTR(MP_QSTR_tcsetattr), MP_ROM_PTR(&mod_termios_tcsetattr_obj) },
{ MP_ROM_QSTR(MP_QSTR_setraw), MP_ROM_PTR(&mod_termios_setraw_obj) },
-#define C(name) { MP_ROM_QSTR(MP_QSTR_ ## name), MP_ROM_INT(name) }
+#define C(name) { MP_ROM_QSTR(MP_QSTR_##name), MP_ROM_INT(name) }
C(TCSANOW),
C(B9600),
@@ -146,5 +146,5 @@
const mp_obj_module_t mp_module_termios = {
.base = { &mp_type_module },
- .globals = (mp_obj_dict_t*)&mp_module_termios_globals,
+ .globals = (mp_obj_dict_t *)&mp_module_termios_globals,
};
diff --git a/ports/unix/modtime.c b/ports/unix/modtime.c
index 4ea8cb6..78068b3 100644
--- a/ports/unix/modtime.c
+++ b/ports/unix/modtime.c
@@ -67,32 +67,32 @@
#endif
STATIC mp_obj_t mod_time_time(void) {
-#if MICROPY_PY_BUILTINS_FLOAT
+ #if MICROPY_PY_BUILTINS_FLOAT
struct timeval tv;
gettimeofday(&tv, NULL);
mp_float_t val = tv.tv_sec + (mp_float_t)tv.tv_usec / 1000000;
return mp_obj_new_float(val);
-#else
+ #else
return mp_obj_new_int((mp_int_t)time(NULL));
-#endif
+ #endif
}
STATIC MP_DEFINE_CONST_FUN_OBJ_0(mod_time_time_obj, mod_time_time);
// Note: this is deprecated since CPy3.3, but pystone still uses it.
STATIC mp_obj_t mod_time_clock(void) {
-#if MICROPY_PY_BUILTINS_FLOAT
+ #if MICROPY_PY_BUILTINS_FLOAT
// float cannot represent full range of int32 precisely, so we pre-divide
// int to reduce resolution, and then actually do float division hoping
// to preserve integer part resolution.
return mp_obj_new_float((float)(clock() / 1000) / CLOCK_DIV);
-#else
+ #else
return mp_obj_new_int((mp_int_t)clock());
-#endif
+ #endif
}
STATIC MP_DEFINE_CONST_FUN_OBJ_0(mod_time_clock_obj, mod_time_clock);
STATIC mp_obj_t mod_time_sleep(mp_obj_t arg) {
-#if MICROPY_PY_BUILTINS_FLOAT
+ #if MICROPY_PY_BUILTINS_FLOAT
struct timeval tv;
mp_float_t val = mp_obj_get_float(arg);
double ipart;
@@ -116,12 +116,12 @@
#endif
}
RAISE_ERRNO(res, errno);
-#else
+ #else
// TODO: Handle EINTR
MP_THREAD_GIL_EXIT();
sleep(mp_obj_get_int(arg));
MP_THREAD_GIL_ENTER();
-#endif
+ #endif
return mp_const_none;
}
STATIC MP_DEFINE_CONST_FUN_OBJ_1(mod_time_sleep_obj, mod_time_sleep);
@@ -212,7 +212,7 @@
const mp_obj_module_t mp_module_time = {
.base = { &mp_type_module },
- .globals = (mp_obj_dict_t*)&mp_module_time_globals,
+ .globals = (mp_obj_dict_t *)&mp_module_time_globals,
};
#endif // MICROPY_PY_UTIME
diff --git a/ports/unix/moduos_vfs.c b/ports/unix/moduos_vfs.c
index d4171d0..6e4f352 100644
--- a/ports/unix/moduos_vfs.c
+++ b/ports/unix/moduos_vfs.c
@@ -88,7 +88,7 @@
const mp_obj_module_t mp_module_uos_vfs = {
.base = { &mp_type_module },
- .globals = (mp_obj_dict_t*)&uos_vfs_module_globals,
+ .globals = (mp_obj_dict_t *)&uos_vfs_module_globals,
};
#endif // MICROPY_VFS
diff --git a/ports/unix/moduselect.c b/ports/unix/moduselect.c
index 4a095ec..a48e904 100644
--- a/ports/unix/moduselect.c
+++ b/ports/unix/moduselect.c
@@ -315,7 +315,7 @@
.name = MP_QSTR_poll,
.getiter = mp_identity_getiter,
.iternext = poll_iternext,
- .locals_dict = (void*)&poll_locals_dict,
+ .locals_dict = (void *)&poll_locals_dict,
};
STATIC mp_obj_t select_poll(size_t n_args, const mp_obj_t *args) {
@@ -348,7 +348,7 @@
const mp_obj_module_t mp_module_uselect = {
.base = { &mp_type_module },
- .globals = (mp_obj_dict_t*)&mp_module_select_globals,
+ .globals = (mp_obj_dict_t *)&mp_module_select_globals,
};
#endif // MICROPY_PY_USELECT_POSIX
diff --git a/ports/unix/modusocket.c b/ports/unix/modusocket.c
index 85e4628..4c5d5d2 100644
--- a/ports/unix/modusocket.c
+++ b/ports/unix/modusocket.c
@@ -208,7 +208,7 @@
byte addr[32];
socklen_t addr_len = sizeof(addr);
MP_THREAD_GIL_EXIT();
- int fd = accept(self->fd, (struct sockaddr*)&addr, &addr_len);
+ int fd = accept(self->fd, (struct sockaddr *)&addr, &addr_len);
MP_THREAD_GIL_ENTER();
int err = errno;
if (fd == -1 && self->blocking && err == EAGAIN) {
@@ -263,7 +263,7 @@
byte *buf = m_new(byte, sz);
MP_THREAD_GIL_EXIT();
- int out_sz = recvfrom(self->fd, buf, sz, flags, (struct sockaddr*)&addr, &addr_len);
+ int out_sz = recvfrom(self->fd, buf, sz, flags, (struct sockaddr *)&addr, &addr_len);
MP_THREAD_GIL_ENTER();
RAISE_ERRNO(out_sz, errno);
@@ -272,7 +272,7 @@
mp_obj_tuple_t *t = MP_OBJ_TO_PTR(mp_obj_new_tuple(2, NULL));
t->items[0] = buf_o;
- t->items[1] = mp_obj_from_sockaddr((struct sockaddr*)&addr, addr_len);
+ t->items[1] = mp_obj_from_sockaddr((struct sockaddr *)&addr, addr_len);
return MP_OBJ_FROM_PTR(t);
}
@@ -315,7 +315,7 @@
mp_get_buffer_raise(dst_addr, &addr_bi, MP_BUFFER_READ);
MP_THREAD_GIL_EXIT();
int out_sz = sendto(self->fd, bufinfo.buf, bufinfo.len, flags,
- (struct sockaddr *)addr_bi.buf, addr_bi.len);
+ (struct sockaddr *)addr_bi.buf, addr_bi.len);
MP_THREAD_GIL_ENTER();
RAISE_ERRNO(out_sz, errno);
@@ -425,7 +425,7 @@
mp_obj_t *new_args = alloca(n_args * sizeof(mp_obj_t));
memcpy(new_args + 1, args + 1, (n_args - 1) * sizeof(mp_obj_t));
new_args[0] = MP_OBJ_NEW_SMALL_INT(self->fd);
- return mp_builtin_open(n_args, new_args, (mp_map_t*)&mp_const_empty_map);
+ return mp_builtin_open(n_args, new_args, (mp_map_t *)&mp_const_empty_map);
}
STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(socket_makefile_obj, 1, 3, socket_makefile);
@@ -494,7 +494,7 @@
.getiter = NULL,
.iternext = NULL,
.protocol = &usocket_stream_p,
- .locals_dict = (mp_obj_dict_t*)&usocket_locals_dict,
+ .locals_dict = (mp_obj_dict_t *)&usocket_locals_dict,
};
#define BINADDR_MAX_LEN sizeof(struct in6_addr)
@@ -548,8 +548,8 @@
snprintf(buf, sizeof(buf), "%u", port);
serv = buf;
hints.ai_flags = AI_NUMERICSERV;
-#ifdef __UCLIBC_MAJOR__
-#if __UCLIBC_MAJOR__ == 0 && (__UCLIBC_MINOR__ < 9 || (__UCLIBC_MINOR__ == 9 && __UCLIBC_SUBLEVEL__ <= 32))
+ #ifdef __UCLIBC_MAJOR__
+ #if __UCLIBC_MAJOR__ == 0 && (__UCLIBC_MINOR__ < 9 || (__UCLIBC_MINOR__ == 9 && __UCLIBC_SUBLEVEL__ <= 32))
// "warning" requires -Wno-cpp which is a relatively new gcc option, so we choose not to use it.
//#warning Working around uClibc bug with numeric service name
// Older versions og uClibc have bugs when numeric ports in service
@@ -560,8 +560,8 @@
// Note that this is crude workaround, precluding UDP socket addresses
// to be returned. TODO: set only if not set by Python args.
hints.ai_socktype = SOCK_STREAM;
-#endif
-#endif
+ #endif
+ #endif
} else {
serv = mp_obj_str_get_str(args[1]);
}
@@ -608,30 +608,30 @@
STATIC mp_obj_t mod_socket_sockaddr(mp_obj_t sockaddr_in) {
mp_buffer_info_t bufinfo;
mp_get_buffer_raise(sockaddr_in, &bufinfo, MP_BUFFER_READ);
- switch (((struct sockaddr*)bufinfo.buf)->sa_family) {
+ switch (((struct sockaddr *)bufinfo.buf)->sa_family) {
case AF_INET: {
- struct sockaddr_in *sa = (struct sockaddr_in*)bufinfo.buf;
+ struct sockaddr_in *sa = (struct sockaddr_in *)bufinfo.buf;
mp_obj_tuple_t *t = MP_OBJ_TO_PTR(mp_obj_new_tuple(3, NULL));
t->items[0] = MP_OBJ_NEW_SMALL_INT(AF_INET);
- t->items[1] = mp_obj_new_bytes((byte*)&sa->sin_addr, sizeof(sa->sin_addr));
+ t->items[1] = mp_obj_new_bytes((byte *)&sa->sin_addr, sizeof(sa->sin_addr));
t->items[2] = MP_OBJ_NEW_SMALL_INT(ntohs(sa->sin_port));
return MP_OBJ_FROM_PTR(t);
}
case AF_INET6: {
- struct sockaddr_in6 *sa = (struct sockaddr_in6*)bufinfo.buf;
+ struct sockaddr_in6 *sa = (struct sockaddr_in6 *)bufinfo.buf;
mp_obj_tuple_t *t = MP_OBJ_TO_PTR(mp_obj_new_tuple(5, NULL));
t->items[0] = MP_OBJ_NEW_SMALL_INT(AF_INET6);
- t->items[1] = mp_obj_new_bytes((byte*)&sa->sin6_addr, sizeof(sa->sin6_addr));
+ t->items[1] = mp_obj_new_bytes((byte *)&sa->sin6_addr, sizeof(sa->sin6_addr));
t->items[2] = MP_OBJ_NEW_SMALL_INT(ntohs(sa->sin6_port));
t->items[3] = MP_OBJ_NEW_SMALL_INT(ntohl(sa->sin6_flowinfo));
t->items[4] = MP_OBJ_NEW_SMALL_INT(ntohl(sa->sin6_scope_id));
return MP_OBJ_FROM_PTR(t);
}
default: {
- struct sockaddr *sa = (struct sockaddr*)bufinfo.buf;
+ struct sockaddr *sa = (struct sockaddr *)bufinfo.buf;
mp_obj_tuple_t *t = MP_OBJ_TO_PTR(mp_obj_new_tuple(2, NULL));
t->items[0] = MP_OBJ_NEW_SMALL_INT(sa->sa_family);
- t->items[1] = mp_obj_new_bytes((byte*)sa->sa_data, bufinfo.len - offsetof(struct sockaddr, sa_data));
+ t->items[1] = mp_obj_new_bytes((byte *)sa->sa_data, bufinfo.len - offsetof(struct sockaddr, sa_data));
return MP_OBJ_FROM_PTR(t);
}
}
@@ -647,7 +647,7 @@
{ MP_ROM_QSTR(MP_QSTR_inet_ntop), MP_ROM_PTR(&mod_socket_inet_ntop_obj) },
{ MP_ROM_QSTR(MP_QSTR_sockaddr), MP_ROM_PTR(&mod_socket_sockaddr_obj) },
-#define C(name) { MP_ROM_QSTR(MP_QSTR_ ## name), MP_ROM_INT(name) }
+#define C(name) { MP_ROM_QSTR(MP_QSTR_##name), MP_ROM_INT(name) }
C(AF_UNIX),
C(AF_INET),
C(AF_INET6),
@@ -671,5 +671,5 @@
const mp_obj_module_t mp_module_socket = {
.base = { &mp_type_module },
- .globals = (mp_obj_dict_t*)&mp_module_socket_globals,
+ .globals = (mp_obj_dict_t *)&mp_module_socket_globals,
};
diff --git a/ports/unix/mpconfigport.h b/ports/unix/mpconfigport.h
index 2f01aff..fc2e231 100644
--- a/ports/unix/mpconfigport.h
+++ b/ports/unix/mpconfigport.h
@@ -44,7 +44,7 @@
#endif
#if !defined(MICROPY_EMIT_THUMB) && defined(__thumb2__)
#define MICROPY_EMIT_THUMB (1)
- #define MICROPY_MAKE_POINTER_CALLABLE(p) ((void*)((mp_uint_t)(p) | 1))
+ #define MICROPY_MAKE_POINTER_CALLABLE(p) ((void *)((mp_uint_t)(p) | 1))
#endif
// Some compilers define __thumb2__ and __arm__ at the same time, let
// autodetected thumb2 emitter have priority.
@@ -271,7 +271,7 @@
typedef long mp_off_t;
#endif
-void mp_unix_alloc_exec(size_t min_size, void** ptr, size_t *size);
+void mp_unix_alloc_exec(size_t min_size, void **ptr, size_t *size);
void mp_unix_free_exec(void *ptr, size_t size);
void mp_unix_mark_exec(void);
#define MP_PLAT_ALLOC_EXEC(min_size, ptr, size) mp_unix_alloc_exec(min_size, ptr, size)
@@ -286,10 +286,10 @@
#define MP_PLAT_PRINT_STRN(str, len) mp_hal_stdout_tx_strn_cooked(str, len)
#else
#define MP_PLAT_PRINT_STRN(str, len) do { \
- MP_THREAD_GIL_EXIT(); \
- ssize_t ret = write(1, str, len); \
- MP_THREAD_GIL_ENTER(); \
- (void)ret; \
+ MP_THREAD_GIL_EXIT(); \
+ ssize_t ret = write(1, str, len); \
+ MP_THREAD_GIL_ENTER(); \
+ (void)ret; \
} while (0)
#endif
diff --git a/ports/unix/mphalport.h b/ports/unix/mphalport.h
index cb86e70..daa9c73 100644
--- a/ports/unix/mphalport.h
+++ b/ports/unix/mphalport.h
@@ -42,7 +42,7 @@
#include "input.h"
#define mp_hal_readline mp_hal_readline
static inline int mp_hal_readline(vstr_t *vstr, const char *p) {
- char *line = prompt((char*)p);
+ char *line = prompt((char *)p);
vstr_add_str(vstr, line);
free(line);
return 0;
@@ -65,10 +65,14 @@
// TODO: POSIX et al. define usleep() as guaranteedly capable only of 1s sleep:
// "The useconds argument shall be less than one million."
-static inline void mp_hal_delay_ms(mp_uint_t ms) { usleep((ms) * 1000); }
-static inline void mp_hal_delay_us(mp_uint_t us) { usleep(us); }
+static inline void mp_hal_delay_ms(mp_uint_t ms) {
+ usleep((ms) * 1000);
+}
+static inline void mp_hal_delay_us(mp_uint_t us) {
+ usleep(us);
+}
#define mp_hal_ticks_cpu() 0
#define RAISE_ERRNO(err_flag, error_val) \
{ if (err_flag == -1) \
- { mp_raise_OSError(error_val); } }
+ { mp_raise_OSError(error_val); } }
diff --git a/ports/unix/mpthreadport.c b/ports/unix/mpthreadport.c
index 4ee6923..c604c5d 100644
--- a/ports/unix/mpthreadport.c
+++ b/ports/unix/mpthreadport.c
@@ -82,8 +82,8 @@
// gc_collect_regs_and_stack function above
//gc_collect_root((void**)context, sizeof(ucontext_t) / sizeof(uintptr_t));
#if MICROPY_ENABLE_PYSTACK
- void **ptrs = (void**)(void*)MP_STATE_THREAD(pystack_start);
- gc_collect_root(ptrs, (MP_STATE_THREAD(pystack_cur) - MP_STATE_THREAD(pystack_start)) / sizeof(void*));
+ void **ptrs = (void **)(void *)MP_STATE_THREAD(pystack_start);
+ gc_collect_root(ptrs, (MP_STATE_THREAD(pystack_cur) - MP_STATE_THREAD(pystack_start)) / sizeof(void *));
#endif
#if defined (__APPLE__)
sem_post(thread_signal_done_p);
@@ -163,7 +163,7 @@
}
mp_state_thread_t *mp_thread_get_state(void) {
- return (mp_state_thread_t*)pthread_getspecific(tls_key);
+ return (mp_state_thread_t *)pthread_getspecific(tls_key);
}
void mp_thread_set_state(mp_state_thread_t *state) {
@@ -182,7 +182,7 @@
pthread_mutex_unlock(&thread_mutex);
}
-void mp_thread_create(void *(*entry)(void*), void *arg, size_t *stack_size) {
+void mp_thread_create(void *(*entry)(void *), void *arg, size_t *stack_size) {
// default stack size is 8k machine-words
if (*stack_size == 0) {
*stack_size = 8192 * BYTES_PER_WORD;
diff --git a/ports/unix/unix_mphal.c b/ports/unix/unix_mphal.c
index f7570a3..0d7638f 100644
--- a/ports/unix/unix_mphal.c
+++ b/ports/unix/unix_mphal.c
@@ -132,7 +132,7 @@
return -1;
}
nlr_pop();
- return *(byte*)bufinfo.buf;
+ return *(byte *)bufinfo.buf;
} else {
// Temporarily disable dupterm to avoid infinite recursion
mp_obj_t save_term = MP_STATE_VM(dupterm_objs[idx]);
@@ -147,12 +147,12 @@
#endif
int mp_hal_stdin_rx_chr(void) {
-#if MICROPY_PY_OS_DUPTERM
+ #if MICROPY_PY_OS_DUPTERM
// TODO only support dupterm one slot at the moment
if (MP_STATE_VM(dupterm_objs[0]) != MP_OBJ_NULL) {
int c;
do {
- c = call_dupterm_read(0);
+ c = call_dupterm_read(0);
} while (c == -2);
if (c == -1) {
goto main_term;
@@ -163,7 +163,7 @@
return c;
}
main_term:;
-#endif
+ #endif
MP_THREAD_GIL_EXIT();
unsigned char c;
diff --git a/ports/windows/fmode.c b/ports/windows/fmode.c
index 33ba24e..a7976b8 100644
--- a/ports/windows/fmode.c
+++ b/ports/windows/fmode.c
@@ -32,12 +32,12 @@
// Workaround for setting file translation mode: we must distinguish toolsets
// since mingw has no _set_fmode, and altering msvc's _fmode directly has no effect
STATIC int set_fmode_impl(int mode) {
-#ifndef _MSC_VER
+ #ifndef _MSC_VER
_fmode = mode;
return 0;
-#else
+ #else
return _set_fmode(mode);
-#endif
+ #endif
}
void set_fmode_binary(void) {
diff --git a/ports/windows/init.c b/ports/windows/init.c
index 73ab713..930400f 100644
--- a/ports/windows/init.c
+++ b/ports/windows/init.c
@@ -41,7 +41,7 @@
#endif
void init() {
-#ifdef _MSC_VER
+ #ifdef _MSC_VER
// Disable the 'Debug Error!' dialog for assertions failures and the likes,
// instead write messages to the debugger output and terminate.
_CrtSetReportMode(_CRT_ASSERT, _CRTDBG_MODE_DEBUG);
@@ -52,16 +52,16 @@
// passing invalid file descriptors to functions like lseek() and make the
// functions called behave properly by setting errno to EBADF/EINVAL/..
_set_invalid_parameter_handler(invalid_param_handler);
-#endif
+ #endif
SetConsoleCtrlHandler(console_sighandler, TRUE);
init_sleep();
-#ifdef __MINGW32__
+ #ifdef __MINGW32__
putenv("PRINTF_EXPONENT_DIGITS=2");
-#elif _MSC_VER < 1900
+ #elif _MSC_VER < 1900
// This is only necessary for Visual Studio versions 2013 and below:
// https://msdn.microsoft.com/en-us/library/bb531344(v=vs.140).aspx
_set_output_format(_TWO_DIGIT_EXPONENT);
-#endif
+ #endif
set_fmode_binary();
}
diff --git a/ports/windows/mpconfigport.h b/ports/windows/mpconfigport.h
index 2d852a8..0018b4f 100644
--- a/ports/windows/mpconfigport.h
+++ b/ports/windows/mpconfigport.h
@@ -243,12 +243,12 @@
#define S_ISDIR(m) (((m) & S_IFMT) == S_IFDIR)
#ifdef _WIN64
#define SSIZE_MAX _I64_MAX
-typedef __int64 ssize_t;
+typedef __int64 ssize_t;
#else
#define SSIZE_MAX _I32_MAX
-typedef int ssize_t;
+typedef int ssize_t;
#endif
-typedef mp_off_t off_t;
+typedef mp_off_t off_t;
// Put static/global variables in sections with a known name
diff --git a/ports/windows/realpath.c b/ports/windows/realpath.c
index ac9adf8..5e429ef 100644
--- a/ports/windows/realpath.c
+++ b/ports/windows/realpath.c
@@ -33,8 +33,9 @@
if (p != NULL) {
char *pp = p;
while (*pp != 0) {
- if (*pp == '\\')
+ if (*pp == '\\') {
*pp = '/';
+ }
++pp;
}
}
@@ -50,14 +51,16 @@
errno = EINVAL;
} else if (access(path, R_OK) == 0) {
ret = resolved_path;
- if (ret == NULL)
+ if (ret == NULL) {
ret = malloc(_MAX_PATH);
+ }
if (ret == NULL) {
errno = ENOMEM;
} else {
ret = _fullpath(ret, path, _MAX_PATH);
- if (ret == NULL)
+ if (ret == NULL) {
errno = EIO;
+ }
}
}
return to_unix_path(ret);
diff --git a/ports/windows/windows_mphal.c b/ports/windows/windows_mphal.c
index e0c1255..7835c61 100644
--- a/ports/windows/windows_mphal.c
+++ b/ports/windows/windows_mphal.c
@@ -47,8 +47,8 @@
STATIC void assure_conout_handle() {
if (!con_out) {
con_out = CreateFile("CONOUT$", GENERIC_READ | GENERIC_WRITE,
- FILE_SHARE_READ | FILE_SHARE_WRITE,
- NULL, OPEN_EXISTING, 0, 0);
+ FILE_SHARE_READ | FILE_SHARE_WRITE,
+ NULL, OPEN_EXISTING, 0, 0);
assert(con_out != INVALID_HANDLE_VALUE);
}
}
@@ -198,25 +198,25 @@
DWORD num_read;
INPUT_RECORD rec;
for (;;) {
- MP_THREAD_GIL_EXIT();
- status = ReadConsoleInput(std_in, &rec, 1, &num_read)
- MP_THREAD_GIL_ENTER();
- if (!status || !num_read) {
- return CHAR_CTRL_C; // EOF, ctrl-D
- }
- if (rec.EventType != KEY_EVENT || !rec.Event.KeyEvent.bKeyDown) { // only want key down events
- continue;
- }
- const bool ctrl_key_down = (rec.Event.KeyEvent.dwControlKeyState & LEFT_CTRL_PRESSED) ||
- (rec.Event.KeyEvent.dwControlKeyState & RIGHT_CTRL_PRESSED);
- const int ret = esc_seq_process_vk(rec.Event.KeyEvent.wVirtualKeyCode, ctrl_key_down);
- if (ret) {
- return ret;
- }
- const char c = rec.Event.KeyEvent.uChar.AsciiChar;
- if (c) { // plain ascii char, return it
- return c;
- }
+ MP_THREAD_GIL_EXIT();
+ status = ReadConsoleInput(std_in, &rec, 1, &num_read)
+ MP_THREAD_GIL_ENTER();
+ if (!status || !num_read) {
+ return CHAR_CTRL_C; // EOF, ctrl-D
+ }
+ if (rec.EventType != KEY_EVENT || !rec.Event.KeyEvent.bKeyDown) { // only want key down events
+ continue;
+ }
+ const bool ctrl_key_down = (rec.Event.KeyEvent.dwControlKeyState & LEFT_CTRL_PRESSED) ||
+ (rec.Event.KeyEvent.dwControlKeyState & RIGHT_CTRL_PRESSED);
+ const int ret = esc_seq_process_vk(rec.Event.KeyEvent.wVirtualKeyCode, ctrl_key_down);
+ if (ret) {
+ return ret;
+ }
+ const char c = rec.Event.KeyEvent.uChar.AsciiChar;
+ if (c) { // plain ascii char, return it
+ return c;
+ }
}
}
@@ -249,9 +249,9 @@
mp_uint_t mp_hal_ticks_cpu(void) {
LARGE_INTEGER value;
QueryPerformanceCounter(&value);
-#ifdef _WIN64
+ #ifdef _WIN64
return value.QuadPart;
-#else
+ #else
return value.LowPart;
-#endif
+ #endif
}
diff --git a/ports/zephyr/help.c b/ports/zephyr/help.c
index becc203..4ee674b 100644
--- a/ports/zephyr/help.c
+++ b/ports/zephyr/help.c
@@ -27,14 +27,14 @@
#include "py/builtin.h"
const char zephyr_help_text[] =
-"Welcome to MicroPython!\n"
-"\n"
-"Control commands:\n"
-" CTRL-A -- on a blank line, enter raw REPL mode\n"
-" CTRL-B -- on a blank line, enter normal REPL mode\n"
-" CTRL-C -- interrupt a running program\n"
-" CTRL-D -- on a blank line, do a soft reset of the board\n"
-" CTRL-E -- on a blank line, enter paste mode\n"
-"\n"
-"For further help on a specific object, type help(obj)\n"
+ "Welcome to MicroPython!\n"
+ "\n"
+ "Control commands:\n"
+ " CTRL-A -- on a blank line, enter raw REPL mode\n"
+ " CTRL-B -- on a blank line, enter normal REPL mode\n"
+ " CTRL-C -- interrupt a running program\n"
+ " CTRL-D -- on a blank line, do a soft reset of the board\n"
+ " CTRL-E -- on a blank line, enter paste mode\n"
+ "\n"
+ "For further help on a specific object, type help(obj)\n"
;
diff --git a/ports/zephyr/machine_i2c.c b/ports/zephyr/machine_i2c.c
index 087cf4b..0f16095 100644
--- a/ports/zephyr/machine_i2c.c
+++ b/ports/zephyr/machine_i2c.c
@@ -97,7 +97,7 @@
struct i2c_msg msg;
int ret;
- msg.buf = (u8_t*)buf;
+ msg.buf = (u8_t *)buf;
msg.len = len;
msg.flags = 0;
@@ -133,5 +133,5 @@
.print = machine_hard_i2c_print,
.make_new = machine_hard_i2c_make_new,
.protocol = &machine_hard_i2c_p,
- .locals_dict = (mp_obj_dict_t*)&mp_machine_soft_i2c_locals_dict,
+ .locals_dict = (mp_obj_dict_t *)&mp_machine_soft_i2c_locals_dict,
};
diff --git a/ports/zephyr/main.c b/ports/zephyr/main.c
index 7c64589..6ed8c51 100644
--- a/ports/zephyr/main.c
+++ b/ports/zephyr/main.c
@@ -57,7 +57,7 @@
void init_zephyr(void) {
// We now rely on CONFIG_NET_APP_SETTINGS to set up bootstrap
// network addresses.
-#if 0
+ #if 0
#ifdef CONFIG_NETWORKING
if (net_if_get_default() == NULL) {
// If there's no default networking interface,
@@ -78,7 +78,7 @@
static struct in6_addr in6addr_my = {{{0x20, 0x01, 0x0d, 0xb8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1}}};
net_if_ipv6_addr_add(net_if_get_default(), &in6addr_my, NET_ADDR_MANUAL, 0);
#endif
-#endif
+ #endif
}
int real_main(void) {
@@ -160,7 +160,9 @@
MP_DEFINE_CONST_FUN_OBJ_KW(mp_builtin_open_obj, 1, mp_builtin_open);
NORETURN void nlr_jump_fail(void *val) {
- while (1);
+ while (1) {
+ ;
+ }
}
#ifndef NDEBUG
diff --git a/ports/zephyr/modmachine.c b/ports/zephyr/modmachine.c
index dd79774..72078cf 100644
--- a/ports/zephyr/modmachine.c
+++ b/ports/zephyr/modmachine.c
@@ -72,7 +72,7 @@
const mp_obj_module_t mp_module_machine = {
.base = { &mp_type_module },
- .globals = (mp_obj_dict_t*)&machine_module_globals,
+ .globals = (mp_obj_dict_t *)&machine_module_globals,
};
#endif // MICROPY_PY_MACHINE
diff --git a/ports/zephyr/moduos.c b/ports/zephyr/moduos.c
index 46745e6..49d5744 100644
--- a/ports/zephyr/moduos.c
+++ b/ports/zephyr/moduos.c
@@ -69,7 +69,7 @@
const mp_obj_module_t mp_module_uos = {
.base = { &mp_type_module },
- .globals = (mp_obj_dict_t*)&uos_module_globals,
+ .globals = (mp_obj_dict_t *)&uos_module_globals,
};
#endif // MICROPY_PY_UOS
diff --git a/ports/zephyr/modusocket.c b/ports/zephyr/modusocket.c
index 0830837..09d8754 100644
--- a/ports/zephyr/modusocket.c
+++ b/ports/zephyr/modusocket.c
@@ -75,18 +75,18 @@
STATIC void parse_inet_addr(socket_obj_t *socket, mp_obj_t addr_in, struct sockaddr *sockaddr) {
// We employ the fact that port and address offsets are the same for IPv4 & IPv6
- struct sockaddr_in *sockaddr_in = (struct sockaddr_in*)sockaddr;
+ struct sockaddr_in *sockaddr_in = (struct sockaddr_in *)sockaddr;
mp_obj_t *addr_items;
mp_obj_get_array_fixed_n(addr_in, 2, &addr_items);
- sockaddr_in->sin_family = net_context_get_family((void*)socket->ctx);
+ sockaddr_in->sin_family = net_context_get_family((void *)socket->ctx);
RAISE_ERRNO(net_addr_pton(sockaddr_in->sin_family, mp_obj_str_get_str(addr_items[0]), &sockaddr_in->sin_addr));
sockaddr_in->sin_port = htons(mp_obj_get_int(addr_items[1]));
}
STATIC mp_obj_t format_inet_addr(struct sockaddr *addr, mp_obj_t port) {
// We employ the fact that port and address offsets are the same for IPv4 & IPv6
- struct sockaddr_in6 *sockaddr_in6 = (struct sockaddr_in6*)addr;
+ struct sockaddr_in6 *sockaddr_in6 = (struct sockaddr_in6 *)addr;
char buf[40];
net_addr_ntop(addr->sa_family, &sockaddr_in6->sin6_addr, buf, sizeof(buf));
mp_obj_tuple_t *tuple = mp_obj_new_tuple(addr->sa_family == AF_INET ? 2 : 4, NULL);
@@ -119,7 +119,7 @@
if (self->ctx == -1) {
mp_printf(print, "<socket NULL>");
} else {
- struct net_context *ctx = (void*)self->ctx;
+ struct net_context *ctx = (void *)self->ctx;
mp_printf(print, "<socket %p type=%d>", ctx, net_context_get_type(ctx));
}
}
@@ -462,7 +462,7 @@
const mp_obj_module_t mp_module_usocket = {
.base = { &mp_type_module },
- .globals = (mp_obj_dict_t*)&mp_module_usocket_globals,
+ .globals = (mp_obj_dict_t *)&mp_module_usocket_globals,
};
#endif // MICROPY_PY_USOCKET
diff --git a/ports/zephyr/modutime.c b/ports/zephyr/modutime.c
index a5d32fe..ba9e1d8 100644
--- a/ports/zephyr/modutime.c
+++ b/ports/zephyr/modutime.c
@@ -61,7 +61,7 @@
const mp_obj_module_t mp_module_time = {
.base = { &mp_type_module },
- .globals = (mp_obj_dict_t*)&mp_module_time_globals,
+ .globals = (mp_obj_dict_t *)&mp_module_time_globals,
};
#endif // MICROPY_PY_UTIME
diff --git a/ports/zephyr/modzephyr.c b/ports/zephyr/modzephyr.c
index 02ad356..2d03ac2 100644
--- a/ports/zephyr/modzephyr.c
+++ b/ports/zephyr/modzephyr.c
@@ -49,8 +49,7 @@
extern k_tid_t const _main_thread;
extern k_tid_t const _idle_thread;
-static void thread_stack_dump(const struct k_thread *thread, void *user_data)
-{
+static void thread_stack_dump(const struct k_thread *thread, void *user_data) {
const char *th_name = k_thread_name_get((k_tid_t)thread);
if (th_name == NULL) {
@@ -59,7 +58,7 @@
th_name = tid;
}
- stack_analyze(th_name, (char*)thread->stack_info.start, thread->stack_info.size);
+ stack_analyze(th_name, (char *)thread->stack_info.start, thread->stack_info.size);
}
STATIC mp_obj_t mod_stacks_analyze(void) {
@@ -104,7 +103,7 @@
const mp_obj_module_t mp_module_zephyr = {
.base = { &mp_type_module },
- .globals = (mp_obj_dict_t*)&mp_module_time_globals,
+ .globals = (mp_obj_dict_t *)&mp_module_time_globals,
};
#endif // MICROPY_PY_ZEPHYR
diff --git a/ports/zephyr/modzsensor.c b/ports/zephyr/modzsensor.c
index 570017b..736cd22 100644
--- a/ports/zephyr/modzsensor.c
+++ b/ports/zephyr/modzsensor.c
@@ -110,14 +110,14 @@
{ &mp_type_type },
.name = MP_QSTR_Sensor,
.make_new = sensor_make_new,
- .locals_dict = (void*)&sensor_locals_dict,
+ .locals_dict = (void *)&sensor_locals_dict,
};
STATIC const mp_rom_map_elem_t mp_module_zsensor_globals_table[] = {
{ MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_zsensor) },
{ MP_ROM_QSTR(MP_QSTR_Sensor), MP_ROM_PTR(&sensor_type) },
-#define C(name) { MP_ROM_QSTR(MP_QSTR_ ## name), MP_ROM_INT(SENSOR_CHAN_ ## name) }
+#define C(name) { MP_ROM_QSTR(MP_QSTR_##name), MP_ROM_INT(SENSOR_CHAN_##name) }
C(ACCEL_X),
C(ACCEL_Y),
C(ACCEL_Z),
@@ -140,7 +140,7 @@
const mp_obj_module_t mp_module_zsensor = {
.base = { &mp_type_module },
- .globals = (mp_obj_dict_t*)&mp_module_zsensor_globals,
+ .globals = (mp_obj_dict_t *)&mp_module_zsensor_globals,
};
#endif //MICROPY_PY_UHASHLIB
diff --git a/ports/zephyr/uart_core.c b/ports/zephyr/uart_core.c
index 1c92650..fef9f00 100644
--- a/ports/zephyr/uart_core.c
+++ b/ports/zephyr/uart_core.c
@@ -36,23 +36,23 @@
// Receive single character
int mp_hal_stdin_rx_chr(void) {
-#ifdef CONFIG_CONSOLE_SUBSYS
+ #ifdef CONFIG_CONSOLE_SUBSYS
return console_getchar();
-#else
+ #else
return zephyr_getchar();
-#endif
+ #endif
}
// Send string of given length
void mp_hal_stdout_tx_strn(const char *str, mp_uint_t len) {
-#ifdef CONFIG_CONSOLE_SUBSYS
+ #ifdef CONFIG_CONSOLE_SUBSYS
while (len--) {
char c = *str++;
while (console_putchar(c) == -1) {
k_sleep(1);
}
}
-#else
+ #else
static struct device *uart_console_dev;
if (uart_console_dev == NULL) {
uart_console_dev = device_get_binding(CONFIG_UART_CONSOLE_ON_DEV_NAME);
@@ -61,5 +61,5 @@
while (len--) {
uart_poll_out(uart_console_dev, *str++);
}
-#endif
+ #endif
}
diff --git a/ports/zephyr/zephyr_storage.c b/ports/zephyr/zephyr_storage.c
index ccbd06c..c592881 100644
--- a/ports/zephyr/zephyr_storage.c
+++ b/ports/zephyr/zephyr_storage.c
@@ -134,7 +134,7 @@
.name = MP_QSTR_DiskAccess,
.print = zephyr_disk_access_print,
.make_new = zephyr_disk_access_make_new,
- .locals_dict = (mp_obj_dict_t*)&zephyr_disk_access_locals_dict,
+ .locals_dict = (mp_obj_dict_t *)&zephyr_disk_access_locals_dict,
};
#endif // CONFIG_DISK_ACCESS
@@ -256,6 +256,6 @@
.name = MP_QSTR_FlashArea,
.print = zephyr_flash_area_print,
.make_new = zephyr_flash_area_make_new,
- .locals_dict = (mp_obj_dict_t*)&zephyr_flash_area_locals_dict,
+ .locals_dict = (mp_obj_dict_t *)&zephyr_flash_area_locals_dict,
};
#endif // CONFIG_FLASH_MAP