rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-12-01 09:24:10 +01:00
Code Issues Releases Activity

Merge remote-tracking branch 'origin/skarlsso/OP-922_fix_fw_DEBUG_compile_errors' into next

Browse Source
This commit is contained in:
Alessio Morale 2014-08-26 01:05:32 +02:00
commit 10f5d7c531
11 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
flight/libraries/inc/CoordinateConversions.h
View File

@ -97,7 +97,7 @@ void rot_mult(float R[3][3], const float vec[3], float vec_out[3]);
* @param b
* @param result
*/
inline void matrix_mult_3x3f(float a[3][3], float b[3][3], float result[3][3])
static inline void matrix_mult_3x3f(float a[3][3], float b[3][3], float result[3][3])
{
result[0][0] = a[0][0] * b[0][0] + a[1][0] * b[0][1] + a[2][0] * b[0][2];
result[0][1] = a[0][1] * b[0][0] + a[1][1] * b[0][1] + a[2][1] * b[0][2];

2
flight/libraries/rscode/ecc.h
View File

@ -66,7 +66,7 @@ extern int pBytes[MAXDEG];
extern int synBytes[MAXDEG];
/* print debugging info */
extern int DEBUG;
//extern int DEBUG;
/* Reed Solomon encode/decode routines */
void initialize_ecc (void);

2
flight/libraries/rscode/rs.c
View File

@ -38,7 +38,7 @@ int synBytes[MAXDEG];
/* generator polynomial */
int genPoly[MAXDEG*2];
int DEBUG = FALSE;
//int DEBUG = FALSE;
static void
compute_genpoly (int nbytes, int genpoly[]);

2
flight/pios/inc/pios_debug.h
View File

@ -58,7 +58,7 @@ void PIOS_DEBUG_PinHigh(uint8_t pin);
void PIOS_DEBUG_PinLow(uint8_t pin);
void PIOS_DEBUG_PinValue8Bit(uint8_t value);
void PIOS_DEBUG_PinValue4BitL(uint8_t value);
void PIOS_DEBUG_Panic(const char *msg);
void PIOS_DEBUG_Panic(const char *msg) __attribute__((noreturn));
#ifdef DEBUG
#define PIOS_DEBUG_Assert(test) if (!(test)) { PIOS_DEBUG_Panic(PIOS_DEBUG_AssertMsg); }

2
flight/pios/osx/inc/pios_debug.h
View File

@ -38,7 +38,7 @@ void PIOS_DEBUG_PinHigh(uint8_t pin);
void PIOS_DEBUG_PinLow(uint8_t pin);
void PIOS_DEBUG_PinValue8Bit(uint8_t value);
void PIOS_DEBUG_PinValue4BitL(uint8_t value);
void PIOS_DEBUG_Panic(const char *msg);
void PIOS_DEBUG_Panic(const char *msg) __attribute__((noreturn));
#ifdef DEBUG
#define PIOS_DEBUG_Assert(test) if (!(test)) { PIOS_DEBUG_Panic(PIOS_DEBUG_AssertMsg); }

5
flight/pios/osx/osx/pios_debug.c
View File

@ -82,6 +82,11 @@ void PIOS_DEBUG_Panic(const char *msg)
int b = 0;
int a = (2 / b);
b = a;
// Stay put
while (1) {
;
}
}
/**

5
flight/pios/posix/pios_debug.c
View File

@ -81,6 +81,11 @@ void PIOS_DEBUG_Panic(const char *msg)
int b = 0;
int a = (2 / b);
b = a;
// Stay put
while (1) {
;
}
}
/**

2
flight/pios/stm32f10x/pios_ppm_out.c
View File

@ -107,7 +107,7 @@ static const struct pios_tim_callbacks tim_out_callbacks = {
int32_t PIOS_PPM_Out_Init(uint32_t *ppm_out_id, const struct pios_ppm_out_cfg *cfg)
{
PIOS_DEBUG_Assert(ppm_id);
PIOS_DEBUG_Assert(ppm_out_id);
PIOS_DEBUG_Assert(cfg);
// Allocate the device structure

2
flight/pios/stm32f4xx/pios_tim.c
View File

@ -171,7 +171,7 @@ int32_t PIOS_TIM_InitChannels(uint32_t *tim_id, const struct pios_tim_channel *c
*/ // commented out for now as f4 starts all clocks
GPIO_Init(chan->pin.gpio, &chan->pin.init);
PIOS_DEBUG_Assert(chan->remaP);
PIOS_DEBUG_Assert(chan->remap);
// Second parameter should technically be PinSource but they are numerically the same
GPIO_PinAFConfig(chan->pin.gpio, chan->pin.pin_source, chan->remap);

1
flight/targets/boards/oplinkmini/firmware/pios_board.c
View File

@ -78,6 +78,7 @@ uint8_t *pios_uart_rx_buffer;
uint8_t *pios_uart_tx_buffer;
uintptr_t pios_uavo_settings_fs_id;
uintptr_t pios_user_fs_id = 0;
uint8_t servo_count = 0;

2
flight/targets/boards/osd/firmware/Makefile
View File

@ -76,6 +76,8 @@ ifndef TESTAPP
SRC += $(OPUAVSYNTHDIR)/gcstelemetrystats.c
SRC += $(OPUAVSYNTHDIR)/flighttelemetrystats.c
SRC += $(OPUAVSYNTHDIR)/flightstatus.c
SRC += $(OPUAVSYNTHDIR)/flightmodesettings.c
SRC += $(OPUAVSYNTHDIR)/manualcontrolsettings.c
SRC += $(OPUAVSYNTHDIR)/systemstats.c
SRC += $(OPUAVSYNTHDIR)/systemalarms.c
SRC += $(OPUAVSYNTHDIR)/systemsettings.c