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

Enable ESP32 TWAI in default binary

Browse Source
This commit is contained in:
Theo Arends 2025-01-02 12:44:49 +01:00
parent d5d757fd3d
commit aafe528682
5 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
BUILDS.md
View File

@ -105,8 +105,9 @@ Note: the `minimal` variant is not listed as it shouldn't be used outside of the
| **Feature or Sensor** | **l** | **t** | **k** | **s** | **i** | **d** | **Remarks** | | **Feature or Sensor** | **l** | **t** | **k** | **s** | **i** | **d** | **Remarks** |
| USE_I2C | - | x / x | x | x | - | x | | USE_I2C | - | x / x | x | x | - | x |
| USE_RTC_CHIPS | - | - / x | - | - | - | - | | USE_RTC_CHIPS | - | - / x | - | - | - | - |
| -USE_DS3231 | - | - / - | - | - | - | - |
| -USE_BM8563 | - | - / x | - | - | - | - | | -USE_BM8563 | - | - / x | - | - | - | - |
| -USE_DS3231 | - | - / - | - | - | - | - |
| -USE_PCF85063 | - | - / - | - | - | - | - |
| -USE_PCF85363 | - | - / - | - | - | - | - | | -USE_PCF85363 | - | - / - | - | - | - | - |
| -USE_RX8010 | - | - / - | - | - | - | - | | -USE_RX8010 | - | - / - | - | - | - | - |
| USE_SHT | - | - / x | - | x | - | - | | USE_SHT | - | - / x | - | x | - | - |
@ -249,6 +250,7 @@ Note: the `minimal` variant is not listed as it shouldn't be used outside of the
| USE_DYP | - | - / - | - | - | - | - | | USE_DYP | - | - / - | - | - | - | - |
| USE_TM1638 | - | - / x | - | x | - | - | | USE_TM1638 | - | - / x | - | x | - | - |
| USE_HX711 | - | - / x | - | x | - | - | | USE_HX711 | - | - / x | - | x | - | - |
| -USE_HX711_M5SCALES | - | - / - | - | - | - | - |
| USE_TX2x_WIND_SENSOR | - | - / - | - | - | - | - | | USE_TX2x_WIND_SENSOR | - | - / - | - | - | - | - |
| USE_WINDMETER | - | - / - | - | - | - | - | | USE_WINDMETER | - | - / - | - | - | - | - |
| USE_RC_SWITCH | - | - / x | - | x | - | - | | USE_RC_SWITCH | - | - / x | - | x | - | - |
@ -283,6 +285,7 @@ Note: the `minimal` variant is not listed as it shouldn't be used outside of the
| USE_SONOFF_SPM | | / x | | | | | | USE_SONOFF_SPM | | / x | | | | |
| USE_DISPLAY_TM1621_SONOFF | | / x | | | | | | USE_DISPLAY_TM1621_SONOFF | | / x | | | | |
| USE_SHELLY_PRO | | / x | | | | | | USE_SHELLY_PRO | | / x | | | | |
| USE_ESP32_TWAI | | / x | | | | |
| USE_DALI | | / x | | | | | | USE_DALI | | / x | | | | |
| USE_DINGTIAN_RELAY | | / - | | | | | | USE_DINGTIAN_RELAY | | / - | | | | |
| USE_MATTER_DEVICE | | / x | | | | | See SetOption151 | | USE_MATTER_DEVICE | | / x | | | | | See SetOption151 |

1
tasmota/include/tasmota_configurations_ESP32.h
View File

@ -802,6 +802,7 @@
#define USE_KNX // Enable KNX IP Protocol Support (+23k code, +3k3 mem) #define USE_KNX // Enable KNX IP Protocol Support (+23k code, +3k3 mem)
#endif #endif
#define USE_DALI // Add support for DALI gateway (+5k code) #define USE_DALI // Add support for DALI gateway (+5k code)
#define USE_ESP32_TWAI // Add support for TWAI/CAN interface (+7k code)
#endif // FIRMWARE_TASMOTA32 #endif // FIRMWARE_TASMOTA32

8
tasmota/tasmota_support/support_features.ino
View File

@ -931,8 +931,12 @@ constexpr uint32_t feature[] = {
#if defined(USE_I2C) && defined(USE_RTC_CHIPS) && defined(USE_RX8010) #if defined(USE_I2C) && defined(USE_RTC_CHIPS) && defined(USE_RX8010)
0x00000200 | // xdrv_56_rtc_chips.ino 0x00000200 | // xdrv_56_rtc_chips.ino
#endif #endif
// 0x00000400 | // #if defined(USE_I2C) && defined(USE_RTC_CHIPS) && defined(USE_PCF85063)
// 0x00000800 | // 0x00000400 | // xdrv_56_rtc_chips.ino
#endif
#ifdef USE_ESP32_TWAI
0x00000800 | // xdrv_91_esp32_twai.ino
#endif
// 0x00001000 | // // 0x00001000 | //
// 0x00002000 | // // 0x00002000 | //
// 0x00004000 | // // 0x00004000 | //

5
tasmota/tasmota_xdrv_driver/xdrv_91_esp32_twai.ino
View File

@ -114,6 +114,7 @@ class twai_cls
var id = ident & 0x1fffffff var id = ident & 0x1fffffff
if id == 0x076 # Incremental counter from 0 to 255 if id == 0x076 # Incremental counter from 0 to 255
# tasmota.log(f"RMH: 0x{id:03x} Count {data1}", 3) # tasmota.log(f"RMH: 0x{id:03x} Count {data1}", 3)
# elif id == 0x080 # Heartbeat every second
elif id == 0x100 # Date and Time elif id == 0x100 # Date and Time
var epoch = 441763200 + (data2 * 24 * 60 * 60) + (data1 / 1000) var epoch = 441763200 + (data2 * 24 * 60 * 60) + (data1 / 1000)
# tasmota.log(f"RMH: 0x{id:03x} Time {tasmota.time_str(epoch)}", 3) # tasmota.log(f"RMH: 0x{id:03x} Time {tasmota.time_str(epoch)}", 3)
@ -411,8 +412,8 @@ void TWAIInit(void) {
Twai.supported = false; Twai.supported = false;
for (uint32_t bus = 0; bus < MAX_TWAI; bus++) { for (uint32_t bus = 0; bus < MAX_TWAI; bus++) {
if (PinUsed(GPIO_TWAI_TX, bus) && PinUsed(GPIO_TWAI_RX, bus)) { if (PinUsed(GPIO_TWAI_TX, bus) && PinUsed(GPIO_TWAI_RX, bus)) {
Twai.speed[bus] = TWAI_SPEED_1MBITS; Twai.speed[bus] = TWAI_SPEED_100KBITS;
Twai.mode[bus] = TWAI_MODE_LISTEN_ONLY; // 0 = TWAI_MODE_NORMAL, 1 = TWAI_MODE_NO_ACK, 2 = TWAI_MODE_LISTEN_ONLY Twai.mode[bus] = TWAI_MODE_NORMAL; // 0 = TWAI_MODE_NORMAL, 1 = TWAI_MODE_NO_ACK, 2 = TWAI_MODE_LISTEN_ONLY
#ifdef USE_BERRY #ifdef USE_BERRY
TWAIBerryConfig(bus); TWAIBerryConfig(bus);
#endif // USE_BERRY #endif // USE_BERRY

4
tools/decode-status.py
View File

@ -309,7 +309,7 @@ a_features = [[
],[ ],[
"USE_MAGIC_SWITCH","USE_PIPSOLAR","USE_GPIO_VIEWER","USE_AMSX915", "USE_MAGIC_SWITCH","USE_PIPSOLAR","USE_GPIO_VIEWER","USE_AMSX915",
"USE_SPI_LORA","USE_SPL06_007","USE_QMP6988","USE_WOOLIIS", "USE_SPI_LORA","USE_SPL06_007","USE_QMP6988","USE_WOOLIIS",
"USE_HX711_M5SCALES","USE_RX8010","","", "USE_HX711_M5SCALES","USE_RX8010","USE_PCF85063","USE_ESP32_TWAI",
"","","","", "","","","",
"","","","", "","","","",
"","","","", "","","","",
@ -342,7 +342,7 @@ else:
obj = json.load(fp) obj = json.load(fp)
def StartDecode(): def StartDecode():
print ("\n*** decode-status.py v14.4.1.1 by Theo Arends and Jacek Ziolkowski ***") print ("\n*** decode-status.py v14.4.1.2 by Theo Arends and Jacek Ziolkowski ***")
# print("Decoding\n{}".format(obj)) # print("Decoding\n{}".format(obj))