mirror of
https://github.com/andreili/klipper.git
synced 2025-09-15 01:41:14 +02:00
stm32: Fix N32G45x ADC pin mapping (#7016)
Fixes PA0 (GPIO 0) incorrectly mapping to ADC1_IN0 due to collision with placeholder zeros. Signed-off-by: Lev Voronov <minicx@disroot.org> Co-authored-by: Alexander Simonov <me@darksimpson.com>
This commit is contained in:
parent
7ed7791723
commit
3a11645afe
@ -14,6 +14,8 @@
|
|||||||
#include "sched.h" // sched_shutdown
|
#include "sched.h" // sched_shutdown
|
||||||
#include "n32g45x_adc.h" // ADC
|
#include "n32g45x_adc.h" // ADC
|
||||||
|
|
||||||
|
#define ADC_INVALID_PIN 0xFF
|
||||||
|
|
||||||
DECL_CONSTANT("ADC_MAX", 4095);
|
DECL_CONSTANT("ADC_MAX", 4095);
|
||||||
|
|
||||||
#define ADC_TEMPERATURE_PIN 0xfe
|
#define ADC_TEMPERATURE_PIN 0xfe
|
||||||
@ -21,42 +23,42 @@ DECL_ENUMERATION("pin", "ADC_TEMPERATURE", ADC_TEMPERATURE_PIN);
|
|||||||
|
|
||||||
static const uint8_t adc_pins[] = {
|
static const uint8_t adc_pins[] = {
|
||||||
// ADC1
|
// ADC1
|
||||||
0, GPIO('A', 0), GPIO('A', 1), GPIO('A', 6),
|
ADC_INVALID_PIN, GPIO('A', 0), GPIO('A', 1), GPIO('A', 6),
|
||||||
GPIO('A', 3), GPIO('F', 4), 0, 0,
|
GPIO('A', 3), GPIO('F', 4), ADC_INVALID_PIN, ADC_INVALID_PIN,
|
||||||
0, 0, 0, 0,
|
ADC_INVALID_PIN, ADC_INVALID_PIN, ADC_INVALID_PIN, ADC_INVALID_PIN,
|
||||||
0, 0, 0, 0,
|
ADC_INVALID_PIN, ADC_INVALID_PIN, ADC_INVALID_PIN, ADC_INVALID_PIN,
|
||||||
ADC_TEMPERATURE_PIN, 0, 0, 0,
|
ADC_TEMPERATURE_PIN, ADC_INVALID_PIN, ADC_INVALID_PIN, ADC_INVALID_PIN,
|
||||||
0, 0, 0, 0,
|
ADC_INVALID_PIN, ADC_INVALID_PIN, ADC_INVALID_PIN, ADC_INVALID_PIN,
|
||||||
0, 0, 0, 0,
|
ADC_INVALID_PIN, ADC_INVALID_PIN, ADC_INVALID_PIN, ADC_INVALID_PIN,
|
||||||
0, 0, 0, 0,
|
ADC_INVALID_PIN, ADC_INVALID_PIN, ADC_INVALID_PIN, ADC_INVALID_PIN,
|
||||||
// ADC2
|
// ADC2
|
||||||
0, GPIO('A', 4), GPIO('A', 5), GPIO('B', 1),
|
ADC_INVALID_PIN, GPIO('A', 4), GPIO('A', 5), GPIO('B', 1),
|
||||||
GPIO('A', 7), GPIO('C', 4), GPIO('C', 0), GPIO('C', 1),
|
GPIO('A', 7), GPIO('C', 4), GPIO('C', 0), GPIO('C', 1),
|
||||||
GPIO('C', 2), GPIO('C', 3), GPIO('F', 2), GPIO('A', 2),
|
GPIO('C', 2), GPIO('C', 3), GPIO('F', 2), GPIO('A', 2),
|
||||||
GPIO('C', 5), GPIO('B', 2), 0, 0,
|
GPIO('C', 5), GPIO('B', 2), ADC_INVALID_PIN, ADC_INVALID_PIN,
|
||||||
0, 0, 0, 0,
|
ADC_INVALID_PIN, ADC_INVALID_PIN, ADC_INVALID_PIN, ADC_INVALID_PIN,
|
||||||
0, 0, 0, 0,
|
ADC_INVALID_PIN, ADC_INVALID_PIN, ADC_INVALID_PIN, ADC_INVALID_PIN,
|
||||||
0, 0, 0, 0,
|
ADC_INVALID_PIN, ADC_INVALID_PIN, ADC_INVALID_PIN, ADC_INVALID_PIN,
|
||||||
0, 0, 0, 0,
|
ADC_INVALID_PIN, ADC_INVALID_PIN, ADC_INVALID_PIN, ADC_INVALID_PIN,
|
||||||
#if CONFIG_MACH_N32G455 // ADC3/4 for G455 only
|
#if CONFIG_MACH_N32G455 // ADC3/4 for G455 only
|
||||||
// ADC3
|
// ADC3
|
||||||
0, GPIO('B', 11), GPIO('E', 9), GPIO('E', 13),
|
ADC_INVALID_PIN, GPIO('B', 11), GPIO('E', 9), GPIO('E', 13),
|
||||||
GPIO('E', 12), GPIO('B', 13), GPIO('E', 8), GPIO('D', 10),
|
GPIO('E', 12), GPIO('B', 13), GPIO('E', 8), GPIO('D', 10),
|
||||||
GPIO('D', 11), GPIO('D', 12), GPIO('D', 13), GPIO('D', 14),
|
GPIO('D', 11), GPIO('D', 12), GPIO('D', 13), GPIO('D', 14),
|
||||||
GPIO('B', 0), GPIO('E', 7), GPIO('E', 10), GPIO('E', 11),
|
GPIO('B', 0), GPIO('E', 7), GPIO('E', 10), GPIO('E', 11),
|
||||||
0, 0, 0, 0,
|
ADC_INVALID_PIN, ADC_INVALID_PIN, ADC_INVALID_PIN, ADC_INVALID_PIN,
|
||||||
0, 0, 0, 0,
|
ADC_INVALID_PIN, ADC_INVALID_PIN, ADC_INVALID_PIN, ADC_INVALID_PIN,
|
||||||
0, 0, 0, 0,
|
ADC_INVALID_PIN, ADC_INVALID_PIN, ADC_INVALID_PIN, ADC_INVALID_PIN,
|
||||||
0, 0, 0, 0,
|
ADC_INVALID_PIN, ADC_INVALID_PIN, ADC_INVALID_PIN, ADC_INVALID_PIN,
|
||||||
// ADC4
|
// ADC4
|
||||||
0, GPIO('E', 14), GPIO('E', 15), GPIO('B', 12),
|
ADC_INVALID_PIN, GPIO('E', 14), GPIO('E', 15), GPIO('B', 12),
|
||||||
GPIO('B', 14), GPIO('B', 15), 0, 0,
|
GPIO('B', 14), GPIO('B', 15), ADC_INVALID_PIN, ADC_INVALID_PIN,
|
||||||
0, 0, 0, 0,
|
ADC_INVALID_PIN, ADC_INVALID_PIN, ADC_INVALID_PIN, ADC_INVALID_PIN,
|
||||||
GPIO('D', 8), GPIO('D', 9), 0, 0,
|
GPIO('D', 8), GPIO('D', 9), ADC_INVALID_PIN, ADC_INVALID_PIN,
|
||||||
0, 0, 0, 0,
|
ADC_INVALID_PIN, ADC_INVALID_PIN, ADC_INVALID_PIN, ADC_INVALID_PIN,
|
||||||
0, 0, 0, 0,
|
ADC_INVALID_PIN, ADC_INVALID_PIN, ADC_INVALID_PIN, ADC_INVALID_PIN,
|
||||||
0, 0, 0, 0,
|
ADC_INVALID_PIN, ADC_INVALID_PIN, ADC_INVALID_PIN, ADC_INVALID_PIN,
|
||||||
0, 0, 0, 0,
|
ADC_INVALID_PIN, ADC_INVALID_PIN, ADC_INVALID_PIN, ADC_INVALID_PIN,
|
||||||
#endif
|
#endif
|
||||||
};
|
};
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user