Merge branch 'development' into pre-release

This commit is contained in:
Theo Arends 2020-05-13 14:50:02 +02:00
commit fdc46f60da

View File

@ -169,5 +169,10 @@
| USE_DISPLAY_ILI9488 | - | - | - | - | - | - | - |
| USE_DISPLAY_SSD1351 | - | - | - | - | - | - | - |
| USE_DISPLAY_RA8876 | - | - | - | - | - | - | - |
| | | | | | | | |
| USE_WEBCAM | - | - | - | - | - | - | - | ESP32 only
## Additional Features and Sensors on ESP32
| Feature or Sensor | minimal | lite | tasmota | knx | sensors | ir | display | webcam | Remarks
|-----------------------|---------|-------|--------|-----|---------|----|---------|--------|--------
| USE_MI_ESP32 | - | - | - | - | - | - | - | - |
| USE_WEBCAM | - | - | - | - | - | - | - | x |