Skip to content

Commit 0862693

Browse files
Jason2866Jason2866
authored
update 26122021
1 parent fa32105 commit 0862693

13 files changed

+163
-193
lines changed

Diff for: ‎.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -15,3 +15,4 @@ sdkconfig
1515
sdkconfig.old
1616
version.txt
1717
components/arduino_tinyusb/tinyusb/
18+
dependencies.lock

Diff for: ‎.travis.yml

-42
This file was deleted.

Diff for: ‎CMakeLists.txt

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
# CMakeLists in this exact order for cmake to work correctly
33
cmake_minimum_required(VERSION 3.5)
44

5-
if(IDF_TARGET STREQUAL "esp32")
6-
set(EXTRA_COMPONENT_DIRS ${CMAKE_SOURCE_DIR}/components/esp-rainmaker/components)
7-
endif()
5+
#if(IDF_TARGET STREQUAL "esp32")
6+
# set(EXTRA_COMPONENT_DIRS ${CMAKE_SOURCE_DIR}/components/esp-rainmaker/components)
7+
#endif()
88

99
include($ENV{IDF_PATH}/tools/cmake/project.cmake)
1010
project(arduino-lib-builder)

Diff for: ‎README.md

+8-7
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
1-
# ESP32 Arduino Lib Builder [![Build Status](https://travis-ci.org/espressif/esp32-arduino-lib-builder.svg?branch=master)](https://travis-ci.org/espressif/esp32-arduino-lib-builder)
1+
# Tasmota ESP32 Arduino Lib Builder
22

3-
This repository contains the scripts that produce the libraries included with esp32-arduino.
3+
This repository contains the scripts that produce the adopted libraries for Tasmota Arduino Esp32.
44

5-
Tested on Ubuntu (32 and 64 bit), Raspberry Pi and MacOS.
5+
Tested on Ubuntu.
66

7-
### Build on Ubuntu and Raspberry Pi
7+
### Build on Ubuntu
88
```bash
9-
sudo apt-get install git wget curl libssl-dev libncurses-dev flex bison gperf python python-pip python-setuptools python-serial python-click python-cryptography python-future python-pyparsing python-pyelftools cmake ninja-build ccache
10-
sudo pip install --upgrade pip
11-
git clone https://github.com/espressif/esp32-arduino-lib-builder
9+
sudo apt-get install -y git wget curl libssl-dev libncurses-dev flex bison gperf python3 cmake ninja-build ccache
10+
curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py && python3 get-pip.py && \
11+
pip3 install setuptools pyserial click future wheel cryptography pyparsing pyelftools
12+
git clone https://github.com/Jason2866/esp32-arduino-lib-builder
1213
cd esp32-arduino-lib-builder
1314
./build.sh
1415
```

Diff for: ‎components/arduino_tinyusb/CMakeLists.txt

+3-2
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,14 @@ if(CONFIG_TINYUSB_ENABLED)
2626
"${COMPONENT_DIR}/include")
2727
set(srcs
2828
# espressif:
29-
"${COMPONENT_DIR}/src/dcd_esp32s2.c"
29+
"${COMPONENT_DIR}/src/dcd_esp32sx.c"
3030
# tusb:
31-
#"${COMPONENT_DIR}/tinyusb/src/portable/espressif/esp32s2/dcd_esp32s2.c"
31+
#"${COMPONENT_DIR}/tinyusb/src/portable/espressif/esp32sx/dcd_esp32sx.c"
3232
"${COMPONENT_DIR}/tinyusb/src/class/cdc/cdc_device.c"
3333
"${COMPONENT_DIR}/tinyusb/src/class/hid/hid_device.c"
3434
"${COMPONENT_DIR}/tinyusb/src/class/midi/midi_device.c"
3535
"${COMPONENT_DIR}/tinyusb/src/class/msc/msc_device.c"
36+
"${COMPONENT_DIR}/tinyusb/src/class/video/video_device.c"
3637
"${COMPONENT_DIR}/tinyusb/src/class/dfu/dfu_rt_device.c"
3738
"${COMPONENT_DIR}/tinyusb/src/class/vendor/vendor_device.c"
3839
"${COMPONENT_DIR}/tinyusb/src/common/tusb_fifo.c"

Diff for: ‎components/arduino_tinyusb/Kconfig.projbuild

+37-3
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,8 @@ menu "Arduino TinyUSB"
5959

6060
config TINYUSB_MSC_BUFSIZE
6161
int "MSC Buffer size"
62-
default 64
62+
range 512 4096
63+
default 512
6364
depends on TINYUSB_MSC_ENABLED
6465
help
6566
MSC Buffer size
@@ -92,11 +93,11 @@ menu "Arduino TinyUSB"
9293
endmenu
9394

9495
menu "MIDI driver"
95-
depends on TINYUSB_ENABLED && (!TINYUSB_VENDOR_ENABLED || !TINYUSB_MSC_ENABLED || !TINYUSB_HID_ENABLED || !TINYUSB_CDC_ENABLED)
96+
depends on TINYUSB_ENABLED
9697

9798
config TINYUSB_MIDI_ENABLED
9899
bool "Enable USB MIDI TinyUSB driver"
99-
default n
100+
default y
100101
help
101102
Enable USB MIDI TinyUSB driver.
102103

@@ -123,6 +124,39 @@ menu "Arduino TinyUSB"
123124

124125
endmenu
125126

127+
menu "VIDEO driver"
128+
depends on TINYUSB_ENABLED
129+
130+
config TINYUSB_VIDEO_ENABLED
131+
bool "Enable USB VIDEO TinyUSB driver"
132+
default y
133+
help
134+
Enable USB VIDEO TinyUSB driver.
135+
136+
config TINYUSB_DESC_VIDEO_STRING
137+
string "VIDEO Device String"
138+
default "Espressif VIDEO Device"
139+
depends on TINYUSB_VIDEO_ENABLED
140+
help
141+
Specify name of the VIDEO device
142+
143+
config TINYUSB_VIDEO_STREAMING_BUFSIZE
144+
int "VIDEO streaming endpoint size"
145+
range 0 64
146+
default 64
147+
depends on TINYUSB_VIDEO_ENABLED
148+
help
149+
VIDEO streaming endpoint size
150+
151+
config TINYUSB_VIDEO_STREAMING_IFS
152+
int "Number of VIDEO streaming interfaces"
153+
range 1 3
154+
default 1
155+
depends on TINYUSB_VIDEO_ENABLED
156+
help
157+
The number of VIDEO streaming interfaces
158+
endmenu
159+
126160
menu "DFU Runtime driver"
127161
depends on TINYUSB_ENABLED
128162

Diff for: ‎components/arduino_tinyusb/include/tusb_config.h

+9
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,10 @@ extern "C" {
5252
# define CONFIG_TINYUSB_MIDI_ENABLED 0
5353
#endif
5454

55+
#ifndef CONFIG_TINYUSB_VIDEO_ENABLED
56+
# define CONFIG_TINYUSB_VIDEO_ENABLED 0
57+
#endif
58+
5559
#ifndef CONFIG_TINYUSB_CUSTOM_CLASS_ENABLED
5660
# define CONFIG_TINYUSB_CUSTOM_CLASS_ENABLED 0
5761
#endif
@@ -99,6 +103,7 @@ extern "C" {
99103
#define CFG_TUD_MSC CONFIG_TINYUSB_MSC_ENABLED
100104
#define CFG_TUD_HID CONFIG_TINYUSB_HID_ENABLED
101105
#define CFG_TUD_MIDI CONFIG_TINYUSB_MIDI_ENABLED
106+
#define CFG_TUD_VIDEO CONFIG_TINYUSB_VIDEO_ENABLED
102107
#define CFG_TUD_CUSTOM_CLASS CONFIG_TINYUSB_CUSTOM_CLASS_ENABLED
103108
#define CFG_TUD_DFU_RUNTIME CONFIG_TINYUSB_DFU_RT_ENABLED
104109
#define CFG_TUD_VENDOR CONFIG_TINYUSB_VENDOR_ENABLED
@@ -117,6 +122,10 @@ extern "C" {
117122
#define CFG_TUD_MIDI_RX_BUFSIZE CONFIG_TINYUSB_MIDI_RX_BUFSIZE
118123
#define CFG_TUD_MIDI_TX_BUFSIZE CONFIG_TINYUSB_MIDI_TX_BUFSIZE
119124

125+
// The number of video streaming interfaces and endpoint size
126+
#define CFG_TUD_VIDEO_STREAMING CONFIG_TINYUSB_VIDEO_STREAMING_IFS
127+
#define CFG_TUD_VIDEO_STREAMING_EP_BUFSIZE CONFIG_TINYUSB_VIDEO_STREAMING_BUFSIZE
128+
120129
// VENDOR FIFO size of TX and RX
121130
#define CFG_TUD_VENDOR_RX_BUFSIZE CONFIG_TINYUSB_VENDOR_RX_BUFSIZE
122131
#define CFG_TUD_VENDOR_TX_BUFSIZE CONFIG_TINYUSB_VENDOR_TX_BUFSIZE

0 commit comments

Comments
 (0)