From 2b2458f4390858cf21e5e7cc16c4fb39d06b546b Mon Sep 17 00:00:00 2001 From: PaulStoffregen Date: Fri, 1 Apr 2016 05:37:52 -0700 Subject: [PATCH] Rename to MotionCal --- Info.plist | 8 ++++---- Makefile | 43 +++++++++++++++++++++---------------------- gui.cpp | 12 ++++++++---- 3 files changed, 33 insertions(+), 30 deletions(-) diff --git a/Info.plist b/Info.plist index 5742362..7005c68 100644 --- a/Info.plist +++ b/Info.plist @@ -5,11 +5,11 @@ CFBundleDisplayName - IMUread + Motion Calibrate CFBundleIdentifier - com.pjrc.teensy + com.pjrc.motioncal CFBundleName - IMUread + MotionCal CFBundleShortVersionString 1.234 LSHasLocalizedDisplayName @@ -19,7 +19,7 @@ NSAppleScriptEnabled CFBundleExecutable - gui + MotionCal CFBundleIconFile icon.icns CFBundlePackageType diff --git a/Makefile b/Makefile index f4ae490..ec4bcad 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ OS = LINUX #OS = WINDOWS ifeq ($(OS), LINUX) -ALL = gui imuread +ALL = MotionCal imuread CC = gcc CXX = g++ CFLAGS = -O2 -Wall -D$(OS) @@ -16,7 +16,7 @@ CLILIBS = -lglut -lGLU -lGL -lm MAKEFLAGS = --jobs=12 else ifeq ($(OS), MACOSX) -ALL = gui.app +ALL = MotionCal.app CC = gcc-4.2 CXX = g++-4.2 CFLAGS = -O2 -Wall -D$(OS) @@ -27,7 +27,7 @@ CLILIBS = -lglut -lGLU -lGL -lm VERSION = 0.01 else ifeq ($(OS), MACOSX_CLANG) -ALL = gui.app +ALL = MotionCal.app CC = /usr/bin/clang CXX = /usr/bin/clang++ CFLAGS = -O2 -Wall -DMACOSX @@ -38,7 +38,7 @@ CLILIBS = -lglut -lGLU -lGL -lm VERSION = 0.01 else ifeq ($(OS), WINDOWS) -ALL = gui.exe +ALL = MotionCal.exe CC = i686-w64-mingw32-gcc CXX = i686-w64-mingw32-g++ 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) -gui: gui.o portlist.o $(OBJS) +MotionCal: gui.o portlist.o $(OBJS) $(CXX) $(SFLAG) $(CFLAGS) $(LDFLAGS) -o $@ $^ `$(WXCONFIG) --libs all,opengl` -gui.exe: gui - cp gui $@ +MotionCal.exe: MotionCal + cp MotionCal $@ -./cp_windows.sh $@ -gui.app: gui Info.plist +MotionCal.app: MotionCal Info.plist mkdir -p $@/Contents/MacOS mkdir -p $@/Contents/Resources/English.lproj 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) clean: - rm -f gui imuread *.o *.exe - rm -rf gui.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 + rm -f gui MotionCal imuread *.o *.exe + rm -rf MotionCal.app .DS_Store +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 diff --git a/gui.cpp b/gui.cpp index 80cb999..4f8c035 100644 --- a/gui.cpp +++ b/gui.cpp @@ -287,8 +287,12 @@ void MyFrame::OnPort(wxCommandEvent &event) void MyFrame::OnAbout(wxCommandEvent &event) { wxMessageDialog dialog(this, - "IMU Read\n\n\nCopyright 2016, PJRC.COM, LLC.", - "About IMUREAD", wxOK|wxICON_INFORMATION); + "MotionCal - Motion Sensor Calibration Tool\n\n" + "Paul Stoffregen \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(); } @@ -361,8 +365,8 @@ bool MyApp::OnInit() wxPoint pos(100, 100); - MyFrame *frame = new MyFrame(NULL, -1, wxT("Motion Sensor Calibration Tool"), pos, wxSize(1120,760), - wxDEFAULT_FRAME_STYLE); + MyFrame *frame = new MyFrame(NULL, -1, "Motion Sensor Calibration Tool", + pos, wxSize(1120,760), wxDEFAULT_FRAME_STYLE); frame->Show( true ); return true; }