piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Compilation fixes

Browse Source
This commit is contained in:
Bertrand Songis
2015-10-14 23:47:51 +02:00
parent c92909f7c5
commit e25115b104
16 changed files with 21 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/gui/9X/lcd.cpp
+1 -1
View File
@@ -40,7 +40,7 @@ display_t displayBuf[DISPLAY_BUF_SIZE];
void lcd_clear()
{
memset(displayBuf, 0, DISPLAY_BUFER_SIZE);
memset(displayBuf, 0, DISPLAY_BUFFER_SIZE);
}
coord_t lcdLastPos;
radio/src/gui/9X/lcd.h
+1 -1
View File
@@ -144,7 +144,7 @@ extern display_t displayBuf[DISPLAY_BUF_SIZE];
extern coord_t lcdLastPos;
extern coord_t lcdNextPos;
#define DISPLAY_BUFER_SIZE (sizeof(display_t)*DISPLAY_BUF_SIZE)
#define DISPLAY_BUFFER_SIZE (sizeof(display_t)*DISPLAY_BUF_SIZE)
#define DISPLAY_END (displayBuf + DISPLAY_BUF_SIZE)
#define ASSERT_IN_DISPLAY(p) assert((p) >= displayBuf && (p) < DISPLAY_END)
radio/src/gui/Taranis/lcd.cpp
+1 -1
View File
@@ -52,7 +52,7 @@ inline bool lcdIsPointOutside(coord_t x, coord_t y)
void lcd_clear()
{
memset(displayBuf, 0, DISPLAY_BUFER_SIZE);
memset(displayBuf, 0, DISPLAY_BUFFER_SIZE);
}
coord_t lcdLastPos;
radio/src/gui/Taranis/lcd.h
+1 -1
View File
@@ -138,7 +138,7 @@
extern coord_t lcdLastPos;
extern coord_t lcdNextPos;
#define DISPLAY_BUFER_SIZE (sizeof(display_t)*DISPLAY_BUF_SIZE)
#define DISPLAY_BUFFER_SIZE (sizeof(display_t)*DISPLAY_BUF_SIZE)
#define DISPLAY_END (displayBuf + DISPLAY_BUF_SIZE)
#define ASSERT_IN_DISPLAY(p) assert((p) >= displayBuf && (p) < DISPLAY_END)
radio/src/targets/simu/simpgmspace.cpp
+1 -1
View File
@@ -348,7 +348,7 @@ void *main_thread(void *)
try {
#endif
#if defined(COLORLCD)
#if defined(PCBHORUS)
lcdColorsInit();
#endif
radio/src/tests/eeprom.cpp
+5 -5
View File
@@ -37,7 +37,7 @@
#include "gtests.h"
#if !defined(PCBSKY9X)
TEST(EEPROM, 100_random_writes)
TEST(Eeprom, 100_random_writes)
{
eepromFile = NULL; // in memory
RlcFile f;
@@ -60,7 +60,7 @@ TEST(EEPROM, 100_random_writes)
}
}
TEST(EEPROM, test2)
TEST(Eeprom, test2)
{
eepromFile = NULL; // in memory
RlcFile f;
@@ -83,7 +83,7 @@ TEST(EEPROM, test2)
EXPECT_EQ(sz, 300);
}
TEST(EEPROM, eeCheckImmediately)
TEST(Eeprom, eeCheckImmediately)
{
eepromFile = NULL; // in memory
// RlcFile f;
@@ -108,7 +108,7 @@ TEST(EEPROM, eeCheckImmediately)
EXPECT_EQ(sz, 300);
}
TEST(EEPROM, copy)
TEST(Eeprom, copy)
{
eepromFile = NULL; // in memory
@@ -133,7 +133,7 @@ TEST(EEPROM, copy)
EXPECT_EQ(sz, 300);
}
TEST(EEPROM, rm)
TEST(Eeprom, rm)
{
eepromFile = NULL; // in memory
radio/src/thirdparty/STM32_USB-Host-Device_Lib_V2.1.0/Libraries/STM32_USB_Device_Library/Class/audio/inc/usbd_audio_core.h
Vendored
+1 -1
View File
@@ -30,7 +30,7 @@
#ifndef __USB_AUDIO_CORE_H_
#define __USB_AUDIO_CORE_H_
#include "../../../../../../../targets/Flamenco/usbd_desc.h"
#include "usbd_desc.h"
#include "usbd_ioreq.h"
#include "usbd_req.h"
radio/src/thirdparty/STM32_USB-Host-Device_Lib_V2.1.0/Libraries/STM32_USB_Device_Library/Class/cdc/inc/usbd_cdc_if_template.h
Vendored
+2 -2
View File
@@ -30,8 +30,8 @@
#define __USBD_CDC_IF_TEMPLATE_H
/* Includes ------------------------------------------------------------------*/
#include "../../../../../../../targets/Flamenco/usb_conf.h"
#include "../../../../../../../targets/Flamenco/usbd_conf.h"
#include "usb_conf.h"
#include "usbd_conf.h"
#include "usbd_cdc_core.h"
/* Exported types ------------------------------------------------------------*/
radio/src/thirdparty/STM32_USB-Host-Device_Lib_V2.1.0/Libraries/STM32_USB_Device_Library/Class/dfu/inc/usbd_dfu_mal.h
Vendored
+1 -2
View File
@@ -30,8 +30,7 @@
#define __DFU_MAL_H
/* Includes ------------------------------------------------------------------*/
#include "../../../../../../../targets/Flamenco/usb_conf.h"
#include "../../../../../../../targets/Flamenco/usbd_conf.h"
#include "usb_conf.h"
#include "usbd_conf.h"
#include "usbd_dfu_core.h"
radio/src/thirdparty/STM32_USB-Host-Device_Lib_V2.1.0/Libraries/STM32_USB_Device_Library/Class/dfu/inc/usbd_mem_if_template.h
Vendored
+1 -1
View File
@@ -30,7 +30,7 @@
#define __MEM_IF_MAL_H
/* Includes ------------------------------------------------------------------*/
#include "../../../../../../../targets/Flamenco/usb_conf.h"
#include "usb_conf.h"
#include "usbd_dfu_mal.h"
/* Exported types ------------------------------------------------------------*/
radio/src/thirdparty/STM32_USB-Host-Device_Lib_V2.1.0/Libraries/STM32_USB_Device_Library/Class/dfu/src/usbd_dfu_core.c
Vendored
+1 -1
View File
@@ -64,7 +64,7 @@
/* Includes ------------------------------------------------------------------*/
#include "usbd_dfu_core.h"
#include "../../../../../../../targets/Flamenco/usbd_desc.h"
#include "usbd_desc.h"
#include "usbd_req.h"
#include "usb_bsp.h"
radio/src/thirdparty/STM32_USB-Host-Device_Lib_V2.1.0/Libraries/STM32_USB_Device_Library/Class/hid/src/usbd_hid_core.c
Vendored
+1 -1
View File
@@ -49,7 +49,7 @@
/* Includes ------------------------------------------------------------------*/
#include "usbd_hid_core.h"
#include "../../../../../../../targets/Flamenco/usbd_desc.h"
#include "usbd_desc.h"
#include "usbd_req.h"
radio/src/thirdparty/STM32_USB-Host-Device_Lib_V2.1.0/Libraries/STM32_USB_Device_Library/Class/msc/inc/usbd_msc_data.h
Vendored
+1 -1
View File
@@ -31,7 +31,7 @@
#define _USBD_MSC_DATA_H_
/* Includes ------------------------------------------------------------------*/
#include "../../../../../../../targets/Flamenco/usbd_conf.h"
#include "usbd_conf.h"
/** @addtogroup STM32_USB_OTG_DEVICE_LIBRARY
* @{
radio/src/thirdparty/STM32_USB-Host-Device_Lib_V2.1.0/Libraries/STM32_USB_Device_Library/Core/inc/usbd_conf_template.h
Vendored
+1 -1
View File
@@ -30,7 +30,7 @@
#define __USBD_CONF__H__
/* Includes ------------------------------------------------------------------*/
#include "../../../../../../targets/Flamenco/usb_conf.h"
#include "usb_conf.h"
/** @defgroup USB_CONF_Exported_Defines
* @{
radio/src/thirdparty/STM32_USB-Host-Device_Lib_V2.1.0/Libraries/STM32_USB_OTG_Driver/inc/usb_conf_template.h
Vendored
+1 -1
View File
@@ -30,7 +30,7 @@
#define __USB_CONF__H__
/* Includes ------------------------------------------------------------------*/
#include "../../../../../targets/Flamenco/usb_conf.h"
#include "usb_conf.h"
/** @addtogroup USB_OTG_DRIVER
* @{
radio/src/thirdparty/STM32_USB-Host-Device_Lib_V2.1.0/Libraries/STM32_USB_OTG_Driver/src/usb_hcd.c
Vendored
+1 -1
View File
@@ -29,7 +29,7 @@
#include "usb_core.h"
#include "usb_hcd.h"
#include "../../../../../targets/Flamenco/usb_conf.h"
#include "usb_conf.h"
#include "usb_bsp.h"