mirror of
https://github.com/arendst/Tasmota.git
synced 2025-07-29 05:36:39 +00:00
change location of some defines
This commit is contained in:
parent
4e8e5d4abd
commit
ef3a5fe733
@ -54,7 +54,6 @@ enum UserSelectablePins {
|
|||||||
GPIO_SDM630_TX, GPIO_SDM630_RX, // SDM630 Serial interface
|
GPIO_SDM630_TX, GPIO_SDM630_RX, // SDM630 Serial interface
|
||||||
GPIO_TM1638CLK, GPIO_TM1638DIO, GPIO_TM1638STB, // TM1638 interface
|
GPIO_TM1638CLK, GPIO_TM1638DIO, GPIO_TM1638STB, // TM1638 interface
|
||||||
GPIO_MP3_DFR562, // RB-DFR-562, DFPlayer Mini MP3 Player
|
GPIO_MP3_DFR562, // RB-DFR-562, DFPlayer Mini MP3 Player
|
||||||
GPIO_MP3_DFR562_BUSY, // RB-DFR-562, DFPlayer Mini MP3 Player busy flag
|
|
||||||
GPIO_HX711_SCK, GPIO_HX711_DAT, // HX711 Load Cell interface
|
GPIO_HX711_SCK, GPIO_HX711_DAT, // HX711 Load Cell interface
|
||||||
GPIO_TX2X_TXD_BLACK, // TX20/TX23 Transmission Pin
|
GPIO_TX2X_TXD_BLACK, // TX20/TX23 Transmission Pin
|
||||||
GPIO_TUYA_TX, GPIO_TUYA_RX, // Tuya Serial interface
|
GPIO_TUYA_TX, GPIO_TUYA_RX, // Tuya Serial interface
|
||||||
@ -191,6 +190,7 @@ enum UserSelectablePins {
|
|||||||
GPIO_FLOWRATEMETER_IN, // Flowrate Meter
|
GPIO_FLOWRATEMETER_IN, // Flowrate Meter
|
||||||
GPIO_BP5758D_CLK, GPIO_BP5758D_DAT, // BP5758D PWM controller
|
GPIO_BP5758D_CLK, GPIO_BP5758D_DAT, // BP5758D PWM controller
|
||||||
GPIO_SM2335_CLK, GPIO_SM2335_DAT, // SM2335 PWM controller
|
GPIO_SM2335_CLK, GPIO_SM2335_DAT, // SM2335 PWM controller
|
||||||
|
GPIO_MP3_DFR562_BUSY, // RB-DFR-562, DFPlayer Mini MP3 Player busy flag
|
||||||
GPIO_SENSOR_END };
|
GPIO_SENSOR_END };
|
||||||
|
|
||||||
enum ProgramSelectablePins {
|
enum ProgramSelectablePins {
|
||||||
@ -287,7 +287,7 @@ const char kSensorNames[] PROGMEM =
|
|||||||
D_SENSOR_SDM120_TX "|" D_SENSOR_SDM120_RX "|"
|
D_SENSOR_SDM120_TX "|" D_SENSOR_SDM120_RX "|"
|
||||||
D_SENSOR_SDM630_TX "|" D_SENSOR_SDM630_RX "|"
|
D_SENSOR_SDM630_TX "|" D_SENSOR_SDM630_RX "|"
|
||||||
D_SENSOR_TM1638_CLK "|" D_SENSOR_TM1638_DIO "|" D_SENSOR_TM1638_STB "|"
|
D_SENSOR_TM1638_CLK "|" D_SENSOR_TM1638_DIO "|" D_SENSOR_TM1638_STB "|"
|
||||||
D_SENSOR_DFR562 "|" D_SENSOR_DFR562_BUSY "|"
|
D_SENSOR_DFR562 "|"
|
||||||
D_SENSOR_HX711_SCK "|" D_SENSOR_HX711_DAT "|"
|
D_SENSOR_HX711_SCK "|" D_SENSOR_HX711_DAT "|"
|
||||||
D_SENSOR_TX2X_TX "|"
|
D_SENSOR_TX2X_TX "|"
|
||||||
D_SENSOR_TUYA_TX "|" D_SENSOR_TUYA_RX "|"
|
D_SENSOR_TUYA_TX "|" D_SENSOR_TUYA_RX "|"
|
||||||
@ -425,6 +425,7 @@ const char kSensorNames[] PROGMEM =
|
|||||||
D_SENSOR_FLOWRATEMETER "|"
|
D_SENSOR_FLOWRATEMETER "|"
|
||||||
D_SENSOR_BP5758D_CLK "|" D_SENSOR_BP5758D_DAT "|"
|
D_SENSOR_BP5758D_CLK "|" D_SENSOR_BP5758D_DAT "|"
|
||||||
D_SENSOR_SM2335_CLK "|" D_SENSOR_SM2335_DAT "|"
|
D_SENSOR_SM2335_CLK "|" D_SENSOR_SM2335_DAT "|"
|
||||||
|
D_SENSOR_DFR562_BUSY "|"
|
||||||
;
|
;
|
||||||
|
|
||||||
const char kSensorNamesFixed[] PROGMEM =
|
const char kSensorNamesFixed[] PROGMEM =
|
||||||
|
@ -631,7 +631,7 @@
|
|||||||
#define D_SENSOR_I2S_IN_CLK "I2S In Clk"
|
#define D_SENSOR_I2S_IN_CLK "I2S In Clk"
|
||||||
#define D_SENSOR_I2S_IN_SLCT "I2S In Slct"
|
#define D_SENSOR_I2S_IN_SLCT "I2S In Slct"
|
||||||
#define D_SENSOR_WS2812 "WS2812"
|
#define D_SENSOR_WS2812 "WS2812"
|
||||||
#define D_SENSOR_DFR562 "MP3 Odtwarzacz"
|
#define D_SENSOR_DFR562 "Odtwarzacz MP3"
|
||||||
#define D_SENSOR_DFR562_BUSY "MP3 zajęty"
|
#define D_SENSOR_DFR562_BUSY "MP3 zajęty"
|
||||||
#define D_SENSOR_IRSEND "IRsend"
|
#define D_SENSOR_IRSEND "IRsend"
|
||||||
#define D_SENSOR_SWITCH "Przełącznik" // Suffix "1"
|
#define D_SENSOR_SWITCH "Przełącznik" // Suffix "1"
|
||||||
|
@ -20,7 +20,7 @@
|
|||||||
Version yyyymmdd Action Description
|
Version yyyymmdd Action Description
|
||||||
--------------------------------------------------------------------------------------------
|
--------------------------------------------------------------------------------------------
|
||||||
|
|
||||||
1.0.0.6 22Jun2022 added - Busy flag on optional GPIO pin
|
1.0.0.6 20220624 added - Busy flag on optional GPIO pin
|
||||||
added - command for MP3Folder, folder/track format
|
added - command for MP3Folder, folder/track format
|
||||||
added - an event so that busy flag can be used in Berry
|
added - an event so that busy flag can be used in Berry
|
||||||
ToDo - test changes with SV17F
|
ToDo - test changes with SV17F
|
||||||
@ -412,11 +412,8 @@ bool Xdrv14(uint8_t function)
|
|||||||
break;
|
break;
|
||||||
|
|
||||||
case FUNC_EVERY_SECOND:
|
case FUNC_EVERY_SECOND:
|
||||||
|
MP3_EVERY_SECOND();
|
||||||
TasmotaGlobal.seriallog_timer = 600; // DEBUG Tool <---------- TRL
|
break;
|
||||||
|
|
||||||
MP3_EVERY_SECOND();
|
|
||||||
break;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return result;
|
return result;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user