Integrate git

jorgeazevedo · Jun 4, 2012 · 61176d0 · 61176d0
1 parent 3d1a404
commit 61176d0
Show file tree

Hide file tree

Showing 28 changed files with 4,493 additions and 0 deletions.
diff --git a/Makefile b/Makefile
@@ -0,0 +1,15 @@
+###### CONFIGURATION ######
+
+### List of applications to be build
+EXECUTABLE=oscilloscope
+
+BLOCK_PROJECT_FOLDER=src/
+
+all:
+	cd $(BLOCK_PROJECT_FOLDER); qmake && make;
+
+clean::
+	cd $(BLOCK_PROJECT_FOLDER); qmake && make clean;
+cleanall::
+	cd $(BLOCK_PROJECT_FOLDER); qmake && make clean;
+
diff --git a/oscilloscope.conf b/oscilloscope.conf
diff --git a/src/Makefile b/src/Makefile
@@ -0,0 +1,331 @@
+#############################################################################
+# Makefile for building: ../../oscilloscope/oscilloscope
+# Generated by qmake (2.01a) (Qt 4.6.2) on: Mon Jun 4 17:21:47 2012
+# Project:  oscilloscope.pro
+# Template: app
+# Command: /usr/bin/qmake -unix -o Makefile oscilloscope.pro
+#############################################################################
+
+####### Compiler, tools and options
+
+CC            = gcc
+CXX           = g++
+DEFINES       = -DQT_NO_DEBUG -DQT_NO_KEYWORDS -DQT_GUI_LIB -DQT_CORE_LIB -DQT_SHARED
+CFLAGS        = -pipe -O2 -Wall -W -D_REENTRANT $(DEFINES)
+CXXFLAGS      = -pipe -D_GNU_SOURCE -D_REENTRANT -Wall -pipe -D__XENO__ -O2 -Wall -W -D_REENTRANT $(DEFINES)
+INCPATH       = -I/usr/share/qt4/mkspecs/linux-g++ -I. -I/usr/include/qt4/QtCore -I/usr/include/qt4/QtGui -I/usr/include/qt4 -I/usr/local/qwt-6.0.1/include -I../../../include -I/usr/include/xenomai -Ibuild/.moc
+LINK          = g++
+LFLAGS        = -Wl,-O1
+LIBS          = $(SUBLIBS)  -L/usr/lib -L/usr/local/qwt-6.0.1/lib -lqwt -L/usr/lib -lxenomai -lnative -Xlinker -rpath -Xlinker -lQtGui -lQtCore -lpthread 
+AR            = ar cqs
+RANLIB        = 
+QMAKE         = /usr/bin/qmake
+TAR           = tar -cf
+COMPRESS      = gzip -9f
+COPY          = cp -f
+SED           = sed
+COPY_FILE     = $(COPY)
+COPY_DIR      = $(COPY) -r
+STRIP         = strip
+INSTALL_FILE  = install -m 644 -p
+INSTALL_DIR   = $(COPY_DIR)
+INSTALL_PROGRAM = install -m 755 -p
+DEL_FILE      = rm -f
+SYMLINK       = ln -f -s
+DEL_DIR       = rmdir
+MOVE          = mv -f
+CHK_DIR_EXISTS= test -d
+MKDIR         = mkdir -p
+
+####### Output directory
+
+OBJECTS_DIR   = build/.obj/
+
+####### Files
+
+SOURCES       = signaldata.cpp \
+		plot.cpp \
+		knob.cpp \
+		wheelbox.cpp \
+		samplingthread.cpp \
+		curvedata.cpp \
+		mainwindow.cpp \
+		main.cpp \
+		opsettings.cpp \
+		../../../include/mtrx.c \
+		blockio.cpp \
+		inputmap.cpp build/.moc/moc_plot.cpp \
+		build/.moc/moc_knob.cpp \
+		build/.moc/moc_wheelbox.cpp \
+		build/.moc/moc_samplingthread.cpp \
+		build/.moc/moc_mainwindow.cpp \
+		build/.moc/moc_opsettings.cpp \
+		build/.moc/moc_inputmap.cpp
+OBJECTS       = build/.obj/signaldata.o \
+		build/.obj/plot.o \
+		build/.obj/knob.o \
+		build/.obj/wheelbox.o \
+		build/.obj/samplingthread.o \
+		build/.obj/curvedata.o \
+		build/.obj/mainwindow.o \
+		build/.obj/main.o \
+		build/.obj/opsettings.o \
+		build/.obj/mtrx.o \
+		build/.obj/blockio.o \
+		build/.obj/inputmap.o \
+		build/.obj/moc_plot.o \
+		build/.obj/moc_knob.o \
+		build/.obj/moc_wheelbox.o \
+		build/.obj/moc_samplingthread.o \
+		build/.obj/moc_mainwindow.o \
+		build/.obj/moc_opsettings.o \
+		build/.obj/moc_inputmap.o
+DIST          = /usr/share/qt4/mkspecs/common/g++.conf \
+		/usr/share/qt4/mkspecs/common/unix.conf \
+		/usr/share/qt4/mkspecs/common/linux.conf \
+		/usr/share/qt4/mkspecs/qconfig.pri \
+		/usr/share/qt4/mkspecs/features/qt_functions.prf \
+		/usr/share/qt4/mkspecs/features/qt_config.prf \
+		/usr/share/qt4/mkspecs/features/exclusive_builds.prf \
+		/usr/share/qt4/mkspecs/features/default_pre.prf \
+		/usr/share/qt4/mkspecs/features/release.prf \
+		/usr/share/qt4/mkspecs/features/default_post.prf \
+		/usr/share/qt4/mkspecs/features/warn_on.prf \
+		/usr/share/qt4/mkspecs/features/qt.prf \
+		/usr/share/qt4/mkspecs/features/unix/thread.prf \
+		/usr/share/qt4/mkspecs/features/moc.prf \
+		/usr/share/qt4/mkspecs/features/resources.prf \
+		/usr/share/qt4/mkspecs/features/uic.prf \
+		/usr/share/qt4/mkspecs/features/yacc.prf \
+		/usr/share/qt4/mkspecs/features/lex.prf \
+		oscilloscope.pro
+QMAKE_TARGET  = oscilloscope
+DESTDIR       = ../../oscilloscope/
+TARGET        = ../../oscilloscope/oscilloscope
+
+first: all
+####### Implicit rules
+
+.SUFFIXES: .o .c .cpp .cc .cxx .C
+
+.cpp.o:
+	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<"
+
+.cc.o:
+	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<"
+
+.cxx.o:
+	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<"
+
+.C.o:
+	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<"
+
+.c.o:
+	$(CC) -c $(CFLAGS) $(INCPATH) -o "$@" "$<"
+
+####### Build rules
+
+all: Makefile $(TARGET)
+
+$(TARGET):  $(OBJECTS)  
+	@$(CHK_DIR_EXISTS) ../../oscilloscope/ || $(MKDIR) ../../oscilloscope/ 
+	$(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJCOMP) $(LIBS)
+
+Makefile: oscilloscope.pro  /usr/share/qt4/mkspecs/linux-g++/qmake.conf /usr/share/qt4/mkspecs/common/g++.conf \
+		/usr/share/qt4/mkspecs/common/unix.conf \
+		/usr/share/qt4/mkspecs/common/linux.conf \
+		/usr/share/qt4/mkspecs/qconfig.pri \
+		/usr/share/qt4/mkspecs/features/qt_functions.prf \
+		/usr/share/qt4/mkspecs/features/qt_config.prf \
+		/usr/share/qt4/mkspecs/features/exclusive_builds.prf \
+		/usr/share/qt4/mkspecs/features/default_pre.prf \
+		/usr/share/qt4/mkspecs/features/release.prf \
+		/usr/share/qt4/mkspecs/features/default_post.prf \
+		/usr/share/qt4/mkspecs/features/warn_on.prf \
+		/usr/share/qt4/mkspecs/features/qt.prf \
+		/usr/share/qt4/mkspecs/features/unix/thread.prf \
+		/usr/share/qt4/mkspecs/features/moc.prf \
+		/usr/share/qt4/mkspecs/features/resources.prf \
+		/usr/share/qt4/mkspecs/features/uic.prf \
+		/usr/share/qt4/mkspecs/features/yacc.prf \
+		/usr/share/qt4/mkspecs/features/lex.prf \
+		/usr/lib/libQtGui.prl \
+		/usr/lib/libQtCore.prl
+	$(QMAKE) -unix -o Makefile oscilloscope.pro
+/usr/share/qt4/mkspecs/common/g++.conf:
+/usr/share/qt4/mkspecs/common/unix.conf:
+/usr/share/qt4/mkspecs/common/linux.conf:
+/usr/share/qt4/mkspecs/qconfig.pri:
+/usr/share/qt4/mkspecs/features/qt_functions.prf:
+/usr/share/qt4/mkspecs/features/qt_config.prf:
+/usr/share/qt4/mkspecs/features/exclusive_builds.prf:
+/usr/share/qt4/mkspecs/features/default_pre.prf:
+/usr/share/qt4/mkspecs/features/release.prf:
+/usr/share/qt4/mkspecs/features/default_post.prf:
+/usr/share/qt4/mkspecs/features/warn_on.prf:
+/usr/share/qt4/mkspecs/features/qt.prf:
+/usr/share/qt4/mkspecs/features/unix/thread.prf:
+/usr/share/qt4/mkspecs/features/moc.prf:
+/usr/share/qt4/mkspecs/features/resources.prf:
+/usr/share/qt4/mkspecs/features/uic.prf:
+/usr/share/qt4/mkspecs/features/yacc.prf:
+/usr/share/qt4/mkspecs/features/lex.prf:
+/usr/lib/libQtGui.prl:
+/usr/lib/libQtCore.prl:
+qmake:  FORCE
+	@$(QMAKE) -unix -o Makefile oscilloscope.pro
+
+dist: 
+	@$(CHK_DIR_EXISTS) build/.obj/oscilloscope1.0.0 || $(MKDIR) build/.obj/oscilloscope1.0.0 
+	$(COPY_FILE) --parents $(SOURCES) $(DIST) build/.obj/oscilloscope1.0.0/ && $(COPY_FILE) --parents signaldata.h plot.h knob.h wheelbox.h samplingthread.h curvedata.h mainwindow.h opsettings.h ../../../include/mtrx.h blockio.h inputmap.h build/.obj/oscilloscope1.0.0/ && $(COPY_FILE) --parents signaldata.cpp plot.cpp knob.cpp wheelbox.cpp samplingthread.cpp curvedata.cpp mainwindow.cpp main.cpp opsettings.cpp ../../../include/mtrx.c blockio.cpp inputmap.cpp build/.obj/oscilloscope1.0.0/ && (cd `dirname build/.obj/oscilloscope1.0.0` && $(TAR) oscilloscope1.0.0.tar oscilloscope1.0.0 && $(COMPRESS) oscilloscope1.0.0.tar) && $(MOVE) `dirname build/.obj/oscilloscope1.0.0`/oscilloscope1.0.0.tar.gz . && $(DEL_FILE) -r build/.obj/oscilloscope1.0.0
+
+
+clean:compiler_clean 
+	-$(DEL_FILE) $(OBJECTS)
+	-$(DEL_FILE) *~ core *.core
+	-$(DEL_FILE) ${TARGET}
+
+####### Sub-libraries
+
+distclean: clean
+	-$(DEL_FILE) $(TARGET) 
+	-$(DEL_FILE) Makefile
+
+
+mocclean: compiler_moc_header_clean compiler_moc_source_clean
+
+mocables: compiler_moc_header_make_all compiler_moc_source_make_all
+
+compiler_moc_header_make_all: build/.moc/moc_plot.cpp build/.moc/moc_knob.cpp build/.moc/moc_wheelbox.cpp build/.moc/moc_samplingthread.cpp build/.moc/moc_mainwindow.cpp build/.moc/moc_opsettings.cpp build/.moc/moc_inputmap.cpp
+compiler_moc_header_clean:
+	-$(DEL_FILE) build/.moc/moc_plot.cpp build/.moc/moc_knob.cpp build/.moc/moc_wheelbox.cpp build/.moc/moc_samplingthread.cpp build/.moc/moc_mainwindow.cpp build/.moc/moc_opsettings.cpp build/.moc/moc_inputmap.cpp
+build/.moc/moc_plot.cpp: opsettings.h \
+		plot.h
+	/usr/bin/moc-qt4 $(DEFINES) $(INCPATH) plot.h -o build/.moc/moc_plot.cpp
+
+build/.moc/moc_knob.cpp: knob.h
+	/usr/bin/moc-qt4 $(DEFINES) $(INCPATH) knob.h -o build/.moc/moc_knob.cpp
+
+build/.moc/moc_wheelbox.cpp: wheelbox.h
+	/usr/bin/moc-qt4 $(DEFINES) $(INCPATH) wheelbox.h -o build/.moc/moc_wheelbox.cpp
+
+build/.moc/moc_samplingthread.cpp: opsettings.h \
+		samplingthread.h
+	/usr/bin/moc-qt4 $(DEFINES) $(INCPATH) samplingthread.h -o build/.moc/moc_samplingthread.cpp
+
+build/.moc/moc_mainwindow.cpp: mainwindow.h
+	/usr/bin/moc-qt4 $(DEFINES) $(INCPATH) mainwindow.h -o build/.moc/moc_mainwindow.cpp
+
+build/.moc/moc_opsettings.cpp: opsettings.h
+	/usr/bin/moc-qt4 $(DEFINES) $(INCPATH) opsettings.h -o build/.moc/moc_opsettings.cpp
+
+build/.moc/moc_inputmap.cpp: opsettings.h \
+		inputmap.h
+	/usr/bin/moc-qt4 $(DEFINES) $(INCPATH) inputmap.h -o build/.moc/moc_inputmap.cpp
+
+compiler_rcc_make_all:
+compiler_rcc_clean:
+compiler_image_collection_make_all: qmake_image_collection.cpp
+compiler_image_collection_clean:
+	-$(DEL_FILE) qmake_image_collection.cpp
+compiler_moc_source_make_all:
+compiler_moc_source_clean:
+compiler_uic_make_all:
+compiler_uic_clean:
+compiler_yacc_decl_make_all:
+compiler_yacc_decl_clean:
+compiler_yacc_impl_make_all:
+compiler_yacc_impl_clean:
+compiler_lex_make_all:
+compiler_lex_clean:
+compiler_clean: compiler_moc_header_clean 
+
+####### Compile
+
+build/.obj/signaldata.o: signaldata.cpp signaldata.h \
+		opsettings.h
+	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o build/.obj/signaldata.o signaldata.cpp
+
+build/.obj/plot.o: plot.cpp plot.h \
+		opsettings.h \
+		curvedata.h \
+		signaldata.h
+	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o build/.obj/plot.o plot.cpp
+
+build/.obj/knob.o: knob.cpp knob.h
+	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o build/.obj/knob.o knob.cpp
+
+build/.obj/wheelbox.o: wheelbox.cpp wheelbox.h
+	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o build/.obj/wheelbox.o wheelbox.cpp
+
+build/.obj/samplingthread.o: samplingthread.cpp samplingthread.h \
+		opsettings.h \
+		signaldata.h \
+		plot.h
+	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o build/.obj/samplingthread.o samplingthread.cpp
+
+build/.obj/curvedata.o: curvedata.cpp curvedata.h \
+		signaldata.h
+	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o build/.obj/curvedata.o curvedata.cpp
+
+build/.obj/mainwindow.o: mainwindow.cpp mainwindow.h \
+		signaldata.h \
+		plot.h \
+		opsettings.h \
+		knob.h \
+		wheelbox.h \
+		operationsettings.h
+	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o build/.obj/mainwindow.o mainwindow.cpp
+
+build/.obj/main.o: main.cpp mainwindow.h \
+		samplingthread.h \
+		opsettings.h \
+		plot.h \
+		blockio.h \
+		operationsettings.h \
+		inputmap.h
+	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o build/.obj/main.o main.cpp
+
+build/.obj/opsettings.o: opsettings.cpp opsettings.h \
+		signaldata.h
+	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o build/.obj/opsettings.o opsettings.cpp
+
+build/.obj/mtrx.o: ../../../include/mtrx.c ../../../include/mtrx.h
+	$(CC) -c $(CFLAGS) $(INCPATH) -o build/.obj/mtrx.o ../../../include/mtrx.c
+
+build/.obj/blockio.o: blockio.cpp blockio.h
+	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o build/.obj/blockio.o blockio.cpp
+
+build/.obj/inputmap.o: inputmap.cpp inputmap.h \
+		opsettings.h
+	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o build/.obj/inputmap.o inputmap.cpp
+
+build/.obj/moc_plot.o: build/.moc/moc_plot.cpp 
+	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o build/.obj/moc_plot.o build/.moc/moc_plot.cpp
+
+build/.obj/moc_knob.o: build/.moc/moc_knob.cpp 
+	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o build/.obj/moc_knob.o build/.moc/moc_knob.cpp
+
+build/.obj/moc_wheelbox.o: build/.moc/moc_wheelbox.cpp 
+	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o build/.obj/moc_wheelbox.o build/.moc/moc_wheelbox.cpp
+
+build/.obj/moc_samplingthread.o: build/.moc/moc_samplingthread.cpp 
+	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o build/.obj/moc_samplingthread.o build/.moc/moc_samplingthread.cpp
+
+build/.obj/moc_mainwindow.o: build/.moc/moc_mainwindow.cpp 
+	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o build/.obj/moc_mainwindow.o build/.moc/moc_mainwindow.cpp
+
+build/.obj/moc_opsettings.o: build/.moc/moc_opsettings.cpp 
+	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o build/.obj/moc_opsettings.o build/.moc/moc_opsettings.cpp
+
+build/.obj/moc_inputmap.o: build/.moc/moc_inputmap.cpp 
+	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o build/.obj/moc_inputmap.o build/.moc/moc_inputmap.cpp
+
+####### Install
+
+install:   FORCE
+
+uninstall:   FORCE
+
+FORCE:
+