Mirror/opentx
1
0
Fork 0
mirror of https://github.com/opentx/opentx.git synced 2025-07-25 17:25:13 +03:00
Code Issues Wiki Activity

Visual C++ Compilation

Browse source
This commit is contained in:
Bertrand Songis 2014-03-29 11:47:58 +01:00
parent 71fb790248
commit 42727e6e19
3 changed files with 25 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

3
companion/src/CMakeLists.txt
View file

@ -90,12 +90,15 @@ add_custom_command(
WORKING_DIRECTORY ${RADIO_SRC_DIRECTORY} WORKING_DIRECTORY ${RADIO_SRC_DIRECTORY}
) )
if(WIN32)
else()
add_custom_command( add_custom_command(
OUTPUT ${RADIO_SRC_DIRECTORY}/stamp-opentx.h OUTPUT ${RADIO_SRC_DIRECTORY}/stamp-opentx.h
COMMAND make stamp_header COMMAND make stamp_header
DEPENDS ${RADIO_SRC_DIRECTORY}/Makefile DEPENDS ${RADIO_SRC_DIRECTORY}/Makefile
WORKING_DIRECTORY ${RADIO_SRC_DIRECTORY} WORKING_DIRECTORY ${RADIO_SRC_DIRECTORY}
) )
endif()
include_directories( include_directories(
${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}

15
radio/src/eeprom_conversions.cpp
View file

@ -36,6 +36,7 @@
#include "opentx.h" #include "opentx.h"
#if defined(PCBTARANIS)
PACK(typedef struct { PACK(typedef struct {
uint8_t mode; // 0=end, 1=pos, 2=neg, 3=both uint8_t mode; // 0=end, 1=pos, 2=neg, 3=both
uint8_t chn; uint8_t chn;
@ -44,11 +45,21 @@ PACK(typedef struct {
int8_t weight; int8_t weight;
uint8_t curveMode; uint8_t curveMode;
char name[LEN_EXPOMIX_NAME]; char name[LEN_EXPOMIX_NAME];
#if defined(PCBTARANIS)
uint8_t spare[2]; uint8_t spare[2];
#endif
int8_t curveParam; int8_t curveParam;
}) ExpoData_v215; }) ExpoData_v215;
#else
PACK(typedef struct {
uint8_t mode; // 0=end, 1=pos, 2=neg, 3=both
uint8_t chn;
int8_t swtch;
uint16_t phases;
int8_t weight;
uint8_t curveMode;
char name[LEN_EXPOMIX_NAME];
int8_t curveParam;
}) ExpoData_v215;
#endif
#if defined(PCBTARANIS) #if defined(PCBTARANIS)
#define LIMITDATA_V215_EXTRA char name[LEN_CHANNEL_NAME]; #define LIMITDATA_V215_EXTRA char name[LEN_CHANNEL_NAME];

18
radio/src/simpgmspace.cpp
View file

@ -101,37 +101,37 @@ sem_t *eeprom_write_sem;
#if defined(PCBTARANIS) #if defined(PCBTARANIS)
#define SWITCH_CASE(swtch, pin, mask) \ #define SWITCH_CASE(swtch, pin, mask) \
case swtch: \ case swtch: \
if (state > 0) pin &= ~(mask); else pin |= (mask); \ if ((int)state > 0) pin &= ~(mask); else pin |= (mask); \
break; break;
#else #else
#define SWITCH_CASE(swtch, pin, mask) \ #define SWITCH_CASE(swtch, pin, mask) \
case swtch: \ case swtch: \
if (state > 0) pin |= (mask); else pin &= ~(mask); \ if ((int)state > 0) pin |= (mask); else pin &= ~(mask); \
break; break;
#endif #endif
#define SWITCH_3_CASE(swtch, pin1, pin2, mask1, mask2) \ #define SWITCH_3_CASE(swtch, pin1, pin2, mask1, mask2) \
case swtch: \ case swtch: \
if (state < 0) pin1 &= ~(mask1); else pin1 |= (mask1); \ if ((int)state < 0) pin1 &= ~(mask1); else pin1 |= (mask1); \
if (state > 0) pin2 &= ~(mask2); else pin2 |= (mask2); \ if ((int)state > 0) pin2 &= ~(mask2); else pin2 |= (mask2); \
break; break;
#define KEY_CASE(key, pin, mask) \ #define KEY_CASE(key, pin, mask) \
case key: \ case key: \
if (state > 0) pin &= ~mask; else pin |= mask;\ if ((int)state > 0) pin &= ~mask; else pin |= mask;\
break; break;
#define TRIM_CASE KEY_CASE #define TRIM_CASE KEY_CASE
#else #else
#define SWITCH_CASE(swtch, pin, mask) \ #define SWITCH_CASE(swtch, pin, mask) \
case swtch: \ case swtch: \
if (state > 0) pin &= ~(mask); else pin |= (mask); \ if ((int)state > 0) pin &= ~(mask); else pin |= (mask); \
break; break;
#define SWITCH_3_CASE(swtch, pin1, pin2, mask1, mask2) \ #define SWITCH_3_CASE(swtch, pin1, pin2, mask1, mask2) \
case swtch: \ case swtch: \
if (state >= 0) pin1 &= ~(mask1); else pin1 |= (mask1); \ if ((int)state >= 0) pin1 &= ~(mask1); else pin1 |= (mask1); \
if (state <= 0) pin2 &= ~(mask2); else pin2 |= (mask2); \ if ((int)state <= 0) pin2 &= ~(mask2); else pin2 |= (mask2); \
break; break;
#define KEY_CASE(key, pin, mask) \ #define KEY_CASE(key, pin, mask) \
case key: \ case key: \
if (state > 0) pin |= (mask); else pin &= ~(mask);\ if ((int)state > 0) pin |= (mask); else pin &= ~(mask);\
break; break;
#define TRIM_CASE KEY_CASE #define TRIM_CASE KEY_CASE
#endif #endif