refact: ADC, switches and keys
Add "hardware_defs" target to dump hardware defines from hal.h per target Fixed hal.h definitions for switches & ADC inputs Tools to generate hardware definitions from current hal.h generator: add support for EXTx and analog switches WiP Add generated header to hardware_defs target Add support for ADC input direction and index per GPIO port Incredible: it compiles Removed StdPeriph ADC driver Works on QX7 Works on TX16S (VBat missing) Switch driver using generated switches for stm32 targets Switch driver with generated switches for simu Use switch names from switch driver Fixed single conversion handling Fixed horus VBat reading Added switch name Fix warnings about bitfield offsets and GCC 4.4 This is caused by bitfields that cross type boundaries. In this particular case, it happens as the bitfield is not defined the same in `rtc_backup.cpp`. Switches has already been moved to generic driver Jitter measurement for each sample, not just for oversampled values Moved periph clock init to the ADC driver ADC & GPIOs. Add switchInit() to init pins Fix NV14 CMake Fix taranis target Fix NV14 (again) Model audio files: use new interface for switch index Fix X9-lite Fix simu headers Fix getSwitchName() Add support for ADC switches Fix switch warning YAML Test only switches which are defined Conversions tests for QX7 only on QX7 Fix X12S Fix function switch names Enable ADC periph clock before initialising channels NV14: offset inputs for the sticks & fix switches WiP: get rid of VSRCRAW and some more Simu shall use normal ADC driver fix x7 fix nv14 Fix 9x nav fix 212x64 fix xlite fix x9e fix simu lib fix unit tests fix x7 tests PWM stick values should be written directly into adcValues ... just like FlySky sticks. fix x12s fix nv14 Add some support for SPI ADC (only unit tests) Remove `jq` usage fix generate_yaml.py for newer libclang fix pot config fix stick names Some YAML generator improvements Max 16 Pots on COLORLCD Fix some source names Use 10 bits for switches to prevent overflow Removed horus constants for switches & ADC inputs Fix unit tests Fix curve edit Fix libsimulator Fix function switches (tpro) Refine ADC & analog API Moved hardware definitions scripts and templates into own dir cleanup API refine Fix unit tests Mixer: apply calibration only on required inputs Place ADC switches after all other ADC inputs Fix X12S Remove useless TR_POTS_VSRCRAW, TR_SW_VSRCRAW, and TR_VSRCRAW Cleanup redundant generated YAML parsers Fixes Boxer rebase Add boxer to generate-hw-defs.sh Obsolete LUA exports Add boxer ADC_DIRECTION Split generate_hw_defs.py into multiple files Some cleanup (+ LUA switches) Fix AXIS definitions Fixed translation strings declarations Some rebase fixes Remove some useless StdPeriph drivers fix: set pin mode to reset state on usart deinit fix: use canonical names for calibration data fix: ADC driver does not care about unconfigured inputs fix X12S ADC Add support for ADC conversion chaining Better X12S ADC implem Moved X12S ADC driver to HAL/LL Improve ADC driver separation Fixed taranis & nv14 Moved PWM gimbals to HAL/LL Removed useless TR_EXTRA_VSRCRAW Fixed include guards Small fixes Renamed control inputs Moved internal and external module pulse driver def to boards Move more things to the generic_stm32 board Remove STR_VMIXTRIMS Added analog labels Generate main control names Misuse labels / short labels for main controls Backward compatibility: sliders and legacy names New keys driver Let's get rid of StdPeriph headers in simu Add jinja2 to CI workflows Use `grep` instead of `sed` chore: add python jinja2 oto msys setup script Removed more static definitions and use dynamic ones instead Fixes X9E Fix x7 nav too 212 switch display Fix default sliders Removed NUM_STICKS 212 switch display working nicely Surface radio 'stick' replacements fix: switch, trim & rotary pin init Remove old key drivers Removed VKEYS Removed ETX_FOURCC Fixed SURFACE_NAME Removed TR_VSWITCHES & TR_TRIMS_SWITCHES Fix xpot switches Store calibrated analogs in physical order Use getSourceString in drawSource Implement missing YAML read/write Fix isSourceAvailableInInputs() Fix isSourceAvailable() Some surface fixes Fix CLI debug Ported colour UI of analog diagnostics to new ADC API Small fixes Better input mapping Minor tpro fixes Fix trims available Remove TX mode choice on surface radio Rename surface controls Channel order alignement Fix throttle warning Fix checkTrims() Fix pot config casting issue Fix IS_SWITCH_FS() Fixed input mapping Fix fswitch auto-switch Fixed storing / reading function switches in YAML Fix enableVBatBridge() / disableVBatBridge() Fix interesting mode conversion Fix sources issues Fix special funnction list Proper function switch handling 128 GUI improvements Fix compilation Boxer cosmetics 128 hardware screen cosmetic Fix TX12 switches More switches fixes Simplify CPU type handling Fix flash size Fixed page-up / page-down in libopenui
This commit is contained in:
committed by
Malte Langermann
parent
b6dd3a0ef8
commit
2b100e0eb5
@@ -22,176 +22,20 @@
|
||||
#ifndef _SIMPGMSPACE_H_
|
||||
#define _SIMPGMSPACE_H_
|
||||
|
||||
#ifndef __GNUC__
|
||||
#include <windows.h>
|
||||
#include <intrin.h>
|
||||
#define sleep(x) Sleep(x)
|
||||
#define strcasecmp _stricmp
|
||||
#define strncasecmp _tcsnicmp
|
||||
#define chdir _chdir
|
||||
#define getcwd _getcwd
|
||||
inline int __builtin_clz(unsigned x)
|
||||
{
|
||||
return (int)__lzcnt(x);
|
||||
}
|
||||
#else
|
||||
#include <unistd.h>
|
||||
#define sleep(x) usleep(1000*x)
|
||||
#endif
|
||||
|
||||
#ifdef SIMU_EXCEPTIONS
|
||||
extern char * main_thread_error;
|
||||
#include <stdlib.h>
|
||||
#include <stdio.h>
|
||||
#include <signal.h>
|
||||
#if defined(_MSC_VER) || !defined(__GNUC__)
|
||||
#define write_backtrace(output)
|
||||
#else
|
||||
#include <execinfo.h>
|
||||
inline void write_backtrace(char *output)
|
||||
{
|
||||
void *buf[16];
|
||||
char **s;
|
||||
int n = backtrace(buf, 16);
|
||||
s = backtrace_symbols(buf, n);
|
||||
if (s) {
|
||||
for (int i=0; i<n; ++i) {
|
||||
sprintf(output+strlen(output), "%02i: %s\n", i, s[i]);
|
||||
}
|
||||
}
|
||||
}
|
||||
#endif
|
||||
void sig(int sgn)
|
||||
{
|
||||
main_thread_error = (char *)malloc(2048);
|
||||
sprintf(main_thread_error,"Signal %d caught\n", sgn);
|
||||
write_backtrace(main_thread_error);
|
||||
throw std::exception();
|
||||
}
|
||||
#define assert(x) do { if (!(x)) { main_thread_error = (char *)malloc(2048); sprintf(main_thread_error, "Assert failed, %s:%d: %s\n", __FILE__, __LINE__, #x); write_backtrace(main_thread_error); throw std::exception(); } } while(0)
|
||||
#else
|
||||
#include <assert.h>
|
||||
#endif
|
||||
|
||||
#include <inttypes.h>
|
||||
#include <stdio.h>
|
||||
#include <stddef.h>
|
||||
#include <errno.h>
|
||||
|
||||
#undef min
|
||||
#undef max
|
||||
|
||||
#define __REV
|
||||
|
||||
extern GPIO_TypeDef gpioa, gpiob, gpioc, gpiod, gpioe, gpiof, gpiog, gpioh, gpioi, gpioj;
|
||||
extern TIM_TypeDef tim1, tim2, tim3, tim4, tim5, tim6, tim7, tim8, tim9, tim10;
|
||||
extern USART_TypeDef Usart0, Usart1, Usart2, Usart3, Usart4;
|
||||
extern RCC_TypeDef rcc;
|
||||
extern DMA_Stream_TypeDef dma1_stream0, dma1_stream1, dma1_stream2, dma1_stream3, dma1_stream4, dma1_stream5, dma1_stream6, dma1_stream7, dma2_stream1, dma2_stream2, dma2_stream5, dma2_stream6, dma2_stream7;
|
||||
extern DMA_TypeDef dma2;
|
||||
extern SysTick_Type systick;
|
||||
extern ADC_Common_TypeDef adc;
|
||||
extern RTC_TypeDef rtc;
|
||||
#undef SysTick
|
||||
#define SysTick (&systick)
|
||||
#undef GPIOA
|
||||
#undef GPIOB
|
||||
#undef GPIOC
|
||||
#undef GPIOD
|
||||
#undef GPIOE
|
||||
#undef GPIOF
|
||||
#undef GPIOG
|
||||
#undef GPIOH
|
||||
#undef GPIOI
|
||||
#undef GPIOJ
|
||||
#define GPIOA (&gpioa)
|
||||
#define GPIOB (&gpiob)
|
||||
#define GPIOC (&gpioc)
|
||||
#define GPIOD (&gpiod)
|
||||
#define GPIOE (&gpioe)
|
||||
#define GPIOF (&gpiof)
|
||||
#define GPIOG (&gpiog)
|
||||
#define GPIOH (&gpioh)
|
||||
#define GPIOI (&gpioi)
|
||||
#define GPIOJ (&gpioj)
|
||||
#undef TIM1
|
||||
#undef TIM2
|
||||
#undef TIM3
|
||||
#undef TIM4
|
||||
#undef TIM5
|
||||
#undef TIM6
|
||||
#undef TIM7
|
||||
#undef TIM8
|
||||
#undef TIM9
|
||||
#undef TIM10
|
||||
#define TIM1 (&tim1)
|
||||
#define TIM2 (&tim2)
|
||||
#define TIM3 (&tim3)
|
||||
#define TIM4 (&tim4)
|
||||
#define TIM5 (&tim4)
|
||||
#define TIM6 (&tim4)
|
||||
#define TIM7 (&tim4)
|
||||
#define TIM8 (&tim8)
|
||||
#define TIM9 (&tim9)
|
||||
#define TIM10 (&tim10)
|
||||
#undef USART0
|
||||
#undef USART1
|
||||
#undef USART2
|
||||
#undef USART3
|
||||
#define USART0 (&Usart0)
|
||||
#define USART1 (&Usart1)
|
||||
#define USART2 (&Usart2)
|
||||
#define USART3 (&Usart3)
|
||||
#undef RCC
|
||||
#define RCC (&rcc)
|
||||
#undef DMA1_Stream0
|
||||
#undef DMA1_Stream1
|
||||
#undef DMA1_Stream2
|
||||
#undef DMA1_Stream3
|
||||
#undef DMA1_Stream4
|
||||
#undef DMA1_Stream5
|
||||
#undef DMA1_Stream7
|
||||
#undef DMA2_Stream1
|
||||
#undef DMA2_Stream2
|
||||
#undef DMA2_Stream5
|
||||
#undef DMA2_Stream6
|
||||
#undef DMA2_Stream7
|
||||
#define DMA1_Stream0 (&dma1_stream0)
|
||||
#define DMA1_Stream1 (&dma1_stream1)
|
||||
#define DMA1_Stream2 (&dma1_stream2)
|
||||
#define DMA1_Stream3 (&dma1_stream3)
|
||||
#define DMA1_Stream4 (&dma1_stream4)
|
||||
#define DMA1_Stream5 (&dma1_stream5)
|
||||
#define DMA1_Stream7 (&dma1_stream7)
|
||||
#define DMA2_Stream1 (&dma2_stream1)
|
||||
#define DMA2_Stream2 (&dma2_stream2)
|
||||
#define DMA2_Stream5 (&dma2_stream5)
|
||||
#define DMA2_Stream6 (&dma2_stream6)
|
||||
#define DMA2_Stream7 (&dma2_stream7)
|
||||
#undef DMA2
|
||||
#define DMA2 (&dma2)
|
||||
#undef ADC
|
||||
#define ADC (&adc)
|
||||
#undef RTC
|
||||
#define RTC (&rtc)
|
||||
// #undef min
|
||||
// #undef max
|
||||
|
||||
extern uint8_t * eeprom;
|
||||
extern void startPdcUsartReceive() ;
|
||||
extern uint32_t txPdcUsart( uint8_t *buffer, uint32_t size );
|
||||
extern uint32_t txPdcPending();
|
||||
extern void rxPdcUsart( void (*pChProcess)(uint8_t x) );
|
||||
|
||||
#define ISR(x, ...) void x()
|
||||
|
||||
#if !defined(_MSC_VER) && defined(__GNUC__)
|
||||
#define asm(...)
|
||||
#endif
|
||||
|
||||
extern uint32_t Master_frequency;
|
||||
#define NVIC_EnableIRQ(x)
|
||||
#define NVIC_DisableIRQ(x)
|
||||
#define NVIC_SetPriority(...)
|
||||
#define NVIC_SystemReset() exit(0)
|
||||
#define __disable_irq()
|
||||
#define __enable_irq()
|
||||
|
||||
@@ -200,7 +44,6 @@ extern char * main_thread_error;
|
||||
|
||||
#define OPENTX_START_DEFAULT_ARGS simu_start_mode
|
||||
|
||||
inline void getADC() { }
|
||||
|
||||
uint64_t simuTimerMicros(void);
|
||||
uint8_t simuSleep(uint32_t ms); // returns true if thread shutdown requested
|
||||
@@ -228,21 +71,6 @@ void stopEepromThread();
|
||||
|
||||
void simuMain();
|
||||
|
||||
#define UART_Stop(...)
|
||||
#define UART3_Stop(...)
|
||||
#define USART_GetITStatus(...) 0
|
||||
#define USART_ClearFlag(...)
|
||||
|
||||
#define TIM_DeInit(...)
|
||||
#define TIM_SetCompare2(...)
|
||||
#define TIM_ClearFlag(...)
|
||||
#define TIM_Cmd(...)
|
||||
#define TIM_ITConfig(...)
|
||||
#define GPIO_SetBits(GPIOx, pin) GPIOx->BSRRL |= pin
|
||||
#define GPIO_ResetBits(GPIOx, pin) GPIOx->BSRRL &= ~pin
|
||||
#define GPIO_ReadInputDataBit(GPIOx, pin) (GPIOx->BSRRL & pin)
|
||||
#define RCC_AHB1PeriphClockCmd(...)
|
||||
#define RCC_APB2PeriphClockCmd(...)
|
||||
|
||||
// inline void delay_01us(uint32_t dummy) { }
|
||||
|
||||
|
||||
Reference in New Issue
Block a user