Home-IoT/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2024-12-04 20:48:21 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

MAX6921: make pin mapping independent of configuration order

Browse source
This commit is contained in:
endym 2024-04-01 20:38:17 +02:00
parent 49211644d9
commit 45580f2638
2 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
esphome/components/max6921/display.py
View file

@ -19,7 +19,7 @@ CONF_SEG_D_PIN = "seg_d_pin"
CONF_SEG_E_PIN = "seg_e_pin"
CONF_SEG_F_PIN = "seg_f_pin"
CONF_SEG_G_PIN = "seg_g_pin"
CONF_SEG_DP_PIN = "seg_dp_pin"
CONF_SEG_P_PIN = "seg_p_pin"
CONF_POS_TO_OUT_MAP = "pos_to_out_map"
CONF_POS_0_PIN = "pos_0_pin"
CONF_POS_1_PIN = "pos_1_pin"
@ -80,7 +80,7 @@ OUT_PIN_MAPPING_SCHEMA = cv.Schema(
cv.Required(CONF_SEG_E_PIN): cv.int_range(min=0, max=19),
cv.Required(CONF_SEG_F_PIN): cv.int_range(min=0, max=19),
cv.Required(CONF_SEG_G_PIN): cv.int_range(min=0, max=19),
cv.Optional(CONF_SEG_DP_PIN): cv.int_range(min=0, max=19),
cv.Optional(CONF_SEG_P_PIN): cv.int_range(min=0, max=19),
}
),
cv.Required(CONF_POS_TO_OUT_MAP): cv.Schema(
@ -132,24 +132,22 @@ async def to_code(config):
cg.add(var.set_load_pin(load_pin))
blank_pin = await cg.gpio_pin_expression(config[CONF_BLANK_PIN])
cg.add(var.set_blank_pin(blank_pin))
# pass array of display segment pin numbers sorted by pin name...
sorted_list_of_tuples = sorted(
config[CONF_OUT_PIN_MAPPING][CONF_SEG_TO_OUT_MAP].items()
)
cg.add(
var.set_seg_to_out_pin_map(
cg.ArrayInitializer(
*[
config[CONF_OUT_PIN_MAPPING][CONF_SEG_TO_OUT_MAP][seg]
for seg in config[CONF_OUT_PIN_MAPPING][CONF_SEG_TO_OUT_MAP]
]
)
cg.ArrayInitializer(*[tuple[1] for tuple in sorted_list_of_tuples])
)
)
# pass array of display position pin numbers sorted by pin name...
sorted_list_of_tuples = sorted(
config[CONF_OUT_PIN_MAPPING][CONF_POS_TO_OUT_MAP].items()
)
cg.add(
var.set_pos_to_out_pin_map(
cg.ArrayInitializer(
*[
config[CONF_OUT_PIN_MAPPING][CONF_POS_TO_OUT_MAP][seg]
for seg in config[CONF_OUT_PIN_MAPPING][CONF_POS_TO_OUT_MAP]
]
)
cg.ArrayInitializer(*[tuple[1] for tuple in sorted_list_of_tuples])
)
)
cg.add(var.set_intensity(config[CONF_INTENSITY]))

6
esphome/components/max6921/max6921.cpp
View file

@ -240,10 +240,12 @@ int MAX6921Component::set_display(uint8_t start_pos, const char *str) {
// create segment data...
ESP_LOGVV(TAG, "%s(): pos: %u, char: '%c' (0x%02x)", __func__, pos+1, *str, *str);
if ((*str >= ' ') &&
((*str - ' ') < ARRAY_ELEM_COUNT(ASCII_TO_SEG))) // supported char?
((*str - ' ') < ARRAY_ELEM_COUNT(ASCII_TO_SEG))) { // supported char?
out_data = this->ascii_out_data_[*str - ' ']; // yes ->
else
} else {
ESP_LOGW(TAG, "Encountered unsupported character '%c (0x%02x)'!", *str, *str);
out_data = SEG_UNSUPPORTED_CHAR;
}
ESP_LOGVV(TAG, "%s(): segment data: 0x%06x", __func__, out_data);
#if 0
// At the moment an unsupport character is equal to blank (' ').