Mirrors_Framework/paparazzi
1
0
Fork 0
mirror of https://github.com/paparazzi/paparazzi.git synced 2026-05-31 03:57:45 +08:00
Code Issues Actions 28 Packages Projects Releases Wiki Activity

Merge branch 'master' into dev

Browse Source
This commit is contained in:
Felix Ruess
2012-02-10 16:06:12 +01:00
parent c1e1cd3b6a d86b7b91f1
commit 3b90a341fe
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
conf/modules/baro_board.xml
+2
View File
@@ -19,6 +19,8 @@ else ifeq ($(BOARD), umarim)
ap.CFLAGS += -DUSE_I2C1 -DUSE_ADS1114_1 ap.CFLAGS += -DUSE_I2C1 -DUSE_ADS1114_1
ap.CFLAGS += -DADS1114_I2C_DEVICE=i2c1 ap.CFLAGS += -DADS1114_I2C_DEVICE=i2c1
ap.srcs += peripherals/ads1114.c ap.srcs += peripherals/ads1114.c
else ifeq ($(BOARD), lisa_l)
ap.CFLAGS += -DUSE_I2C2
endif endif
</raw> </raw>
</makefile> </makefile>
sw/ground_segment/tmtc/rotorcraft_server.ml
+4 -2
View File
@@ -174,11 +174,13 @@ let log_and_parse = fun ac_name (a:Aircraft.aircraft) msg values ->
a.roll <- foi32value "phi" /. angle_frac; a.roll <- foi32value "phi" /. angle_frac;
a.pitch <- foi32value "theta" /. angle_frac; a.pitch <- foi32value "theta" /. angle_frac;
a.throttle <- foi32value "thrust" /. 2.; (* thrust / 200 * 100 *) a.throttle <- foi32value "thrust" /. 2.; (* thrust / 200 * 100 *)
(*a.unix_time <- LL.unix_time_of_tow (truncate (fvalue "itow" /. 1000.));
a.itow <- Int32.of_float (fvalue "itow");*)
a.flight_time <- ivalue "flight_time"; a.flight_time <- ivalue "flight_time";
(*if a.gspeed > 3. && a.ap_mode = _AUTO2 then (*if a.gspeed > 3. && a.ap_mode = _AUTO2 then
Wind.update ac_name a.gspeed a.course*) Wind.update ac_name a.gspeed a.course*)
| "GPS_INT" ->
a.unix_time <- LL.unix_time_of_tow (truncate (fvalue "tow" /. 1000.));
a.itow <- Int32.of_float (fvalue "tow");
a.gps_Pacc <- ivalue "pacc"
| "ROTORCRAFT_STATUS" -> | "ROTORCRAFT_STATUS" ->
a.vehicle_type <- Rotorcraft; a.vehicle_type <- Rotorcraft;
a.fbw.rc_status <- get_rc_status (ivalue "rc_status"); a.fbw.rc_status <- get_rc_status (ivalue "rc_status");