feat: Flysky PL18U Support (#6114)

Co-authored-by: Peter Feerick <peter.feerick@gmail.com>
This commit is contained in:
richardclli
2025-06-21 18:31:11 +10:00
committed by GitHub
co-authored by Peter Feerick
parent d81513d4f2
commit f4c019bbb1
34 changed files with 1617 additions and 171 deletions
@@ -66,10 +66,10 @@ extern "C" void SDRAM_GPIOConfig(void)
+-------------------+--------------------+--------------------+--------------------+
| PD0 <-> FMC_D2 | PE0 <-> FMC_NBL0 | PF0 <-> FMC_A0 | PG0 <-> FMC_A10 |
| PD1 <-> FMC_D3 | PE1 <-> FMC_NBL1 | PF1 <-> FMC_A1 | PG1 <-> FMC_A11 |
| PD8 <-> FMC_D13 | PE7 <-> FMC_D4 | PF2 <-> FMC_A2 | PG8 <-> FMC_SDCLK |
| PD9 <-> FMC_D14 | PE8 <-> FMC_D5 | PF3 <-> FMC_A3 | PG15 <-> FMC_NCAS |
| PD10 <-> FMC_D15 | PE9 <-> FMC_D6 | PF4 <-> FMC_A4 |--------------------+
| PD14 <-> FMC_D0 | PE10 <-> FMC_D7 | PF5 <-> FMC_A5 |
| PD8 <-> FMC_D13 | PE7 <-> FMC_D4 | PF2 <-> FMC_A2 | PG2 <-> FMC_A12 |
| PD9 <-> FMC_D14 | PE8 <-> FMC_D5 | PF3 <-> FMC_A3 | PG8 <-> FMC_SDCLK |
| PD10 <-> FMC_D15 | PE9 <-> FMC_D6 | PF4 <-> FMC_A4 | PG15 <-> FMC_NCAS |
| PD14 <-> FMC_D0 | PE10 <-> FMC_D7 | PF5 <-> FMC_A5 |--------------------+
| PD15 <-> FMC_D1 | PE11 <-> FMC_D8 | PF11 <-> FMC_NRAS |
+-------------------| PE12 <-> FMC_D9 | PF12 <-> FMC_A6 |
| PE13 <-> FMC_D10 | PF13 <-> FMC_A7 |
@@ -140,6 +140,10 @@ extern "C" void SDRAM_GPIOConfig(void)
gpio_init_af(GPIO_PIN(GPIOG, 5), GPIO_AF_FMC, GPIO_PIN_SPEED_VERY_HIGH);
gpio_init_af(GPIO_PIN(GPIOG, 8), GPIO_AF_FMC, GPIO_PIN_SPEED_VERY_HIGH);
gpio_init_af(GPIO_PIN(GPIOG, 15), GPIO_AF_FMC, GPIO_PIN_SPEED_VERY_HIGH);
#if defined(SDRAM_32MB)
gpio_init_af(GPIO_PIN(GPIOG, 2), GPIO_AF_FMC, GPIO_PIN_SPEED_VERY_HIGH);
#endif
}
void SDRAM_InitSequence(void)
@@ -209,10 +213,17 @@ void SDRAM_InitSequence(void)
FMC_SDRAM_SendCommand(FMC_SDRAM_DEVICE, &FMC_SDRAMCommandStructure, 10);
/* Step 8: Set the refresh rate counter - refer to section SDRAM refresh timer register in RM0455 */
#if defined(SDRAM_32MB)
/* Set the device refresh rate
* COUNT = [(SDRAM self refresh time / number of row) x SDRAM CLK] – 20
* COUNT = [(SDRAM self refresh time / number of row) x SDRAM CLK] - 20
= [(64ms/8192) * 84MHz] - 20 = 656 - 20 ~ 636 */
FMC_SDRAM_ProgramRefreshRate(FMC_SDRAM_DEVICE, 636);
#else
/* Set the device refresh rate
* COUNT = [(SDRAM self refresh time / number of row) x SDRAM CLK] - 20
= [(64ms/4096) * 84MHz] - 20 = 1312 - 20 ~ 1292 */
FMC_SDRAM_ProgramRefreshRate(FMC_SDRAM_DEVICE, 1292);
#endif
/* Wait until the SDRAM controller is ready */
while((__FMC_SDRAM_GET_FLAG(FMC_SDRAM_DEVICE, FMC_SDRAM_FLAG_BUSY) != 0));
}
@@ -251,10 +262,17 @@ extern "C" void SDRAM_Init(void)
/* FMC SDRAM control configuration */
FMC_SDRAMInitStructure.SDBank = SDRAM_BANK;
/* Row addressing: [7:0] */
#if defined(SDRAM_32MB)
/* Column addressing: [8:0] */
FMC_SDRAMInitStructure.ColumnBitsNumber = FMC_SDRAM_COLUMN_BITS_NUM_9;
/* Row addressing: [12:0] */
FMC_SDRAMInitStructure.RowBitsNumber = FMC_SDRAM_ROW_BITS_NUM_13;
#else
/* Column addressing: [7:0] */
FMC_SDRAMInitStructure.ColumnBitsNumber = FMC_SDRAM_COLUMN_BITS_NUM_8;
/* Column addressing: [11:0] */
/* Row addressing: [11:0] */
FMC_SDRAMInitStructure.RowBitsNumber = FMC_SDRAM_ROW_BITS_NUM_12;
#endif
FMC_SDRAMInitStructure.MemoryDataWidth = SDRAM_MEMORY_WIDTH;
FMC_SDRAMInitStructure.InternalBankNumber = FMC_SDRAM_INTERN_BANKS_NUM_4;
FMC_SDRAMInitStructure.CASLatency = SDRAM_CAS_LATENCY;
+20 -2
View File
@@ -27,7 +27,12 @@ set(CPU_TYPE_FULL STM32F429xI)
set(TARGET_LINKER_DIR stm32f429_sdram)
set(TARGET_EXTRAM_START 0xC0000000)
set(SIZE_TARGET_MEM_DEFINE "MEM_SIZE_SDRAM1=8192")
if(PCBREV STREQUAL PL18U)
set(TARGET_SDRAM_SIZE 32768K)
set(SIZE_TARGET_MEM_DEFINE "MEM_SIZE_SDRAM1=32768")
else()
set(SIZE_TARGET_MEM_DEFINE "MEM_SIZE_SDRAM1=8192")
endif()
set(RF_BAUD_RATE 921600 230400 115200 57600 38400 19200 9600 4800 2400 1200)
set(PCB_RF_BAUD 921600 CACHE STRING "INTERNAL_MODULE_BAUDRATE: ${RF_BAUD_RATE}")
@@ -37,7 +42,20 @@ add_definitions(-DPCBPL18 -DPCBFLYSKY)
add_definitions(-DBATTERY_CHARGE)
add_definitions(-DSTM32_SUPPORT_32BIT_TIMERS)
if (PCBREV STREQUAL EL18)
if(PCBREV STREQUAL PL18U)
set(FLAVOUR pl18u)
add_definitions(-DRADIO_PL18U)
set(DISK_CACHE ON)
set(WIRELESS_CHARGER YES)
set(FLYSKY_GIMBAL ON)
set(LED_STRIP ON)
set(USE_VS1053B ON)
set(KEY_DRIVER pl18u_key_driver.cpp)
# Defines internal module for PL18U
set(INTERNAL_MODULES AFHDS3;CRSF CACHE STRING "Internal modules")
set(DEFAULT_INTERNAL_MODULE FLYSKY_AFHDS3 CACHE STRING "Default internal module")
elseif (PCBREV STREQUAL EL18)
set(FLAVOUR el18)
add_definitions(-DRADIO_EL18 -DRADIO_NV14_FAMILY -DPCBNV14 -DUSE_HATS_AS_KEYS)
set(DISK_CACHE ON)
+90 -29
View File
@@ -25,6 +25,9 @@
#define __BATTERY_DRIVER_C__
// Debug driver
//#define BATTERY_DRIVER_DEBUG
#define BATTERY_W 140
#define BATTERY_H (LCD_H - 120)
#define BATTERY_TOP ((LCD_H - BATTERY_H)/2)
@@ -35,12 +38,25 @@
#define BATTERY_H_INNER (BATTERY_H - 2*BATTERY_BORDER)
#define BATTERY_TOP_INNER (BATTERY_TOP + BATTERY_BORDER)
#define UCHARGER_SAMPLING_CNT 10
#define UCHARGER_CHARGING_SAMPLING_CNT 10
#define WCHARGER_SAMPLING_CNT 30
#define WCHARGER_CHARGING_SAMPLING_CNT 10
#define WCHARGER_LOW_CURRENT_DELAY_CNT 6000
#define WCHARGER_HIGH_CURRENT_DELAY_CNT 24000
#define UCHARGER_SAMPLING_CNT 10
#if defined(RADIO_PL18U)
#define UCHARGER_CHARGING_SAMPLING_CNT 1
#define UCHARGER_CHARGE_END_SAMPLING_CNT 250
#else
#define UCHARGER_CHARGING_SAMPLING_CNT 10
#define UCHARGER_CHARGE_END_SAMPLING_CNT 10
#endif
#define WCHARGER_SAMPLING_CNT 30
#if defined(RADIO_PL18U)
#define WCHARGER_CHARGING_SAMPLING_CNT 1
#define WCHARGER_CHARGE_END_SAMPLING_CNT 250
#else
#define WCHARGER_CHARGING_SAMPLING_CNT 10
#define WCHARGER_CHARGE_END_SAMPLING_CNT 10
#endif
#define WCHARGER_LOW_CURRENT_DELAY_CNT 6000
#define WCHARGER_HIGH_CURRENT_DELAY_CNT 24000
typedef struct
{
@@ -54,11 +70,12 @@ typedef struct
uint8_t chargeEndSamplingCount;
} STRUCT_BATTERY_CHARGER;
STRUCT_BATTERY_CHARGER uCharger; // USB charger
static STRUCT_BATTERY_CHARGER uCharger; // USB charger
#if defined(WIRELESS_CHARGER)
STRUCT_BATTERY_CHARGER wCharger; // Wireless charger
uint16_t wirelessLowCurrentDelay = 0;
uint16_t wirelessHighCurrentDelay = 0;
static STRUCT_BATTERY_CHARGER wCharger; // Wireless charger
static uint16_t wirelessLowCurrentDelay = 0;
static uint16_t wirelessHighCurrentDelay = 0;
#endif
void chargerDetection(STRUCT_BATTERY_CHARGER* charger, uint8_t chargerPinActive, uint8_t samplingCountThreshold)
@@ -87,7 +104,8 @@ void resetChargeEndDetection(STRUCT_BATTERY_CHARGER* charger)
charger->isHighCurrent = false;
}
void chargeEndDetection(STRUCT_BATTERY_CHARGER* charger, uint8_t chargeEndPinActive, uint8_t samplingCountThreshold)
void chargeEndDetection(STRUCT_BATTERY_CHARGER* charger, uint8_t chargeEndPinActive,
uint8_t chargingSamplingCountThreshold, uint8_t chargeEndSamplingCountThreshold)
{
if (charger->isChargeEnd)
{
@@ -101,7 +119,7 @@ void chargeEndDetection(STRUCT_BATTERY_CHARGER* charger, uint8_t chargeEndPinAct
else
{
charger->chargeEndSamplingCount++;
if (charger->chargeEndSamplingCount >= samplingCountThreshold)
if (charger->chargeEndSamplingCount >= chargeEndSamplingCountThreshold)
{
charger->chargeEndSamplingCount = 0;
charger->isChargingDetectionReady = true;
@@ -112,7 +130,7 @@ void chargeEndDetection(STRUCT_BATTERY_CHARGER* charger, uint8_t chargeEndPinAct
{
charger->chargeEndSamplingCount = 0;
charger->chargingSamplingCount++;
if (charger->chargingSamplingCount >= samplingCountThreshold)
if (charger->chargingSamplingCount >= chargingSamplingCountThreshold)
{
charger->chargingSamplingCount = 0;
charger->isChargeEnd = false;
@@ -132,7 +150,7 @@ void chargeEndDetection(STRUCT_BATTERY_CHARGER* charger, uint8_t chargeEndPinAct
else
{
charger->chargingSamplingCount++;
if (charger->chargingSamplingCount >= samplingCountThreshold)
if (charger->chargingSamplingCount >= chargingSamplingCountThreshold)
{
charger->chargingSamplingCount = 0;
charger->isChargingDetectionReady = true;
@@ -143,7 +161,7 @@ void chargeEndDetection(STRUCT_BATTERY_CHARGER* charger, uint8_t chargeEndPinAct
{
charger->chargingSamplingCount = 0;
charger->chargeEndSamplingCount++;
if (charger->chargeEndSamplingCount >= samplingCountThreshold)
if (charger->chargeEndSamplingCount >= chargeEndSamplingCountThreshold)
{
charger->chargeEndSamplingCount = 0;
charger->isChargeEnd = true;
@@ -153,17 +171,18 @@ void chargeEndDetection(STRUCT_BATTERY_CHARGER* charger, uint8_t chargeEndPinAct
}
}
uint16_t get_battery_charge_state()
uint16_t get_uCharger_state(uint16_t state)
{
uint16_t state = CHARGE_UNKNOWN;
chargerDetection(&uCharger, IS_UCHARGER_ACTIVE(), UCHARGER_SAMPLING_CNT);
if (uCharger.isChargerDetectionReady)
{
if (uCharger.hasCharger) // USB charger can be detected properly no matter it is enabled or not
{
#if !defined(RADIO_PL18U)
// Enable USB charger when USB power is detected
ENABLE_UCHARGER();
chargeEndDetection(&uCharger, IS_UCHARGER_CHARGE_END_ACTIVE(), UCHARGER_CHARGING_SAMPLING_CNT);
#endif
chargeEndDetection(&uCharger, IS_UCHARGER_CHARGE_END_ACTIVE(), UCHARGER_CHARGING_SAMPLING_CNT, UCHARGER_CHARGE_END_SAMPLING_CNT);
if (uCharger.isChargingDetectionReady)
{
if (uCharger.isChargeEnd)
@@ -180,18 +199,30 @@ uint16_t get_battery_charge_state()
{
resetChargeEndDetection(&uCharger);
#if !defined(RADIO_PL18U)
// Disable USB charger if it is not present, so that wireless charger can be detected properly
DISABLE_UCHARGER();
#endif
}
}
return state;
}
uint16_t get_wCharger_state(uint16_t state)
{
#if defined(WIRELESS_CHARGER)
chargerDetection(&wCharger, IS_WCHARGER_ACTIVE(), WCHARGER_SAMPLING_CNT);
if (wCharger.isChargerDetectionReady)
{
if (wCharger.hasCharger) // Wireless charger can only be detected when USB charger is disabled
{
chargeEndDetection(&wCharger, IS_WCHARGER_CHARGE_END_ACTIVE(), WCHARGER_CHARGING_SAMPLING_CNT);
#if defined(RADIO_PL18U)
// Disable USB charger when wireless charger is present, otherwise USB charger detection will be wrong
DISABLE_UCHARGER();
ENABLE_WCHARGER();
#endif
chargeEndDetection(&wCharger, IS_WCHARGER_CHARGE_END_ACTIVE(), WCHARGER_CHARGING_SAMPLING_CNT, WCHARGER_CHARGE_END_SAMPLING_CNT);
if (wCharger.isChargingDetectionReady)
{
if (wCharger.isChargeEnd)
@@ -219,6 +250,11 @@ uint16_t get_battery_charge_state()
else
{
resetChargeEndDetection(&wCharger);
#if defined(RADIO_PL18U)
// Enable USB charger only if wireless charger is not present
DISABLE_WCHARGER();
ENABLE_UCHARGER();
#endif
// Charge current control
wirelessHighCurrentDelay = 0;
@@ -234,6 +270,22 @@ uint16_t get_battery_charge_state()
}
}
#endif // defined(WIRELESS_CHARGER)
return state;
}
uint16_t get_battery_charge_state()
{
uint16_t state = CHARGE_UNKNOWN;
#if defined(RADIO_PL18U)
// PL18U wireless charger takes precedence
state = get_wCharger_state(state);
state = get_uCharger_state(state);
#else
state = get_uCharger_state(state);
state = get_wCharger_state(state);
#endif
return state;
@@ -268,8 +320,7 @@ void battery_charge_init()
// Wireless charger status pins
gpio_init(WCHARGER_GPIO, GPIO_IN, GPIO_PIN_SPEED_LOW);
gpio_init(WCHARGER_CHARGE_END_GPIO, GPIO_IN, GPIO_PIN_SPEED_LOW);
#endif
#endif // defined(WIRELESS_CHARGER)
// USB charger control pins
@@ -278,7 +329,11 @@ void battery_charge_init()
#endif
// USB charger state init
#if defined(RADIO_PL18U)
DISABLE_UCHARGER();
#else
ENABLE_UCHARGER();
#endif // defined(RADIO_PL18U)
uCharger.hasCharger = !IS_UCHARGER_ACTIVE(); // Init for sampling count works
uCharger.isChargerDetectionReady = false;
resetChargeEndDetection(&uCharger);
@@ -286,7 +341,10 @@ void battery_charge_init()
#if defined(WIRELESS_CHARGER)
// Wireless charger control pins
gpio_init(WCHARGER_EN_GPIO, GPIO_OUT, GPIO_PIN_SPEED_LOW);
#if defined(WCHARGER_I_CONTROL_GPIO)
gpio_init(WCHARGER_I_CONTROL_GPIO, GPIO_OUT, GPIO_PIN_SPEED_LOW);
#endif // defined(WCHARGER_I_CONTROL_GPIO)
// Wireless charger state init
ENABLE_WCHARGER();
@@ -294,7 +352,7 @@ void battery_charge_init()
wCharger.hasCharger = !IS_WCHARGER_ACTIVE(); // Init for sampling count works
wCharger.isChargerDetectionReady = false;
resetChargeEndDetection(&wCharger);
#endif
#endif // defined(WIRELESS_CHARGER)
}
void ledChargingInfo(uint16_t chargeState) {
@@ -386,7 +444,7 @@ void battery_charge_end()
#define CHARGE_INFO_DURATION 5000 // ms
//this method should be called by timer interrupt or by GPIO interrupt
// This method should be called by timer interrupt or by GPIO interrupt
void handle_battery_charge(uint32_t last_press_time)
{
#if !defined(SIMU)
@@ -400,13 +458,13 @@ void handle_battery_charge(uint32_t last_press_time)
if (chargeState != CHARGE_UNKNOWN) {
if (lastState != chargeState) {
//avoid positive check when none and unknown
// Avoid positive check when none and unknown
if (lastState + chargeState > 1) {
//charge state changed - last state known
// Charge state changed - last state known
info_until = now + (CHARGE_INFO_DURATION);
}
}
//power buttons pressed
// Power buttons pressed
else if (now - last_press_time < POWER_ON_DELAY) {
info_until = now + CHARGE_INFO_DURATION;
}
@@ -424,6 +482,7 @@ void handle_battery_charge(uint32_t last_press_time)
updateTime = timersGetMsTick();
ledChargingInfo(chargeState);
#if !defined(BATTERY_DRIVER_DEBUG)
if(now > info_until) {
info_until = 0;
BACKLIGHT_DISABLE();
@@ -431,13 +490,14 @@ void handle_battery_charge(uint32_t last_press_time)
lcdOff();
}
} else {
#endif
if (lcdInited) {
lcdOn();
}
drawChargingInfo(chargeState);
// DEBUG INFO - TODO delete or replace with LVGL objects
#if 0
#if defined(BATTERY_DRIVER_DEBUG)
char buffer[1024];
sprintf(buffer, "%d,%d,%d,%d", uCharger.isChargerDetectionReady, uCharger.hasCharger, IS_UCHARGER_ACTIVE(), uCharger.chargerSamplingCount);
@@ -457,8 +517,9 @@ void handle_battery_charge(uint32_t last_press_time)
sprintf(buffer, "%d", isChargerActive());
lcd->drawSizedText(100, 130, buffer, strlen(buffer), CENTERED | COLOR_THEME_PRIMARY2);
#endif
#if !defined(BATTERY_DRIVER_DEBUG)
}
#endif
}
#endif
}
+8 -2
View File
@@ -39,8 +39,14 @@ enum ChargeState
#define IS_WCHARGER_CHARGE_END_ACTIVE() gpio_read(WCHARGER_CHARGE_END_GPIO) ? 1 : 0
#define ENABLE_WCHARGER() gpio_set(WCHARGER_EN_GPIO)
#define DISABLE_WCHARGER() gpio_clear(WCHARGER_EN_GPIO)
#define WCHARGER_CURRENT_LOW() gpio_set(WCHARGER_I_CONTROL_GPIO)
#define WCHARGER_CURRENT_HIGH() gpio_clear(WCHARGER_I_CONTROL_GPIO)
#if defined(WCHARGER_I_CONTROL_GPIO)
#define WCHARGER_CURRENT_LOW() gpio_set(WCHARGER_I_CONTROL_GPIO)
#define WCHARGER_CURRENT_HIGH() gpio_clear(WCHARGER_I_CONTROL_GPIO)
#else
#define WCHARGER_CURRENT_LOW()
#define WCHARGER_CURRENT_HIGH()
#endif
extern void battery_charge_init();
extern void handle_battery_charge(uint32_t last_press_time);
+5 -4
View File
@@ -160,6 +160,9 @@ void disableVoiceChip()
void boardBLEarlyInit()
{
#if defined(RADIO_PL18U)
pwrOn();
#endif
// USB charger status pins
gpio_init(UCHARGER_GPIO, GPIO_IN, GPIO_PIN_SPEED_LOW);
@@ -313,13 +316,11 @@ void boardOff()
#endif
if (isChargerActive())
{
// RTC->BKP0R = SOFTRESET_REQUEST;
NVIC_SystemReset();
}
else
#endif
{
// RTC->BKP0R = SHUTDOWN_REQUEST;
pwrOff();
}
@@ -333,9 +334,9 @@ void boardOff()
MODIFY_REG(PWR->CR, (PWR_CR_PDDS | PWR_CR_LPDS | PWR_CR_FPDS | PWR_CR_LPLVDS | PWR_CR_MRLVDS), PDMode);
#else
MODIFY_REG(PWR->CR, (PWR_CR_PDDS| PWR_CR_LPDS), PDMode);
#endif /* PWR_CR_MRUDS && PWR_CR_LPUDS && PWR_CR_FPDS */
#endif // PWR_CR_MRUDS && PWR_CR_LPUDS && PWR_CR_FPDS
/* Set SLEEPDEEP bit of Cortex System Control Register */
// Set SLEEPDEEP bit of Cortex System Control Register
SET_BIT(SCB->SCR, ((uint32_t)SCB_SCR_SLEEPDEEP_Msk));
// To avoid HardFault at return address, end in an endless loop
+5 -7
View File
@@ -96,12 +96,12 @@ extern "C" void SDRAM_Init();
else \
gpio_set(INTMODULE_PWR_GPIO); \
} while (0)
#elif defined(RADIO_NB4P)
#elif defined(RADIO_NB4P) || defined(RADIO_PL18U)
#define INTERNAL_MODULE_ON() gpio_clear(INTMODULE_PWR_GPIO)
#define INTERNAL_MODULE_OFF() gpio_set(INTMODULE_PWR_GPIO);
#else
#define INTERNAL_MODULE_ON() gpio_set(INTMODULE_PWR_GPIO)
#define INTERNAL_MODULE_OFF() gpio_clear(INTMODULE_PWR_GPIO);
#define INTERNAL_MODULE_OFF() gpio_clear(INTMODULE_PWR_GPIO)
#endif
#define EXTERNAL_MODULE_ON() gpio_set(EXTMODULE_PWR_GPIO)
@@ -109,19 +109,17 @@ extern "C" void SDRAM_Init();
#define EXTERNAL_MODULE_PWR_OFF EXTERNAL_MODULE_OFF
#define BLUETOOTH_MODULE_ON() gpio_clear(BLUETOOTH_ON_GPIO)
#define BLUETOOTH_MODULE_OFF() gpio_set(BLUETOOTH_ON_GPIO)
#define IS_INTERNAL_MODULE_ON() (false)
#define IS_EXTERNAL_MODULE_ON() (gpio_read(EXTMODULE_PWR_GPIO) ? 1 : 0)
//#define IS_INTERNAL_MODULE_ON() (false)
//#define IS_EXTERNAL_MODULE_ON() (gpio_read(EXTMODULE_PWR_GPIO) ? 1 : 0)
#else // defined(SIMU)
#define INTERNAL_MODULE_OFF()
#define INTERNAL_MODULE_ON()
#define INTERNAL_MODULE_OFF()
#define EXTERNAL_MODULE_ON()
#define EXTERNAL_MODULE_OFF()
#define BLUETOOTH_MODULE_ON()
#define BLUETOOTH_MODULE_OFF()
#define IS_INTERNAL_MODULE_ON() (false)
#define IS_EXTERNAL_MODULE_ON() (false)
#endif // defined(SIMU)
+137 -53
View File
@@ -235,6 +235,14 @@
#else // !defined(RADIO_NB4P) && !defined(RADIO_NV14_FAMILY)
// Keys
#if defined(RADIO_PL18U)
#define KEYS_GPIO_PIN_ENTER
#define KEYS_GPIO_REG_ENTER
#define KEYS_GPIO_PIN_EXIT
#define KEYS_GPIO_REG_EXIT
#endif
// Trims
#define TRIMS_GPIO_REG_LHL
#define TRIMS_GPIO_PIN_LHL
@@ -272,37 +280,51 @@
#define TRIMS_GPIO_REG_RSU
#define TRIMS_GPIO_PIN_RSU
#define TRIMS_GPIO_REG_T7L
#define TRIMS_GPIO_PIN_T7L
#if !defined(RADIO_PL18U)
#define TRIMS_GPIO_REG_T7L
#define TRIMS_GPIO_PIN_T7L
#define TRIMS_GPIO_REG_T7R
#define TRIMS_GPIO_PIN_T7R
#define TRIMS_GPIO_REG_T7R
#define TRIMS_GPIO_PIN_T7R
#define TRIMS_GPIO_REG_T8D
#define TRIMS_GPIO_PIN_T8D
#define TRIMS_GPIO_REG_T8D
#define TRIMS_GPIO_PIN_T8D
#define TRIMS_GPIO_REG_T8U
#define TRIMS_GPIO_PIN_T8U
#define TRIMS_GPIO_REG_T8U
#define TRIMS_GPIO_PIN_T8U
#define TRIMS_GPIO_REG_TR1U GPIOH->IDR
#define TRIMS_GPIO_PIN_TR1U LL_GPIO_PIN_8 // PH.08
#define TRIMS_GPIO_REG_TR1D GPIOH->IDR
#define TRIMS_GPIO_PIN_TR1D LL_GPIO_PIN_9 // PH.09
#define TRIMS_GPIO_REG_TR2U GPIOH->IDR
#define TRIMS_GPIO_PIN_TR2U LL_GPIO_PIN_10 // PH.10
#define TRIMS_GPIO_REG_TR2D GPIOH->IDR
#define TRIMS_GPIO_PIN_TR2D LL_GPIO_PIN_11 // PH.11
#define TRIMS_GPIO_REG_TR1U GPIOH->IDR
#define TRIMS_GPIO_PIN_TR1U LL_GPIO_PIN_8 // PH.08
#define TRIMS_GPIO_REG_TR1D GPIOH->IDR
#define TRIMS_GPIO_PIN_TR1D LL_GPIO_PIN_9 // PH.09
#define TRIMS_GPIO_REG_TR2U GPIOH->IDR
#define TRIMS_GPIO_PIN_TR2U LL_GPIO_PIN_10 // PH.10
#define TRIMS_GPIO_REG_TR2D GPIOH->IDR
#define TRIMS_GPIO_PIN_TR2D LL_GPIO_PIN_11 // PH.11
#endif
// active 4x4 column/row based key-matrix to support up to 16 buttons with only 8 GPIOs
#define TRIMS_GPIO_OUT1 GPIOG
#define TRIMS_GPIO_OUT1_PIN LL_GPIO_PIN_2 // PG.02
#if defined(RADIO_PL18U)
#define TRIMS_GPIO_OUT1 GPIOI
#define TRIMS_GPIO_OUT1_PIN LL_GPIO_PIN_2 // PI.02
#else
#define TRIMS_GPIO_OUT1 GPIOG
#define TRIMS_GPIO_OUT1_PIN LL_GPIO_PIN_2 // PG.02
#endif
#define TRIMS_GPIO_OUT2 GPIOG
#define TRIMS_GPIO_OUT2_PIN LL_GPIO_PIN_10 // PG.10
#define TRIMS_GPIO_OUT3 GPIOG
#define TRIMS_GPIO_OUT3_PIN LL_GPIO_PIN_11 // PG.11
#if defined(RADIO_PL18U)
#define TRIMS_GPIO_OUT4 GPIOH
#define TRIMS_GPIO_OUT4_PIN LL_GPIO_PIN_10 // PH.10
#endif
// OUT4 routed on MCU PCB, but not attached to any physical buttons, free to use for extensions
#define TRIMS_GPIO_OUT4 GPIOH
#define TRIMS_GPIO_OUT4_PIN LL_GPIO_PIN_7 // PH.07
//#define TRIMS_GPIO_OUT4 GPIOH
//#define TRIMS_GPIO_OUT4_PIN LL_GPIO_PIN_7 // PH.07
#define TRIMS_GPIO_REG_IN1 GPIOB->IDR
#define TRIMS_GPIO_PIN_IN1 LL_GPIO_PIN_15 // PB.15
@@ -322,15 +344,21 @@
#define KEYS_GPIOD_PINS (LL_GPIO_PIN_7)
#define KEYS_GPIOH_PINS \
(LL_GPIO_PIN_8 | LL_GPIO_PIN_9 | LL_GPIO_PIN_10 | LL_GPIO_PIN_11)
#if !defined(RADIO_PL18U)
#define KEYS_GPIOH_PINS \
(LL_GPIO_PIN_8 | LL_GPIO_PIN_9 | LL_GPIO_PIN_10 | LL_GPIO_PIN_11)
#endif
#define KEYS_GPIOJ_PINS (LL_GPIO_PIN_12)
#define KEYS_OUT_GPIOG_PINS (LL_GPIO_PIN_2 | LL_GPIO_PIN_10 | LL_GPIO_PIN_11)
#define KEYS_OUT_GPIOH_PINS (LL_GPIO_PIN_7)
#if defined(RADIO_PL18U)
#define KEYS_OUT_GPIOG_PINS (LL_GPIO_PIN_10 | LL_GPIO_PIN_11)
#define KEYS_OUT_GPIOH_PINS (LL_GPIO_PIN_10)
#define KEYS_OUT_GPIOI_PINS (LL_GPIO_PIN_2)
#else
#define KEYS_OUT_GPIOG_PINS (LL_GPIO_PIN_2 | LL_GPIO_PIN_10 | LL_GPIO_PIN_11)
#define KEYS_OUT_GPIOH_PINS (LL_GPIO_PIN_7)
#endif
// Monitor pin
// #define MONITOR_RCC_AHB1Periph (RCC_AHB1Periph_GPIOJ)
@@ -344,13 +372,15 @@
// Especially, as on current dev. state, using PC8 for SDIO D0.
// (happy coincidence ;)
//
// #define SWITCHES_GPIO_REG_A_H GPIOC
// #define SWITCHES_GPIO_PIN_A_H LL_GPIO_PIN_8 // PC.08
// #define SWITCHES_GPIO_REG_A_L GPIOC
// #define SWITCHES_GPIO_PIN_A_L LL_GPIO_PIN_9 // PC.09
#define SWITCHES_GPIO_REG_A GPIOC
#define SWITCHES_GPIO_PIN_A LL_GPIO_PIN_9 // PC.09
#if defined(RADIO_PL18U)
#define SWITCHES_GPIO_REG_A_H GPIOD
#define SWITCHES_GPIO_PIN_A_H LL_GPIO_PIN_3 // PD.03
#define SWITCHES_GPIO_REG_A_L GPIOB
#define SWITCHES_GPIO_PIN_A_L LL_GPIO_PIN_6 // PB.06
#else
#define SWITCHES_GPIO_REG_A GPIOC
#define SWITCHES_GPIO_PIN_A LL_GPIO_PIN_9 // PC.09
#endif
// High rail of Switch C is not required and thus PC10 is free to use for
// customizations.
@@ -360,8 +390,15 @@
// #define SWITCHES_GPIO_REG_C_L GPIOC
// #define SWITCHES_GPIO_PIN_C_L LL_GPIO_PIN_11 // PC.11
#define SWITCHES_GPIO_REG_C GPIOC
#define SWITCHES_GPIO_PIN_C LL_GPIO_PIN_11 // PC.11
#if defined(RADIO_PL18U)
#define SWITCHES_GPIO_REG_C_H GPIOJ
#define SWITCHES_GPIO_PIN_C_H LL_GPIO_PIN_14 // PJ.14
#define SWITCHES_GPIO_REG_C_L GPIOH
#define SWITCHES_GPIO_PIN_C_L LL_GPIO_PIN_2 // PH.02
#else
#define SWITCHES_GPIO_REG_C GPIOC
#define SWITCHES_GPIO_PIN_C LL_GPIO_PIN_11 // PC.11
#endif
// ADC
@@ -471,6 +508,20 @@
0, /* SWG */ \
0 /* SWH */ \
}
#elif defined(RADIO_PL18U)
#define ADC_DIRECTION { \
0,0,0,0, /* gimbals */ \
0,0,0, /* pots */ \
-1,1, /* sliders */ \
0, /* vbat */ \
0, /* rtc_bat */ \
-1, /* SWB */ \
0, /* SWD */ \
-1, /* SWE */ \
0, /* SWF */ \
-1, /* SWG */ \
0 /* SWH */ \
}
#else
#define ADC_DIRECTION { \
0,0,0,0, /* gimbals */ \
@@ -497,7 +548,7 @@
#define UCHARGER_GPIO GPIO_PIN(GPIOB, 14) // PB.14 input
#define UCHARGER_CHARGE_END_GPIO GPIO_PIN(GPIOB, 13) // PB.13 input
#if defined(RADIO_PL18) || defined(RADIO_PL18EV)
#if defined(RADIO_PL18) || defined(RADIO_PL18EV) || defined(RADIO_PL18U)
#define UCHARGER_EN_GPIO GPIO_PIN(GPIOG, 3) // PG.03 output
#elif defined(RADIO_NV14_FAMILY)
#define UCHARGER_EN_GPIO GPIO_PIN(GPIOH, 11) // PH.11 output
@@ -505,11 +556,17 @@
#endif
#if defined (WIRELESS_CHARGER)
#define WCHARGER_GPIO GPIO_PIN(GPIOI, 9) // PI.09 input
#define WCHARGER_CHARGE_END_GPIO GPIO_PIN(GPIOI, 10) // PI.10 input
#define WCHARGER_EN_GPIO GPIO_PIN(GPIOH, 4) // PH.04 output
#define WCHARGER_I_CONTROL_GPIO GPIO_PIN(GPIOH, 13) // PH.13 output
#endif
#define WCHARGER_GPIO GPIO_PIN(GPIOI, 9) // PI.09 input
#if defined(RADIO_PL18U)
#define WCHARGER_CHARGE_END_GPIO GPIO_PIN(GPIOB, 13) // PB.13 input
#else
#define WCHARGER_CHARGE_END_GPIO GPIO_PIN(GPIOI, 10) // PI.10 input
#endif
#define WCHARGER_EN_GPIO GPIO_PIN(GPIOH, 4) // PH.04 output
#if defined(RADIO_PL18) || defined(RADIO_PL18EV)
#define WCHARGER_I_CONTROL_GPIO GPIO_PIN(GPIOH, 13) // PH.13 output
#endif
#endif // defined(WIRELESS_CHARGER)
// TODO! Check IOLL1 to PI.01 connectivity!
@@ -586,12 +643,14 @@
#define USB_GPIO_AF GPIO_AF10
#if defined(RADIO_NV14_FAMILY)
#define USB_GPIO_VBUS GPIO_PIN(GPIOA, 9) // PA.09
#define USB_SW_GPIO GPIO_PIN(GPIOI, 10) // PI.10
#define USB_GPIO_VBUS GPIO_PIN(GPIOA, 9) // PA.09
#define USB_SW_GPIO GPIO_PIN(GPIOI, 10) // PI.10
#elif defined(RADIO_PL18U)
#define USB_SW_GPIO GPIO_PIN(GPIOI, 5) // PI.05
#endif
// LCD
#define LCD_NRST_GPIO GPIO_PIN(GPIOG, 9) // PG.09
#define LCD_NRST_GPIO GPIO_PIN(GPIOG, 9) // PG.09
#define LCD_SPI_CS_GPIO GPIO_PIN(GPIOE, 4) // PE.04
#define LCD_SPI_SCK_GPIO GPIO_PIN(GPIOE, 2) // PE.02
#define LCD_SPI_MISO_GPIO GPIO_PIN(GPIOE, 5) // PE.05
@@ -631,9 +690,13 @@
#define ROTARY_ENCODER_TIMER_IRQHandler TIM8_UP_TIM13_IRQHandler
#endif
#if defined(RADIO_NV14_FAMILY)
#if defined(RADIO_NV14_FAMILY) || defined(RADIO_PL18U)
// SD card
#define SD_PRESENT_GPIO GPIO_PIN(GPIOH, 10) // PH.10
#if defined(RADIO_PL18U)
#define SD_PRESENT_GPIO GPIO_PIN(GPIOH, 11) // PH.11
#else
#define SD_PRESENT_GPIO GPIO_PIN(GPIOH, 10) // PH.10
#endif
#define SD_SDIO_DMA DMA2
#define SD_SDIO_DMA_STREAM DMA2_Stream3
#define SD_SDIO_DMA_CHANNEL LL_DMA_CHANNEL_4
@@ -641,7 +704,11 @@
#define SD_SDIO_DMA_IRQHANDLER DMA2_Stream3_IRQHandler
#define SD_SDIO_CLK_DIV(fq) ((48000000 / (fq)) - 2)
#define SD_SDIO_INIT_CLK_DIV SD_SDIO_CLK_DIV(400000)
#define SD_SDIO_TRANSFER_CLK_DIV SD_SDIO_CLK_DIV(24000000)
#if defined(RADIO_PL18U)
#define SD_SDIO_TRANSFER_CLK_DIV SD_SDIO_CLK_DIV(12000000)
#else
#define SD_SDIO_TRANSFER_CLK_DIV SD_SDIO_CLK_DIV(24000000)
#endif
#endif
// SPI NOR Flash
@@ -655,7 +722,7 @@
#define FLASH_SPI_DMA_TX_STREAM LL_DMA_STREAM_5
#define FLASH_SPI_DMA_RX_STREAM LL_DMA_STREAM_6
#if defined(RADIO_NV14_FAMILY)
#if defined(RADIO_NV14_FAMILY) || defined(RADIO_PL18U)
#define STORAGE_USE_SDIO
#else
#define STORAGE_USE_SPI_FLASH
@@ -666,7 +733,7 @@
#define SDRAM_RCC_AHB3Periph RCC_AHB3Periph_FMC
// Audio
#if defined(RADIO_NV14_FAMILY)
#if defined(RADIO_NV14_FAMILY) || defined(RADIO_PL18U)
#define AUDIO_XDCS_GPIO GPIO_PIN(GPIOH, 14) // PH.14
#define AUDIO_CS_GPIO GPIO_PIN(GPIOH, 13) // PH.13
#define AUDIO_DREQ_GPIO GPIO_PIN(GPIOH, 15) // PH.15
@@ -685,7 +752,12 @@
#define AUDIO_DMA DMA1
#endif
#if defined(RADIO_NV14_FAMILY)
#if defined(RADIO_PL18U)
#define AUDIO_MUTE_GPIO GPIO_PIN(GPIOI, 10) // PI.10 audio amp control pin
#define AUDIO_UNMUTE_DELAY 120 // ms
#define AUDIO_MUTE_DELAY 500 // ms
#define INVERTED_MUTE_PIN
#elif defined(RADIO_NV14_FAMILY)
#define AUDIO_MUTE_GPIO GPIO_PIN(GPIOH, 8) // PH.08 audio amp control pin
#define AUDIO_UNMUTE_DELAY 120 // ms
#define AUDIO_MUTE_DELAY 500 // ms
@@ -774,8 +846,12 @@
#endif
// Internal Module
#if defined(RADIO_PL18)
#define INTMODULE_PWR_GPIO GPIO_PIN(GPIOI, 0) // PI.00
#if defined(RADIO_PL18) || defined(RADIO_PL18U)
#if defined(RADIO_PL18U)
#define INTMODULE_PWR_GPIO GPIO_PIN(GPIOI, 3) // PI.03
#else
#define INTMODULE_PWR_GPIO GPIO_PIN(GPIOI, 0) // PI.00
#endif
#define INTMODULE_TX_GPIO GPIO_PIN(GPIOF, 7) // PF.07
#define INTMODULE_RX_GPIO GPIO_PIN(GPIOF, 6) // PF.06
#define INTMODULE_USART UART7
@@ -844,7 +920,11 @@
// External Module
#define EXTMODULE
#define EXTMODULE_PULSES
#define EXTMODULE_PWR_GPIO GPIO_PIN(GPIOD, 11) // PD.11
#if defined(RADIO_PL18U)
#define EXTMODULE_PWR_GPIO GPIO_PIN(GPIOI, 1) // PI.01
#else
#define EXTMODULE_PWR_GPIO GPIO_PIN(GPIOD, 11) // PD.11
#endif
#if defined(RADIO_NV14_FAMILY)
#define EXTMODULE_PWR_FIX_GPIO GPIO_PIN(GPIOA, 2) // PA.02
#endif
@@ -937,7 +1017,11 @@
// SDRAM
#define SDRAM_BANK1
#if defined(RADIO_PL18U)
#define SDRAM_32MB
#endif
// LCD Settings
#if defined(RADIO_NB4P) || defined(RADIO_NV14_FAMILY)
#define LCD_W 320
#define LCD_H 480
+21 -34
View File
@@ -28,8 +28,9 @@
#include "delays_driver.h"
#include "keys.h"
/* The output bit-order has to be:
0 LHL TR7L (Left equals down)
/* The output bit-order has to be (D = L, U = R):
PL18/PL18EV
0 LHL TR7L
1 LHR TR7R
2 LVD TR5D
3 LVU TR5U
@@ -49,22 +50,22 @@
enum PhysicalTrims
{
TR7L = 0,
TR7R,
TR5D = 2,
TR5U,
TR6D = 4,
TR6U,
TR8L = 6,
TR8R,
TR1D = 8,
TR1U,
TR2D = 10,
TR2U,
TR3D = 12,
TR3U,
TR4D = 14,
TR4U,
TR7L = 0,
TR7R,
TR5D = 2,
TR5U,
TR6D = 4,
TR6U,
TR8L = 6,
TR8R,
TR1D = 8,
TR1U,
TR2D = 10,
TR2U,
TR3D = 12,
TR3U,
TR4D = 14,
TR4U,
};
void keysInit()
@@ -79,7 +80,7 @@ void keysInit()
LL_GPIO_InitTypeDef pinInit;
LL_GPIO_StructInit(&pinInit);
pinInit.Mode = LL_GPIO_MODE_INPUT;
pinInit.Pull = LL_GPIO_PULL_DOWN;
pinInit.Pull = LL_GPIO_PULL_NO;
pinInit.Pin = KEYS_GPIOB_PINS;
LL_GPIO_Init(GPIOB, &pinInit);
@@ -98,7 +99,7 @@ void keysInit()
// Matrix outputs
pinInit.Mode = LL_GPIO_MODE_OUTPUT;
pinInit.Pull = LL_GPIO_PULL_NO;
pinInit.OutputType = LL_GPIO_OUTPUT_PUSHPULL;
pinInit.Pin = KEYS_OUT_GPIOG_PINS;
LL_GPIO_Init(GPIOG, &pinInit);
@@ -112,19 +113,6 @@ static uint32_t _readKeyMatrix()
// This function avoids concurrent matrix agitation
uint32_t result = 0;
/* Bit 0 - TR3 down
* Bit 1 - TR3 up
* Bit 2 - TR4 down
* Bit 3 - TR4 up
* Bit 4 - TR5 down
* Bit 5 - TR5 up
* Bit 6 - TR6 down
* Bit 7 - TR6 up
* Bit 8 - TR7 left
* Bit 9 - TR7 right
* Bit 10 - TR8 left
* Bit 11 - TR8 right
*/
volatile static struct
{
@@ -144,7 +132,6 @@ static uint32_t _readKeyMatrix()
LL_GPIO_ResetOutputPin(TRIMS_GPIO_OUT1, TRIMS_GPIO_OUT1_PIN);
LL_GPIO_SetOutputPin(TRIMS_GPIO_OUT2, TRIMS_GPIO_OUT2_PIN);
LL_GPIO_SetOutputPin(TRIMS_GPIO_OUT3, TRIMS_GPIO_OUT3_PIN);
LL_GPIO_SetOutputPin(TRIMS_GPIO_OUT4, TRIMS_GPIO_OUT4_PIN);
delay_us(10);
if (~TRIMS_GPIO_REG_IN1 & TRIMS_GPIO_PIN_IN1)
result |= 1 << TR7L;
@@ -109,7 +109,6 @@ uint16_t _adcRead()
LL_ADC_REG_StartConversionSWStart(ADC_MAIN);
// Wait until ADC conversion is complete
uint32_t timeout = 0;
while (!LL_ADC_IsActiveFlag_EOCS(ADC_MAIN));
// Read ADC converted value
@@ -43,15 +43,15 @@ SwitchHwPos boardSwitchGetPosition(SwitchCategory cat, uint8_t idx)
if (idx == 1 && (swVal < 512 || (swVal >= 1536 && swVal < 2560))) {
return SWITCH_HW_DOWN;
}
} /*else if (idx <= 3) {
/* } else if (idx <= 3) {
uint16_t swVal = getAnalogValue(5);
if (idx == 3 && (swVal < 512 || (swVal >= 1536 && swVal < 2560))) {
return SWITCH_HW_DOWN;
}
if (idx == 2 && (swVal >= 3584 || (swVal >= 1536 && swVal < 2560))) {
return SWITCH_HW_DOWN;
}
}*/
}*/
}
return SWITCH_HW_UP;
}
+248
View File
@@ -0,0 +1,248 @@
/*
* Copyright (C) EdgeTX
*
* Based on code named
* opentx - https://github.com/opentx/opentx
* th9x - http://code.google.com/p/th9x
* er9x - http://code.google.com/p/er9x
* gruvin9x - http://code.google.com/p/gruvin9x
*
* License GPLv2: http://www.gnu.org/licenses/gpl-2.0.html
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*/
#include "hal/key_driver.h"
#include "stm32_hal_ll.h"
#include "stm32_gpio_driver.h"
#include "hal.h"
#include "delays_driver.h"
#include "keys.h"
#define REPEAT_DELAY 20
/* The output bit-order has to be (D = L, U = R):
PL18U
0 LHL TR4L
1 LHR TR4R
2 LVD TR3D
3 LVU TR3U
4 RVD TR2D
5 RVU TR2U
6 RHL TR1L
7 RHR TR1R
8 LSD TR6D
9 LSU TR6U
10 RSD TR5D
11 RSU TR5U
12 EX1D KLD
13 EX1U KLU
14 EX2D KRD
15 EX2U KRU
*/
enum PhysicalTrims
{
TR4L = 0,
TR4R,
TR3D = 2,
TR3U,
TR2D = 4,
TR2U,
TR1L = 6,
TR1R,
TR6D = 8,
TR6U,
TR5D = 10,
TR5U,
KLD = 12,
KLU,
KRD = 14,
KRU,
};
volatile uint32_t rotencDt = 0;
static rotenc_t rotencValue = 0;
static uint8_t lastRotState = 0;
static uint8_t stateCount = 0;
void keysInit()
{
stm32_gpio_enable_clock(GPIOB);
stm32_gpio_enable_clock(GPIOC);
stm32_gpio_enable_clock(GPIOD);
stm32_gpio_enable_clock(GPIOG);
stm32_gpio_enable_clock(GPIOH);
stm32_gpio_enable_clock(GPIOI);
stm32_gpio_enable_clock(GPIOJ);
LL_GPIO_InitTypeDef pinInit;
LL_GPIO_StructInit(&pinInit);
pinInit.Mode = LL_GPIO_MODE_INPUT;
pinInit.Pull = LL_GPIO_PULL_NO;
pinInit.Pin = KEYS_GPIOB_PINS;
LL_GPIO_Init(GPIOB, &pinInit);
pinInit.Pin = KEYS_GPIOC_PINS;
LL_GPIO_Init(GPIOC, &pinInit);
pinInit.Pin = KEYS_GPIOD_PINS;
LL_GPIO_Init(GPIOD, &pinInit);
pinInit.Pin = KEYS_GPIOJ_PINS;
LL_GPIO_Init(GPIOJ, &pinInit);
// Matrix outputs
pinInit.Mode = LL_GPIO_MODE_OUTPUT;
pinInit.OutputType = LL_GPIO_OUTPUT_PUSHPULL;
pinInit.Pin = KEYS_OUT_GPIOG_PINS;
LL_GPIO_Init(GPIOG, &pinInit);
pinInit.Pin = KEYS_OUT_GPIOH_PINS;
LL_GPIO_Init(GPIOH, &pinInit);
pinInit.Pin = KEYS_OUT_GPIOI_PINS;
LL_GPIO_Init(GPIOI, &pinInit);
}
static uint32_t _readKeyMatrix()
{
// This function avoids concurrent matrix agitation
uint32_t result = 0;
volatile static struct
{
uint32_t oldResult = 0;
uint8_t ui8ReadInProgress = 0;
} syncelem;
if (syncelem.ui8ReadInProgress != 0) return syncelem.oldResult;
// ui8ReadInProgress was 0, increment it
syncelem.ui8ReadInProgress++;
// Double check before continuing, as non-atomic, non-blocking so far
// If ui8ReadInProgress is above 1, then there was concurrent task calling it, exit
if (syncelem.ui8ReadInProgress > 1) return syncelem.oldResult;
// If we land here, we have exclusive access to Matrix
LL_GPIO_ResetOutputPin(TRIMS_GPIO_OUT1, TRIMS_GPIO_OUT1_PIN);
LL_GPIO_SetOutputPin(TRIMS_GPIO_OUT2, TRIMS_GPIO_OUT2_PIN);
LL_GPIO_SetOutputPin(TRIMS_GPIO_OUT3, TRIMS_GPIO_OUT3_PIN);
LL_GPIO_SetOutputPin(TRIMS_GPIO_OUT4, TRIMS_GPIO_OUT4_PIN);
delay_us(10);
if (~TRIMS_GPIO_REG_IN1 & TRIMS_GPIO_PIN_IN1)
result |= 1 << KLD;
if (~TRIMS_GPIO_REG_IN2 & TRIMS_GPIO_PIN_IN2)
result |= 1 << KLU;
if (~TRIMS_GPIO_REG_IN3 & TRIMS_GPIO_PIN_IN3)
result |= 1 << TR4L;
if (~TRIMS_GPIO_REG_IN4 & TRIMS_GPIO_PIN_IN4)
result |= 1 << TR4R;
LL_GPIO_SetOutputPin(TRIMS_GPIO_OUT1, TRIMS_GPIO_OUT1_PIN);
LL_GPIO_ResetOutputPin(TRIMS_GPIO_OUT2, TRIMS_GPIO_OUT2_PIN);
delay_us(10);
if (~TRIMS_GPIO_REG_IN1 & TRIMS_GPIO_PIN_IN1)
result |= 1 << TR3D;
if (~TRIMS_GPIO_REG_IN2 & TRIMS_GPIO_PIN_IN2)
result |= 1 << TR3U;
if (~TRIMS_GPIO_REG_IN3 & TRIMS_GPIO_PIN_IN3)
result |= 1 << TR2U;
if (~TRIMS_GPIO_REG_IN4 & TRIMS_GPIO_PIN_IN4)
result |= 1 << TR2D;
LL_GPIO_SetOutputPin(TRIMS_GPIO_OUT2, TRIMS_GPIO_OUT2_PIN);
LL_GPIO_ResetOutputPin(TRIMS_GPIO_OUT3, TRIMS_GPIO_OUT3_PIN);
delay_us(10);
if (~TRIMS_GPIO_REG_IN1 & TRIMS_GPIO_PIN_IN1)
result |= 1 << TR1R;
if (~TRIMS_GPIO_REG_IN2 & TRIMS_GPIO_PIN_IN2)
result |= 1 << TR1L;
if (~TRIMS_GPIO_REG_IN3 & TRIMS_GPIO_PIN_IN3)
result |= 1 << KRD;
if (~TRIMS_GPIO_REG_IN4 & TRIMS_GPIO_PIN_IN4)
result |= 1 << KRU;
LL_GPIO_SetOutputPin(TRIMS_GPIO_OUT3, TRIMS_GPIO_OUT3_PIN);
LL_GPIO_ResetOutputPin(TRIMS_GPIO_OUT4, TRIMS_GPIO_OUT4_PIN);
delay_us(10);
if (~TRIMS_GPIO_REG_IN1 & TRIMS_GPIO_PIN_IN1)
result |= 1 << TR6U;
if (~TRIMS_GPIO_REG_IN2 & TRIMS_GPIO_PIN_IN2)
result |= 1 << TR6D;
if (~TRIMS_GPIO_REG_IN3 & TRIMS_GPIO_PIN_IN3)
result |= 1 << TR5D;
if (~TRIMS_GPIO_REG_IN4 & TRIMS_GPIO_PIN_IN4)
result |= 1 << TR5U;
LL_GPIO_SetOutputPin(TRIMS_GPIO_OUT4, TRIMS_GPIO_OUT4_PIN);
syncelem.oldResult = result;
syncelem.ui8ReadInProgress = 0;
return result;
}
uint32_t readKeys()
{
uint32_t result = 0;
uint32_t mkeys = _readKeyMatrix();
if (mkeys & (1 << KRD)) result |= 1 << KEY_ENTER;
if (mkeys & (1 << KRU)) result |= 1 << KEY_EXIT;
uint8_t rotState = 0;
if (mkeys & (1 << KLD)) rotState |= 1;
if (mkeys & (1 << KLU)) rotState |= 2;
if (rotState != lastRotState) {
lastRotState = rotState;
stateCount = 0;
} else {
stateCount++;
if (stateCount == 3) {
if (rotState == 1)
rotencValue++;
else if (rotState == 2)
rotencValue--;
} else if (stateCount >= REPEAT_DELAY) {
stateCount = 0;
}
}
return result;
}
uint32_t readTrims()
{
uint32_t result = 0;
result |= _readKeyMatrix();
result &= 0xfff; // Only 12 bits for 6 trims
return result;
}
rotenc_t rotaryEncoderGetValue()
{
return rotencValue;
}
void rotaryEncoderInit()
{
}
+42 -1
View File
@@ -32,6 +32,7 @@
#include "timers_driver.h"
#include "delays_driver.h"
#include "touch_driver.h"
#include "keys.h"
#include "debug.h"
@@ -87,6 +88,20 @@ typedef enum {TC_NONE, TC_FT6236, TC_CST836U, TC_CST340, TC_CHSC5448} TouchContr
const char TOUCH_CONTROLLER_STR[][10] = {"", "FT6236", "CST836U", "CST340", "CHSC5448"};
#endif
static uint8_t lastTouchKey = 0;
static bool eventFired = false;
static const event_t TOUCHKEY_EVENTS[8] = {
KEY_EXIT | _MSK_KEY_BREAK,
KEY_MODEL | _MSK_KEY_BREAK,
KEY_MODEL | _MSK_KEY_LONG,
KEY_PAGEUP | _MSK_KEY_FIRST,
KEY_TELE | _MSK_KEY_BREAK,
KEY_PAGEDN | _MSK_KEY_FIRST,
KEY_SYS | _MSK_KEY_LONG,
KEY_ENTER | _MSK_KEY_BREAK,
};
TouchController touchController = TC_NONE;
enum TouchRotate
@@ -320,8 +335,34 @@ static bool chsc5448TouchRead(uint16_t * X, uint16_t * Y)
*X = ((ppt->rp.x_h4 & 0x0f) << 8) | ppt->rp.x_l8;
*Y = ((ppt->rp.y_h4 & 0x0f) << 8) | ppt->rp.y_l8;
uint8_t event = ppt->rp.event;
bool hasEvent = ptCnt > 0 && event == TOUCH_CHSC5448_EVT_CONTACT;
return ptCnt > 0 && event == TOUCH_CHSC5448_EVT_CONTACT;
// Touch keys returns X = 2600, Y = 1 to 8 (total 8 keys)
uint8_t currTouchKey = 0;
if (hasEvent && *X >= 2000) {
// Touch key event
currTouchKey = *Y;
if (currTouchKey > 8) {
currTouchKey = 8;
}
hasEvent = false;
}
#if defined(DEBUG)
TRACE("%s: lastTouchKey=%d, currTouchKey=%d", TOUCH_CONTROLLER_STR[touchController], lastTouchKey, currTouchKey);
#endif
if (currTouchKey != lastTouchKey) {
lastTouchKey = currTouchKey;
eventFired = false;
} else {
if (currTouchKey > 0 && !eventFired) {
pushEvent(TOUCHKEY_EVENTS[currTouchKey - 1]);
eventFired = true;
}
}
return hasEvent;
}
static void chsc5448PrintDebugInfo()
+5 -1
View File
@@ -21,7 +21,11 @@
#pragma once
#if defined(RADIO_EL18)
#if defined(RADIO_PL18U)
#define USB_NAME "FlySky PL18Ultra"
#define USB_MANUFACTURER 'F', 'l', 'y', 'S', 'k', 'y', ' ', ' ' /* 8 bytes */
#define USB_PRODUCT 'P', 'L', '1', '8', 'U', ' ', ' ', ' ' /* 8 Bytes */
#elif defined(RADIO_EL18)
#define USB_NAME "Flysky EL18"
#define USB_MANUFACTURER 'F', 'l', 'y', 's', 'k', 'y', ' ', ' ' /* 8 bytes */
#define USB_PRODUCT 'E', 'L', '1', '8', ' ', ' ', ' ', ' ' /* 8 Bytes */