From e8a22fa60e9ff86d6e8812d703c8f7109cdbfdc5 Mon Sep 17 00:00:00 2001 From: jflyper Date: Mon, 31 Oct 2016 03:31:39 +0900 Subject: [PATCH] Added FC identifier... (Argggh) --- src/main/io/cms.c | 5 ++++- src/main/target/OMNIBUSF4/target.h | 3 +++ src/main/target/OMNIBUSF4/target.mk | 4 +++- src/main/target/REVO/target.h | 3 +++ src/main/target/REVO/target.mk | 4 +++- 5 files changed, 16 insertions(+), 3 deletions(-) diff --git a/src/main/io/cms.c b/src/main/io/cms.c index 6b076b14e2..539f4c9939 100644 --- a/src/main/io/cms.c +++ b/src/main/io/cms.c @@ -102,7 +102,7 @@ cmsDeviceInitFuncPtr cmsDeviceSelectNext(void) #define CMS_UPDATE_INTERVAL 50 // msec // XXX Why is this here? Something wrong? -// XXX We need something like Drawing Context that holds all state variables? +// XXX Something like Drawing Context that holds all state variables would be the way... int8_t lastCursorPos; void cmsScreenClear(displayPort_t *instance) @@ -1214,8 +1214,11 @@ OSD_Entry menuOsdLayout[] = static char infoGitRev[GIT_SHORT_REVISION_LENGTH]; static char infoTargetName[] = __TARGET__; +#include "msp/msp_protocol.h" // XXX for FC identification... not available elsewhere + OSD_Entry menuInfo[] = { { "--- INFO ---", OME_Label, NULL, NULL, 0 }, + { BETAFLIGHT_IDENTIFIER, OME_Label, NULL, NULL, 0 }, { FC_VERSION_STRING, OME_Label, NULL, NULL, 0 }, { infoGitRev, OME_Label, NULL, NULL, 0 }, { infoTargetName, OME_Label, NULL, NULL, 0 }, diff --git a/src/main/target/OMNIBUSF4/target.h b/src/main/target/OMNIBUSF4/target.h index d7137502d8..a1dd90dfaf 100644 --- a/src/main/target/OMNIBUSF4/target.h +++ b/src/main/target/OMNIBUSF4/target.h @@ -70,6 +70,9 @@ //#define MAX7456_DMA_CHANNEL_RX DMA1_Stream0 //#define MAX7456_DMA_IRQ_HANDLER_ID DMA1_ST0_HANDLER +#define CMS +#define CANVAS + //#define PITOT //#define USE_PITOT_MS4525 //#define MS4525_BUS I2C_DEVICE_EXT diff --git a/src/main/target/OMNIBUSF4/target.mk b/src/main/target/OMNIBUSF4/target.mk index 18034c1332..c7cf0ad933 100644 --- a/src/main/target/OMNIBUSF4/target.mk +++ b/src/main/target/OMNIBUSF4/target.mk @@ -6,5 +6,7 @@ TARGET_SRC = \ drivers/barometer_ms5611.c \ drivers/compass_hmc5883l.c \ drivers/max7456.c \ - io/osd.c + io/osd.c \ + io/cms.c \ + io/canvas.c diff --git a/src/main/target/REVO/target.h b/src/main/target/REVO/target.h index 4d73c99355..eed70b40de 100644 --- a/src/main/target/REVO/target.h +++ b/src/main/target/REVO/target.h @@ -144,3 +144,6 @@ #define USABLE_TIMER_CHANNEL_COUNT 12 #define USED_TIMERS ( TIM_N(2) | TIM_N(3) | TIM_N(5) | TIM_N(12) | TIM_N(8) | TIM_N(9) ) + +#define CMS +#define CANVAS diff --git a/src/main/target/REVO/target.mk b/src/main/target/REVO/target.mk index 2711b19dac..6f70ecbe7e 100644 --- a/src/main/target/REVO/target.mk +++ b/src/main/target/REVO/target.mk @@ -4,4 +4,6 @@ FEATURES += VCP ONBOARDFLASH TARGET_SRC = \ drivers/accgyro_spi_mpu6000.c \ drivers/barometer_ms5611.c \ - drivers/compass_hmc5883l.c + drivers/compass_hmc5883l.c \ + io/cms.c \ + io/canvas.c