MirrorSave
/
nodemcu-firmware
mirror of https://github.com/nodemcu/nodemcu-firmware.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Updated ESP-IDF to latest.

This commit is contained in:
devsaurus 2017-09-12 22:21:33 +02:00
parent b2f09da2e2
commit 7448d21afa
6 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/platform/dht.c
View File

@ -93,7 +93,7 @@ static int dht_init( uint8_t gpio_num )
if (rmt_config( &rmt_rx ) == ESP_OK) { if (rmt_config( &rmt_rx ) == ESP_OK) {
if (rmt_driver_install( rmt_rx.channel, 512, ESP_INTR_FLAG_LOWMED | ESP_INTR_FLAG_IRAM | ESP_INTR_FLAG_SHARED ) == ESP_OK) { if (rmt_driver_install( rmt_rx.channel, 512, ESP_INTR_FLAG_LOWMED | ESP_INTR_FLAG_IRAM | ESP_INTR_FLAG_SHARED ) == ESP_OK) {
rmt_get_ringbuf_handler( dht_rmt.channel, &dht_rmt.rb ); rmt_get_ringbuf_handle( dht_rmt.channel, &dht_rmt.rb );
dht_rmt.gpio = gpio_num; dht_rmt.gpio = gpio_num;

2
components/platform/onewire.c
View File

@ -141,7 +141,7 @@ static int onewire_rmt_init( uint8_t gpio_num )
if (rmt_config( &rmt_rx ) == ESP_OK) { if (rmt_config( &rmt_rx ) == ESP_OK) {
if (rmt_driver_install( rmt_rx.channel, 512, ESP_INTR_FLAG_LOWMED | ESP_INTR_FLAG_IRAM | ESP_INTR_FLAG_SHARED ) == ESP_OK) { if (rmt_driver_install( rmt_rx.channel, 512, ESP_INTR_FLAG_LOWMED | ESP_INTR_FLAG_IRAM | ESP_INTR_FLAG_SHARED ) == ESP_OK) {
rmt_get_ringbuf_handler( ow_rmt.rx, &ow_rmt.rb ); rmt_get_ringbuf_handle( ow_rmt.rx, &ow_rmt.rb );
// don't set ow_rmt.gpio here // don't set ow_rmt.gpio here
// -1 forces a full pin set procedure in first call to onewire_rmt_attach_pin() // -1 forces a full pin set procedure in first call to onewire_rmt_attach_pin()

2
components/platform/platform.c
View File

@ -421,7 +421,7 @@ uint8_t platform_adc_setup( uint8_t adc, uint8_t channel, uint8_t atten ) {
int platform_adc_read( uint8_t adc, uint8_t channel ) { int platform_adc_read( uint8_t adc, uint8_t channel ) {
int value = -1; int value = -1;
if (adc == 1) value = adc1_get_voltage( channel ); if (adc == 1) value = adc1_get_raw( channel );
return value; return value;
} }

2
components/platform/ws2812.c
View File

@ -225,7 +225,7 @@ int platform_ws2812_send( void )
// wait for all channels to finish // wait for all channels to finish
for (rmt_channel_t channel = 0; channel < RMT_CHANNEL_MAX; channel++) { for (rmt_channel_t channel = 0; channel < RMT_CHANNEL_MAX; channel++) {
if (ws2812_chains[channel].valid) { if (ws2812_chains[channel].valid) {
rmt_wait_tx_done( channel ); rmt_wait_tx_done( channel, portMAX_DELAY );
} }
} }

2
sdk/esp32-esp-idf

@ -1 +1 @@
Subproject commit 3a1de7dba3565424a12f795b71af45dc3c2072fc Subproject commit 9a26296a0e88a4c3ae27e9c848be970946fff87e

7
sdkconfig.defaults
View File

@ -1,6 +1,13 @@
# Don't warn about undefined variables
CONFIG_MAKE_WARN_UNDEFINED_VARIABLES=n
# Empirical value to prevent a firmware crash due to stack overflow. # Empirical value to prevent a firmware crash due to stack overflow.
CONFIG_MAIN_TASK_STACK_SIZE=8192 CONFIG_MAIN_TASK_STACK_SIZE=8192
# Enable address reuse for sockets in TIME_WAIT # Enable address reuse for sockets in TIME_WAIT
# see https://github.com/nodemcu/nodemcu-firmware/pull/1838 # see https://github.com/nodemcu/nodemcu-firmware/pull/1838
CONFIG_LWIP_SO_REUSE=y CONFIG_LWIP_SO_REUSE=y
# Decrease the duration of sockets in TIME_WAIT
# see https://github.com/nodemcu/nodemcu-firmware/issues/1836
CONFIG_TCP_MSL=5000