rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-02-18 08:54:15 +01:00
Code Issues Releases Activity

OP-95 Please pretty please this is a multiplatform project, check that your code compiles at least on Windows & Linux before sending anything!!!

Browse Source 
Unix (MacOS & Linux) = CASE SENSITIVE, no stray caps please
 Makefiles should not be included
 object_* should not be included


git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@1486 ebee16cc-31ac-478f-84a7-5cbb03baadba
This commit is contained in:
edouard 2010-08-31 12:21:06 +00:00 committed by edouard
parent 9e67c780da
commit 7956835163
12 changed files with 13 additions and 238 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

186
ground/src/plugins/hitlnew/Makefile
View File

@ -1,186 +0,0 @@
#############################################################################
# Makefile for building: HITLNEW
# Generated by qmake (2.01a) (Qt 4.6.2) on: ?? 28. ??? 19:28:31 2010
# Project: hitlnew.pro
# Template: lib
# Command: d:\qt\2010.02.1\qt\bin\qmake.exe -spec d:/Qt/2010.02.1/qt/mkspecs/win32-g++ -win32 -o Makefile hitlnew.pro
#############################################################################
first: debug
install: debug-install
uninstall: debug-uninstall
MAKEFILE = Makefile
QMAKE = d:/qt/2010.02.1/qt/bin/qmake.exe
DEL_FILE = rm
CHK_DIR_EXISTS= test -d
MKDIR = mkdir
COPY = cp
COPY_FILE = $(COPY)
COPY_DIR = xcopy /s /q /y /i
INSTALL_FILE = $(COPY_FILE)
INSTALL_PROGRAM = $(COPY_FILE)
INSTALL_DIR = $(COPY_DIR)
DEL_FILE = rm
SYMLINK =
DEL_DIR = rmdir
MOVE = mv
CHK_DIR_EXISTS= test -d
MKDIR = mkdir
SUBTARGETS = \
debug \
release
debug: $(MAKEFILE).Debug FORCE
$(MAKE) -f $(MAKEFILE).Debug
debug-make_default: $(MAKEFILE).Debug FORCE
$(MAKE) -f $(MAKEFILE).Debug
debug-make_first: $(MAKEFILE).Debug FORCE
$(MAKE) -f $(MAKEFILE).Debug first
debug-all: $(MAKEFILE).Debug FORCE
$(MAKE) -f $(MAKEFILE).Debug all
debug-clean: $(MAKEFILE).Debug FORCE
$(MAKE) -f $(MAKEFILE).Debug clean
debug-distclean: $(MAKEFILE).Debug FORCE
$(MAKE) -f $(MAKEFILE).Debug distclean
debug-install: $(MAKEFILE).Debug FORCE
$(MAKE) -f $(MAKEFILE).Debug install
debug-uninstall: $(MAKEFILE).Debug FORCE
$(MAKE) -f $(MAKEFILE).Debug uninstall
release: $(MAKEFILE).Release FORCE
$(MAKE) -f $(MAKEFILE).Release
release-make_default: $(MAKEFILE).Release FORCE
$(MAKE) -f $(MAKEFILE).Release
release-make_first: $(MAKEFILE).Release FORCE
$(MAKE) -f $(MAKEFILE).Release first
release-all: $(MAKEFILE).Release FORCE
$(MAKE) -f $(MAKEFILE).Release all
release-clean: $(MAKEFILE).Release FORCE
$(MAKE) -f $(MAKEFILE).Release clean
release-distclean: $(MAKEFILE).Release FORCE
$(MAKE) -f $(MAKEFILE).Release distclean
release-install: $(MAKEFILE).Release FORCE
$(MAKE) -f $(MAKEFILE).Release install
release-uninstall: $(MAKEFILE).Release FORCE
$(MAKE) -f $(MAKEFILE).Release uninstall
Makefile: hitlnew.pro d:/Qt/2010.02.1/qt/mkspecs/win32-g++/qmake.conf d:/Qt/2010.02.1/qt/mkspecs/qconfig.pri \
d:/Qt/2010.02.1/qt/mkspecs/features/qt_functions.prf \
d:/Qt/2010.02.1/qt/mkspecs/features/qt_config.prf \
d:/Qt/2010.02.1/qt/mkspecs/features/exclusive_builds.prf \
d:/Qt/2010.02.1/qt/mkspecs/features/default_pre.prf \
d:/Qt/2010.02.1/qt/mkspecs/features/win32/default_pre.prf \
../../../openpilotgcs.pri \
../../openpilotgcsplugin.pri \
../../libs/aggregation/aggregation.pri \
../../libs/extensionsystem/extensionsystem_dependencies.pri \
../../libs/extensionsystem/extensionsystem.pri \
../../libs/utils/utils.pri \
../../libs/libqxt/libqxt.pri \
../../libs/qextserialport/qextserialport.pri \
../coreplugin/coreplugin_dependencies.pri \
../coreplugin/coreplugin.pri \
../../libs/utils/utils.pri \
../uavobjects/uavobjects_dependencies.pri \
../uavobjects/uavobjects.pri \
../uavobjects/uavobjects.pri \
../coreplugin/coreplugin.pri \
../../libs/utils/utils.pri \
../uavtalk/uavtalk_dependencies.pri \
../uavtalk/uavtalk.pri \
../coreplugin/coreplugin.pri \
../../libs/utils/utils.pri \
hitlnew_dependencies.pri \
d:/Qt/2010.02.1/qt/mkspecs/features/debug.prf \
d:/Qt/2010.02.1/qt/mkspecs/features/debug_and_release.prf \
d:/Qt/2010.02.1/qt/mkspecs/features/default_post.prf \
d:/Qt/2010.02.1/qt/mkspecs/features/win32/default_post.prf \
d:/Qt/2010.02.1/qt/mkspecs/features/win32/rtti.prf \
d:/Qt/2010.02.1/qt/mkspecs/features/win32/exceptions.prf \
d:/Qt/2010.02.1/qt/mkspecs/features/win32/stl.prf \
d:/Qt/2010.02.1/qt/mkspecs/features/shared.prf \
d:/Qt/2010.02.1/qt/mkspecs/features/dll.prf \
d:/Qt/2010.02.1/qt/mkspecs/features/warn_on.prf \
d:/Qt/2010.02.1/qt/mkspecs/features/qt.prf \
d:/Qt/2010.02.1/qt/mkspecs/features/win32/thread.prf \
d:/Qt/2010.02.1/qt/mkspecs/features/moc.prf \
d:/Qt/2010.02.1/qt/mkspecs/features/win32/windows.prf \
d:/Qt/2010.02.1/qt/mkspecs/features/resources.prf \
d:/Qt/2010.02.1/qt/mkspecs/features/uic.prf \
d:/Qt/2010.02.1/qt/mkspecs/features/yacc.prf \
d:/Qt/2010.02.1/qt/mkspecs/features/lex.prf \
d:/Qt/2010.02.1/qt/mkspecs/features/include_source_dir.prf
$(QMAKE) -spec d:/Qt/2010.02.1/qt/mkspecs/win32-g++ -win32 -o Makefile hitlnew.pro
d:/Qt/2010.02.1/qt/mkspecs/qconfig.pri:
d:/Qt/2010.02.1/qt/mkspecs/features/qt_functions.prf:
d:/Qt/2010.02.1/qt/mkspecs/features/qt_config.prf:
d:/Qt/2010.02.1/qt/mkspecs/features/exclusive_builds.prf:
d:/Qt/2010.02.1/qt/mkspecs/features/default_pre.prf:
d:/Qt/2010.02.1/qt/mkspecs/features/win32/default_pre.prf:
../../../openpilotgcs.pri:
../../openpilotgcsplugin.pri:
../../libs/aggregation/aggregation.pri:
../../libs/extensionsystem/extensionsystem_dependencies.pri:
../../libs/extensionsystem/extensionsystem.pri:
../../libs/utils/utils.pri:
../../libs/libqxt/libqxt.pri:
../../libs/qextserialport/qextserialport.pri:
../coreplugin/coreplugin_dependencies.pri:
../coreplugin/coreplugin.pri:
../../libs/utils/utils.pri:
../uavobjects/uavobjects_dependencies.pri:
../uavobjects/uavobjects.pri:
../uavobjects/uavobjects.pri:
../coreplugin/coreplugin.pri:
../../libs/utils/utils.pri:
../uavtalk/uavtalk_dependencies.pri:
../uavtalk/uavtalk.pri:
../coreplugin/coreplugin.pri:
../../libs/utils/utils.pri:
hitlnew_dependencies.pri:
d:/Qt/2010.02.1/qt/mkspecs/features/debug.prf:
d:/Qt/2010.02.1/qt/mkspecs/features/debug_and_release.prf:
d:/Qt/2010.02.1/qt/mkspecs/features/default_post.prf:
d:/Qt/2010.02.1/qt/mkspecs/features/win32/default_post.prf:
d:/Qt/2010.02.1/qt/mkspecs/features/win32/rtti.prf:
d:/Qt/2010.02.1/qt/mkspecs/features/win32/exceptions.prf:
d:/Qt/2010.02.1/qt/mkspecs/features/win32/stl.prf:
d:/Qt/2010.02.1/qt/mkspecs/features/shared.prf:
d:/Qt/2010.02.1/qt/mkspecs/features/dll.prf:
d:/Qt/2010.02.1/qt/mkspecs/features/warn_on.prf:
d:/Qt/2010.02.1/qt/mkspecs/features/qt.prf:
d:/Qt/2010.02.1/qt/mkspecs/features/win32/thread.prf:
d:/Qt/2010.02.1/qt/mkspecs/features/moc.prf:
d:/Qt/2010.02.1/qt/mkspecs/features/win32/windows.prf:
d:/Qt/2010.02.1/qt/mkspecs/features/resources.prf:
d:/Qt/2010.02.1/qt/mkspecs/features/uic.prf:
d:/Qt/2010.02.1/qt/mkspecs/features/yacc.prf:
d:/Qt/2010.02.1/qt/mkspecs/features/lex.prf:
d:/Qt/2010.02.1/qt/mkspecs/features/include_source_dir.prf:
qmake: qmake_all FORCE
@$(QMAKE) -spec d:/Qt/2010.02.1/qt/mkspecs/win32-g++ -win32 -o Makefile hitlnew.pro
qmake_all: FORCE
make_default: debug-make_default release-make_default FORCE
make_first: debug-make_first release-make_first FORCE
all: debug-all release-all FORCE
clean: debug-clean release-clean FORCE
-$(DEL_FILE) d:/Qt/QtProjects/OpenPilot/OpenPilot/trunk/ground/lib/openpilotgcs/plugins/OpenPilot/libHITLNEW.a
distclean: debug-distclean release-distclean FORCE
-$(DEL_FILE) Makefile
debug-mocclean: $(MAKEFILE).Debug
$(MAKE) -f $(MAKEFILE).Debug mocclean
release-mocclean: $(MAKEFILE).Release
$(MAKE) -f $(MAKEFILE).Release mocclean
mocclean: debug-mocclean release-mocclean
debug-mocables: $(MAKEFILE).Debug
$(MAKE) -f $(MAKEFILE).Debug mocables
release-mocables: $(MAKEFILE).Release
$(MAKE) -f $(MAKEFILE).Release mocables
mocables: debug-mocables release-mocables
FORCE:
$(MAKEFILE).Debug: Makefile
$(MAKEFILE).Release: Makefile

2
ground/src/plugins/hitlnew/fgsimulator.cpp
View File

@ -193,7 +193,7 @@ void FGSimulator::processUpdate(QString& data)
float pressure = fields[20].toFloat() * INHG2KPA;
// Update AltitudeActual object
AltitudeActual::DataFields altActualData;
BaroAltitude::DataFields altActualData;
altActualData.Altitude = altitudeAGL;
altActualData.Temperature = temperature;
altActualData.Pressure = pressure;

2
ground/src/plugins/hitlnew/fgsimulator.h
View File

@ -29,7 +29,7 @@
#define FGSIMULATOR_H_H
#include <QObject>
#include "Simulator.h"
#include "simulator.h"
class FGSimulator: public Simulator
{

2
ground/src/plugins/hitlnew/hitlnew.pro
View File

@ -21,7 +21,7 @@ SOURCES += hitlplugin.cpp \
simulator.cpp \
il2simulator.cpp \
fgsimulator.cpp
OTHER_FILES += HITLNEW.pluginspec
OTHER_FILES += hitlnew.pluginspec
FORMS += hitloptionspage.ui \
hitlwidget.ui
RESOURCES += hitlresources.qrc

2
ground/src/plugins/hitlnew/hitloptionspage.cpp
View File

@ -33,7 +33,7 @@
#include <QFileDialog>
#include <QtAlgorithms>
#include <QStringList>
#include <Simulator.h>
#include <simulator.h>

2
ground/src/plugins/hitlnew/hitlplugin.h
View File

@ -31,7 +31,7 @@
#include <extensionsystem/iplugin.h>
#include <qstringlist.h>
#include <Simulator.h>
#include <simulator.h>
class HITLFactory;

4
ground/src/plugins/hitlnew/hitlwidget.cpp
View File

@ -33,7 +33,7 @@
#include <QDateTime>
#include <QThread>
#include <HITLPlugin.h>
#include <hitlplugin.h>
#include <simulator.h>
#include "uavobjects/uavobjectmanager.h"
#include "coreplugin/icore.h"
@ -74,7 +74,7 @@ HITLWidget::~HITLWidget()
void HITLWidget::startButtonClicked()
{
Qt::HANDLE mainThread = QThread::currentThread();
QThread* mainThread = QThread::currentThread();
qDebug() << "Main Thread: "<< mainThread;
// [1]

2
ground/src/plugins/hitlnew/il2simulator.cpp
View File

@ -208,7 +208,7 @@ void IL2Simulator::processUpdate(QString& data)
current.Y = old.Y + (current.dY*current.dT);
// Update AltitudeActual object
AltitudeActual::DataFields altActualData;
BaroAltitude::DataFields altActualData;
altActualData.Altitude = current.Z;
altActualData.Temperature = TEMP_GROUND + (current.Z * TEMP_LAPSE_RATE) - 273.0;
altActualData.Pressure = PRESSURE(current.Z)/1000.0; // kpa

20
ground/src/plugins/hitlnew/object_script.HITLNEW.Release
View File

@ -1,20 +0,0 @@
INPUT(
./release/hitlplugin.o
./release/hitlwidget.o
./release/hitloptionspage.o
./release/hitlfactory.o
./release/hitlconfiguration.o
./release/hitlgadget.o
./release/simulator.o
./release/il2simulator.o
./release/fgsimulator.o
./release/moc_hitlwidget.o
./release/moc_hitloptionspage.o
./release/moc_hitlfactory.o
./release/moc_hitlconfiguration.o
./release/moc_hitlgadget.o
./release/moc_simulator.o
./release/moc_fgsimulator.o
./release/moc_il2simulator.o
./release/qrc_hitlresources.o
);

20
ground/src/plugins/hitlnew/object_script.HITLNEWd.Debug
View File

@ -1,20 +0,0 @@
INPUT(
./debug/hitlplugin.o
./debug/hitlwidget.o
./debug/hitloptionspage.o
./debug/hitlfactory.o
./debug/hitlconfiguration.o
./debug/hitlgadget.o
./debug/simulator.o
./debug/il2simulator.o
./debug/fgsimulator.o
./debug/moc_hitlwidget.o
./debug/moc_hitloptionspage.o
./debug/moc_hitlfactory.o
./debug/moc_hitlconfiguration.o
./debug/moc_hitlgadget.o
./debug/moc_simulator.o
./debug/moc_fgsimulator.o
./debug/moc_il2simulator.o
./debug/qrc_hitlresources.o
);

4
ground/src/plugins/hitlnew/simulator.cpp
View File

@ -109,14 +109,14 @@ void Simulator::onStart()
{
QMutexLocker locker(&lock);
Qt::HANDLE mainThread = QThread::currentThread();
QThread* mainThread = QThread::currentThread();
qDebug() << "Simulator Thread: "<< mainThread;
// Get required UAVObjects
ExtensionSystem::PluginManager* pm = ExtensionSystem::PluginManager::instance();
UAVObjectManager* objManager = pm->getObject<UAVObjectManager>();
actDesired = ActuatorDesired::GetInstance(objManager);
altActual = AltitudeActual::GetInstance(objManager);
altActual = BaroAltitude::GetInstance(objManager);
attActual = AttitudeActual::GetInstance(objManager);
posActual = PositionActual::GetInstance(objManager);
telStats = GCSTelemetryStats::GetInstance(objManager);

5
ground/src/plugins/hitlnew/simulator.h
View File

@ -36,7 +36,8 @@
#include "uavtalk/telemetrymanager.h"
#include "uavobjects/uavobjectmanager.h"
#include "uavobjects/actuatordesired.h"
#include "uavobjects/altitudeactual.h"
// #include "uavobjects/altitudeactual.h"
#include "uavobjects/baroaltitude.h"
#include "uavobjects/attitudeactual.h"
#include "uavobjects/positionactual.h"
#include "uavobjects/gcstelemetrystats.h"
@ -142,7 +143,7 @@ protected:
QUdpSocket* outSocket;
ActuatorDesired* actDesired;
AltitudeActual* altActual;
BaroAltitude* altActual;
AttitudeActual* attActual;
PositionActual* posActual;
GCSTelemetryStats* telStats;