This list is sorted alphabetically by name
- -Connor Abbott -David Ankers -Sergiy Anikeyev -Pedro Assuncao -Fredrik Arvidsson -Werner Backes -Jose Barros -Pete Boehl -David Carlson -James Cotton -Steve Doll -Piotr Esden-Tempski -Richard Flay -Peter Farnworth -Ed Faulkner -Darren Furniss -Frederic Goddeeris -Daniel Godin -Bani Greyling -Nuno Guedes -Erik Gustavsson -Peter Gunnarsson -Dean Hall -Joe Hlebasko -Andy Honecker -Ryan Hunt -Mark James -Sami Korhonen -Thorsten Klose -Hallvard Kristiansen -Edouard Lafargue -Mike Labranche -Fredrik Larsson -Pablo Lema -David Llama -Matt Lipski -Les Newell -Ken Northup -Greg Matthews -Guy McCaldin -Gary Mortimer -Alessio Morale -Cathy Moss -Angus Peart -Dmytro Poplavskiy -Eric Price -Richard Querin -Randy Ram -Philippe Renon -Laurent Ribon -Mathieu Rondonneau -Julien Rouviere -Jackson Russell -Zik Saleeba -Professor Dale Schinstock -Professor Kenn Sebesta -Oleg Semyonov -Stacey Sheldon -Troy Schultz -Dr. Erhard Siegl -Mike Smith -Alex Sowa -Pete Stapley -Vova Starikh -Rowan Taubitz -Andrew Thoms -Philippe Vanhaesendonck -Jasper van Loenen -Vassilis Varveropoulos -Kevin Vertucio -Alex Vrubel -Brian Webb -Justin Welander -Mat Wellington -Kendal Wells -David Willis -Dmitriy Zaitsev -- - +Connor Abbott +David Ankers +Sergiy Anikeyev +Pedro Assuncao +Fredrik Arvidsson +Werner Backes +Jose Barros +Pete Boehl +David Carlson +James Cotton +Steve Doll +Piotr Esden-Tempski +Richard Flay +Peter Farnworth +Ed Faulkner +Darren Furniss +Frederic Goddeeris +Daniel Godin +Bani Greyling +Nuno Guedes +Erik Gustavsson +Peter Gunnarsson +Dean Hall +Joe Hlebasko +Andy Honecker +Ryan Hunt +Mark James +Sami Korhonen +Thorsten Klose +Hallvard Kristiansen +Edouard Lafargue +Mike Labranche +Fredrik Larsson +Pablo Lema +David Llama +Matt Lipski +Les Newell +Ken Northup +Greg Matthews +Guy McCaldin +Gary Mortimer +Alessio Morale +Cathy Moss +Angus Peart +Dmytro Poplavskiy +Eric Price +Richard Querin +Randy Ram +Philippe Renon +Laurent Ribon +Mathieu Rondonneau +Julien Rouviere +Jackson Russell +Zik Saleeba +Professor Dale Schinstock +Professor Kenn Sebesta +Oleg Semyonov +Stacey Sheldon +Troy Schultz +Dr. Erhard Siegl +Mike Smith +Alex Sowa +Pete Stapley +Vova Starikh +Rowan Taubitz +Andrew Thoms +Philippe Vanhaesendonck +Jasper van Loenen +Vassilis Varveropoulos +Kevin Vertucio +Alex Vrubel +Brian Webb +Justin Welander +Mat Wellington +Kendal Wells +David Willis +Dmitriy Zaitsev diff --git a/flight/modules/Actuator/actuator.c b/flight/modules/Actuator/actuator.c index 5e55c5b98..7d92efdf2 100644 --- a/flight/modules/Actuator/actuator.c +++ b/flight/modules/Actuator/actuator.c @@ -139,7 +139,7 @@ int32_t ActuatorInitialize() return 0; } -MODULE_INITCALL(ActuatorInitialize, ActuatorStart) +MODULE_INITCALL(ActuatorInitialize, ActuatorStart); /** * @brief Main Actuator module task diff --git a/flight/modules/Airspeed/revolution/airspeed.c b/flight/modules/Airspeed/revolution/airspeed.c index 340cb3315..c4a66f3fd 100644 --- a/flight/modules/Airspeed/revolution/airspeed.c +++ b/flight/modules/Airspeed/revolution/airspeed.c @@ -124,7 +124,7 @@ int32_t AirspeedInitialize() return 0; } -MODULE_INITCALL(AirspeedInitialize, AirspeedStart) +MODULE_INITCALL(AirspeedInitialize, AirspeedStart); /** diff --git a/flight/modules/Altitude/altitude.c b/flight/modules/Altitude/altitude.c index c6302c39f..6675fea65 100644 --- a/flight/modules/Altitude/altitude.c +++ b/flight/modules/Altitude/altitude.c @@ -122,7 +122,7 @@ int32_t AltitudeInitialize() HwSettingsCC_RcvrPortGet(&hwsettings_rcvrport); return 0; } -MODULE_INITCALL(AltitudeInitialize, AltitudeStart) +MODULE_INITCALL(AltitudeInitialize, AltitudeStart); /** * Module thread, should not return. */ diff --git a/flight/modules/Altitude/revolution/altitude.c b/flight/modules/Altitude/revolution/altitude.c index 53bcbe579..63e825cbd 100644 --- a/flight/modules/Altitude/revolution/altitude.c +++ b/flight/modules/Altitude/revolution/altitude.c @@ -82,7 +82,7 @@ int32_t AltitudeInitialize() #endif return 0; } -MODULE_INITCALL(AltitudeInitialize, AltitudeStart) +MODULE_INITCALL(AltitudeInitialize, AltitudeStart); /** * Module thread, should not return. */ diff --git a/flight/modules/AltitudeHold/altitudehold.c b/flight/modules/AltitudeHold/altitudehold.c index 823be87ca..fb4c0e498 100644 --- a/flight/modules/AltitudeHold/altitudehold.c +++ b/flight/modules/AltitudeHold/altitudehold.c @@ -104,7 +104,7 @@ int32_t AltitudeHoldInitialize() return 0; } -MODULE_INITCALL(AltitudeHoldInitialize, AltitudeHoldStart) +MODULE_INITCALL(AltitudeHoldInitialize, AltitudeHoldStart); float tau; float throttleIntegral; diff --git a/flight/modules/Attitude/attitude.c b/flight/modules/Attitude/attitude.c index 688d97dbc..d625661f9 100644 --- a/flight/modules/Attitude/attitude.c +++ b/flight/modules/Attitude/attitude.c @@ -170,7 +170,7 @@ int32_t AttitudeInitialize(void) return 0; } -MODULE_INITCALL(AttitudeInitialize, AttitudeStart) +MODULE_INITCALL(AttitudeInitialize, AttitudeStart); /** * Module thread, should not return. diff --git a/flight/modules/Attitude/revolution/attitude.c b/flight/modules/Attitude/revolution/attitude.c index 6334017e2..5144ff247 100644 --- a/flight/modules/Attitude/revolution/attitude.c +++ b/flight/modules/Attitude/revolution/attitude.c @@ -241,7 +241,7 @@ int32_t AttitudeStart(void) return 0; } -MODULE_INITCALL(AttitudeInitialize, AttitudeStart) +MODULE_INITCALL(AttitudeInitialize, AttitudeStart); /** * Module thread, should not return. diff --git a/flight/modules/Autotune/autotune.c b/flight/modules/Autotune/autotune.c index d14c75090..246180409 100644 --- a/flight/modules/Autotune/autotune.c +++ b/flight/modules/Autotune/autotune.c @@ -116,7 +116,7 @@ int32_t AutotuneStart(void) return 0; } -MODULE_INITCALL(AutotuneInitialize, AutotuneStart) +MODULE_INITCALL(AutotuneInitialize, AutotuneStart); /** * Module thread, should not return. diff --git a/flight/modules/Battery/battery.c b/flight/modules/Battery/battery.c index 66ed8893a..c3b3b2d1e 100644 --- a/flight/modules/Battery/battery.c +++ b/flight/modules/Battery/battery.c @@ -122,7 +122,7 @@ int32_t BatteryInitialize(void) return 0; } -MODULE_INITCALL(BatteryInitialize, 0) +MODULE_INITCALL(BatteryInitialize, 0); #define HAS_SENSOR(x) batterySettings.SensorType[x] == FLIGHTBATTERYSETTINGS_SENSORTYPE_ENABLED static void onTimer(__attribute__((unused)) UAVObjEvent *ev) { diff --git a/flight/modules/CameraStab/camerastab.c b/flight/modules/CameraStab/camerastab.c index 04350c033..0f927cbb9 100644 --- a/flight/modules/CameraStab/camerastab.c +++ b/flight/modules/CameraStab/camerastab.c @@ -142,7 +142,7 @@ int32_t CameraStabStart(void) return 0; } -MODULE_INITCALL(CameraStabInitialize, CameraStabStart) +MODULE_INITCALL(CameraStabInitialize, CameraStabStart); static void attitudeUpdated(UAVObjEvent *ev) { diff --git a/flight/modules/ComUsbBridge/ComUsbBridge.c b/flight/modules/ComUsbBridge/ComUsbBridge.c index 0a21fb605..11d0161be 100644 --- a/flight/modules/ComUsbBridge/ComUsbBridge.c +++ b/flight/modules/ComUsbBridge/ComUsbBridge.c @@ -125,7 +125,7 @@ static int32_t comUsbBridgeInitialize(void) return 0; } -MODULE_INITCALL(comUsbBridgeInitialize, comUsbBridgeStart) +MODULE_INITCALL(comUsbBridgeInitialize, comUsbBridgeStart); /** * Main task. It does not return. diff --git a/flight/modules/Example/example.c b/flight/modules/Example/example.c index 13bcaf539..fa62a5439 100644 --- a/flight/modules/Example/example.c +++ b/flight/modules/Example/example.c @@ -59,4 +59,4 @@ void ExampleInitialize(void) { ExampleModEventInitialize(); } -MODULE_INITCALL(ExampleInitialize, ExampleStart) +MODULE_INITCALL(ExampleInitialize, ExampleStart); diff --git a/flight/modules/Extensions/MagBaro/magbaro.c b/flight/modules/Extensions/MagBaro/magbaro.c index cc3835c54..ef478b57f 100644 --- a/flight/modules/Extensions/MagBaro/magbaro.c +++ b/flight/modules/Extensions/MagBaro/magbaro.c @@ -123,7 +123,7 @@ int32_t MagBaroInitialize() } return 0; } -MODULE_INITCALL(MagBaroInitialize, MagBaroStart) +MODULE_INITCALL(MagBaroInitialize, MagBaroStart); /** * Module thread, should not return. */ diff --git a/flight/modules/Fault/Fault.c b/flight/modules/Fault/Fault.c index 86c052ce0..023df2891 100644 --- a/flight/modules/Fault/Fault.c +++ b/flight/modules/Fault/Fault.c @@ -113,7 +113,7 @@ static int32_t fault_start(void) } return -1; } -MODULE_INITCALL(fault_initialize, fault_start) +MODULE_INITCALL(fault_initialize, fault_start); static void fault_task(__attribute__((unused)) void *parameters) { diff --git a/flight/modules/FirmwareIAP/firmwareiap.c b/flight/modules/FirmwareIAP/firmwareiap.c index 553eef2c6..8c425f699 100644 --- a/flight/modules/FirmwareIAP/firmwareiap.c +++ b/flight/modules/FirmwareIAP/firmwareiap.c @@ -86,7 +86,7 @@ static void resetTask(UAVObjEvent *); * \note * */ -MODULE_INITCALL(FirmwareIAPInitialize, 0) +MODULE_INITCALL(FirmwareIAPInitialize, 0); int32_t FirmwareIAPInitialize() { FirmwareIAPObjInitialize(); diff --git a/flight/modules/FixedWingPathFollower/fixedwingpathfollower.c b/flight/modules/FixedWingPathFollower/fixedwingpathfollower.c index fec984a87..ef7cf19ff 100644 --- a/flight/modules/FixedWingPathFollower/fixedwingpathfollower.c +++ b/flight/modules/FixedWingPathFollower/fixedwingpathfollower.c @@ -127,7 +127,7 @@ int32_t FixedWingPathFollowerInitialize() } return 0; } -MODULE_INITCALL(FixedWingPathFollowerInitialize, FixedWingPathFollowerStart) +MODULE_INITCALL(FixedWingPathFollowerInitialize, FixedWingPathFollowerStart); static float northVelIntegral = 0; static float eastVelIntegral = 0; diff --git a/flight/modules/FlightPlan/flightplan.c b/flight/modules/FlightPlan/flightplan.c index 545b4b437..0341263cb 100644 --- a/flight/modules/FlightPlan/flightplan.c +++ b/flight/modules/FlightPlan/flightplan.c @@ -93,7 +93,7 @@ int32_t FlightPlanInitialize() return 0; } -MODULE_INITCALL(FlightPlanInitialize, FlightPlanStart) +MODULE_INITCALL(FlightPlanInitialize, FlightPlanStart); /** * Module task */ diff --git a/flight/modules/GPS/GPS.c b/flight/modules/GPS/GPS.c index 0fdb9142e..0caeaf140 100644 --- a/flight/modules/GPS/GPS.c +++ b/flight/modules/GPS/GPS.c @@ -190,7 +190,7 @@ int32_t GPSInitialize(void) return -1; } -MODULE_INITCALL(GPSInitialize, GPSStart) +MODULE_INITCALL(GPSInitialize, GPSStart); // **************** /** diff --git a/flight/modules/ManualControl/manualcontrol.c b/flight/modules/ManualControl/manualcontrol.c index aac310600..8620da5e0 100644 --- a/flight/modules/ManualControl/manualcontrol.c +++ b/flight/modules/ManualControl/manualcontrol.c @@ -162,7 +162,7 @@ int32_t ManualControlInitialize() return 0; } -MODULE_INITCALL(ManualControlInitialize, ManualControlStart) +MODULE_INITCALL(ManualControlInitialize, ManualControlStart); /** * Module task diff --git a/flight/modules/OPLink/oplinkmod.c b/flight/modules/OPLink/oplinkmod.c index 3947ee569..9b2b068a2 100644 --- a/flight/modules/OPLink/oplinkmod.c +++ b/flight/modules/OPLink/oplinkmod.c @@ -117,7 +117,7 @@ int32_t OPLinkModInitialize(void) return 0; } -MODULE_INITCALL(OPLinkModInitialize, 0) +MODULE_INITCALL(OPLinkModInitialize, 0); /** * System task, periodically executes every SYSTEM_UPDATE_PERIOD_MS diff --git a/flight/modules/Osd/WavPlayer/wavplayer.c b/flight/modules/Osd/WavPlayer/wavplayer.c index bb1fd93dd..a4046fa4e 100644 --- a/flight/modules/Osd/WavPlayer/wavplayer.c +++ b/flight/modules/Osd/WavPlayer/wavplayer.c @@ -68,7 +68,7 @@ int32_t WavPlayerInitialize(void) { return 0; } -MODULE_INITCALL(WavPlayerInitialize, WavPlayerStart) +MODULE_INITCALL(WavPlayerInitialize, WavPlayerStart); // **************** /** diff --git a/flight/modules/Osd/osdgen/osdgen.c b/flight/modules/Osd/osdgen/osdgen.c index 654b0aeef..41c0f217b 100644 --- a/flight/modules/Osd/osdgen/osdgen.c +++ b/flight/modules/Osd/osdgen/osdgen.c @@ -2436,7 +2436,7 @@ int32_t osdgenInitialize(void) return 0; } -MODULE_INITCALL(osdgenInitialize, osdgenStart) +MODULE_INITCALL(osdgenInitialize, osdgenStart); // **************** /** diff --git a/flight/modules/Osd/osdinput/osdinput.c b/flight/modules/Osd/osdinput/osdinput.c index 6387eeb27..78db66f2f 100644 --- a/flight/modules/Osd/osdinput/osdinput.c +++ b/flight/modules/Osd/osdinput/osdinput.c @@ -107,7 +107,7 @@ int32_t osdinputInitialize(void) return 0; } -MODULE_INITCALL(osdinputInitialize, osdinputStart) +MODULE_INITCALL(osdinputInitialize, osdinputStart); // **************** /** diff --git a/flight/modules/Osd/osdoutput/osdoutput.c b/flight/modules/Osd/osdoutput/osdoutput.c index e6e5ff023..904a1b8e9 100644 --- a/flight/modules/Osd/osdoutput/osdoutput.c +++ b/flight/modules/Osd/osdoutput/osdoutput.c @@ -286,7 +286,7 @@ static int32_t osdoutputInitialize(void) #endif return 0; } -MODULE_INITCALL(osdoutputInitialize, osdoutputStart) +MODULE_INITCALL(osdoutputInitialize, osdoutputStart); /** * @} diff --git a/flight/modules/OveroSync/overosync.c b/flight/modules/OveroSync/overosync.c index 039bd35cb..e191b26c1 100644 --- a/flight/modules/OveroSync/overosync.c +++ b/flight/modules/OveroSync/overosync.c @@ -136,7 +136,7 @@ int32_t OveroSyncStart(void) return 0; } -MODULE_INITCALL(OveroSyncInitialize, OveroSyncStart) +MODULE_INITCALL(OveroSyncInitialize, OveroSyncStart); /** * Register a new object, adds object to local list and connects the queue depending on the object's diff --git a/flight/modules/OveroSync/simulated/overosync.c b/flight/modules/OveroSync/simulated/overosync.c index 291765f8a..0bbf570af 100644 --- a/flight/modules/OveroSync/simulated/overosync.c +++ b/flight/modules/OveroSync/simulated/overosync.c @@ -138,7 +138,7 @@ int32_t OveroSyncStart(void) return 0; } -MODULE_INITCALL(OveroSyncInitialize, OveroSyncStart) +MODULE_INITCALL(OveroSyncInitialize, OveroSyncStart); /** * Register a new object, adds object to local list and connects the queue depending on the object's diff --git a/flight/modules/PathPlanner/pathplanner.c b/flight/modules/PathPlanner/pathplanner.c index 30bd42fa3..949919d5f 100644 --- a/flight/modules/PathPlanner/pathplanner.c +++ b/flight/modules/PathPlanner/pathplanner.c @@ -111,7 +111,7 @@ int32_t PathPlannerInitialize() return 0; } -MODULE_INITCALL(PathPlannerInitialize, PathPlannerStart) +MODULE_INITCALL(PathPlannerInitialize, PathPlannerStart); /** * Module task diff --git a/flight/modules/RadioComBridge/RadioComBridge.c b/flight/modules/RadioComBridge/RadioComBridge.c index 125a14de7..cbf3608ed 100644 --- a/flight/modules/RadioComBridge/RadioComBridge.c +++ b/flight/modules/RadioComBridge/RadioComBridge.c @@ -246,7 +246,7 @@ static int32_t RadioComBridgeInitialize(void) return 0; } -MODULE_INITCALL(RadioComBridgeInitialize, RadioComBridgeStart) +MODULE_INITCALL(RadioComBridgeInitialize, RadioComBridgeStart); /** * Telemetry transmit task, regular priority diff --git a/flight/modules/Sensors/sensors.c b/flight/modules/Sensors/sensors.c index 52ed09855..cf659013b 100644 --- a/flight/modules/Sensors/sensors.c +++ b/flight/modules/Sensors/sensors.c @@ -143,7 +143,7 @@ int32_t SensorsStart(void) return 0; } -MODULE_INITCALL(SensorsInitialize, SensorsStart) +MODULE_INITCALL(SensorsInitialize, SensorsStart); int32_t accel_test; int32_t gyro_test; diff --git a/flight/modules/Sensors/simulated/sensors.c b/flight/modules/Sensors/simulated/sensors.c index 6f973f2f5..769c17b79 100644 --- a/flight/modules/Sensors/simulated/sensors.c +++ b/flight/modules/Sensors/simulated/sensors.c @@ -138,7 +138,7 @@ int32_t SensorsStart(void) return 0; } -MODULE_INITCALL(SensorsInitialize, SensorsStart) +MODULE_INITCALL(SensorsInitialize, SensorsStart); /** * Simulated sensor task. Run a model of the airframe and produce sensor values diff --git a/flight/modules/Stabilization/stabilization.c b/flight/modules/Stabilization/stabilization.c index 3a8a464e8..36bfeacc6 100644 --- a/flight/modules/Stabilization/stabilization.c +++ b/flight/modules/Stabilization/stabilization.c @@ -138,7 +138,7 @@ int32_t StabilizationInitialize() return 0; } -MODULE_INITCALL(StabilizationInitialize, StabilizationStart) +MODULE_INITCALL(StabilizationInitialize, StabilizationStart); /** * Module task diff --git a/flight/modules/System/systemmod.c b/flight/modules/System/systemmod.c index 4ee66f54f..ef92a326e 100644 --- a/flight/modules/System/systemmod.c +++ b/flight/modules/System/systemmod.c @@ -154,7 +154,7 @@ int32_t SystemModInitialize(void) return 0; } -MODULE_INITCALL(SystemModInitialize, 0) +MODULE_INITCALL(SystemModInitialize, 0); /** * System task, periodically executes every SYSTEM_UPDATE_PERIOD_MS */ diff --git a/flight/modules/Telemetry/telemetry.c b/flight/modules/Telemetry/telemetry.c index a2abfffe5..1eccd33d5 100644 --- a/flight/modules/Telemetry/telemetry.c +++ b/flight/modules/Telemetry/telemetry.c @@ -148,7 +148,7 @@ int32_t TelemetryInitialize(void) return 0; } -MODULE_INITCALL(TelemetryInitialize, TelemetryStart) +MODULE_INITCALL(TelemetryInitialize, TelemetryStart); /** * Register a new object, adds object to local list and connects the queue depending on the object's diff --git a/flight/modules/TxPID/txpid.c b/flight/modules/TxPID/txpid.c index 9f9c5f2cf..96ffdd156 100644 --- a/flight/modules/TxPID/txpid.c +++ b/flight/modules/TxPID/txpid.c @@ -138,7 +138,7 @@ int32_t TxPIDStart(void) return 0; } -MODULE_INITCALL(TxPIDInitialize, TxPIDStart) +MODULE_INITCALL(TxPIDInitialize, TxPIDStart); /** * Update PIDs callback function diff --git a/flight/modules/VtolPathFollower/vtolpathfollower.c b/flight/modules/VtolPathFollower/vtolpathfollower.c index b07601c0c..83e0ee553 100644 --- a/flight/modules/VtolPathFollower/vtolpathfollower.c +++ b/flight/modules/VtolPathFollower/vtolpathfollower.c @@ -147,7 +147,7 @@ int32_t VtolPathFollowerInitialize() return 0; } -MODULE_INITCALL(VtolPathFollowerInitialize, VtolPathFollowerStart) +MODULE_INITCALL(VtolPathFollowerInitialize, VtolPathFollowerStart); static float northVelIntegral = 0; static float eastVelIntegral = 0; diff --git a/flight/pios/inc/pios_initcall.h b/flight/pios/inc/pios_initcall.h index 6614b48dd..2b9f32418 100644 --- a/flight/pios/inc/pios_initcall.h +++ b/flight/pios/inc/pios_initcall.h @@ -86,8 +86,8 @@ extern void StartModules(); __attribute__((__section__(".initcall" level ".init"))) = fn #define __define_module_initcall(level, ifn, sfn) \ - static initmodule_t __initcall_##fn __attribute__((__used__)) \ - __attribute__((__section__(".initcall" level ".init"))) = { .fn_minit = ifn, .fn_tinit = sfn }; + static initmodule_t __initcall_##ifn __attribute__((__used__)) \ + __attribute__((__section__(".initcall" level ".init"))) = { .fn_minit = ifn, .fn_tinit = sfn } #define MODULE_INITCALL(ifn, sfn) __define_module_initcall("module", ifn, sfn) diff --git a/ground/.gitattributes b/ground/.gitattributes index 0417f63e1..42263f54b 100644 --- a/ground/.gitattributes +++ b/ground/.gitattributes @@ -3,6 +3,9 @@ # http://wiki.openpilot.org/display/Doc/Coding+Style # +*.pri text eol=crlf +*.pro text eol=crlf + *.c text eol=crlf *.cpp text eol=crlf *.h text eol=crlf @@ -13,9 +16,9 @@ *.qml text eol=crlf *.pluginspec text eol=crlf -*.pri text eol=crlf -*.pro text eol=crlf - *.h.template text eol=crlf *.c.template text eol=crlf *.cpp.template text eol=crlf +*.qml.template text eol=crlf + +*.py text eol=lf diff --git a/ground/openpilotgcs/src/libs/version_info/version_info.pro b/ground/openpilotgcs/src/libs/version_info/version_info.pro index a00cb8424..ce51ff076 100644 --- a/ground/openpilotgcs/src/libs/version_info/version_info.pro +++ b/ground/openpilotgcs/src/libs/version_info/version_info.pro @@ -2,6 +2,7 @@ TEMPLATE = lib TARGET = VersionInfo include(../../openpilotgcslibrary.pri) +include(../../python.pri) HEADERS = version_info.h SOURCES = version_info.cpp @@ -13,31 +14,8 @@ SOURCES = version_info.cpp # the other dependencies evaluation. # -# We use python to extract git version info, but it may be installed locally. -# This expected python version should be kept in sync with make/tools.mk. -PYTHON_DIR = python-2.7.4 - # Since debug_and_release option is set, we need this !debug_and_release|build_pass { - - ROOT_DIR = $$GCS_SOURCE_TREE/../.. - - # Search the python using environment override first - OPENPILOT_TOOLS_DIR = $$(OPENPILOT_TOOLS_DIR) - !isEmpty(OPENPILOT_TOOLS_DIR):exists($$OPENPILOT_TOOLS_DIR/$$PYTHON_DIR/python*) { - PYTHON = \"$$OPENPILOT_TOOLS_DIR/$$PYTHON_DIR/python\" - } else { - # If not found, search the predefined tools path - exists($$ROOT_DIR/tools/$$PYTHON_DIR/python*) { - PYTHON = \"$$ROOT_DIR/tools/$$PYTHON_DIR/python\" - } else { - # not found, hope it's in the path... - PYTHON = \"python\" - } - } - PYTHON = $$replace(PYTHON, \\\\, /) - message(Using python interpreter: $$PYTHON) - # Define other variables VERSION_INFO_DIR = $$GCS_BUILD_TREE/../openpilotgcs-synthetics VERSION_INFO_SCRIPT = $$ROOT_DIR/make/scripts/version-info.py diff --git a/ground/openpilotgcs/src/plugins/coreplugin/CREDITS-utility.html b/ground/openpilotgcs/src/plugins/coreplugin/CREDITS-utility.html deleted file mode 100644 index 4e6258b52..000000000 --- a/ground/openpilotgcs/src/plugins/coreplugin/CREDITS-utility.html +++ /dev/null @@ -1,41 +0,0 @@ - - - -
This utility will parse a \n delimited list of names and generate ListElement components for entry into the QML model located in /qml/AuthorsModel.qml.
- - - - - -