New Makefile option to display the limits in us
This commit is contained in:
+9
-1
@@ -63,7 +63,11 @@ HAPTIC = NO
|
||||
# SPLASH on START
|
||||
SPLASH = YES
|
||||
|
||||
# Decimals display in the main view (PPM calibration,
|
||||
# Limits display in the LIMITS
|
||||
# Values = PERCENT, US
|
||||
LIMITS = PERCENT
|
||||
|
||||
# Decimals display in the main view / PPM calibration,
|
||||
# Values = YES, NO
|
||||
DECIMALS = YES
|
||||
|
||||
@@ -346,6 +350,10 @@ endif
|
||||
|
||||
### Global Build-Option Directives ###
|
||||
|
||||
ifeq ($(LIMITS), US)
|
||||
CPPDEFS += -DLIMITS_US
|
||||
endif
|
||||
|
||||
ifeq ($(DECIMALS), YES)
|
||||
CPPDEFS += -DDECIMALS_DISPLAYED
|
||||
endif
|
||||
|
||||
+2220
-2207
File diff suppressed because it is too large
Load Diff
@@ -85,6 +85,8 @@ extern void board_init();
|
||||
|
||||
#include "myeeprom.h"
|
||||
|
||||
#define PPM_CENTER 1500
|
||||
|
||||
#if defined(PCBARM)
|
||||
#include "eeprom_arm.h"
|
||||
#include "pulses_arm.h"
|
||||
|
||||
@@ -193,8 +193,6 @@ ISR(TIMER1_COMPA_vect) //2MHz pulse generation
|
||||
|
||||
#endif
|
||||
|
||||
#define PPM_CENTER 1500
|
||||
|
||||
FORCEINLINE void setupPulsesPPM()
|
||||
{
|
||||
int16_t PPM_range = g_model.extendedLimits ? 640*2 : 512*2; //range of 0.7..1.7msec
|
||||
|
||||
@@ -281,6 +281,7 @@
|
||||
#define TR_THRTHP "THR\015TH%"
|
||||
#define TR_TOT "TOT"
|
||||
#define TR_TMR1LATMAXUS "Tmr1Lat max\003us"
|
||||
#define STR_US (STR_TMR1LATMAXUS+12)
|
||||
#define TR_TMR1LATMINUS "Tmr1Lat min\003us"
|
||||
#define TR_TMR1JITTERUS "Tmr1 Jitter\003us"
|
||||
#define TR_TMAINMAXMS "Tmain max\005ms"
|
||||
|
||||
@@ -282,6 +282,7 @@
|
||||
#define TR_THRTHP "THR\015TH%"
|
||||
#define TR_TOT "TOT"
|
||||
#define TR_TMR1LATMAXUS "Tmr1Lat max\003us"
|
||||
#define STR_US (STR_TMR1LATMAXUS+12)
|
||||
#define TR_TMR1LATMINUS "Tmr1Lat min\003us"
|
||||
#define TR_TMR1JITTERUS "Tmr1 Jitter\003us"
|
||||
#define TR_TMAINMAXMS "Tmain max\005ms"
|
||||
|
||||
@@ -281,6 +281,7 @@
|
||||
#define TR_THRTHP "THR\015TH%"
|
||||
#define TR_TOT "TOT"
|
||||
#define TR_TMR1LATMAXUS "Tmr1Lat max\003us"
|
||||
#define STR_US (STR_TMR1LATMAXUS+12)
|
||||
#define TR_TMR1LATMINUS "Tmr1Lat min\003us"
|
||||
#define TR_TMR1JITTERUS "Tmr1 Jitter\003us"
|
||||
#define TR_TMAINMAXMS "Tmain max\005ms"
|
||||
|
||||
Reference in New Issue
Block a user