rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-11-29 07:24:13 +01:00
Code Issues Releases Activity

Several small changes to OSX simulator.

Browse Source 
*Changed .gitignore to ignore OSXSIM build files
*Added SIMOSX define
*Changed tcp and udp ports to be consistent with SIMPOSIX.
This commit is contained in:
Laura Sebesta 2012-07-08 14:26:08 +02:00
parent a98991d8a1
commit bc5e428bfe
4 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@ -23,6 +23,9 @@
# /flight/PipBee/ # /flight/PipBee/
/flight/PipBee/Build /flight/PipBee/Build
# /flight/Project/OpenPilotOSX/
/flight/Project/OpenPilotOSX/build/
# /ground/ # /ground/
/ground/Build /ground/Build

2
flight/Modules/Battery/battery.c
View File

@ -131,7 +131,7 @@ static void onTimer(UAVObjEvent* ev)
//calculate the battery parameters //calculate the battery parameters
if (voltageADCPin >=0) { if (voltageADCPin >=0) {
flightBatteryData.Voltage = ((float)PIOS_ADC_PinGet(voltageADCPin)) * batterySettings.SensorCalibrations[FLIGHTBATTERYSETTINGS_SENSORCALIBRATIONS_VOLTAGEFACTOR]; //in Volts flightBatteryData.Voltage = ((float)PIOS_ADC_PinGet(voltageADCPin)) * batterySettings.SensorCalibrations[FLIGHTBATTERYSETTINGS_SENSORCALIBRATIONS_VOLTAGEFACTOR]; //in Volts
} }
if (currentADCPin >=0) { if (currentADCPin >=0) {
flightBatteryData.Current = ((float)PIOS_ADC_PinGet(currentADCPin)) * batterySettings.SensorCalibrations[FLIGHTBATTERYSETTINGS_SENSORCALIBRATIONS_CURRENTFACTOR]; //in Amps flightBatteryData.Current = ((float)PIOS_ADC_PinGet(currentADCPin)) * batterySettings.SensorCalibrations[FLIGHTBATTERYSETTINGS_SENSORCALIBRATIONS_CURRENTFACTOR]; //in Amps

1
flight/Revolution/System/inc/pios_config_sim.h
View File

@ -74,5 +74,6 @@
#define CPULOAD_LIMIT_CRITICAL 95 #define CPULOAD_LIMIT_CRITICAL 95
#define REVOLUTION #define REVOLUTION
#define SIM_OSX
#endif /* PIOS_CONFIG_POSIX_H */ #endif /* PIOS_CONFIG_POSIX_H */

4
flight/Revolution/System/pios_board_sim.c
View File

@ -52,12 +52,12 @@ void Stack_Change_Weak() {
const struct pios_tcp_cfg pios_tcp_telem_cfg = { const struct pios_tcp_cfg pios_tcp_telem_cfg = {
.ip = "0.0.0.0", .ip = "0.0.0.0",
.port = 9001, .port = 9000,
}; };
const struct pios_udp_cfg pios_udp_telem_cfg = { const struct pios_udp_cfg pios_udp_telem_cfg = {
.ip = "0.0.0.0", .ip = "0.0.0.0",
.port = 9001, .port = 9000,
}; };
const struct pios_tcp_cfg pios_tcp_gps_cfg = { const struct pios_tcp_cfg pios_tcp_gps_cfg = {