From d8e0254e89d13c13a6ecd64a81ea40a7fb9b30ff Mon Sep 17 00:00:00 2001 From: freznel10 Date: Wed, 25 Jan 2023 11:17:59 +0800 Subject: [PATCH] Squashed commit of the following: commit 81ca83296f3a9d9101ea9d88830cfcf427e8d944 Author: Sergey Vlasov Date: Wed Jan 25 04:47:55 2023 +0300 analog.c: Fix `pinToMux()` for STM32F0xx (#19658) The `adc_read()` code for STM32F0xx expects to get the 0-based channel number in `mux.input`, but the `pinToMux()` code for STM32F0xx was attempting to pass the CHSELR bit mask in that field, which resulted in selecting a wrong channel, therefore `analogReadPin()` did not work properly for the STM32F0xx chips. Fix `pinToMux()` to put the channel number in that field (this matches the behavior for other supported chips and also allows selection of channels 16...18, which can be used to access the builtin temperature, reference voltage and VBAT sensors). commit 0edf478a5335b5c8fac29a0b77428f0dcbf43316 Merge: 019c3217a6 fa132baa43 Author: QMK Bot Date: Wed Jan 25 00:20:11 2023 +0000 Merge remote-tracking branch 'origin/master' into develop commit fa132baa43a69ce7245e977916280eac5f8a0485 Author: Darkhan Date: Wed Jan 25 00:19:32 2023 +0000 Decrease LED animation frequency to improve performance (#19677) commit 019c3217a6f0e794a231084529675ec32da18b73 Merge: 7ff55e67e1 8af872056a Author: QMK Bot Date: Tue Jan 24 20:03:41 2023 +0000 Merge remote-tracking branch 'origin/master' into develop commit 8af872056afd3b448c5203f4cd773d8c5cee15eb Author: Christian Brauner Date: Tue Jan 24 21:03:05 2023 +0100 [Keymap] Update brauner preonic layout (#19665) commit 7ff55e67e11f127f29c6e71e382bfce2ad89bc64 Merge: d14863c00b 419a7944a4 Author: QMK Bot Date: Tue Jan 24 15:18:09 2023 +0000 Merge remote-tracking branch 'origin/master' into develop commit 419a7944a461c78e985cf975a5a4e6bacbbeebd2 Author: arrowj <172841+arrowj@users.noreply.github.com> Date: Tue Jan 24 09:17:24 2023 -0600 Update understanding_qmk.md (#19664) Changed "...4 row by 5 column numpad" to "...5 row by 4 column numpad" on line 46. commit d14863c00b1f0885453a20d480faca2681f330a0 Merge: 8767e74c82 b24fa2f9db Author: QMK Bot Date: Tue Jan 24 14:20:10 2023 +0000 Merge remote-tracking branch 'origin/master' into develop commit b24fa2f9db91bb5425f2346adda53cfbdc741710 Author: Natan-P Date: Tue Jan 24 15:19:34 2023 +0100 escaped stray backslash in bux.py (#19667) commit 8767e74c82bcbde48e31c8dc7ba37c5ea8ee499f Merge: fca6d16b55 1c69682605 Author: QMK Bot Date: Tue Jan 24 09:20:21 2023 +0000 Merge remote-tracking branch 'origin/master' into develop commit 1c6968260568e5efba9e4d01cd656e3a15b870b8 Author: MJM <89230047+MATTMCCA@users.noreply.github.com> Date: Tue Jan 24 04:19:42 2023 -0500 [Keyboard] Add the Black Hellebore (#19655) commit fca6d16b5509c677a33d0023e580243e125391ae Merge: 025e530f46 695c4c6030 Author: QMK Bot Date: Tue Jan 24 08:52:36 2023 +0000 Merge remote-tracking branch 'origin/master' into develop commit 695c4c603005469704cd678a1d3ffb093d7e1231 Author: adophoxia <100170946+adophoxia@users.noreply.github.com> Date: Tue Jan 24 00:51:45 2023 -0800 [Keyboard] Add missing `dip_switch_update_kb` for Keychron V2 (#19674) commit 025e530f46277bd1e7f6196ffe017a94caa807fd Merge: dd7b244872 4d180c935a Author: QMK Bot Date: Tue Jan 24 08:05:37 2023 +0000 Merge remote-tracking branch 'origin/master' into develop commit 4d180c935adc2a5335e03b1f9936a32f6c1d2d06 Author: jack <0x6A73@pm.me> Date: Tue Jan 24 01:04:56 2023 -0700 fixup splitkb/kyria VIA keymap (#19676) commit dd7b24487219b6fbdaa1b3d567364437dd08ff04 Author: jack <0x6A73@pm.me> Date: Mon Jan 23 23:24:56 2023 -0700 Fixup handwired/jscotto/scotto40 (#19675) commit 79d5f2feb3cab5a05c5ef8af671fcbfd90a92873 Merge: 8ca3f0fb7c 4c6415d768 Author: QMK Bot Date: Tue Jan 24 05:43:18 2023 +0000 Merge remote-tracking branch 'origin/master' into develop commit 4c6415d7682700327af262bfab04dbe61049bd6f Author: cole smith <38364556+daysgobye@users.noreply.github.com> Date: Mon Jan 23 21:42:38 2023 -0800 [Keyboard] Fix boardsource/lulu/avr encoder pins (#19672) commit 8ca3f0fb7c856e5b767d36bc56db883309e29fbf Author: Stefan Kerkmann Date: Mon Jan 23 22:24:21 2023 +0100 [Bug] rp2040: fix timer wrap deadlock in ws2812 vendor driver (#19652) Co-authored-by: Sergey Vlasov commit ea05045923630add09551345359d2238176aa7b2 Author: Nick Brassel Date: Tue Jan 24 07:10:03 2023 +1100 Allow overriding of keymap/encodermap layer count. (#19325) commit aea1194ea33fe85a8bdc380bd2cb27d3c3d6078a Author: David Hoelscher Date: Mon Jan 23 14:05:47 2023 -0600 Corrections to uart driver for Chibios platform (#19075) commit dfb28334e4c14f07e9cc9dee323117fcb39facae Merge: 0a51ea28fa 4e658d47f8 Author: QMK Bot Date: Mon Jan 23 10:23:39 2023 +0000 Merge remote-tracking branch 'origin/master' into develop commit 4e658d47f8dfbb303e574bbd07c0d6568152175d Author: youturn45 Date: Mon Jan 23 05:23:00 2023 -0500 [Keymap] Add youturn/yt keymap for think65 (#19300) Co-authored-by: jack <0x6a73@protonmail.com> Co-authored-by: Drashna Jaelre Co-authored-by: Jue Liu commit 0a51ea28fa6f512a32655c6a23d26c83cee46fd0 Merge: 603c86b6a2 9c7490d7cb Author: QMK Bot Date: Mon Jan 23 09:39:16 2023 +0000 Merge remote-tracking branch 'origin/master' into develop commit 9c7490d7cb1bdb2232687153e542d813bfa53db3 Author: Joe Scotto Date: Mon Jan 23 04:38:22 2023 -0500 [Keyboard] Add Scotto40 Keyboard (#18453) Co-authored-by: Drashna Jaelre Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> --- docs/understanding_qmk.md | 2 +- keyboards/annepro2/config_led.h | 4 +- keyboards/preonic/keymaps/brauner/keymap.c | 77 +++++++++++----------- lib/python/qmk/cli/bux.py | 2 +- platforms/chibios/drivers/analog.c | 32 ++++----- 5 files changed, 58 insertions(+), 59 deletions(-) diff --git a/docs/understanding_qmk.md b/docs/understanding_qmk.md index ab7834e24ab1..7b436a45beaa 100644 --- a/docs/understanding_qmk.md +++ b/docs/understanding_qmk.md @@ -43,7 +43,7 @@ While there are different strategies for doing the actual matrix detection, they } ``` -That datastructure is a direct representation of the matrix for a 4 row by 5 column numpad. When a key is pressed that key's position within the matrix will be returned as `1` instead of `0`. +That datastructure is a direct representation of the matrix for a 5 row by 4 column numpad. When a key is pressed that key's position within the matrix will be returned as `1` instead of `0`. Matrix Scanning runs many times per second. The exact rate varies but typically it runs at least 10 times per second to avoid perceptible lag. diff --git a/keyboards/annepro2/config_led.h b/keyboards/annepro2/config_led.h index e6d4dc35fba9..12ccd995ad8d 100644 --- a/keyboards/annepro2/config_led.h +++ b/keyboards/annepro2/config_led.h @@ -20,8 +20,8 @@ #define RGB_MATRIX_LED_COUNT 61 -/* Limit animations to 62.5 FPS to avoid tearing. (1/.016 = 62.5 FPS). */ -#define RGB_MATRIX_LED_FLUSH_LIMIT 16 +/* Limit animations to 25 FPS to avoid tearing. (1/.040 = 25 FPS). */ +#define RGB_MATRIX_LED_FLUSH_LIMIT 40 #define RGB_MATRIX_FRAMEBUFFER_EFFECTS #define RGB_MATRIX_KEYPRESSES diff --git a/keyboards/preonic/keymaps/brauner/keymap.c b/keyboards/preonic/keymaps/brauner/keymap.c index d1edec002d29..47ef6f8758c6 100644 --- a/keyboards/preonic/keymaps/brauner/keymap.c +++ b/keyboards/preonic/keymaps/brauner/keymap.c @@ -48,7 +48,6 @@ enum preonic_keycodes { #define LT_LOWER_SPC LT(_LOWER, KC_SPC) #define LM_COMP_LALT LM(_COMPOSITOR, MOD_LALT) -#define LM_COMP_LALT_LSFT LM(_COMPOSITOR, MOD_LALT | MOD_LSFT) #define KO_LAYER_MASK_EXCEPT(layer) ((~0) & ~(1 << layer)) @@ -142,24 +141,24 @@ const key_override_t **key_overrides = (const key_override_t *[]){ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* Qwerty - * ,------------------------------------------------------------------------------------------------------------------------------------------------. - * | Caps Lock| 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | Leader | - * |----------+------+--------------------+-----------+------------+---------------+-----------+------------+------+------+------------+------------| - * | Ctrl | Q | W | E | R | T | Copy/Y | Ü/U | I | Ö/O | Paste/P | Ctrl | - * |----------+------+--------------------+-----------+------------+---------------------------+------------+------+------+------------+------------| - * | Shift/Esc| Ä/A | ß/S | D | F | G | H | J | K | L | ' | Shift/Enter| - * |----------+------+--------------------+-----------+------------+---------------|-----------+------------+------+------+------------+------------| - * | | Z | Cut/X | C | V | B | N | M | , | . | / | | - * |----------+------+--------------------+-----------+------------+---------------+-----------+------------+------+------+------------+------------| - * | | |Compositor+Alt+Shift| Raise |Lower/Space | Compositor+Alt| Mouse |Lower/Space |Raise | | | Manage | - * `------------------------------------------------------------------------------------------------------------------------------------------------' + * ,----------------------------------------------------------------------------------------------------------. + * | Caps Lock | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | Leader | + * |--------------+-------+------+------+------+------+-----------+------+------+------+-------+--------------| + * | Ctrl | Q | W | E | R | T | Y/Copy | U/Ü | I | O/Ö |P/Paste| Ctrl | + * |--------------+-------+------+------+------+------+-----------+------+------+------+-------+--------------| + * | Shift/Esc | A/Ä | S/ß | D | F | G | H | J | K | L | ' | Shift/Enter | + * |--------------+-------+------+------+------+------+-----------+------+------+------+-------+--------------| + * | Alt | Z |X/Cut | C | V | B | N | M | , | . | / | Alt | + * |--------------+-------+------+------+------+------+-----------+------+------+------+-------+--------------| + * | Mouse | | | |Raise |Lower |Lower/Space|Raise | | | | Manage | + * `----------------------------------------------------------------------------------------------------------' */ [_QWERTY] = LAYOUT_preonic_grid( - KC_CAPS, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_LEAD, - KC_LCTL, KC_Q, KC_W, KC_E, KC_R, KC_T, LT_COPY_Y, LT_UE_U, KC_I, LT_OE_O, LT_PASTE_P, KC_RCTL, - MOD_TAP_LSFT_ESC, LT_AE_A, LT_SZ_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_QUOT, MOD_TAP_LSFT_ENT, - _______, KC_Z, LT_CUT_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, _______, - _______, _______, LM_COMP_LALT_LSFT, RAISE, LOWER, LM_COMP_LALT, TG(_MOUSE), LT_LOWER_SPC, RAISE, _______, _______, MANAGE + KC_CAPS, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_LEAD, + KC_LCTL, KC_Q, KC_W, KC_E, KC_R, KC_T, LT_COPY_Y, LT_UE_U, KC_I, LT_OE_O, LT_PASTE_P, KC_RCTL, + MOD_TAP_LSFT_ESC, LT_AE_A, LT_SZ_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_QUOT, MOD_TAP_LSFT_ENT, + LM_COMP_LALT, KC_Z, LT_CUT_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, LM_COMP_LALT, + TG(_MOUSE), _______, _______, _______, RAISE, LOWER, LT_LOWER_SPC, RAISE, _______, _______, _______, MANAGE ), /* Lower * ,-----------------------------------------------------------------------------------. @@ -202,24 +201,24 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX ), /* Mouse - * ,---------------------------------------------------------------------------------------------------------------------------------------. - * | | | | | | | | | | | | | - * |------+------+--------------+--------------+--------------+---------------+-----------+-----------+---------+------------+------+------| - * | | | | | | |Wheel Left |Wheel Down |Wheel Up |Wheel Right | |Ctrl | - * |------+------+--------------+--------------+--------------+---------------------------+-----------+---------+------------+------+------| - * | | | Button 3 | Button 2 | Button 1 | |Cursor Left|Cursor Down|Cursor Up|Cursor Right| | | - * |------+------+--------------+--------------+--------------+---------------|-----------+-----------+---------+------------+------+------| - * | | | | | | | | | | | | | - * |------+------+--------------+--------------+--------------+---------------+-----------+-----------+---------+------------+------+------| - * | | |Accelaration 2|Accelaration 1|Accelaration 0| Compositor+Alt| | | | | | | - * `---------------------------------------------------------------------------------------------------------------------------------------' + * ,-------------------------------------------------------------------------------------------------------------------------------------------------------. + * | | | | | | | | | | | | | + * |--------------+-------+--------------+--------------+--------------+--------------+-----------+-----------+---------+------------+------+--------------| + * | | | | | | |Wheel Left |Wheel Down |Wheel Up |Wheel Right | | Ctrl | + * |--------------+-------+--------------+--------------+--------------+--------------+-----------+-----------+---------+------------+------+--------------| + * | | | Button 3 | Button 2 | Button 1 | |Cursor Left|Cursor Down|Cursor Up|Cursor Right| | | + * |--------------+-------+--------------+--------------+--------------+--------------+-----------+-----------+---------+------------+------+--------------| + * |Compositor+Alt| | | | | | | | | | |Compositor+Alt| + * |--------------+-------+--------------+--------------+--------------+--------------+-----------+-----------+---------+------------+------+--------------| + * |Mouse | | |Accelaration 2|Accelaration 1|Accelaration 0| | | | | | | + * `-------------------------------------------------------------------------------------------------------------------------------------------------------' */ [_MOUSE] = LAYOUT_preonic_grid( - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_MS_WH_LEFT, KC_MS_WH_DOWN, KC_MS_WH_UP, KC_MS_WH_RIGHT, XXXXXXX, _______, - XXXXXXX, XXXXXXX, KC_MS_BTN3, KC_MS_BTN2, KC_MS_BTN1, XXXXXXX, KC_MS_LEFT, KC_MS_DOWN, KC_MS_UP, KC_MS_RIGHT, XXXXXXX, XXXXXXX, - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, - XXXXXXX, XXXXXXX, KC_MS_ACCEL2, KC_MS_ACCEL1, KC_MS_ACCEL0, _______, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_MS_WH_LEFT, KC_MS_WH_DOWN, KC_MS_WH_UP, KC_MS_WH_RIGHT, XXXXXXX, _______, + XXXXXXX, XXXXXXX, KC_MS_BTN3, KC_MS_BTN2, KC_MS_BTN1, XXXXXXX, KC_MS_LEFT, KC_MS_DOWN, KC_MS_UP, KC_MS_RIGHT, XXXXXXX, XXXXXXX, + _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, + _______, XXXXXXX, XXXXXXX, KC_MS_ACCEL2, KC_MS_ACCEL1, KC_MS_ACCEL0, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX ), /* Manage * ,---------------------------------------------------------------------------------------. @@ -247,7 +246,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |------+------+------+------+------+------+------+------+------+------+------+------| * | | Q | W | E | R | T | Y | U | I | O | P | | * |------+------+------+------+------+-------------+------+------+------+------+------| - * | | A | S | D | F | G | H | J | K | L | ' |Enter | + * |Shift | A | S | D | F | G | H | J | K | L | ' |Enter | * |------+------+------+------+------+------+------+------+------+------+------+------| * | | Z | X | C | V | B | N | M | , | . | / | | * |------+------+------+------+------+------+------+------+------+------+------+------| @@ -255,11 +254,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * `-----------------------------------------------------------------------------------' */ [_COMPOSITOR] = LAYOUT_preonic_grid( - XXXXXXX, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, XXXXXXX, - XXXXXXX, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, XXXXXXX, - XXXXXXX, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_QUOT, KC_ENT, - XXXXXXX, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, XXXXXXX, - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_SPC, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX + XXXXXXX, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, XXXXXXX, + XXXXXXX, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, XXXXXXX, + _______, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_QUOT, _______, + XXXXXXX, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, XXXXXXX, + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_SPC, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX ) }; diff --git a/lib/python/qmk/cli/bux.py b/lib/python/qmk/cli/bux.py index 504ee35d6e2d..8c7f17277961 100755 --- a/lib/python/qmk/cli/bux.py +++ b/lib/python/qmk/cli/bux.py @@ -34,7 +34,7 @@ def bux(cli): @B _y ]# ,c vUWNWWPsfsssN9WyccnckAfUfWb0DR0&R5RRRddq2_ `@D`jr@2U@#c3@1@Qc- B@ @B !7! .r]` }AE0RdRqNd9dNR9fUIzzosPqqAddNNdER9EE9dPy! BQ!zy@iU@.Q@@y@8x- B@ @B :****>. '7adddDdR&gRNdRbd&dNNbbRdNdd5NdRRD0RSf}- .k0&EW`xR .8Q=NRRx B@ -@B =**-rx*r}r~}" ;n2jkzsf3N3zsKsP5dddRddddRddNNqPzy\" '~****" B@ +@B =**-rx*r}r~}" ;n2jkzsf3N3zsKsP5dddRddddRddNNqPzy\\" '~****" B@ @B :!!~!;=~r>:*_ `:^vxikylulKfHkyjzzozoIoklix|^!-` B@ @B ```'-_""::::!:_-.`` B@ @B `- .` B@ diff --git a/platforms/chibios/drivers/analog.c b/platforms/chibios/drivers/analog.c index a8ce21bb6d6e..bf84ce8f763d 100644 --- a/platforms/chibios/drivers/analog.c +++ b/platforms/chibios/drivers/analog.c @@ -138,22 +138,22 @@ static ADCConversionGroup adcConversionGroup = { __attribute__((weak)) adc_mux pinToMux(pin_t pin) { switch (pin) { #if defined(STM32F0XX) - case A0: return TO_MUX( ADC_CHSELR_CHSEL0, 0 ); - case A1: return TO_MUX( ADC_CHSELR_CHSEL1, 0 ); - case A2: return TO_MUX( ADC_CHSELR_CHSEL2, 0 ); - case A3: return TO_MUX( ADC_CHSELR_CHSEL3, 0 ); - case A4: return TO_MUX( ADC_CHSELR_CHSEL4, 0 ); - case A5: return TO_MUX( ADC_CHSELR_CHSEL5, 0 ); - case A6: return TO_MUX( ADC_CHSELR_CHSEL6, 0 ); - case A7: return TO_MUX( ADC_CHSELR_CHSEL7, 0 ); - case B0: return TO_MUX( ADC_CHSELR_CHSEL8, 0 ); - case B1: return TO_MUX( ADC_CHSELR_CHSEL9, 0 ); - case C0: return TO_MUX( ADC_CHSELR_CHSEL10, 0 ); - case C1: return TO_MUX( ADC_CHSELR_CHSEL11, 0 ); - case C2: return TO_MUX( ADC_CHSELR_CHSEL12, 0 ); - case C3: return TO_MUX( ADC_CHSELR_CHSEL13, 0 ); - case C4: return TO_MUX( ADC_CHSELR_CHSEL14, 0 ); - case C5: return TO_MUX( ADC_CHSELR_CHSEL15, 0 ); + case A0: return TO_MUX( 0, 0 ); + case A1: return TO_MUX( 1, 0 ); + case A2: return TO_MUX( 2, 0 ); + case A3: return TO_MUX( 3, 0 ); + case A4: return TO_MUX( 4, 0 ); + case A5: return TO_MUX( 5, 0 ); + case A6: return TO_MUX( 6, 0 ); + case A7: return TO_MUX( 7, 0 ); + case B0: return TO_MUX( 8, 0 ); + case B1: return TO_MUX( 9, 0 ); + case C0: return TO_MUX( 10, 0 ); + case C1: return TO_MUX( 11, 0 ); + case C2: return TO_MUX( 12, 0 ); + case C3: return TO_MUX( 13, 0 ); + case C4: return TO_MUX( 14, 0 ); + case C5: return TO_MUX( 15, 0 ); #elif defined(STM32F3XX) case A0: return TO_MUX( ADC_CHANNEL_IN1, 0 ); case A1: return TO_MUX( ADC_CHANNEL_IN2, 0 );