Fixed some compilation issues

This commit is contained in:
Raphael Coeffic
2022-03-20 16:22:12 +01:00
parent 5fb369f052
commit e5c852ab37
17 changed files with 62 additions and 39 deletions
@@ -21,6 +21,10 @@
#include "mixer_scheduler.h"
#include "board.h"
#include "debug.h"
#include "heartbeat_driver.h"
#include "timers_driver.h"
#if defined(INTMODULE_HEARTBEAT_GPIO)
@@ -79,9 +83,7 @@ void stop_intmodule_heartbeat()
void check_intmodule_heartbeat()
{
if (EXTI_GetITStatus(INTMODULE_HEARTBEAT_EXTI_LINE) != RESET) {
#if !defined(INTMODULE_USART)
heartbeatCapture.timestamp = getTmr2MHz();
#endif
#if defined(DEBUG_LATENCY)
heartbeatCapture.count++;
#endif
@@ -21,7 +21,16 @@
#pragma once
struct HeartbeatCapture {
uint32_t timestamp;
uint8_t valid;
#if defined(DEBUG_LATENCY)
uint32_t count;
#endif
};
extern volatile HeartbeatCapture heartbeatCapture;
void init_intmodule_heartbeat();
void check_intmodule_heartbeat();
void stop_intmodule_heartbeat();
@@ -52,8 +52,7 @@ void stop1msTimer()
NVIC_DisableIRQ(INTERRUPT_xMS_IRQn);
}
// TODO use the same than board_sky9x.cpp
void interrupt1ms()
static void interrupt1ms()
{
static uint8_t pre_scale; // Used to get 10 Hz counter
@@ -0,0 +1,38 @@
/*
* Copyright (C) EdgeTX
*
* Based on code named
* opentx - https://github.com/opentx/opentx
* th9x - http://code.google.com/p/th9x
* er9x - http://code.google.com/p/er9x
* gruvin9x - http://code.google.com/p/gruvin9x
*
* License GPLv2: http://www.gnu.org/licenses/gpl-2.0.html
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*/
#pragma once
#if defined(SIMU)
uint16_t getTmr2MHz();
#elif defined(STM32)
#include "board.h"
void init2MhzTimer();
void init1msTimer();
void stop1msTimer();
static inline uint16_t getTmr2MHz() { return TIMER_2MHz_TIMER->CNT; }
#endif