From 299bc625864b9e624ed599c94a5f95870516139a Mon Sep 17 00:00:00 2001 From: Alexander Steffen Date: Thu, 29 Jun 2017 23:14:58 +0200 Subject: all: Unify header guard usage. The code conventions suggest using header guards, but do not define how those should look like and instead point to existing files. However, not all existing files follow the same scheme, sometimes omitting header guards altogether, sometimes using non-standard names, making it easy to accidentally pick a "wrong" example. This commit ensures that all header files of the MicroPython project (that were not simply copied from somewhere else) follow the same pattern, that was already present in the majority of files, especially in the py folder. The rules are as follows. Naming convention: * start with the words MICROPY_INCLUDED * contain the full path to the file * replace special characters with _ In addition, there are no empty lines before #ifndef, between #ifndef and one empty line before #endif. #endif is followed by a comment containing the name of the guard macro. py/grammar.h cannot use header guards by design, since it has to be included multiple times in a single C file. Several other files also do not need header guards as they are only used internally and guaranteed to be included only once: * MICROPY_MPHALPORT_H * mpconfigboard.h * mpconfigport.h * mpthreadport.h * pin_defs_*.h * qstrdefs*.h --- esp8266/uart.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'esp8266/uart.h') diff --git a/esp8266/uart.h b/esp8266/uart.h index f6850c42db..ebcd8b051a 100644 --- a/esp8266/uart.h +++ b/esp8266/uart.h @@ -1,5 +1,5 @@ -#ifndef _INCLUDED_UART_H_ -#define _INCLUDED_UART_H_ +#ifndef MICROPY_INCLUDED_ESP8266_UART_H +#define MICROPY_INCLUDED_ESP8266_UART_H #include @@ -103,4 +103,4 @@ void uart_setup(uint8 uart); int uart_rx_any(uint8 uart); int uart_tx_any_room(uint8 uart); -#endif // _INCLUDED_UART_H_ +#endif // MICROPY_INCLUDED_ESP8266_UART_H -- cgit v1.2.3 From ab2c64cc7656c8e6da9389e51f9b88270dd5a998 Mon Sep 17 00:00:00 2001 From: Ein Terakawa Date: Wed, 16 Aug 2017 10:23:27 +0000 Subject: esp8266: Fix UART stop bit constants. As per the "ESP8266 Technical Reference". --- esp8266/uart.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'esp8266/uart.h') diff --git a/esp8266/uart.h b/esp8266/uart.h index ebcd8b051a..684689a0ec 100644 --- a/esp8266/uart.h +++ b/esp8266/uart.h @@ -14,9 +14,9 @@ typedef enum { } UartBitsNum4Char; typedef enum { - UART_ONE_STOP_BIT = 0, - UART_ONE_HALF_STOP_BIT = BIT2, - UART_TWO_STOP_BIT = BIT2 + UART_ONE_STOP_BIT = 0x1, + UART_ONE_HALF_STOP_BIT = 0x2, + UART_TWO_STOP_BIT = 0x3 } UartStopBitsNum; typedef enum { -- cgit v1.2.3