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

Avoid the use of invalid GPIOS when setting up a one-wire bus. (#2934) 

Fixes #2933
This commit is contained in:
f4grx 2019-10-29 22:34:15 +01:00 committed by Marcel Stör
parent 9a5327cab1
commit bfd2259165
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
components/platform/onewire.c
View File

@ -108,6 +108,10 @@ static const uint8_t owDefaultPower = 0;
static int onewire_rmt_init( uint8_t gpio_num )
{
if(!GPIO_IS_VALID_GPIO(gpio_num)) {
return PLATFORM_ERR;
}
// acquire an RMT module for TX and RX each
if ((ow_rmt.tx = platform_rmt_allocate( 1 )) >= 0) {
if ((ow_rmt.rx = platform_rmt_allocate( 1 )) >= 0) {
@ -143,6 +147,9 @@ static int onewire_rmt_init( uint8_t gpio_num )
if (rmt_driver_install( rmt_rx.channel, 512, PLATFORM_RMT_INTR_FLAGS ) == ESP_OK) {
rmt_get_ringbuf_handle( ow_rmt.rx, &ow_rmt.rb );
#ifdef OW_DEBUG
ESP_LOGI("ow", "RMT RX ringbuf handle %p", ow_rmt.rb);
#endif
// don't set ow_rmt.gpio here
// -1 forces a full pin set procedure in first call to onewire_rmt_attach_pin()
@ -178,6 +185,10 @@ static void onewire_flush_rmt_rx_buf( void )
// check rmt TX&RX channel assignment and eventually attach them to the requested pin
static int onewire_rmt_attach_pin( uint8_t gpio_num )
{
if(!GPIO_IS_VALID_GPIO(gpio_num)) {
return PLATFORM_ERR;
}
if (ow_rmt.tx < 0 || ow_rmt.rx < 0)
return PLATFORM_ERR;