jeans/Tasmota
jeans/Tasmota
1
0
Fork 0
mirror of https://github.com/arendst/Tasmota.git synced 2025-07-27 20:56:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Prep for ESP32-C3 ph3

Browse Source
This commit is contained in:
Theo Arends 2020-11-28 17:00:15 +01:00
parent 17e6890809
commit 765e0e922d
9 changed files with 70 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
tasmota/xdsp_08_ILI9488.ino
View File

@ -72,6 +72,14 @@ void ILI9488_InitDriver()
bppin=Pin(GPIO_BACKLIGHT); bppin=Pin(GPIO_BACKLIGHT);
} }
#ifdef ESP8266
#undef HW_SPI_MOSI
#define HW_SPI_MOSI 13
#undef HW_SPI_MISO
#define HW_SPI_MISO 12
#undef HW_SPI_CLK
#define HW_SPI_CLK 14
#endif // ESP8266
#ifdef ESP32 #ifdef ESP32
#undef HW_SPI_MOSI #undef HW_SPI_MOSI
#define HW_SPI_MOSI 23 #define HW_SPI_MOSI 23
@ -79,14 +87,7 @@ void ILI9488_InitDriver()
#define HW_SPI_MISO 19 #define HW_SPI_MISO 19
#undef HW_SPI_CLK #undef HW_SPI_CLK
#define HW_SPI_CLK 18 #define HW_SPI_CLK 18
#else #endif // ESP32
#undef HW_SPI_MOSI
#define HW_SPI_MOSI 13
#undef HW_SPI_MISO
#define HW_SPI_MISO 12
#undef HW_SPI_CLK
#define HW_SPI_CLK 14
#endif
// init renderer, must use hardware spi // init renderer, must use hardware spi
if (PinUsed(GPIO_SSPI_CS) && (Pin(GPIO_SSPI_MOSI)==HW_SPI_MOSI) && (Pin(GPIO_SSPI_SCLK)==HW_SPI_CLK)) { if (PinUsed(GPIO_SSPI_CS) && (Pin(GPIO_SSPI_MOSI)==HW_SPI_MOSI) && (Pin(GPIO_SSPI_SCLK)==HW_SPI_CLK)) {
@ -102,7 +103,6 @@ void ILI9488_InitDriver()
ili9488->begin(); ili9488->begin();
renderer = ili9488; renderer = ili9488;
renderer->DisplayInit(DISPLAY_INIT_MODE,Settings.display_size,Settings.display_rotate,Settings.display_font); renderer->DisplayInit(DISPLAY_INIT_MODE,Settings.display_size,Settings.display_rotate,Settings.display_font);
renderer->dim(Settings.display_dimmer);
#ifdef SHOW_SPLASH #ifdef SHOW_SPLASH
// Welcome text // Welcome text

17
tasmota/xdsp_10_RA8876.ino
View File

@ -59,6 +59,14 @@ void RA8876_InitDriver()
fg_color = RA8876_WHITE; fg_color = RA8876_WHITE;
bg_color = RA8876_BLACK; bg_color = RA8876_BLACK;
#ifdef ESP8266
#undef HW_SPI_MOSI
#define HW_SPI_MOSI 13
#undef HW_SPI_MISO
#define HW_SPI_MISO 12
#undef HW_SPI_CLK
#define HW_SPI_CLK 14
#endif // ESP8266
#ifdef ESP32 #ifdef ESP32
#undef HW_SPI_MOSI #undef HW_SPI_MOSI
#define HW_SPI_MOSI 23 #define HW_SPI_MOSI 23
@ -66,14 +74,7 @@ void RA8876_InitDriver()
#define HW_SPI_MISO 19 #define HW_SPI_MISO 19
#undef HW_SPI_CLK #undef HW_SPI_CLK
#define HW_SPI_CLK 18 #define HW_SPI_CLK 18
#else #endif // ESP32
#undef HW_SPI_MOSI
#define HW_SPI_MOSI 13
#undef HW_SPI_MISO
#define HW_SPI_MISO 12
#undef HW_SPI_CLK
#define HW_SPI_CLK 14
#endif
// init renderer, must use hardware spi // init renderer, must use hardware spi
if (PinUsed(GPIO_SSPI_CS) && (Pin(GPIO_SSPI_MOSI)==HW_SPI_MOSI) && (Pin(GPIO_SSPI_MISO)==HW_SPI_MISO) && (Pin(GPIO_SSPI_SCLK)==HW_SPI_CLK)) { if (PinUsed(GPIO_SSPI_CS) && (Pin(GPIO_SSPI_MOSI)==HW_SPI_MOSI) && (Pin(GPIO_SSPI_MISO)==HW_SPI_MISO) && (Pin(GPIO_SSPI_SCLK)==HW_SPI_CLK)) {

14
tasmota/xdsp_12_ST7789.ino
View File

@ -95,17 +95,18 @@ void ST7789_InitDriver()
cs=Pin(GPIO_SPI_CS); cs=Pin(GPIO_SPI_CS);
} }
#ifdef ESP8266
#undef HW_SPI_MOSI
#define HW_SPI_MOSI 13
#undef HW_SPI_CLK
#define HW_SPI_CLK 14
#endif // ESP8266
#ifdef ESP32 #ifdef ESP32
#undef HW_SPI_MOSI #undef HW_SPI_MOSI
#define HW_SPI_MOSI 23 #define HW_SPI_MOSI 23
#undef HW_SPI_CLK #undef HW_SPI_CLK
#define HW_SPI_CLK 18 #define HW_SPI_CLK 18
#else #endif // ESP32
#undef HW_SPI_MOSI
#define HW_SPI_MOSI 13
#undef HW_SPI_CLK
#define HW_SPI_CLK 14
#endif
// init renderer, may use hardware spi // init renderer, may use hardware spi
//if (PinUsed(GPIO_SPI_CS) && (Pin(GPIO_SPI_MOSI)==HW_SPI_MOSI) && (Pin(GPIO_SPI_CLK)==HW_SPI_CLK) && PinUsed(GPIO_SPI_DC)) { //if (PinUsed(GPIO_SPI_CS) && (Pin(GPIO_SPI_MOSI)==HW_SPI_MOSI) && (Pin(GPIO_SPI_CLK)==HW_SPI_CLK) && PinUsed(GPIO_SPI_DC)) {
@ -121,7 +122,6 @@ void ST7789_InitDriver()
st7789->init(Settings.display_width,Settings.display_height); st7789->init(Settings.display_width,Settings.display_height);
renderer = st7789; renderer = st7789;
renderer->DisplayInit(DISPLAY_INIT_MODE,Settings.display_size,Settings.display_rotate,Settings.display_font); renderer->DisplayInit(DISPLAY_INIT_MODE,Settings.display_size,Settings.display_rotate,Settings.display_font);
renderer->dim(Settings.display_dimmer);
#ifdef SHOW_SPLASH #ifdef SHOW_SPLASH
// Welcome text // Welcome text

5
tasmota/xlgt_03_sm16716.ino
View File

@ -150,9 +150,10 @@ void Sm16716ModuleSelected(void)
if (PinUsed(GPIO_PWM1, i)) { if (PinUsed(GPIO_PWM1, i)) {
#ifdef ESP8266 #ifdef ESP8266
pinMode(Pin(GPIO_PWM1, i), OUTPUT); pinMode(Pin(GPIO_PWM1, i), OUTPUT);
#else // ESP32 #endif // ESP8266
#ifdef ESP32
analogAttach(Pin(GPIO_PWM1, i), i); analogAttach(Pin(GPIO_PWM1, i), i);
#endif #endif // ESP32
} }
} }
*/ */

15
tasmota/xnrg_15_teleinfo.ino
View File

@ -463,20 +463,21 @@ void TInfoInit(void)
AddLog_P(LOG_LEVEL_INFO, PSTR("TIC: always enabled")); AddLog_P(LOG_LEVEL_INFO, PSTR("TIC: always enabled"));
} }
#if defined (ESP8266) #ifdef ESP8266
// Allow GPIO3 AND GPIO13 with hardware fallback to 2 // Allow GPIO3 AND GPIO13 with hardware fallback to 2
TInfoSerial = new TasmotaSerial(rx_pin, -1, 2); TInfoSerial = new TasmotaSerial(rx_pin, -1, 2);
//pinMode(rx_pin, INPUT_PULLUP); //pinMode(rx_pin, INPUT_PULLUP);
#else #endif // ESP8266
#ifdef ESP32
TInfoSerial = new TasmotaSerial(rx_pin, -1, 1); TInfoSerial = new TasmotaSerial(rx_pin, -1, 1);
#endif #endif // ESP32
// Trick here even using SERIAL_7E1 or TS_SERIAL_7E1 // Trick here even using SERIAL_7E1 or TS_SERIAL_7E1
// this is not working, need to call SetSerialConfig after // this is not working, need to call SetSerialConfig after
if (TInfoSerial->begin(baudrate)) { if (TInfoSerial->begin(baudrate)) {
#if defined (ESP8266) #ifdef ESP8266
if (TInfoSerial->hardwareSerial() ) { if (TInfoSerial->hardwareSerial() ) {
ClaimSerial(); ClaimSerial();
@ -491,10 +492,10 @@ void TInfoInit(void)
} else { } else {
AddLog_P(LOG_LEVEL_INFO, PSTR("TIC: using software serial")); AddLog_P(LOG_LEVEL_INFO, PSTR("TIC: using software serial"));
} }
#endif // ESP8266
#elif defined (ESP32) #ifdef ESP32
AddLog_P(LOG_LEVEL_INFO, PSTR("TIC: using ESP32 hardware serial")); AddLog_P(LOG_LEVEL_INFO, PSTR("TIC: using ESP32 hardware serial"));
#endif #endif // ESP32
// Init teleinfo // Init teleinfo
tinfo.init(tinfo_mode); tinfo.init(tinfo_mode);
// Attach needed callbacks // Attach needed callbacks

7
tasmota/xsns_01_counter.ino
View File

@ -253,16 +253,17 @@ void SyncACDimmer(void)
timelag_ClockCycles = ((ac_zero_cross_dimmer.dimm_timeClockCycles + ac_zero_cross_dimmer.tobe_cycle_timeClockCycles) - timelag_ClockCycles)%ac_zero_cross_dimmer.tobe_cycle_timeClockCycles; timelag_ClockCycles = ((ac_zero_cross_dimmer.dimm_timeClockCycles + ac_zero_cross_dimmer.tobe_cycle_timeClockCycles) - timelag_ClockCycles)%ac_zero_cross_dimmer.tobe_cycle_timeClockCycles;
delayMicroseconds(clockCyclesToMicroseconds(timelag_ClockCycles)); delayMicroseconds(clockCyclesToMicroseconds(timelag_ClockCycles));
#ifdef ESP8266 #ifdef ESP8266
pinMode(Pin(GPIO_PWM1, i), OUTPUT); pinMode(Pin(GPIO_PWM1, i), OUTPUT);
// short fire to ensure not to hit next sinus curve. 0.78% of duty cycle (10ms) ~4µs // short fire to ensure not to hit next sinus curve. 0.78% of duty cycle (10ms) ~4µs
uint32_t high = ac_zero_cross_dimmer.current_cycle_ClockCycles / 256; uint32_t high = ac_zero_cross_dimmer.current_cycle_ClockCycles / 256;
uint32_t low = ac_zero_cross_dimmer.current_cycle_ClockCycles - high; uint32_t low = ac_zero_cross_dimmer.current_cycle_ClockCycles - high;
// Find the first GPIO being generated by checking GCC's find-first-set (returns 1 + the bit of the first 1 in an int32_t // Find the first GPIO being generated by checking GCC's find-first-set (returns 1 + the bit of the first 1 in an int32_t
startWaveformClockCycles(Pin(GPIO_PWM1, i), high, low, 0, -1, 0, true); startWaveformClockCycles(Pin(GPIO_PWM1, i), high, low, 0, -1, 0, true);
#else // ESP32 #endif // ESP8266
#ifdef ESP32
analogWrite(Pin(GPIO_PWM1, i), 5); analogWrite(Pin(GPIO_PWM1, i), 5);
#endif // ESP8266 - ESP32 #endif // ESP32
//AddLog_P(LOG_LEVEL_DEBUG_MORE, PSTR("CNT: [%d] dimm_time_CCs %d, current_cycle_CC: %d, timelag %lu, lastcc %lu, currentSteps %d, curr %d"), i, ac_zero_cross_dimmer.dimm_timeClockCycles,ac_zero_cross_dimmer.current_cycle_ClockCycles , timelag_ClockCycles, ac_zero_cross_dimmer.currentCycleCount, ac_zero_cross_dimmer.currentSteps, Light.fade_cur_10[i]); //AddLog_P(LOG_LEVEL_DEBUG_MORE, PSTR("CNT: [%d] dimm_time_CCs %d, current_cycle_CC: %d, timelag %lu, lastcc %lu, currentSteps %d, curr %d"), i, ac_zero_cross_dimmer.dimm_timeClockCycles,ac_zero_cross_dimmer.current_cycle_ClockCycles , timelag_ClockCycles, ac_zero_cross_dimmer.currentCycleCount, ac_zero_cross_dimmer.currentSteps, Light.fade_cur_10[i]);
} }
} }

5
tasmota/xsns_02_analog.ino
View File

@ -27,12 +27,13 @@
#ifdef ESP8266 #ifdef ESP8266
#define ANALOG_RESOLUTION 10 // 12 = 4095, 11 = 2047, 10 = 1023 #define ANALOG_RESOLUTION 10 // 12 = 4095, 11 = 2047, 10 = 1023
#define ANALOG_RANGE 1023 // 4095 = 12, 2047 = 11, 1023 = 10 #define ANALOG_RANGE 1023 // 4095 = 12, 2047 = 11, 1023 = 10
#else // ESP32 #endif // ESP8266
#ifdef ESP32
#undef ANALOG_RESOLUTION #undef ANALOG_RESOLUTION
#define ANALOG_RESOLUTION 12 // 12 = 4095, 11 = 2047, 10 = 1023 #define ANALOG_RESOLUTION 12 // 12 = 4095, 11 = 2047, 10 = 1023
#undef ANALOG_RANGE #undef ANALOG_RANGE
#define ANALOG_RANGE 4095 // 4095 = 12, 2047 = 11, 1023 = 10 #define ANALOG_RANGE 4095 // 4095 = 12, 2047 = 11, 1023 = 10
#endif // ESP8266 or ESP32 #endif // ESP32
#define TO_CELSIUS(x) ((x) - 273.15) #define TO_CELSIUS(x) ((x) - 273.15)
#define TO_KELVIN(x) ((x) + 273.15) #define TO_KELVIN(x) ((x) + 273.15)

5
tasmota/xsns_44_sps30.ino
View File

@ -99,9 +99,10 @@ uint8_t twi_buff[64];
#ifdef ESP8266 #ifdef ESP8266
twi_readFrom(SPS30_ADDR,twi_buff,dlen,1); twi_readFrom(SPS30_ADDR,twi_buff,dlen,1);
#else #endif // ESP8266
#ifdef ESP32
Wire.readTransmission(SPS30_ADDR,twi_buff,dlen,1, NULL); Wire.readTransmission(SPS30_ADDR,twi_buff,dlen,1, NULL);
#endif #endif // ESP32
uint8_t bind=0; uint8_t bind=0;
while (bind<dlen) { while (bind<dlen) {

45
tasmota/xsns_53_sml.ino
View File

@ -471,11 +471,12 @@ const uint8_t *meter_p;
uint8_t meter_spos[MAX_METERS]; uint8_t meter_spos[MAX_METERS];
// software serial pointers // software serial pointers
#ifdef ESP8266
TasmotaSerial *meter_ss[MAX_METERS];
#endif // ESP8266
#ifdef ESP32 #ifdef ESP32
HardwareSerial *meter_ss[MAX_METERS]; HardwareSerial *meter_ss[MAX_METERS];
#else #endif // ESP32
TasmotaSerial *meter_ss[MAX_METERS];
#endif
// serial buffers, may be made larger depending on telegram lenght // serial buffers, may be made larger depending on telegram lenght
#ifndef SML_BSIZ #ifndef SML_BSIZ
@ -2177,15 +2178,16 @@ init10:
meter_ss[meters] = new TasmotaSerial(meter_desc_p[meters].srcpin,meter_desc_p[meters].trxpin,1,1,TMSBSIZ); meter_ss[meters] = new TasmotaSerial(meter_desc_p[meters].srcpin,meter_desc_p[meters].trxpin,1,1,TMSBSIZ);
} }
#else #else
#ifdef ESP8266
meter_ss[meters] = new TasmotaSerial(meter_desc_p[meters].srcpin,meter_desc_p[meters].trxpin,1,0,TMSBSIZ);
#endif // ESP8266
#ifdef ESP32 #ifdef ESP32
meter_ss[meters] = new HardwareSerial(uart_index); meter_ss[meters] = new HardwareSerial(uart_index);
if (uart_index==0) { ClaimSerial(); } if (uart_index==0) { ClaimSerial(); }
uart_index--; uart_index--;
if (uart_index<0) uart_index=0; if (uart_index<0) uart_index=0;
meter_ss[meters]->setRxBufferSize(TMSBSIZ); meter_ss[meters]->setRxBufferSize(TMSBSIZ);
#else #endif // ESP32
meter_ss[meters] = new TasmotaSerial(meter_desc_p[meters].srcpin,meter_desc_p[meters].trxpin,1,0,TMSBSIZ);
#endif
#endif #endif
SerialConfig smode = SERIAL_8N1; SerialConfig smode = SERIAL_8N1;
@ -2198,9 +2200,7 @@ init10:
smode = SERIAL_8E2; smode = SERIAL_8E2;
} }
} }
#ifdef ESP32 #ifdef ESP8266
meter_ss[meters]->begin(meter_desc_p[meters].params, smode, meter_desc_p[meters].srcpin, meter_desc_p[meters].trxpin);
#else
if (meter_ss[meters]->begin(meter_desc_p[meters].params)) { if (meter_ss[meters]->begin(meter_desc_p[meters].params)) {
meter_ss[meters]->flush(); meter_ss[meters]->flush();
} }
@ -2209,7 +2209,10 @@ init10:
ClaimSerial(); ClaimSerial();
//Serial.setRxBufferSize(512); //Serial.setRxBufferSize(512);
} }
#endif #endif // ESP8266
#ifdef ESP32
meter_ss[meters]->begin(meter_desc_p[meters].params, smode, meter_desc_p[meters].srcpin, meter_desc_p[meters].trxpin);
#endif // ESP32
} }
} }
@ -2221,7 +2224,16 @@ uint32_t SML_SetBaud(uint32_t meter, uint32_t br) {
if (meter<1 || meter>meters_used) return 0; if (meter<1 || meter>meters_used) return 0;
meter--; meter--;
if (!meter_ss[meter]) return 0; if (!meter_ss[meter]) return 0;
#ifdef ESP8266
if (meter_ss[meter]->begin(br)) {
meter_ss[meter]->flush();
}
if (meter_ss[meter]->hardwareSerial()) {
if (meter_desc_p[meter].type=='M') {
Serial.begin(br, SERIAL_8E1);
}
}
#endif // ESP8266
#ifdef ESP32 #ifdef ESP32
meter_ss[meter]->flush(); meter_ss[meter]->flush();
meter_ss[meter]->updateBaudRate(br); meter_ss[meter]->updateBaudRate(br);
@ -2231,16 +2243,7 @@ uint32_t SML_SetBaud(uint32_t meter, uint32_t br) {
} else { } else {
meter_ss[meter]->begin(br,SERIAL_8N1,meter_desc_p[meter].srcpin,meter_desc_p[meter].trxpin); meter_ss[meter]->begin(br,SERIAL_8N1,meter_desc_p[meter].srcpin,meter_desc_p[meter].trxpin);
}*/ }*/
#else #endif // ESP32
if (meter_ss[meter]->begin(br)) {
meter_ss[meter]->flush();
}
if (meter_ss[meter]->hardwareSerial()) {
if (meter_desc_p[meter].type=='M') {
Serial.begin(br, SERIAL_8E1);
}
}
#endif
return 1; return 1;
} }