diff options
| author | Dave Hylands | 2019-02-14 11:56:02 -0800 |
|---|---|---|
| committer | Damien George | 2019-02-19 15:17:28 +1100 |
| commit | 92fec603d0a72e8b962fddca42af075117c36395 (patch) | |
| tree | c524fff3f8a9acffa3c62d321e2468d71c6b066b | |
| parent | 9441f4b682b29b0a03e68e5e57567a81ce05afa7 (diff) | |
stm32/make-stmconst.py: Improve regex to parse more constants.
A few RTC constants weren't being parsed properly due to whitespace
differences, and this patch makes certain whitespace optional. Changes
made:
- allow for no space between /*!< and EXTI, eg for:
__IO uint32_t IMR; /*!<EXTI Interrupt mask register, Address offset: 0x00 */
- allow for no space between semicolon and start of comment, eg for:
__IO uint32_t ALRMASSR;/*!< RTC alarm A sub second register, Address offset: 0x44 */
| -rw-r--r-- | ports/stm32/make-stmconst.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ports/stm32/make-stmconst.py b/ports/stm32/make-stmconst.py index d509d00c1..cfcc12f59 100644 --- a/ports/stm32/make-stmconst.py +++ b/ports/stm32/make-stmconst.py @@ -48,8 +48,8 @@ class Lexer: ('{', 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}) *\*/')), + ('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): |