From d21bbe0ad8e7ae287671e506e8468653d60fa866 Mon Sep 17 00:00:00 2001 From: Dario Nieuwenhuis Date: Mon, 6 Jun 2022 22:34:32 +0200 Subject: [PATCH] Sort interrupts. --- stm32data/__main__.py | 4 +++- stm32data/interrupts.py | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/stm32data/__main__.py b/stm32data/__main__.py index 896ed9b..48b3dd6 100755 --- a/stm32data/__main__.py +++ b/stm32data/__main__.py @@ -786,7 +786,9 @@ def parse_chips(): if pname in chip_irqs: # filter by available, because some are conditioned on - p['interrupts'] = interrupts.filter_interrupts(chip_irqs[pname], header_irqs) + irqs = interrupts.filter_interrupts(chip_irqs[pname], header_irqs) + irqs = sorted(irqs, key=lambda x: (x['signal'], x['interrupt'])) + p['interrupts'] = irqs peris.append(p) diff --git a/stm32data/interrupts.py b/stm32data/interrupts.py index ee6fee9..37175df 100644 --- a/stm32data/interrupts.py +++ b/stm32data/interrupts.py @@ -160,8 +160,8 @@ def parse(): for name, signals in irqs.items(): for (p, s) in signals: irqs2.setdefault(p, []).append({ - 'interrupt': name, 'signal': s, + 'interrupt': name, }) chip_interrupts[(nvic_name, nvic_version)] = irqs2