Skip to content

Commit

Permalink
Rework serial
Browse files Browse the repository at this point in the history
  • Loading branch information
@AdrianSoundy
AdrianSoundy committed Jun 14, 2020
1 parent b7023a7 commit 3721e8e
Show file tree
Hide file tree
Showing 4 changed files with 915 additions and 397 deletions.
22 changes: 17 additions & 5 deletions targets/FreeRTOS_ESP32/ESP32_WROOM_32/Include/Esp32_DeviceMapping.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,21 +16,33 @@
#define I2C2_DATA 25
#define I2C2_CLOCK 26

// UART defines
// number of pins required to configure an UART
enum Esp32SerialPin
{
Esp32SerialPin_Tx,
Esp32SerialPin_Rx,
Esp32SerialPin_Rts,
Esp32SerialPin_Cts,
Esp32SerialPin_Max,
};

enum Esp32_MapDeviceType
{
DEV_TYPE_GPIO,
DEV_TYPE_SPI,
DEV_TYPE_I2C,
DEV_TYPE_SERIAL,
DEV_TYPE_LED_PWM,
DEV_TYPE_ADC,
DEV_TYPE_DAC,
DEV_TYPE_MAX,
DEV_TYPE_LED_PWM,
DEV_TYPE_ADC,
DEV_TYPE_DAC,
DEV_TYPE_MAX,
};

int Esp32_GetMappedDevicePins(Esp32_MapDeviceType DevType, int DevNumber, int PinIndex);
int Esp32_GetMappedDevicePinsWithFunction(uint32_t alternateFunction);

void Esp32_SetMappedDevicePins( uint8_t pin, int32_t alternateFunction );
void Esp32_SetMappedDevicePins(uint8_t pin, int32_t alternateFunction);
void Esp32_SetMappedDevicePins(Esp32_MapDeviceType devType, int devNumber, int8_t pinIndex, int ioPinNumber);

#endif //_ESP32_DEVICEMAPPING_
180 changes: 105 additions & 75 deletions targets/FreeRTOS_ESP32/ESP32_WROOM_32/common/Esp32_DeviceMapping.cpp
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//
// Copyright (c) 2017 The nanoFramework project contributors
// Copyright (c) 2020 The nanoFramework project contributors
// See LICENSE file in the project root for full license information.
//

Expand All @@ -11,7 +11,7 @@
// 2 devices
// Map pins mosi, miso, clock
//
int8_t Esp32_SPI_DevicePinMap[2][3] =
int8_t Esp32_SPI_DevicePinMap[2][3] =
{
{GPIO_NUM_23, GPIO_NUM_25, GPIO_NUM_19}, // SPI1 - Wrover SPI display pins
{-1, -1, -1} // SPI2 - no pins assigned
Expand All @@ -20,24 +20,25 @@ int8_t Esp32_SPI_DevicePinMap[2][3] =
// Serial
// 3 devices COM1,COM2, COM3 ( UART_NUM_0, UART_NUM_1, UART_NUM_2 )
// Map pins Tx, RX, RTS, CTS
// Set default direct pins
int8_t Esp32_SERIAL_DevicePinMap[3][4] =
// Set pins to default for UART_NUM_0
// others assign as NONE because the default pins can be shared with serial flash and PSRAM
int8_t Esp32_SERIAL_DevicePinMap[UART_NUM_MAX][Esp32SerialPin_Max] =
{
// COM 1 - pins 1, 3, 19, 22
{UART_NUM_0_TXD_DIRECT_GPIO_NUM, UART_NUM_0_RXD_DIRECT_GPIO_NUM, UART_NUM_0_RTS_DIRECT_GPIO_NUM, UART_NUM_0_CTS_DIRECT_GPIO_NUM},
// COM 2 - 10, 9, 6, 11
{UART_NUM_1_TXD_DIRECT_GPIO_NUM, UART_NUM_1_RXD_DIRECT_GPIO_NUM, UART_NUM_1_RTS_DIRECT_GPIO_NUM, UART_NUM_1_CTS_DIRECT_GPIO_NUM},
// COM3 - 17, 16, 8, 7
{UART_NUM_2_TXD_DIRECT_GPIO_NUM, UART_NUM_2_RXD_DIRECT_GPIO_NUM, UART_NUM_2_RTS_DIRECT_GPIO_NUM, UART_NUM_2_CTS_DIRECT_GPIO_NUM}
};

// COM 2 - all set to UART_PIN_NO_CHANGE
{UART_PIN_NO_CHANGE, UART_PIN_NO_CHANGE, UART_PIN_NO_CHANGE, UART_PIN_NO_CHANGE},

// COM3 - all set to UART_PIN_NO_CHANGE
{UART_PIN_NO_CHANGE, UART_PIN_NO_CHANGE, UART_PIN_NO_CHANGE, UART_PIN_NO_CHANGE}
};

// =============================================
// I2C
// 2 devices I2C1 & I2C2
// Map pins Data & Clock
int8_t Esp32_I2C_DevicePinMap[2][2] =
int8_t Esp32_I2C_DevicePinMap[2][2] =
{
// I2C1 - pins 18, 19,
{I2C1_DATA, I2C1_CLOCK},
Expand All @@ -49,25 +50,25 @@ int8_t Esp32_I2C_DevicePinMap[2][2] =
// LED PWM
// 16 channels LED1 to LED16 or PWM1 to PWM16
// Map pins Data & Clock
int8_t Esp32_LED_DevicePinMap[16] =
int8_t Esp32_LED_DevicePinMap[16] =
{
// Channels ( non assigned )
-1, // 1
-1, // 2
-1, // 3
-1, // 4
-1, // 5
-1, // 6
-1, // 7
-1, // 8
-1, // 9
-1, // 10
-1, // 11
-1, // 12
-1, // 13
-1, // 14
-1, // 15
-1, // 16
// Channels ( non assigned )
-1, // 1
-1, // 2
-1, // 3
-1, // 4
-1, // 5
-1, // 6
-1, // 7
-1, // 8
-1, // 9
-1, // 10
-1, // 11
-1, // 12
-1, // 13
-1, // 14
-1, // 15
-1, // 16
};

// We use "ADC1" for 20 logical channels
Expand All @@ -78,8 +79,8 @@ int8_t Esp32_LED_DevicePinMap[16] =
// " ADC2 channels 10 - 19
int8_t Esp32_ADC_DevicePinMap[20] =
{
// 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19
36, 37, 38, 39, 32, 33, 34, 35, 36, 39, 04, 00, 02, 15, 13, 12, 14, 27, 25, 26
// 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19
36, 37, 38, 39, 32, 33, 34, 35, 36, 39, 04, 00, 02, 15, 13, 12, 14, 27, 25, 26
};

//
Expand All @@ -88,42 +89,42 @@ int8_t Esp32_ADC_DevicePinMap[20] =
//
int8_t Esp32_DAC_DevicePinMap[2] =
{
// 0 1
25, 26
// 0 1
25, 26
};

void Esp32_DecodeAlternateFunction(uint32_t alternateFunction, Esp32_MapDeviceType & deviceType, uint8_t & busIndex, uint16_t & PinIndex)
void Esp32_DecodeAlternateFunction(uint32_t alternateFunction, Esp32_MapDeviceType& deviceType, uint8_t& busIndex, uint16_t& PinIndex)
{
deviceType = (Esp32_MapDeviceType)((alternateFunction >> 16) & 0x00ff);
busIndex = (uint8_t)((alternateFunction >> 8) & 0x00ff) - 1;
PinIndex = (uint16_t)(alternateFunction & 0x00ff);
deviceType = (Esp32_MapDeviceType)((alternateFunction >> 16) & 0x00ff);
busIndex = (uint8_t)((alternateFunction >> 8) & 0x00ff) - 1;
PinIndex = (uint16_t)(alternateFunction & 0x00ff);
}

int Esp32_GetMappedDevicePins( Esp32_MapDeviceType deviceType, int DevNumber, int PinIndex)
int Esp32_GetMappedDevicePins(Esp32_MapDeviceType deviceType, int DevNumber, int PinIndex)
{
if ( DevNumber >= 0)
if (DevNumber >= 0)
{
switch( deviceType )
switch (deviceType)
{
case DEV_TYPE_SPI:
return (int)Esp32_SPI_DevicePinMap[DevNumber][PinIndex];

case DEV_TYPE_I2C:
return (int)Esp32_I2C_DevicePinMap[DevNumber][PinIndex];
case DEV_TYPE_SERIAL:
return (int)Esp32_SERIAL_DevicePinMap[DevNumber][PinIndex];
case DEV_TYPE_LED_PWM:

case DEV_TYPE_SERIAL:
return (int)Esp32_SERIAL_DevicePinMap[DevNumber][PinIndex];

case DEV_TYPE_LED_PWM:
return (int)Esp32_LED_DevicePinMap[DevNumber];

case DEV_TYPE_ADC:
return (int)Esp32_ADC_DevicePinMap[PinIndex];
case DEV_TYPE_DAC:
return (int)Esp32_DAC_DevicePinMap[PinIndex];
case DEV_TYPE_ADC:
return (int)Esp32_ADC_DevicePinMap[PinIndex];

case DEV_TYPE_DAC:
return (int)Esp32_DAC_DevicePinMap[PinIndex];

default:
default:
break;
};
}
Expand All @@ -132,15 +133,44 @@ int Esp32_GetMappedDevicePins( Esp32_MapDeviceType deviceType, int DevNumber, i

int Esp32_GetMappedDevicePinsWithFunction(uint32_t alternateFunction)
{
Esp32_MapDeviceType deviceType;
uint8_t deviceIndex;
uint16_t pinIndex;
Esp32_MapDeviceType deviceType;
uint8_t deviceIndex;
uint16_t pinIndex;

Esp32_DecodeAlternateFunction(alternateFunction, deviceType, deviceIndex, pinIndex);
Esp32_DecodeAlternateFunction(alternateFunction, deviceType, deviceIndex, pinIndex);

return Esp32_GetMappedDevicePins(deviceType, deviceIndex, pinIndex);
return Esp32_GetMappedDevicePins(deviceType, deviceIndex, pinIndex);
}

void Esp32_SetMappedDevicePins(Esp32_MapDeviceType deviceType, int devNumber, int8_t pinIndex, int ioPinNumber)
{
if (devNumber >= 0)
{
switch (deviceType)
{
case DEV_TYPE_SPI:
Esp32_SPI_DevicePinMap[devNumber][pinIndex] = ioPinNumber;

case DEV_TYPE_I2C:
Esp32_I2C_DevicePinMap[devNumber][pinIndex] = ioPinNumber;

case DEV_TYPE_SERIAL:
Esp32_SERIAL_DevicePinMap[devNumber][pinIndex] = ioPinNumber;

case DEV_TYPE_LED_PWM:
Esp32_LED_DevicePinMap[devNumber] = ioPinNumber;

case DEV_TYPE_ADC:
Esp32_ADC_DevicePinMap[pinIndex] = ioPinNumber;

case DEV_TYPE_DAC:
Esp32_DAC_DevicePinMap[pinIndex] = ioPinNumber;

default:
break;
};
}
}

// Esp32_SetMappedDevicePins
//
Expand All @@ -149,44 +179,44 @@ int Esp32_GetMappedDevicePinsWithFunction(uint32_t alternateFunction)
// II= device index 1,2,3 etc
// FF= functional pin i.e data, clock, tx,rx
//
void Esp32_SetMappedDevicePins( uint8_t pin, int32_t alternateFunction )
void Esp32_SetMappedDevicePins(uint8_t pin, int32_t alternateFunction)
{
Esp32_MapDeviceType deviceType;
uint8_t deviceIndex;
uint16_t mapping;
Esp32_MapDeviceType deviceType;
uint8_t deviceIndex;
uint16_t mapping;

Esp32_DecodeAlternateFunction(alternateFunction, deviceType, deviceIndex, mapping);
Esp32_DecodeAlternateFunction(alternateFunction, deviceType, deviceIndex, mapping);

// Set the pins used by a device type / index
switch( deviceType )
switch (deviceType)
{
case DEV_TYPE_GPIO:
// Just opening a GPIO pin will set it to GPIO function
break;

case DEV_TYPE_SPI:
if (deviceIndex <= 1 && mapping <= 2)
if (deviceIndex <= 1 && mapping <= 2)
{
Esp32_SPI_DevicePinMap[deviceIndex][mapping] = pin;
}
break;

case DEV_TYPE_I2C:
if (deviceIndex <= 1 && mapping <= 1)
if (deviceIndex <= 1 && mapping <= 1)
{
Esp32_I2C_DevicePinMap[deviceIndex][mapping] = pin;
}
break;

case DEV_TYPE_SERIAL:
if (deviceIndex <= 2 && mapping <= 3)
{
Esp32_SERIAL_DevicePinMap[deviceIndex][mapping] = pin;
}
break;
case DEV_TYPE_LED_PWM:
if (deviceIndex <= 15 )
case DEV_TYPE_SERIAL:
if (deviceIndex < UART_NUM_MAX && mapping < Esp32SerialPin_Max)
{
Esp32_SERIAL_DevicePinMap[deviceIndex][mapping] = pin;
}
break;

case DEV_TYPE_LED_PWM:
if (deviceIndex <= 15)
{
Esp32_LED_DevicePinMap[deviceIndex] = pin;
}
Expand Down
Loading

0 comments on commit 3721e8e

Please sign in to comment.