diff options
| author | sendmmsg <47253595+sendmmsg@users.noreply.github.com> | 2021-06-24 04:27:10 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-24 12:27:10 +1000 |
| commit | d45a24a9546fec52998c66c68a5b3a4306f50199 (patch) | |
| tree | 5cb5aec868ea54b73e8f37b896936d19db537ae3 | |
| parent | 480b7e595ec53a891e35895d6707deb000aeb578 (diff) | |
| download | qmk_firmware-d45a24a9546fec52998c66c68a5b3a4306f50199.tar.gz qmk_firmware-d45a24a9546fec52998c66c68a5b3a4306f50199.zip | |
bug if macro definition and not integer is used to identify layers (#12648)
| -rwxr-xr-x | keyboards/ergodox_ez/util/keymap_beautifier/KeymapBeautifier.py | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/keyboards/ergodox_ez/util/keymap_beautifier/KeymapBeautifier.py b/keyboards/ergodox_ez/util/keymap_beautifier/KeymapBeautifier.py index 6b6f391ce..f55bdaf2d 100755 --- a/keyboards/ergodox_ez/util/keymap_beautifier/KeymapBeautifier.py +++ b/keyboards/ergodox_ez/util/keymap_beautifier/KeymapBeautifier.py | |||
| @@ -164,7 +164,16 @@ class KeymapBeautifier: | |||
| 164 | key_symbols = [key_symbols[i] for i in self.index_conversion_map_reversed(self.INDEX_CONVERSTION_LAYOUT_ergodox_pretty_to_LAYOUT_ergodox)] | 164 | key_symbols = [key_symbols[i] for i in self.index_conversion_map_reversed(self.INDEX_CONVERSTION_LAYOUT_ergodox_pretty_to_LAYOUT_ergodox)] |
| 165 | 165 | ||
| 166 | padded_key_symbols = self.pad_key_symbols(key_symbols, input_layout) | 166 | padded_key_symbols = self.pad_key_symbols(key_symbols, input_layout) |
| 167 | current_pretty_output_layer = self.pretty_output_layer(layer.name[0].value, padded_key_symbols) | 167 | |
| 168 | layer_identifier = None | ||
| 169 | if hasattr(layer.name[0], "value"): | ||
| 170 | layer_identifier = layer.name[0].value | ||
| 171 | elif hasattr(layer.name[0], "name"): | ||
| 172 | layer_identifier = layer.name[0].name | ||
| 173 | else: | ||
| 174 | raise AttributeError("Layer is missing both index and name (e.g., [BASE] = LAYOUT_ergodox(...))") | ||
| 175 | |||
| 176 | current_pretty_output_layer = self.pretty_output_layer(layer_identifier, padded_key_symbols) | ||
| 168 | # strip trailing spaces from padding | 177 | # strip trailing spaces from padding |
| 169 | layer_output.append(re.sub(r" +\n", "\n", current_pretty_output_layer)) | 178 | layer_output.append(re.sub(r" +\n", "\n", current_pretty_output_layer)) |
| 170 | 179 | ||
