[paparazzi-commits] [paparazzi/paparazzi] bf0a6b: fucking git salsa

paparazzi-commits
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[paparazzi-commits] [paparazzi/paparazzi] bf0a6b: fucking git salsa

From:	noreply
Subject:	[paparazzi-commits] [paparazzi/paparazzi] bf0a6b: fucking git salsa
Date:	Wed, 2 Mar 2011 07:19:52 -0800
Branch: refs/heads/new-state-interface
Home:   https://github.com/paparazzi/paparazzi

Commit: bf0a6b2cd51d3c18b06dc6e545b2b324d30b9927
    
https://github.com/paparazzi/paparazzi/commit/bf0a6b2cd51d3c18b06dc6e545b2b324d30b9927
Author: Antoine Drouin <address@hidden>
Date:   2011-02-24 (Thu, 24 Feb 2011)

Changed paths:
  M sw/airborne/math/pprz_geodetic_double.c

Log Message:
-----------
fucking git salsa
Merge branch 'master' of github.com:paparazzi/paparazzi

Conflicts:
        sw/airborne/math/pprz_geodetic_double.c


Commit: 29e4f169ee05dc620e6c57bc1315b5a318dc127a
    
https://github.com/paparazzi/paparazzi/commit/29e4f169ee05dc620e6c57bc1315b5a318dc127a
Author: Antoine Drouin <address@hidden>
Date:   2011-02-24 (Thu, 24 Feb 2011)

Changed paths:
  M .gitignore
  M TODO
  M conf/airframes/jsbsim.xml
  A conf/simulator/Malolo1/Malolo1-IC.xml
  M sw/airborne/gps_ubx.c
  M sw/airborne/math/pprz_geodetic_double.c
  M sw/airborne/math/pprz_geodetic_double.h
  M sw/airborne/test/test_geodetic.c
  M sw/simulator/sim_ac_fw.c
  M sw/simulator/sim_ac_jsbsim.c

Log Message:
-----------
Merge branch 'master' of github.com:paparazzi/paparazzi

Conflicts:
        sw/airborne/math/pprz_geodetic_double.c


Commit: 4326f2a91c436a381736bea40ed4d3ced8a90414
    
https://github.com/paparazzi/paparazzi/commit/4326f2a91c436a381736bea40ed4d3ced8a90414
Author: Antoine Drouin <address@hidden>
Date:   2011-02-24 (Thu, 24 Feb 2011)

Changed paths:
  M sw/airborne/booz/test/booz2_test_radio_control.c

Log Message:
-----------
updated to use radio_control subsystem


Commit: 9297e4a8b56dfc410079f85946feb6db38cf21f0
    
https://github.com/paparazzi/paparazzi/commit/9297e4a8b56dfc410079f85946feb6db38cf21f0
Author: Antoine Drouin <address@hidden>
Date:   2011-02-24 (Thu, 24 Feb 2011)

Changed paths:
  M conf/autopilot/lisa_l_test_progs.makefile
  A sw/airborne/test/subsystems/test_radio_control.c

Log Message:
-----------
moved test_radio_control out of booz directory


Commit: f021bb635d104ba9ffee800a602143a766ebcbaf
    
https://github.com/paparazzi/paparazzi/commit/f021bb635d104ba9ffee800a602143a766ebcbaf
Author: Felix Ruess <address@hidden>
Date:   2011-02-24 (Thu, 24 Feb 2011)

Changed paths:
  M sw/airborne/math/pprz_geodetic_double.c

Log Message:
-----------
removed duplicate stuff in geodetic_double from merge


Commit: b44d3f7ab8458da6d79c9e92801bb48aed1dd057
    
https://github.com/paparazzi/paparazzi/commit/b44d3f7ab8458da6d79c9e92801bb48aed1dd057
Author: Antoine Drouin <address@hidden>
Date:   2011-02-24 (Thu, 24 Feb 2011)

Changed paths:
  M sw/airborne/math/pprz_geodetic_double.c

Log Message:
-----------
fixing unmerged previous commit


Commit: 854bcd589584d72adcdca5cfbb7a373780278e44
    
https://github.com/paparazzi/paparazzi/commit/854bcd589584d72adcdca5cfbb7a373780278e44
Author: Antoine Drouin <address@hidden>
Date:   2011-02-24 (Thu, 24 Feb 2011)

Changed paths:
  R sw/airborne/math/pprz_geodetic_double.c

Log Message:
-----------
Merge branch 'master' of github.com:paparazzi/paparazzi

Conflicts:
        sw/airborne/math/pprz_geodetic_double.c


Commit: 63921be99661098adb4ee74793f6b803d3cba8af
    
https://github.com/paparazzi/paparazzi/commit/63921be99661098adb4ee74793f6b803d3cba8af
Author: Antoine Drouin <address@hidden>
Date:   2011-02-24 (Thu, 24 Feb 2011)

Changed paths:
  A sw/airborne/math/pprz_geodetic_double.c

Log Message:
-----------
trying to restore the fucking file


Commit: d52860bf4cb1c8fddf64b8ed2e3a088c72351264
    
https://github.com/paparazzi/paparazzi/commit/d52860bf4cb1c8fddf64b8ed2e3a088c72351264
Author: Allen <address@hidden>
Date:   2011-02-24 (Thu, 24 Feb 2011)

Changed paths:
  M sw/airborne/subsystems/imu/imu_aspirin.h

Log Message:
-----------
Simplify aspirin event handler


Commit: ed226149fe86fb93910753ca79e65a80f0d15727
    
https://github.com/paparazzi/paparazzi/commit/ed226149fe86fb93910753ca79e65a80f0d15727
Author: Allen <address@hidden>
Date:   2011-02-24 (Thu, 24 Feb 2011)

Changed paths:
  M sw/airborne/subsystems/imu.h
  M sw/airborne/subsystems/imu/imu_aspirin.c
  M sw/airborne/subsystems/imu/imu_aspirin.h

Log Message:
-----------
Convert imu_aspirin event handler to static inline


Commit: 9d043a27ad294f1202d98bedcde6706c51e57e28
    
https://github.com/paparazzi/paparazzi/commit/9d043a27ad294f1202d98bedcde6706c51e57e28
Author: Allen <address@hidden>
Date:   2011-02-24 (Thu, 24 Feb 2011)

Changed paths:
  M sw/airborne/subsystems/imu/imu_aspirin.h

Log Message:
-----------
Minor fix for imu aspirin event handler


Commit: 03ba316f63555cf69946d202d99744f5b573d4fb
    
https://github.com/paparazzi/paparazzi/commit/03ba316f63555cf69946d202d99744f5b573d4fb
Author: Allen <address@hidden>
Date:   2011-02-24 (Thu, 24 Feb 2011)

Changed paths:
  M sw/airborne/subsystems/imu/imu_aspirin.h

Log Message:
-----------
Try to ony copy gyro data when it's fresh


Commit: 2225be9d8ab558b2b50278993ce779bb7adcdd46
    
https://github.com/paparazzi/paparazzi/commit/2225be9d8ab558b2b50278993ce779bb7adcdd46
Author: Allen <address@hidden>
Date:   2011-02-24 (Thu, 24 Feb 2011)

Changed paths:
  M sw/airborne/peripherals/hmc5843.c

Log Message:
-----------
Be a little more careful about calling arch_reset in hmc5843, and make
it optional (if gyros are also on i2c, it's better to let the
    gyro/aspirin driver handle reset)


Commit: ae2e4178b5a6c79f8664435dd46f096b360e68be
    
https://github.com/paparazzi/paparazzi/commit/ae2e4178b5a6c79f8664435dd46f096b360e68be
Author: Allen <address@hidden>
Date:   2011-02-24 (Thu, 24 Feb 2011)

Changed paths:
  M sw/airborne/subsystems/imu/imu_aspirin.h

Log Message:
-----------
Slight tweaks to imu_aspirin event handler


Commit: ab813e009657c41c4e20c59039326e2034f9ac1f
    
https://github.com/paparazzi/paparazzi/commit/ab813e009657c41c4e20c59039326e2034f9ac1f
Author: Allen <address@hidden>
Date:   2011-02-24 (Thu, 24 Feb 2011)

Changed paths:
  M sw/airborne/arch/stm32/mcu_periph/i2c_arch.c

Log Message:
-----------
I2C2: Don't bother generating stop in case of ACK error, let the hard reset
deal with things as they are


Commit: 15dd2e5ca3317bafeae91b6f76d5db66ca9b4109
    
https://github.com/paparazzi/paparazzi/commit/15dd2e5ca3317bafeae91b6f76d5db66ca9b4109
Author: Allen <address@hidden>
Date:   2011-02-24 (Thu, 24 Feb 2011)

Changed paths:
  M sw/airborne/arch/stm32/mcu_periph/i2c_arch.c

Log Message:
-----------
Add i2c2_hard_reset inline function to deal with reseting and possibly
unstucking the bus


Commit: 7c3d4455a56d4b3a7cf9ae72e59441006bc68d61
    
https://github.com/paparazzi/paparazzi/commit/7c3d4455a56d4b3a7cf9ae72e59441006bc68d61
Author: Christophe De Wagter <address@hidden>
Date:   2011-02-25 (Fri, 25 Feb 2011)

Changed paths:
  M sw/airborne/ap_downlink.h

Log Message:
-----------
float gyro and accel


Commit: ebce59b74840e7d7e615c63db3c643e366a97b42
    
https://github.com/paparazzi/paparazzi/commit/ebce59b74840e7d7e615c63db3c643e366a97b42
Author: Christophe De Wagter <address@hidden>
Date:   2011-02-25 (Fri, 25 Feb 2011)

Changed paths:
  M conf/airframes/TU_Delft/MicrojetCDW.xml

Log Message:
-----------
MicroJet IMU Flights


Commit: 932fdfbb99fe07bc1cff4841699c90574e7bec9e
    
https://github.com/paparazzi/paparazzi/commit/932fdfbb99fe07bc1cff4841699c90574e7bec9e
Author: Felix Ruess <address@hidden>
Date:   2011-02-25 (Fri, 25 Feb 2011)

Changed paths:
  M sw/airborne/math/pprz_geodetic_double.c
  M sw/airborne/math/pprz_geodetic_double.h
  M sw/airborne/math/pprz_geodetic_float.h
  M sw/airborne/math/pprz_geodetic_int.h

Log Message:
-----------
update comments on geodetic units and add UTMCoor_i


Commit: 92e70babc93f8350035a75578924cb17ed4d1043
    
https://github.com/paparazzi/paparazzi/commit/92e70babc93f8350035a75578924cb17ed4d1043
Author: Felix Ruess <address@hidden>
Date:   2011-02-25 (Fri, 25 Feb 2011)

Changed paths:
  M sw/airborne/math/pprz_geodetic_double.h
  M sw/airborne/math/pprz_geodetic_int.h

Log Message:
-----------
add alt to UTMCoor_* structs


Commit: 964cd3fadc0cb6eac031612ef2163b22171b3f77
    
https://github.com/paparazzi/paparazzi/commit/964cd3fadc0cb6eac031612ef2163b22171b3f77
Author: Felix Ruess <address@hidden>
Date:   2011-02-26 (Sat, 26 Feb 2011)

Changed paths:
  M conf/Makefile.lpc21
  M conf/Makefile.stm32

Log Message:
-----------
when compiling for stm32, first look for toolchain in ~/sat before trying 
/opt/paparazzi/stm32


Commit: 06845dbb4546b21dc15a44286f9f33d742c17b27
    
https://github.com/paparazzi/paparazzi/commit/06845dbb4546b21dc15a44286f9f33d742c17b27
Author: Felix Ruess <address@hidden>
Date:   2011-02-26 (Sat, 26 Feb 2011)

Changed paths:
  M sw/airborne/math/pprz_geodetic_double.c

Log Message:
-----------
use sin instead of sinf in geodetic_double


Commit: db2cd5c44b4aa99166b3a737452d496d63081939
    
https://github.com/paparazzi/paparazzi/commit/db2cd5c44b4aa99166b3a737452d496d63081939
Author: Felix Ruess <address@hidden>
Date:   2011-02-26 (Sat, 26 Feb 2011)

Changed paths:
  M sw/airborne/math/pprz_geodetic_double.c
  M sw/airborne/math/pprz_geodetic_double.h
  M sw/airborne/math/pprz_geodetic_float.h
  M sw/airborne/test/test_geodetic.c

Log Message:
-----------
added hmsl to floating point ltp_defs, also copy alt in lla_of_utm


Commit: e5c26601e0a979361cd2f5ca8532e2ffedaabe23
    
https://github.com/paparazzi/paparazzi/commit/e5c26601e0a979361cd2f5ca8532e2ffedaabe23
Author: Felix Ruess <address@hidden>
Date:   2011-03-01 (Tue, 01 Mar 2011)

Changed paths:
  M sw/airborne/subsystems/electrical.c

Log Message:
-----------
use a superellipse to estimate the current based on current throttle and the mA 
at full throttle; Define CURRENT_ESTIMATION_NONLINEARITY to set the 
nonlin-factor (default is 1.2)


Commit: dff6b5d3da4bd63c57eb1b038805e31bb91e8f4b
    
https://github.com/paparazzi/paparazzi/commit/dff6b5d3da4bd63c57eb1b038805e31bb91e8f4b
Author: Felix Ruess <address@hidden>
Date:   2011-03-01 (Tue, 01 Mar 2011)

Changed paths:
  M conf/Makefile.lpc21
  M conf/Makefile.stm32
  M conf/airframes/TU_Delft/MicrojetCDW.xml
  M conf/autopilot/lisa_l_test_progs.makefile
  M sw/airborne/ap_downlink.h
  M sw/airborne/arch/stm32/mcu_periph/i2c_arch.c
  M sw/airborne/booz/test/booz2_test_radio_control.c
  M sw/airborne/gps_ubx.c
  M sw/airborne/math/pprz_geodetic.h
  M sw/airborne/math/pprz_geodetic_double.c
  M sw/airborne/math/pprz_geodetic_double.h
  M sw/airborne/math/pprz_geodetic_float.h
  M sw/airborne/math/pprz_geodetic_int.h
  M sw/airborne/peripherals/hmc5843.c
  M sw/airborne/subsystems/electrical.c
  M sw/airborne/subsystems/imu.h
  M sw/airborne/subsystems/imu/imu_aspirin.c
  M sw/airborne/subsystems/imu/imu_aspirin.h
  A sw/airborne/test/subsystems/test_radio_control.c
  M sw/airborne/test/test_geodetic.c

Log Message:
-----------
Merge branch 'master' into new-state-interface


Compare: https://github.com/paparazzi/paparazzi/compare/4a1f803...dff6b5d
[Prev in Thread]
Current Thread
[Next in Thread]
[paparazzi-commits] [paparazzi/paparazzi] bf0a6b: fucking git salsa, noreply <=
Prev by Date: [paparazzi-commits] [paparazzi/paparazzi] 4a55b7: simulation works with arduimu module
Next by Date: [paparazzi-commits] [6438] Added Lisa/L board files under CC-BY-SA license.
Previous by thread: [paparazzi-commits] [paparazzi/paparazzi] 4a55b7: simulation works with arduimu module
Next by thread: [paparazzi-commits] [6438] Added Lisa/L board files under CC-BY-SA license.
Index(es):
- Date
- Thread