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

Rename to MotionCal

Browse source
This commit is contained in:
PaulStoffregen 2016-04-01 05:37:52 -07:00
commit 2b2458f439
3 changed files with 33 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Info.plist
View file

@ -5,11 +5,11 @@
<!-- Documentation for this format is at --> <!-- Documentation for this format is at -->
<!-- http://developer.apple.com/documentation/MacOSX/Conceptual/BPRuntimeConfig/Articles/ConfigFiles.html --> <!-- http://developer.apple.com/documentation/MacOSX/Conceptual/BPRuntimeConfig/Articles/ConfigFiles.html -->
<key>CFBundleDisplayName</key> <key>CFBundleDisplayName</key>
<string>IMUread</string> <string>Motion Calibrate</string>
<key>CFBundleIdentifier</key> <key>CFBundleIdentifier</key>
<string>com.pjrc.teensy</string> <string>com.pjrc.motioncal</string>
<key>CFBundleName</key> <key>CFBundleName</key>
<string>IMUread</string> <string>MotionCal</string>
<key>CFBundleShortVersionString</key> <key>CFBundleShortVersionString</key>
<string>1.234</string> <string>1.234</string>
<key>LSHasLocalizedDisplayName</key> <key>LSHasLocalizedDisplayName</key>
@ -19,7 +19,7 @@
<key>NSAppleScriptEnabled</key> <key>NSAppleScriptEnabled</key>
<false/> <false/>
<key>CFBundleExecutable</key> <key>CFBundleExecutable</key>
<string>gui</string> <string>MotionCal</string>
<key>CFBundleIconFile</key> <key>CFBundleIconFile</key>
<string>icon.icns</string> <string>icon.icns</string>
<key>CFBundlePackageType</key> <key>CFBundlePackageType</key>

43
Makefile
View file

@ -4,7 +4,7 @@ OS = LINUX
#OS = WINDOWS #OS = WINDOWS
ifeq ($(OS), LINUX) ifeq ($(OS), LINUX)
ALL = gui imuread ALL = MotionCal imuread
CC = gcc CC = gcc
CXX = g++ CXX = g++
CFLAGS = -O2 -Wall -D$(OS) CFLAGS = -O2 -Wall -D$(OS)
@ -16,7 +16,7 @@ CLILIBS = -lglut -lGLU -lGL -lm
MAKEFLAGS = --jobs=12 MAKEFLAGS = --jobs=12
else ifeq ($(OS), MACOSX) else ifeq ($(OS), MACOSX)
ALL = gui.app ALL = MotionCal.app
CC = gcc-4.2 CC = gcc-4.2
CXX = g++-4.2 CXX = g++-4.2
CFLAGS = -O2 -Wall -D$(OS) CFLAGS = -O2 -Wall -D$(OS)
@ -27,7 +27,7 @@ CLILIBS = -lglut -lGLU -lGL -lm
VERSION = 0.01 VERSION = 0.01
else ifeq ($(OS), MACOSX_CLANG) else ifeq ($(OS), MACOSX_CLANG)
ALL = gui.app ALL = MotionCal.app
CC = /usr/bin/clang CC = /usr/bin/clang
CXX = /usr/bin/clang++ CXX = /usr/bin/clang++
CFLAGS = -O2 -Wall -DMACOSX CFLAGS = -O2 -Wall -DMACOSX
@ -38,7 +38,7 @@ CLILIBS = -lglut -lGLU -lGL -lm
VERSION = 0.01 VERSION = 0.01
else ifeq ($(OS), WINDOWS) else ifeq ($(OS), WINDOWS)
ALL = gui.exe ALL = MotionCal.exe
CC = i686-w64-mingw32-gcc CC = i686-w64-mingw32-gcc
CXX = i686-w64-mingw32-g++ CXX = i686-w64-mingw32-g++
CFLAGS = -O2 -Wall -D$(OS) CFLAGS = -O2 -Wall -D$(OS)
@ -55,14 +55,14 @@ OBJS = visualize.o serialdata.o rawdata.o magcal.o matrix.o fusion.o quality.o m
all: $(ALL) all: $(ALL)
gui: gui.o portlist.o $(OBJS) MotionCal: gui.o portlist.o $(OBJS)
$(CXX) $(SFLAG) $(CFLAGS) $(LDFLAGS) -o $@ $^ `$(WXCONFIG) --libs all,opengl` $(CXX) $(SFLAG) $(CFLAGS) $(LDFLAGS) -o $@ $^ `$(WXCONFIG) --libs all,opengl`
gui.exe: gui MotionCal.exe: MotionCal
cp gui $@ cp MotionCal $@
-./cp_windows.sh $@ -./cp_windows.sh $@
gui.app: gui Info.plist MotionCal.app: MotionCal Info.plist
mkdir -p $@/Contents/MacOS mkdir -p $@/Contents/MacOS
mkdir -p $@/Contents/Resources/English.lproj mkdir -p $@/Contents/Resources/English.lproj
sed "s/1.234/$(VERSION)/g" Info.plist > $@/Contents/Info.plist sed "s/1.234/$(VERSION)/g" Info.plist > $@/Contents/Info.plist
@ -75,19 +75,18 @@ imuread: imuread.o $(OBJS)
$(CC) -s $(CFLAGS) $(LDFLAGS) -o $@ $^ $(CLILIBS) $(CC) -s $(CFLAGS) $(LDFLAGS) -o $@ $^ $(CLILIBS)
clean: clean:
rm -f gui imuread *.o *.exe rm -f gui MotionCal imuread *.o *.exe
rm -rf gui.app .DS_Store rm -rf MotionCal.app .DS_Store
gui.o: gui.cpp gui.h imuread.h
portlist.o: portlist.cpp gui.h
imuread.o: imuread.c imuread.h
visualize.o: visualize.c imuread.h
serialdata.o: serialdata.c imuread.h
rawdata.o: rawdata.c imuread.h
magcal.o: magcal.c imuread.h
matrix.o: matrix.c imuread.h
fusion.o: fusion.c imuread.h
quality.o: quality.c imuread.h
mahony.o: mahony.c imuread.h
gui.o: gui.cpp gui.h imuread.h Makefile
portlist.o: portlist.cpp gui.h Makefile
imuread.o: imuread.c imuread.h Makefile
visualize.o: visualize.c imuread.h Makefile
serialdata.o: serialdata.c imuread.h Makefile
rawdata.o: rawdata.c imuread.h Makefile
magcal.o: magcal.c imuread.h Makefile
matrix.o: matrix.c imuread.h Makefile
fusion.o: fusion.c imuread.h Makefile
quality.o: quality.c imuread.h Makefile
mahony.o: mahony.c imuread.h Makefile

12
gui.cpp
View file

@ -287,8 +287,12 @@ void MyFrame::OnPort(wxCommandEvent &event)
void MyFrame::OnAbout(wxCommandEvent &event) void MyFrame::OnAbout(wxCommandEvent &event)
{ {
wxMessageDialog dialog(this, wxMessageDialog dialog(this,
"IMU Read\n\n\nCopyright 2016, PJRC.COM, LLC.", "MotionCal - Motion Sensor Calibration Tool\n\n"
"About IMUREAD", wxOK|wxICON_INFORMATION); "Paul Stoffregen <paul@pjrc.com>\n"
"http://www.pjrc.com/store/prop_shield.html\n"
"https://github.com/PaulStoffregen/MotionCal\n\n"
"Copyright 2016, PJRC.COM, LLC.",
"About MotionCal", wxOK|wxICON_INFORMATION|wxCENTER);
dialog.ShowModal(); dialog.ShowModal();
} }
@ -361,8 +365,8 @@ bool MyApp::OnInit()
wxPoint pos(100, 100); wxPoint pos(100, 100);
MyFrame *frame = new MyFrame(NULL, -1, wxT("Motion Sensor Calibration Tool"), pos, wxSize(1120,760), MyFrame *frame = new MyFrame(NULL, -1, "Motion Sensor Calibration Tool",
wxDEFAULT_FRAME_STYLE); pos, wxSize(1120,760), wxDEFAULT_FRAME_STYLE);
frame->Show( true ); frame->Show( true );
return true; return true;
} }