Mirror/opentx
1
0
Fork 0
mirror of https://github.com/opentx/opentx.git synced 2025-07-23 16:25:16 +03:00
Code Issues Wiki Activity

Fixed simu build

Browse source
This commit is contained in:
Damjan Adamic 2014-12-04 22:17:06 +01:00
parent 271dae71f7
commit 5566439e76
4 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
radio/src/lcd.h
View file

@ -168,9 +168,11 @@ extern display_t * displayBuf;
#else #else
extern display_t displayBuf[DISPLAY_BUF_SIZE]; extern display_t displayBuf[DISPLAY_BUF_SIZE];
#endif #endif
extern coord_t lcdLastPos; extern coord_t lcdLastPos;
extern coord_t lcdNextPos; extern coord_t lcdNextPos;
#define DISPLAY_BUFER_SIZE (sizeof(display_t)*DISPLAY_BUF_SIZE)
#define DISPLAY_END (displayBuf + DISPLAY_BUF_SIZE) #define DISPLAY_END (displayBuf + DISPLAY_BUF_SIZE)
#define ASSERT_IN_DISPLAY(p) assert((p) >= displayBuf && (p) < DISPLAY_END) #define ASSERT_IN_DISPLAY(p) assert((p) >= displayBuf && (p) < DISPLAY_END)

2
radio/src/lcd_common.cpp
View file

@ -41,10 +41,8 @@
display_t displayBuf1[DISPLAY_BUF_SIZE]; display_t displayBuf1[DISPLAY_BUF_SIZE];
display_t displayBuf2[DISPLAY_BUF_SIZE]; display_t displayBuf2[DISPLAY_BUF_SIZE];
display_t * displayBuf = displayBuf1; display_t * displayBuf = displayBuf1;
#define DISPLAY_BUFER_SIZE sizeof(displayBuf1)
#else #else
display_t displayBuf[DISPLAY_BUF_SIZE]; display_t displayBuf[DISPLAY_BUF_SIZE];
#define DISPLAY_BUFER_SIZE sizeof(displayBuf)
#endif #endif
void lcd_clear() void lcd_clear()

2
radio/src/simu.cpp
View file

@ -85,7 +85,7 @@ Open9xSim::Open9xSim(FXApp* a):
FXMainWindow(a, "OpenTX Simu", NULL, NULL, DECOR_ALL, 20, 90, 0, 0) FXMainWindow(a, "OpenTX Simu", NULL, NULL, DECOR_ALL, 20, 90, 0, 0)
{ {
firstTime = true; firstTime = true;
memset(displayBuf, 0, sizeof(displayBuf)); memset(displayBuf, 0, DISPLAY_BUFER_SIZE);
bmp = new FXPPMImage(getApp(),NULL,IMAGE_OWNED|IMAGE_KEEP|IMAGE_SHMI|IMAGE_SHMP, W2, H2); bmp = new FXPPMImage(getApp(),NULL,IMAGE_OWNED|IMAGE_KEEP|IMAGE_SHMI|IMAGE_SHMP, W2, H2);
FXHorizontalFrame *hf11=new FXHorizontalFrame(this,LAYOUT_CENTER_X); FXHorizontalFrame *hf11=new FXHorizontalFrame(this,LAYOUT_CENTER_X);

4
radio/src/tasks_arm.cpp
View file

@ -117,6 +117,8 @@ uint32_t stack_free(uint32_t tid)
return i*4; return i*4;
} }
#if !defined(SIMU)
void mixerTask(void * pdata) void mixerTask(void * pdata)
{ {
s_pulses_paused = true; s_pulses_paused = true;
@ -209,3 +211,5 @@ void tasksStart()
CoStartOS(); CoStartOS();
} }
#endif // #if !defined(SIMU)