fleg
/
OpenRTX
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix emulator compilation errors

This commit is contained in:
Fred 2020-11-17 21:58:24 +01:00
parent fc3ee1d6ed
commit 610da21013
2 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
platform/targets/linux/emulator/emulator.c
View File

@ -25,6 +25,8 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
radio_state Radio_State = {12, 7, 3, 4, 1, false};
void systemBootstrap(); void systemBootstrap();
int CLIMenu() { int CLIMenu() {
@ -99,15 +101,11 @@ void *startCLIMenu() {
} }
} while (choice != EXIT); } while (choice != EXIT);
printf("exiting\n"); printf("exiting\n");
SDL_Quit();
SDL_DestroyWindow(window);
exit(0); exit(0);
}; };
int emulator_main() { int emulator_main() {
Radio_State = (radio_state){12, 7, 3, 4, 1, false};
pthread_t gui_thread, cli_thread, radio_thread; pthread_t gui_thread, cli_thread, radio_thread;
int err1, err2; int err1, err2;

11
platform/targets/linux/emulator/emulator.h
View File

@ -17,6 +17,8 @@
* You should have received a copy of the GNU General Public License * * You should have received a copy of the GNU General Public License *
* along with this program; if not, see <http://www.gnu.org/licenses/> * * along with this program; if not, see <http://www.gnu.org/licenses/> *
***************************************************************************/ ***************************************************************************/
#ifndef EMULATOR_H
#define EMULATOR_H
#include <stdbool.h> #include <stdbool.h>
#include <stdint.h> #include <stdint.h>
@ -30,11 +32,6 @@
#define SCREEN_HEIGHT 128 #define SCREEN_HEIGHT 128
#endif #endif
SDL_Renderer *renderer; /* SDL renderer */
SDL_Window *window; /* SDL window */
SDL_Texture *displayTexture; /* SDL rendering surface */
enum choices { enum choices {
VAL_RSSI=1, VAL_RSSI=1,
VAL_BAT, VAL_BAT,
@ -55,4 +52,6 @@ typedef struct {
bool PttStatus; bool PttStatus;
} radio_state; } radio_state;
radio_state Radio_State; extern radio_state Radio_State;
#endif /* EMULATOR_H */