Fixes datacopy target (#7619)

- removed GCC includes from parameters (causes duplicated typedef btw. GCC & clang otherwise).
- make "frskyInstance" NOBACKUP (only 1 member can be backed up per union).
This commit is contained in:
Raphael Coeffic
2020-05-22 19:36:45 +02:00
committed by GitHub
parent 273b0ae81d
commit a778aea8fb
2 changed files with 4 additions and 4 deletions
+3 -3
View File
@@ -329,10 +329,10 @@ PACK(struct TelemetrySensor {
NOBACKUP(uint16_t persistentValue);
};
union {
PACK(struct {
NOBACKUP(PACK(struct {
uint8_t physID:5;
uint8_t rxIndex:3; // 1 bit for module index, 2 bits for receiver index
}) frskyInstance;
}) frskyInstance);
uint8_t instance;
NOBACKUP(uint8_t formula);
};
@@ -941,4 +941,4 @@ static inline void check_struct()
#undef CHKSIZE
}
#endif /* BACKUP */
#endif /* BACKUP */
+1 -1
View File
@@ -310,7 +310,7 @@ if(PYTHONINTERP_FOUND)
add_custom_command(
OUTPUT ${PROJECT_BINARY_DIR}/radio/src/datacopy.cpp
WORKING_DIRECTORY ${RADIO_DIRECTORY}/src
COMMAND ${PYTHON_EXECUTABLE} ${RADIO_DIRECTORY}/util/generate_datacopy.py datastructs.h -DPCBHORUS -DPCBX10 -DCPUARM -DSTM32F4 -DSTM32F429_439xx -DCOLORLCD -DBACKUP -DSIMU -I. -Itargets/horus -Itargets/common/arm/stm32 -I${THIRDPARTY_DIR} -I${THIRDPARTY_DIR}/STM32F4xx_DSP_StdPeriph_Lib_V1.4.0/Libraries/CMSIS/Device/ST/STM32F4xx/Include ${arm_gcc_include_path} > ${PROJECT_BINARY_DIR}/radio/src/datacopy.cpp
COMMAND ${PYTHON_EXECUTABLE} ${RADIO_DIRECTORY}/util/generate_datacopy.py datastructs.h -DPCBHORUS -DPCBX10 -DCPUARM -DSTM32F4 -DSTM32F429_439xx -DCOLORLCD -DBACKUP -DSIMU -I. -Itargets/horus -Itargets/common/arm/stm32 -I${THIRDPARTY_DIR} -I${THIRDPARTY_DIR}/STM32F4xx_DSP_StdPeriph_Lib_V1.4.0/Libraries/CMSIS/Device/ST/STM32F4xx/Include > ${PROJECT_BINARY_DIR}/radio/src/datacopy.cpp
DEPENDS ${RADIO_DIRECTORY}/src/datastructs.h ${RADIO_DIRECTORY}/util/generate_datacopy.py
)
add_custom_target(datacopy