From 7588e6e7a75a1e920507b4f42b9c886c57129c9d Mon Sep 17 00:00:00 2001 From: Theo Arends <11044339+arendst@users.noreply.github.com> Date: Wed, 6 Jan 2021 14:14:15 +0100 Subject: [PATCH] Oops --- tasmota/tasmota_template.h | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/tasmota/tasmota_template.h b/tasmota/tasmota_template.h index b87ada8a7..4a50aa3e3 100644 --- a/tasmota/tasmota_template.h +++ b/tasmota/tasmota_template.h @@ -143,6 +143,7 @@ enum UserSelectablePins { GPIO_ST7789_CS, GPIO_ST7789_DC, GPIO_SSD1331_CS, GPIO_SSD1331_DC, GPIO_SDCARD_CS, + GPIO_ROT1A_NP, GPIO_ROT1B_NP, // Rotary switch GPIO_SENSOR_END }; enum ProgramSelectablePins { @@ -236,7 +237,7 @@ const char kSensorNames[] PROGMEM = D_SENSOR_CSE7766_TX "|" D_SENSOR_CSE7766_RX "|" D_SENSOR_ARIRFRCV "|" D_SENSOR_ARIRFSEL "|" D_SENSOR_TXD "|" D_SENSOR_RXD "|" - D_SENSOR_ROTARY "_a|" D_SENSOR_ROTARY "_b|" + D_SENSOR_ROTARY " A|" D_SENSOR_ROTARY " B|" D_SENSOR_ADC_JOYSTICK "|" D_SENSOR_MAX31865_CS "|" D_SENSOR_HRE_CLOCK "|" D_SENSOR_HRE_DATA "|" @@ -293,7 +294,7 @@ const char kSensorNames[] PROGMEM = D_SENSOR_SHELLY_DIMMER_BOOT0 "|" D_SENSOR_SHELLY_DIMMER_RST_INV "|" D_SENSOR_RC522_RST "|" D_SENSOR_P9813_CLK "|" D_SENSOR_P9813_DAT "|" - D_SENSOR_OPTION "_a|" + D_SENSOR_OPTION " A|" D_SENSOR_FTC532 "|" D_SENSOR_RC522_CS "|" D_SENSOR_NRF24_CS "|" D_SENSOR_NRF24_DC "|" @@ -306,6 +307,7 @@ const char kSensorNames[] PROGMEM = D_SENSOR_ST7789_CS "|" D_SENSOR_ST7789_DC "|" D_SENSOR_SSD1331_CS "|" D_SENSOR_SSD1331_DC "|" D_SENSOR_SDCARD_CS "|" + D_SENSOR_ROTARY " A_n|" D_SENSOR_ROTARY " B_n|" ; const char kSensorNamesFixed[] PROGMEM = @@ -330,6 +332,8 @@ const uint16_t kGpioNiceList[] PROGMEM = { #ifdef ROTARY_V1 AGPIO(GPIO_ROT1A) + MAX_ROTARIES, // Rotary A Pin AGPIO(GPIO_ROT1B) + MAX_ROTARIES, // Rotary B Pin + AGPIO(GPIO_ROT1A_NP) + MAX_ROTARIES, // Rotary A Pin No Pullup + AGPIO(GPIO_ROT1B_NP) + MAX_ROTARIES, // Rotary B Pin No Pullup #endif AGPIO(GPIO_REL1) + MAX_RELAYS, // Relays AGPIO(GPIO_REL1_INV) + MAX_RELAYS,