jlpoole/MotionCal
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix compile errors for Windows

Browse source
This commit is contained in:
PaulStoffregen 2016-03-15 16:22:15 -07:00
commit dbf89a1a33
2 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
imuread.h
View file

@ -21,6 +21,7 @@
#include <windows.h> #include <windows.h>
#include <GL/gl.h> #include <GL/gl.h>
#include <GL/glu.h> #include <GL/glu.h>
#define random() rand()
#elif defined(MACOSX) #elif defined(MACOSX)
#include <termios.h> #include <termios.h>
#include <unistd.h> #include <unistd.h>

5
portlist.cpp
View file

@ -261,7 +261,8 @@ wxArrayString serial_port_list()
} }
} else { } else {
char buf[1024]; char buf[1024];
win32_err(buf); buf[0] = 0;
//win32_err(buf);
printf("QueryDosDeviceA failed, error \"%s\"\n", buf); printf("QueryDosDeviceA failed, error \"%s\"\n", buf);
printf("Detect Serial using brute force GetDefaultCommConfig probing: "); printf("Detect Serial using brute force GetDefaultCommConfig probing: ");
for (int i=1; i<=32; i++) { for (int i=1; i<=32; i++) {
@ -269,7 +270,7 @@ wxArrayString serial_port_list()
COMMCONFIG cfg; COMMCONFIG cfg;
DWORD len; DWORD len;
snprintf(buf, sizeof(buf), "COM%d", i); snprintf(buf, sizeof(buf), "COM%d", i);
if (GetDefaultCommConfig(buf, &cfg, &len)) { if (GetDefaultCommConfigA(buf, &cfg, &len)) {
wxString name; wxString name;
name.Printf("COM%d:", i); name.Printf("COM%d:", i);
list.Add(name); list.Add(name);