Ported from master to next:

#1489: TRACE() output intercepted and shown in Companion (shortcut F6)
#1270: simple Trainer Simulator (shortcut F5)
#1466: telemetry simulator (shorcut F5)
This commit is contained in:
Damjan Adamic
2015-01-04 20:07:39 +01:00
parent a2dc0040b0
commit bb921a0a7f
39 changed files with 865 additions and 96 deletions
+7 -8
View File
@@ -389,6 +389,7 @@ ifeq ($(PCB), $(filter $(PCB), STD 9X 9XR))
EEPROMSRC = eeprom_common.cpp eeprom_rlc.cpp
LCDSRC = lcd_common.cpp lcd_default.cpp
PULSESSRC = pulses/pulses_avr.cpp
CPPSRC += debug.cpp
ifeq ($(PCB), 9XR)
FLAVOUR = 9xr
@@ -456,6 +457,7 @@ ifeq ($(PCB), $(filter $(PCB), STD128 9X128 9XR128))
EEPROMSRC = eeprom_common.cpp eeprom_rlc.cpp
LCDSRC = lcd_common.cpp lcd_default.cpp
PULSESSRC = pulses/pulses_avr.cpp
CPPSRC += debug.cpp
ifeq ($(PCB), 9XR128)
FLAVOUR = 9xr128
@@ -519,6 +521,7 @@ ifeq ($(PCB), $(filter $(PCB), 9X2561))
EEPROMSRC = eeprom_common.cpp eeprom_rlc.cpp
LCDSRC = lcd_common.cpp lcd_default.cpp
PULSESSRC = pulses/pulses_avr.cpp
CPPSRC += debug.cpp
ifeq ($(PCB), 9XR2561)
FLAVOUR = 9xr2561
@@ -584,7 +587,7 @@ ifeq ($(PCB), GRUVIN9X)
EEPROMSRC = eeprom_common.cpp eeprom_rlc.cpp
LCDSRC = lcd_common.cpp lcd_default.cpp
PULSESSRC = pulses/pulses_avr.cpp
CPPSRC += audio_avr.cpp haptic.cpp
CPPSRC += audio_avr.cpp haptic.cpp debug.cpp
ifeq ($(SDCARD), YES)
CPPDEFS += -DRTCLOCK
@@ -626,7 +629,7 @@ ifeq ($(PCB), MEGA2560)
EEPROMSRC = eeprom_common.cpp eeprom_rlc.cpp
LCDSRC = lcd_common.cpp lcd_default.cpp
PULSESSRC = pulses/pulses_avr.cpp
CPPSRC += audio_avr.cpp
CPPSRC += audio_avr.cpp debug.cpp
ifeq ($(PCBREV), ST7565P)
EXTRABOARDSRC = targets/stock/lcd_driver.cpp targets/common_avr/telemetry_driver.cpp
@@ -711,7 +714,7 @@ ifeq ($(PCB), $(filter $(PCB), SKY9X 9XRPRO))
PULSESSRC = pulses/pulses_arm.cpp pulses/ppm_arm.cpp pulses/pxx_arm.cpp pulses/dsm2_arm.cpp
CPPSRC += tasks_arm.cpp audio_arm.cpp haptic.cpp gui/view_about.cpp gui/view_text.cpp telemetry/telemetry.cpp
CPPSRC += targets/sky9x/telemetry_driver.cpp targets/sky9x/second_serial_driver.cpp targets/sky9x/pwr_driver.cpp targets/sky9x/adc_driver.cpp targets/sky9x/eeprom_driver.cpp targets/sky9x/pulses_driver.cpp targets/sky9x/keys_driver.cpp targets/sky9x/audio_driver.cpp targets/sky9x/buzzer_driver.cpp targets/sky9x/haptic_driver.cpp targets/sky9x/sdcard_driver.cpp targets/sky9x/massstorage.cpp
CPPSRC += loadboot.cpp
CPPSRC += loadboot.cpp debug.cpp
ifeq ($(SDCARD), YES)
CPPDEFS += -DVOICE
INCDIRS += FatFs FatFs/option
@@ -731,7 +734,6 @@ ifeq ($(PCB), $(filter $(PCB), SKY9X 9XRPRO))
CPPSRC += targets/sky9x/bluetooth.cpp
endif
ifeq ($(DEBUG), YES)
CPPSRC += debug.cpp
SRC += targets/sky9x/syscalls.c
endif
endif
@@ -814,7 +816,7 @@ ifeq ($(PCB), TARANIS)
PULSESSRC = pulses/pulses_arm.cpp pulses/ppm_arm.cpp pulses/pxx_arm.cpp
CPPSRC += tasks_arm.cpp audio_arm.cpp sbus.cpp telemetry/telemetry.cpp
CPPSRC += targets/taranis/pulses_driver.cpp targets/taranis/keys_driver.cpp targets/taranis/adc_driver.cpp targets/taranis/trainer_driver.cpp targets/taranis/audio_driver.cpp targets/taranis/uart3_driver.cpp targets/taranis/telemetry_driver.cpp
CPPSRC += bmp.cpp gui/view_channels.cpp gui/view_about.cpp gui/view_text.cpp loadboot.cpp
CPPSRC += bmp.cpp gui/view_channels.cpp gui/view_about.cpp gui/view_text.cpp loadboot.cpp debug.cpp
SRC += targets/taranis/STM32F2xx_StdPeriph_Lib_V1.1.0/Libraries/CMSIS/Device/ST/STM32F2xx/Source/Templates/system_stm32f2xx.c
SRC += targets/taranis/STM32F2xx_StdPeriph_Lib_V1.1.0/Libraries/STM32F2xx_StdPeriph_Driver/src/misc.c
SRC += targets/taranis/STM32F2xx_StdPeriph_Lib_V1.1.0/Libraries/STM32F2xx_StdPeriph_Driver/src/stm32f2xx_gpio.c
@@ -879,9 +881,6 @@ ifeq ($(PCB), TARANIS)
CPPDEFS += -DRTCLOCK
CPPSRC += rtc.cpp targets/taranis/rtc_driver.cpp
endif
ifeq ($(DEBUG), YES)
CPPSRC += debug.cpp
endif
ifeq ($(DSM2), PPM)
CPPSRC += pulses/dsm2_arm.cpp
endif
+3 -3
View File
@@ -407,7 +407,7 @@ bool isAudioFileReferenced(uint32_t i, char * filename)
uint8_t event = i & 0xFF;
#if 0
printf("isAudioFileReferenced(%08x)\n", i); fflush(stdout);
TRACE("isAudioFileReferenced(%08x)", i);
#endif
if (category == SYSTEM_AUDIO_CATEGORY) {
@@ -846,7 +846,7 @@ void AudioQueue::playTone(uint16_t freq, uint16_t len, uint16_t pause, uint8_t f
void AudioQueue::playFile(const char *filename, uint8_t flags, uint8_t id)
{
#if defined(SIMU)
printf("playFile(\"%s\", flags=%x, id=%d)\n", filename, flags, id);
TRACE("playFile(\"%s\", flags=%x, id=%d)", filename, flags, id);
if (strlen(filename) > AUDIO_FILENAME_MAXLEN) {
TRACE("file name too long! maximum length is %d characters", AUDIO_FILENAME_MAXLEN);
}
@@ -893,7 +893,7 @@ void AudioQueue::playFile(const char *filename, uint8_t flags, uint8_t id)
void AudioQueue::stopPlay(uint8_t id)
{
#if defined(SIMU)
printf("stopPlay(id=%d)\n", id); fflush(stdout);
TRACE("stopPlay(id=%d)", id);
#endif
// For the moment it's only needed to stop the background music
+56 -35
View File
@@ -34,28 +34,44 @@
*
*/
#include "../opentx.h"
#include "opentx.h"
#include <stdio.h>
#include <stdarg.h>
#if !defined(SIMU) && defined(DEBUG)
#if (defined(DEBUG) && defined(CPUARM)) || defined(SIMU)
Fifo<512> debugRxFifo;
#if defined(SIMU)
traceCallbackFunc traceCallback = 0;
#endif
#if defined(SIMU)
#define PRINTF_BUFFER_SIZE 1024
#else
#define PRINTF_BUFFER_SIZE 256
#endif
// Outputs a string to the UART
void debugPuts(const char *format, ...)
{
va_list arglist;
char tmp[256];
char tmp[PRINTF_BUFFER_SIZE];
va_start(arglist, format);
vsnprintf(tmp, 256, format, arglist);
vsnprintf(tmp, PRINTF_BUFFER_SIZE, format, arglist);
va_end(arglist);
#if defined(SIMU)
fputs(tmp, stdout);
fflush(stdout);
if (traceCallback) {
traceCallback(tmp);
}
#else
const char *t = tmp;
while (*t) {
debugPutc(*t++);
}
#endif
}
void dump(unsigned char *data, unsigned int size)
@@ -73,9 +89,13 @@ void dump(unsigned char *data, unsigned int size)
debugPuts("\n\r");
}
#if !defined(SIMU)
uint32_t Mem_address ;
uint32_t Next_mem_address ;
uint32_t Memaddmode ;
Fifo<512> debugRxFifo;
void crlf()
{
@@ -86,55 +106,55 @@ void crlf()
// Send a single 4 bit value to the RS232 port as a hex digit
void hex_digit_send( unsigned char c )
{
c &= 0x0F ;
if ( c > 9 )
{
c += 7 ;
}
c += '0' ;
debugPutc( c ) ;
c &= 0x0F ;
if ( c > 9 )
{
c += 7 ;
}
c += '0' ;
debugPutc( c ) ;
}
// Send the 8 bit value to the RS232 port as 2 hex digits
void p2hex( unsigned char c )
{
// asm("swap %c") ;
hex_digit_send( c >> 4 ) ;
// asm("swap %c") ;
hex_digit_send( c ) ;
// asm("swap %c") ;
hex_digit_send( c >> 4 ) ;
// asm("swap %c") ;
hex_digit_send( c ) ;
}
// Send the 16 bit value to the RS232 port as 4 hex digits
void p4hex( uint16_t value )
{
p2hex( value >> 8 ) ;
p2hex( value ) ;
p2hex( value >> 8 ) ;
p2hex( value ) ;
}
// Send the 32 bit value to the RS232 port as 8 hex digits
void p8hex( uint32_t value )
{
p4hex( value >> 16 ) ;
p4hex( value ) ;
p4hex( value >> 16 ) ;
p4hex( value ) ;
}
static void dispw_256( register uint32_t address, register uint32_t lines )
{
register uint32_t i ;
register uint32_t j ;
address &= 0xFFFFFFFC ;
for ( i = 0 ; i < lines ; i += 1 )
{
p8hex( address ) ;
for ( j = 0 ; j < 4 ; j += 1 )
{
debugPutc(' ') ;
p8hex( *( (uint32_t *)address ) ) ;
address += 4 ;
}
crlf() ;
}
register uint32_t i ;
register uint32_t j ;
address &= 0xFFFFFFFC ;
for ( i = 0 ; i < lines ; i += 1 )
{
p8hex( address ) ;
for ( j = 0 ; j < 4 ; j += 1 )
{
debugPutc(' ') ;
p8hex( *( (uint32_t *)address ) ) ;
address += 4 ;
}
crlf() ;
}
}
extern Fifo<512> uart3TxFifo;
@@ -221,7 +241,8 @@ void debugTask(void* pdata)
}
}
#endif
#endif // #if !defined(SIMU)
#endif // #if (defined(DEBUG) && defined(CPUARM)) || defined(SIMU)
#if defined(DEBUG_TRACE_BUFFER)
+11 -33
View File
@@ -40,44 +40,17 @@
#include <inttypes.h>
#include "rtc.h"
#if defined(SIMU)
#include <stdio.h>
#define TRACE(...) do { printf(__VA_ARGS__); printf("\n"); fflush(stdout); } while(0)
#define TRACE_DEBUG(...) do { printf("-D- " __VA_ARGS__); fflush(stdout); } while(0)
#define TRACE_DEBUG_WP(...) do { printf(__VA_ARGS__); fflush(stdout); } while(0)
#define TRACE_INFO(...) do { printf("-I- " __VA_ARGS__); fflush(stdout); } while(0)
#define TRACE_INFO_WP(...) do { printf(__VA_ARGS__); fflush(stdout); } while(0)
#define TRACE_WARNING(...) do { printf("-W- " __VA_ARGS__); fflush(stdout); } while(0)
#define TRACE_WARNING_WP(...) do { printf(__VA_ARGS__); fflush(stdout); } while(0)
#define TRACE_ERROR(...) do { printf("-E- " __VA_ARGS__); fflush(stdout); } while(0)
#define FLUSH()
inline void dump(void * data, unsigned int size)
{
unsigned char *uchar_data = (unsigned char *)data;
printf("DUMP %d bytes ...\n\r", size);
unsigned int i = 0, j=0;
while (i*32+j < size) {
printf("%.2X ", uchar_data[i*32+j]);
j++;
if (j==32) {
i++; j=0;
printf("\n\r");
}
}
printf("\n\r");
}
#define DUMP(data, size) dump(data, size)
#elif defined(DEBUG) && defined(CPUARM)
#if (defined(DEBUG) && defined(CPUARM)) || defined(SIMU)
#ifdef __cplusplus
extern "C" {
#endif
#if defined(SIMU)
typedef void (*traceCallbackFunc)(const char * text);
extern traceCallbackFunc traceCallback;
#endif
void debugPuts(const char *string, ...);
void dump(unsigned char *data, unsigned int size);
void debugFlush();
@@ -95,8 +68,13 @@ void debugFlush();
#define TRACE_WARNING(...) debugPuts("-W- " __VA_ARGS__)
#define TRACE_WARNING_WP(...) debugPuts(__VA_ARGS__)
#define TRACE_ERROR(...) debugPuts("-E- " __VA_ARGS__)
#if !defined(SIMU)
#define FLUSH() debugFlush();
void debugTask(void* pdata);
#else
#define FLUSH()
#endif
#else
+3 -5
View File
@@ -293,12 +293,10 @@ inline bool EeFsOpen()
#ifdef SIMU
if (eeFs.version != EEFS_VERS) {
printf("bad eeFs.version (%d instead of %d)\n", eeFs.version, EEFS_VERS);
fflush(stdout);
TRACE("bad eeFs.version (%d instead of %d)", eeFs.version, EEFS_VERS);
}
if (eeFs.mySize != sizeof(eeFs)) {
printf("bad eeFs.mySize (%d instead of %d)\n", (int)eeFs.mySize, (int)sizeof(eeFs));
fflush(stdout);
TRACE("bad eeFs.mySize (%d instead of %d)", (int)eeFs.mySize, (int)sizeof(eeFs));
}
#endif
@@ -605,7 +603,7 @@ const pm_char * eeBackupModel(uint8_t i_fileSrc)
strcpy_P(&buf[len], STR_MODELS_EXT);
#ifdef SIMU
printf("SD-card backup filename=%s\n", buf); fflush(stdout);
TRACE("SD-card backup filename=%s", buf);
#endif
result = f_open(&g_oLogFile, buf, FA_CREATE_ALWAYS | FA_WRITE);
+1 -1
View File
@@ -116,7 +116,7 @@ void perMain()
if (evt && (g_eeGeneral.backlightMode & e_backlight_mode_keys)) backlightOn(); // on keypress turn the light on
checkBacklight();
#if (defined(FRSKY) || defined(MAVLINK))
#if defined(FRSKY) || defined(MAVLINK) || defined(SIMU)
telemetryWakeup();
#endif
+1 -1
View File
@@ -194,7 +194,7 @@ void getGpsPilotPosition()
uint32_t angle2 = (lat*lat) / 10000;
uint32_t angle4 = angle2 * angle2;
frskyData.hub.distFromEarthAxis = 139*(((uint32_t)10000000-((angle2*(uint32_t)123370)/81)+(angle4/25))/12500);
// printf("frskyData.hub.distFromEarthAxis=%d\n", frskyData.hub.distFromEarthAxis); fflush(stdout);
// TRACE("frskyData.hub.distFromEarthAxis=%d", frskyData.hub.distFromEarthAxis);
}
void getGpsDistance()
+5 -5
View File
@@ -159,7 +159,7 @@ void simuSetKey(uint8_t key, bool state)
void simuSetTrim(uint8_t trim, bool state)
{
// printf("trim=%d state=%d\n", trim, state); fflush(stdout);
// TRACE("trim=%d state=%d", trim, state);
switch (trim) {
TRIM_CASE(0, GPIO_TRIM_LH_L, PIN_TRIM_LH_L)
@@ -176,7 +176,7 @@ void simuSetTrim(uint8_t trim, bool state)
// TODO use a better numbering to allow google tests to work on Taranis
void simuSetSwitch(uint8_t swtch, int8_t state)
{
// printf("swtch=%d state=%d\n", swtch, state); fflush(stdout);
// TRACE("swtch=%d state=%d", swtch, state);
switch (swtch) {
#if defined(PCBTARANIS) && defined(REV9E)
SWITCH_3_CASE(0, GPIO_PIN_SW_A_L, GPIO_PIN_SW_A_H, PIN_SW_A_L, PIN_SW_A_H)
@@ -443,7 +443,7 @@ void eeprom_read_block (void *pointer_ram, const void *pointer_eeprom, size_t si
assert(size);
if (fp) {
// printf("EEPROM read (pos=%d, size=%d)\n", pointer_eeprom, size); fflush(stdout);
// TRACE("EEPROM read (pos=%d, size=%d)", pointer_eeprom, size);
if (fseek(fp, (long)pointer_eeprom, SEEK_SET)==-1) perror("error in fseek");
if (fread(pointer_ram, size, 1, fp) <= 0) perror("error in fread");
}
@@ -458,7 +458,7 @@ void eeWriteBlockCmp(const void *pointer_ram, uint16_t pointer_eeprom, size_t si
assert(size);
if (fp) {
// printf("EEPROM write (pos=%d, size=%d)\n", pointer_eeprom, size); fflush(stdout);
// TRACE("EEPROM write (pos=%d, size=%d)", pointer_eeprom, size);
if (fseek(fp, (long)pointer_eeprom, SEEK_SET)==-1) perror("error in fseek");
if (fwrite(pointer_ram, size, 1, fp) <= 0) perror("error in fwrite");
}
@@ -623,7 +623,7 @@ FRESULT f_readdir (DIR * rep, FILINFO * fil)
FRESULT f_mkfs (const TCHAR *path, BYTE, UINT)
{
printf("Format SD...\n"); fflush(stdout);
TRACE("Format SD...");
return FR_OK;
}
+1 -1
View File
@@ -81,7 +81,7 @@ uint32_t readKeys()
result |= 0x02 << KEY_MENU;
#endif
// printf("readKeys(): %x => %x\n", x, result); fflush(stdout);
// TRACE("readKeys(): %x => %x", x, result);
return result;
}
@@ -181,8 +181,10 @@ uint32_t telemetryTransmitPending()
void telemetryPortInit(uint32_t baudrate)
{
#if !defined(SIMU)
UART2_Configure(baudrate, Master_frequency);
startPdcUsartReceive();
#endif
}
void telemetryTransmitBuffer(uint8_t * buffer, uint32_t size)
+1 -1
View File
@@ -41,7 +41,7 @@ struct t_voice Voice ;
void pushPrompt(uint16_t value)
{
#ifdef SIMU
printf("playFile(\"%04d.ad4\")\n", value); fflush(stdout);
TRACE("playFile(\"%04d.ad4\")", value);
#endif
struct t_voice *vptr;
+2 -2
View File
@@ -72,7 +72,7 @@ uint32_t readKeys()
if (d & PIN_BUTTON_EXIT)
result |= 0x02 << KEY_EXIT;
// printf("readKeys(): %x %x => %x\n", d, e, result); fflush(stdout);
// TRACE("readKeys(): %x %x => %x", d, e, result);
return result;
}
@@ -112,7 +112,7 @@ uint32_t readTrims()
if (~c & PIN_TRIM_RH_R)
result |= 0x80; // RH_R
// printf("readTrims(): %x %x => %x\n", c, e, result); fflush(stdout);
// TRACE("readTrims(): %x %x => %x", c, e, result);
return result;
}
+1 -1
View File
@@ -132,7 +132,7 @@ void mixerTask(void * pdata)
doMixerCalculations();
CoLeaveMutexSection(mixerMutex);
#if defined(FRSKY) || defined(MAVLINK)
#if defined(FRSKY) || defined(MAVLINK) || defined(SIMU)
telemetryWakeup();
#endif
+3
View File
@@ -88,6 +88,7 @@ bool checkSportPacket(uint8_t *packet)
crc += crc >> 8; // 0-1FF
crc &= 0x00ff; // 0-FF
}
// TRACE("crc: 0x%02x", crc);
return (crc == 0x00ff);
}
@@ -103,6 +104,8 @@ void processSportPacket(uint8_t *packet)
uint16_t appId = *((uint16_t *)(packet+2));
if (!checkSportPacket(packet)) {
TRACE("processSportPacket(): checksumm error ");
DUMP(packet, FRSKY_SPORT_PACKET_SIZE);
return;
}