NV14 implementation partially merged with actual Flysky version.
This commit is contained in:
@@ -13,6 +13,8 @@ option(PPM "PPM TX Module" ON)
|
||||
option(DSM2 "DSM2 TX Module" ON)
|
||||
option(SBUS "SBUS TX Module" ON)
|
||||
option(CROSSFIRE "Crossfire TX Module" ON)
|
||||
option(AFHDS2 "Support for AFHDS2" OFF)
|
||||
option(AFHDS3 "Support for AFHDS3" OFF)
|
||||
option(MULTIMODULE "DIY Multiprotocol TX Module (https://github.com/pascallanger/DIY-Multiprotocol-TX-Module)" ON)
|
||||
option(DEBUG_INTERRUPTS "Count interrupts" OFF)
|
||||
option(DEBUG_LATENCY "Debug latency" OFF)
|
||||
@@ -147,7 +149,18 @@ endif()
|
||||
|
||||
if(MULTIMODULE)
|
||||
add_definitions(-DMULTIMODULE)
|
||||
set(SRC ${SRC} pulses/multi.cpp telemetry/spektrum.cpp telemetry/flysky_ibus.cpp telemetry/hitec.cpp telemetry/hott.cpp telemetry/multi.cpp io/multi_firmware_update.cpp)
|
||||
set(SRC ${SRC} pulses/multi.cpp telemetry/spektrum.cpp telemetry/hitec.cpp telemetry/hott.cpp telemetry/multi.cpp io/multi_firmware_update.cpp)
|
||||
endif()
|
||||
if(MULTIMODULE OR AFHDS3)
|
||||
set(SRC ${SRC} telemetry/flysky_ibus.cpp)
|
||||
endif()
|
||||
if(AFHDS2)
|
||||
add_definitions(-DAFHDS2)
|
||||
set(SRC ${SRC} telemetry/flysky_nv14.cpp)
|
||||
endif()
|
||||
|
||||
if(AFHDS3)
|
||||
add_definitions(-DAFHDS3)
|
||||
endif()
|
||||
|
||||
if(CROSSFIRE)
|
||||
@@ -236,3 +249,17 @@ if(SBUS)
|
||||
sbus.cpp
|
||||
)
|
||||
endif()
|
||||
if(AFHDS2)
|
||||
set(PULSES_SRC
|
||||
${PULSES_SRC}
|
||||
afhds2.cpp
|
||||
flysky.cpp
|
||||
)
|
||||
endif()
|
||||
|
||||
if(AFHDS3)
|
||||
set(PULSES_SRC
|
||||
${PULSES_SRC}
|
||||
afhds3.cpp
|
||||
)
|
||||
endif()
|
||||
|
||||
@@ -102,7 +102,7 @@ if(PCB STREQUAL X7 OR PCB STREQUAL XLITE OR PCB STREQUAL XLITES)
|
||||
)
|
||||
endif()
|
||||
|
||||
if(NOT (PCB STREQUAL X10 OR PCB STREQUAL X12S))
|
||||
if(NOT (PCB STREQUAL X10 OR PCB STREQUAL X12S OR PCB STREQUAL NV14))
|
||||
set(BOOTLOADER_SRC
|
||||
${BOOTLOADER_SRC}
|
||||
../../../../../targets/${TARGET_DIR}/i2c_driver.cpp
|
||||
|
||||
@@ -516,6 +516,6 @@ int main()
|
||||
return 0;
|
||||
}
|
||||
|
||||
#if defined(PCBHORUS)
|
||||
#if defined(PCBHORUS) || defined(PCBNV14)
|
||||
void *__dso_handle = nullptr;
|
||||
#endif
|
||||
|
||||
@@ -167,11 +167,11 @@ uint32_t isFirmwareStart(const uint8_t * buffer)
|
||||
return 0;
|
||||
}
|
||||
// First ISR pointer in FLASH
|
||||
if ((block[1] & 0xFFF00000) != 0x08000000) {
|
||||
if ((block[1] & 0xFFC00000) != 0x08000000) {//for nv14 firmware may start up to 0x81F ....
|
||||
return 0;
|
||||
}
|
||||
// Second ISR pointer in FLASH
|
||||
if ((block[2] & 0xFFF00000) != 0x08000000) {
|
||||
if ((block[2] & 0xFFC00000) != 0x08000000) {
|
||||
return 0;
|
||||
}
|
||||
#else
|
||||
|
||||
@@ -57,7 +57,6 @@
|
||||
#define USBD_VID 0x0483
|
||||
|
||||
#define USBD_LANGID_STRING 0x409
|
||||
#define USBD_MANUFACTURER_STRING "FrSky"
|
||||
#define USBD_SERIALNUMBER_FS_STRING "00000000001B"
|
||||
|
||||
|
||||
@@ -216,8 +215,10 @@ uint8_t * USBD_USR_ProductStrDescriptor( uint8_t speed , uint16_t *length)
|
||||
* @param length : pointer to data length variable
|
||||
* @retval pointer to descriptor buffer
|
||||
*/
|
||||
static const char USBD_MANUFACTURER_STRING[] = { USB_MANUFACTURER };
|
||||
uint8_t * USBD_USR_ManufacturerStrDescriptor( uint8_t speed , uint16_t *length)
|
||||
{
|
||||
|
||||
USBD_GetString ((uint8_t*)USBD_MANUFACTURER_STRING, USBD_StrDesc, length);
|
||||
return USBD_StrDesc;
|
||||
}
|
||||
|
||||
@@ -1,13 +1,13 @@
|
||||
option(DISK_CACHE "Enable SD card disk cache" YES)
|
||||
option(UNEXPECTED_SHUTDOWN "Enable the Unexpected Shutdown screen" YES)
|
||||
option(DISK_CACHE "Enable SD card disk cache" ON)
|
||||
option(UNEXPECTED_SHUTDOWN "Enable the Unexpected Shutdown screen" ON)
|
||||
option(FLYSKY_HALL_STICKS "sticks for FlySky hall sticks" ON)
|
||||
option(FLYSKY_HALL_STICKS_REVERSE "Reverse sticks for FlySky hall sticks" OFF)
|
||||
set(PWR_BUTTON "PRESS" CACHE STRING "Pwr button type (PRESS/SWITCH)")
|
||||
option(MULTIMODULE "DIY Multiprotocol TX Module (https://github.com/pascallanger/DIY-Multiprotocol-TX-Module)" ON)
|
||||
|
||||
set(PWR_BUTTON "PRESS" CACHE STRING "Pwr button type (PRESS/SWITCH)")
|
||||
set(CPU_TYPE STM32F4)
|
||||
set(HSE_VALUE 12000000)
|
||||
set(SDCARD YES)
|
||||
set(SDCARD YES)
|
||||
set(STORAGE SDCARD)
|
||||
set(STORAGE_FORMAT BIN)
|
||||
set(HAPTIC YES)
|
||||
@@ -24,7 +24,7 @@ endif()
|
||||
set(RAMBACKUP YES)
|
||||
set(PPM_LIMITS_SYMETRICAL YES)
|
||||
# for size report script
|
||||
set(CPU_TYPE_FULL STM32F429BIT6)
|
||||
set(CPU_TYPE_FULL STM32F429xI)
|
||||
set(SIZE_TARGET_MEM_DEFINE "MEM_SIZE_SDRAM2=8192")
|
||||
option(USB_SERIAL "Enable USB serial (CDC)" ON)
|
||||
|
||||
@@ -37,7 +37,6 @@ add_definitions(-DPCBNV14 -DPCBFLYSKY -DINTERNAL_MODULE_BAUDRATE=${PCB_RF_BAUD})
|
||||
#add_definitions(-DSOFTWARE_VOLUME)
|
||||
set(TARGET_SRC
|
||||
${TARGET_SRC}
|
||||
#../common/arm/stm32/audio_dac_driver.cpp
|
||||
audio_spi_driver.cpp
|
||||
adc_driver.cpp
|
||||
)
|
||||
@@ -64,11 +63,22 @@ add_definitions(-DSTM32F429_439xx -DSDRAM -DCOLORLCD -DLIBOPENUI -DHARDWARE_TOUC
|
||||
add_definitions(-DEEPROM_VARIANT=0 -DAUDIO -DVOICE -DRTCLOCK)
|
||||
add_definitions(-DGPS_USART_BAUDRATE=${INTERNAL_GPS_BAUDRATE})
|
||||
add_definitions(-DPWR_BUTTON_${PWR_BUTTON})
|
||||
add_definitions(-DCROSSFIRE_NATIVE)
|
||||
add_definitions(-DFLYSKY_HALL_STICKS_REVERSE)
|
||||
add_definitions(-DHALL_STICKS)
|
||||
#add_definitions(-DFLYSKY_AUTO_POWER_DOWN)
|
||||
|
||||
if(STICKS_DEAD_ZONE)
|
||||
add_definitions(-DSTICK_DEAD_ZONE)
|
||||
endif()
|
||||
|
||||
if(NOT UNEXPECTED_SHUTDOWN)
|
||||
add_definitions(-DNO_UNEXPECTED_SHUTDOWN)
|
||||
endif()
|
||||
|
||||
set(AFHDS2 ON)
|
||||
set(AFHDS3 ON)
|
||||
|
||||
include_directories(${RADIO_SRC_DIR}/fonts/colorlcd gui/${GUI_DIR} gui/${GUI_DIR}/layouts)
|
||||
|
||||
file(GLOB THEMES_SRC RELATIVE ${RADIO_SRC_DIR}/gui/colorlcd ${RADIO_SRC_DIR}/gui/colorlcd/themes/*.cpp)
|
||||
@@ -110,14 +120,15 @@ set(FIRMWARE_TARGET_SRC
|
||||
|
||||
if(BOOTLOADER)
|
||||
set(FIRMWARE_TARGET_SRC
|
||||
${FIRMWARE_TARGET_SRC}
|
||||
../common/arm/loadboot.cpp
|
||||
)
|
||||
${FIRMWARE_TARGET_SRC}
|
||||
../common/arm/loadboot.cpp
|
||||
)
|
||||
endif()
|
||||
|
||||
set(PULSES_SRC
|
||||
${PULSES_SRC}
|
||||
#flysky.cpp
|
||||
set(SRC
|
||||
${SRC}
|
||||
io/frsky_firmware_update.cpp
|
||||
io/multi_firmware_update.cpp
|
||||
)
|
||||
|
||||
set(STM32LIB_SRC
|
||||
@@ -126,6 +137,8 @@ set(STM32LIB_SRC
|
||||
STM32F4xx_StdPeriph_Driver/src/stm32f4xx_ltdc.c
|
||||
STM32F4xx_StdPeriph_Driver/src/stm32f4xx_tim.c
|
||||
STM32F4xx_StdPeriph_Driver/src/stm32f4xx_dma2d.c
|
||||
STM32F4xx_StdPeriph_Driver/src/stm32f4xx_exti.c
|
||||
STM32F4xx_StdPeriph_Driver/src/stm32f4xx_syscfg.c
|
||||
)
|
||||
|
||||
if(PYTHONINTERP_FOUND)
|
||||
|
||||
@@ -23,7 +23,11 @@
|
||||
#if defined(SIMU)
|
||||
// not needed
|
||||
#elif defined(PCBNV14)
|
||||
const int8_t ana_direction[NUM_ANALOGS] = { 0 };
|
||||
const int8_t ana_direction[NUM_ANALOGS] = { 0 /*STICK1*/, 0 /*STICK2*/, 0 /*STICK3*/, 0 /*STICK4*/,
|
||||
0 /*POT1*/, 0 /*POT2*/, 0 /*SWA*/, 0 /*SWB*/,
|
||||
0 /*SWC*/, -1 /*SWD*/, 0 /*SWE*/, -1 /*SWF*/,
|
||||
0 /*SWH*/, 0 /*SWG*/,
|
||||
0 /*TX_VOLTAGE*/ };
|
||||
const uint8_t anas_mapping[NUM_ANALOGS] = { 0 /*STICK1*/, 1 /*STICK2*/, 2 /*STICK3*/, 3 /*STICK4*/,
|
||||
4 /*POT1*/, 5 /*POT2*/, 6 /*SWA*/, 13 /*SWB*/,
|
||||
7 /*SWC*/, 14 /*SWD*/, 8 /*SWE*/, 9 /*SWF*/,
|
||||
@@ -64,13 +68,18 @@
|
||||
#define FIRST_ANALOG_ADC 0
|
||||
#define NUM_MAIN_ANALOGS_ADC 10
|
||||
#define NUM_MAIN_ANALOGS_ADC_EXT (NUM_MAIN_ANALOGS - 10)
|
||||
#elif defined(PCBNV14) && defined(HALL_STICKS)
|
||||
#define FIRST_ANALOG_ADC 4
|
||||
#define NUM_MAIN_ANALOGS_ADC 9
|
||||
#else
|
||||
#define FIRST_ANALOG_ADC 0
|
||||
#define FIRST_SUB_ANALOG_ADC 0
|
||||
#define NUM_MAIN_ANALOGS_ADC (SUB_ANALOG_POS)
|
||||
#define NUM_SUB_ANALOGS_ADC (NUM_ANALOGS - SUB_ANALOG_POS)
|
||||
#endif
|
||||
|
||||
#ifndef NUM_SUB_ANALOGS_ADC
|
||||
#define NUM_SUB_ANALOGS_ADC 0
|
||||
#endif
|
||||
uint16_t adcValues[NUM_ANALOGS] __DMA;
|
||||
|
||||
void adcInit()
|
||||
@@ -104,7 +113,7 @@ void adcInit()
|
||||
ADC_MAIN->CR1 = ADC_CR1_SCAN;
|
||||
ADC_MAIN->CR2 = ADC_CR2_ADON | ADC_CR2_DMA | ADC_CR2_DDS;
|
||||
ADC_MAIN->SQR1 = (NUM_MAIN_ANALOGS_ADC-1) << 20; // bits 23:20 = number of conversions
|
||||
#if defined(PCBNV14)
|
||||
#if NUM_SUB_ANALOGS_ADC > 0
|
||||
ADC_SUB->CR1 = ADC_CR1_SCAN;
|
||||
ADC_SUB->CR2 = ADC_CR2_ADON | ADC_CR2_DMA | ADC_CR2_DDS;
|
||||
ADC_SUB->SQR1 = (NUM_SUB_ANALOGS_ADC-1) << 20; // bits 23:20 = number of conversions
|
||||
@@ -138,11 +147,16 @@ void adcInit()
|
||||
ADC_MAIN->SQR2 = (ADC_CHANNEL_SWE<<0) + (ADC_CHANNEL_SWF<<5) + (ADC_CHANNEL_LIBATT<<10) + (ADC_CHANNEL_DRYBATT<<15); // conversions 7 and more
|
||||
ADC_MAIN->SQR3 = (ADC_CHANNEL_POT1<<0) + (ADC_CHANNEL_POT2<<5) + (ADC_CHANNEL_SWA<<10) + (ADC_CHANNEL_SWB<<15) + (ADC_CHANNEL_SWC<<20) + (ADC_CHANNEL_SWD<<25); // conversions 1 to 6
|
||||
#elif defined(PCBNV14)
|
||||
#if !defined(HALL_STICKS)
|
||||
ADC_MAIN->SQR1 |= (ADC_CHANNEL_BATT <<0 );
|
||||
ADC_MAIN->SQR2 = (ADC_CHANNEL_SWA << 0) + (ADC_CHANNEL_SWC << 5) + (ADC_CHANNEL_SWE << 10) + (ADC_CHANNEL_SWF << 15) + (ADC_CHANNEL_SWG << 20) + (ADC_CHANNEL_SWH << 25); // conversions 7 and more
|
||||
ADC_MAIN->SQR3 = (ADC_CHANNEL_STICK_LH<<0) + (ADC_CHANNEL_STICK_LV<<5) + (ADC_CHANNEL_STICK_RV<<10) + (ADC_CHANNEL_STICK_RH<<15) + (ADC_CHANNEL_POT1<<20) + (ADC_CHANNEL_POT2<<25); // conversions 1 to 6
|
||||
ADC_SUB->SQR3 = (ADC_CHANNEL_SWB<<0) + (ADC_CHANNEL_SWD<<5); // conversions 1 to 2
|
||||
|
||||
#else
|
||||
ADC_MAIN->SQR2 = (ADC_CHANNEL_SWG << 0) + (ADC_CHANNEL_SWH << 5) + (ADC_CHANNEL_BATT << 10); // conversions 7 and more
|
||||
ADC_MAIN->SQR3 = (ADC_CHANNEL_POT1<<0) + (ADC_CHANNEL_POT2<<5) + (ADC_CHANNEL_SWA<<10) + (ADC_CHANNEL_SWC<<15) + (ADC_CHANNEL_SWE<<20) + (ADC_CHANNEL_SWF<<25); // conversions 1 to 6
|
||||
ADC_SUB->SQR3 = (ADC_CHANNEL_SWB<<0) + (ADC_CHANNEL_SWD<<5); // conversions 1 to 2
|
||||
#endif
|
||||
#else
|
||||
ADC_MAIN->SQR2 = (ADC_CHANNEL_POT3<<0) + (ADC_CHANNEL_SLIDER1<<5) + (ADC_CHANNEL_SLIDER2<<10) + (ADC_CHANNEL_BATT<<15); // conversions 7 and more
|
||||
ADC_MAIN->SQR3 = (ADC_CHANNEL_STICK_LH<<0) + (ADC_CHANNEL_STICK_LV<<5) + (ADC_CHANNEL_STICK_RV<<10) + (ADC_CHANNEL_STICK_RH<<15) + (ADC_CHANNEL_POT1<<20) + (ADC_CHANNEL_POT2<<25); // conversions 1 to 6
|
||||
@@ -159,7 +173,7 @@ void adcInit()
|
||||
ADC_MAIN_DMA_Stream->NDTR = NUM_MAIN_ANALOGS_ADC;
|
||||
ADC_MAIN_DMA_Stream->FCR = DMA_SxFCR_DMDIS | DMA_SxFCR_FTH_0;
|
||||
|
||||
#if defined(PCBNV14)
|
||||
#if NUM_SUB_ANALOGS > 0
|
||||
ADC_SUB->SMPR1 = ADC_SAMPTIME + (ADC_SAMPTIME<<3) + (ADC_SAMPTIME<<6) + (ADC_SAMPTIME<<9) + (ADC_SAMPTIME<<12) + (ADC_SAMPTIME<<15) + (ADC_SAMPTIME<<18) + (ADC_SAMPTIME<<21) + (ADC_SAMPTIME<<24);
|
||||
ADC_SUB->SMPR2 = ADC_SAMPTIME + (ADC_SAMPTIME<<3) + (ADC_SAMPTIME<<6) + (ADC_SAMPTIME<<9) + (ADC_SAMPTIME<<12) + (ADC_SAMPTIME<<15) + (ADC_SAMPTIME<<18) + (ADC_SAMPTIME<<21) + (ADC_SAMPTIME<<24) + (ADC_SAMPTIME<<27);
|
||||
|
||||
@@ -192,6 +206,8 @@ void adcInit()
|
||||
sticksPwmInit();
|
||||
}
|
||||
#endif
|
||||
//Avoid reading wrong values when the adcRead not be called.
|
||||
adcRead();
|
||||
}
|
||||
|
||||
void adcSingleRead()
|
||||
@@ -201,7 +217,7 @@ void adcSingleRead()
|
||||
ADC_MAIN_SET_DMA_FLAGS();
|
||||
ADC_MAIN_DMA_Stream->CR |= DMA_SxCR_EN; // Enable DMA
|
||||
ADC_MAIN->CR2 |= (uint32_t) ADC_CR2_SWSTART;
|
||||
#if defined(PCBNV14)
|
||||
#if NUM_SUB_ANALOGS_ADC > 0
|
||||
ADC_SUB_DMA_Stream->CR &= ~DMA_SxCR_EN; // Disable DMA
|
||||
ADC_SUB->SR &= ~(uint32_t)(ADC_SR_EOC | ADC_SR_STRT | ADC_SR_OVR);
|
||||
ADC_SUB_SET_DMA_FLAGS();
|
||||
|
||||
@@ -78,6 +78,8 @@
|
||||
|
||||
#define READ_DREQ() (GPIO_ReadInputDataBit(AUDIO_DREQ_GPIO, AUDIO_DREQ_GPIO_PIN))
|
||||
|
||||
bool isAudioOn = false;
|
||||
|
||||
void audioSpiInit(void)
|
||||
{
|
||||
GPIO_InitTypeDef GPIO_InitStructure;
|
||||
@@ -164,13 +166,10 @@ void audioSpiSetSpeed(uint8_t speed)
|
||||
break;
|
||||
}
|
||||
AUDIO_SPI->CR1 |= 0x01 << 6;
|
||||
|
||||
//SPI_Cmd(AUDIO_SPI, ENABLE);
|
||||
}
|
||||
|
||||
uint8_t audioSpiReadWriteByte(uint8_t value)
|
||||
{
|
||||
uint8_t ret = 0;
|
||||
uint16_t time_out = 0x0FFF;
|
||||
while (SPI_I2S_GetFlagStatus(AUDIO_SPI, SPI_I2S_FLAG_TXE) == RESET) {
|
||||
if (--time_out == 0) {
|
||||
@@ -199,10 +198,7 @@ uint8_t audioSpiReadWriteByte(uint8_t value)
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
ret = SPI_I2S_ReceiveData(AUDIO_SPI);
|
||||
|
||||
return ret;
|
||||
return SPI_I2S_ReceiveData(AUDIO_SPI);
|
||||
}
|
||||
|
||||
uint8_t audioWaitDreq(int32_t delay_us)
|
||||
@@ -321,7 +317,6 @@ uint8_t audioSoftReset(void)
|
||||
audioSpiReadWriteByte(0X0);
|
||||
delay_01us(100); // 10us
|
||||
XDCS_HIGH();
|
||||
|
||||
return 1;
|
||||
}
|
||||
|
||||
@@ -386,15 +381,8 @@ void Audio_Sine_Test(void)
|
||||
|
||||
uint32_t audioSpiWriteData(const uint8_t * buffer, uint32_t size)
|
||||
{
|
||||
int i = 55;
|
||||
|
||||
XDCS_LOW();
|
||||
|
||||
if (58 == i)
|
||||
{
|
||||
TRACE("\nbuffer = %d \r\n)", buffer);
|
||||
}
|
||||
|
||||
uint32_t index = 0;
|
||||
while (index < size && READ_DREQ() != 0) {
|
||||
for (int i=0; i<MP3_BUFFER_SIZE && index<size; i++) {
|
||||
@@ -426,7 +414,20 @@ void audioSendRiffHeader()
|
||||
audioSpiWriteBuffer(RiffHeader, sizeof(RiffHeader));
|
||||
}
|
||||
|
||||
#if defined(PCBNV14)
|
||||
void audioOn()
|
||||
{
|
||||
if(isAudioOn) return;
|
||||
GPIO_SetBits(AUDIO_SHUTDOWN_GPIO, AUDIO_SHUTDOWN_GPIO_PIN);
|
||||
isAudioOn = true;
|
||||
}
|
||||
|
||||
void audioOff()
|
||||
{
|
||||
if(!isAudioOn) return;
|
||||
GPIO_ResetBits(AUDIO_SHUTDOWN_GPIO, AUDIO_SHUTDOWN_GPIO_PIN);
|
||||
isAudioOn = false;
|
||||
}
|
||||
|
||||
void audioShutdownInit()
|
||||
{
|
||||
GPIO_InitTypeDef GPIO_InitStructure;
|
||||
@@ -436,21 +437,26 @@ void audioShutdownInit()
|
||||
GPIO_InitStructure.GPIO_OType = GPIO_OType_PP;
|
||||
GPIO_InitStructure.GPIO_PuPd = GPIO_PuPd_UP;
|
||||
GPIO_Init(AUDIO_SHUTDOWN_GPIO, &GPIO_InitStructure);
|
||||
GPIO_SetBits(AUDIO_SHUTDOWN_GPIO, AUDIO_SHUTDOWN_GPIO_PIN); // we never RESET it, there is a 2s delay on STARTUP
|
||||
audioOn();
|
||||
}
|
||||
#endif
|
||||
|
||||
void audioInit()
|
||||
{
|
||||
#if defined(PCBNV14)
|
||||
audioShutdownInit();
|
||||
// TODO X10 code missing
|
||||
#endif
|
||||
|
||||
audioSpiInit();
|
||||
/* Audio setting */
|
||||
audioSpiSetSpeed(SPI_SPEED_64);
|
||||
audioHardReset();
|
||||
audioSoftReset();
|
||||
audioSpiSetSpeed(SPI_SPEED_8);
|
||||
delay_01us(10000);
|
||||
audioSendRiffHeader();
|
||||
audioOn();
|
||||
delay_01us(10000);
|
||||
|
||||
}
|
||||
|
||||
uint8_t * currentBuffer = NULL;
|
||||
uint8_t * currentBuffer = nullptr;
|
||||
uint32_t currentSize = 0;
|
||||
int16_t newVolume = -1;
|
||||
|
||||
@@ -461,13 +467,14 @@ void audioSetCurrentBuffer(const AudioBuffer * buffer)
|
||||
currentSize = buffer->size * 2;
|
||||
}
|
||||
else {
|
||||
currentBuffer = NULL;
|
||||
currentBuffer = nullptr;
|
||||
currentSize = 0;
|
||||
}
|
||||
}
|
||||
|
||||
void audioConsumeCurrentBuffer()
|
||||
{
|
||||
//return;
|
||||
if (newVolume >= 0) {
|
||||
uint8_t value = newVolume;
|
||||
audioSpiWriteCmd(SPI_VOL, (value << 8) + value);
|
||||
@@ -485,7 +492,7 @@ void audioConsumeCurrentBuffer()
|
||||
currentSize -= written;
|
||||
if (currentSize == 0) {
|
||||
audioQueue.buffersFifo.freeNextFilledBuffer();
|
||||
currentBuffer = NULL;
|
||||
currentBuffer = nullptr;
|
||||
currentSize = 0;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -43,9 +43,32 @@ void backlightInit()
|
||||
BACKLIGHT_TIMER->BDTR |= TIM_BDTR_MOE;
|
||||
}
|
||||
|
||||
uint8_t lastDutyCycle = 0;
|
||||
|
||||
void backlightEnable(uint8_t dutyCycle)
|
||||
{
|
||||
// TODO SET provided cycle - for now ensure backlight will be on
|
||||
//BACKLIGHT_TIMER->CCR1 = dutyCycle;
|
||||
BACKLIGHT_TIMER->CCR1 = BACKLIGHT_LEVEL_MAX;
|
||||
BACKLIGHT_TIMER->CCR1 = dutyCycle;
|
||||
if(!dutyCycle) {
|
||||
//experimental to turn off LCD when no backlight
|
||||
if(lcdOffFunction) lcdOffFunction();
|
||||
}
|
||||
else if(!lastDutyCycle) {
|
||||
if(lcdOnFunction) lcdOnFunction();
|
||||
else lcdInit();
|
||||
}
|
||||
lastDutyCycle = dutyCycle;
|
||||
}
|
||||
|
||||
void lcdOff() {
|
||||
backlightEnable(0);
|
||||
}
|
||||
|
||||
void lcdOn(){
|
||||
if(lcdOnFunction) lcdOnFunction();
|
||||
else lcdInit();
|
||||
backlightEnable(BACKLIGHT_LEVEL_MAX);
|
||||
}
|
||||
|
||||
bool isBacklightEnabled() {
|
||||
return lastDutyCycle != 0;
|
||||
}
|
||||
|
||||
@@ -21,8 +21,17 @@
|
||||
|
||||
#define __BATTERY_DRIVER_C__
|
||||
|
||||
#define BATTERY_W 140
|
||||
#define BATTERY_H 320
|
||||
#define BATTERY_TOP ((LCD_H - BATTERY_H)/2)
|
||||
#define BATTERY_CONNECTOR_W 32
|
||||
#define BATTERY_CONNECTOR_H 10
|
||||
#define BATTERY_BORDER 4
|
||||
#define BATTERY_W_INNER (BATTERY_W - 2*BATTERY_BORDER)
|
||||
#define BATTERY_H_INNER (BATTERY_H - 2*BATTERY_BORDER)
|
||||
#define BATTERY_TOP_INNER (BATTERY_TOP + BATTERY_BORDER)
|
||||
|
||||
void init_battery_charge()
|
||||
void battery_charge_init()
|
||||
{
|
||||
GPIO_InitTypeDef GPIO_InitStructure;
|
||||
GPIO_InitStructure.GPIO_Pin = PWR_CHARGE_FINISHED_GPIO_PIN | PWR_CHARGING_GPIO_PIN;
|
||||
@@ -34,51 +43,155 @@ void init_battery_charge()
|
||||
GPIO_SetBits(PWR_CHARGING_GPIO, PWR_CHARGE_FINISHED_GPIO_PIN | PWR_CHARGING_GPIO_PIN);
|
||||
}
|
||||
|
||||
#define CHARGE_SAMPLES 10
|
||||
|
||||
uint16_t get_battery_charge_state()
|
||||
{
|
||||
if (!READ_CHARGE_FINISHED_STATE())
|
||||
{
|
||||
return CHARGE_FINISHED;
|
||||
}
|
||||
else if (!READ_CHARGING_STATE())
|
||||
{
|
||||
return CHARGE_STARTED;
|
||||
}
|
||||
static uint16_t chargeSamples[CHARGE_SAMPLES] = {0};
|
||||
static uint16_t chargeSampleIndex = 0;
|
||||
uint16_t chargeState = CHARGE_UNKNOWN;
|
||||
int maxSamples = CHARGE_SAMPLES;
|
||||
#if !defined(SIMU)
|
||||
bool isFinished = !READ_CHARGE_FINISHED_STATE();
|
||||
bool isCharging = !READ_CHARGING_STATE();
|
||||
//maxSamples = boardState == BOARD_POWER_OFF ? CHARGE_SAMPLES/2 : CHARGE_SAMPLES;
|
||||
if(chargeSampleIndex >= maxSamples) chargeSampleIndex = 0;
|
||||
uint16_t currentChargeState = isFinished ? CHARGE_FINISHED : isCharging ? CHARGE_STARTED : CHARGE_NONE;
|
||||
chargeSamples[chargeSampleIndex++] = currentChargeState;
|
||||
//TRACE("CHARGE sample %d value %d", chargeSampleIndex -1, currentChargeState);
|
||||
#endif
|
||||
uint8_t temp1 = 0, temp2 = 0, temp3 = 0;
|
||||
for(int index = 0; index < maxSamples; index++) {
|
||||
if(chargeSamples[index] == CHARGE_FINISHED)
|
||||
{
|
||||
temp1++;
|
||||
}
|
||||
else if(chargeSamples[index] == CHARGE_STARTED)
|
||||
{
|
||||
temp2++;
|
||||
}
|
||||
else
|
||||
{
|
||||
temp3++;
|
||||
}
|
||||
|
||||
return CHARGE_NONE;
|
||||
if(temp1>=temp2&& temp1>temp3)
|
||||
{
|
||||
chargeState = CHARGE_FINISHED;
|
||||
}
|
||||
else if(temp2>=temp1&& temp2>temp3)
|
||||
{
|
||||
chargeState = CHARGE_STARTED;
|
||||
}
|
||||
else
|
||||
{
|
||||
chargeState = CHARGE_NONE;
|
||||
}
|
||||
}
|
||||
return chargeState;
|
||||
}
|
||||
|
||||
void drawChargingInfo(uint16_t chargeState){
|
||||
static int progress = 0;
|
||||
const char* text = chargeState == CHARGE_STARTED ? STR_BATTERYCHARGING : STR_BATTERYFULL;
|
||||
int h = 0;
|
||||
LcdFlags color = 0;
|
||||
if(CHARGE_STARTED == chargeState)
|
||||
{
|
||||
if(progress >= 100)
|
||||
{
|
||||
progress = 0;
|
||||
}
|
||||
else
|
||||
{
|
||||
progress+=25;
|
||||
}
|
||||
text = STR_BATTERYCHARGING;
|
||||
h = ((BATTERY_H_INNER * progress) / 100);
|
||||
color = ROUND|BATTERY_CHARGE_COLOR;
|
||||
}
|
||||
else if(CHARGE_FINISHED == chargeState)
|
||||
{
|
||||
text = STR_BATTERYFULL;
|
||||
h = BATTERY_H_INNER;
|
||||
color = ROUND|BATTERY_CHARGE_COLOR;
|
||||
}
|
||||
else
|
||||
{
|
||||
text = STR_BATTERYNONE;
|
||||
h = BATTERY_H_INNER;
|
||||
color = ROUND|TRIM_SHADOW_COLOR;
|
||||
}
|
||||
|
||||
uint16_t getBatteryVoltage()
|
||||
BACKLIGHT_ENABLE();
|
||||
lcd->drawSizedText(LCD_W/2, LCD_H-50, text, strlen(text), CENTERED|MAINVIEW_PANES_COLOR);
|
||||
|
||||
lcd->drawFilledRect((LCD_W - BATTERY_W)/2, BATTERY_TOP, BATTERY_W, BATTERY_H, SOLID, ROUND|MAINVIEW_PANES_COLOR);
|
||||
lcd->drawFilledRect((LCD_W - BATTERY_W_INNER)/2, BATTERY_TOP_INNER, BATTERY_W_INNER, BATTERY_H_INNER, SOLID, ROUND|TRIM_SHADOW_COLOR);
|
||||
|
||||
lcd->drawFilledRect((LCD_W - BATTERY_W_INNER)/2, BATTERY_TOP_INNER + BATTERY_H_INNER - h , BATTERY_W_INNER, h, SOLID, color);
|
||||
lcd->drawFilledRect((LCD_W - BATTERY_CONNECTOR_W)/2, BATTERY_TOP-BATTERY_CONNECTOR_H , BATTERY_CONNECTOR_W, BATTERY_CONNECTOR_H, SOLID, MAINVIEW_PANES_COLOR);
|
||||
}
|
||||
#define CHARGE_INFO_DURATION 500
|
||||
//this method should be called by timer interrupt or by GPIO interrupt
|
||||
void handle_battery_charge(uint32_t last_press_time)
|
||||
{
|
||||
#if defined (SIMU)
|
||||
return 350 + g_eeGeneral.txVoltageCalibration;
|
||||
#else
|
||||
int32_t t = getAnalogValue(TX_VOLTAGE) + g_eeGeneral.txVoltageCalibration;
|
||||
#if !defined(SIMU)
|
||||
static uint32_t updateTime = 0;
|
||||
static uint16_t lastState = CHARGE_UNKNOWN;
|
||||
static uint32_t info_until = 0;
|
||||
static bool lcdInited = false;
|
||||
|
||||
t *= ( 3300 * 20);
|
||||
t /= ( 4095 * 10);
|
||||
t = ( t * 100 + 500 ) / 1000;
|
||||
if(boardState != BOARD_POWER_OFF) return;
|
||||
uint32_t now = get_tmr10ms();
|
||||
uint16_t chargeState = get_battery_charge_state();
|
||||
if(chargeState != CHARGE_UNKNOWN) {
|
||||
|
||||
return t;
|
||||
if(lastState != chargeState) {
|
||||
//avoid positive check when none and unknown
|
||||
if(lastState + chargeState > 1) {
|
||||
//charge state changed - last state known
|
||||
info_until = now + (CHARGE_INFO_DURATION);
|
||||
}
|
||||
}
|
||||
//power buttons pressed
|
||||
else if(now - last_press_time < POWER_ON_DELAY) {
|
||||
info_until = now + CHARGE_INFO_DURATION;
|
||||
}
|
||||
lastState = chargeState;
|
||||
}
|
||||
|
||||
if(now > info_until) {
|
||||
info_until = 0;
|
||||
lcd->clear();
|
||||
BACKLIGHT_DISABLE();
|
||||
if(lcdInited) {
|
||||
lcdOff();
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
if(updateTime == 0 || ((get_tmr10ms() - updateTime) >= 50))
|
||||
{
|
||||
if(!lcdInited) {
|
||||
backlightInit();
|
||||
lcdInit();
|
||||
lcdInited = true;
|
||||
}
|
||||
else {
|
||||
lcdOn();
|
||||
}
|
||||
updateTime = get_tmr10ms();
|
||||
lcdNextLayer();
|
||||
lcd->clear();
|
||||
drawChargingInfo(chargeState);
|
||||
lcdRefresh();
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
uint16_t getBatteryVoltage()
|
||||
{
|
||||
int32_t instant_vbat = anaIn(TX_VOLTAGE); // using filtered ADC value on purpose
|
||||
return (uint16_t)((instant_vbat * (1000 + g_eeGeneral.txVoltageCalibration)) / 2942);
|
||||
}
|
||||
|
||||
@@ -31,6 +31,7 @@
|
||||
|
||||
enum ChargeState
|
||||
{
|
||||
CHARGE_UNKNOWN,
|
||||
CHARGE_NONE,
|
||||
CHARGE_STARTED,
|
||||
CHARGE_FINISHED
|
||||
@@ -48,25 +49,9 @@ enum ChargeState
|
||||
#define READ_CHARGE_FINISHED_STATE() GPIO_ReadInputDataBit( PWR_CHARGE_FINISHED_GPIO, PWR_CHARGE_FINISHED_GPIO_PIN )
|
||||
#define READ_CHARGING_STATE() GPIO_ReadInputDataBit( PWR_CHARGING_GPIO, PWR_CHARGING_GPIO_PIN )
|
||||
|
||||
extern void init_battery_charge();
|
||||
extern void battery_charge_init();
|
||||
extern void handle_battery_charge(uint32_t last_press_time);
|
||||
extern uint16_t get_battery_charge_state();
|
||||
extern uint16_t getBatteryVoltage(); // returns current battery voltage in 10mV steps
|
||||
|
||||
#endif
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -17,8 +17,9 @@
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*/
|
||||
|
||||
|
||||
#include "opentx.h"
|
||||
#include "touch.h"
|
||||
#if defined(__cplusplus) && !defined(SIMU)
|
||||
extern "C" {
|
||||
#endif
|
||||
@@ -62,8 +63,6 @@ void init1msTimer()
|
||||
NVIC_EnableIRQ(INTERRUPT_xMS_IRQn);
|
||||
NVIC_SetPriority(INTERRUPT_xMS_IRQn, 7);
|
||||
}
|
||||
|
||||
// TODO use the same than board_sky9x.cpp
|
||||
void interrupt1ms()
|
||||
{
|
||||
static uint8_t pre_scale; // Used to get 10 Hz counter
|
||||
@@ -74,7 +73,7 @@ void interrupt1ms()
|
||||
debugCounter1ms++;
|
||||
#endif
|
||||
|
||||
#if defined(HAPTIC)
|
||||
#if defined(HAPTIC) && !defined(BOOT)
|
||||
if (pre_scale == 5 || pre_scale == 10) {
|
||||
DEBUG_TIMER_START(debugTimerHaptic);
|
||||
HAPTIC_HEARTBEAT();
|
||||
@@ -85,7 +84,7 @@ void interrupt1ms()
|
||||
if (pre_scale == 10) {
|
||||
pre_scale = 0;
|
||||
#if !defined(SIMU)
|
||||
hall_stick_loop();
|
||||
if (boardState == BOARD_STARTED) hall_stick_loop();
|
||||
#endif
|
||||
DEBUG_TIMER_START(debugTimerPer10ms);
|
||||
DEBUG_TIMER_SAMPLE(debugTimerPer10msPeriod);
|
||||
@@ -96,18 +95,70 @@ void interrupt1ms()
|
||||
DEBUG_TIMER_START(debugTimerRotEnc);
|
||||
DEBUG_TIMER_STOP(debugTimerRotEnc);
|
||||
}
|
||||
|
||||
#if !defined(BOOT)
|
||||
extern "C" void INTERRUPT_xMS_IRQHandler()
|
||||
{
|
||||
INTERRUPT_xMS_TIMER->SR &= ~TIM_SR_UIF;
|
||||
interrupt1ms();
|
||||
DEBUG_INTERRUPT(INT_1MS);
|
||||
}
|
||||
#endif
|
||||
|
||||
#if defined(SEMIHOSTING)
|
||||
extern "C" void initialise_monitor_handles();
|
||||
#endif
|
||||
|
||||
|
||||
void delay_self(int count)
|
||||
{
|
||||
for (int i = 50000; i > 0; i--)
|
||||
{
|
||||
for (; count > 0; count--);
|
||||
}
|
||||
}
|
||||
#define RCC_AHB1PeriphMinimum (PWR_RCC_AHB1Periph |\
|
||||
LCD_RCC_AHB1Periph |\
|
||||
BACKLIGHT_RCC_AHB1Periph |\
|
||||
SDRAM_RCC_AHB1Periph \
|
||||
)
|
||||
#define RCC_AHB1PeriphOther (SD_RCC_AHB1Periph |\
|
||||
AUDIO_RCC_AHB1Periph |\
|
||||
MONITOR_RCC_AHB1Periph |\
|
||||
KEYS_RCC_AHB1Periph |\
|
||||
ADC_RCC_AHB1Periph |\
|
||||
AUX_SERIAL_RCC_AHB1Periph |\
|
||||
TELEMETRY_RCC_AHB1Periph |\
|
||||
TRAINER_RCC_AHB1Periph |\
|
||||
AUDIO_RCC_AHB1Periph |\
|
||||
HAPTIC_RCC_AHB1Periph |\
|
||||
INTMODULE_RCC_AHB1Periph |\
|
||||
INTMODULE_RCC_AHB1Periph|\
|
||||
EXTMODULE_RCC_AHB1Periph\
|
||||
)
|
||||
#define RCC_AHB3PeriphMinimum (SDRAM_RCC_AHB3Periph)
|
||||
|
||||
#define RCC_APB1PeriphMinimum (INTERRUPT_xMS_RCC_APB1Periph |\
|
||||
TIMER_2MHz_RCC_APB1Periph |\
|
||||
BACKLIGHT_RCC_APB1Periph \
|
||||
)
|
||||
|
||||
#define RCC_APB1PeriphOther (TELEMETRY_RCC_APB1Periph |\
|
||||
TRAINER_RCC_APB1Periph |\
|
||||
INTMODULE_RCC_APB1Periph |\
|
||||
HALL_RCC_APB1Periph |\
|
||||
EXTMODULE_RCC_APB1Periph |\
|
||||
INTMODULE_RCC_APB1Periph |\
|
||||
AUX_SERIAL_RCC_APB1Periph \
|
||||
)
|
||||
#define RCC_APB2PeriphMinimum (LCD_RCC_APB2Periph)
|
||||
|
||||
#define RCC_APB2PeriphOther (ADC_RCC_APB2Periph |\
|
||||
HAPTIC_RCC_APB2Periph |\
|
||||
AUX_SERIAL_RCC_APB2Periph |\
|
||||
AUDIO_RCC_APB2Periph |\
|
||||
EXTMODULE_RCC_APB2Periph \
|
||||
)
|
||||
|
||||
void boardInit()
|
||||
{
|
||||
#if defined(SEMIHOSTING)
|
||||
@@ -115,51 +166,15 @@ void boardInit()
|
||||
#endif
|
||||
|
||||
#if !defined(SIMU)
|
||||
RCC_AHB1PeriphClockCmd(PWR_RCC_AHB1Periph |
|
||||
LCD_RCC_AHB1Periph |
|
||||
BACKLIGHT_RCC_AHB1Periph |
|
||||
SD_RCC_AHB1Periph |
|
||||
SDRAM_RCC_AHB1Periph |
|
||||
AUDIO_RCC_AHB1Periph |
|
||||
MONITOR_RCC_AHB1Periph |
|
||||
KEYS_RCC_AHB1Periph |
|
||||
ADC_RCC_AHB1Periph |
|
||||
AUX_SERIAL_RCC_AHB1Periph |
|
||||
TELEMETRY_RCC_AHB1Periph |
|
||||
TRAINER_RCC_AHB1Periph |
|
||||
AUDIO_RCC_AHB1Periph |
|
||||
HAPTIC_RCC_AHB1Periph |
|
||||
INTMODULE_RCC_AHB1Periph |
|
||||
HALL_RCC_AHB1Periph |
|
||||
EXTMODULE_RCC_AHB1Periph,
|
||||
ENABLE);
|
||||
|
||||
RCC_AHB3PeriphClockCmd(SDRAM_RCC_AHB3Periph,
|
||||
ENABLE);
|
||||
|
||||
RCC_APB1PeriphClockCmd(INTERRUPT_xMS_RCC_APB1Periph |
|
||||
TIMER_2MHz_RCC_APB1Periph |
|
||||
TELEMETRY_RCC_APB1Periph |
|
||||
TRAINER_RCC_APB1Periph |
|
||||
INTMODULE_RCC_APB1Periph |
|
||||
HALL_RCC_APB1Periph |
|
||||
EXTMODULE_RCC_APB1Periph |
|
||||
BACKLIGHT_RCC_APB1Periph,
|
||||
ENABLE);
|
||||
|
||||
RCC_APB2PeriphClockCmd(LCD_RCC_APB2Periph |
|
||||
ADC_RCC_APB2Periph |
|
||||
HAPTIC_RCC_APB2Periph |
|
||||
AUX_SERIAL_RCC_APB2Periph |
|
||||
INTMODULE_RCC_APB2Periph |
|
||||
AUDIO_RCC_APB2Periph |
|
||||
EXTMODULE_RCC_APB2Periph,
|
||||
ENABLE);
|
||||
|
||||
pwrInit();
|
||||
RCC_AHB1PeriphClockCmd(RCC_AHB1PeriphMinimum | RCC_AHB1PeriphOther, ENABLE);
|
||||
RCC_AHB3PeriphClockCmd(RCC_AHB3PeriphMinimum, ENABLE);
|
||||
RCC_APB1PeriphClockCmd(RCC_APB1PeriphMinimum | RCC_APB1PeriphOther, ENABLE);
|
||||
RCC_APB2PeriphClockCmd(RCC_APB2PeriphMinimum | RCC_APB2PeriphOther, ENABLE);
|
||||
|
||||
__enable_irq();
|
||||
#endif
|
||||
#if defined(DEBUG)
|
||||
auxSerialInit(0, 0); // default serial mode (None if DEBUG nm ot defined)
|
||||
auxSerialInit(0, 0); // default serial mode (None if DEBUG not defined)
|
||||
#endif
|
||||
|
||||
__enable_irq();
|
||||
@@ -167,52 +182,83 @@ void boardInit()
|
||||
TRACE("\nNV14 board started :)");
|
||||
delay_ms(10);
|
||||
TRACE("RCC->CSR = %08x", RCC->CSR);
|
||||
audioInit();
|
||||
|
||||
// we need to initialize g_FATFS_Obj here, because it is in .ram section (because of DMA access)
|
||||
pwrInit();
|
||||
extModuleInit();
|
||||
battery_charge_init();
|
||||
init2MhzTimer();
|
||||
init1msTimer();
|
||||
TouchInit();
|
||||
uint32_t press_start = 0;
|
||||
uint32_t press_end = 0;
|
||||
if(UNEXPECTED_SHUTDOWN() || true) pwrOn();
|
||||
|
||||
while (boardState == BOARD_POWER_OFF)
|
||||
{
|
||||
uint32_t now = get_tmr10ms();
|
||||
if (pwrPressed())
|
||||
{
|
||||
press_end = now;
|
||||
if (press_start == 0) press_start = now;
|
||||
if ((now - press_start) > POWER_ON_DELAY)
|
||||
{
|
||||
pwrOn();
|
||||
break;
|
||||
}
|
||||
}
|
||||
else {
|
||||
uint32_t press_end_touch = press_end;
|
||||
if(touchState.event == TE_UP)
|
||||
{
|
||||
touchState.event = TE_NONE;
|
||||
press_end_touch = touchState.time;
|
||||
}
|
||||
press_start = 0;
|
||||
handle_battery_charge(press_end_touch);
|
||||
delay_ms(20);
|
||||
press_end = 0;
|
||||
}
|
||||
}
|
||||
|
||||
keysInit();
|
||||
audioInit();
|
||||
// we need to initialize g_FATFS_Obj here, because it is in .ram section (because of DMA access)
|
||||
// and this section is un-initialized
|
||||
memset(&g_FATFS_Obj, 0, sizeof(g_FATFS_Obj));
|
||||
|
||||
init_battery_charge();
|
||||
monitorInit();
|
||||
keysInit();
|
||||
adcInit();
|
||||
backlightInit();
|
||||
lcdInit();
|
||||
#if defined(FLYSKY_HALL_STICKS)
|
||||
hall_stick_init(FLYSKY_HALL_BAUDRATE);
|
||||
#endif
|
||||
|
||||
|
||||
|
||||
init2MhzTimer();
|
||||
init1msTimer();
|
||||
usbInit();
|
||||
hapticInit();
|
||||
|
||||
TouchInit();
|
||||
|
||||
|
||||
boardState = BOARD_STARTED;
|
||||
#if defined(DEBUG)
|
||||
DBGMCU_APB1PeriphConfig(DBGMCU_IWDG_STOP|DBGMCU_TIM1_STOP|DBGMCU_TIM2_STOP|DBGMCU_TIM3_STOP|DBGMCU_TIM4_STOP|DBGMCU_TIM5_STOP|DBGMCU_TIM6_STOP|DBGMCU_TIM7_STOP|DBGMCU_TIM8_STOP|DBGMCU_TIM9_STOP|DBGMCU_TIM10_STOP|DBGMCU_TIM11_STOP|DBGMCU_TIM12_STOP|DBGMCU_TIM13_STOP|DBGMCU_TIM14_STOP, ENABLE);
|
||||
#endif
|
||||
|
||||
#endif
|
||||
}
|
||||
|
||||
void boardOff()
|
||||
{
|
||||
BACKLIGHT_DISABLE();
|
||||
lcd->drawFilledRect(0, 0, LCD_WIDTH, LCD_HEIGHT, SOLID, HEADER_BGCOLOR);
|
||||
lcdOff();
|
||||
|
||||
while (pwrPressed()) {
|
||||
wdt_reset();
|
||||
WDG_RESET();
|
||||
}
|
||||
|
||||
|
||||
SysTick->CTRL = 0; // turn off systick
|
||||
pwrOff();
|
||||
#if !defined (SIMU)
|
||||
#if defined(HAPTIC) && !defined(BOOT)
|
||||
haptic.event(AU_ERROR);
|
||||
delay_ms(50);
|
||||
#endif
|
||||
while(1)
|
||||
{
|
||||
NVIC_SystemReset();
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
void init_intmodule_heartbeat()
|
||||
{
|
||||
|
||||
}
|
||||
@@ -54,8 +54,8 @@
|
||||
|
||||
extern uint16_t sessionTimer;
|
||||
|
||||
#define SLAVE_MODE() (g_model.trainerMode == TRAINER_MODE_SLAVE)
|
||||
#define TRAINER_CONNECTED() (GPIO_ReadInputDataBit(TRAINER_DETECT_GPIO, TRAINER_DETECT_GPIO_PIN) == Bit_SET)
|
||||
#define SLAVE_MODE() (g_model.trainerData.mode == TRAINER_MODE_SLAVE)
|
||||
#define TRAINER_CONNECTED() (true)
|
||||
|
||||
PACK(typedef struct {
|
||||
uint8_t pxx2Enabled:1;
|
||||
@@ -95,7 +95,7 @@ uint32_t sdGetSpeed();
|
||||
#define SD_IS_HC() (sdIsHC())
|
||||
#define SD_GET_SPEED() (sdGetSpeed())
|
||||
#define SD_GET_FREE_BLOCKNR() (sdGetFreeSectors())
|
||||
#define SD_CARD_PRESENT() (true)
|
||||
#define SD_CARD_PRESENT() (~SD_PRESENT_GPIO->IDR & SD_PRESENT_GPIO_PIN)
|
||||
void sdInit();
|
||||
void sdMount();
|
||||
void sdDone();
|
||||
@@ -133,8 +133,8 @@ void SDRAM_Init();
|
||||
// Pulses driver
|
||||
#define INTERNAL_MODULE_OFF() GPIO_SetBits(INTMODULE_PWR_GPIO, INTMODULE_PWR_GPIO_PIN)
|
||||
#define INTERNAL_MODULE_ON() GPIO_ResetBits(INTMODULE_PWR_GPIO, INTMODULE_PWR_GPIO_PIN)
|
||||
#define EXTERNAL_MODULE_ON() GPIO_SetBits(EXTMODULE_PWR_GPIO, EXTMODULE_PWR_GPIO_PIN)
|
||||
#define EXTERNAL_MODULE_OFF() GPIO_ResetBits(EXTMODULE_PWR_GPIO, EXTMODULE_PWR_GPIO_PIN)
|
||||
void EXTERNAL_MODULE_ON();
|
||||
void EXTERNAL_MODULE_OFF();
|
||||
#define BLUETOOTH_MODULE_ON() GPIO_ResetBits(BLUETOOTH_ON_GPIO, BLUETOOTH_ON_GPIO_PIN)
|
||||
#define BLUETOOTH_MODULE_OFF() GPIO_SetBits(BLUETOOTH_ON_GPIO, BLUETOOTH_ON_GPIO_PIN)
|
||||
#define IS_INTERNAL_MODULE_ON() (GPIO_ReadInputDataBit(INTMODULE_PWR_GPIO, INTMODULE_PWR_GPIO_PIN) == Bit_SET)
|
||||
@@ -162,6 +162,17 @@ void stop_trainer_capture();
|
||||
// Keys driver
|
||||
enum EnumKeys
|
||||
{
|
||||
KEY_ENTER,
|
||||
KEY_EXIT,
|
||||
KEY_PGUP,
|
||||
KEY_PGDN,
|
||||
KEY_UP,
|
||||
KEY_DOWN,
|
||||
KEY_RIGHT,
|
||||
KEY_LEFT,
|
||||
KEY_TELEM,
|
||||
KEY_MENU,
|
||||
KEY_RADIO,
|
||||
TRM_BASE,
|
||||
TRM_LH_DWN = TRM_BASE,
|
||||
TRM_LH_UP,
|
||||
@@ -173,14 +184,32 @@ enum EnumKeys
|
||||
TRM_RH_UP,
|
||||
TRM_LS_DWN,
|
||||
TRM_LS_UP,
|
||||
TRM_RS_DWN,
|
||||
TRM_RS_UP,
|
||||
TRM_LAST = TRM_RS_UP,
|
||||
TRM_LEFT_CLICK,
|
||||
TRM_RIGHT_CLICK,
|
||||
TRM_LAST = TRM_RIGHT_CLICK,
|
||||
NUM_KEYS
|
||||
};
|
||||
|
||||
#define IS_SHIFT_KEY(index) (false)
|
||||
#define IS_SHIFT_PRESSED() (false)&é&é&é""
|
||||
#define IS_SHIFT_PRESSED() (false)
|
||||
enum VirtualKeys {
|
||||
VKEY_MIN,
|
||||
VKEY_MAX,
|
||||
VKEY_INC,
|
||||
VKEY_DEC,
|
||||
VKEY_INC_LARGE,
|
||||
VKEY_DEC_LARGE,
|
||||
VKEY_DEFAULT,
|
||||
};
|
||||
|
||||
enum LUATouchEvent {
|
||||
TOUCH_DOWN = 1,
|
||||
TOUCH_UP,
|
||||
TOUCH_SLIDE_UP,
|
||||
TOUCH_SLIDE_DOWN,
|
||||
TOUCH_SLIDE_LEFT,
|
||||
TOUCH_SLIDE_RIGHT,
|
||||
};
|
||||
|
||||
enum EnumSwitches
|
||||
{
|
||||
@@ -228,6 +257,13 @@ enum EnumSwitchesPositions
|
||||
};
|
||||
|
||||
#define STORAGE_NUM_SWITCHES_POSITIONS (STORAGE_NUM_SWITCHES * 3)
|
||||
enum EnumPowerupState
|
||||
{
|
||||
BOARD_POWER_OFF = 0xCAFEDEAD,
|
||||
BOARD_POWER_ON = 0xDEADBEEF,
|
||||
BOARD_STARTED = 0xBAADF00D,
|
||||
BOARD_REBOOT = 0xC00010FF,
|
||||
};
|
||||
|
||||
void monitorInit();
|
||||
void keysInit();
|
||||
@@ -245,14 +281,15 @@ uint32_t readTrims();
|
||||
#define DBLKEYS_PRESSED_LFT_DWN(in) (false)
|
||||
|
||||
// WDT driver
|
||||
#define WDTO_500MS 500
|
||||
extern uint32_t powerupReason;
|
||||
extern uint32_t boardState;
|
||||
|
||||
#define SHUTDOWN_REQUEST 0xDEADBEEF
|
||||
#define NO_SHUTDOWN_REQUEST ~SHUTDOWN_REQUEST
|
||||
#define DIRTY_SHUTDOWN 0xCAFEDEAD
|
||||
#define NORMAL_POWER_OFF ~DIRTY_SHUTDOWN
|
||||
|
||||
#define WDG_DURATION 500 /*ms*/
|
||||
void watchdogInit(unsigned int duration);
|
||||
#if defined(SIMU)
|
||||
#define WAS_RESET_BY_WATCHDOG() (false)
|
||||
@@ -336,10 +373,11 @@ void adcInit();
|
||||
void adcRead();
|
||||
uint16_t getAnalogValue(uint8_t index);
|
||||
uint16_t getBatteryVoltage(); // returns current battery voltage in 10mV steps
|
||||
uint16_t getBattery2Voltage(); // returns current battery voltage in 10mV steps
|
||||
|
||||
#define BATTERY_WARN 37 // 3.7V
|
||||
#define BATTERY_WARN 36 // 3.6V
|
||||
#define BATTERY_MIN 35 // 3.5V
|
||||
#define BATTERY_MAX 43 // 4.3V
|
||||
#define BATTERY_MAX 42 // 4.2V
|
||||
|
||||
#if defined(__cplusplus) && !defined(SIMU)
|
||||
extern "C" {
|
||||
@@ -347,20 +385,24 @@ extern "C" {
|
||||
|
||||
// Power driver
|
||||
#define SOFT_PWR_CTRL
|
||||
#define POWER_ON_DELAY 100 // 3s
|
||||
void pwrInit();
|
||||
void extModuleInit();
|
||||
uint32_t pwrCheck();
|
||||
#if defined(PCBFLYSKY)
|
||||
uint32_t lowPowerCheck();
|
||||
#endif
|
||||
|
||||
//TBD removed?!
|
||||
uint8_t UsbModeSelect( uint32_t index );
|
||||
void pwrOn();
|
||||
void pwrSoftReboot();
|
||||
void pwrOff();
|
||||
void pwrResetHandler();
|
||||
bool pwrPressed();
|
||||
uint32_t pwrPressedDuration();
|
||||
uint32_t pwrPressedDuration();;
|
||||
#if defined(SIMU) || defined(NO_UNEXPECTED_SHUTDOWN)
|
||||
#define UNEXPECTED_SHUTDOWN() (false)
|
||||
#else
|
||||
#define UNEXPECTED_SHUTDOWN() ((powerupReason == DIRTY_SHUTDOWN) || WAS_RESET_BY_WATCHDOG_OR_SOFTWARE())
|
||||
#define UNEXPECTED_SHUTDOWN() (powerupReason == DIRTY_SHUTDOWN)
|
||||
#endif
|
||||
|
||||
// LCD driver
|
||||
@@ -377,7 +419,8 @@ void DMACopyBitmap(uint16_t * dest, uint16_t destw, uint16_t desth, uint16_t x,
|
||||
void DMACopyAlphaBitmap(uint16_t * dest, uint16_t destw, uint16_t desth, uint16_t x, uint16_t y, const uint16_t * src, uint16_t srcw, uint16_t srch, uint16_t srcx, uint16_t srcy, uint16_t w, uint16_t h);
|
||||
void DMABitmapConvert(uint16_t * dest, const uint8_t * src, uint16_t w, uint16_t h, uint32_t format);
|
||||
void lcdSetContrast();
|
||||
#define lcdOff() backlightEnable(0) /* just disable the backlight */
|
||||
void lcdOff();
|
||||
void lcdOn();
|
||||
#define lcdSetRefVolt(...)
|
||||
#define lcdRefreshWait(...)
|
||||
void lcdStoreBackupBuffer();
|
||||
@@ -385,10 +428,12 @@ int lcdRestoreBackupBuffer();
|
||||
|
||||
// Backlight driver
|
||||
void backlightInit();
|
||||
#if defined(SIMU)
|
||||
#if defined(SIMU) || !defined(__cplusplus)
|
||||
#define backlightEnable(...)
|
||||
#define isBacklightEnabled() (true)
|
||||
#else
|
||||
void backlightEnable(uint8_t dutyCycle);
|
||||
void backlightEnable(uint8_t dutyCycle = 0);
|
||||
bool isBacklightEnabled();
|
||||
#endif
|
||||
|
||||
#define BACKLIGHT_LEVEL_MAX 100
|
||||
@@ -396,12 +441,11 @@ void backlightEnable(uint8_t dutyCycle);
|
||||
|
||||
#define BACKLIGHT_ENABLE() backlightEnable(globalData.unexpectedShutdown ? BACKLIGHT_LEVEL_MAX : BACKLIGHT_LEVEL_MAX-g_eeGeneral.backlightBright)
|
||||
#define BACKLIGHT_DISABLE() backlightEnable(globalData.unexpectedShutdown ? BACKLIGHT_LEVEL_MAX : ((g_eeGeneral.blOffBright == BACKLIGHT_LEVEL_MIN) && (g_eeGeneral.backlightMode != e_backlight_mode_off)) ? 0 : g_eeGeneral.blOffBright)
|
||||
#define isBacklightEnabled() true
|
||||
|
||||
|
||||
#if !defined(SIMU)
|
||||
void usbJoystickUpdate();
|
||||
#endif
|
||||
#define USBD_MANUFACTURER_STRING "FlySky"
|
||||
#define USB_NAME "FlySky NV14"
|
||||
#define USB_MANUFACTURER 'F', 'l', 'y', 'S', 'k', 'y', ' ', ' ' /* 8 bytes */
|
||||
#define USB_PRODUCT 'N', 'V', '1', '4', ' ', ' ', ' ', ' ' /* 8 Bytes */
|
||||
@@ -419,6 +463,8 @@ void audioSpiSetSpeed(uint8_t speed);
|
||||
uint8_t audioHardReset();
|
||||
uint8_t audioSoftReset();
|
||||
void audioSendRiffHeader();
|
||||
void audioOn();
|
||||
void audioOff();
|
||||
|
||||
#define SPI_SPEED_2 0
|
||||
#define SPI_SPEED_4 1
|
||||
@@ -490,5 +536,4 @@ extern AuxSerialRxFifo auxSerialRxFifo;
|
||||
|
||||
uint8_t touchPressed(uint32_t x, uint32_t y, uint32_t w, uint32_t h);
|
||||
|
||||
|
||||
#endif // _BOARD_H_
|
||||
|
||||
@@ -1,11 +1,12 @@
|
||||
#include "opentx.h"
|
||||
#include "../../common/arm/stm32/bootloader/boot.h"
|
||||
#include "../../common/arm/stm32/bootloader/bin_files.h"
|
||||
|
||||
#define SELECTED_COLOR (INVERS | DEFAULT_COLOR)
|
||||
|
||||
#include "bmp_plug_usb.lbm"
|
||||
#include "bmp_usb_plugged.lbm"
|
||||
#define DEFAULT_PADDING 28
|
||||
#define DOUBLE_PADDING 56
|
||||
#define MESSAGE_TOP (LCD_H - (2*DOUBLE_PADDING))
|
||||
//#include "bmp_plug_usb.lbm"
|
||||
//#include "bmp_usb_plugged.lbm"
|
||||
|
||||
const uint8_t LBM_FLASH[] = {
|
||||
#include "icon_flash.lbm"
|
||||
@@ -34,7 +35,7 @@ const uint8_t LBM_OK[] = {
|
||||
void bootloaderInitScreen()
|
||||
{
|
||||
lcdColorTable[DEFAULT_COLOR_INDEX] = BLACK;
|
||||
lcdColorTable[DEFAULT_BGCOLOR_INDEX] = WHITE;
|
||||
lcdColorTable[DEFAULT_BGCOLOR_INDEX] = WHITE;
|
||||
lcdColorTable[LINE_COLOR_INDEX] = RED;
|
||||
lcdColorTable[BARGRAPH1_COLOR_INDEX] = RED;
|
||||
lcdColorTable[BARGRAPH2_COLOR_INDEX] = RGB(73, 219, 62); // green
|
||||
@@ -42,52 +43,54 @@ void bootloaderInitScreen()
|
||||
backlightEnable(BACKLIGHT_LEVEL_MAX);
|
||||
}
|
||||
|
||||
static void bootloaderDrawTitle(unsigned int x, const char* text)
|
||||
static void bootloaderDrawTitle(const char* text)
|
||||
{
|
||||
lcdDrawText(x, 28, text);
|
||||
lcdDrawSolidFilledRect(28, 56, 422, 2, DEFAULT_COLOR);
|
||||
lcd->drawText(LCD_W/2, DEFAULT_PADDING, text, CENTERED | DEFAULT_COLOR);
|
||||
lcd->drawSolidFilledRect(DEFAULT_PADDING, DOUBLE_PADDING, LCD_W - DOUBLE_PADDING, 2, DEFAULT_COLOR);
|
||||
}
|
||||
|
||||
static void bootloaderDrawFooter()
|
||||
{
|
||||
lcdDrawSolidFilledRect(28, 234, 422, 2, DEFAULT_COLOR);
|
||||
lcd->drawSolidFilledRect(DEFAULT_PADDING, LCD_H - (DOUBLE_PADDING + 4), LCD_W - DOUBLE_PADDING, 2, DEFAULT_COLOR);
|
||||
}
|
||||
|
||||
void bootloaderDrawScreen(BootloaderState st, int opt, const char* str)
|
||||
{
|
||||
#if defined(COLORLCD)
|
||||
lcdNextLayer();
|
||||
#endif
|
||||
// clear screen
|
||||
lcdDrawSolidFilledRect(0, 0, LCD_W-1, LCD_H-1, DEFAULT_BGCOLOR);
|
||||
|
||||
lcd->drawSolidFilledRect(0, 0, LCD_W-1, LCD_H-1, DEFAULT_BGCOLOR);
|
||||
int center = LCD_W/2;
|
||||
if (st == ST_START) {
|
||||
|
||||
bootloaderDrawTitle(88, "HORUS BOOTLOADER");
|
||||
bootloaderDrawTitle("NV14 BOOTLOADER");
|
||||
|
||||
lcdDrawBitmapPattern(90, 72, LBM_FLASH, DEFAULT_COLOR);
|
||||
lcdDrawText(124, 75, "Write Firmware");
|
||||
lcd->drawBitmapPattern(50, 72, LBM_FLASH, DEFAULT_COLOR);
|
||||
lcd->drawText(84, 75, "Write Firmware");
|
||||
|
||||
lcdDrawBitmapPattern(90, 107, LBM_EXIT, DEFAULT_COLOR);
|
||||
lcdDrawText(124, 110, "Exit");
|
||||
lcd->drawBitmapPattern(50, 107, LBM_EXIT, DEFAULT_COLOR);
|
||||
lcd->drawText(84, 110, "Exit");
|
||||
|
||||
lcdDrawSolidRect(119, (opt == 0) ? 72 : 107, 270, 26, 2, LINE_COLOR);
|
||||
lcd->drawSolidRect(79, (opt == 0) ? 72 : 107, LCD_W - 79 - 28, 26, 2, LINE_COLOR);
|
||||
|
||||
lcd->drawBitmap(60, 166, &BMP_PLUG_USB);
|
||||
lcdDrawText(195, 175, "Or plug in a USB cable");
|
||||
lcdDrawText(195, 200, "for mass storage");
|
||||
//lcd->drawBitmap(60, 166, &BMP_PLUG_USB);
|
||||
lcd->drawText(center, 175, "Or plug in a USB cable", CENTERED | DEFAULT_COLOR);
|
||||
lcd->drawText(center, 200, "for mass storage", CENTERED | DEFAULT_COLOR);
|
||||
|
||||
bootloaderDrawFooter();
|
||||
lcdDrawText( 36, 242, "Current Firmware:");
|
||||
lcdDrawText(200, 242, getOtherVersion(nullptr));
|
||||
lcd->drawText(center, LCD_H - DOUBLE_PADDING, "Current Firmware:", CENTERED | DEFAULT_COLOR);
|
||||
lcd->drawText(center, LCD_H - DEFAULT_PADDING, getOtherVersion(nullptr), CENTERED | DEFAULT_COLOR);
|
||||
}
|
||||
else if (st == ST_USB) {
|
||||
|
||||
lcd->drawBitmap(136, 98, &BMP_USB_PLUGGED);
|
||||
lcdDrawText(195, 128, "USB Connected");
|
||||
//lcd->drawBitmap(136, 98, &BMP_USB_PLUGGED);
|
||||
lcd->drawText(center, 128, "USB Connected", CENTERED | DEFAULT_COLOR);
|
||||
}
|
||||
else if (st == ST_FILE_LIST || st == ST_DIR_CHECK || st == ST_FLASH_CHECK ||
|
||||
st == ST_FLASHING || st == ST_FLASH_DONE) {
|
||||
|
||||
bootloaderDrawTitle(126, "SD>FIRMWARE");
|
||||
lcdDrawBitmapPattern(87, 16, LBM_SD, DEFAULT_COLOR);
|
||||
bootloaderDrawTitle("SD>FIRMWARE");
|
||||
lcd->drawBitmapPattern(DEFAULT_PADDING, 16, LBM_SD, DEFAULT_COLOR);
|
||||
|
||||
if (st == ST_FLASHING || st == ST_FLASH_DONE) {
|
||||
|
||||
@@ -98,39 +101,39 @@ void bootloaderDrawScreen(BootloaderState st, int opt, const char* str)
|
||||
opt = 100; // Completed > 100%
|
||||
}
|
||||
|
||||
lcdDrawRect(70, 120, 340, 31, 2);
|
||||
lcdDrawSolidFilledRect(74, 124, (332 * opt) / 100, 23, color);
|
||||
lcd->drawRect(DEFAULT_PADDING, 120, LCD_W - DOUBLE_PADDING, 31, 2);
|
||||
lcd->drawSolidFilledRect(DEFAULT_PADDING+4, 124, ((LCD_W - DOUBLE_PADDING - 8) * opt) / 100, 23, color);
|
||||
}
|
||||
else if (st == ST_DIR_CHECK) {
|
||||
|
||||
if (opt == FR_NO_PATH) {
|
||||
lcdDrawText(90, 168, "Directory is missing");
|
||||
lcd->drawText(20, MESSAGE_TOP, "Directory is missing");
|
||||
}
|
||||
else {
|
||||
lcdDrawText(90, 168, "Directory is empty");
|
||||
lcd->drawText(20, MESSAGE_TOP, "Directory is empty");
|
||||
}
|
||||
|
||||
lcdDrawBitmapPattern(356, 158, LBM_ERROR, BARGRAPH1_COLOR);
|
||||
lcd->drawBitmapPattern(LCD_W - DOUBLE_PADDING, MESSAGE_TOP-10, LBM_ERROR, BARGRAPH1_COLOR);
|
||||
}
|
||||
else if (st == ST_FLASH_CHECK) {
|
||||
|
||||
bootloaderDrawFilename(str, 0, true);
|
||||
|
||||
if (opt == FC_ERROR) {
|
||||
lcdDrawText(94, 168, STR_INVALID_FIRMWARE);
|
||||
lcdDrawBitmapPattern(356, 158, LBM_ERROR, BARGRAPH1_COLOR);
|
||||
lcd->drawText(20, MESSAGE_TOP, STR_INVALID_FIRMWARE);
|
||||
lcd->drawBitmapPattern(LCD_W - DOUBLE_PADDING, MESSAGE_TOP-10, LBM_ERROR, BARGRAPH1_COLOR);
|
||||
}
|
||||
else if (opt == FC_OK) {
|
||||
VersionTag tag;
|
||||
extractFirmwareVersion(&tag);
|
||||
|
||||
lcdDrawText(168, 158, "Version:", RIGHT);
|
||||
lcdDrawText(174, 158, tag.version);
|
||||
lcd->drawText(LCD_W/4 + DEFAULT_PADDING, MESSAGE_TOP, "Version:", RIGHT);
|
||||
lcd->drawText(LCD_W/4 + 6 + DEFAULT_PADDING, MESSAGE_TOP, tag.version);
|
||||
|
||||
lcdDrawText(168, 178, "Radio:", RIGHT);
|
||||
lcdDrawText(174, 178, tag.flavour);
|
||||
lcd->drawText(LCD_W/4 + DEFAULT_PADDING, MESSAGE_TOP + DEFAULT_PADDING, "Radio:", RIGHT);
|
||||
lcd->drawText(LCD_W/4 + 6 + DEFAULT_PADDING, MESSAGE_TOP + DEFAULT_PADDING, tag.flavour);
|
||||
|
||||
lcdDrawBitmapPattern(356, 158, LBM_OK, BARGRAPH2_COLOR);
|
||||
lcd->drawBitmapPattern(LCD_W - DOUBLE_PADDING, MESSAGE_TOP-10, LBM_OK, BARGRAPH2_COLOR);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -138,35 +141,35 @@ void bootloaderDrawScreen(BootloaderState st, int opt, const char* str)
|
||||
|
||||
if ( st != ST_DIR_CHECK && (st != ST_FLASH_CHECK || opt == FC_OK)) {
|
||||
|
||||
lcdDrawBitmapPattern(28, 242, LBM_FLASH, DEFAULT_COLOR);
|
||||
lcd->drawBitmapPattern(DEFAULT_PADDING, LCD_H - DOUBLE_PADDING - 2, LBM_FLASH, DEFAULT_COLOR);
|
||||
|
||||
if (st == ST_FILE_LIST) {
|
||||
lcdDrawText(56, 244, "[ENT] to select file");
|
||||
lcd->drawText(DOUBLE_PADDING, LCD_H - DOUBLE_PADDING, "[R TRIM] to select file");
|
||||
}
|
||||
else if (st == ST_FLASH_CHECK && opt == FC_OK) {
|
||||
lcdDrawText(56, 244, "Hold [ENT] long to flash");
|
||||
lcd->drawText(DOUBLE_PADDING, LCD_H - DOUBLE_PADDING, "Hold [R TRIM] long to flash");
|
||||
}
|
||||
else if (st == ST_FLASHING) {
|
||||
lcdDrawText(56, 244, "Writing Firmware ...");
|
||||
lcd->drawText(DOUBLE_PADDING, LCD_H - DOUBLE_PADDING, "Writing Firmware ...");
|
||||
}
|
||||
else if (st == ST_FLASH_DONE) {
|
||||
lcdDrawText(56, 244, "Writing Completed");
|
||||
lcd->drawText(DOUBLE_PADDING, LCD_H - DOUBLE_PADDING, "Writing Completed");
|
||||
}
|
||||
}
|
||||
|
||||
if (st != ST_FLASHING) {
|
||||
lcdDrawBitmapPattern(305, 242, LBM_EXIT, DEFAULT_COLOR);
|
||||
lcdDrawText(335, 244, "[RTN] to exit");
|
||||
lcd->drawBitmapPattern(DEFAULT_PADDING, LCD_H - DEFAULT_PADDING - 2, LBM_EXIT, DEFAULT_COLOR);
|
||||
lcd->drawText(DOUBLE_PADDING, LCD_H - DEFAULT_PADDING, "[L TRIM] to exit");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void bootloaderDrawFilename(const char* str, uint8_t line, bool selected)
|
||||
{
|
||||
lcdDrawBitmapPattern(94, 76 + (line * 25), LBM_FILE, DEFAULT_COLOR);
|
||||
lcdDrawText(124, 75 + (line * 25), str);
|
||||
lcd->drawBitmapPattern(DEFAULT_PADDING, 76 + (line * 25), LBM_FILE, DEFAULT_COLOR);
|
||||
lcd->drawText(DEFAULT_PADDING + 30, 75 + (line * 25), str);
|
||||
|
||||
if (selected) {
|
||||
lcdDrawSolidRect(119, 72 + (line * 25), 278, 26, 2, LINE_COLOR);
|
||||
lcd->drawSolidRect(DEFAULT_PADDING + 25, 72 + (line * 25), LCD_W - (DEFAULT_PADDING + 25) - 28, 26, 2, LINE_COLOR);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -19,6 +19,49 @@
|
||||
*/
|
||||
|
||||
#include "opentx.h"
|
||||
//fix it
|
||||
#if defined(EXTMODULE_USART)
|
||||
ModuleFifo extmoduleFifo;
|
||||
#endif
|
||||
bool stopOnTxDone = false;
|
||||
|
||||
void extmoduleSendNextFrame();
|
||||
|
||||
void EXTERNAL_MODULE_ON()
|
||||
{
|
||||
GPIO_SetBits(EXTMODULE_PWR_GPIO, EXTMODULE_PWR_GPIO_PIN);
|
||||
GPIO_ResetBits(EXTMODULE_PWR_FIX_GPIO, EXTMODULE_PWR_FIX_GPIO_PIN);
|
||||
}
|
||||
void EXTERNAL_MODULE_OFF()
|
||||
{
|
||||
GPIO_ResetBits(EXTMODULE_PWR_GPIO, EXTMODULE_PWR_GPIO_PIN);
|
||||
GPIO_SetBits(EXTMODULE_PWR_FIX_GPIO, EXTMODULE_PWR_FIX_GPIO_PIN);
|
||||
}
|
||||
void extModuleInit()
|
||||
{
|
||||
GPIO_InitTypeDef GPIO_InitStructure;
|
||||
GPIO_InitStructure.GPIO_Pin = EXTMODULE_PWR_GPIO_PIN;
|
||||
GPIO_InitStructure.GPIO_Mode = GPIO_Mode_OUT;
|
||||
GPIO_InitStructure.GPIO_Speed = GPIO_Speed_2MHz;
|
||||
GPIO_InitStructure.GPIO_OType = GPIO_OType_PP;
|
||||
GPIO_InitStructure.GPIO_PuPd = GPIO_PuPd_UP;
|
||||
GPIO_ResetBits(EXTMODULE_PWR_GPIO, EXTMODULE_PWR_GPIO_PIN);
|
||||
GPIO_Init(EXTMODULE_PWR_GPIO, &GPIO_InitStructure);
|
||||
|
||||
//for additional transistor to ensuring module is completely disabled
|
||||
GPIO_InitStructure.GPIO_OType = GPIO_OType_OD;
|
||||
//pin must be pulled to V+ (voltage of board - VCC is not enough to fully close transistor)
|
||||
GPIO_InitStructure.GPIO_PuPd = GPIO_PuPd_NOPULL;
|
||||
GPIO_InitStructure.GPIO_Pin = EXTMODULE_PWR_FIX_GPIO_PIN;
|
||||
GPIO_SetBits(EXTMODULE_PWR_FIX_GPIO, EXTMODULE_PWR_FIX_GPIO_PIN);
|
||||
GPIO_Init(EXTMODULE_PWR_FIX_GPIO, &GPIO_InitStructure);
|
||||
|
||||
GPIO_InitStructure.GPIO_Pin = EXTMODULE_TX_INVERT_GPIO_PIN;
|
||||
GPIO_InitStructure.GPIO_Mode = GPIO_Mode_OUT;
|
||||
GPIO_Init(EXTMODULE_TX_INVERT_GPIO, &GPIO_InitStructure);
|
||||
|
||||
GPIO_SetBits(EXTMODULE_TX_INVERT_GPIO, EXTMODULE_TX_INVERT_GPIO_PIN);
|
||||
}
|
||||
|
||||
void extmoduleStop()
|
||||
{
|
||||
@@ -89,27 +132,13 @@ void extmodulePpmStart()
|
||||
EXTMODULE_TIMER->CR1 &= ~TIM_CR1_CEN; // Stop timer
|
||||
EXTMODULE_TIMER->PSC = EXTMODULE_TIMER_FREQ / 2000000 - 1; // 0.5uS (2Mhz)
|
||||
EXTMODULE_TIMER->ARR = 45000;
|
||||
#if defined(PCBX10) || PCBREV >= 13
|
||||
EXTMODULE_TIMER->CCMR2 = TIM_CCMR2_OC3M_1 | TIM_CCMR2_OC3M_2; // PWM mode 1
|
||||
EXTMODULE_TIMER->BDTR = TIM_BDTR_MOE;
|
||||
EXTMODULE_TIMER->EGR = 1; // Reloads register values now
|
||||
EXTMODULE_TIMER->DIER = TIM_DIER_UDE; // Update DMA request
|
||||
EXTMODULE_TIMER->CR1 = TIM_CR1_CEN; // Start timer
|
||||
#elif defined(PCBNV14)
|
||||
|
||||
EXTMODULE_TIMER->CCMR1 = TIM_CCMR1_OC1M_1 | TIM_CCMR1_OC1M_2; // PWM mode 1
|
||||
EXTMODULE_TIMER->BDTR = TIM_BDTR_MOE;
|
||||
EXTMODULE_TIMER->EGR = 1; // Reloads register values now
|
||||
EXTMODULE_TIMER->DIER = TIM_DIER_UDE; // Update DMA request
|
||||
EXTMODULE_TIMER->CR1 = TIM_CR1_CEN; // Start timer
|
||||
#else
|
||||
EXTMODULE_TIMER->CCR1 = GET_PPM_DELAY(EXTERNAL_MODULE)*2;
|
||||
EXTMODULE_TIMER->CCER = TIM_CCER_CC1E | (GET_PPM_POLARITY(EXTERNAL_MODULE) ? TIM_CCER_CC1P : 0);
|
||||
EXTMODULE_TIMER->CCMR1 = TIM_CCMR1_OC1M_2 | TIM_CCMR1_OC1M_0; // Force O/P high
|
||||
EXTMODULE_TIMER->EGR = 1; // Reloads register values now
|
||||
EXTMODULE_TIMER->DIER |= TIM_DIER_UDE; // Update DMA request
|
||||
EXTMODULE_TIMER->CCMR1 = TIM_CCMR1_OC1M_1 | TIM_CCMR1_OC1M_2 | TIM_CCMR1_OC2PE; // PWM mode 1
|
||||
EXTMODULE_TIMER->CR1 |= TIM_CR1_CEN; // Start timer
|
||||
#endif
|
||||
|
||||
|
||||
extmoduleSendNextFrame();
|
||||
|
||||
@@ -143,28 +172,8 @@ void extmodulePxxStart()
|
||||
EXTMODULE_TIMER->PSC = EXTMODULE_TIMER_FREQ / 2000000 - 1; // 0.5uS (2Mhz)
|
||||
EXTMODULE_TIMER->ARR = 18000;
|
||||
|
||||
#if defined(PCBX10) || PCBREV >= 13
|
||||
EXTMODULE_TIMER->CCER = TIM_CCER_CC3E | TIM_CCER_CC3NE;
|
||||
EXTMODULE_TIMER->BDTR = TIM_BDTR_MOE; // Enable outputs
|
||||
EXTMODULE_TIMER->CCR3 = 18;
|
||||
EXTMODULE_TIMER->CCMR2 = TIM_CCMR2_OC3M_2 | TIM_CCMR2_OC3M_0; // Force O/P high
|
||||
EXTMODULE_TIMER->EGR = 1; // Restart
|
||||
EXTMODULE_TIMER->DIER |= TIM_DIER_UDE; // Enable DMA on update
|
||||
EXTMODULE_TIMER->CCMR2 = TIM_CCMR2_OC3M_1 | TIM_CCMR2_OC3M_2;
|
||||
EXTMODULE_TIMER->CR1 |= TIM_CR1_CEN;
|
||||
#elif defined(PCBNV14)
|
||||
{
|
||||
EXTMODULE_TIMER->CCER = TIM_CCER_CC1E | TIM_CCER_CC1NE;
|
||||
EXTMODULE_TIMER->BDTR = TIM_BDTR_MOE; // Enable outputs
|
||||
EXTMODULE_TIMER->CCR1 = 18;
|
||||
EXTMODULE_TIMER->CCMR1 = TIM_CCMR1_OC1M_2 | TIM_CCMR1_OC1M_0; // Force O/P high
|
||||
EXTMODULE_TIMER->EGR = 1; // Restart
|
||||
EXTMODULE_TIMER->DIER |= TIM_DIER_UDE; // Enable DMA on update
|
||||
EXTMODULE_TIMER->CCMR1 = TIM_CCMR1_OC1M_1 | TIM_CCMR1_OC1M_2;
|
||||
EXTMODULE_TIMER->CR1 |= TIM_CR1_CEN;
|
||||
}
|
||||
#else
|
||||
EXTMODULE_TIMER->CCER = TIM_CCER_CC1E | TIM_CCER_CC1P | TIM_CCER_CC1NE | TIM_CCER_CC1NP; // TIM_CCER_CC1E | TIM_CCER_CC1P;
|
||||
|
||||
EXTMODULE_TIMER->CCER = TIM_CCER_CC1E | TIM_CCER_CC1NE;
|
||||
EXTMODULE_TIMER->BDTR = TIM_BDTR_MOE; // Enable outputs
|
||||
EXTMODULE_TIMER->CCR1 = 18;
|
||||
EXTMODULE_TIMER->CCMR1 = TIM_CCMR1_OC1M_2 | TIM_CCMR1_OC1M_0; // Force O/P high
|
||||
@@ -172,7 +181,6 @@ void extmodulePxxStart()
|
||||
EXTMODULE_TIMER->DIER |= TIM_DIER_UDE; // Enable DMA on update
|
||||
EXTMODULE_TIMER->CCMR1 = TIM_CCMR1_OC1M_1 | TIM_CCMR1_OC1M_2;
|
||||
EXTMODULE_TIMER->CR1 |= TIM_CR1_CEN;
|
||||
#endif
|
||||
|
||||
extmoduleSendNextFrame();
|
||||
|
||||
@@ -201,16 +209,6 @@ void extmoduleDsm2Start()
|
||||
EXTMODULE_TIMER->PSC = EXTMODULE_TIMER_FREQ / 2000000 - 1; // 0.5uS (2Mhz)
|
||||
EXTMODULE_TIMER->ARR = 44000; // 22mS
|
||||
|
||||
#if defined(PCBX10) || PCBREV >= 13
|
||||
EXTMODULE_TIMER->CCER = TIM_CCER_CC3E | TIM_CCER_CC3P;
|
||||
EXTMODULE_TIMER->BDTR = TIM_BDTR_MOE; // Enable outputs
|
||||
EXTMODULE_TIMER->CCR3 = 0;
|
||||
EXTMODULE_TIMER->CCMR2 = TIM_CCMR2_OC3M_2 | TIM_CCMR2_OC3M_0; // Force O/P high
|
||||
EXTMODULE_TIMER->EGR = 1; // Restart
|
||||
EXTMODULE_TIMER->DIER |= TIM_DIER_UDE; // Enable DMA on update
|
||||
EXTMODULE_TIMER->CCMR2 = TIM_CCMR2_OC3M_1 | TIM_CCMR2_OC3M_0;
|
||||
EXTMODULE_TIMER->CR1 |= TIM_CR1_CEN;
|
||||
#else
|
||||
EXTMODULE_TIMER->CCER = TIM_CCER_CC1E | TIM_CCER_CC1P;
|
||||
EXTMODULE_TIMER->BDTR = TIM_BDTR_MOE; // Enable outputs
|
||||
EXTMODULE_TIMER->CCR1 = 0;
|
||||
@@ -219,7 +217,6 @@ void extmoduleDsm2Start()
|
||||
EXTMODULE_TIMER->DIER |= TIM_DIER_UDE; // Enable DMA on update
|
||||
EXTMODULE_TIMER->CCMR1 = TIM_CCMR1_OC1M_1 | TIM_CCMR1_OC1M_0;
|
||||
EXTMODULE_TIMER->CR1 |= TIM_CR1_CEN;
|
||||
#endif
|
||||
|
||||
extmoduleSendNextFrame();
|
||||
|
||||
|
||||
+113
-30
@@ -97,10 +97,17 @@
|
||||
// ADC
|
||||
#define ADC_RCC_AHB1Periph (RCC_AHB1Periph_GPIOA | RCC_AHB1Periph_GPIOB | RCC_AHB1Periph_GPIOC | RCC_AHB1Periph_GPIOF | RCC_AHB1Periph_DMA2)
|
||||
#define ADC_RCC_APB2Periph (RCC_APB2Periph_ADC1 | RCC_APB2Periph_ADC3)
|
||||
#if !defined(HALL_STICKS)
|
||||
#define ADC_GPIO_PIN_STICK_LH GPIO_Pin_2 // PA.02
|
||||
#define ADC_GPIO_PIN_STICK_LV GPIO_Pin_3 // PA.03
|
||||
#define ADC_GPIO_PIN_STICK_RH GPIO_Pin_4 // PA.04
|
||||
#define ADC_GPIO_PIN_STICK_RV GPIO_Pin_5 // PA.05
|
||||
#else
|
||||
#define ADC_GPIO_PIN_STICK_LH 0
|
||||
#define ADC_GPIO_PIN_STICK_LV 0
|
||||
#define ADC_GPIO_PIN_STICK_RH 0
|
||||
#define ADC_GPIO_PIN_STICK_RV 0
|
||||
#endif
|
||||
#define ADC_GPIO_PIN_POT1 GPIO_Pin_6 // PA.06 VRA
|
||||
#define ADC_GPIO_PIN_POT2 GPIO_Pin_4 // PC.04 VRB
|
||||
#define ADC_GPIO_PIN_SWA GPIO_Pin_1 // PB.01
|
||||
@@ -118,10 +125,12 @@
|
||||
#define ADC_GPIOC_PINS (GPIO_Pin_0 | GPIO_Pin_1 | GPIO_Pin_2 | GPIO_Pin_4 | GPIO_Pin_5)
|
||||
#define ADC_GPIOF_PINS (GPIO_Pin_8 | GPIO_Pin_10)
|
||||
|
||||
#if !defined(HALL_STICKS)
|
||||
#define ADC_CHANNEL_STICK_LH ADC_Channel_2 // ADC123_IN2 -> ADC1_IN2
|
||||
#define ADC_CHANNEL_STICK_LV ADC_Channel_3 // ADC123_IN3 -> ADC1_IN3
|
||||
#define ADC_CHANNEL_STICK_RH ADC_Channel_4 // ADC12_IN4 -> ADC1_IN4
|
||||
#define ADC_CHANNEL_STICK_RV ADC_Channel_5 // ADC12_IN5 -> ADC1_IN5
|
||||
#endif
|
||||
#define ADC_CHANNEL_POT1 ADC_Channel_6 // ADC12_IN6 -> ADC1_IN6
|
||||
#define ADC_CHANNEL_POT2 ADC_Channel_14 // ADC12_IN14 -> ADC1_IN14
|
||||
#define ADC_CHANNEL_SWA ADC_Channel_9 // ADC12_IN9 -> ADC1_IN9
|
||||
@@ -193,6 +202,9 @@
|
||||
#define AUX_SERIAL_RX_INVERT_GPIO GPIOI
|
||||
#define AUX_SERIAL_RX_INVERT_GPIO_PIN GPIO_Pin_15 // PI.15
|
||||
|
||||
//used in BOOTLOADER
|
||||
#define SERIAL_RCC_AHB1Periph 0
|
||||
#define SERIAL_RCC_APB1Periph 0
|
||||
// Telemetry
|
||||
#define TELEMETRY_RCC_AHB1Periph (RCC_AHB1Periph_GPIOD | RCC_AHB1Periph_GPIOJ | RCC_AHB1Periph_DMA1)
|
||||
#define TELEMETRY_RCC_APB1Periph RCC_APB1Periph_USART2
|
||||
@@ -252,6 +264,7 @@
|
||||
// TODO TIM3, TIM8, TIM14, review the channel in backlight_driver.cpp according to the chosen timer
|
||||
#define BACKLIGHT_RCC_AHB1Periph RCC_AHB1Periph_GPIOA
|
||||
#define BACKLIGHT_RCC_APB1Periph RCC_APB1Periph_TIM2
|
||||
#define BACKLIGHT_RCC_APB2Periph 0
|
||||
#define BACKLIGHT_GPIO GPIOA
|
||||
#define BACKLIGHT_GPIO_PIN GPIO_Pin_15
|
||||
#define BACKLIGHT_GPIO_PinSource GPIO_PinSource15
|
||||
@@ -259,9 +272,16 @@
|
||||
#define BACKLIGHT_GPIO_AF GPIO_AF_TIM2
|
||||
#define BACKLIGHT_TIMER_FREQ (PERI1_FREQUENCY * TIMER_MULT_APB1)
|
||||
|
||||
//used in BOOTLOADER
|
||||
#define SERIAL_RCC_AHB1Periph 0
|
||||
#define SERIAL_RCC_APB1Periph 0
|
||||
#define ROTARY_ENCODER_RCC_APB1Periph 0
|
||||
|
||||
// SD card
|
||||
#define SD_RCC_AHB1Periph (RCC_AHB1Periph_GPIOC | RCC_AHB1Periph_GPIOD | RCC_AHB1Periph_DMA2)
|
||||
#define SD_RCC_AHB1Periph (RCC_AHB1Periph_GPIOC | RCC_AHB1Periph_GPIOD | RCC_AHB1Periph_GPIOH | RCC_AHB1Periph_DMA2)
|
||||
#define SD_RCC_APB1Periph 0
|
||||
#define SD_PRESENT_GPIO GPIOH
|
||||
#define SD_PRESENT_GPIO_PIN GPIO_Pin_10 // PH.10
|
||||
#define SD_SDIO_DMA_STREAM DMA2_Stream3
|
||||
#define SD_SDIO_DMA_CHANNEL DMA_Channel_4
|
||||
#define SD_SDIO_DMA_FLAG_FEIF DMA_FLAG_FEIF3
|
||||
@@ -324,18 +344,18 @@
|
||||
#define I2C_RCC_AHB1Periph 0
|
||||
#define I2C_RCC_APB1Periph 0
|
||||
|
||||
// Haptic: TIM1_CH2
|
||||
// Haptic: TIM1_CH1
|
||||
#define HAPTIC_PWM
|
||||
#define HAPTIC_RCC_AHB1Periph RCC_AHB1Periph_GPIOA
|
||||
#define HAPTIC_RCC_APB2Periph RCC_APB2ENR_TIM1EN
|
||||
#define HAPTIC_GPIO GPIOA
|
||||
#define HAPTIC_GPIO_PIN GPIO_Pin_9
|
||||
#define HAPTIC_GPIO_PIN GPIO_Pin_8
|
||||
#define HAPTIC_GPIO_TIMER TIM1
|
||||
#define HAPTIC_GPIO_AF GPIO_AF_TIM1
|
||||
#define HAPTIC_GPIO_PinSource GPIO_PinSource9
|
||||
#define HAPTIC_TIMER_OUTPUT_ENABLE TIM_CCER_CC2E
|
||||
#define HAPTIC_TIMER_MODE TIM_CCMR1_OC2M_1 | TIM_CCMR1_OC2M_2
|
||||
#define HAPTIC_TIMER_COMPARE_VALUE HAPTIC_GPIO_TIMER->CCR2
|
||||
#define HAPTIC_GPIO_PinSource GPIO_PinSource8
|
||||
#define HAPTIC_TIMER_OUTPUT_ENABLE TIM_CCER_CC1E | TIM_CCER_CC1NE;
|
||||
#define HAPTIC_TIMER_MODE TIM_CCMR1_OC1M_1 | TIM_CCMR1_OC1M_2 | TIM_CCMR1_OC1PE
|
||||
#define HAPTIC_TIMER_COMPARE_VALUE HAPTIC_GPIO_TIMER->CCR1
|
||||
|
||||
// Internal Module
|
||||
#define HARDWARE_INTERNAL_MODULE
|
||||
@@ -359,42 +379,73 @@
|
||||
#define INTMODULE_TX_DMA_Stream_IRQn DMA1_Stream1_IRQn
|
||||
#define INTMODULE_TX_DMA_Stream_IRQHandler DMA1_Stream1_IRQHandler
|
||||
#define INTMODULE_TX_DMA_FLAG_TC DMA_IT_TCIF1
|
||||
|
||||
//TX new implementation
|
||||
#define INTMODULE_DMA_STREAM DMA1_Stream1
|
||||
#define INTMODULE_DMA_CHANNEL DMA_Channel_5
|
||||
#define INTMODULE_GPIO INTMODULE_TX_GPIO
|
||||
//#define INTMODULE_DMA_STREAM_IRQ INTMODULE_RX_DMA_Stream_IRQHandler
|
||||
#define INTMODULE_DMA_STREAM_IRQ INTMODULE_TX_DMA_Stream_IRQn
|
||||
|
||||
#define INTMODULE_RCC_APB1Periph (RCC_APB1Periph_UART7)
|
||||
#define INTMODULE_RCC_APB2Periph (RCC_APB2Periph_TIM1)
|
||||
#define INTMODULE_TIMER TIM1
|
||||
#define INTMODULE_TIMER_IRQn TIM1_CC_IRQn
|
||||
#define INTMODULE_TIMER_IRQHandler TIM1_CC_IRQHandler
|
||||
#define INTMODULE_TIMER_FREQ (PERI2_FREQUENCY * TIMER_MULT_APB2)
|
||||
#define INTMODULE_RCC_APB1Periph (RCC_APB1Periph_UART7 | RCC_APB1Periph_TIM3)
|
||||
|
||||
#define INTMODULE_RCC_APB2Periph 0
|
||||
#define INTMODULE_TIMER TIM3
|
||||
#define INTMODULE_TIMER_IRQn TIM3_IRQn
|
||||
#define INTMODULE_TIMER_IRQHandler TIM3_IRQHandler
|
||||
#define INTMODULE_TIMER_FREQ (PERI1_FREQUENCY * TIMER_MULT_APB1)
|
||||
|
||||
// External Module
|
||||
#define EXTMODULE
|
||||
#define EXTMODULE_PULSES
|
||||
#define EXTMODULE_PWR_GPIO GPIOD
|
||||
#define EXTMODULE_PWR_GPIO_PIN GPIO_Pin_11
|
||||
#define EXTMODULE_RCC_AHB1Periph (RCC_AHB1Periph_GPIOD | RCC_AHB1Periph_GPIOC | RCC_AHB1Periph_DMA2)
|
||||
#define EXTMODULE_PWR_FIX_GPIO GPIOA
|
||||
#define EXTMODULE_PWR_FIX_GPIO_PIN GPIO_Pin_2 // PA.02
|
||||
#define EXTMODULE_RCC_AHB1Periph (RCC_AHB1Periph_GPIOA | RCC_AHB1Periph_GPIOD | RCC_AHB1Periph_GPIOC | RCC_AHB1Periph_GPIOI | RCC_AHB1Periph_GPIOE | RCC_AHB1Periph_DMA2)
|
||||
#define EXTMODULE_RCC_APB1Periph 0
|
||||
#define EXTMODULE_RCC_APB2Periph RCC_APB2Periph_TIM8
|
||||
#define EXTMODULE_RCC_APB2Periph (RCC_APB2Periph_TIM8 | RCC_APB2Periph_USART6)
|
||||
#define EXTMODULE_TX_GPIO GPIOC
|
||||
#define EXTMODULE_TX_GPIO_PIN GPIO_Pin_6 // PC.06
|
||||
#define EXTMODULE_TX_GPIO_PinSource GPIO_PinSource6
|
||||
#define EXTMODULE_TX_GPIO_AF GPIO_AF_TIM8
|
||||
#define EXTMODULE_TX_GPIO_AF_USART GPIO_AF_USART6
|
||||
#define EXTMODULE_RX_GPIO GPIOC
|
||||
#define EXTMODULE_RX_GPIO_PIN GPIO_Pin_7 // PC.07
|
||||
#define EXTMODULE_RX_GPIO_PinSource GPIO_PinSource7
|
||||
#define EXTMODULE_RX_GPIO_AF_USART GPIO_AF_USART6
|
||||
#define EXTMODULE_TIMER TIM8
|
||||
#define EXTMODULE_TIMER_IRQn TIM8_CC_IRQn
|
||||
#define EXTMODULE_TIMER_IRQHandler TIM8_CC_IRQHandler
|
||||
#define EXTMODULE_TIMER_FREQ (PERI2_FREQUENCY * TIMER_MULT_APB1)
|
||||
#define EXTMODULE_TIMER_FREQ (PERI2_FREQUENCY * TIMER_MULT_APB2)
|
||||
//USART
|
||||
#define EXTMODULE_USART_TX_DMA_CHANNEL DMA_Channel_5
|
||||
#define EXTMODULE_USART_TX_DMA_STREAM DMA2_Stream7
|
||||
#define EXTMODULE_USART_TX_DMA_IRQn DMA2_Stream7_IRQn
|
||||
#define EXTMODULE_USART_TX_DMA_IRQHandler DMA2_Stream7_IRQHandler
|
||||
#define EXTMODULE_USART_TX_DMA_FLAG_TC DMA_IT_TCIF7
|
||||
|
||||
#define EXTMODULE_USART_RX_DMA_CHANNEL DMA_Channel_5
|
||||
#define EXTMODULE_USART_RX_DMA_STREAM DMA2_Stream2
|
||||
#define EXTMODULE_USART_RX_DMA_IRQn DMA2_Stream5_IRQn
|
||||
#define EXTMODULE_USART_RX_DMA_IRQHandler DMA2_Stream5_IRQHandler
|
||||
#define EXTMODULE_USART_RX_DMA_FLAG_TC DMA_IT_TCIF5
|
||||
|
||||
#define EXTMODULE_USART_IRQHandler USART6_IRQHandler
|
||||
#define EXTMODULE_USART_IRQn USART6_IRQn
|
||||
|
||||
//TIMER
|
||||
#define EXTMODULE_DMA_CHANNEL DMA_Channel_7
|
||||
#define EXTMODULE_DMA_STREAM DMA2_Stream1
|
||||
#define EXTMODULE_DMA_IRQn DMA2_Stream1_IRQn
|
||||
#define EXTMODULE_DMA_IRQHandler DMA2_Stream1_IRQHandler
|
||||
#define EXTMODULE_DMA_FLAG_TC DMA_IT_TCIF1
|
||||
//#define EXTMODULE_USART USART6 // TODO
|
||||
#define EXTMODULE_USART USART6
|
||||
|
||||
#define EXTMODULE_TX_INVERT_GPIO GPIOE
|
||||
#define EXTMODULE_TX_INVERT_GPIO_PIN GPIO_Pin_3 // PE.03
|
||||
#define EXTMODULE_RX_INVERT_GPIO GPIOI
|
||||
#define EXTMODULE_RX_INVERT_GPIO_PIN GPIO_Pin_15 // PI.15
|
||||
|
||||
|
||||
// Heartbeat (not used)
|
||||
#define HEARTBEAT_RCC_AHB1Periph RCC_AHB1Periph_GPIOD
|
||||
@@ -410,20 +461,52 @@
|
||||
#define TRAINER_IN_GPIO_PinSource GPIO_PinSource12
|
||||
#define TRAINER_OUT_GPIO_PIN GPIO_Pin_13 // PD.13
|
||||
#define TRAINER_OUT_GPIO_PinSource GPIO_PinSource13
|
||||
// #define TRAINER_DETECT_GPIO GPIOB
|
||||
// #define TRAINER_DETECT_GPIO_PIN GPIO_Pin_4 // PB.04
|
||||
|
||||
#define TRAINER_TIMER TIM4
|
||||
#define TRAINER_TIMER_IRQn TIM4_IRQn
|
||||
#define TRAINER_GPIO_AF GPIO_AF_TIM4 // TIM4_CH1 (in) + TIM4_CH2 (out)
|
||||
#define TRAINER_OUT_DMA DMA1
|
||||
// #define TRAINER_OUT_DMA_CHANNEL DMA_Channel_2
|
||||
// #define TRAINER_OUT_DMA_STREAM DMA1_Stream3
|
||||
// #define TRAINER_OUT_DMA_IRQn DMA1_Stream3_IRQn
|
||||
// #define TRAINER_OUT_DMA_IRQHandler DMA1_Stream3_IRQHandler
|
||||
// #define TRAINER_OUT_DMA_FLAG_TC DMA_IT_TCIF3
|
||||
#define TRAINER_EXTMODULE_TIMER_IRQn TIM4_IRQn
|
||||
#define TRAINER_EXTMODULE_TIMER_IRQHandler TIM4_IRQHandler
|
||||
#define TRAINER_EXTMODULE_TIMER_FREQ (PERI1_FREQUENCY * TIMER_MULT_APB1)
|
||||
#define TRAINER_TIMER_IRQn TIM4_IRQn
|
||||
#define TRAINER_TIMER_IRQHandler TIM4_IRQHandler
|
||||
#define TRAINER_TIMER_FREQ (PERI1_FREQUENCY * TIMER_MULT_APB1)
|
||||
|
||||
#define TRAINER_OUT_CCMR1 TIM_CCMR1_OC2M_1 | TIM_CCMR1_OC2M_2 | TIM_CCMR1_OC2PE;
|
||||
#define TRAINER_IN_CCMR1 TIM_CCMR1_IC1F_0 | TIM_CCMR1_IC1F_1 | TIM_CCMR1_CC1S_0;
|
||||
|
||||
#define TRAINER_OUT_COUNTER_REGISTER TRAINER_TIMER->CCR2
|
||||
#define TRAINER_IN_COUNTER_REGISTER TRAINER_TIMER->CCR1
|
||||
#define TRAINER_SETUP_REGISTER TRAINER_TIMER->CCR3
|
||||
#define TRAINER_OUT_INTERRUPT_FLAG TIM_SR_CC1IF
|
||||
#define TRAINER_OUT_INTERRUPT_ENABLE TIM_DIER_CC1IE
|
||||
#define TRAINER_IN_INTERRUPT_ENABLE TIM_DIER_CC1IE
|
||||
#define TRAINER_IN_INTERRUPT_FLAG TIM_SR_CC1IF
|
||||
#define TRAINER_OUT_CCER TIM_CCER_CC2E
|
||||
#define TRAINER_CCER_POLARYTY TIM_CCER_CC2P
|
||||
#define TRAINER_IN_CCER TIM_CCER_CC1E
|
||||
|
||||
|
||||
|
||||
/*
|
||||
#define TRAINER_MODULE_SBUS_GPIO EXTMODULE_USART_GPIO
|
||||
#define TRAINER_MODULE_SBUS_GPIO_PIN EXTMODULE_RX_GPIO_PIN
|
||||
#define TRAINER_MODULE_SBUS_GPIO_AF EXTMODULE_USART_GPIO_AF
|
||||
#define TRAINER_MODULE_SBUS_USART EXTMODULE_USART
|
||||
#define TRAINER_MODULE_SBUS_GPIO_PinSource EXTMODULE_RX_GPIO_PinSource
|
||||
#define TRAINER_MODULE_SBUS_DMA_STREAM EXTMODULE_DMA_STREAM
|
||||
#define TRAINER_MODULE_SBUS_DMA_CHANNEL EXTMODULE_DMA_CHANNEL
|
||||
*/
|
||||
/*
|
||||
#define TRAINER_MODULE_CPPM_GPIO EXTMODULE_USART_GPIO
|
||||
#define TRAINER_MODULE_CPPM_GPIO_PIN EXTMODULE_RX_GPIO_PIN
|
||||
#define TRAINER_MODULE_CPPM_GPIO_PinSource EXTMODULE_RX_GPIO_PinSource
|
||||
#define TRAINER_MODULE_CPPM_GPIO_AF GPIO_AF_TIM3
|
||||
#define TRAINER_MODULE_CPPM_TIMER TIM3
|
||||
#define TRAINER_MODULE_CPPM_COUNTER_REGISTER TRAINER_MODULE_CPPM_TIMER->CCR2
|
||||
#define TRAINER_MODULE_CPPM_INTERRUPT_ENABLE TIM_DIER_CC2IE
|
||||
#define TRAINER_MODULE_CPPM_INTERRUPT_FLAG TIM_SR_CC2IF
|
||||
#define TRAINER_MODULE_CPPM_CCMR1 (TIM_CCMR1_IC2F_0 | TIM_CCMR1_IC2F_1 | TIM_CCMR1_CC2S_0)
|
||||
#define TRAINER_MODULE_CPPM_CCER TIM_CCER_CC2E
|
||||
#define TRAINER_MODULE_CPPM_TIMER_IRQn TIM3_IRQn
|
||||
#define TRAINER_MODULE_CPPM_TIMER_IRQHandler TIM3_IRQHandler
|
||||
*/
|
||||
|
||||
// Xms Interrupt
|
||||
#define INTERRUPT_xMS_RCC_APB1Periph RCC_APB1Periph_TIM14
|
||||
|
||||
@@ -19,6 +19,7 @@
|
||||
*/
|
||||
|
||||
#include "opentx.h"
|
||||
#include "pulses/flysky.h"
|
||||
|
||||
DMAFifo<HALLSTICK_BUFF_SIZE> hallDMAFifo __DMA (HALL_DMA_Stream_RX);
|
||||
Fifo<uint8_t, HALLSTICK_BUFF_SIZE> hallStickTxFifo;
|
||||
@@ -27,9 +28,9 @@ unsigned char HallCmd[264] __DMA;
|
||||
|
||||
STRUCT_HALL HallProtocol = { 0 };
|
||||
STRUCT_HALL HallProtocolTx = { 0 };
|
||||
STRUCT_HALL_CHANNEL Channel;
|
||||
STRUCT_STICK_CALIBRATION StickCallbration[4] = { {0, 0, 0} };
|
||||
unsigned short HallChVal[4];
|
||||
signed short hall_raw_values[FLYSKY_HALL_CHANNEL_COUNT];
|
||||
STRUCT_STICK_CALIBRATION hall_calibration[FLYSKY_HALL_CHANNEL_COUNT] = { {0, 0, 0} };
|
||||
unsigned short hall_adc_values[FLYSKY_HALL_CHANNEL_COUNT];
|
||||
|
||||
/* crc16 implementation according to CCITT standards */
|
||||
const unsigned short CRC16Table[256]= {
|
||||
@@ -92,14 +93,14 @@ uint16_t get_hall_adc_value(uint8_t ch)
|
||||
#if defined(FLYSKY_HALL_STICKS_REVERSE)
|
||||
ch = sticks_mapping[ch];
|
||||
|
||||
return MAX_ADC_CHANNEL_VALUE - HallChVal[ch];
|
||||
return MAX_ADC_CHANNEL_VALUE - hall_adc_values[ch];
|
||||
#else
|
||||
if (ch < 2)
|
||||
{
|
||||
return MAX_ADC_CHANNEL_VALUE - HallChVal[ch];
|
||||
return MAX_ADC_CHANNEL_VALUE - hall_adc_values[ch];
|
||||
}
|
||||
|
||||
return HallChVal[ch];
|
||||
return hall_adc_values[ch];
|
||||
#endif
|
||||
}
|
||||
|
||||
@@ -175,11 +176,10 @@ void hall_stick_init(uint32_t baudrate)
|
||||
|
||||
void HallSendBuffer(uint8_t * buffer, uint32_t count)
|
||||
{
|
||||
for(int idx = 0; buffer != HallCmd && idx < count; idx++)
|
||||
for(uint32_t idx = 0; buffer != HallCmd && idx < count; idx++)
|
||||
{
|
||||
HallCmd[idx] = buffer[idx];
|
||||
}
|
||||
|
||||
DMA_InitTypeDef DMA_InitStructure;
|
||||
DMA_DeInit(HALL_DMA_Stream_TX);
|
||||
DMA_InitStructure.DMA_Channel = HALL_DMA_Channel;
|
||||
@@ -228,7 +228,7 @@ void reset_hall_stick( void )
|
||||
{
|
||||
unsigned short crc16 = 0xffff;
|
||||
|
||||
HallCmd[0] = 0x55;
|
||||
HallCmd[0] = HALL_PROTOLO_HEAD;
|
||||
HallCmd[1] = 0xD1;
|
||||
HallCmd[2] = 0x01;
|
||||
HallCmd[3] = 0x01;
|
||||
@@ -245,7 +245,7 @@ void get_hall_config( void )
|
||||
{
|
||||
unsigned short crc16 = 0xffff;
|
||||
|
||||
HallCmd[0] = 0x55;
|
||||
HallCmd[0] = HALL_PROTOLO_HEAD;
|
||||
HallCmd[1] = 0xD1;
|
||||
HallCmd[2] = 0x01;
|
||||
HallCmd[3] = 0x00;
|
||||
@@ -262,7 +262,7 @@ void get_hall_firmware_info()
|
||||
{
|
||||
unsigned short crc16 = 0xffff;
|
||||
|
||||
HallCmd[0] = 0x55;
|
||||
HallCmd[0] = HALL_PROTOLO_HEAD;
|
||||
HallCmd[1] = 0xA2;
|
||||
HallCmd[2] = 0x00;
|
||||
|
||||
@@ -278,7 +278,7 @@ void hallStickUpdatefwEnd( void )
|
||||
{
|
||||
unsigned short crc16 = 0xffff;
|
||||
|
||||
HallCmd[0] = 0x55;
|
||||
HallCmd[0] = HALL_PROTOLO_HEAD;
|
||||
HallCmd[1] = 0xA2;
|
||||
HallCmd[2] = 0x01;
|
||||
HallCmd[3] = 0x07;
|
||||
@@ -380,36 +380,36 @@ exit: parse_ps_state = 0;
|
||||
return ;
|
||||
}
|
||||
|
||||
|
||||
#define ERROR_OFFSET 10
|
||||
void convert_hall_to_adcVaule( void )
|
||||
{
|
||||
uint16_t value;
|
||||
|
||||
for ( uint8_t i = 0; i < 4; i++ )
|
||||
for ( uint8_t channel = 0; channel < 4; channel++ )
|
||||
{
|
||||
if (Channel.channel[i] < StickCallbration[i].mid)
|
||||
if (hall_raw_values[channel] < hall_calibration[channel].mid)
|
||||
{
|
||||
value = StickCallbration[i].mid - StickCallbration[i].min;
|
||||
value = ( MIDDLE_ADC_CHANNLE_VALUE * (StickCallbration[i].mid - Channel.channel[i] ) ) / ( value );
|
||||
value = hall_calibration[channel].mid - (hall_calibration[channel].min+ERROR_OFFSET);
|
||||
value = ( MIDDLE_ADC_CHANNLE_VALUE * (hall_calibration[channel].mid - hall_raw_values[channel] ) ) / ( value );
|
||||
|
||||
if (value >= MIDDLE_ADC_CHANNLE_VALUE ) {
|
||||
value = MIDDLE_ADC_CHANNLE_VALUE;
|
||||
}
|
||||
|
||||
HallChVal[i] = MIDDLE_ADC_CHANNLE_VALUE - value;
|
||||
hall_adc_values[channel] = MIDDLE_ADC_CHANNLE_VALUE - value;
|
||||
}
|
||||
else
|
||||
{
|
||||
value = StickCallbration[i].max - StickCallbration[i].mid;
|
||||
value = (hall_calibration[channel].max - ERROR_OFFSET) - hall_calibration[channel].mid;
|
||||
|
||||
value = ( MIDDLE_ADC_CHANNLE_VALUE * (Channel.channel[i] - StickCallbration[i].mid ) ) / (value );
|
||||
value = ( MIDDLE_ADC_CHANNLE_VALUE * (hall_raw_values[channel] - hall_calibration[channel].mid ) ) / (value );
|
||||
|
||||
if (value >= MIDDLE_ADC_CHANNLE_VALUE )
|
||||
{
|
||||
value = MIDDLE_ADC_CHANNLE_VALUE;
|
||||
}
|
||||
|
||||
HallChVal[i] = MIDDLE_ADC_CHANNLE_VALUE + value + 1;
|
||||
hall_adc_values[channel] = MIDDLE_ADC_CHANNLE_VALUE + value + 1;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -494,7 +494,7 @@ void hallStick_GetTxDataFromUSB( void )
|
||||
break;
|
||||
|
||||
case TRANSFER_DIR_HALLSTICK:
|
||||
// onFlySkyUsbDownloadStart(TRANSFER_DIR_HALLSTICK);
|
||||
onFlySkyUsbDownloadStart(TRANSFER_DIR_HALLSTICK);
|
||||
|
||||
if ( 0xA2 == HallProtocolTx.hallID.ID )
|
||||
{
|
||||
@@ -513,17 +513,23 @@ void hallStick_GetTxDataFromUSB( void )
|
||||
break;
|
||||
|
||||
case TRANSFER_DIR_RFMODULE:
|
||||
// onFlySkyUsbDownloadStart(TRANSFER_DIR_RFMODULE);
|
||||
onFlySkyUsbDownloadStart(TRANSFER_DIR_RFMODULE);
|
||||
|
||||
if ( 0xAE == HallProtocolTx.hallID.ID && HallProtocolTx.length == 0 )
|
||||
{ // 55 AE 00 D3 47
|
||||
// onIntmoduleUsbDownloadStart(INTERNAL_MODULE);
|
||||
{
|
||||
setFlyskyState(INTERNAL_MODULE, FLYSKY_MODULE_STATE_UPDATE_RF_FIRMWARE);
|
||||
break;
|
||||
}
|
||||
|
||||
if ( 0x0D == HallProtocolTx.hallID.hall_Id.packetID && HallProtocolTx.data[0] == 1 )
|
||||
{
|
||||
onFlySkyGetVersionInfoStart(INTERNAL_MODULE, 1);
|
||||
break;
|
||||
}
|
||||
|
||||
//if ( isFlySkyUsbDownload() )
|
||||
{
|
||||
// intmoduleSendBufferDMA( pt, HallProtocolTx.length + 3 + 2 );
|
||||
intmoduleSendBuffer( pt, HallProtocolTx.length + 3 + 2 );
|
||||
}
|
||||
break;
|
||||
}
|
||||
@@ -532,7 +538,7 @@ void hallStick_GetTxDataFromUSB( void )
|
||||
|
||||
if ( !usbPlugged() )
|
||||
{
|
||||
// onFlySkyUsbDownloadStart(0);
|
||||
onFlySkyUsbDownloadStart(0);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -540,19 +546,24 @@ void hallStick_GetTxDataFromUSB( void )
|
||||
/* Run it in 1ms timer routine */
|
||||
void hall_stick_loop(void)
|
||||
{
|
||||
unsigned char ch;
|
||||
static unsigned int getCfgTime = get_tmr10ms();
|
||||
uint32_t printf_log_now = 0;
|
||||
static uint8_t count = 0;
|
||||
static tmr10ms_t lastConfigTime = get_tmr10ms();
|
||||
bool log = 0;
|
||||
|
||||
hallStick_GetTxDataFromUSB();
|
||||
|
||||
hallstick_send_by_state();
|
||||
|
||||
while( HallGetByte(&ch) )
|
||||
if(count>10)
|
||||
{
|
||||
count = 0;
|
||||
hallstick_send_by_state();
|
||||
}
|
||||
count++;
|
||||
uint8_t byte;
|
||||
while(HallGetByte(&byte))
|
||||
{
|
||||
HallProtocol.index++;
|
||||
|
||||
Parse_Character(&HallProtocol, ch );
|
||||
Parse_Character(&HallProtocol, byte);
|
||||
|
||||
if ( HallProtocol.msg_OK )
|
||||
{
|
||||
@@ -562,46 +573,42 @@ void hall_stick_loop(void)
|
||||
switch ( HallProtocol.hallID.hall_Id.receiverID )
|
||||
{
|
||||
case TRANSFER_DIR_TXMCU:
|
||||
if ( 0x0e == HallProtocol.hallID.hall_Id.packetID )
|
||||
{
|
||||
memcpy(&StickCallbration, HallProtocol.data, sizeof(StickCallbration));
|
||||
if(HallProtocol.hallID.hall_Id.packetID == HALL_RESP_TYPE_CALIB) {
|
||||
memcpy(&hall_calibration, HallProtocol.data, sizeof(hall_calibration));
|
||||
}
|
||||
else if(HallProtocol.hallID.hall_Id.packetID == HALL_RESP_TYPE_VALUES) {
|
||||
memcpy(hall_raw_values, HallProtocol.data, sizeof(hall_raw_values));
|
||||
convert_hall_to_adcVaule();
|
||||
}
|
||||
else if ( 0x0c == HallProtocol.hallID.hall_Id.packetID )
|
||||
{
|
||||
memcpy(&Channel, HallProtocol.data, sizeof(Channel));
|
||||
|
||||
convert_hall_to_adcVaule();
|
||||
}
|
||||
break;
|
||||
|
||||
case TRANSFER_DIR_HOSTPC:
|
||||
if ( 0x01 == HallProtocol.length &&
|
||||
( 0x05 == HallProtocol.data[0] || 0x06 == HallProtocol.data[0]) )
|
||||
if (HallProtocol.length == 0x01 && (HallProtocol.data[0] == 0x05 || HallProtocol.data[0] == 0x06) )
|
||||
{
|
||||
hallStickSendState = HALLSTICK_SEND_STATE_IDLE;
|
||||
}
|
||||
case TRANSFER_DIR_HALLSTICK:
|
||||
HallProtocolCount++;
|
||||
uint8_t *pt = (uint8_t*)&HallProtocol;
|
||||
//HallProtocol.head = HALL_PROTOLO_HEAD;
|
||||
//TRACE("HALL: %02X %02X %02X ...%04X", pt[0], pt[1], pt[2], HallProtocol.checkSum);
|
||||
pt[HallProtocol.length + 3] = HallProtocol.checkSum & 0xFF;
|
||||
pt[HallProtocol.length + 4] = HallProtocol.checkSum >> 8;
|
||||
// usbDownloadTransmit( pt, HallProtocol.length + 5 );
|
||||
usbDownloadTransmit( pt, HallProtocol.length + 5 );
|
||||
break;
|
||||
}
|
||||
//printf_log_now = 1;
|
||||
}
|
||||
}
|
||||
|
||||
if ((get_tmr10ms() - getCfgTime) > 200)
|
||||
//check periodically if calibration is correct
|
||||
if (get_tmr10ms() - lastConfigTime > 200)
|
||||
{
|
||||
if ( (0 == StickCallbration[0].max) && (0 == StickCallbration[0].mid) && (0== StickCallbration[0].min) )
|
||||
{
|
||||
get_hall_config();
|
||||
getCfgTime = get_tmr10ms();
|
||||
//invalid calibration
|
||||
if(hall_calibration[0].max - hall_calibration[0].min < 1024) {
|
||||
TRACE("GET HALL CONFIG");
|
||||
get_hall_config();
|
||||
lastConfigTime = get_tmr10ms();
|
||||
}
|
||||
|
||||
if ( printf_log_now != 0)
|
||||
if (log)
|
||||
{
|
||||
TRACE_NOCRLF("Hall(%0d):", FLYSKY_HALL_BAUDRATE);
|
||||
for (int idx = 0; idx < HallProtocol.length + 5; idx++)
|
||||
|
||||
@@ -46,10 +46,6 @@
|
||||
#define MIN_ADC_CHANNLE_VALUE ( 0 )
|
||||
#define MIDDLE_ADC_CHANNLE_VALUE ( 2047 )
|
||||
|
||||
|
||||
|
||||
extern unsigned short HallChVal[FLYSKY_HALL_CHANNEL_COUNT];
|
||||
|
||||
typedef struct
|
||||
{
|
||||
signed short min;
|
||||
@@ -62,25 +58,20 @@ typedef struct
|
||||
STRUCT_STICK_CALIBRATION sticksCalibration[4];
|
||||
unsigned char reststate;
|
||||
unsigned short CRC16;
|
||||
}STRUCT_STICK_CALIBRATION_PACK;
|
||||
} STRUCT_STICK_CALIBRATION_PACK;
|
||||
|
||||
typedef struct
|
||||
{
|
||||
signed short channel[4];
|
||||
}STRUCT_HALL_CHANNEL;
|
||||
|
||||
typedef struct
|
||||
{
|
||||
STRUCT_HALL_CHANNEL channel;
|
||||
unsigned char stickState;
|
||||
unsigned short CRC16;
|
||||
}STRUCT_CHANNEL_PACK;
|
||||
} STRUCT_CHANNEL_PACK;
|
||||
|
||||
typedef union
|
||||
{
|
||||
STRUCT_STICK_CALIBRATION_PACK channelPack;
|
||||
STRUCT_CHANNEL_PACK sticksCalibrationPack;
|
||||
}UNION_DATA;
|
||||
} UNION_DATA;
|
||||
|
||||
typedef struct
|
||||
{
|
||||
@@ -103,14 +94,14 @@ typedef union
|
||||
{
|
||||
STRUCT_HALLID hall_Id;
|
||||
unsigned char ID;
|
||||
}STRUCT_ID;
|
||||
} STRUCT_ID;
|
||||
|
||||
|
||||
typedef union
|
||||
{
|
||||
STRUCT_HALLDATA halldat;
|
||||
unsigned char buffer[30];
|
||||
}UNION_HALLDATA;
|
||||
} UNION_HALLDATA;
|
||||
|
||||
|
||||
typedef struct
|
||||
@@ -159,7 +150,9 @@ enum TRANSFER_DIR_E {
|
||||
TRANSFER_DIR_RFMODULE,
|
||||
};
|
||||
|
||||
#define HALL_PROTOLO_HEAD ( 0x55 )
|
||||
#define HALL_PROTOLO_HEAD 0x55
|
||||
#define HALL_RESP_TYPE_CALIB 0x0e
|
||||
#define HALL_RESP_TYPE_VALUES 0x0c
|
||||
|
||||
#define HALL_SERIAL_USART UART4
|
||||
#define HALL_SERIAL_GPIO GPIOA
|
||||
@@ -192,6 +185,11 @@ enum TRANSFER_DIR_E {
|
||||
/***************************************************************************************************
|
||||
interface function
|
||||
***************************************************************************************************/
|
||||
extern unsigned short hall_adc_values[FLYSKY_HALL_CHANNEL_COUNT];
|
||||
extern signed short hall_raw_values[FLYSKY_HALL_CHANNEL_COUNT];
|
||||
extern STRUCT_STICK_CALIBRATION hall_calibration[FLYSKY_HALL_CHANNEL_COUNT];
|
||||
|
||||
|
||||
extern void reset_hall_stick( void );
|
||||
extern void get_hall_config( void );
|
||||
extern void hall_stick_init(uint32_t baudrate);
|
||||
|
||||
@@ -49,11 +49,10 @@ void hapticInit(void)
|
||||
HAPTIC_GPIO_TIMER->PSC = (PERI2_FREQUENCY * TIMER_MULT_APB2) / 10000 - 1;
|
||||
HAPTIC_GPIO_TIMER->CCMR1 = HAPTIC_TIMER_MODE; // PWM
|
||||
HAPTIC_GPIO_TIMER->CCER = HAPTIC_TIMER_OUTPUT_ENABLE;
|
||||
|
||||
hapticOff();
|
||||
|
||||
HAPTIC_GPIO_TIMER->EGR = 0;
|
||||
HAPTIC_GPIO_TIMER->CCR1 = 0;
|
||||
HAPTIC_GPIO_TIMER->EGR = TIM_EGR_UG;
|
||||
HAPTIC_GPIO_TIMER->CR1 = TIM_CR1_CEN; // counter enable
|
||||
HAPTIC_GPIO_TIMER->BDTR |= TIM_BDTR_MOE;
|
||||
}
|
||||
|
||||
void hapticDone(void)
|
||||
|
||||
@@ -22,31 +22,67 @@
|
||||
|
||||
uint32_t readKeys()
|
||||
{
|
||||
return 0;
|
||||
uint32_t result = 0;
|
||||
bool getKeys = true;
|
||||
#if defined(LUA)
|
||||
getKeys = (luaState & INTERPRETER_RUNNING_STANDALONE_SCRIPT);
|
||||
#endif
|
||||
if (getKeys) {
|
||||
if (TRIMS_GPIO_REG_LHL & TRIMS_GPIO_PIN_LHL)
|
||||
result |= 1 << KEY_PGDN;
|
||||
if (TRIMS_GPIO_REG_LHR & TRIMS_GPIO_PIN_LHR)
|
||||
result |= 1 << KEY_PGUP;
|
||||
if (TRIMS_GPIO_REG_LVD & TRIMS_GPIO_PIN_LVD)
|
||||
result |= 1 << KEY_TELEM;
|
||||
if (TRIMS_GPIO_REG_LVU & TRIMS_GPIO_PIN_LVU)
|
||||
result |= 1 << KEY_MENU;
|
||||
if (TRIMS_GPIO_REG_RVD & TRIMS_GPIO_PIN_RVD)
|
||||
result |= 1 << KEY_DOWN;
|
||||
if (TRIMS_GPIO_REG_RVU & TRIMS_GPIO_PIN_RVU)
|
||||
result |= 1 << KEY_UP;
|
||||
if (TRIMS_GPIO_REG_RHL & TRIMS_GPIO_PIN_RHL)
|
||||
result |= 1 << KEY_LEFT;
|
||||
if (TRIMS_GPIO_REG_RHR & TRIMS_GPIO_PIN_RHR)
|
||||
result |= 1 << KEY_RIGHT;
|
||||
if (TRIMS_GPIO_REG_RPRESS & TRIMS_GPIO_PIN_RPRESS)
|
||||
result |= 1 << KEY_ENTER;
|
||||
if (TRIMS_GPIO_REG_LPRESS & TRIMS_GPIO_PIN_LPRESS)
|
||||
result |= 1 << KEY_EXIT;
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
uint32_t readTrims()
|
||||
{
|
||||
uint32_t result = 0;
|
||||
|
||||
bool getTrim = true;
|
||||
#if defined(LUA)
|
||||
if(luaState & INTERPRETER_RUNNING_STANDALONE_SCRIPT) {
|
||||
getTrim = false;
|
||||
}
|
||||
#endif
|
||||
if(!getTrim) return result;
|
||||
if (TRIMS_GPIO_REG_LHL & TRIMS_GPIO_PIN_LHL)
|
||||
result |= 0x01;
|
||||
result |= 1 << (TRM_LH_DWN - TRM_BASE);
|
||||
if (TRIMS_GPIO_REG_LHR & TRIMS_GPIO_PIN_LHR)
|
||||
result |= 0x02;
|
||||
result |= 1 << (TRM_LH_UP - TRM_BASE);
|
||||
if (TRIMS_GPIO_REG_LVD & TRIMS_GPIO_PIN_LVD)
|
||||
result |= 0x04;
|
||||
result |= 1 << (TRM_LV_DWN - TRM_BASE);
|
||||
if (TRIMS_GPIO_REG_LVU & TRIMS_GPIO_PIN_LVU)
|
||||
result |= 0x08;
|
||||
result |= 1 << (TRM_LV_UP - TRM_BASE);
|
||||
if (TRIMS_GPIO_REG_RVD & TRIMS_GPIO_PIN_RVD)
|
||||
result |= 0x10;
|
||||
result |= 1 << (TRM_RV_DWN - TRM_BASE);
|
||||
if (TRIMS_GPIO_REG_RVU & TRIMS_GPIO_PIN_RVU)
|
||||
result |= 0x20;
|
||||
result |= 1 << (TRM_RV_UP - TRM_BASE);
|
||||
if (TRIMS_GPIO_REG_RHL & TRIMS_GPIO_PIN_RHL)
|
||||
result |= 0x40;
|
||||
result |= 1 << (TRM_RH_DWN - TRM_BASE);
|
||||
if (TRIMS_GPIO_REG_RHR & TRIMS_GPIO_PIN_RHR)
|
||||
result |= 0x80;
|
||||
|
||||
// TRACE("readTrims(): result=0x%02x", result);
|
||||
result |= 1 << (TRM_RH_UP - TRM_BASE);
|
||||
if (TRIMS_GPIO_REG_RPRESS & TRIMS_GPIO_PIN_RPRESS)
|
||||
result |= 1 << (TRM_RIGHT_CLICK - TRM_BASE);
|
||||
if (TRIMS_GPIO_REG_LPRESS & TRIMS_GPIO_PIN_LPRESS)
|
||||
result |= 1 << (TRM_LEFT_CLICK - TRM_BASE);
|
||||
|
||||
return result;
|
||||
}
|
||||
@@ -68,13 +104,13 @@ void readKeysAndTrims()
|
||||
|
||||
uint8_t index = 0;
|
||||
uint32_t in = readKeys();
|
||||
uint32_t trims = readTrims();
|
||||
for (i = 0; i < TRM_BASE; i++) {
|
||||
keys[index++].input(in & (1 << i));
|
||||
}
|
||||
|
||||
in = readTrims();
|
||||
for (i = 1; i <= 1 << (TRM_LAST-TRM_BASE); i <<= 1) {
|
||||
keys[index++].input(in & i);
|
||||
keys[index++].input(trims & i);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -87,12 +87,9 @@ typedef unsigned int LcdReadIDFucPtr( void );
|
||||
|
||||
extern void GPIO_SetDirection( GPIO_TypeDef *GPIOx, unsigned char Pin, unsigned char IsInput );
|
||||
|
||||
extern void LCD_HX8357D_On( void );
|
||||
extern void LCD_ILI9481_On( void );
|
||||
extern void LCD_ILI9486_On( void );
|
||||
extern void LCD_ILI9488_On( void );
|
||||
extern void LCD_ST7796S_On( void );
|
||||
|
||||
extern lcdSpiInitFucPtr lcdInitFunction;
|
||||
extern lcdSpiInitFucPtr lcdOffFunction;
|
||||
extern lcdSpiInitFucPtr lcdOnFunction;
|
||||
|
||||
#define SET_IO_INPUT( PORT, PIN ) GPIO_SetDirection( PORT, PIN, 1 )
|
||||
#define SET_IO_OUTPUT( PORT, PIN ) GPIO_SetDirection( PORT, PIN, 0 )
|
||||
|
||||
@@ -124,6 +124,8 @@ enum LcdColorIndex
|
||||
BARGRAPH2_COLOR_INDEX,
|
||||
BARGRAPH_BGCOLOR_INDEX,
|
||||
SCROLLBOX_COLOR_INDEX,
|
||||
BATTERY_CHARGE_COLOR_INDEX,
|
||||
|
||||
LCD_COLOR_COUNT,
|
||||
|
||||
TABLE_HEADER_BGCOLOR_INDEX,
|
||||
|
||||
@@ -21,9 +21,8 @@
|
||||
#include "pwr.h"
|
||||
#include "board.h"
|
||||
|
||||
uint32_t shutdownRequest; // Stores intentional shutdown to avoid reboot loop
|
||||
uint32_t shutdownReason; // Used for detecting unexpected reboots regardless of reason
|
||||
uint32_t powerupReason __NOINIT; // Stores power up reason beyond initialization for emergency mode activation
|
||||
uint32_t boardState __NOINIT;
|
||||
|
||||
void pwrInit()
|
||||
{
|
||||
@@ -41,11 +40,6 @@ void pwrInit()
|
||||
//GPIO_InitStructure.GPIO_Pin = INTMODULE_PWR_GPIO_PIN;
|
||||
//GPIO_Init(INTMODULE_PWR_GPIO, &GPIO_InitStructure);
|
||||
|
||||
//TODO move this elsewhere!
|
||||
GPIO_ResetBits(EXTMODULE_PWR_GPIO, EXTMODULE_PWR_GPIO_PIN);
|
||||
GPIO_InitStructure.GPIO_Pin = EXTMODULE_PWR_GPIO_PIN;
|
||||
GPIO_Init(EXTMODULE_PWR_GPIO, &GPIO_InitStructure);
|
||||
|
||||
//Bluetooth
|
||||
GPIO_SetBits(BLUETOOTH_ON_GPIO, BLUETOOTH_ON_GPIO_PIN);
|
||||
GPIO_InitStructure.GPIO_Pin = BLUETOOTH_ON_GPIO_PIN;
|
||||
@@ -55,38 +49,35 @@ void pwrInit()
|
||||
GPIO_InitStructure.GPIO_Mode = GPIO_Mode_IN;
|
||||
GPIO_InitStructure.GPIO_Pin = PWR_SWITCH_GPIO_PIN;
|
||||
GPIO_Init(PWR_GPIO, &GPIO_InitStructure);
|
||||
|
||||
// Init SD-DETECT PIN
|
||||
GPIO_ResetBits(SD_PRESENT_GPIO, SD_PRESENT_GPIO_PIN);
|
||||
GPIO_InitStructure.GPIO_Pin = SD_PRESENT_GPIO_PIN;
|
||||
GPIO_Init(SD_PRESENT_GPIO, &GPIO_InitStructure);
|
||||
|
||||
// TODO move this elsewhere! (plus SD DETECT on other boards)
|
||||
// Init TRAINER DETECT PIN
|
||||
// GPIO_InitStructure.GPIO_Pin = TRAINER_DETECT_GPIO_PIN;
|
||||
// GPIO_Init(TRAINER_DETECT_GPIO, &GPIO_InitStructure);
|
||||
//turn power off
|
||||
GPIO_ResetBits(PWR_GPIO, PWR_ON_GPIO_PIN);
|
||||
//turn Bluetooth off
|
||||
GPIO_ResetBits(PWR_GPIO, BLUETOOTH_ON_GPIO_PIN);
|
||||
|
||||
pwrOn();
|
||||
boardState = BOARD_POWER_OFF;
|
||||
}
|
||||
|
||||
void pwrOn()
|
||||
{
|
||||
GPIO_InitTypeDef GPIO_InitStructure;
|
||||
GPIO_InitStructure.GPIO_Pin = PWR_ON_GPIO_PIN;
|
||||
GPIO_InitStructure.GPIO_Mode = GPIO_Mode_OUT;
|
||||
GPIO_InitStructure.GPIO_Speed = GPIO_Speed_2MHz;
|
||||
GPIO_InitStructure.GPIO_OType = GPIO_OType_PP;
|
||||
GPIO_InitStructure.GPIO_PuPd = GPIO_PuPd_UP;
|
||||
GPIO_Init(PWR_GPIO, &GPIO_InitStructure);
|
||||
|
||||
GPIO_SetBits(PWR_GPIO, PWR_ON_GPIO_PIN);
|
||||
|
||||
shutdownRequest = NO_SHUTDOWN_REQUEST;
|
||||
shutdownReason = DIRTY_SHUTDOWN;
|
||||
boardState = BOARD_POWER_ON;
|
||||
}
|
||||
|
||||
void pwrSoftReboot(){
|
||||
boardState = BOARD_REBOOT;
|
||||
NVIC_SystemReset();
|
||||
}
|
||||
void pwrOff()
|
||||
{
|
||||
// Shutdown the Haptic
|
||||
hapticDone();
|
||||
|
||||
shutdownRequest = SHUTDOWN_REQUEST;
|
||||
shutdownReason = NORMAL_POWER_OFF;
|
||||
boardState = BOARD_POWER_OFF;
|
||||
GPIO_ResetBits(PWR_GPIO, PWR_ON_GPIO_PIN);
|
||||
}
|
||||
|
||||
@@ -97,36 +88,11 @@ bool pwrPressed()
|
||||
|
||||
void pwrResetHandler()
|
||||
{
|
||||
RCC->AHB1ENR |= RCC_AHB1ENR_GPIOJEN;
|
||||
|
||||
// these two NOPs are needed (see STM32F errata sheet) before the peripheral
|
||||
// register can be written after the peripheral clock was enabled
|
||||
__ASM volatile ("nop");
|
||||
__ASM volatile ("nop");
|
||||
|
||||
// We get here whether we are powering up normally, we had an unexpected reboot or we have just powered down normally.
|
||||
// We want:
|
||||
// - In the 2nd case, to power ON as soon as possible if an unexpected reboot happened
|
||||
// (we get there running on remaining capacitor charge, soft power having been cut by the RESET).
|
||||
// - In the 3rd case, NOT power on as that would prevent from turning the system off.
|
||||
// - The 1st case does not need to be handled here, but will be as a result of the handling for the 3rd case, see below.
|
||||
//
|
||||
// shutdownRequest is used to handle the 3rd case. If we really powered down on purpose this will still be set to SHUTDOWN_REQUEST
|
||||
// as we left it in pwrOff(). If however we had an unexpected reboot, it would be set to NO_SHUTDOWN_REQUEST as we set it in pwrOn().
|
||||
// Any other value (e.g. resulting from data corruption) would also keep power on for safety, so this variable can NOT be used
|
||||
// to detect an unexpected reboot (on a normal power on the contents of the variable are random).
|
||||
//
|
||||
// shutdownReason is used to differentiate between an unexpected reboot and a normal power on. We set it to DIRTY_SHUTDOWN in pwrOn()
|
||||
// in anticipation of a potential reboot. Should there be one the value should be preserved and signal below that we rebooted unexpectedly.
|
||||
// If it is NOT set to DIRTY_SHUTDOWN we likely had a normal boot and its contents are random. Due to the need to initialize it to detect a
|
||||
// potential failure ASAP we cannot use it to determine in the firmware why we got there, it has to be buffered.
|
||||
//
|
||||
// powerupReason is there to cater for that, and is what is used in the firmware to decide whether we have to enter emergency mode.
|
||||
// This variable needs to be in a RAM section that is not initialized or zeroed, since once we exit this pwrResetHandler() function the
|
||||
// C runtime would otherwise overwrite it during program init.
|
||||
// Only for X12, X10 power circuit causes inability to shut down on some samples.
|
||||
|
||||
if (WAS_RESET_BY_WATCHDOG_OR_SOFTWARE()) {
|
||||
pwrOn();
|
||||
if (boardState != BOARD_POWER_OFF) {
|
||||
powerupReason = boardState != BOARD_REBOOT && WAS_RESET_BY_WATCHDOG_OR_SOFTWARE() ? DIRTY_SHUTDOWN : ~DIRTY_SHUTDOWN;
|
||||
RCC->CSR |= RCC_CSR_RMVF; //clear all flags
|
||||
}
|
||||
else {
|
||||
powerupReason = ~DIRTY_SHUTDOWN;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -20,7 +20,7 @@
|
||||
ENTRY(Reset_Handler)
|
||||
|
||||
/* Highest address of the user mode stack */
|
||||
_estack = 0x20030000; /* end of 192K RAM */
|
||||
_estack = 0x2002FFF0; /* end of 192K RAM */
|
||||
_heap_end = 0xC0800000; /* end of 8192K SDRAM */
|
||||
|
||||
/* Generate a link error if heap and stack don't fit into RAM */
|
||||
@@ -35,7 +35,8 @@ MEMORY
|
||||
{
|
||||
FLASH (rx) : ORIGIN = 0x08000000, LENGTH = 2048K
|
||||
RAM (xrw) : ORIGIN = 0x20000000, LENGTH = 192K
|
||||
CCM (xrw) : ORIGIN = 0x10000000, LENGTH = 64K
|
||||
CCM (xrw) : ORIGIN = 0x10000000, LENGTH = 65520
|
||||
NO_INIT (xrw) : ORIGIN = 0x1000FFF0, LENGTH = 16
|
||||
MEMORY_B1 (rx) : ORIGIN = 0x60000000, LENGTH = 0K
|
||||
SDRAM(xrw) : ORIGIN = 0xC0000000, LENGTH = 8192K
|
||||
}
|
||||
@@ -132,7 +133,8 @@ SECTIONS
|
||||
.noinit (NOLOAD) :
|
||||
{
|
||||
*(.noinit)
|
||||
} >CCM
|
||||
} >NO_INIT
|
||||
|
||||
|
||||
/* collect all uninitialized .ccm sections */
|
||||
.ram (NOLOAD) :
|
||||
|
||||
@@ -20,7 +20,6 @@
|
||||
ENTRY(Reset_Handler)
|
||||
|
||||
/* Highest address of the user mode stack */
|
||||
_estack = 0x10010000; /* end of 64K CCM */
|
||||
_heap_end = 0xC0800000; /* end of 8192K SDRAM */
|
||||
|
||||
/* Generate a link error if heap and stack don't fit into RAM */
|
||||
@@ -35,11 +34,16 @@ MEMORY
|
||||
{
|
||||
FLASH (rx) : ORIGIN = 0x08000000, LENGTH = 2048K
|
||||
RAM (xrw) : ORIGIN = 0x20000000, LENGTH = 192K
|
||||
CCM (xrw) : ORIGIN = 0x10000000, LENGTH = 64K
|
||||
CCM (xrw) : ORIGIN = 0x10000000, LENGTH = 65520
|
||||
NO_INIT (xrw) : ORIGIN = 0x1000FFF0, LENGTH = 16
|
||||
MEMORY_B1 (rx) : ORIGIN = 0x60000000, LENGTH = 0K
|
||||
SDRAM(xrw) : ORIGIN = 0xC0000000, LENGTH = 8192K
|
||||
}
|
||||
|
||||
/* Main stack end */
|
||||
_estack = 0x10000000 + LENGTH(CCM);
|
||||
_main_stack_start = _estack - _Main_Stack_Size;
|
||||
|
||||
/* Define output sections */
|
||||
SECTIONS
|
||||
{
|
||||
@@ -52,6 +56,9 @@ SECTIONS
|
||||
|
||||
CREATE_OBJECT_SYMBOLS
|
||||
|
||||
|
||||
|
||||
|
||||
_stext = .; /* Provide the name for the start of this section */
|
||||
. = ALIGN(4);
|
||||
KEEP(*(.isr_vector)) /* Startup code */
|
||||
@@ -135,7 +142,8 @@ SECTIONS
|
||||
.noinit (NOLOAD) :
|
||||
{
|
||||
*(.noinit)
|
||||
} >CCM
|
||||
} >NO_INIT
|
||||
|
||||
|
||||
/* collect all uninitialized .ccm sections */
|
||||
.ram (NOLOAD) :
|
||||
|
||||
@@ -20,26 +20,28 @@
|
||||
ENTRY(Reset_Handler)
|
||||
|
||||
/* Highest address of the user mode stack */
|
||||
_estack = 0x10010000; /* end of 64K CCM */
|
||||
_heap_end = 0xC0800000; /* end of 8192K SDRAM */
|
||||
|
||||
/* Generate a link error if heap and stack don't fit into RAM */
|
||||
_Min_Heap_Size = 0; /* required amount of heap */
|
||||
_Main_Stack_Size = 1024; /* required amount of stack for interrupt stack (Main stack) */
|
||||
|
||||
/* Main stack end */
|
||||
_main_stack_start = _estack - _Main_Stack_Size;
|
||||
|
||||
/* Specify the memory areas */
|
||||
MEMORY
|
||||
{
|
||||
FLASH (rx) : ORIGIN = 0x08000000, LENGTH = 2048K
|
||||
RAM (xrw) : ORIGIN = 0x20000000, LENGTH = 192K
|
||||
CCM (xrw) : ORIGIN = 0x10000000, LENGTH = 64K
|
||||
CCM (xrw) : ORIGIN = 0x10000000, LENGTH = 65520
|
||||
NO_INIT (xrw) : ORIGIN = 0x1000FFF0, LENGTH = 16
|
||||
MEMORY_B1 (rx) : ORIGIN = 0x60000000, LENGTH = 0K
|
||||
SDRAM(xrw) : ORIGIN = 0xC0000000, LENGTH = 8192K
|
||||
}
|
||||
|
||||
/* Main stack end */
|
||||
_estack = 0x10000000 + LENGTH(CCM);
|
||||
_main_stack_start = _estack - _Main_Stack_Size;
|
||||
|
||||
/* Define output sections */
|
||||
SECTIONS
|
||||
{
|
||||
@@ -138,7 +140,7 @@ SECTIONS
|
||||
.noinit (NOLOAD) :
|
||||
{
|
||||
*(.noinit)
|
||||
} >CCM
|
||||
} >NO_INIT
|
||||
|
||||
/* collect all uninitialized .ccm sections */
|
||||
.ram (NOLOAD) :
|
||||
|
||||
@@ -24,7 +24,6 @@ void trainerSendNextFrame();
|
||||
|
||||
void init_trainer_ppm()
|
||||
{
|
||||
#if 0
|
||||
GPIO_PinAFConfig(TRAINER_GPIO, TRAINER_OUT_GPIO_PinSource, TRAINER_GPIO_AF);
|
||||
|
||||
GPIO_InitTypeDef GPIO_InitStructure;
|
||||
@@ -38,8 +37,8 @@ void init_trainer_ppm()
|
||||
TRAINER_TIMER->CR1 &= ~TIM_CR1_CEN;
|
||||
TRAINER_TIMER->PSC = TRAINER_TIMER_FREQ / 2000000 - 1; // 0.5uS
|
||||
TRAINER_TIMER->ARR = 45000;
|
||||
TRAINER_TIMER->CCR2 = GET_PPM_DELAY(TRAINER_MODULE)*2;
|
||||
TRAINER_TIMER->CCER = TIM_CCER_CC2E | (g_model.moduleData[TRAINER_MODULE].ppm.pulsePol ? 0 : TIM_CCER_CC2P);
|
||||
TRAINER_TIMER->CCR2 = GET_TRAINER_PPM_DELAY()*2;
|
||||
TRAINER_TIMER->CCER = TIM_CCER_CC2E | (GET_TRAINER_PPM_POLARITY() ? 0 : TIM_CCER_CC2P);
|
||||
TRAINER_TIMER->CCMR1 = TIM_CCMR1_OC2M_2 | TIM_CCMR1_OC2M_0; // Force O/P high
|
||||
TRAINER_TIMER->BDTR = TIM_BDTR_MOE;
|
||||
TRAINER_TIMER->EGR = 1;
|
||||
@@ -47,120 +46,96 @@ void init_trainer_ppm()
|
||||
TRAINER_TIMER->CCMR1 = TIM_CCMR1_OC2M_1 | TIM_CCMR1_OC2M_2 | TIM_CCMR1_OC2PE; // PWM mode 1
|
||||
TRAINER_TIMER->CR1 |= TIM_CR1_CEN;
|
||||
|
||||
setupPulsesPPMTrainer();
|
||||
trainerSendNextFrame();
|
||||
|
||||
NVIC_EnableIRQ(TRAINER_OUT_DMA_IRQn);
|
||||
NVIC_SetPriority(TRAINER_OUT_DMA_IRQn, 7);
|
||||
NVIC_EnableIRQ(TRAINER_TIMER_IRQn);
|
||||
NVIC_SetPriority(TRAINER_TIMER_IRQn, 7);
|
||||
#endif
|
||||
}
|
||||
|
||||
void stop_trainer_ppm()
|
||||
{
|
||||
#if 0
|
||||
NVIC_DisableIRQ(TRAINER_OUT_DMA_IRQn);
|
||||
NVIC_DisableIRQ(TRAINER_TIMER_IRQn);
|
||||
|
||||
TRAINER_OUT_DMA_STREAM->CR &= ~DMA_SxCR_EN; // Disable DMA
|
||||
TRAINER_TIMER->DIER = 0; // Stop Interrupt
|
||||
TRAINER_TIMER->CR1 &= ~TIM_CR1_CEN; // Stop counter
|
||||
#endif
|
||||
}
|
||||
|
||||
void init_trainer_capture()
|
||||
{
|
||||
#if 0
|
||||
GPIO_InitTypeDef GPIO_InitStructure;
|
||||
GPIO_PinAFConfig(TRAINER_GPIO, TRAINER_IN_GPIO_PinSource, TRAINER_GPIO_AF);
|
||||
|
||||
GPIO_InitTypeDef GPIO_InitStructure;
|
||||
GPIO_InitStructure.GPIO_Pin = TRAINER_IN_GPIO_PIN;
|
||||
GPIO_InitStructure.GPIO_Mode = GPIO_Mode_AF;
|
||||
GPIO_InitStructure.GPIO_OType = GPIO_OType_PP;
|
||||
GPIO_InitStructure.GPIO_Speed = GPIO_Speed_2MHz;
|
||||
GPIO_InitStructure.GPIO_PuPd = GPIO_PuPd_NOPULL;
|
||||
GPIO_Init(TRAINER_GPIO, &GPIO_InitStructure);
|
||||
GPIO_PinAFConfig(TRAINER_GPIO, TRAINER_IN_GPIO_PinSource, TRAINER_GPIO_AF);
|
||||
|
||||
TRAINER_TIMER->ARR = 0xFFFF;
|
||||
TRAINER_TIMER->PSC = TRAINER_TIMER_FREQ / 2000000 - 1; // 0.5uS
|
||||
TRAINER_TIMER->CR2 = 0;
|
||||
TRAINER_TIMER->CCMR1 = TIM_CCMR1_IC1F_0 | TIM_CCMR1_IC1F_1 | TIM_CCMR1_CC1S_0;
|
||||
TRAINER_TIMER->CCER = TIM_CCER_CC1E;
|
||||
TRAINER_TIMER->SR &= ~TIM_SR_CC1IF & ~TIM_SR_CC2IF & ~TIM_SR_UIF; // Clear flags
|
||||
TRAINER_TIMER->CCMR1 = TRAINER_IN_CCMR1;
|
||||
TRAINER_TIMER->CCER = TRAINER_IN_CCER;
|
||||
TRAINER_TIMER->SR &= ~TIM_SR_CC3IF & ~TIM_SR_CC2IF & ~TIM_SR_UIF; // Clear flags
|
||||
TRAINER_TIMER->DIER |= TIM_DIER_CC1IE;
|
||||
TRAINER_TIMER->CR1 = TIM_CR1_CEN;
|
||||
|
||||
NVIC_EnableIRQ(TRAINER_TIMER_IRQn);
|
||||
NVIC_SetPriority(TRAINER_TIMER_IRQn, 7);
|
||||
#endif
|
||||
}
|
||||
|
||||
void stop_trainer_capture()
|
||||
{
|
||||
#if 0
|
||||
NVIC_DisableIRQ(TRAINER_TIMER_IRQn); // Stop Interrupt
|
||||
|
||||
TRAINER_TIMER->CR1 &= ~TIM_CR1_CEN; // Stop counter
|
||||
TRAINER_TIMER->DIER = 0; // Stop Interrupt
|
||||
#endif
|
||||
}
|
||||
short unsigned int* lastPulse = 0;
|
||||
|
||||
void trainerSendNextFrame()
|
||||
{
|
||||
#if 0
|
||||
TRAINER_TIMER->CCR2 = GET_PPM_DELAY(TRAINER_MODULE)*2;
|
||||
TRAINER_TIMER->CCER = TIM_CCER_CC2E | (g_model.moduleData[TRAINER_MODULE].ppm.pulsePol ? 0 : TIM_CCER_CC2P);
|
||||
TRAINER_TIMER->CCR1 = *(trainerPulsesData.ppm.ptr - 1) - 4000; // 2mS in advance
|
||||
setupPulsesPPMTrainer();
|
||||
TRAINER_TIMER->CCR2 = GET_TRAINER_PPM_DELAY() * 2;
|
||||
TRAINER_TIMER->CCER = TIM_CCER_CC2E | (GET_TRAINER_PPM_POLARITY() ? 0 : TIM_CCER_CC2P);
|
||||
lastPulse = trainerPulsesData.ppm.ptr;
|
||||
TRAINER_TIMER->CCR3 = *(trainerPulsesData.ppm.ptr - 1) - 4000; // 2mS in advance
|
||||
|
||||
TRAINER_OUT_DMA_STREAM->CR &= ~DMA_SxCR_EN; // Disable DMA
|
||||
TRAINER_OUT_DMA_STREAM->CR |= TRAINER_OUT_DMA_CHANNEL | DMA_SxCR_DIR_0 | DMA_SxCR_MINC | DMA_SxCR_PSIZE_0 | DMA_SxCR_MSIZE_0 | DMA_SxCR_PL_0 | DMA_SxCR_PL_1;
|
||||
TRAINER_OUT_DMA_STREAM->PAR = CONVERT_PTR_UINT(&TRAINER_TIMER->ARR);
|
||||
TRAINER_OUT_DMA_STREAM->M0AR = CONVERT_PTR_UINT(trainerPulsesData.ppm.pulses);
|
||||
TRAINER_OUT_DMA_STREAM->NDTR = trainerPulsesData.ppm.ptr - trainerPulsesData.ppm.pulses;
|
||||
TRAINER_OUT_DMA_STREAM->CR |= DMA_SxCR_EN | DMA_SxCR_TCIE; // Enable DMA
|
||||
#endif
|
||||
}
|
||||
|
||||
#if 0
|
||||
extern "C" void TRAINER_OUT_DMA_IRQHandler()
|
||||
{
|
||||
if (!DMA_GetITStatus(TRAINER_OUT_DMA_STREAM, TRAINER_OUT_DMA_FLAG_TC))
|
||||
return;
|
||||
|
||||
DMA_ClearITPendingBit(TRAINER_OUT_DMA_STREAM, TRAINER_OUT_DMA_FLAG_TC);
|
||||
|
||||
TRAINER_TIMER->SR &= ~TIM_SR_CC1IF; // Clear flag
|
||||
TRAINER_TIMER->DIER |= TIM_DIER_CC1IE; // Enable this interrupt
|
||||
trainerPulsesData.ppm.ptr = trainerPulsesData.ppm.pulses;
|
||||
TRAINER_TIMER->DIER |= TIM_DIER_UDE;
|
||||
TRAINER_TIMER->SR &= ~TIM_SR_UIF; // Clear this flag
|
||||
TRAINER_TIMER->DIER |= TIM_DIER_UIE; // Enable this interrupt
|
||||
}
|
||||
|
||||
extern "C" void TRAINER_TIMER_IRQHandler()
|
||||
{
|
||||
DEBUG_INTERRUPT(INT_TRAINER);
|
||||
|
||||
uint16_t capture = 0;
|
||||
bool doCapture = false;
|
||||
|
||||
// What mode? in or out?
|
||||
|
||||
if ((TRAINER_TIMER->DIER & TIM_DIER_CC1IE) && (TRAINER_TIMER->SR & TIM_SR_CC1IF)) {
|
||||
// capture mode on trainer jack
|
||||
capture = TRAINER_TIMER->CCR1;
|
||||
capture = TRAINER_IN_COUNTER_REGISTER;
|
||||
if (TRAINER_CONNECTED() && currentTrainerMode == TRAINER_MODE_MASTER_TRAINER_JACK) {
|
||||
doCapture = true;
|
||||
}
|
||||
}
|
||||
|
||||
if (doCapture) {
|
||||
captureTrainerPulses(capture);
|
||||
}
|
||||
|
||||
}
|
||||
// PPM out compare interrupt
|
||||
if ((TRAINER_TIMER->DIER & TIM_DIER_CC1IE) && (TRAINER_TIMER->SR & TIM_SR_CC1IF)) {
|
||||
if ((TRAINER_TIMER->DIER & TIM_DIER_CC3IE) && (TRAINER_TIMER->SR & TIM_SR_CC3IF)) {
|
||||
// compare interrupt
|
||||
TRAINER_TIMER->DIER &= ~TIM_DIER_CC1IE; // stop this interrupt
|
||||
TRAINER_TIMER->SR &= ~TIM_SR_CC1IF; // Clear flag
|
||||
setupPulsesPPMTrainer();
|
||||
TRAINER_TIMER->DIER &= ~TIM_DIER_CC3IE; // stop this interrupt
|
||||
TRAINER_TIMER->SR &= ~TIM_SR_CC3IF; // Clear flag
|
||||
trainerSendNextFrame();
|
||||
}
|
||||
|
||||
if ((TRAINER_TIMER->DIER & TIM_DIER_UIE) && (TRAINER_TIMER->SR & TIM_SR_UIF)) {
|
||||
TRAINER_TIMER->SR &= ~TIM_SR_UIF; // Clear flag
|
||||
TRAINER_TIMER->ARR = *trainerPulsesData.ppm.ptr++;
|
||||
if (trainerPulsesData.ppm.ptr == lastPulse) {
|
||||
TRAINER_TIMER->SR &= ~TIM_SR_CC3IF; // Clear flag
|
||||
TRAINER_TIMER->DIER |= TIM_DIER_CC3IE; // Enable this interrupt
|
||||
}
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user