Merge pull request #477 from EdgeTX/403-access-denied

Enable ISRM internal module for non-FrSky hardware (T16 / TX16S / etc...)
This commit is contained in:
Raphael Coeffic
2021-07-27 06:02:45 +02:00
committed by GitHub
14 changed files with 112 additions and 90 deletions
@@ -26,6 +26,7 @@ volatile HeartbeatCapture heartbeatCapture;
void init_intmodule_heartbeat()
{
TRACE("init_intmodule_heartbeat");
GPIO_InitTypeDef GPIO_InitStructure;
GPIO_InitStructure.GPIO_Mode = GPIO_Mode_IN;
GPIO_InitStructure.GPIO_Speed = GPIO_Speed_2MHz;
@@ -34,7 +35,8 @@ void init_intmodule_heartbeat()
GPIO_InitStructure.GPIO_Pin = INTMODULE_HEARTBEAT_GPIO_PIN;
GPIO_Init(INTMODULE_HEARTBEAT_GPIO, &GPIO_InitStructure);
SYSCFG_EXTILineConfig(INTMODULE_HEARTBEAT_EXTI_PortSource, INTMODULE_HEARTBEAT_EXTI_PinSource);
SYSCFG_EXTILineConfig(INTMODULE_HEARTBEAT_EXTI_PortSource,
INTMODULE_HEARTBEAT_EXTI_PinSource);
EXTI_InitTypeDef EXTI_InitStructure;
EXTI_StructInit(&EXTI_InitStructure);
@@ -51,6 +53,7 @@ void init_intmodule_heartbeat()
void stop_intmodule_heartbeat()
{
TRACE("stop_intmodule_heartbeat");
heartbeatCapture.valid = false;
#if !defined(INTMODULE_HEARTBEAT_REUSE_INTERRUPT_ROTARY_ENCODER)
@@ -69,9 +72,7 @@ void stop_intmodule_heartbeat()
void check_intmodule_heartbeat()
{
if (EXTI_GetITStatus(INTMODULE_HEARTBEAT_EXTI_LINE) != RESET) {
#if defined(INTMODULE_USART)
nextMixerTime[INTERNAL_MODULE] = RTOS_GET_MS();
#else
#if !defined(INTMODULE_USART)
heartbeatCapture.timestamp = getTmr2MHz();
#endif
#if defined(DEBUG_LATENCY)
+2 -2
View File
@@ -202,8 +202,8 @@ if(INTERNAL_MODULE_PXX2)
add_definitions(-DHARDWARE_INTERNAL_MODULE)
add_definitions(-DINTERNAL_MODULE_PXX2)
if (NOT PCBREV STREQUAL EXPRESS)
set(ACCESS_LIB ON)
add_definitions(-DACCESS_LIB)
set(ACCESS_DENIED ON)
add_definitions(-DACCESS_DENIED)
endif()
endif()
+1
View File
@@ -909,6 +909,7 @@
#define INTMODULE_HEARTBEAT_EXTI_PinSource GPIO_PinSource12
#define INTMODULE_HEARTBEAT_EXTI_LINE EXTI_Line12
#define INTMODULE_HEARTBEAT_EXTI_IRQn EXTI15_10_IRQn
#define INTMODULE_HEARTBEAT_EXTI_IRQHandler EXTI15_10_IRQHandler
#define INTMODULE_HEARTBEAT_REUSE_INTERRUPT_ROTARY_ENCODER
#if defined(INTERNAL_MODULE_PXX2)
#define INTMODULE_HEARTBEAT_TRIGGER EXTI_Trigger_Falling