From eef2792d39b62f0a025ae7f80f3e372e3dc47a31 Mon Sep 17 00:00:00 2001 From: Gautier Hattenberger Date: Fri, 12 Nov 2021 15:39:00 +0100 Subject: [PATCH] [modules] move datalink from subsystems to modules --- conf/firmwares/setup.makefile | 2 +- conf/firmwares/test_chibios.makefile | 2 +- conf/firmwares/test_progs.makefile | 4 ++-- conf/flight_plans/AGGIEAIR/BasicTuning_BlueRoom2.xml | 2 +- conf/flight_plans/AGGIEAIR/BasicTuning_Launcher.xml | 2 +- .../AGGIEAIR/CachJct_Gallo_temp_rect_survey.xml | 2 +- conf/flight_plans/ENAC/dw1000_basic.xml | 2 +- conf/flight_plans/ENAC/fish_outdoor.xml | 2 +- .../flight_plans/OPENUAS/include_obc2014_mission.xml | 2 +- .../OPENUAS/openuas_nav_modules_test.xml | 2 +- .../OPENUAS/openuas_rotorcraft_simple.xml | 2 +- .../OPENUAS/openuas_tuning_a_fresh_fixedwing.xml | 2 +- .../OPENUAS/openuas_versatile_unified.xml | 2 +- conf/flight_plans/basic.xml | 2 +- conf/flight_plans/basic_sim.xml | 2 +- conf/flight_plans/competitions/IMAV2014_carto.xml | 2 +- conf/flight_plans/competitions/IMAV2014_digit.xml | 2 +- conf/flight_plans/competitions/IMAV2014_vision.xml | 2 +- conf/flight_plans/competitions/IMAV2018_carto.xml | 2 +- conf/flight_plans/competitions/IMAV2019_carto.xml | 2 +- conf/flight_plans/competitions/IMAV2019_drop.xml | 2 +- conf/flight_plans/dynamic_sectors.xml | 2 +- conf/flight_plans/joystick.xml | 2 +- conf/flight_plans/nav_modules.xml | 2 +- .../rotorcraft_basic_superbitrf_from_hand.xml | 2 +- conf/flight_plans/tcas.xml | 2 +- .../tudelft/course_orangeavoid_cyberzoo.xml | 2 +- .../tudelft/course_orangeavoid_cyberzoo_guided.xml | 2 +- conf/flight_plans/tudelft/delft_basic.xml | 2 +- conf/flight_plans/tudelft/delft_bebop.xml | 2 +- conf/flight_plans/tudelft/nederdrone_cyberzoo.xml | 2 +- conf/flight_plans/tudelft/nederdrone_valkenburg.xml | 2 +- .../tudelft/ralphthesis2020_stereo_cyberzoo.xml | 2 +- .../tudelft/rotorcraft_optitrack_path.xml | 2 +- conf/flight_plans/tudelft/train_safe_zoo.xml | 2 +- conf/flight_plans/versatile.xml | 2 +- conf/flight_plans/versatile_airspeed.xml | 2 +- conf/flight_plans/zamboni_survey_test.xml | 2 +- conf/modules/datalink_common.xml | 12 ++++++------ conf/modules/radio_control_superbitrf_rc.xml | 10 +++++----- conf/modules/telemetry_bluegiga.xml | 2 +- conf/modules/telemetry_superbitrf.xml | 4 ++-- conf/modules/telemetry_transparent.xml | 2 +- conf/modules/telemetry_transparent_frsky_x.xml | 6 +++--- conf/modules/telemetry_w5100.xml | 4 ++-- conf/settings/nps.xml | 2 +- conf/settings/superbitrf.xml | 6 +++--- .../{subsystems => modules}/datalink/superbitrf.c | 4 ++-- .../{subsystems => modules}/datalink/superbitrf.h | 2 +- sw/airborne/arch/sim/sim_ap.c | 4 ++-- sw/airborne/autopilot.c | 2 +- sw/airborne/boards/apogee/imu_apogee.c | 2 +- sw/airborne/boards/ardrone/navdata.c | 2 +- sw/airborne/boards/baro_board_ms5611_i2c.c | 2 +- sw/airborne/boards/baro_board_ms5611_spi.c | 2 +- sw/airborne/boards/bebop/actuators.c | 2 +- sw/airborne/boards/krooz/imu_krooz.c | 2 +- sw/airborne/firmwares/demo/demo_ahrs_actuators.c | 6 +++--- sw/airborne/firmwares/fixedwing/autopilot_firmware.c | 2 +- .../firmwares/fixedwing/autopilot_generated.c | 2 +- sw/airborne/firmwares/fixedwing/autopilot_static.c | 2 +- sw/airborne/firmwares/fixedwing/fixedwing_datalink.c | 4 ++-- sw/airborne/firmwares/fixedwing/main_chibios.c | 2 +- sw/airborne/firmwares/fixedwing/main_fbw.c | 2 +- sw/airborne/firmwares/fixedwing/nav.c | 2 +- .../fixedwing/stabilization/stabilization_adaptive.c | 2 +- .../fixedwing/stabilization/stabilization_attitude.c | 2 +- .../firmwares/rotorcraft/autopilot_firmware.c | 2 +- .../firmwares/rotorcraft/autopilot_generated.c | 2 +- .../firmwares/rotorcraft/guidance/guidance_h.c | 2 +- .../firmwares/rotorcraft/guidance/guidance_hybrid.c | 2 +- .../rotorcraft/guidance/guidance_indi_hybrid.c | 2 +- .../firmwares/rotorcraft/guidance/guidance_v.c | 2 +- sw/airborne/firmwares/rotorcraft/navigation.c | 4 ++-- .../firmwares/rotorcraft/rotorcraft_datalink.c | 2 +- .../stabilization_attitude_euler_float.c | 2 +- .../stabilization/stabilization_attitude_euler_int.c | 2 +- .../stabilization/stabilization_attitude_heli_indi.c | 2 +- .../stabilization_attitude_quat_float.c | 2 +- .../stabilization/stabilization_attitude_quat_int.c | 2 +- .../rotorcraft/stabilization/stabilization_indi.c | 2 +- .../stabilization/stabilization_indi_simple.c | 2 +- .../rotorcraft/stabilization/stabilization_rate.c | 2 +- .../stabilization/stabilization_rate_indi.c | 2 +- sw/airborne/firmwares/rover/autopilot_firmware.c | 2 +- sw/airborne/firmwares/rover/autopilot_generated.c | 2 +- .../firmwares/rover/guidance/rover_guidance.c | 2 +- .../rover/guidance/rover_guidance_holonomic.c | 2 +- sw/airborne/firmwares/rover/navigation.c | 4 ++-- sw/airborne/firmwares/rover/rover_datalink.c | 2 +- sw/airborne/firmwares/setup/setup_actuators.c | 4 ++-- sw/airborne/firmwares/tutorial/main_demo3.c | 2 +- sw/airborne/firmwares/tutorial/main_demo4.c | 2 +- sw/airborne/firmwares/tutorial/main_demo5.c | 2 +- sw/airborne/firmwares/tutorial/main_demo6.c | 2 +- sw/airborne/link_mcu_can.c | 2 +- sw/airborne/link_mcu_spi.c | 2 +- sw/airborne/link_mcu_usart.c | 2 +- sw/airborne/mcu_periph/i2c.c | 2 +- sw/airborne/mcu_periph/softi2c.c | 2 +- sw/airborne/mcu_periph/uart.c | 2 +- sw/airborne/modules/actuators/actuators_uavcan.c | 2 +- sw/airborne/modules/actuators/motor_mixing.c | 2 +- sw/airborne/modules/adcs/adc_generic.c | 4 ++-- sw/airborne/modules/adcs/battery_monitor.c | 2 +- sw/airborne/modules/adcs/max11040.c | 2 +- sw/airborne/modules/ahrs/ahrs_aligner.c | 2 +- sw/airborne/modules/ahrs/ahrs_chimu_spi.c | 2 +- sw/airborne/modules/ahrs/ahrs_chimu_uart.c | 2 +- sw/airborne/modules/ahrs/ahrs_float_cmpl_wrapper.c | 2 +- sw/airborne/modules/ahrs/ahrs_float_dcm.c | 2 +- sw/airborne/modules/ahrs/ahrs_float_dcm_wrapper.c | 2 +- sw/airborne/modules/ahrs/ahrs_float_invariant.c | 2 +- .../modules/ahrs/ahrs_float_invariant_wrapper.c | 2 +- sw/airborne/modules/ahrs/ahrs_float_mlkf_wrapper.c | 2 +- sw/airborne/modules/ahrs/ahrs_gx3.c | 2 +- .../modules/ahrs/ahrs_int_cmpl_quat_wrapper.c | 2 +- sw/airborne/modules/ahrs/ahrs_madgwick_wrapper.c | 2 +- sw/airborne/modules/ahrs/ahrs_vectornav.c | 2 +- sw/airborne/modules/ahrs/ahrs_vectornav_wrapper.c | 2 +- sw/airborne/modules/air_data/air_data.c | 2 +- sw/airborne/modules/benchmark/flight_benchmark.c | 2 +- sw/airborne/modules/calibration/mag_calib_ukf.c | 2 +- .../modules/calibration/send_imu_mag_current.c | 2 +- sw/airborne/modules/cam_control/cam.c | 2 +- sw/airborne/modules/cam_control/rotorcraft_cam.c | 2 +- .../modules/computer_vision/cv_georeference.c | 2 +- .../modules/computer_vision/cv_target_localization.c | 2 +- sw/airborne/modules/computer_vision/detect_gate.c | 2 +- .../modules/computer_vision/opticflow_module.c | 2 +- sw/airborne/modules/computer_vision/qrcode/qr_code.c | 2 +- sw/airborne/modules/core/rtos_mon.c | 2 +- sw/airborne/modules/core/sys_mon.c | 2 +- sw/airborne/modules/ctrl/ctrl_windtunnel.c | 2 +- sw/airborne/modules/ctrl/follow_me.c | 2 +- sw/airborne/modules/ctrl/object_tracking.c | 2 +- sw/airborne/modules/ctrl/optical_flow_hover.c | 2 +- sw/airborne/modules/ctrl/optical_flow_landing.c | 2 +- sw/airborne/modules/ctrl/shift_tracking.c | 2 +- .../{subsystems => modules}/datalink/bluegiga.c | 6 +++--- .../{subsystems => modules}/datalink/bluegiga.h | 8 ++++---- sw/airborne/modules/datalink/bluegiga_dl.c | 4 ++-- sw/airborne/modules/datalink/bluegiga_dl.h | 2 +- .../{subsystems => modules}/datalink/datalink.c | 4 ++-- .../{subsystems => modules}/datalink/datalink.h | 0 .../{subsystems => modules}/datalink/downlink.c | 6 +++--- .../{subsystems => modules}/datalink/downlink.h | 2 +- sw/airborne/modules/datalink/extra_pprz_dl.c | 2 +- sw/airborne/modules/datalink/extra_pprz_dl.h | 2 +- .../{subsystems => modules}/datalink/frsky_x.c | 4 ++-- .../{subsystems => modules}/datalink/frsky_x.h | 0 sw/airborne/modules/datalink/gec_dl.c | 4 ++-- sw/airborne/modules/datalink/ivy_dl.c | 2 +- sw/airborne/modules/datalink/mavlink.c | 2 +- sw/airborne/modules/datalink/mavlink_decoder.c | 2 +- sw/airborne/modules/datalink/pprz_dl.c | 2 +- sw/airborne/modules/datalink/pprz_dl.h | 2 +- .../{subsystems => modules}/datalink/superbitrf.c | 6 +++--- .../{subsystems => modules}/datalink/superbitrf.h | 4 ++-- .../{subsystems => modules}/datalink/telemetry.c | 6 +++--- .../{subsystems => modules}/datalink/telemetry.h | 6 +++--- .../datalink/telemetry_common.h | 2 +- .../{subsystems => modules}/datalink/uart_print.h | 0 sw/airborne/{subsystems => modules}/datalink/w5100.c | 4 ++-- sw/airborne/{subsystems => modules}/datalink/w5100.h | 4 ++-- sw/airborne/modules/datalink/xbee_dl.c | 2 +- sw/airborne/modules/datalink/xtend_rssi.c | 2 +- .../decawave/decawave_anchorless_communication.c | 2 +- sw/airborne/modules/decawave/dw1000_arduino.c | 2 +- .../modules/digital_cam/atmega_i2c_cam_ctrl.c | 2 +- sw/airborne/modules/digital_cam/dc.c | 2 +- .../modules/digital_cam/dc_ctrl_parrot_mykonos.c | 4 ++-- sw/airborne/modules/digital_cam/hackhd.c | 2 +- sw/airborne/modules/digital_cam/sim_i2c_cam_ctrl.c | 2 +- sw/airborne/modules/digital_cam/uart_cam_ctrl.c | 2 +- sw/airborne/modules/display/max7456.c | 2 +- sw/airborne/modules/dragspeed/dragspeed.c | 2 +- sw/airborne/modules/energy/MPPT.c | 2 +- sw/airborne/modules/energy/sim_MPPT.c | 2 +- sw/airborne/modules/esc32/esc32.c | 4 ++-- .../modules/glide_wing_lock/glide_wing_lock.c | 2 +- sw/airborne/modules/gps/gps.c | 2 +- sw/airborne/modules/gps/gps_datalink.c | 4 ++-- sw/airborne/modules/gps/gps_piksi.c | 2 +- sw/airborne/modules/gps/gps_ubx_i2c.c | 2 +- sw/airborne/modules/gps/gps_ubx_ucenter.c | 2 +- sw/airborne/modules/gsm/gsm.c | 2 +- sw/airborne/modules/guidance/gvf/gvf.c | 2 +- .../guidance/gvf_parametric/gvf_parametric.cpp | 2 +- .../guidance_opticflow/guidance_opticflow_hover.c | 2 +- .../modules/gumstix_interface/qr_code_spi_link.c | 2 +- sw/airborne/modules/helicopter/throttle_curve.c | 2 +- sw/airborne/modules/imu/imu.c | 2 +- sw/airborne/modules/imu/imu_mpu9250.c | 2 +- sw/airborne/modules/imu/imu_vectornav.c | 2 +- sw/airborne/modules/ins/alt_filter.c | 2 +- sw/airborne/modules/ins/hf_float.c | 2 +- sw/airborne/modules/ins/imu_temp_ctrl.c | 2 +- sw/airborne/modules/ins/ins_alt_float.c | 2 +- sw/airborne/modules/ins/ins_arduimu.c | 2 +- sw/airborne/modules/ins/ins_arduimu_basic.c | 2 +- sw/airborne/modules/ins/ins_ekf2.cpp | 2 +- sw/airborne/modules/ins/ins_float_invariant.c | 2 +- .../modules/ins/ins_float_invariant_wrapper.c | 2 +- sw/airborne/modules/ins/ins_gps_passthrough.c | 2 +- sw/airborne/modules/ins/ins_int.c | 2 +- sw/airborne/modules/ins/ins_mekf_wind_wrapper.c | 2 +- sw/airborne/modules/ins/ins_vectornav.c | 2 +- sw/airborne/modules/ins/ins_vn100.c | 4 ++-- sw/airborne/modules/ins/ins_xsens700.c | 2 +- sw/airborne/modules/ins/vf_extended_float.c | 4 ++-- sw/airborne/modules/ins/vf_float.c | 2 +- sw/airborne/modules/ins/xsens.c | 2 +- sw/airborne/modules/joystick/joystick.c | 2 +- sw/airborne/modules/lidar/lidar_lite.c | 2 +- sw/airborne/modules/lidar/lidar_sf11.c | 2 +- sw/airborne/modules/lidar/tfmini.c | 4 ++-- sw/airborne/modules/lidar/tfmini_i2c.c | 4 ++-- sw/airborne/modules/loggers/flight_recorder.c | 6 +++--- .../loggers/high_speed_logger_direct_memory.c | 4 ++-- sw/airborne/modules/loggers/openlog.c | 2 +- sw/airborne/modules/loggers/sdlog_chibios.c | 2 +- sw/airborne/modules/loggers/sdlogger_spi_direct.c | 4 ++-- sw/airborne/modules/meteo/charge_sens.c | 2 +- sw/airborne/modules/meteo/dust_gp2y.c | 2 +- sw/airborne/modules/meteo/geiger_counter.c | 2 +- sw/airborne/modules/meteo/humid_dpicco.c | 2 +- sw/airborne/modules/meteo/humid_hih.c | 2 +- sw/airborne/modules/meteo/humid_htm_b71.c | 2 +- sw/airborne/modules/meteo/humid_pcap01.c | 2 +- sw/airborne/modules/meteo/humid_sht.c | 2 +- sw/airborne/modules/meteo/humid_sht_i2c.c | 2 +- sw/airborne/modules/meteo/humid_sht_uart.c | 2 +- sw/airborne/modules/meteo/ir_mlx.c | 2 +- sw/airborne/modules/meteo/light_solar.c | 2 +- sw/airborne/modules/meteo/light_temt.c | 2 +- sw/airborne/modules/meteo/meteo_france_DAQ.c | 4 ++-- sw/airborne/modules/meteo/meteo_stick.c | 2 +- sw/airborne/modules/meteo/mf_ptu.c | 2 +- sw/airborne/modules/meteo/temp_lm75.c | 2 +- sw/airborne/modules/meteo/temp_tcouple_adc.c | 2 +- sw/airborne/modules/meteo/temp_temod.c | 2 +- sw/airborne/modules/meteo/temp_tmp102.c | 2 +- sw/airborne/modules/meteo/wind_estimator.c | 4 ++-- sw/airborne/modules/meteo/wind_gfi.c | 2 +- sw/airborne/modules/meteo/windturbine.c | 2 +- sw/airborne/modules/mission/copilot.h | 2 +- sw/airborne/modules/mission/copilot_common.c | 2 +- sw/airborne/modules/mission/copilot_fixedwing.c | 2 +- sw/airborne/modules/mission/copilot_rotorcraft.c | 2 +- sw/airborne/modules/mission/mission_common.c | 4 ++-- sw/airborne/modules/multi/ctc/ctc.c | 4 ++-- sw/airborne/modules/multi/ctc/ctc_target.c | 4 ++-- sw/airborne/modules/multi/dcf/dcf.c | 4 ++-- sw/airborne/modules/multi/fc_rotor/fc_rotor.c | 2 +- sw/airborne/modules/multi/formation.c | 2 +- sw/airborne/modules/multi/formation.h | 2 +- sw/airborne/modules/multi/potential.c | 2 +- sw/airborne/modules/multi/rssi.c | 2 +- sw/airborne/modules/multi/tcas.c | 2 +- sw/airborne/modules/multi/tcas.h | 2 +- sw/airborne/modules/multi/traffic_info.c | 2 +- sw/airborne/modules/nav/nav_catapult.c | 2 +- sw/airborne/modules/nav/nav_fish.c | 2 +- sw/airborne/modules/nav/nav_geofence.h | 2 +- sw/airborne/modules/nav/nav_rover_base.c | 2 +- .../modules/nav/nav_survey_rectangle_rotorcraft.c | 4 ++-- sw/airborne/modules/obstacle_avoidance/guidance_OA.c | 4 ++-- .../modules/obstacle_avoidance/obstacle_avoidance.c | 2 +- sw/airborne/modules/optical_flow/mateksys_3901_l0x.c | 4 ++-- sw/airborne/modules/optical_flow/px4flow.c | 2 +- sw/airborne/modules/optical_flow/px4flow_i2c.c | 2 +- sw/airborne/modules/pca9685/pca9685_i2c.c | 2 +- .../radio_control/cc2500_frsky/cc2500_paparazzi.c | 2 +- .../radio_control/cc2500_frsky/cc2500_smartport.c | 2 +- sw/airborne/modules/radio_control/hott.c | 2 +- sw/airborne/modules/radio_control/ppm.c | 2 +- sw/airborne/modules/radio_control/sbus.c | 2 +- sw/airborne/modules/radio_control/sbus_dual.c | 2 +- sw/airborne/modules/radio_control/superbitrf_rc.h | 2 +- .../modules/range_finder/cf_deck_multi_ranger.c | 2 +- sw/airborne/modules/range_finder/laser_range_array.c | 2 +- sw/airborne/modules/range_finder/teraranger_one.c | 2 +- .../relative_localization_filter.c | 2 +- sw/airborne/modules/sensors/airspeed_amsys.c | 2 +- sw/airborne/modules/sensors/airspeed_ets.c | 2 +- sw/airborne/modules/sensors/airspeed_ms45xx_i2c.c | 4 ++-- sw/airborne/modules/sensors/airspeed_otf.c | 2 +- sw/airborne/modules/sensors/airspeed_sdp3x.c | 4 ++-- sw/airborne/modules/sensors/airspeed_uADC.c | 4 ++-- sw/airborne/modules/sensors/alt_srf08.c | 2 +- sw/airborne/modules/sensors/aoa_adc.c | 2 +- sw/airborne/modules/sensors/aoa_pwm.c | 4 ++-- sw/airborne/modules/sensors/baro_MS5534A.c | 2 +- sw/airborne/modules/sensors/baro_amsys.c | 2 +- sw/airborne/modules/sensors/baro_bmp.c | 2 +- sw/airborne/modules/sensors/baro_bmp280_i2c.c | 4 ++-- sw/airborne/modules/sensors/baro_bmp3.c | 2 +- sw/airborne/modules/sensors/baro_ets.c | 2 +- sw/airborne/modules/sensors/baro_hca.c | 2 +- sw/airborne/modules/sensors/baro_mpl3115.c | 2 +- sw/airborne/modules/sensors/baro_ms5611_i2c.c | 2 +- sw/airborne/modules/sensors/baro_ms5611_spi.c | 2 +- sw/airborne/modules/sensors/baro_scp_i2c.c | 2 +- sw/airborne/modules/sensors/cameras/jevois.c | 2 +- sw/airborne/modules/sensors/cameras/jevois_mavlink.c | 2 +- sw/airborne/modules/sensors/mag_hmc5843.c | 2 +- sw/airborne/modules/sensors/mag_hmc58xx.c | 2 +- sw/airborne/modules/sensors/mag_ist8310.c | 2 +- sw/airborne/modules/sensors/mag_lis3mdl.c | 2 +- sw/airborne/modules/sensors/mag_pitot_uart.c | 2 +- sw/airborne/modules/sensors/mag_rm3100.c | 2 +- sw/airborne/modules/sensors/opticflow_pmw3901.c | 2 +- sw/airborne/modules/sensors/rpm_sensor.c | 2 +- sw/airborne/modules/sensors/temp_adc.c | 4 ++-- sw/airborne/modules/sonar/sonar_adc.c | 2 +- sw/airborne/modules/sonar/sonar_bebop.c | 2 +- sw/airborne/modules/sonar/sonar_pwm.c | 4 ++-- sw/airborne/modules/sonar/sonar_vl53l1x.c | 2 +- .../modules/stereocam/droplet/stereocam_droplet.c | 2 +- .../stereocam/nav_line_avoid/avoid_navigation.c | 2 +- sw/airborne/modules/stereocam/stereocam.c | 2 +- .../stereocam/stereocam_follow_me/follow_me.c | 2 +- .../modules/system_identification/sys_id_chirp.c | 2 +- .../modules/telemetry/telemetry_intermcu_ap.c | 4 ++-- .../modules/telemetry/telemetry_intermcu_fbw.c | 2 +- sw/airborne/modules/uav_recovery/uav_recovery.c | 4 ++-- sw/airborne/peripherals/cc2500.c | 4 ++-- sw/airborne/peripherals/cyrf6936.c | 2 +- sw/airborne/pprz_debug.h | 2 +- sw/airborne/subsystems/intermcu/intermcu_ap.c | 2 +- sw/airborne/subsystems/navigation/waypoints.c | 2 +- sw/airborne/test/chibios_test_telemetry.c | 2 +- sw/airborne/test/mcu_periph/test_adc.c | 2 +- sw/airborne/test/peripherals/test_ami601.c | 2 +- sw/airborne/test/peripherals/test_lis302dl_spi.c | 2 +- sw/airborne/test/peripherals/test_ms2100.c | 2 +- sw/airborne/test/subsystems/test_ahrs.c | 6 +++--- sw/airborne/test/subsystems/test_imu.c | 2 +- sw/airborne/test/subsystems/test_radio_control.c | 2 +- sw/airborne/test/subsystems/test_settings.c | 4 ++-- sw/airborne/test/test_actuators_pwm.c | 4 ++-- sw/airborne/test/test_baro_board.c | 2 +- sw/airborne/test/test_can.c | 2 +- sw/airborne/test/test_datalink.c | 4 ++-- sw/airborne/test/test_manual.c | 4 ++-- sw/airborne/test/test_math_trig_compressed.c | 2 +- sw/airborne/test/test_module.c | 2 +- sw/airborne/test/test_telemetry.c | 2 +- sw/simulator/nps/nps_autopilot_fixedwing.c | 4 ++-- sw/simulator/nps/nps_autopilot_rotorcraft.c | 4 ++-- sw/simulator/nps/nps_ivy.c | 2 +- sw/tools/generators/gen_periodic.ml | 2 +- tests/modules/generated/periodic_telemetry.h | 2 +- .../{subsystems => modules}/datalink/superbitrf.h | 2 +- 355 files changed, 435 insertions(+), 435 deletions(-) rename sw/airborne/arch/sim/{subsystems => modules}/datalink/superbitrf.c (92%) rename sw/airborne/arch/sim/{subsystems => modules}/datalink/superbitrf.h (97%) rename sw/airborne/{subsystems => modules}/datalink/bluegiga.c (98%) rename sw/airborne/{subsystems => modules}/datalink/bluegiga.h (91%) rename sw/airborne/{subsystems => modules}/datalink/datalink.c (98%) rename sw/airborne/{subsystems => modules}/datalink/datalink.h (100%) rename sw/airborne/{subsystems => modules}/datalink/downlink.c (94%) rename sw/airborne/{subsystems => modules}/datalink/downlink.h (97%) rename sw/airborne/{subsystems => modules}/datalink/frsky_x.c (97%) rename sw/airborne/{subsystems => modules}/datalink/frsky_x.h (100%) rename sw/airborne/{subsystems => modules}/datalink/superbitrf.c (99%) rename sw/airborne/{subsystems => modules}/datalink/superbitrf.h (98%) rename sw/airborne/{subsystems => modules}/datalink/telemetry.c (95%) rename sw/airborne/{subsystems => modules}/datalink/telemetry.h (94%) rename sw/airborne/{subsystems => modules}/datalink/telemetry_common.h (98%) rename sw/airborne/{subsystems => modules}/datalink/uart_print.h (100%) rename sw/airborne/{subsystems => modules}/datalink/w5100.c (99%) rename sw/airborne/{subsystems => modules}/datalink/w5100.h (97%) rename tests/modules/test_arch/{subsystems => modules}/datalink/superbitrf.h (98%) diff --git a/conf/firmwares/setup.makefile b/conf/firmwares/setup.makefile index 991c6464ab..dd721ce7e1 100644 --- a/conf/firmwares/setup.makefile +++ b/conf/firmwares/setup.makefile @@ -102,7 +102,7 @@ setup_actuators.CFLAGS += -D$(MODEM_PORT)_BAUD=$(MODEM_BAUD) SETUP_ACTUATORS_MODEM_PORT_LOWER=$(shell echo $(MODEM_PORT) | tr A-Z a-z) setup_actuators.CFLAGS += -DDOWNLINK -DDOWNLINK_DEVICE=$(SETUP_ACTUATORS_MODEM_PORT_LOWER) -DPPRZ_UART=$(SETUP_ACTUATORS_MODEM_PORT_LOWER) setup_actuators.CFLAGS += -DDOWNLINK_TRANSPORT=pprz_tp -DDATALINK=PPRZ -setup_actuators.srcs += subsystems/datalink/downlink.c pprzlink/src/pprz_transport.c modules/datalink/pprz_dl.c +setup_actuators.srcs += modules/datalink/downlink.c pprzlink/src/pprz_transport.c modules/datalink/pprz_dl.c setup_actuators.srcs += modules/actuators/actuators.c setup_actuators.srcs += $(SRC_FIRMWARE)/setup_actuators.c diff --git a/conf/firmwares/test_chibios.makefile b/conf/firmwares/test_chibios.makefile index 1efa3f0472..1a2e24f4a9 100644 --- a/conf/firmwares/test_chibios.makefile +++ b/conf/firmwares/test_chibios.makefile @@ -68,7 +68,7 @@ COMMON_TEST_SRCS += $(SRC_ARCH)/mcu_periph/gpio_arch.c # pprz downlink/datalink COMMON_TELEMETRY_CFLAGS = -DDOWNLINK -DDOWNLINK_TRANSPORT=pprz_tp -DDATALINK=PPRZ -COMMON_TELEMETRY_SRCS = subsystems/datalink/downlink.c subsystems/datalink/pprz_transport.c modules/datalink/pprz_dl.c +COMMON_TELEMETRY_SRCS = modules/datalink/downlink.c modules/datalink/pprz_transport.c modules/datalink/pprz_dl.c COMMON_TELEMETRY_MODEM_PORT_LOWER=$(shell echo $(MODEM_PORT) | tr A-Z a-z) COMMON_TELEMETRY_CFLAGS += -DUSE_$(MODEM_PORT) -D$(MODEM_PORT)_BAUD=$(MODEM_BAUD) diff --git a/conf/firmwares/test_progs.makefile b/conf/firmwares/test_progs.makefile index 035c1b6982..fc733faa6a 100644 --- a/conf/firmwares/test_progs.makefile +++ b/conf/firmwares/test_progs.makefile @@ -69,7 +69,7 @@ endif # pprz downlink/datalink COMMON_TELEMETRY_CFLAGS = -DDOWNLINK -DDOWNLINK_TRANSPORT=pprz_tp -DDATALINK=PPRZ -COMMON_TELEMETRY_SRCS = subsystems/datalink/downlink.c pprzlink/src/pprz_transport.c modules/datalink/pprz_dl.c +COMMON_TELEMETRY_SRCS = modules/datalink/downlink.c pprzlink/src/pprz_transport.c modules/datalink/pprz_dl.c # check if we are using UDP ifneq (,$(findstring UDP, $(MODEM_DEV))) @@ -453,7 +453,7 @@ test_ahrs.CFLAGS += $(COMMON_TEST_CFLAGS) test_ahrs.srcs += $(COMMON_TEST_SRCS) test_ahrs.CFLAGS += $(COMMON_TELEMETRY_CFLAGS) test_ahrs.srcs += $(COMMON_TELEMETRY_SRCS) -test_ahrs.srcs += subsystems/datalink/telemetry.c +test_ahrs.srcs += modules/datalink/telemetry.c test_ahrs.CFLAGS += -DPERIODIC_TELEMETRY test_ahrs.srcs += mcu_periph/i2c.c $(SRC_ARCH)/mcu_periph/i2c_arch.c test_ahrs.srcs += test/subsystems/test_ahrs.c diff --git a/conf/flight_plans/AGGIEAIR/BasicTuning_BlueRoom2.xml b/conf/flight_plans/AGGIEAIR/BasicTuning_BlueRoom2.xml index f8a8383dd6..5ff276255f 100644 --- a/conf/flight_plans/AGGIEAIR/BasicTuning_BlueRoom2.xml +++ b/conf/flight_plans/AGGIEAIR/BasicTuning_BlueRoom2.xml @@ -2,7 +2,7 @@
-#include "subsystems/datalink/datalink.h" +#include "modules/datalink/datalink.h"
diff --git a/conf/flight_plans/AGGIEAIR/BasicTuning_Launcher.xml b/conf/flight_plans/AGGIEAIR/BasicTuning_Launcher.xml index 849641b310..29cdc254ba 100644 --- a/conf/flight_plans/AGGIEAIR/BasicTuning_Launcher.xml +++ b/conf/flight_plans/AGGIEAIR/BasicTuning_Launcher.xml @@ -2,7 +2,7 @@
-#include "subsystems/datalink/datalink.h" +#include "modules/datalink/datalink.h"
diff --git a/conf/flight_plans/AGGIEAIR/CachJct_Gallo_temp_rect_survey.xml b/conf/flight_plans/AGGIEAIR/CachJct_Gallo_temp_rect_survey.xml index 1a9538f3b8..15709526c1 100644 --- a/conf/flight_plans/AGGIEAIR/CachJct_Gallo_temp_rect_survey.xml +++ b/conf/flight_plans/AGGIEAIR/CachJct_Gallo_temp_rect_survey.xml @@ -2,7 +2,7 @@
-#include "subsystems/datalink/datalink.h" +#include "modules/datalink/datalink.h"
diff --git a/conf/flight_plans/ENAC/dw1000_basic.xml b/conf/flight_plans/ENAC/dw1000_basic.xml index 5afceaf759..45284c5663 100644 --- a/conf/flight_plans/ENAC/dw1000_basic.xml +++ b/conf/flight_plans/ENAC/dw1000_basic.xml @@ -2,7 +2,7 @@
-#include "subsystems/datalink/datalink.h" +#include "modules/datalink/datalink.h"
diff --git a/conf/flight_plans/ENAC/fish_outdoor.xml b/conf/flight_plans/ENAC/fish_outdoor.xml index 0f3727f5cc..8bc26942b3 100644 --- a/conf/flight_plans/ENAC/fish_outdoor.xml +++ b/conf/flight_plans/ENAC/fish_outdoor.xml @@ -3,7 +3,7 @@
#include "autopilot.h" -#include "subsystems/datalink/datalink.h" +#include "modules/datalink/datalink.h"
diff --git a/conf/flight_plans/OPENUAS/include_obc2014_mission.xml b/conf/flight_plans/OPENUAS/include_obc2014_mission.xml index 0493bdda45..f64cae2413 100644 --- a/conf/flight_plans/OPENUAS/include_obc2014_mission.xml +++ b/conf/flight_plans/OPENUAS/include_obc2014_mission.xml @@ -57,7 +57,7 @@ TESTS: //Enable advanced electrical power functions #include "subsystems/electrical.h" //Enable datalink tests - #include "subsystems/datalink/datalink.h" + #include "modules/datalink/datalink.h" //For interaction with the Flight termination Device (FTD) #define RCChannel(_x) ((*fbw_state).channels[_x]) diff --git a/conf/flight_plans/OPENUAS/openuas_nav_modules_test.xml b/conf/flight_plans/OPENUAS/openuas_nav_modules_test.xml index 300fb12ff8..7cafb4beea 100644 --- a/conf/flight_plans/OPENUAS/openuas_nav_modules_test.xml +++ b/conf/flight_plans/OPENUAS/openuas_nav_modules_test.xml @@ -2,7 +2,7 @@
-#include "subsystems/datalink/datalink.h" +#include "modules/datalink/datalink.h" #include "modules/digital_cam/dc.h" #define LINE_START_FUNCTION dc_Survey(40); #define LINE_STOP_FUNCTION dc_autoshoot = DC_AUTOSHOOT_STOP; diff --git a/conf/flight_plans/OPENUAS/openuas_rotorcraft_simple.xml b/conf/flight_plans/OPENUAS/openuas_rotorcraft_simple.xml index 9c42734640..e783a12c41 100644 --- a/conf/flight_plans/OPENUAS/openuas_rotorcraft_simple.xml +++ b/conf/flight_plans/OPENUAS/openuas_rotorcraft_simple.xml @@ -18,7 +18,7 @@ Your safe aircraft operation is *your* responsibility //Enable advanced electrical power functions #include "subsystems/electrical.h" //Enable datalink tests - #include "subsystems/datalink/datalink.h" + #include "modules/datalink/datalink.h" #include "firmwares/rotorcraft/guidance/guidance_v.h"
diff --git a/conf/flight_plans/OPENUAS/openuas_tuning_a_fresh_fixedwing.xml b/conf/flight_plans/OPENUAS/openuas_tuning_a_fresh_fixedwing.xml index 1e46bd1d3f..f9402d7a6e 100644 --- a/conf/flight_plans/OPENUAS/openuas_tuning_a_fresh_fixedwing.xml +++ b/conf/flight_plans/OPENUAS/openuas_tuning_a_fresh_fixedwing.xml @@ -137,7 +137,7 @@ perhaps a few global alt exceptions? But where do they deroute to assuming the a
-#include "subsystems/datalink/datalink.h" +#include "modules/datalink/datalink.h" #include "state.h"
diff --git a/conf/flight_plans/OPENUAS/openuas_versatile_unified.xml b/conf/flight_plans/OPENUAS/openuas_versatile_unified.xml index c8dd675fad..07c7f85ad3 100644 --- a/conf/flight_plans/OPENUAS/openuas_versatile_unified.xml +++ b/conf/flight_plans/OPENUAS/openuas_versatile_unified.xml @@ -23,7 +23,7 @@ Should be unified for Hybrid, FW and rotorcraft //Enable advanced electrical power functions #include "subsystems/electrical.h" //Enable datalink tests - #include "subsystems/datalink/datalink.h" + #include "modules/datalink/datalink.h" // PHOTOGRAMMETRY settings #define PHOTOGRAMMETRY_OVERLAP 30 // 1-99 Procent diff --git a/conf/flight_plans/basic.xml b/conf/flight_plans/basic.xml index 9b34ac7e54..9985e0a9e1 100644 --- a/conf/flight_plans/basic.xml +++ b/conf/flight_plans/basic.xml @@ -2,7 +2,7 @@
-#include "subsystems/datalink/datalink.h" +#include "modules/datalink/datalink.h"
diff --git a/conf/flight_plans/basic_sim.xml b/conf/flight_plans/basic_sim.xml index bbef71daa6..c900a90ba3 100644 --- a/conf/flight_plans/basic_sim.xml +++ b/conf/flight_plans/basic_sim.xml @@ -3,7 +3,7 @@ can finish it -->
-#include "subsystems/datalink/datalink.h" +#include "modules/datalink/datalink.h"
diff --git a/conf/flight_plans/competitions/IMAV2014_carto.xml b/conf/flight_plans/competitions/IMAV2014_carto.xml index 1540933c96..7c907d1160 100644 --- a/conf/flight_plans/competitions/IMAV2014_carto.xml +++ b/conf/flight_plans/competitions/IMAV2014_carto.xml @@ -3,7 +3,7 @@
-#include "subsystems/datalink/datalink.h" +#include "modules/datalink/datalink.h" static inline float wp_dist(float wp1_x, float wp1_y, float wp2_x, float wp2_y) { float dx = wp1_x - wp2_x; float dy = wp1_y - wp2_y; diff --git a/conf/flight_plans/competitions/IMAV2014_digit.xml b/conf/flight_plans/competitions/IMAV2014_digit.xml index 6d98201b48..06ad1ebf64 100644 --- a/conf/flight_plans/competitions/IMAV2014_digit.xml +++ b/conf/flight_plans/competitions/IMAV2014_digit.xml @@ -2,7 +2,7 @@
-#include "subsystems/datalink/datalink.h" +#include "modules/datalink/datalink.h" static inline float wp_dist(float wp1_x, float wp1_y, float wp2_x, float wp2_y) { float dx = wp1_x - wp2_x; float dy = wp1_y - wp2_y; diff --git a/conf/flight_plans/competitions/IMAV2014_vision.xml b/conf/flight_plans/competitions/IMAV2014_vision.xml index cb26d07300..2d9771ae9c 100644 --- a/conf/flight_plans/competitions/IMAV2014_vision.xml +++ b/conf/flight_plans/competitions/IMAV2014_vision.xml @@ -2,7 +2,7 @@
-#include "subsystems/datalink/datalink.h" +#include "modules/datalink/datalink.h" static inline float wp_dist(float wp1_x, float wp1_y, float wp2_x, float wp2_y) { float dx = wp1_x - wp2_x; float dy = wp1_y - wp2_y; diff --git a/conf/flight_plans/competitions/IMAV2018_carto.xml b/conf/flight_plans/competitions/IMAV2018_carto.xml index 56f97f4a2b..9c3dd2cf27 100644 --- a/conf/flight_plans/competitions/IMAV2018_carto.xml +++ b/conf/flight_plans/competitions/IMAV2018_carto.xml @@ -2,7 +2,7 @@
-#include "subsystems/datalink/datalink.h" +#include "modules/datalink/datalink.h" static inline bool delay_test_rc(bool test, int delay) { static int nb = 0; diff --git a/conf/flight_plans/competitions/IMAV2019_carto.xml b/conf/flight_plans/competitions/IMAV2019_carto.xml index 71021a0e1b..912ec627c6 100644 --- a/conf/flight_plans/competitions/IMAV2019_carto.xml +++ b/conf/flight_plans/competitions/IMAV2019_carto.xml @@ -2,7 +2,7 @@
-#include "subsystems/datalink/datalink.h" +#include "modules/datalink/datalink.h" static inline bool delay_test_rc(bool test, int delay) { static int nb = 0; if (test) { diff --git a/conf/flight_plans/competitions/IMAV2019_drop.xml b/conf/flight_plans/competitions/IMAV2019_drop.xml index b82627432f..40072d02dc 100644 --- a/conf/flight_plans/competitions/IMAV2019_drop.xml +++ b/conf/flight_plans/competitions/IMAV2019_drop.xml @@ -2,7 +2,7 @@
-#include "subsystems/datalink/datalink.h" +#include "modules/datalink/datalink.h" static inline bool delay_test_rc(bool test, int delay) { static int nb = 0; if (test) { diff --git a/conf/flight_plans/dynamic_sectors.xml b/conf/flight_plans/dynamic_sectors.xml index 2985169c08..393f301c9c 100644 --- a/conf/flight_plans/dynamic_sectors.xml +++ b/conf/flight_plans/dynamic_sectors.xml @@ -2,7 +2,7 @@
-#include "subsystems/datalink/datalink.h" +#include "modules/datalink/datalink.h"
diff --git a/conf/flight_plans/joystick.xml b/conf/flight_plans/joystick.xml index fd62c40bd0..06f6b37be7 100644 --- a/conf/flight_plans/joystick.xml +++ b/conf/flight_plans/joystick.xml @@ -2,7 +2,7 @@
-#include "subsystems/datalink/datalink.h" +#include "modules/datalink/datalink.h" #ifdef NAV_C #include "firmwares/fixedwing/stabilization/stabilization_attitude.h" diff --git a/conf/flight_plans/nav_modules.xml b/conf/flight_plans/nav_modules.xml index d8f521d0a7..97322da699 100644 --- a/conf/flight_plans/nav_modules.xml +++ b/conf/flight_plans/nav_modules.xml @@ -2,7 +2,7 @@
-#include "subsystems/datalink/datalink.h" +#include "modules/datalink/datalink.h" #include "modules/digital_cam/dc.h" #define LINE_START_FUNCTION dc_Survey(40); #define LINE_STOP_FUNCTION dc_autoshoot = DC_AUTOSHOOT_STOP; diff --git a/conf/flight_plans/rotorcraft_basic_superbitrf_from_hand.xml b/conf/flight_plans/rotorcraft_basic_superbitrf_from_hand.xml index 3effb9c820..6ffcd5d551 100644 --- a/conf/flight_plans/rotorcraft_basic_superbitrf_from_hand.xml +++ b/conf/flight_plans/rotorcraft_basic_superbitrf_from_hand.xml @@ -8,7 +8,7 @@ The goal of this flightplan is to have a safe, simple no-brainer flightplan for #include "autopilot.h" #include "subsystems/ahrs.h" #include "subsystems/electrical.h" -#include "subsystems/datalink/datalink.h" +#include "modules/datalink/datalink.h"
diff --git a/conf/flight_plans/tcas.xml b/conf/flight_plans/tcas.xml index 7325bb5363..74494a2661 100644 --- a/conf/flight_plans/tcas.xml +++ b/conf/flight_plans/tcas.xml @@ -2,7 +2,7 @@
-#include "subsystems/datalink/datalink.h" +#include "modules/datalink/datalink.h" #include "tcas.h"
diff --git a/conf/flight_plans/tudelft/course_orangeavoid_cyberzoo.xml b/conf/flight_plans/tudelft/course_orangeavoid_cyberzoo.xml index dcad6d5987..7eda68f916 100644 --- a/conf/flight_plans/tudelft/course_orangeavoid_cyberzoo.xml +++ b/conf/flight_plans/tudelft/course_orangeavoid_cyberzoo.xml @@ -2,7 +2,7 @@
- #include "subsystems/datalink/datalink.h" + #include "modules/datalink/datalink.h" #include "subsystems/electrical.h" #include "modules/radio_control/radio_control.h" #include "subsystems/ahrs.h" diff --git a/conf/flight_plans/tudelft/course_orangeavoid_cyberzoo_guided.xml b/conf/flight_plans/tudelft/course_orangeavoid_cyberzoo_guided.xml index 7eea3c81a8..dc392e4c47 100644 --- a/conf/flight_plans/tudelft/course_orangeavoid_cyberzoo_guided.xml +++ b/conf/flight_plans/tudelft/course_orangeavoid_cyberzoo_guided.xml @@ -2,7 +2,7 @@
- #include "subsystems/datalink/datalink.h" + #include "modules/datalink/datalink.h" #include "subsystems/electrical.h" #include "modules/radio_control/radio_control.h" #include "subsystems/ahrs.h" diff --git a/conf/flight_plans/tudelft/delft_basic.xml b/conf/flight_plans/tudelft/delft_basic.xml index d00b20cb9c..19d260eb55 100644 --- a/conf/flight_plans/tudelft/delft_basic.xml +++ b/conf/flight_plans/tudelft/delft_basic.xml @@ -3,7 +3,7 @@
#include "autopilot.h" - #include "subsystems/datalink/datalink.h" + #include "modules/datalink/datalink.h" #include "subsystems/electrical.h" #include "modules/radio_control/radio_control.h"
diff --git a/conf/flight_plans/tudelft/delft_bebop.xml b/conf/flight_plans/tudelft/delft_bebop.xml index 5f8f7e80b1..fc5f856855 100644 --- a/conf/flight_plans/tudelft/delft_bebop.xml +++ b/conf/flight_plans/tudelft/delft_bebop.xml @@ -3,7 +3,7 @@
#include "autopilot.h" - #include "subsystems/datalink/datalink.h" + #include "modules/datalink/datalink.h" #include "subsystems/electrical.h" #include "modules/radio_control/radio_control.h"
diff --git a/conf/flight_plans/tudelft/nederdrone_cyberzoo.xml b/conf/flight_plans/tudelft/nederdrone_cyberzoo.xml index 83d4c88e5b..a524adb105 100644 --- a/conf/flight_plans/tudelft/nederdrone_cyberzoo.xml +++ b/conf/flight_plans/tudelft/nederdrone_cyberzoo.xml @@ -2,7 +2,7 @@
- #include "subsystems/datalink/datalink.h" + #include "modules/datalink/datalink.h" #include "subsystems/electrical.h" #include "modules/radio_control/radio_control.h" #include "subsystems/ahrs.h" diff --git a/conf/flight_plans/tudelft/nederdrone_valkenburg.xml b/conf/flight_plans/tudelft/nederdrone_valkenburg.xml index 6f2a4cc812..4901d4d078 100644 --- a/conf/flight_plans/tudelft/nederdrone_valkenburg.xml +++ b/conf/flight_plans/tudelft/nederdrone_valkenburg.xml @@ -3,7 +3,7 @@
#include "autopilot.h" - #include "subsystems/datalink/datalink.h" + #include "modules/datalink/datalink.h"
diff --git a/conf/flight_plans/tudelft/ralphthesis2020_stereo_cyberzoo.xml b/conf/flight_plans/tudelft/ralphthesis2020_stereo_cyberzoo.xml index 2947b51430..1664006a07 100644 --- a/conf/flight_plans/tudelft/ralphthesis2020_stereo_cyberzoo.xml +++ b/conf/flight_plans/tudelft/ralphthesis2020_stereo_cyberzoo.xml @@ -2,7 +2,7 @@
- #include "subsystems/datalink/datalink.h" + #include "modules/datalink/datalink.h" #include "subsystems/electrical.h" #include "modules/radio_control/radio_control.h" #include "subsystems/ahrs.h" diff --git a/conf/flight_plans/tudelft/rotorcraft_optitrack_path.xml b/conf/flight_plans/tudelft/rotorcraft_optitrack_path.xml index 024e69711d..3cf761485d 100644 --- a/conf/flight_plans/tudelft/rotorcraft_optitrack_path.xml +++ b/conf/flight_plans/tudelft/rotorcraft_optitrack_path.xml @@ -7,7 +7,7 @@ #include "modules/radio_control/radio_control.h" #include "subsystems/ahrs.h" #include "subsystems/electrical.h" - #include "subsystems/datalink/datalink.h" + #include "modules/datalink/datalink.h"
diff --git a/conf/flight_plans/tudelft/train_safe_zoo.xml b/conf/flight_plans/tudelft/train_safe_zoo.xml index a0fb697e4b..fc40723325 100644 --- a/conf/flight_plans/tudelft/train_safe_zoo.xml +++ b/conf/flight_plans/tudelft/train_safe_zoo.xml @@ -2,7 +2,7 @@
- #include "subsystems/datalink/datalink.h" + #include "modules/datalink/datalink.h" #include "subsystems/electrical.h" #include "modules/radio_control/radio_control.h" #include "subsystems/ahrs.h" diff --git a/conf/flight_plans/versatile.xml b/conf/flight_plans/versatile.xml index 7e79c4907b..34399a589e 100644 --- a/conf/flight_plans/versatile.xml +++ b/conf/flight_plans/versatile.xml @@ -2,7 +2,7 @@
-#include "subsystems/datalink/datalink.h" +#include "modules/datalink/datalink.h"
diff --git a/conf/flight_plans/versatile_airspeed.xml b/conf/flight_plans/versatile_airspeed.xml index e2fbe7856b..0b789dfd0a 100644 --- a/conf/flight_plans/versatile_airspeed.xml +++ b/conf/flight_plans/versatile_airspeed.xml @@ -3,7 +3,7 @@
#include "firmwares/fixedwing/guidance/energy_ctrl.h" -#include "subsystems/datalink/datalink.h" +#include "modules/datalink/datalink.h"
diff --git a/conf/flight_plans/zamboni_survey_test.xml b/conf/flight_plans/zamboni_survey_test.xml index ff513e5cec..0bed9bda14 100644 --- a/conf/flight_plans/zamboni_survey_test.xml +++ b/conf/flight_plans/zamboni_survey_test.xml @@ -2,7 +2,7 @@
-#include "subsystems/datalink/datalink.h" +#include "modules/datalink/datalink.h" #include "modules/digital_cam/dc.h" //#define LINE_START_FUNCTION dc_autoshoot = DC_AUTOSHOOT_DISTANCE; //#define LINE_START_FUNCTION dc_Survey(dc_gps_dist); diff --git a/conf/modules/datalink_common.xml b/conf/modules/datalink_common.xml index ea550ed838..dd6797b6cf 100644 --- a/conf/modules/datalink_common.xml +++ b/conf/modules/datalink_common.xml @@ -7,17 +7,17 @@
- - - + + +
- - - + + + diff --git a/conf/modules/radio_control_superbitrf_rc.xml b/conf/modules/radio_control_superbitrf_rc.xml index a18028746b..81c490ea4a 100644 --- a/conf/modules/radio_control_superbitrf_rc.xml +++ b/conf/modules/radio_control_superbitrf_rc.xml @@ -13,9 +13,9 @@ - - - + + + @@ -41,7 +41,7 @@ - + @@ -52,7 +52,7 @@ - + diff --git a/conf/modules/telemetry_bluegiga.xml b/conf/modules/telemetry_bluegiga.xml index 41ab7e95f9..4a042382ba 100644 --- a/conf/modules/telemetry_bluegiga.xml +++ b/conf/modules/telemetry_bluegiga.xml @@ -45,7 +45,7 @@ - + diff --git a/conf/modules/telemetry_superbitrf.xml b/conf/modules/telemetry_superbitrf.xml index a5c1a1494f..2a10645581 100644 --- a/conf/modules/telemetry_superbitrf.xml +++ b/conf/modules/telemetry_superbitrf.xml @@ -13,7 +13,7 @@
- +
@@ -21,7 +21,7 @@ - + diff --git a/conf/modules/telemetry_transparent.xml b/conf/modules/telemetry_transparent.xml index 5c4c35632f..62c70dd208 100644 --- a/conf/modules/telemetry_transparent.xml +++ b/conf/modules/telemetry_transparent.xml @@ -5,7 +5,7 @@ Telemetry using PPRZ protocol over UART - Currently used as a makefile wrapper over the telemetry_transparent subsystem + Currently used as a makefile wrapper over the telemetry_transparent modules diff --git a/conf/modules/telemetry_transparent_frsky_x.xml b/conf/modules/telemetry_transparent_frsky_x.xml index f491c12fbc..b990f9e0d7 100644 --- a/conf/modules/telemetry_transparent_frsky_x.xml +++ b/conf/modules/telemetry_transparent_frsky_x.xml @@ -27,13 +27,13 @@
- +
- + @@ -44,7 +44,7 @@ - + diff --git a/conf/modules/telemetry_w5100.xml b/conf/modules/telemetry_w5100.xml index 208875797e..d98acbf0ab 100644 --- a/conf/modules/telemetry_w5100.xml +++ b/conf/modules/telemetry_w5100.xml @@ -22,7 +22,7 @@
- +
@@ -43,7 +43,7 @@ - + diff --git a/conf/settings/nps.xml b/conf/settings/nps.xml index 7b3de9366f..3d85d26880 100644 --- a/conf/settings/nps.xml +++ b/conf/settings/nps.xml @@ -7,7 +7,7 @@ - + diff --git a/conf/settings/superbitrf.xml b/conf/settings/superbitrf.xml index 3e60501456..359f8cf71a 100644 --- a/conf/settings/superbitrf.xml +++ b/conf/settings/superbitrf.xml @@ -4,9 +4,9 @@ - - - + + + diff --git a/sw/airborne/arch/sim/subsystems/datalink/superbitrf.c b/sw/airborne/arch/sim/modules/datalink/superbitrf.c similarity index 92% rename from sw/airborne/arch/sim/subsystems/datalink/superbitrf.c rename to sw/airborne/arch/sim/modules/datalink/superbitrf.c index 178a33b6c8..8867e7c3f2 100644 --- a/sw/airborne/arch/sim/subsystems/datalink/superbitrf.c +++ b/sw/airborne/arch/sim/modules/datalink/superbitrf.c @@ -20,13 +20,13 @@ */ /** - * @file arch/sim/subsystems/datalink/superbitrf.c + * @file arch/sim/modules/datalink/superbitrf.c * DSM2 and DSMX datalink implementation for the cyrf6936 2.4GHz radio chip trough SPI * * Dummy for sim so you don't have to remove the superbitrf.xml settings file. */ -#include "subsystems/datalink/superbitrf.h" +#include "modules/datalink/superbitrf.h" /* The superbitRF structure */ struct SuperbitRF superbitrf; diff --git a/sw/airborne/arch/sim/subsystems/datalink/superbitrf.h b/sw/airborne/arch/sim/modules/datalink/superbitrf.h similarity index 97% rename from sw/airborne/arch/sim/subsystems/datalink/superbitrf.h rename to sw/airborne/arch/sim/modules/datalink/superbitrf.h index e3a06481dc..eb27ec0c07 100644 --- a/sw/airborne/arch/sim/subsystems/datalink/superbitrf.h +++ b/sw/airborne/arch/sim/modules/datalink/superbitrf.h @@ -20,7 +20,7 @@ */ /** - * @file arch/sim/subsystems/datalink/superbitrf.h + * @file arch/sim/modules/datalink/superbitrf.h * DSM2 and DSMX datalink implementation for the cyrf6936 2.4GHz radio chip trough SPI * * Dummy for sim so you don't have to remove the superbitrf.xml settings file. diff --git a/sw/airborne/arch/sim/sim_ap.c b/sw/airborne/arch/sim/sim_ap.c index f726cbd072..694f673fe6 100644 --- a/sw/airborne/arch/sim/sim_ap.c +++ b/sw/airborne/arch/sim/sim_ap.c @@ -19,8 +19,8 @@ #include "firmwares/fixedwing/guidance/guidance_v.h" #include "modules/core/commands.h" #include "firmwares/fixedwing/main_ap.h" -#include "subsystems/datalink/datalink.h" -#include "subsystems/datalink/telemetry.h" +#include "modules/datalink/datalink.h" +#include "modules/datalink/telemetry.h" #include "generated/flight_plan.h" #include "generated/modules.h" diff --git a/sw/airborne/autopilot.c b/sw/airborne/autopilot.c index 90bacb9f1f..5fc199fb35 100644 --- a/sw/airborne/autopilot.c +++ b/sw/airborne/autopilot.c @@ -40,7 +40,7 @@ #include "modules/core/commands.h" #include "modules/actuators/actuators.h" //#include "modules/energy/electrical.h" -#include "subsystems/datalink/telemetry.h" +#include "modules/datalink/telemetry.h" #include "modules/core/settings.h" #include "generated/settings.h" diff --git a/sw/airborne/boards/apogee/imu_apogee.c b/sw/airborne/boards/apogee/imu_apogee.c index 4c4f2ee354..546d9ab24f 100644 --- a/sw/airborne/boards/apogee/imu_apogee.c +++ b/sw/airborne/boards/apogee/imu_apogee.c @@ -36,7 +36,7 @@ // Downlink #include "mcu_periph/uart.h" #include "pprzlink/messages.h" -#include "subsystems/datalink/downlink.h" +#include "modules/datalink/downlink.h" #ifndef IMU_APOGEE_CHAN_X #define IMU_APOGEE_CHAN_X 0 diff --git a/sw/airborne/boards/ardrone/navdata.c b/sw/airborne/boards/ardrone/navdata.c index 7381ba2d2b..223b8b75d5 100644 --- a/sw/airborne/boards/ardrone/navdata.c +++ b/sw/airborne/boards/ardrone/navdata.c @@ -128,7 +128,7 @@ ssize_t full_read(int fd, uint8_t *buf, size_t count) } #if PERIODIC_TELEMETRY -#include "subsystems/datalink/telemetry.h" +#include "modules/datalink/telemetry.h" static void send_navdata(struct transport_tx *trans, struct link_device *dev) { diff --git a/sw/airborne/boards/baro_board_ms5611_i2c.c b/sw/airborne/boards/baro_board_ms5611_i2c.c index 52e1396f9c..255a2c610a 100644 --- a/sw/airborne/boards/baro_board_ms5611_i2c.c +++ b/sw/airborne/boards/baro_board_ms5611_i2c.c @@ -39,7 +39,7 @@ #include "mcu_periph/uart.h" #include "pprzlink/messages.h" -#include "subsystems/datalink/downlink.h" +#include "modules/datalink/downlink.h" #include "filters/median_filter.h" diff --git a/sw/airborne/boards/baro_board_ms5611_spi.c b/sw/airborne/boards/baro_board_ms5611_spi.c index 8f54de1747..d15a822cbf 100644 --- a/sw/airborne/boards/baro_board_ms5611_spi.c +++ b/sw/airborne/boards/baro_board_ms5611_spi.c @@ -37,7 +37,7 @@ #include "mcu_periph/uart.h" #include "pprzlink/messages.h" -#include "subsystems/datalink/downlink.h" +#include "modules/datalink/downlink.h" #include "filters/median_filter.h" diff --git a/sw/airborne/boards/bebop/actuators.c b/sw/airborne/boards/bebop/actuators.c index 641dedeb8c..8198b047af 100644 --- a/sw/airborne/boards/bebop/actuators.c +++ b/sw/airborne/boards/bebop/actuators.c @@ -33,7 +33,7 @@ #include "modules/core/abi.h" #if PERIODIC_TELEMETRY -#include "subsystems/datalink/telemetry.h" +#include "modules/datalink/telemetry.h" #include "firmwares/rotorcraft/stabilization.h" static void send_bebop_actuators(struct transport_tx *trans, struct link_device *dev) diff --git a/sw/airborne/boards/krooz/imu_krooz.c b/sw/airborne/boards/krooz/imu_krooz.c index 77104dccca..2b00c23b43 100644 --- a/sw/airborne/boards/krooz/imu_krooz.c +++ b/sw/airborne/boards/krooz/imu_krooz.c @@ -39,7 +39,7 @@ // Downlink #include "mcu_periph/uart.h" #include "pprzlink/messages.h" -#include "subsystems/datalink/downlink.h" +#include "modules/datalink/downlink.h" #if !defined KROOZ_LOWPASS_FILTER && !defined KROOZ_SMPLRT_DIV #define KROOZ_LOWPASS_FILTER MPU60X0_DLPF_256HZ diff --git a/sw/airborne/firmwares/demo/demo_ahrs_actuators.c b/sw/airborne/firmwares/demo/demo_ahrs_actuators.c index c471debaf7..aadc2eebfe 100644 --- a/sw/airborne/firmwares/demo/demo_ahrs_actuators.c +++ b/sw/airborne/firmwares/demo/demo_ahrs_actuators.c @@ -31,9 +31,9 @@ #define ABI_C #define MODULES_C -#include "subsystems/datalink/telemetry.h" -#include "subsystems/datalink/datalink.h" -#include "subsystems/datalink/downlink.h" +#include "modules/datalink/telemetry.h" +#include "modules/datalink/datalink.h" +#include "modules/datalink/downlink.h" #include "modules/core/abi.h" #include "generated/airframe.h" diff --git a/sw/airborne/firmwares/fixedwing/autopilot_firmware.c b/sw/airborne/firmwares/fixedwing/autopilot_firmware.c index 6df5f9a5a7..e549e1266f 100644 --- a/sw/airborne/firmwares/fixedwing/autopilot_firmware.c +++ b/sw/airborne/firmwares/fixedwing/autopilot_firmware.c @@ -39,7 +39,7 @@ uint8_t lateral_mode; uint8_t mcu1_status; #if PERIODIC_TELEMETRY -#include "subsystems/datalink/telemetry.h" +#include "modules/datalink/telemetry.h" #include "generated/settings.h" #if defined RADIO_CALIB && defined RADIO_CONTROL_SETTINGS diff --git a/sw/airborne/firmwares/fixedwing/autopilot_generated.c b/sw/airborne/firmwares/fixedwing/autopilot_generated.c index c1b1725481..205fab1e70 100644 --- a/sw/airborne/firmwares/fixedwing/autopilot_generated.c +++ b/sw/airborne/firmwares/fixedwing/autopilot_generated.c @@ -33,7 +33,7 @@ #include "modules/core/commands.h" #include "modules/actuators/actuators.h" #include "modules/core/settings.h" -#include "subsystems/datalink/telemetry.h" +#include "modules/datalink/telemetry.h" #include "generated/settings.h" diff --git a/sw/airborne/firmwares/fixedwing/autopilot_static.c b/sw/airborne/firmwares/fixedwing/autopilot_static.c index 69feae1daa..711a62589e 100644 --- a/sw/airborne/firmwares/fixedwing/autopilot_static.c +++ b/sw/airborne/firmwares/fixedwing/autopilot_static.c @@ -44,7 +44,7 @@ #endif static bool gps_lost; -#include "subsystems/datalink/downlink.h" +#include "modules/datalink/downlink.h" #if defined RADIO_CONTROL || defined RADIO_CONTROL_AUTO1 static uint8_t mcu1_ppm_cpt; diff --git a/sw/airborne/firmwares/fixedwing/fixedwing_datalink.c b/sw/airborne/firmwares/fixedwing/fixedwing_datalink.c index 559bd83db2..d7cdb26ee0 100644 --- a/sw/airborne/firmwares/fixedwing/fixedwing_datalink.c +++ b/sw/airborne/firmwares/fixedwing/fixedwing_datalink.c @@ -25,8 +25,8 @@ * */ -#include "subsystems/datalink/datalink.h" -#include "subsystems/datalink/downlink.h" +#include "modules/datalink/datalink.h" +#include "modules/datalink/downlink.h" #include "pprzlink/messages.h" #include "pprzlink/dl_protocol.h" diff --git a/sw/airborne/firmwares/fixedwing/main_chibios.c b/sw/airborne/firmwares/fixedwing/main_chibios.c index 237e6e3e63..8a27ab45c7 100644 --- a/sw/airborne/firmwares/fixedwing/main_chibios.c +++ b/sw/airborne/firmwares/fixedwing/main_chibios.c @@ -48,7 +48,7 @@ #endif #if USE_HARD_FAULT_RECOVERY -#include "subsystems/datalink/downlink.h" +#include "modules/datalink/downlink.h" #endif /* diff --git a/sw/airborne/firmwares/fixedwing/main_fbw.c b/sw/airborne/firmwares/fixedwing/main_fbw.c index fe838e547b..2e75cb98f4 100644 --- a/sw/airborne/firmwares/fixedwing/main_fbw.c +++ b/sw/airborne/firmwares/fixedwing/main_fbw.c @@ -50,7 +50,7 @@ #endif #if PERIODIC_TELEMETRY -#include "subsystems/datalink/telemetry.h" +#include "modules/datalink/telemetry.h" #endif #ifdef FBW_DATALINK diff --git a/sw/airborne/firmwares/fixedwing/nav.c b/sw/airborne/firmwares/fixedwing/nav.c index 20f2d12706..c760562b53 100644 --- a/sw/airborne/firmwares/fixedwing/nav.c +++ b/sw/airborne/firmwares/fixedwing/nav.c @@ -464,7 +464,7 @@ void nav_periodic_task(void) * \brief Periodic telemetry */ #if PERIODIC_TELEMETRY -#include "subsystems/datalink/telemetry.h" +#include "modules/datalink/telemetry.h" static void send_nav_ref(struct transport_tx *trans, struct link_device *dev) { diff --git a/sw/airborne/firmwares/fixedwing/stabilization/stabilization_adaptive.c b/sw/airborne/firmwares/fixedwing/stabilization/stabilization_adaptive.c index 5cce790d43..fffa6d7086 100644 --- a/sw/airborne/firmwares/fixedwing/stabilization/stabilization_adaptive.c +++ b/sw/airborne/firmwares/fixedwing/stabilization/stabilization_adaptive.c @@ -266,7 +266,7 @@ inline static void h_ctl_cl_loop(void); #endif #if PERIODIC_TELEMETRY -#include "subsystems/datalink/telemetry.h" +#include "modules/datalink/telemetry.h" static void send_calibration(struct transport_tx *trans, struct link_device *dev) { diff --git a/sw/airborne/firmwares/fixedwing/stabilization/stabilization_attitude.c b/sw/airborne/firmwares/fixedwing/stabilization/stabilization_attitude.c index 50a8961ece..11439968f6 100644 --- a/sw/airborne/firmwares/fixedwing/stabilization/stabilization_attitude.c +++ b/sw/airborne/firmwares/fixedwing/stabilization/stabilization_attitude.c @@ -124,7 +124,7 @@ static float nav_ratio; #endif #if PERIODIC_TELEMETRY -#include "subsystems/datalink/telemetry.h" +#include "modules/datalink/telemetry.h" static void send_calibration(struct transport_tx *trans, struct link_device *dev) { diff --git a/sw/airborne/firmwares/rotorcraft/autopilot_firmware.c b/sw/airborne/firmwares/rotorcraft/autopilot_firmware.c index 6cc4632a1c..efaf3ad17c 100644 --- a/sw/airborne/firmwares/rotorcraft/autopilot_firmware.c +++ b/sw/airborne/firmwares/rotorcraft/autopilot_firmware.c @@ -33,7 +33,7 @@ #include //#include "mcu_periph/sys_time.h" #include "modules/energy/electrical.h" -#include "subsystems/datalink/telemetry.h" +#include "modules/datalink/telemetry.h" #include "modules/radio_control/radio_control.h" #if USE_GPS diff --git a/sw/airborne/firmwares/rotorcraft/autopilot_generated.c b/sw/airborne/firmwares/rotorcraft/autopilot_generated.c index de44a4342f..8dc6d3cbba 100644 --- a/sw/airborne/firmwares/rotorcraft/autopilot_generated.c +++ b/sw/airborne/firmwares/rotorcraft/autopilot_generated.c @@ -34,7 +34,7 @@ #include "modules/core/commands.h" #include "modules/actuators/actuators.h" #include "modules/core/settings.h" -#include "subsystems/datalink/telemetry.h" +#include "modules/datalink/telemetry.h" #include "generated/settings.h" diff --git a/sw/airborne/firmwares/rotorcraft/guidance/guidance_h.c b/sw/airborne/firmwares/rotorcraft/guidance/guidance_h.c index 67650dae87..b5c9bd6e4b 100644 --- a/sw/airborne/firmwares/rotorcraft/guidance/guidance_h.c +++ b/sw/airborne/firmwares/rotorcraft/guidance/guidance_h.c @@ -112,7 +112,7 @@ static inline void transition_run(bool to_forward); static void read_rc_setpoint_speed_i(struct Int32Vect2 *speed_sp, bool in_flight); #if PERIODIC_TELEMETRY -#include "subsystems/datalink/telemetry.h" +#include "modules/datalink/telemetry.h" static void send_gh(struct transport_tx *trans, struct link_device *dev) { diff --git a/sw/airborne/firmwares/rotorcraft/guidance/guidance_hybrid.c b/sw/airborne/firmwares/rotorcraft/guidance/guidance_hybrid.c index 8bcb09c6fd..34d1f22bee 100644 --- a/sw/airborne/firmwares/rotorcraft/guidance/guidance_hybrid.c +++ b/sw/airborne/firmwares/rotorcraft/guidance/guidance_hybrid.c @@ -73,7 +73,7 @@ bool force_forward_flight; static int32_t v_control_pitch; #if PERIODIC_TELEMETRY -#include "subsystems/datalink/telemetry.h" +#include "modules/datalink/telemetry.h" static void send_hybrid_guidance(struct transport_tx *trans, struct link_device *dev) { diff --git a/sw/airborne/firmwares/rotorcraft/guidance/guidance_indi_hybrid.c b/sw/airborne/firmwares/rotorcraft/guidance/guidance_indi_hybrid.c index 2fc05de077..34fdb590eb 100644 --- a/sw/airborne/firmwares/rotorcraft/guidance/guidance_indi_hybrid.c +++ b/sw/airborne/firmwares/rotorcraft/guidance/guidance_indi_hybrid.c @@ -154,7 +154,7 @@ struct FloatVect3 nav_get_speed_sp_from_line(struct FloatVect2 line_v_enu, struc struct FloatVect3 nav_get_speed_setpoint(float pos_gain); #if PERIODIC_TELEMETRY -#include "subsystems/datalink/telemetry.h" +#include "modules/datalink/telemetry.h" static void send_guidance_indi_hybrid(struct transport_tx *trans, struct link_device *dev) { pprz_msg_send_GUIDANCE_INDI_HYBRID(trans, dev, AC_ID, diff --git a/sw/airborne/firmwares/rotorcraft/guidance/guidance_v.c b/sw/airborne/firmwares/rotorcraft/guidance/guidance_v.c index fa48240d44..4b4c9980ea 100644 --- a/sw/airborne/firmwares/rotorcraft/guidance/guidance_v.c +++ b/sw/airborne/firmwares/rotorcraft/guidance/guidance_v.c @@ -145,7 +145,7 @@ int32_t guidance_v_thrust_coeff; static int32_t get_vertical_thrust_coeff(void); #if PERIODIC_TELEMETRY -#include "subsystems/datalink/telemetry.h" +#include "modules/datalink/telemetry.h" static void send_vert_loop(struct transport_tx *trans, struct link_device *dev) { diff --git a/sw/airborne/firmwares/rotorcraft/navigation.c b/sw/airborne/firmwares/rotorcraft/navigation.c index aef7d01eb1..6f4ba9d3c9 100644 --- a/sw/airborne/firmwares/rotorcraft/navigation.c +++ b/sw/airborne/firmwares/rotorcraft/navigation.c @@ -44,7 +44,7 @@ #include "math/pprz_algebra_int.h" -#include "subsystems/datalink/downlink.h" +#include "modules/datalink/downlink.h" #include "pprzlink/messages.h" #include "mcu_periph/uart.h" @@ -125,7 +125,7 @@ struct EnuCoor_i nav_segment_start, nav_segment_end; static inline void nav_set_altitude(void); #if PERIODIC_TELEMETRY -#include "subsystems/datalink/telemetry.h" +#include "modules/datalink/telemetry.h" void set_exception_flag(uint8_t flag_num) { diff --git a/sw/airborne/firmwares/rotorcraft/rotorcraft_datalink.c b/sw/airborne/firmwares/rotorcraft/rotorcraft_datalink.c index 107020830e..f92860584c 100644 --- a/sw/airborne/firmwares/rotorcraft/rotorcraft_datalink.c +++ b/sw/airborne/firmwares/rotorcraft/rotorcraft_datalink.c @@ -25,7 +25,7 @@ * */ -#include "subsystems/datalink/datalink.h" +#include "modules/datalink/datalink.h" #include "pprzlink/dl_protocol.h" diff --git a/sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_euler_float.c b/sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_euler_float.c index a1f223ef56..775418d308 100644 --- a/sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_euler_float.c +++ b/sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_euler_float.c @@ -49,7 +49,7 @@ float stabilization_att_fb_cmd[COMMANDS_NB]; float stabilization_att_ff_cmd[COMMANDS_NB]; #if PERIODIC_TELEMETRY -#include "subsystems/datalink/telemetry.h" +#include "modules/datalink/telemetry.h" static void send_att(struct transport_tx *trans, struct link_device *dev) { diff --git a/sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_euler_int.c b/sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_euler_int.c index f6809ba88f..2667e065a2 100644 --- a/sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_euler_int.c +++ b/sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_euler_int.c @@ -83,7 +83,7 @@ static inline void reset_psi_ref_from_body(void) } #if PERIODIC_TELEMETRY -#include "subsystems/datalink/telemetry.h" +#include "modules/datalink/telemetry.h" static void send_att(struct transport_tx *trans, struct link_device *dev) { diff --git a/sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_heli_indi.c b/sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_heli_indi.c index cff224503a..67fc018921 100644 --- a/sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_heli_indi.c +++ b/sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_heli_indi.c @@ -158,7 +158,7 @@ void indi_apply_actuator_butterworth_filters(int32_t _out[], int32_t _in[]); void indi_apply_measurement_butterworth_filters(int32_t _out[], int32_t _in[]); #if PERIODIC_TELEMETRY -#include "subsystems/datalink/telemetry.h" +#include "modules/datalink/telemetry.h" /* Telemetry messages here, at the moment there are none */ diff --git a/sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_quat_float.c b/sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_quat_float.c index dfe7f6ddef..f2a13e7d7b 100644 --- a/sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_quat_float.c +++ b/sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_quat_float.c @@ -98,7 +98,7 @@ static const float psi_ddgain_surface[] = STABILIZATION_ATTITUDE_PSI_DDGAIN_SURF #define IERROR_SCALE 1024 #if PERIODIC_TELEMETRY -#include "subsystems/datalink/telemetry.h" +#include "modules/datalink/telemetry.h" static void send_att(struct transport_tx *trans, struct link_device *dev) { diff --git a/sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_quat_int.c b/sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_quat_int.c index 43950cb7cd..2e78c4224b 100644 --- a/sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_quat_int.c +++ b/sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_quat_int.c @@ -84,7 +84,7 @@ struct AttRefQuatInt att_ref_quat_i; #define GAIN_PRESCALER_I 3 #if PERIODIC_TELEMETRY -#include "subsystems/datalink/telemetry.h" +#include "modules/datalink/telemetry.h" static void send_att(struct transport_tx *trans, struct link_device *dev) //FIXME really use this message here ? { diff --git a/sw/airborne/firmwares/rotorcraft/stabilization/stabilization_indi.c b/sw/airborne/firmwares/rotorcraft/stabilization/stabilization_indi.c index 72f549895f..9732f520eb 100644 --- a/sw/airborne/firmwares/rotorcraft/stabilization/stabilization_indi.c +++ b/sw/airborne/firmwares/rotorcraft/stabilization/stabilization_indi.c @@ -194,7 +194,7 @@ struct FloatVect3 body_accel_f; void init_filters(void); #if PERIODIC_TELEMETRY -#include "subsystems/datalink/telemetry.h" +#include "modules/datalink/telemetry.h" static void send_indi_g(struct transport_tx *trans, struct link_device *dev) { pprz_msg_send_INDI_G(trans, dev, AC_ID, INDI_NUM_ACT, g1_est[0], diff --git a/sw/airborne/firmwares/rotorcraft/stabilization/stabilization_indi_simple.c b/sw/airborne/firmwares/rotorcraft/stabilization/stabilization_indi_simple.c index ebcd61f30f..6384e81b7e 100644 --- a/sw/airborne/firmwares/rotorcraft/stabilization/stabilization_indi_simple.c +++ b/sw/airborne/firmwares/rotorcraft/stabilization/stabilization_indi_simple.c @@ -140,7 +140,7 @@ struct IndiVariables indi = { }; #if PERIODIC_TELEMETRY -#include "subsystems/datalink/telemetry.h" +#include "modules/datalink/telemetry.h" static void send_att_indi(struct transport_tx *trans, struct link_device *dev) { diff --git a/sw/airborne/firmwares/rotorcraft/stabilization/stabilization_rate.c b/sw/airborne/firmwares/rotorcraft/stabilization/stabilization_rate.c index eacf8e616c..999cff6e86 100644 --- a/sw/airborne/firmwares/rotorcraft/stabilization/stabilization_rate.c +++ b/sw/airborne/firmwares/rotorcraft/stabilization/stabilization_rate.c @@ -94,7 +94,7 @@ struct FloatRates stabilization_rate_fb_cmd; radio_control.values[RADIO_YAW] < -STABILIZATION_RATE_DEADBAND_R) #if PERIODIC_TELEMETRY -#include "subsystems/datalink/telemetry.h" +#include "modules/datalink/telemetry.h" static void send_rate(struct transport_tx *trans, struct link_device *dev) { diff --git a/sw/airborne/firmwares/rotorcraft/stabilization/stabilization_rate_indi.c b/sw/airborne/firmwares/rotorcraft/stabilization/stabilization_rate_indi.c index 84780695a4..bb3c6d6937 100644 --- a/sw/airborne/firmwares/rotorcraft/stabilization/stabilization_rate_indi.c +++ b/sw/airborne/firmwares/rotorcraft/stabilization/stabilization_rate_indi.c @@ -68,7 +68,7 @@ struct FloatRates stabilization_rate_sp; #if PERIODIC_TELEMETRY -#include "subsystems/datalink/telemetry.h" +#include "modules/datalink/telemetry.h" static void send_rate(struct transport_tx *trans, struct link_device *dev) { diff --git a/sw/airborne/firmwares/rover/autopilot_firmware.c b/sw/airborne/firmwares/rover/autopilot_firmware.c index b7e257d3ad..f40264e5d8 100644 --- a/sw/airborne/firmwares/rover/autopilot_firmware.c +++ b/sw/airborne/firmwares/rover/autopilot_firmware.c @@ -31,7 +31,7 @@ #include #include "modules/energy/electrical.h" -#include "subsystems/datalink/telemetry.h" +#include "modules/datalink/telemetry.h" #include "modules/radio_control/radio_control.h" #if USE_GPS diff --git a/sw/airborne/firmwares/rover/autopilot_generated.c b/sw/airborne/firmwares/rover/autopilot_generated.c index c557b99bdc..c8cda38398 100644 --- a/sw/airborne/firmwares/rover/autopilot_generated.c +++ b/sw/airborne/firmwares/rover/autopilot_generated.c @@ -33,7 +33,7 @@ #include "modules/core/commands.h" #include "modules/actuators/actuators.h" #include "modules/core/settings.h" -#include "subsystems/datalink/telemetry.h" +#include "modules/datalink/telemetry.h" #include "generated/settings.h" diff --git a/sw/airborne/firmwares/rover/guidance/rover_guidance.c b/sw/airborne/firmwares/rover/guidance/rover_guidance.c index bdd4879ec3..2c5275b75b 100644 --- a/sw/airborne/firmwares/rover/guidance/rover_guidance.c +++ b/sw/airborne/firmwares/rover/guidance/rover_guidance.c @@ -35,7 +35,7 @@ struct RoverGuidance rover_guidance; #if PERIODIC_TELEMETRY -#include "subsystems/datalink/telemetry.h" +#include "modules/datalink/telemetry.h" // TODO rover guidance messages #endif diff --git a/sw/airborne/firmwares/rover/guidance/rover_guidance_holonomic.c b/sw/airborne/firmwares/rover/guidance/rover_guidance_holonomic.c index 2a23e3c232..ffb333b1bf 100644 --- a/sw/airborne/firmwares/rover/guidance/rover_guidance_holonomic.c +++ b/sw/airborne/firmwares/rover/guidance/rover_guidance_holonomic.c @@ -36,7 +36,7 @@ struct RoverHoloGuidance rover_holo_guidance; #if PERIODIC_TELEMETRY -#include "subsystems/datalink/telemetry.h" +#include "modules/datalink/telemetry.h" // TODO rover guidance messages #endif diff --git a/sw/airborne/firmwares/rover/navigation.c b/sw/airborne/firmwares/rover/navigation.c index 25788fe2a5..b6c424f997 100644 --- a/sw/airborne/firmwares/rover/navigation.c +++ b/sw/airborne/firmwares/rover/navigation.c @@ -40,7 +40,7 @@ #include "math/pprz_algebra_int.h" -#include "subsystems/datalink/downlink.h" +#include "modules/datalink/downlink.h" #include "pprzlink/messages.h" #include "mcu_periph/uart.h" @@ -62,7 +62,7 @@ void set_exception_flag(uint8_t flag_num) #if PERIODIC_TELEMETRY -#include "subsystems/datalink/telemetry.h" +#include "modules/datalink/telemetry.h" static void send_wp_moved(struct transport_tx *trans, struct link_device *dev) { diff --git a/sw/airborne/firmwares/rover/rover_datalink.c b/sw/airborne/firmwares/rover/rover_datalink.c index 5cbd5b1a47..e0a6b67285 100644 --- a/sw/airborne/firmwares/rover/rover_datalink.c +++ b/sw/airborne/firmwares/rover/rover_datalink.c @@ -24,7 +24,7 @@ * */ -#include "subsystems/datalink/datalink.h" +#include "modules/datalink/datalink.h" #include "pprzlink/dl_protocol.h" diff --git a/sw/airborne/firmwares/setup/setup_actuators.c b/sw/airborne/firmwares/setup/setup_actuators.c index bcba42953a..9c84c2525b 100644 --- a/sw/airborne/firmwares/setup/setup_actuators.c +++ b/sw/airborne/firmwares/setup/setup_actuators.c @@ -39,8 +39,8 @@ #include "generated/settings.h" #include "generated/modules.h" -#include "subsystems/datalink/datalink.h" -#include "subsystems/datalink/downlink.h" +#include "modules/datalink/datalink.h" +#include "modules/datalink/downlink.h" #include "modules/datalink/pprz_dl.h" #include "mcu.h" diff --git a/sw/airborne/firmwares/tutorial/main_demo3.c b/sw/airborne/firmwares/tutorial/main_demo3.c index 1c2470850c..62f8cbe3da 100644 --- a/sw/airborne/firmwares/tutorial/main_demo3.c +++ b/sw/airborne/firmwares/tutorial/main_demo3.c @@ -4,7 +4,7 @@ #include "mcu_periph/sys_time.h" #include "led.h" #include "mcu_periph/uart.h" -#include "subsystems/datalink/uart_print.h" +#include "modules/datalink/uart_print.h" static inline void main_init(void); static inline void main_periodic_task(void); diff --git a/sw/airborne/firmwares/tutorial/main_demo4.c b/sw/airborne/firmwares/tutorial/main_demo4.c index 1f0ca60063..7ca4a39eb5 100644 --- a/sw/airborne/firmwares/tutorial/main_demo4.c +++ b/sw/airborne/firmwares/tutorial/main_demo4.c @@ -5,7 +5,7 @@ #include "mcu_periph/uart.h" #include "pprzlink/messages.h" -#include "subsystems/datalink/downlink.h" +#include "modules/datalink/downlink.h" static inline void main_init(void); static inline void main_periodic_task(void); diff --git a/sw/airborne/firmwares/tutorial/main_demo5.c b/sw/airborne/firmwares/tutorial/main_demo5.c index a4a23ed26c..80bdfb8abd 100644 --- a/sw/airborne/firmwares/tutorial/main_demo5.c +++ b/sw/airborne/firmwares/tutorial/main_demo5.c @@ -5,7 +5,7 @@ #include "mcu_periph/uart.h" #include "pprzlink/messages.h" -#include "subsystems/datalink/downlink.h" +#include "modules/datalink/downlink.h" static inline void main_init(void); static inline void main_periodic_task(void); diff --git a/sw/airborne/firmwares/tutorial/main_demo6.c b/sw/airborne/firmwares/tutorial/main_demo6.c index 416075bd19..b479f4cd74 100644 --- a/sw/airborne/firmwares/tutorial/main_demo6.c +++ b/sw/airborne/firmwares/tutorial/main_demo6.c @@ -5,7 +5,7 @@ #include "mcu_periph/usb_serial.h" #include "pprzlink/messages.h" -#include "subsystems/datalink/downlink.h" +#include "modules/datalink/downlink.h" static inline void main_init(void); static inline void main_periodic_task(void); diff --git a/sw/airborne/link_mcu_can.c b/sw/airborne/link_mcu_can.c index 762bfa7d1a..0b9713d8c1 100644 --- a/sw/airborne/link_mcu_can.c +++ b/sw/airborne/link_mcu_can.c @@ -178,7 +178,7 @@ struct link_mcu_msg link_mcu_from_fbw_msg; #ifdef AP -#include "subsystems/datalink/telemetry.h" +#include "modules/datalink/telemetry.h" #define RC_OK 0 #define RC_LOST 1 diff --git a/sw/airborne/link_mcu_spi.c b/sw/airborne/link_mcu_spi.c index b573d4eff0..e9f11551e0 100644 --- a/sw/airborne/link_mcu_spi.c +++ b/sw/airborne/link_mcu_spi.c @@ -108,7 +108,7 @@ uint8_t link_mcu_nb_err; uint8_t link_mcu_fbw_nb_err; #if PERIODIC_TELEMETRY -#include "subsystems/datalink/telemetry.h" +#include "modules/datalink/telemetry.h" static void send_debug_link(struct transport_tx *trans, struct link_device *dev) { diff --git a/sw/airborne/link_mcu_usart.c b/sw/airborne/link_mcu_usart.c index 5154472d07..cc4ced67b0 100644 --- a/sw/airborne/link_mcu_usart.c +++ b/sw/airborne/link_mcu_usart.c @@ -245,7 +245,7 @@ inline void parse_mavpilot_msg(void); #ifdef AP -#include "subsystems/datalink/telemetry.h" +#include "modules/datalink/telemetry.h" #define RC_OK 0 #define RC_LOST 1 diff --git a/sw/airborne/mcu_periph/i2c.c b/sw/airborne/mcu_periph/i2c.c index 8d0a0a20b5..1d4b9315e6 100644 --- a/sw/airborne/mcu_periph/i2c.c +++ b/sw/airborne/mcu_periph/i2c.c @@ -29,7 +29,7 @@ #include "mcu_periph/sys_time.h" #if PERIODIC_TELEMETRY -#include "subsystems/datalink/telemetry.h" +#include "modules/datalink/telemetry.h" #endif #if USE_I2C0 diff --git a/sw/airborne/mcu_periph/softi2c.c b/sw/airborne/mcu_periph/softi2c.c index b2bed45e9a..82cc51db06 100644 --- a/sw/airborne/mcu_periph/softi2c.c +++ b/sw/airborne/mcu_periph/softi2c.c @@ -35,7 +35,7 @@ #include "mcu_periph/sys_time.h" #if PERIODIC_TELEMETRY -#include "subsystems/datalink/telemetry.h" +#include "modules/datalink/telemetry.h" #endif #include diff --git a/sw/airborne/mcu_periph/uart.c b/sw/airborne/mcu_periph/uart.c index 2c2f3cb770..69a357ad85 100644 --- a/sw/airborne/mcu_periph/uart.c +++ b/sw/airborne/mcu_periph/uart.c @@ -23,7 +23,7 @@ #include "mcu_periph/uart.h" #if PERIODIC_TELEMETRY -#include "subsystems/datalink/telemetry.h" +#include "modules/datalink/telemetry.h" #endif #if USE_UART0 diff --git a/sw/airborne/modules/actuators/actuators_uavcan.c b/sw/airborne/modules/actuators/actuators_uavcan.c index 93a21e8be4..c5fe91f69b 100644 --- a/sw/airborne/modules/actuators/actuators_uavcan.c +++ b/sw/airborne/modules/actuators/actuators_uavcan.c @@ -66,7 +66,7 @@ static bool actuators_uavcan_initialized = false; static uavcan_event esc_status_ev; #if PERIODIC_TELEMETRY -#include "subsystems/datalink/telemetry.h" +#include "modules/datalink/telemetry.h" static void actuators_uavcan_send_esc(struct transport_tx *trans, struct link_device *dev) { diff --git a/sw/airborne/modules/actuators/motor_mixing.c b/sw/airborne/modules/actuators/motor_mixing.c index f37ba5b777..652b26aa8a 100644 --- a/sw/airborne/modules/actuators/motor_mixing.c +++ b/sw/airborne/modules/actuators/motor_mixing.c @@ -94,7 +94,7 @@ static const int32_t thrust_coef[MOTOR_MIXING_NB_MOTOR] = MOTOR_MIXING_THRUST_CO struct MotorMixing motor_mixing; #if PERIODIC_TELEMETRY -#include "subsystems/datalink/telemetry.h" +#include "modules/datalink/telemetry.h" static void send_motor_mixing(struct transport_tx *trans, struct link_device *dev) { int16_t motors[MOTOR_MIXING_NB_MOTOR]; diff --git a/sw/airborne/modules/adcs/adc_generic.c b/sw/airborne/modules/adcs/adc_generic.c index 4eaffa15ca..f2ccd84a87 100644 --- a/sw/airborne/modules/adcs/adc_generic.c +++ b/sw/airborne/modules/adcs/adc_generic.c @@ -33,7 +33,7 @@ #include "mcu_periph/adc.h" #include "mcu_periph/uart.h" #include "pprzlink/messages.h" -#include "subsystems/datalink/downlink.h" +#include "modules/datalink/downlink.h" uint16_t adc_generic_val1; uint16_t adc_generic_val2; @@ -49,7 +49,7 @@ uint16_t adc_generic_val2; #endif #if PERIODIC_TELEMETRY -#include "subsystems/datalink/telemetry.h" +#include "modules/datalink/telemetry.h" #endif #ifndef ADC_GENERIC_PERIODIC_SEND diff --git a/sw/airborne/modules/adcs/battery_monitor.c b/sw/airborne/modules/adcs/battery_monitor.c index 640a13297e..bba23edb50 100644 --- a/sw/airborne/modules/adcs/battery_monitor.c +++ b/sw/airborne/modules/adcs/battery_monitor.c @@ -42,7 +42,7 @@ int16_t batmon_temp_offset; float batmon_temp_sensitivity; #if PERIODIC_TELEMETRY -#include "subsystems/datalink/telemetry.h" +#include "modules/datalink/telemetry.h" static void send_batmon(struct transport_tx *trans, struct link_device *dev) { static uint16_t power_status; diff --git a/sw/airborne/modules/adcs/max11040.c b/sw/airborne/modules/adcs/max11040.c index a8c509f598..807a798179 100644 --- a/sw/airborne/modules/adcs/max11040.c +++ b/sw/airborne/modules/adcs/max11040.c @@ -28,7 +28,7 @@ #include "led.h" #include "mcu_periph/uart.h" #include "pprzlink/messages.h" -#include "subsystems/datalink/downlink.h" +#include "modules/datalink/downlink.h" #include "max11040.h" #include "adcs/max11040_hw.h" diff --git a/sw/airborne/modules/ahrs/ahrs_aligner.c b/sw/airborne/modules/ahrs/ahrs_aligner.c index 8739f14ad7..5bfa400649 100644 --- a/sw/airborne/modules/ahrs/ahrs_aligner.c +++ b/sw/airborne/modules/ahrs/ahrs_aligner.c @@ -61,7 +61,7 @@ static void gyro_cb(uint8_t sender_id __attribute__((unused)), } #if PERIODIC_TELEMETRY -#include "subsystems/datalink/telemetry.h" +#include "modules/datalink/telemetry.h" static void send_aligner(struct transport_tx *trans, struct link_device *dev) { diff --git a/sw/airborne/modules/ahrs/ahrs_chimu_spi.c b/sw/airborne/modules/ahrs/ahrs_chimu_spi.c index d25eb32b15..fdeef7db1d 100644 --- a/sw/airborne/modules/ahrs/ahrs_chimu_spi.c +++ b/sw/airborne/modules/ahrs/ahrs_chimu_spi.c @@ -21,7 +21,7 @@ #if CHIMU_DOWNLINK_IMMEDIATE #include "mcu_periph/uart.h" #include "pprzlink/messages.h" -#include "subsystems/datalink/downlink.h" +#include "modules/datalink/downlink.h" #endif #include "modules/ins/ins_module.h" diff --git a/sw/airborne/modules/ahrs/ahrs_chimu_uart.c b/sw/airborne/modules/ahrs/ahrs_chimu_uart.c index 516078397e..da62a03b62 100644 --- a/sw/airborne/modules/ahrs/ahrs_chimu_uart.c +++ b/sw/airborne/modules/ahrs/ahrs_chimu_uart.c @@ -17,7 +17,7 @@ #if CHIMU_DOWNLINK_IMMEDIATE #include "mcu_periph/uart.h" #include "pprzlink/messages.h" -#include "subsystems/datalink/downlink.h" +#include "modules/datalink/downlink.h" #endif #include "modules/ins/ins_module.h" diff --git a/sw/airborne/modules/ahrs/ahrs_float_cmpl_wrapper.c b/sw/airborne/modules/ahrs/ahrs_float_cmpl_wrapper.c index 5c68eb96fd..7418e55d20 100644 --- a/sw/airborne/modules/ahrs/ahrs_float_cmpl_wrapper.c +++ b/sw/airborne/modules/ahrs/ahrs_float_cmpl_wrapper.c @@ -42,7 +42,7 @@ static uint8_t ahrs_fc_id = AHRS_COMP_ID_FC; static void compute_body_orientation_and_rates(void); #if PERIODIC_TELEMETRY -#include "subsystems/datalink/telemetry.h" +#include "modules/datalink/telemetry.h" #include "mcu_periph/sys_time.h" #include "state.h" diff --git a/sw/airborne/modules/ahrs/ahrs_float_dcm.c b/sw/airborne/modules/ahrs/ahrs_float_dcm.c index 8949d4c4ae..3c7d457fda 100644 --- a/sw/airborne/modules/ahrs/ahrs_float_dcm.c +++ b/sw/airborne/modules/ahrs/ahrs_float_dcm.c @@ -46,7 +46,7 @@ // FIXME Debugging Only #include "mcu_periph/uart.h" #include "pprzlink/messages.h" -#include "subsystems/datalink/downlink.h" +#include "modules/datalink/downlink.h" #endif struct AhrsFloatDCM ahrs_dcm; diff --git a/sw/airborne/modules/ahrs/ahrs_float_dcm_wrapper.c b/sw/airborne/modules/ahrs/ahrs_float_dcm_wrapper.c index a376a363a1..37e6d0a28c 100644 --- a/sw/airborne/modules/ahrs/ahrs_float_dcm_wrapper.c +++ b/sw/airborne/modules/ahrs/ahrs_float_dcm_wrapper.c @@ -42,7 +42,7 @@ static uint8_t ahrs_dcm_id = AHRS_COMP_ID_DCM; static void set_body_orientation_and_rates(void); #if PERIODIC_TELEMETRY -#include "subsystems/datalink/telemetry.h" +#include "modules/datalink/telemetry.h" #include "mcu_periph/sys_time.h" static void send_filter_status(struct transport_tx *trans, struct link_device *dev) diff --git a/sw/airborne/modules/ahrs/ahrs_float_invariant.c b/sw/airborne/modules/ahrs/ahrs_float_invariant.c index 72431265d5..b2408e0e3a 100644 --- a/sw/airborne/modules/ahrs/ahrs_float_invariant.c +++ b/sw/airborne/modules/ahrs/ahrs_float_invariant.c @@ -37,7 +37,7 @@ #include "math/pprz_rk_float.h" #if SEND_INVARIANT_FILTER -#include "subsystems/datalink/telemetry.h" +#include "modules/datalink/telemetry.h" #endif /*---------Invariant Observers----------- diff --git a/sw/airborne/modules/ahrs/ahrs_float_invariant_wrapper.c b/sw/airborne/modules/ahrs/ahrs_float_invariant_wrapper.c index 0d86f92553..eb3b7bdde7 100644 --- a/sw/airborne/modules/ahrs/ahrs_float_invariant_wrapper.c +++ b/sw/airborne/modules/ahrs/ahrs_float_invariant_wrapper.c @@ -46,7 +46,7 @@ static uint8_t ahrs_finv_id = AHRS_COMP_ID_FINV; static void compute_body_orientation_and_rates(void); #if PERIODIC_TELEMETRY -#include "subsystems/datalink/telemetry.h" +#include "modules/datalink/telemetry.h" static void send_att(struct transport_tx *trans, struct link_device *dev) { diff --git a/sw/airborne/modules/ahrs/ahrs_float_mlkf_wrapper.c b/sw/airborne/modules/ahrs/ahrs_float_mlkf_wrapper.c index 104ca070c9..e212e98ad9 100644 --- a/sw/airborne/modules/ahrs/ahrs_float_mlkf_wrapper.c +++ b/sw/airborne/modules/ahrs/ahrs_float_mlkf_wrapper.c @@ -43,7 +43,7 @@ static uint8_t ahrs_mlkf_id = AHRS_COMP_ID_MLKF; static void set_body_state_from_quat(void); #if PERIODIC_TELEMETRY -#include "subsystems/datalink/telemetry.h" +#include "modules/datalink/telemetry.h" #include "mcu_periph/sys_time.h" static void send_euler(struct transport_tx *trans, struct link_device *dev) diff --git a/sw/airborne/modules/ahrs/ahrs_gx3.c b/sw/airborne/modules/ahrs/ahrs_gx3.c index 38771fc2c7..e881c8bbf7 100644 --- a/sw/airborne/modules/ahrs/ahrs_gx3.c +++ b/sw/airborne/modules/ahrs/ahrs_gx3.c @@ -88,7 +88,7 @@ void ahrs_gx3_align(void) } #if PERIODIC_TELEMETRY -#include "subsystems/datalink/telemetry.h" +#include "modules/datalink/telemetry.h" static void send_gx3(struct transport_tx *trans, struct link_device *dev) { diff --git a/sw/airborne/modules/ahrs/ahrs_int_cmpl_quat_wrapper.c b/sw/airborne/modules/ahrs/ahrs_int_cmpl_quat_wrapper.c index 5fa1069ecc..9c8d85af8e 100644 --- a/sw/airborne/modules/ahrs/ahrs_int_cmpl_quat_wrapper.c +++ b/sw/airborne/modules/ahrs/ahrs_int_cmpl_quat_wrapper.c @@ -42,7 +42,7 @@ static uint8_t ahrs_icq_id = AHRS_COMP_ID_ICQ; static void set_body_state_from_quat(void); #if PERIODIC_TELEMETRY -#include "subsystems/datalink/telemetry.h" +#include "modules/datalink/telemetry.h" #include "mcu_periph/sys_time.h" #include "state.h" diff --git a/sw/airborne/modules/ahrs/ahrs_madgwick_wrapper.c b/sw/airborne/modules/ahrs/ahrs_madgwick_wrapper.c index 67877c8d39..765dee159d 100644 --- a/sw/airborne/modules/ahrs/ahrs_madgwick_wrapper.c +++ b/sw/airborne/modules/ahrs/ahrs_madgwick_wrapper.c @@ -45,7 +45,7 @@ static uint8_t ahrs_madgwick_id = AHRS_COMP_ID_MADGWICK; static void compute_body_orientation_and_rates(void); #if PERIODIC_TELEMETRY -#include "subsystems/datalink/telemetry.h" +#include "modules/datalink/telemetry.h" static void send_att(struct transport_tx *trans, struct link_device *dev) { diff --git a/sw/airborne/modules/ahrs/ahrs_vectornav.c b/sw/airborne/modules/ahrs/ahrs_vectornav.c index 417ba7ba65..6efba0669c 100644 --- a/sw/airborne/modules/ahrs/ahrs_vectornav.c +++ b/sw/airborne/modules/ahrs/ahrs_vectornav.c @@ -33,7 +33,7 @@ struct AhrsVectornav ahrs_vn; #if PERIODIC_TELEMETRY -#include "subsystems/datalink/telemetry.h" +#include "modules/datalink/telemetry.h" static void send_vn_info(struct transport_tx *trans, struct link_device *dev) diff --git a/sw/airborne/modules/ahrs/ahrs_vectornav_wrapper.c b/sw/airborne/modules/ahrs/ahrs_vectornav_wrapper.c index e40c6c147e..b9b83c370b 100644 --- a/sw/airborne/modules/ahrs/ahrs_vectornav_wrapper.c +++ b/sw/airborne/modules/ahrs/ahrs_vectornav_wrapper.c @@ -40,7 +40,7 @@ static bool ahrs_vectornav_output_enabled; static uint8_t ahrs_vectornav_id = AHRS_COMP_ID_VECTORNAV; #if PERIODIC_TELEMETRY -#include "subsystems/datalink/telemetry.h" +#include "modules/datalink/telemetry.h" static void send_euler(struct transport_tx *trans, struct link_device *dev) { diff --git a/sw/airborne/modules/air_data/air_data.c b/sw/airborne/modules/air_data/air_data.c index daec983a5c..c44f4f040f 100644 --- a/sw/airborne/modules/air_data/air_data.c +++ b/sw/airborne/modules/air_data/air_data.c @@ -184,7 +184,7 @@ static void incidence_cb(uint8_t __attribute__((unused)) sender_id, uint8_t flag } #if PERIODIC_TELEMETRY -#include "subsystems/datalink/telemetry.h" +#include "modules/datalink/telemetry.h" static void send_baro_raw(struct transport_tx *trans, struct link_device *dev) { diff --git a/sw/airborne/modules/benchmark/flight_benchmark.c b/sw/airborne/modules/benchmark/flight_benchmark.c index 39d6e3c654..c2736831ba 100644 --- a/sw/airborne/modules/benchmark/flight_benchmark.c +++ b/sw/airborne/modules/benchmark/flight_benchmark.c @@ -9,7 +9,7 @@ #include "firmwares/fixedwing/guidance/guidance_v.h" #include "state.h" #include "pprzlink/messages.h" -#include "subsystems/datalink/downlink.h" +#include "modules/datalink/downlink.h" #include "mcu_periph/uart.h" #include "generated/airframe.h" #include "firmwares/fixedwing/nav.h" diff --git a/sw/airborne/modules/calibration/mag_calib_ukf.c b/sw/airborne/modules/calibration/mag_calib_ukf.c index 059f7eb043..d629be6a91 100644 --- a/sw/airborne/modules/calibration/mag_calib_ukf.c +++ b/sw/airborne/modules/calibration/mag_calib_ukf.c @@ -34,7 +34,7 @@ #include "modules/core/abi.h" #include "generated/airframe.h" #include "modules/ahrs/ahrs_magnetic_field_model.h" -#include "subsystems/datalink/telemetry.h" +#include "modules/datalink/telemetry.h" #include "TRICAL.h" // diff --git a/sw/airborne/modules/calibration/send_imu_mag_current.c b/sw/airborne/modules/calibration/send_imu_mag_current.c index a514d077d7..4ecfff4299 100644 --- a/sw/airborne/modules/calibration/send_imu_mag_current.c +++ b/sw/airborne/modules/calibration/send_imu_mag_current.c @@ -29,7 +29,7 @@ #include "pprzlink/messages.h" #include "mcu_periph/uart.h" -#include "subsystems/datalink/downlink.h" +#include "modules/datalink/downlink.h" void send_imu_mag_current(void) { diff --git a/sw/airborne/modules/cam_control/cam.c b/sw/airborne/modules/cam_control/cam.c index adc3af0d24..a549caa5cf 100644 --- a/sw/airborne/modules/cam_control/cam.c +++ b/sw/airborne/modules/cam_control/cam.c @@ -34,7 +34,7 @@ #include "point.h" #endif // POINT_CAM -#include "subsystems/datalink/telemetry.h" +#include "modules/datalink/telemetry.h" #ifdef TEST_CAM float test_cam_estimator_x; diff --git a/sw/airborne/modules/cam_control/rotorcraft_cam.c b/sw/airborne/modules/cam_control/rotorcraft_cam.c index f5dcc8005a..d118808cd2 100644 --- a/sw/airborne/modules/cam_control/rotorcraft_cam.c +++ b/sw/airborne/modules/cam_control/rotorcraft_cam.c @@ -45,7 +45,7 @@ #include "firmwares/rotorcraft/navigation.h" #include "std.h" -#include "subsystems/datalink/telemetry.h" +#include "modules/datalink/telemetry.h" /** Gpio output to turn camera power power on. diff --git a/sw/airborne/modules/computer_vision/cv_georeference.c b/sw/airborne/modules/computer_vision/cv_georeference.c index b589e10797..c1a283dc40 100644 --- a/sw/airborne/modules/computer_vision/cv_georeference.c +++ b/sw/airborne/modules/computer_vision/cv_georeference.c @@ -31,7 +31,7 @@ #include "state.h" #include "generated/flight_plan.h" -#include "subsystems/datalink/downlink.h" +#include "modules/datalink/downlink.h" struct georeference_filter_t { struct Int32Vect3 x; ///< Target diff --git a/sw/airborne/modules/computer_vision/cv_target_localization.c b/sw/airborne/modules/computer_vision/cv_target_localization.c index 27aa68d7e6..deb9eaeac3 100644 --- a/sw/airborne/modules/computer_vision/cv_target_localization.c +++ b/sw/airborne/modules/computer_vision/cv_target_localization.c @@ -32,7 +32,7 @@ #include "math/pprz_geodetic_float.h" #include "state.h" #include "modules/core/abi.h" -#include "subsystems/datalink/downlink.h" +#include "modules/datalink/downlink.h" #include "subsystems/navigation/waypoints.h" #include "generated/flight_plan.h" diff --git a/sw/airborne/modules/computer_vision/detect_gate.c b/sw/airborne/modules/computer_vision/detect_gate.c index 69d9aa9690..bd3f645c85 100644 --- a/sw/airborne/modules/computer_vision/detect_gate.c +++ b/sw/airborne/modules/computer_vision/detect_gate.c @@ -19,7 +19,7 @@ #include "modules/computer_vision/snake_gate_detection.h" -#include "subsystems/datalink/telemetry.h" +#include "modules/datalink/telemetry.h" //#define DEBUG_GATE diff --git a/sw/airborne/modules/computer_vision/opticflow_module.c b/sw/airborne/modules/computer_vision/opticflow_module.c index bfe005e96c..115d2c95df 100644 --- a/sw/airborne/modules/computer_vision/opticflow_module.c +++ b/sw/airborne/modules/computer_vision/opticflow_module.c @@ -72,7 +72,7 @@ static pthread_mutex_t opticflow_mutex; ///< Mutex lock fo thre struct image_t *opticflow_module_calc(struct image_t *img, uint8_t camera_id); ///< The main optical flow calculation thread #if PERIODIC_TELEMETRY -#include "subsystems/datalink/telemetry.h" +#include "modules/datalink/telemetry.h" /** * Send optical flow telemetry information * @param[in] *trans The transport structure to send the information over diff --git a/sw/airborne/modules/computer_vision/qrcode/qr_code.c b/sw/airborne/modules/computer_vision/qrcode/qr_code.c index 1951421aa2..b9fe7a7c7f 100644 --- a/sw/airborne/modules/computer_vision/qrcode/qr_code.c +++ b/sw/airborne/modules/computer_vision/qrcode/qr_code.c @@ -46,7 +46,7 @@ void qrcode_init(void) } // Telemetry -#include "subsystems/datalink/telemetry.h" +#include "modules/datalink/telemetry.h" zbar_image_scanner_t *scanner = 0; diff --git a/sw/airborne/modules/core/rtos_mon.c b/sw/airborne/modules/core/rtos_mon.c index 7916070251..5258c2cd20 100644 --- a/sw/airborne/modules/core/rtos_mon.c +++ b/sw/airborne/modules/core/rtos_mon.c @@ -25,7 +25,7 @@ #include "modules/core/sys_mon.h" #include "modules/core/sys_mon_rtos.h" -#include "subsystems/datalink/downlink.h" +#include "modules/datalink/downlink.h" struct rtos_monitoring rtos_mon; diff --git a/sw/airborne/modules/core/sys_mon.c b/sw/airborne/modules/core/sys_mon.c index d3b70c4419..f378142c6f 100644 --- a/sw/airborne/modules/core/sys_mon.c +++ b/sw/airborne/modules/core/sys_mon.c @@ -31,7 +31,7 @@ #include "mcu_periph/uart.h" #include "pprzlink/messages.h" -#include "subsystems/datalink/downlink.h" +#include "modules/datalink/downlink.h" /** Global system monitor data (averaged over 1 sec) */ struct SysMon sys_mon; diff --git a/sw/airborne/modules/ctrl/ctrl_windtunnel.c b/sw/airborne/modules/ctrl/ctrl_windtunnel.c index 5d09c00cb3..9203f40e30 100644 --- a/sw/airborne/modules/ctrl/ctrl_windtunnel.c +++ b/sw/airborne/modules/ctrl/ctrl_windtunnel.c @@ -59,7 +59,7 @@ void ctrl_module_init(void); void ctrl_module_run(bool in_flight); #if PERIODIC_TELEMETRY -#include "subsystems/datalink/telemetry.h" +#include "modules/datalink/telemetry.h" static void send_windtunnel_meas(struct transport_tx *trans, struct link_device *dev) { struct FloatQuat windtunnel_to_body; diff --git a/sw/airborne/modules/ctrl/follow_me.c b/sw/airborne/modules/ctrl/follow_me.c index 0300946902..63a8e5af47 100644 --- a/sw/airborne/modules/ctrl/follow_me.c +++ b/sw/airborne/modules/ctrl/follow_me.c @@ -25,7 +25,7 @@ #include "follow_me.h" -#include "subsystems/datalink/telemetry.h" +#include "modules/datalink/telemetry.h" #include "generated/modules.h" // Distance to the target to hover from is by default 15 meters diff --git a/sw/airborne/modules/ctrl/object_tracking.c b/sw/airborne/modules/ctrl/object_tracking.c index c184cb9472..121ca1eb85 100644 --- a/sw/airborne/modules/ctrl/object_tracking.c +++ b/sw/airborne/modules/ctrl/object_tracking.c @@ -56,7 +56,7 @@ #endif #if OBJECT_TRACKING_DEBUG -#include "subsystems/datalink/downlink.h" +#include "modules/datalink/downlink.h" #include "pprzlink/messages.h" #include "mcu_periph/uart.h" #endif diff --git a/sw/airborne/modules/ctrl/optical_flow_hover.c b/sw/airborne/modules/ctrl/optical_flow_hover.c index 33da940468..737955f596 100644 --- a/sw/airborne/modules/ctrl/optical_flow_hover.c +++ b/sw/airborne/modules/ctrl/optical_flow_hover.c @@ -29,7 +29,7 @@ #include "modules/energy/electrical.h" #include -#include "subsystems/datalink/telemetry.h" +#include "modules/datalink/telemetry.h" // //// for measuring time #include "mcu_periph/sys_time.h" diff --git a/sw/airborne/modules/ctrl/optical_flow_landing.c b/sw/airborne/modules/ctrl/optical_flow_landing.c index 19229e23a9..13a523a16a 100644 --- a/sw/airborne/modules/ctrl/optical_flow_landing.c +++ b/sw/airborne/modules/ctrl/optical_flow_landing.c @@ -52,7 +52,7 @@ // used for automated landing: #include "autopilot.h" #include "subsystems/navigation/common_flight_plan.h" -#include "subsystems/datalink/telemetry.h" +#include "modules/datalink/telemetry.h" // for measuring time #include "mcu_periph/sys_time.h" diff --git a/sw/airborne/modules/ctrl/shift_tracking.c b/sw/airborne/modules/ctrl/shift_tracking.c index 4c6c677510..0fda34d472 100644 --- a/sw/airborne/modules/ctrl/shift_tracking.c +++ b/sw/airborne/modules/ctrl/shift_tracking.c @@ -47,7 +47,7 @@ #endif #if SHIFT_TRACKING_DEBUG -#include "subsystems/datalink/downlink.h" +#include "modules/datalink/downlink.h" #include "pprzlink/messages.h" #include "mcu_periph/uart.h" #endif diff --git a/sw/airborne/subsystems/datalink/bluegiga.c b/sw/airborne/modules/datalink/bluegiga.c similarity index 98% rename from sw/airborne/subsystems/datalink/bluegiga.c rename to sw/airborne/modules/datalink/bluegiga.c index 698068a2f0..bd061be38b 100644 --- a/sw/airborne/subsystems/datalink/bluegiga.c +++ b/sw/airborne/modules/datalink/bluegiga.c @@ -21,12 +21,12 @@ */ /** - * @file subsystems/datalink/bluegiga.c + * @file modules/datalink/bluegiga.c * Datalink implementation for the BlueGiga Bluetooth radio chip trough SPI */ #include "mcu_periph/sys_time.h" -#include "subsystems/datalink/bluegiga.h" +#include "modules/datalink/bluegiga.h" #include "mcu_periph/gpio.h" #include "mcu_periph/spi.h" @@ -126,7 +126,7 @@ void bluegiga_increment_buf(uint8_t *buf_idx, uint8_t len) uint32_t a2a_msgs = 0; #if PERIODIC_TELEMETRY -#include "subsystems/datalink/telemetry.h" +#include "modules/datalink/telemetry.h" uint32_t last_ts = 0; static void send_bluegiga(struct transport_tx *trans, struct link_device *dev) diff --git a/sw/airborne/subsystems/datalink/bluegiga.h b/sw/airborne/modules/datalink/bluegiga.h similarity index 91% rename from sw/airborne/subsystems/datalink/bluegiga.h rename to sw/airborne/modules/datalink/bluegiga.h index 7fe8614141..049d170d90 100644 --- a/sw/airborne/subsystems/datalink/bluegiga.h +++ b/sw/airborne/modules/datalink/bluegiga.h @@ -20,7 +20,7 @@ */ /** - * @file subsystems/datalink/bluegiga.h + * @file modules/datalink/bluegiga.h * Bluegiga Bluetooth chip I/O */ @@ -29,7 +29,7 @@ #include "pprzlink/pprzlink_device.h" #include "pprzlink/pprz_transport.h" -#include "subsystems/datalink/datalink.h" +#include "modules/datalink/datalink.h" /* The different statuses the communication can be in */ enum BlueGigaStatus { @@ -42,9 +42,9 @@ enum BlueGigaStatus { #ifndef BLUEGIGA_BUFFER_SIZE #define BLUEGIGA_BUFFER_SIZE 256 // buffer max value: 256 #elif BLUEGIGA_BUFFER_SIZE < 256 -#warning "BLUEGIGA_BUFFER_SIZE may be smaller than possible message length, check subsystems/datalink/bluegiga.c:dev_check_free_space for more information" +#warning "BLUEGIGA_BUFFER_SIZE may be smaller than possible message length, check modules/datalink/bluegiga.c:dev_check_free_space for more information" #elif BLUEGIGA_BUFFER_SIZE > 256 -#error "BLUEGIGA_BUFFER_SIZE not made for sizes larger than 256, check subsystems/datalink/bluegiga.c for more information" +#error "BLUEGIGA_BUFFER_SIZE not made for sizes larger than 256, check modules/datalink/bluegiga.c for more information" #endif #define BLUEGIGA_SPI_BUF_SIZE 20 diff --git a/sw/airborne/modules/datalink/bluegiga_dl.c b/sw/airborne/modules/datalink/bluegiga_dl.c index c68c308d24..7bee9693de 100644 --- a/sw/airborne/modules/datalink/bluegiga_dl.c +++ b/sw/airborne/modules/datalink/bluegiga_dl.c @@ -24,8 +24,8 @@ */ #include "modules/datalink/bluegiga_dl.h" -#include "subsystems/datalink/datalink.h" -#include "subsystems/datalink/bluegiga.h" +#include "modules/datalink/datalink.h" +#include "modules/datalink/bluegiga.h" #ifndef BLUEGIGA_UPDATE_DL #define BLUEGIGA_UPDATE_DL TRUE diff --git a/sw/airborne/modules/datalink/bluegiga_dl.h b/sw/airborne/modules/datalink/bluegiga_dl.h index 51c7605f52..edf00fefa0 100644 --- a/sw/airborne/modules/datalink/bluegiga_dl.h +++ b/sw/airborne/modules/datalink/bluegiga_dl.h @@ -27,7 +27,7 @@ #define BLUEGIGA_DL_H #include "pprzlink/pprz_transport.h" -#include "subsystems/datalink/bluegiga.h" +#include "modules/datalink/bluegiga.h" /** PPRZ transport structure */ extern struct pprz_transport pprz_bg_tp; diff --git a/sw/airborne/subsystems/datalink/datalink.c b/sw/airborne/modules/datalink/datalink.c similarity index 98% rename from sw/airborne/subsystems/datalink/datalink.c rename to sw/airborne/modules/datalink/datalink.c index d54e41057c..aca6b2c450 100644 --- a/sw/airborne/subsystems/datalink/datalink.c +++ b/sw/airborne/modules/datalink/datalink.c @@ -20,7 +20,7 @@ */ /** - * @file subsystems/datalink/datalink.c + * @file modules/datalink/datalink.c * Handling of messages coming from ground and other A/Cs. * */ @@ -29,7 +29,7 @@ #define MODULES_DATALINK_C #include "datalink.h" -#include "subsystems/datalink/downlink.h" +#include "modules/datalink/downlink.h" #include "generated/modules.h" #include "generated/settings.h" diff --git a/sw/airborne/subsystems/datalink/datalink.h b/sw/airborne/modules/datalink/datalink.h similarity index 100% rename from sw/airborne/subsystems/datalink/datalink.h rename to sw/airborne/modules/datalink/datalink.h diff --git a/sw/airborne/subsystems/datalink/downlink.c b/sw/airborne/modules/datalink/downlink.c similarity index 94% rename from sw/airborne/subsystems/datalink/downlink.c rename to sw/airborne/modules/datalink/downlink.c index 4f34cb9596..c64e8a1eaf 100644 --- a/sw/airborne/subsystems/datalink/downlink.c +++ b/sw/airborne/modules/datalink/downlink.c @@ -26,14 +26,14 @@ */ -#include "subsystems/datalink/downlink.h" +#include "modules/datalink/downlink.h" #if (defined DATALINK) || PERIODIC_TELEMETRY -#include "subsystems/datalink/datalink.h" +#include "modules/datalink/datalink.h" #endif #if PERIODIC_TELEMETRY -#include "subsystems/datalink/telemetry.h" +#include "modules/datalink/telemetry.h" #include "mcu_periph/sys_time.h" static uint32_t last_down_nb_bytes = 0; // previous number of bytes sent diff --git a/sw/airborne/subsystems/datalink/downlink.h b/sw/airborne/modules/datalink/downlink.h similarity index 97% rename from sw/airborne/subsystems/datalink/downlink.h rename to sw/airborne/modules/datalink/downlink.h index 7ee025d00c..7289c375f8 100644 --- a/sw/airborne/subsystems/datalink/downlink.h +++ b/sw/airborne/modules/datalink/downlink.h @@ -32,7 +32,7 @@ #include "generated/airframe.h" #include "pprzlink/messages.h" -#include "subsystems/datalink/datalink.h" +#include "modules/datalink/datalink.h" // FIXME test prog still need some includes here #include "modules/datalink/pprz_dl.h" diff --git a/sw/airborne/modules/datalink/extra_pprz_dl.c b/sw/airborne/modules/datalink/extra_pprz_dl.c index f06b05b6b7..ad05651f85 100644 --- a/sw/airborne/modules/datalink/extra_pprz_dl.c +++ b/sw/airborne/modules/datalink/extra_pprz_dl.c @@ -44,7 +44,7 @@ #define PERIODIC_C_EXTRA #include "modules/datalink/extra_pprz_dl.h" -#include "subsystems/datalink/telemetry.h" +#include "modules/datalink/telemetry.h" // By default don't update datalink_time when receiving messages from extra datalink #ifndef EXTRA_PPRZ_UPDATE_DL diff --git a/sw/airborne/modules/datalink/extra_pprz_dl.h b/sw/airborne/modules/datalink/extra_pprz_dl.h index 8e4fea2bec..ce26c3fe5e 100644 --- a/sw/airborne/modules/datalink/extra_pprz_dl.h +++ b/sw/airborne/modules/datalink/extra_pprz_dl.h @@ -27,7 +27,7 @@ #ifndef EXTRA_PPRZ_DL_H #define EXTRA_PPRZ_DL_H -#include "subsystems/datalink/datalink.h" +#include "modules/datalink/datalink.h" #include "pprzlink/pprz_transport.h" #if USE_UDP diff --git a/sw/airborne/subsystems/datalink/frsky_x.c b/sw/airborne/modules/datalink/frsky_x.c similarity index 97% rename from sw/airborne/subsystems/datalink/frsky_x.c rename to sw/airborne/modules/datalink/frsky_x.c index 1a2b9b0bf2..7a5c23bcdd 100644 --- a/sw/airborne/subsystems/datalink/frsky_x.c +++ b/sw/airborne/modules/datalink/frsky_x.c @@ -19,8 +19,8 @@ * Boston, MA 02111-1307, USA. */ -#include "subsystems/radio_control/cc2500_frsky/cc2500_smartport.h" -#include "subsystems/datalink/frsky_x.h" +#include "modules/radio_control/cc2500_frsky/cc2500_smartport.h" +#include "modules/datalink/frsky_x.h" #include diff --git a/sw/airborne/subsystems/datalink/frsky_x.h b/sw/airborne/modules/datalink/frsky_x.h similarity index 100% rename from sw/airborne/subsystems/datalink/frsky_x.h rename to sw/airborne/modules/datalink/frsky_x.h diff --git a/sw/airborne/modules/datalink/gec_dl.c b/sw/airborne/modules/datalink/gec_dl.c index 26ac1b682b..6e547298d6 100644 --- a/sw/airborne/modules/datalink/gec_dl.c +++ b/sw/airborne/modules/datalink/gec_dl.c @@ -25,7 +25,7 @@ #include "gec_dl.h" #include "modules/datalink/gec/gec.h" -#include "subsystems/datalink/datalink.h" +#include "modules/datalink/datalink.h" #include "pprzlink/messages.h" #include // for memset() @@ -70,7 +70,7 @@ struct gec_transport gec_tp; #if PERIODIC_TELEMETRY -#include "subsystems/datalink/telemetry.h" +#include "modules/datalink/telemetry.h" static void send_secure_link_info(struct transport_tx *trans, struct link_device *dev) { diff --git a/sw/airborne/modules/datalink/ivy_dl.c b/sw/airborne/modules/datalink/ivy_dl.c index 52f15bd3c8..00b87a0213 100644 --- a/sw/airborne/modules/datalink/ivy_dl.c +++ b/sw/airborne/modules/datalink/ivy_dl.c @@ -24,7 +24,7 @@ */ #include "modules/datalink/ivy_dl.h" -#include "subsystems/datalink/datalink.h" +#include "modules/datalink/datalink.h" struct ivy_transport ivy_tp; diff --git a/sw/airborne/modules/datalink/mavlink.c b/sw/airborne/modules/datalink/mavlink.c index dea125efac..7b850359ed 100644 --- a/sw/airborne/modules/datalink/mavlink.c +++ b/sw/airborne/modules/datalink/mavlink.c @@ -34,7 +34,7 @@ #if PERIODIC_TELEMETRY #define PERIODIC_C_MAVLINK -#include "subsystems/datalink/telemetry_common.h" +#include "modules/datalink/telemetry_common.h" #include "generated/periodic_telemetry.h" #ifndef TELEMETRY_MAVLINK_NB_MSG #warning Using hardcoded msg periods. To customize specify a in your telemetry file. diff --git a/sw/airborne/modules/datalink/mavlink_decoder.c b/sw/airborne/modules/datalink/mavlink_decoder.c index 1fa08902b8..1a600ba7b8 100644 --- a/sw/airborne/modules/datalink/mavlink_decoder.c +++ b/sw/airborne/modules/datalink/mavlink_decoder.c @@ -35,7 +35,7 @@ uint8_t mavlink_crc_extra[256] = {50, 124, 137, 0, 237, 217, 104, 119, 0, 0, 0, #if MAVLINK_DECODER_DEBUG #include "mcu_periph/uart.h" #include "pprzlink/messages.h" -#include "subsystems/datalink/downlink.h" +#include "modules/datalink/downlink.h" void mavlink_send_debug(struct mavlink_transport *t) { diff --git a/sw/airborne/modules/datalink/pprz_dl.c b/sw/airborne/modules/datalink/pprz_dl.c index f2cf9dd0d8..f08b3fd8c2 100644 --- a/sw/airborne/modules/datalink/pprz_dl.c +++ b/sw/airborne/modules/datalink/pprz_dl.c @@ -24,7 +24,7 @@ */ #include "modules/datalink/pprz_dl.h" -#include "subsystems/datalink/datalink.h" +#include "modules/datalink/datalink.h" #ifndef PPRZ_UPDATE_DL #define PPRZ_UPDATE_DL TRUE diff --git a/sw/airborne/modules/datalink/pprz_dl.h b/sw/airborne/modules/datalink/pprz_dl.h index 94c74d0ce8..40a8f2f60c 100644 --- a/sw/airborne/modules/datalink/pprz_dl.h +++ b/sw/airborne/modules/datalink/pprz_dl.h @@ -33,7 +33,7 @@ #include "mcu_periph/usb_serial.h" #endif #if USE_FRSKY_X_SERIAL -#include "subsystems/datalink/frsky_x.h" +#include "modules/datalink/frsky_x.h" #endif #if USE_UDP #include "mcu_periph/udp.h" diff --git a/sw/airborne/subsystems/datalink/superbitrf.c b/sw/airborne/modules/datalink/superbitrf.c similarity index 99% rename from sw/airborne/subsystems/datalink/superbitrf.c rename to sw/airborne/modules/datalink/superbitrf.c index e6ee8d6d34..74f97ab68e 100644 --- a/sw/airborne/subsystems/datalink/superbitrf.c +++ b/sw/airborne/modules/datalink/superbitrf.c @@ -20,11 +20,11 @@ */ /** - * @file subsystems/datalink/superbitrf.c + * @file modules/datalink/superbitrf.c * DSM2 and DSMX datalink implementation for the cyrf6936 2.4GHz radio chip trough SPI */ -#include "subsystems/datalink/superbitrf.h" +#include "modules/datalink/superbitrf.h" #include #include "paparazzi.h" @@ -183,7 +183,7 @@ static const uint8_t pn_codes[5][9][8] = { static const uint8_t pn_bind[] = { 0x98, 0x88, 0x1B, 0xE4, 0x30, 0x79, 0x03, 0x84 }; #if PERIODIC_TELEMETRY -#include "subsystems/datalink/telemetry.h" +#include "modules/datalink/telemetry.h" static void send_superbit(struct transport_tx *trans, struct link_device *dev) { diff --git a/sw/airborne/subsystems/datalink/superbitrf.h b/sw/airborne/modules/datalink/superbitrf.h similarity index 98% rename from sw/airborne/subsystems/datalink/superbitrf.h rename to sw/airborne/modules/datalink/superbitrf.h index d9e462a59e..7b62804436 100644 --- a/sw/airborne/subsystems/datalink/superbitrf.h +++ b/sw/airborne/modules/datalink/superbitrf.h @@ -20,7 +20,7 @@ */ /** - * @file subsystems/datalink/superbitrf.h + * @file modules/datalink/superbitrf.h * DSM2 and DSMX datalink implementation for the cyrf6936 2.4GHz radio chip trough SPI */ @@ -31,7 +31,7 @@ #include "peripherals/cyrf6936.h" #include "pprzlink/pprzlink_device.h" #include "pprzlink/pprz_transport.h" -#include "subsystems/datalink/datalink.h" +#include "modules/datalink/datalink.h" /* The timings in microseconds */ #define SUPERBITRF_BIND_RECV_TIME 10000 /**< The time to wait for a bind packet on a channel in microseconds */ diff --git a/sw/airborne/subsystems/datalink/telemetry.c b/sw/airborne/modules/datalink/telemetry.c similarity index 95% rename from sw/airborne/subsystems/datalink/telemetry.c rename to sw/airborne/modules/datalink/telemetry.c index a1b113b7dc..d585ff6020 100644 --- a/sw/airborne/subsystems/datalink/telemetry.c +++ b/sw/airborne/modules/datalink/telemetry.c @@ -21,13 +21,13 @@ */ /** - * @file subsystems/datalink/telemetry.c + * @file modules/datalink/telemetry.c * * Periodic telemetry system utility function. * */ -#include "subsystems/datalink/telemetry_common.h" +#include "modules/datalink/telemetry_common.h" #include "generated/periodic_telemetry.h" /* Implement global structures from generated header. @@ -68,7 +68,7 @@ int8_t register_periodic_telemetry(struct periodic_telemetry *_pt, uint8_t _id, #if USE_PERIODIC_TELEMETRY_REPORT -#include "subsystems/datalink/downlink.h" +#include "modules/datalink/downlink.h" /** Send an error report when trying to send message that as not been register * @param _process telemetry process id diff --git a/sw/airborne/subsystems/datalink/telemetry.h b/sw/airborne/modules/datalink/telemetry.h similarity index 94% rename from sw/airborne/subsystems/datalink/telemetry.h rename to sw/airborne/modules/datalink/telemetry.h index 4ba3a4e47b..aa64050406 100644 --- a/sw/airborne/subsystems/datalink/telemetry.h +++ b/sw/airborne/modules/datalink/telemetry.h @@ -23,14 +23,14 @@ #define TELEMETRY_H /** - * @file subsystems/datalink/telemetry.h + * @file modules/datalink/telemetry.h * * Periodic telemetry system header (includes downlink utility and generated code). * * In order to use it a subsystem/module: * - include this header: * @code - * #include "subsystems/datalink/telemetry.h" + * #include "modules/datalink/telemetry.h" * @endcode * - write a callback function: * @code @@ -51,7 +51,7 @@ #include "std.h" #include "mcu_periph/uart.h" #include "generated/periodic_telemetry.h" -#include "subsystems/datalink/downlink.h" +#include "modules/datalink/downlink.h" /** Global telemetry structure * diff --git a/sw/airborne/subsystems/datalink/telemetry_common.h b/sw/airborne/modules/datalink/telemetry_common.h similarity index 98% rename from sw/airborne/subsystems/datalink/telemetry_common.h rename to sw/airborne/modules/datalink/telemetry_common.h index 4a0d89d21f..0f5eda01c3 100644 --- a/sw/airborne/subsystems/datalink/telemetry_common.h +++ b/sw/airborne/modules/datalink/telemetry_common.h @@ -20,7 +20,7 @@ * */ -/** @file subsystems/datalink/telemetry_common.h +/** @file modules/datalink/telemetry_common.h * * Common tools for periodic telemetry interface * Allows subsystem to register callback functions diff --git a/sw/airborne/subsystems/datalink/uart_print.h b/sw/airborne/modules/datalink/uart_print.h similarity index 100% rename from sw/airborne/subsystems/datalink/uart_print.h rename to sw/airborne/modules/datalink/uart_print.h diff --git a/sw/airborne/subsystems/datalink/w5100.c b/sw/airborne/modules/datalink/w5100.c similarity index 99% rename from sw/airborne/subsystems/datalink/w5100.c rename to sw/airborne/modules/datalink/w5100.c index 6c77b4bfdc..51e4c629a7 100644 --- a/sw/airborne/subsystems/datalink/w5100.c +++ b/sw/airborne/modules/datalink/w5100.c @@ -21,12 +21,12 @@ */ /** - * @file subsystems/datalink/w5100.c + * @file modules/datalink/w5100.c * W5100 ethernet chip I/O */ #include "mcu_periph/sys_time.h" -#include "subsystems/datalink/w5100.h" +#include "modules/datalink/w5100.h" #include "mcu_periph/spi.h" #include "mcu_periph/gpio.h" diff --git a/sw/airborne/subsystems/datalink/w5100.h b/sw/airborne/modules/datalink/w5100.h similarity index 97% rename from sw/airborne/subsystems/datalink/w5100.h rename to sw/airborne/modules/datalink/w5100.h index 1d2943dea1..48a49f5c54 100644 --- a/sw/airborne/subsystems/datalink/w5100.h +++ b/sw/airborne/modules/datalink/w5100.h @@ -21,7 +21,7 @@ */ /** - * @file subsystems/datalink/w5100.h + * @file modules/datalink/w5100.h * W5100 ethernet chip I/O */ @@ -30,7 +30,7 @@ #include "pprzlink/pprzlink_device.h" #include "pprzlink/pprz_transport.h" -#include "subsystems/datalink/datalink.h" +#include "modules/datalink/datalink.h" #include "generated/airframe.h" #define W5100_RX_BUFFER_SIZE 80 diff --git a/sw/airborne/modules/datalink/xbee_dl.c b/sw/airborne/modules/datalink/xbee_dl.c index 6284760ff5..2e506491fc 100644 --- a/sw/airborne/modules/datalink/xbee_dl.c +++ b/sw/airborne/modules/datalink/xbee_dl.c @@ -24,7 +24,7 @@ */ #include "modules/datalink/xbee_dl.h" -#include "subsystems/datalink/datalink.h" +#include "modules/datalink/datalink.h" #include "mcu.h" #include "mcu_periph/sys_time.h" #include "mcu_periph/uart.h" diff --git a/sw/airborne/modules/datalink/xtend_rssi.c b/sw/airborne/modules/datalink/xtend_rssi.c index df91ea0830..7ce2efd390 100644 --- a/sw/airborne/modules/datalink/xtend_rssi.c +++ b/sw/airborne/modules/datalink/xtend_rssi.c @@ -34,7 +34,7 @@ #include "mcu_periph/uart.h" #include "pprzlink/messages.h" -#include "subsystems/datalink/downlink.h" +#include "modules/datalink/downlink.h" //from Digi XTend manual #define XTEND_RSSI_PWM_PERIOD_USEC 8320 //rssi pwm period () in sys tics diff --git a/sw/airborne/modules/decawave/decawave_anchorless_communication.c b/sw/airborne/modules/decawave/decawave_anchorless_communication.c index 45138803cf..6cead4d756 100644 --- a/sw/airborne/modules/decawave/decawave_anchorless_communication.c +++ b/sw/airborne/modules/decawave/decawave_anchorless_communication.c @@ -38,7 +38,7 @@ */ #include "decawave_anchorless_communication.h" -#include "subsystems/datalink/telemetry.h" +#include "modules/datalink/telemetry.h" #include "modules/radio_control/radio_control.h" #include "state.h" #include "mcu_periph/uart.h" diff --git a/sw/airborne/modules/decawave/dw1000_arduino.c b/sw/airborne/modules/decawave/dw1000_arduino.c index fd685736eb..e5403456b3 100644 --- a/sw/airborne/modules/decawave/dw1000_arduino.c +++ b/sw/airborne/modules/decawave/dw1000_arduino.c @@ -28,7 +28,7 @@ #include "std.h" #include "mcu_periph/uart.h" #include "pprzlink/messages.h" -#include "subsystems/datalink/downlink.h" +#include "modules/datalink/downlink.h" #include "modules/core/abi.h" #include "modules/decawave/trilateration.h" #include "modules/gps/gps.h" diff --git a/sw/airborne/modules/digital_cam/atmega_i2c_cam_ctrl.c b/sw/airborne/modules/digital_cam/atmega_i2c_cam_ctrl.c index 24bd941835..7f4b148cd5 100644 --- a/sw/airborne/modules/digital_cam/atmega_i2c_cam_ctrl.c +++ b/sw/airborne/modules/digital_cam/atmega_i2c_cam_ctrl.c @@ -35,7 +35,7 @@ #include "mcu_periph/uart.h" #include "pprzlink/messages.h" -#include "subsystems/datalink/downlink.h" +#include "modules/datalink/downlink.h" // In I2C mode we can not inline this function: void dc_send_command(uint8_t cmd) diff --git a/sw/airborne/modules/digital_cam/dc.c b/sw/airborne/modules/digital_cam/dc.c index 7b56e310b5..dbbdc3ed48 100644 --- a/sw/airborne/modules/digital_cam/dc.c +++ b/sw/airborne/modules/digital_cam/dc.c @@ -94,7 +94,7 @@ uint16_t dc_photo_nr = 0; #include "mcu_periph/uart.h" #include "pprzlink/messages.h" -#include "subsystems/datalink/downlink.h" +#include "modules/datalink/downlink.h" #include "state.h" #include "modules/gps/gps.h" #if DC_SHOT_EXTRA_DL diff --git a/sw/airborne/modules/digital_cam/dc_ctrl_parrot_mykonos.c b/sw/airborne/modules/digital_cam/dc_ctrl_parrot_mykonos.c index c0515bb1d4..ab9c937247 100644 --- a/sw/airborne/modules/digital_cam/dc_ctrl_parrot_mykonos.c +++ b/sw/airborne/modules/digital_cam/dc_ctrl_parrot_mykonos.c @@ -52,11 +52,11 @@ #if DC_CTRL_PARROT_MYKONOS_SYNC_SEND #include "pprzlink/messages.h" -#include "subsystems/datalink/downlink.h" +#include "modules/datalink/downlink.h" #include "state.h" #include "modules/gps/gps.h" -#include "subsystems/datalink/telemetry.h" //? or just downlink.h should be enough +#include "modules/datalink/telemetry.h" //? or just downlink.h should be enough static inline void dc_ctrl_parrot_mykonos_send_shot_position(void) { diff --git a/sw/airborne/modules/digital_cam/hackhd.c b/sw/airborne/modules/digital_cam/hackhd.c index affd6cc2c9..78a30b5b60 100644 --- a/sw/airborne/modules/digital_cam/hackhd.c +++ b/sw/airborne/modules/digital_cam/hackhd.c @@ -84,7 +84,7 @@ static inline uint16_t pin_of_gpio(uint32_t __attribute__((unused)) port, uint16 #include "mcu_periph/uart.h" #include "pprzlink/messages.h" -#include "subsystems/datalink/downlink.h" +#include "modules/datalink/downlink.h" #include "state.h" #include "modules/gps/gps.h" diff --git a/sw/airborne/modules/digital_cam/sim_i2c_cam_ctrl.c b/sw/airborne/modules/digital_cam/sim_i2c_cam_ctrl.c index b91f095aa4..a2e15a592c 100644 --- a/sw/airborne/modules/digital_cam/sim_i2c_cam_ctrl.c +++ b/sw/airborne/modules/digital_cam/sim_i2c_cam_ctrl.c @@ -32,7 +32,7 @@ #include "mcu_periph/uart.h" #include "pprzlink/messages.h" -#include "subsystems/datalink/downlink.h" +#include "modules/datalink/downlink.h" #include "state.h" diff --git a/sw/airborne/modules/digital_cam/uart_cam_ctrl.c b/sw/airborne/modules/digital_cam/uart_cam_ctrl.c index 8dc8ae6c4a..89730021ab 100644 --- a/sw/airborne/modules/digital_cam/uart_cam_ctrl.c +++ b/sw/airborne/modules/digital_cam/uart_cam_ctrl.c @@ -32,7 +32,7 @@ #include "modules/digital_cam/dc.h" // Telemetry -#include "subsystems/datalink/telemetry.h" +#include "modules/datalink/telemetry.h" #include BOARD_CONFIG diff --git a/sw/airborne/modules/display/max7456.c b/sw/airborne/modules/display/max7456.c index 2ded56ac22..541c2b15a0 100644 --- a/sw/airborne/modules/display/max7456.c +++ b/sw/airborne/modules/display/max7456.c @@ -48,7 +48,7 @@ #include "firmwares/rotorcraft/navigation.h" #endif #if DOWNLINK -#include "subsystems/datalink/telemetry.h" +#include "modules/datalink/telemetry.h" #endif // Peripherials diff --git a/sw/airborne/modules/dragspeed/dragspeed.c b/sw/airborne/modules/dragspeed/dragspeed.c index b269764d98..12c77d2475 100644 --- a/sw/airborne/modules/dragspeed/dragspeed.c +++ b/sw/airborne/modules/dragspeed/dragspeed.c @@ -40,7 +40,7 @@ #include "modules/core/abi.h" #include "modules/core/abi_common.h" -#include "subsystems/datalink/telemetry.h" +#include "modules/datalink/telemetry.h" #include diff --git a/sw/airborne/modules/energy/MPPT.c b/sw/airborne/modules/energy/MPPT.c index 1305e13472..d94fc2ec53 100644 --- a/sw/airborne/modules/energy/MPPT.c +++ b/sw/airborne/modules/energy/MPPT.c @@ -55,7 +55,7 @@ struct i2c_transaction mppt_trans; #include "mcu_periph/uart.h" #include "pprzlink/messages.h" -#include "subsystems/datalink/downlink.h" +#include "modules/datalink/downlink.h" uint8_t MPPT_mode; /** A value different from 0 is a request from this mode */ diff --git a/sw/airborne/modules/energy/sim_MPPT.c b/sw/airborne/modules/energy/sim_MPPT.c index 321e3ca78e..e0ce355b6d 100644 --- a/sw/airborne/modules/energy/sim_MPPT.c +++ b/sw/airborne/modules/energy/sim_MPPT.c @@ -23,7 +23,7 @@ #include "modules/energy/MPPT.h" #include "pprzlink/messages.h" -#include "subsystems/datalink/downlink.h" +#include "modules/datalink/downlink.h" diff --git a/sw/airborne/modules/esc32/esc32.c b/sw/airborne/modules/esc32/esc32.c index 25cd1cf9e9..313669ae03 100644 --- a/sw/airborne/modules/esc32/esc32.c +++ b/sw/airborne/modules/esc32/esc32.c @@ -27,12 +27,12 @@ #include "modules/esc32/esc32.h" #include "mcu_periph/uart.h" #include "mcu_periph/sys_time.h" -#include "subsystems/datalink/downlink.h" +#include "modules/datalink/downlink.h" #include #include #if PERIODIC_TELEMETRY -#include "subsystems/datalink/telemetry.h" +#include "modules/datalink/telemetry.h" #endif struct esc32 esc32; diff --git a/sw/airborne/modules/glide_wing_lock/glide_wing_lock.c b/sw/airborne/modules/glide_wing_lock/glide_wing_lock.c index f8767b5689..3998c65862 100644 --- a/sw/airborne/modules/glide_wing_lock/glide_wing_lock.c +++ b/sw/airborne/modules/glide_wing_lock/glide_wing_lock.c @@ -27,7 +27,7 @@ #include "pprzlink/messages.h" #include "mcu_periph/uart.h" -#include "subsystems/datalink/downlink.h" +#include "modules/datalink/downlink.h" #include "mcu_periph/adc.h" #include "modules/core/commands.h" diff --git a/sw/airborne/modules/gps/gps.c b/sw/airborne/modules/gps/gps.c index 3313e62ba6..e2ab543ada 100644 --- a/sw/airborne/modules/gps/gps.c +++ b/sw/airborne/modules/gps/gps.c @@ -79,7 +79,7 @@ uint8_t multi_gps_mode; #if PERIODIC_TELEMETRY -#include "subsystems/datalink/telemetry.h" +#include "modules/datalink/telemetry.h" static void send_svinfo_id(struct transport_tx *trans, struct link_device *dev, uint8_t svid) diff --git a/sw/airborne/modules/gps/gps_datalink.c b/sw/airborne/modules/gps/gps_datalink.c index 7ff2656d68..02c6d3b95c 100644 --- a/sw/airborne/modules/gps/gps_datalink.c +++ b/sw/airborne/modules/gps/gps_datalink.c @@ -33,8 +33,8 @@ #include "modules/gps/gps.h" #include "modules/core/abi.h" #include "modules/imu/imu.h" -#include "subsystems/datalink/datalink.h" -#include "subsystems/datalink/downlink.h" +#include "modules/datalink/datalink.h" +#include "modules/datalink/downlink.h" /** Set to 1 to receive also magnetometer ABI messages */ #ifndef GPS_DATALINK_USE_MAG diff --git a/sw/airborne/modules/gps/gps_piksi.c b/sw/airborne/modules/gps/gps_piksi.c index 82c6c4ecd8..7e0dc5a823 100644 --- a/sw/airborne/modules/gps/gps_piksi.c +++ b/sw/airborne/modules/gps/gps_piksi.c @@ -62,7 +62,7 @@ struct GpsTimeSync gps_piksi_time_sync; static uint32_t time_since_last_heartbeat; #if PERIODIC_TELEMETRY -#include "subsystems/datalink/telemetry.h" +#include "modules/datalink/telemetry.h" static void send_piksi_heartbeat(struct transport_tx *trans, struct link_device *dev) { diff --git a/sw/airborne/modules/gps/gps_ubx_i2c.c b/sw/airborne/modules/gps/gps_ubx_i2c.c index c04cd7cf5a..59b20f2e47 100644 --- a/sw/airborne/modules/gps/gps_ubx_i2c.c +++ b/sw/airborne/modules/gps/gps_ubx_i2c.c @@ -31,7 +31,7 @@ #include "mcu_periph/i2c.h" #include "modules/gps/gps_ubx_i2c.h" -#include "subsystems/datalink/downlink.h" +#include "modules/datalink/downlink.h" #include #include diff --git a/sw/airborne/modules/gps/gps_ubx_ucenter.c b/sw/airborne/modules/gps/gps_ubx_ucenter.c index 844eb3f78a..b1998a2869 100644 --- a/sw/airborne/modules/gps/gps_ubx_ucenter.c +++ b/sw/airborne/modules/gps/gps_ubx_ucenter.c @@ -30,7 +30,7 @@ #include "modules/gps/gps_ubx_ucenter.h" #include "modules/gps/gps_ubx.h" #include "ubx_protocol.h" -#include "subsystems/datalink/downlink.h" +#include "modules/datalink/downlink.h" #if PRINT_DEBUG_GPS_UBX_UCENTER #include diff --git a/sw/airborne/modules/gsm/gsm.c b/sw/airborne/modules/gsm/gsm.c index a18b76da61..18cfa1fab0 100644 --- a/sw/airborne/modules/gsm/gsm.c +++ b/sw/airborne/modules/gsm/gsm.c @@ -58,7 +58,7 @@ Receiving: #include "gsm.h" #include "mcu_periph/uart.h" #include "std.h" -#include "subsystems/datalink/downlink.h" +#include "modules/datalink/downlink.h" #include "modules/gps/gps.h" #include "autopilot.h" #include "modules/energy/electrical.h" diff --git a/sw/airborne/modules/guidance/gvf/gvf.c b/sw/airborne/modules/guidance/gvf/gvf.c index d6e0dbd1ef..708f7834e9 100644 --- a/sw/airborne/modules/guidance/gvf/gvf.c +++ b/sw/airborne/modules/guidance/gvf/gvf.c @@ -44,7 +44,7 @@ gvf_seg gvf_segment; uint32_t gvf_t0 = 0; #if PERIODIC_TELEMETRY -#include "subsystems/datalink/telemetry.h" +#include "modules/datalink/telemetry.h" static void send_gvf(struct transport_tx *trans, struct link_device *dev) { // Do not know whether is a good idea to do this check here or to include diff --git a/sw/airborne/modules/guidance/gvf_parametric/gvf_parametric.cpp b/sw/airborne/modules/guidance/gvf_parametric/gvf_parametric.cpp index 2f3b6fda63..ef519c7122 100644 --- a/sw/airborne/modules/guidance/gvf_parametric/gvf_parametric.cpp +++ b/sw/airborne/modules/guidance/gvf_parametric/gvf_parametric.cpp @@ -47,7 +47,7 @@ gvf_parametric_con gvf_parametric_control; gvf_parametric_tra gvf_parametric_trajectory; #if PERIODIC_TELEMETRY -#include "subsystems/datalink/telemetry.h" +#include "modules/datalink/telemetry.h" static void send_gvf_parametric(struct transport_tx *trans, struct link_device *dev) { // Do not know whether is a good idea to do this check here or to include diff --git a/sw/airborne/modules/guidance_opticflow/guidance_opticflow_hover.c b/sw/airborne/modules/guidance_opticflow/guidance_opticflow_hover.c index b0b3dd7df4..57e2d55e22 100644 --- a/sw/airborne/modules/guidance_opticflow/guidance_opticflow_hover.c +++ b/sw/airborne/modules/guidance_opticflow/guidance_opticflow_hover.c @@ -36,7 +36,7 @@ #include "firmwares/rotorcraft/stabilization/stabilization_attitude.h" #include "firmwares/rotorcraft/guidance/guidance_v.h" #include "autopilot.h" -#include "subsystems/datalink/downlink.h" +#include "modules/datalink/downlink.h" /** Default sender to accect VELOCITY_ESTIMATE messages from */ #ifndef VISION_VELOCITY_ESTIMATE_ID diff --git a/sw/airborne/modules/gumstix_interface/qr_code_spi_link.c b/sw/airborne/modules/gumstix_interface/qr_code_spi_link.c index 95f0d7e125..de5e9bcef6 100644 --- a/sw/airborne/modules/gumstix_interface/qr_code_spi_link.c +++ b/sw/airborne/modules/gumstix_interface/qr_code_spi_link.c @@ -27,7 +27,7 @@ #include "mcu_periph/uart.h" #include "pprzlink/messages.h" -#include "subsystems/datalink/downlink.h" +#include "modules/datalink/downlink.h" //struct qr_code_spi_link_data qr_code_spi_link_data; struct spi_transaction qr_code_spi_link_transaction; diff --git a/sw/airborne/modules/helicopter/throttle_curve.c b/sw/airborne/modules/helicopter/throttle_curve.c index 1bdfe14e8d..6379eb7b47 100644 --- a/sw/airborne/modules/helicopter/throttle_curve.c +++ b/sw/airborne/modules/helicopter/throttle_curve.c @@ -63,7 +63,7 @@ struct throttle_curve_t throttle_curve = { }; #if PERIODIC_TELEMETRY -#include "subsystems/datalink/telemetry.h" +#include "modules/datalink/telemetry.h" static void throttle_curve_send_telem(struct transport_tx *trans, struct link_device *dev) { diff --git a/sw/airborne/modules/imu/imu.c b/sw/airborne/modules/imu/imu.c index 337b083d08..0dd9099780 100644 --- a/sw/airborne/modules/imu/imu.c +++ b/sw/airborne/modules/imu/imu.c @@ -41,7 +41,7 @@ #endif #if PERIODIC_TELEMETRY -#include "subsystems/datalink/telemetry.h" +#include "modules/datalink/telemetry.h" static void send_accel_raw(struct transport_tx *trans, struct link_device *dev) { diff --git a/sw/airborne/modules/imu/imu_mpu9250.c b/sw/airborne/modules/imu/imu_mpu9250.c index fa7297cb56..b9b40e575c 100644 --- a/sw/airborne/modules/imu/imu_mpu9250.c +++ b/sw/airborne/modules/imu/imu_mpu9250.c @@ -50,7 +50,7 @@ void imu_mpu9250_event(void) } #include "math/pprz_algebra_int.h" -#include "subsystems/datalink/downlink.h" +#include "modules/datalink/downlink.h" void imu_mpu9250_report(void) { diff --git a/sw/airborne/modules/imu/imu_vectornav.c b/sw/airborne/modules/imu/imu_vectornav.c index 0c2bcc6f9d..122fbe31a8 100644 --- a/sw/airborne/modules/imu/imu_vectornav.c +++ b/sw/airborne/modules/imu/imu_vectornav.c @@ -44,7 +44,7 @@ void imu_scale_gyro(struct Imu *_imu __attribute__((unused))) {} void imu_scale_accel(struct Imu *_imu __attribute__((unused))) {} #if PERIODIC_TELEMETRY -#include "subsystems/datalink/telemetry.h" +#include "modules/datalink/telemetry.h" static void send_vn_info(struct transport_tx *trans, struct link_device *dev) diff --git a/sw/airborne/modules/ins/alt_filter.c b/sw/airborne/modules/ins/alt_filter.c index 8bf6a0b891..3cd7be3eb9 100644 --- a/sw/airborne/modules/ins/alt_filter.c +++ b/sw/airborne/modules/ins/alt_filter.c @@ -26,7 +26,7 @@ #include "mcu_periph/uart.h" #include "pprzlink/messages.h" -#include "subsystems/datalink/downlink.h" +#include "modules/datalink/downlink.h" TypeKalman alt_filter; diff --git a/sw/airborne/modules/ins/hf_float.c b/sw/airborne/modules/ins/hf_float.c index b45d236866..3bc1aaf510 100644 --- a/sw/airborne/modules/ins/hf_float.c +++ b/sw/airborne/modules/ins/hf_float.c @@ -36,7 +36,7 @@ #include "generated/airframe.h" #if PERIODIC_TELEMETRY -#include "subsystems/datalink/telemetry.h" +#include "modules/datalink/telemetry.h" #endif #ifdef SITL diff --git a/sw/airborne/modules/ins/imu_temp_ctrl.c b/sw/airborne/modules/ins/imu_temp_ctrl.c index e7fc041240..d7fa73a0c5 100644 --- a/sw/airborne/modules/ins/imu_temp_ctrl.c +++ b/sw/airborne/modules/ins/imu_temp_ctrl.c @@ -35,7 +35,7 @@ #include "std.h" #include "mcu_periph/uart.h" #include "pprzlink/messages.h" -#include "subsystems/datalink/downlink.h" +#include "modules/datalink/downlink.h" #include "imu_temp_ctrl.h" uint8_t imu_temp_ctrl_ok = 0; diff --git a/sw/airborne/modules/ins/ins_alt_float.c b/sw/airborne/modules/ins/ins_alt_float.c index 00a83d507c..83555d45e8 100644 --- a/sw/airborne/modules/ins/ins_alt_float.c +++ b/sw/airborne/modules/ins/ins_alt_float.c @@ -42,7 +42,7 @@ #ifdef DEBUG_ALT_KALMAN #include "mcu_periph/uart.h" -#include "subsystems/datalink/downlink.h" +#include "modules/datalink/downlink.h" #endif #ifndef USE_INS_NAV_INIT diff --git a/sw/airborne/modules/ins/ins_arduimu.c b/sw/airborne/modules/ins/ins_arduimu.c index 205ae9ed7d..e4be78aee5 100644 --- a/sw/airborne/modules/ins/ins_arduimu.c +++ b/sw/airborne/modules/ins/ins_arduimu.c @@ -32,7 +32,7 @@ int32_t GPS_Data[14]; #include "mcu_periph/uart.h" #include "pprzlink/messages.h" -#include "subsystems/datalink/downlink.h" +#include "modules/datalink/downlink.h" struct i2c_transaction ardu_gps_trans; struct i2c_transaction ardu_ins_trans; diff --git a/sw/airborne/modules/ins/ins_arduimu_basic.c b/sw/airborne/modules/ins/ins_arduimu_basic.c index 2ea46513d3..56b1d476c1 100644 --- a/sw/airborne/modules/ins/ins_arduimu_basic.c +++ b/sw/airborne/modules/ins/ins_arduimu_basic.c @@ -51,7 +51,7 @@ #ifdef ARDUIMU_SYNC_SEND #include "mcu_periph/uart.h" #include "pprzlink/messages.h" -#include "subsystems/datalink/downlink.h" +#include "modules/datalink/downlink.h" #endif struct i2c_transaction ardu_gps_trans; diff --git a/sw/airborne/modules/ins/ins_ekf2.cpp b/sw/airborne/modules/ins/ins_ekf2.cpp index 72068f56af..12fd40ccab 100644 --- a/sw/airborne/modules/ins/ins_ekf2.cpp +++ b/sw/airborne/modules/ins/ins_ekf2.cpp @@ -259,7 +259,7 @@ static uint8_t ahrs_ekf2_id = AHRS_COMP_ID_EKF2; ///< Component ID for EKF struct ekf2_parameters_t ekf2_params; #if PERIODIC_TELEMETRY -#include "subsystems/datalink/telemetry.h" +#include "modules/datalink/telemetry.h" static void send_ins_ref(struct transport_tx *trans, struct link_device *dev) { diff --git a/sw/airborne/modules/ins/ins_float_invariant.c b/sw/airborne/modules/ins/ins_float_invariant.c index c8dfd53d7b..530ebf67ca 100644 --- a/sw/airborne/modules/ins/ins_float_invariant.c +++ b/sw/airborne/modules/ins/ins_float_invariant.c @@ -48,7 +48,7 @@ // for debugging #if SEND_INVARIANT_FILTER || PERIODIC_TELEMETRY -#include "subsystems/datalink/telemetry.h" +#include "modules/datalink/telemetry.h" #endif #if LOG_INVARIANT_FILTER diff --git a/sw/airborne/modules/ins/ins_float_invariant_wrapper.c b/sw/airborne/modules/ins/ins_float_invariant_wrapper.c index 78a7d7d83f..aa09aebcfa 100644 --- a/sw/airborne/modules/ins/ins_float_invariant_wrapper.c +++ b/sw/airborne/modules/ins/ins_float_invariant_wrapper.c @@ -44,7 +44,7 @@ static struct FloatVect3 ins_finv_accel; static uint32_t ins_finv_last_stamp = 0; #if PERIODIC_TELEMETRY && !INS_FINV_USE_UTM -#include "subsystems/datalink/telemetry.h" +#include "modules/datalink/telemetry.h" #include "state.h" static void send_ins_ref(struct transport_tx *trans, struct link_device *dev) { diff --git a/sw/airborne/modules/ins/ins_gps_passthrough.c b/sw/airborne/modules/ins/ins_gps_passthrough.c index 2aa6045544..43627a4ad4 100644 --- a/sw/airborne/modules/ins/ins_gps_passthrough.c +++ b/sw/airborne/modules/ins/ins_gps_passthrough.c @@ -107,7 +107,7 @@ static void gps_cb(uint8_t sender_id __attribute__((unused)), #if PERIODIC_TELEMETRY -#include "subsystems/datalink/telemetry.h" +#include "modules/datalink/telemetry.h" static void send_ins(struct transport_tx *trans, struct link_device *dev) { diff --git a/sw/airborne/modules/ins/ins_int.c b/sw/airborne/modules/ins/ins_int.c index 965b25bf5a..d5a62ee57f 100644 --- a/sw/airborne/modules/ins/ins_int.c +++ b/sw/airborne/modules/ins/ins_int.c @@ -161,7 +161,7 @@ static void agl_cb(uint8_t sender_id, uint32_t stamp, float distance); struct InsInt ins_int; #if PERIODIC_TELEMETRY -#include "subsystems/datalink/telemetry.h" +#include "modules/datalink/telemetry.h" static void send_ins(struct transport_tx *trans, struct link_device *dev) { diff --git a/sw/airborne/modules/ins/ins_mekf_wind_wrapper.c b/sw/airborne/modules/ins/ins_mekf_wind_wrapper.c index a2cf8294f3..f866fc2ccc 100644 --- a/sw/airborne/modules/ins/ins_mekf_wind_wrapper.c +++ b/sw/airborne/modules/ins/ins_mekf_wind_wrapper.c @@ -73,7 +73,7 @@ static FILE* pprzLogFile = NULL; /** telemetry functions */ #if PERIODIC_TELEMETRY -#include "subsystems/datalink/telemetry.h" +#include "modules/datalink/telemetry.h" #include "mcu_periph/sys_time.h" static void send_euler(struct transport_tx *trans, struct link_device *dev) diff --git a/sw/airborne/modules/ins/ins_vectornav.c b/sw/airborne/modules/ins/ins_vectornav.c index 21e6938890..450b421a89 100644 --- a/sw/airborne/modules/ins/ins_vectornav.c +++ b/sw/airborne/modules/ins/ins_vectornav.c @@ -32,7 +32,7 @@ struct InsVectornav ins_vn; #if PERIODIC_TELEMETRY -#include "subsystems/datalink/telemetry.h" +#include "modules/datalink/telemetry.h" static void send_ins(struct transport_tx *trans, struct link_device *dev) { diff --git a/sw/airborne/modules/ins/ins_vn100.c b/sw/airborne/modules/ins/ins_vn100.c index 3a6fd7e349..c4e7fe0b47 100644 --- a/sw/airborne/modules/ins/ins_vn100.c +++ b/sw/airborne/modules/ins/ins_vn100.c @@ -32,7 +32,7 @@ // for telemetry report #include "mcu_periph/uart.h" -#include "subsystems/datalink/downlink.h" +#include "modules/datalink/downlink.h" #include "pprzlink/messages.h" #ifndef INS_YAW_NEUTRAL_DEFAULT @@ -306,7 +306,7 @@ static inline void parse_ins_msg(void) #include "mcu_periph/uart.h" #include "pprzlink/messages.h" -#include "subsystems/datalink/downlink.h" +#include "modules/datalink/downlink.h" extern void vn100_report_task(void) { diff --git a/sw/airborne/modules/ins/ins_xsens700.c b/sw/airborne/modules/ins/ins_xsens700.c index 8b84bc34c2..5f8b80353b 100644 --- a/sw/airborne/modules/ins/ins_xsens700.c +++ b/sw/airborne/modules/ins/ins_xsens700.c @@ -31,7 +31,7 @@ #include "generated/airframe.h" #include "mcu_periph/sys_time.h" -#include "subsystems/datalink/downlink.h" +#include "modules/datalink/downlink.h" #include "pprzlink/messages.h" #if USE_GPS_XSENS diff --git a/sw/airborne/modules/ins/vf_extended_float.c b/sw/airborne/modules/ins/vf_extended_float.c index caf058d716..2d42b5efd8 100644 --- a/sw/airborne/modules/ins/vf_extended_float.c +++ b/sw/airborne/modules/ins/vf_extended_float.c @@ -44,7 +44,7 @@ PRINT_CONFIG_VAR(DEBUG_VFF_EXTENDED) #if DEBUG_VFF_EXTENDED #include "mcu_periph/uart.h" #include "pprzlink/messages.h" -#include "subsystems/datalink/downlink.h" +#include "modules/datalink/downlink.h" #endif /** initial covariance diagonal */ @@ -91,7 +91,7 @@ struct VffExtended vff; void vff_update_obs_height(float obs_height); #if PERIODIC_TELEMETRY -#include "subsystems/datalink/telemetry.h" +#include "modules/datalink/telemetry.h" static void send_vffe(struct transport_tx *trans, struct link_device *dev) { diff --git a/sw/airborne/modules/ins/vf_float.c b/sw/airborne/modules/ins/vf_float.c index 8b66ae5095..a41225dc23 100644 --- a/sw/airborne/modules/ins/vf_float.c +++ b/sw/airborne/modules/ins/vf_float.c @@ -53,7 +53,7 @@ struct Vff vff; #if PERIODIC_TELEMETRY -#include "subsystems/datalink/telemetry.h" +#include "modules/datalink/telemetry.h" static void send_vff(struct transport_tx *trans, struct link_device *dev) { diff --git a/sw/airborne/modules/ins/xsens.c b/sw/airborne/modules/ins/xsens.c index 7e144245c4..35fd534823 100644 --- a/sw/airborne/modules/ins/xsens.c +++ b/sw/airborne/modules/ins/xsens.c @@ -35,7 +35,7 @@ // FIXME Debugging Only #include "mcu_periph/uart.h" #include "pprzlink/messages.h" -#include "subsystems/datalink/downlink.h" +#include "modules/datalink/downlink.h" /* output mode : calibrated, orientation, position, velocity, status diff --git a/sw/airborne/modules/joystick/joystick.c b/sw/airborne/modules/joystick/joystick.c index cda57f7ec2..2d1ea0cd0c 100644 --- a/sw/airborne/modules/joystick/joystick.c +++ b/sw/airborne/modules/joystick/joystick.c @@ -24,7 +24,7 @@ */ #include "modules/joystick/joystick.h" -#include "subsystems/datalink/datalink.h" +#include "modules/datalink/datalink.h" #include "modules/core/abi.h" #include "pprzlink/dl_protocol.h" #include "generated/airframe.h" diff --git a/sw/airborne/modules/lidar/lidar_lite.c b/sw/airborne/modules/lidar/lidar_lite.c index d8d6d15a65..e7ede62464 100644 --- a/sw/airborne/modules/lidar/lidar_lite.c +++ b/sw/airborne/modules/lidar/lidar_lite.c @@ -40,7 +40,7 @@ // Messages #include "pprzlink/messages.h" -#include "subsystems/datalink/downlink.h" +#include "modules/datalink/downlink.h" struct LidarLite lidar_lite; struct MedianFilterInt lidar_lite_filter; diff --git a/sw/airborne/modules/lidar/lidar_sf11.c b/sw/airborne/modules/lidar/lidar_sf11.c index a189e19c5d..bd16d11b5d 100644 --- a/sw/airborne/modules/lidar/lidar_sf11.c +++ b/sw/airborne/modules/lidar/lidar_sf11.c @@ -32,7 +32,7 @@ // Messages #include "pprzlink/messages.h" -#include "subsystems/datalink/downlink.h" +#include "modules/datalink/downlink.h" struct LidarSF11 lidar_sf11; struct MedianFilterInt lidar_sf11_filter; diff --git a/sw/airborne/modules/lidar/tfmini.c b/sw/airborne/modules/lidar/tfmini.c index dfaf467acc..be8ced5cbf 100644 --- a/sw/airborne/modules/lidar/tfmini.c +++ b/sw/airborne/modules/lidar/tfmini.c @@ -33,7 +33,7 @@ // Messages #include "pprzlink/messages.h" -#include "subsystems/datalink/downlink.h" +#include "modules/datalink/downlink.h" struct TFMini tfmini = { .parse_status = TFMINI_INITIALIZE @@ -42,7 +42,7 @@ struct TFMini tfmini = { static void tfmini_parse(uint8_t byte); #if PERIODIC_TELEMETRY -#include "subsystems/datalink/telemetry.h" +#include "modules/datalink/telemetry.h" /** * Downlink message lidar diff --git a/sw/airborne/modules/lidar/tfmini_i2c.c b/sw/airborne/modules/lidar/tfmini_i2c.c index 4a2ea19452..8f30d48960 100644 --- a/sw/airborne/modules/lidar/tfmini_i2c.c +++ b/sw/airborne/modules/lidar/tfmini_i2c.c @@ -31,12 +31,12 @@ #include "modules/core/abi.h" #if PERIODIC_TELEMETRY -#include "subsystems/datalink/telemetry.h" +#include "modules/datalink/telemetry.h" #include "pprzlink/messages.h" #endif #ifdef SENSOR_SYNC_SEND -#include "subsystems/datalink/downlink.h" +#include "modules/datalink/downlink.h" #endif #ifdef SITL diff --git a/sw/airborne/modules/loggers/flight_recorder.c b/sw/airborne/modules/loggers/flight_recorder.c index 503ce80f2a..2b9dd10a24 100644 --- a/sw/airborne/modules/loggers/flight_recorder.c +++ b/sw/airborne/modules/loggers/flight_recorder.c @@ -27,8 +27,8 @@ #include "modules/loggers/flight_recorder.h" -#include "subsystems/datalink/telemetry.h" -#include "subsystems/datalink/downlink.h" +#include "modules/datalink/telemetry.h" +#include "modules/datalink/downlink.h" #include "modules/loggers/pprzlog_tp.h" #if FLIGHTRECORDER_SDLOG @@ -42,7 +42,7 @@ struct chibios_sdlog flightrecorder_sdlog; #else // include downlink for other devices -#include "subsystems/datalink/downlink.h" +#include "modules/datalink/downlink.h" #endif #ifndef TELEMETRY_PROCESS_FlightRecorder diff --git a/sw/airborne/modules/loggers/high_speed_logger_direct_memory.c b/sw/airborne/modules/loggers/high_speed_logger_direct_memory.c index a8fe98617a..096968c9a9 100644 --- a/sw/airborne/modules/loggers/high_speed_logger_direct_memory.c +++ b/sw/airborne/modules/loggers/high_speed_logger_direct_memory.c @@ -33,8 +33,8 @@ #include "mcu_periph/spi.h" #include "mcu_periph/uart.h" -#include "subsystems/datalink/downlink.h" -#include "subsystems/datalink/telemetry.h" +#include "modules/datalink/downlink.h" +#include "modules/datalink/telemetry.h" /******************************************************************/ diff --git a/sw/airborne/modules/loggers/openlog.c b/sw/airborne/modules/loggers/openlog.c index 27c9f506fd..66b357bdc6 100644 --- a/sw/airborne/modules/loggers/openlog.c +++ b/sw/airborne/modules/loggers/openlog.c @@ -30,7 +30,7 @@ #include "openlog.h" #include "pprzlink/messages.h" -#include "subsystems/datalink/downlink.h" +#include "modules/datalink/downlink.h" #include "mcu_periph/sys_time.h" void periodic_2Hz_openlog(void) diff --git a/sw/airborne/modules/loggers/sdlog_chibios.c b/sw/airborne/modules/loggers/sdlog_chibios.c index a772a0f119..99358cbbff 100644 --- a/sw/airborne/modules/loggers/sdlog_chibios.c +++ b/sw/airborne/modules/loggers/sdlog_chibios.c @@ -107,7 +107,7 @@ static char chibios_sdlog_filenames[68]; static char NO_FILE_NAME[] = "none"; #if PERIODIC_TELEMETRY -#include "subsystems/datalink/telemetry.h" +#include "modules/datalink/telemetry.h" static void send_sdlog_status(struct transport_tx *trans, struct link_device *dev) { uint8_t status = (uint8_t) chibios_sdlog_status; diff --git a/sw/airborne/modules/loggers/sdlogger_spi_direct.c b/sw/airborne/modules/loggers/sdlogger_spi_direct.c index 4eafc2e878..b9cfe7f130 100644 --- a/sw/airborne/modules/loggers/sdlogger_spi_direct.c +++ b/sw/airborne/modules/loggers/sdlogger_spi_direct.c @@ -30,9 +30,9 @@ #define PERIODIC_C_LOGGER #include "modules/loggers/sdlogger_spi_direct.h" -#include "subsystems/datalink/downlink.h" +#include "modules/datalink/downlink.h" #include "modules/loggers/pprzlog_tp.h" -#include "subsystems/datalink/telemetry.h" +#include "modules/datalink/telemetry.h" #include "led.h" #include diff --git a/sw/airborne/modules/meteo/charge_sens.c b/sw/airborne/modules/meteo/charge_sens.c index d548be6baf..54309b9821 100644 --- a/sw/airborne/modules/meteo/charge_sens.c +++ b/sw/airborne/modules/meteo/charge_sens.c @@ -29,7 +29,7 @@ #include "mcu_periph/i2c.h" #include "mcu_periph/uart.h" #include "pprzlink/messages.h" -#include "subsystems/datalink/downlink.h" +#include "modules/datalink/downlink.h" #ifndef CHARGE_SENS_DEV diff --git a/sw/airborne/modules/meteo/dust_gp2y.c b/sw/airborne/modules/meteo/dust_gp2y.c index ee60752e1f..6170bf5e4d 100644 --- a/sw/airborne/modules/meteo/dust_gp2y.c +++ b/sw/airborne/modules/meteo/dust_gp2y.c @@ -33,7 +33,7 @@ #include "mcu_periph/sys_time.h" #include "mcu_periph/uart.h" #include "pprzlink/messages.h" -#include "subsystems/datalink/downlink.h" +#include "modules/datalink/downlink.h" uint8_t dust_gp2y_status; uint16_t dust_gp2y_density; diff --git a/sw/airborne/modules/meteo/geiger_counter.c b/sw/airborne/modules/meteo/geiger_counter.c index cb3298864d..d32ff387fb 100644 --- a/sw/airborne/modules/meteo/geiger_counter.c +++ b/sw/airborne/modules/meteo/geiger_counter.c @@ -29,7 +29,7 @@ #include "mcu_periph/i2c.h" #include "mcu_periph/uart.h" #include "pprzlink/messages.h" -#include "subsystems/datalink/downlink.h" +#include "modules/datalink/downlink.h" #ifndef GEIGER_CNT_DEV diff --git a/sw/airborne/modules/meteo/humid_dpicco.c b/sw/airborne/modules/meteo/humid_dpicco.c index 51608bb13f..612ca4fd50 100644 --- a/sw/airborne/modules/meteo/humid_dpicco.c +++ b/sw/airborne/modules/meteo/humid_dpicco.c @@ -34,7 +34,7 @@ #include "led.h" #include "mcu_periph/uart.h" #include "pprzlink/messages.h" -#include "subsystems/datalink/downlink.h" +#include "modules/datalink/downlink.h" #ifndef DPICCO_I2C_DEV diff --git a/sw/airborne/modules/meteo/humid_hih.c b/sw/airborne/modules/meteo/humid_hih.c index c84d3e6b5d..17deef0cb6 100644 --- a/sw/airborne/modules/meteo/humid_hih.c +++ b/sw/airborne/modules/meteo/humid_hih.c @@ -34,7 +34,7 @@ #include "mcu_periph/adc.h" #include "mcu_periph/uart.h" #include "pprzlink/messages.h" -#include "subsystems/datalink/downlink.h" +#include "modules/datalink/downlink.h" #ifndef ADC_CHANNEL_HUMID_HIH diff --git a/sw/airborne/modules/meteo/humid_htm_b71.c b/sw/airborne/modules/meteo/humid_htm_b71.c index 1bfffc822a..d351f35041 100644 --- a/sw/airborne/modules/meteo/humid_htm_b71.c +++ b/sw/airborne/modules/meteo/humid_htm_b71.c @@ -34,7 +34,7 @@ #include "mcu_periph/i2c.h" #include "mcu_periph/uart.h" #include "pprzlink/messages.h" -#include "subsystems/datalink/downlink.h" +#include "modules/datalink/downlink.h" #ifndef HTM_I2C_DEV diff --git a/sw/airborne/modules/meteo/humid_pcap01.c b/sw/airborne/modules/meteo/humid_pcap01.c index 570d8e4d7a..ef10e71bfe 100644 --- a/sw/airborne/modules/meteo/humid_pcap01.c +++ b/sw/airborne/modules/meteo/humid_pcap01.c @@ -33,7 +33,7 @@ #include "mcu_periph/i2c.h" #include "mcu_periph/uart.h" #include "pprzlink/messages.h" -#include "subsystems/datalink/downlink.h" +#include "modules/datalink/downlink.h" #include "modules/meteo/humid_pcap01.h" #ifdef PCAP01_LOAD_FIRMWARE #include "modules/meteo/humid_pcap01_firmware.h" diff --git a/sw/airborne/modules/meteo/humid_sht.c b/sw/airborne/modules/meteo/humid_sht.c index e237d6a19d..82c25be8f2 100644 --- a/sw/airborne/modules/meteo/humid_sht.c +++ b/sw/airborne/modules/meteo/humid_sht.c @@ -32,7 +32,7 @@ #include "mcu_periph/gpio.h" #include "mcu_periph/uart.h" #include "pprzlink/messages.h" -#include "subsystems/datalink/downlink.h" +#include "modules/datalink/downlink.h" #include "humid_sht.h" // sd-log diff --git a/sw/airborne/modules/meteo/humid_sht_i2c.c b/sw/airborne/modules/meteo/humid_sht_i2c.c index 23757a82d2..85e8a312db 100644 --- a/sw/airborne/modules/meteo/humid_sht_i2c.c +++ b/sw/airborne/modules/meteo/humid_sht_i2c.c @@ -31,7 +31,7 @@ #include "mcu_periph/i2c.h" #include "mcu_periph/uart.h" #include "pprzlink/messages.h" -#include "subsystems/datalink/downlink.h" +#include "modules/datalink/downlink.h" #ifndef SHT_I2C_DEV diff --git a/sw/airborne/modules/meteo/humid_sht_uart.c b/sw/airborne/modules/meteo/humid_sht_uart.c index ed6390ee26..76b43492d3 100644 --- a/sw/airborne/modules/meteo/humid_sht_uart.c +++ b/sw/airborne/modules/meteo/humid_sht_uart.c @@ -32,7 +32,7 @@ #include "mcu_periph/gpio.h" #include "mcu_periph/uart.h" #include "pprzlink/messages.h" -#include "subsystems/datalink/downlink.h" +#include "modules/datalink/downlink.h" #include "humid_sht_uart.h" uint16_t humidsht, tempsht; diff --git a/sw/airborne/modules/meteo/ir_mlx.c b/sw/airborne/modules/meteo/ir_mlx.c index 1dabd53d2f..e91c1af4e1 100644 --- a/sw/airborne/modules/meteo/ir_mlx.c +++ b/sw/airborne/modules/meteo/ir_mlx.c @@ -34,7 +34,7 @@ #include "led.h" #include "mcu_periph/uart.h" #include "pprzlink/messages.h" -#include "subsystems/datalink/downlink.h" +#include "modules/datalink/downlink.h" #ifndef MLX_I2C_DEV diff --git a/sw/airborne/modules/meteo/light_solar.c b/sw/airborne/modules/meteo/light_solar.c index d03c4ed07a..ba8d40b034 100644 --- a/sw/airborne/modules/meteo/light_solar.c +++ b/sw/airborne/modules/meteo/light_solar.c @@ -30,7 +30,7 @@ #include "mcu_periph/adc.h" #include "mcu_periph/uart.h" #include "pprzlink/messages.h" -#include "subsystems/datalink/downlink.h" +#include "modules/datalink/downlink.h" #include "modules/meteo/light_solar.h" #ifndef ADC_CHANNEL_LIGHT_SOLAR_UP diff --git a/sw/airborne/modules/meteo/light_temt.c b/sw/airborne/modules/meteo/light_temt.c index 4de52db2a5..c6f086f4c1 100644 --- a/sw/airborne/modules/meteo/light_temt.c +++ b/sw/airborne/modules/meteo/light_temt.c @@ -31,7 +31,7 @@ #include "mcu_periph/adc.h" #include "mcu_periph/uart.h" #include "pprzlink/messages.h" -#include "subsystems/datalink/downlink.h" +#include "modules/datalink/downlink.h" #ifndef ADC_CHANNEL_LIGHT_TEMT #define ADC_CHANNEL_LIGHT_TEMT ADC_4 diff --git a/sw/airborne/modules/meteo/meteo_france_DAQ.c b/sw/airborne/modules/meteo/meteo_france_DAQ.c index 86e6c202ea..3b7c4922b0 100644 --- a/sw/airborne/modules/meteo/meteo_france_DAQ.c +++ b/sw/airborne/modules/meteo/meteo_france_DAQ.c @@ -35,8 +35,8 @@ #include "state.h" #include "autopilot.h" -#include "subsystems/datalink/datalink.h" -#include "subsystems/datalink/downlink.h" +#include "modules/datalink/datalink.h" +#include "modules/datalink/downlink.h" #include "modules/loggers/sdlog_chibios.h" #include "modules/loggers/pprzlog_tp.h" diff --git a/sw/airborne/modules/meteo/meteo_stick.c b/sw/airborne/modules/meteo/meteo_stick.c index 6cf75c851f..d942537379 100644 --- a/sw/airborne/modules/meteo/meteo_stick.c +++ b/sw/airborne/modules/meteo/meteo_stick.c @@ -188,7 +188,7 @@ bool log_ptu_started; #if SEND_MS #include "mcu_periph/uart.h" #include "pprzlink/messages.h" -#include "subsystems/datalink/downlink.h" +#include "modules/datalink/downlink.h" #include "modules/gps/gps.h" #define MS_DATA_SIZE 4 diff --git a/sw/airborne/modules/meteo/mf_ptu.c b/sw/airborne/modules/meteo/mf_ptu.c index 19e0164f77..7447404096 100644 --- a/sw/airborne/modules/meteo/mf_ptu.c +++ b/sw/airborne/modules/meteo/mf_ptu.c @@ -69,7 +69,7 @@ bool log_ptu_started; #if SEND_PTU #include "mcu_periph/uart.h" #include "pprzlink/messages.h" -#include "subsystems/datalink/downlink.h" +#include "modules/datalink/downlink.h" #include "modules/gps/gps.h" #endif diff --git a/sw/airborne/modules/meteo/temp_lm75.c b/sw/airborne/modules/meteo/temp_lm75.c index 208674a109..50c3e1e400 100644 --- a/sw/airborne/modules/meteo/temp_lm75.c +++ b/sw/airborne/modules/meteo/temp_lm75.c @@ -33,7 +33,7 @@ #include "led.h" #include "mcu_periph/uart.h" #include "pprzlink/messages.h" -#include "subsystems/datalink/downlink.h" +#include "modules/datalink/downlink.h" uint8_t lm75_meas_started; diff --git a/sw/airborne/modules/meteo/temp_tcouple_adc.c b/sw/airborne/modules/meteo/temp_tcouple_adc.c index 5e672564f9..74a1ecc1c9 100644 --- a/sw/airborne/modules/meteo/temp_tcouple_adc.c +++ b/sw/airborne/modules/meteo/temp_tcouple_adc.c @@ -31,7 +31,7 @@ #include "mcu_periph/adc.h" #include "mcu_periph/uart.h" #include "pprzlink/messages.h" -#include "subsystems/datalink/downlink.h" +#include "modules/datalink/downlink.h" #include "modules/meteo/temp_tcouple_adc.h" #ifndef ADC_CHANNEL_TEMP_REF diff --git a/sw/airborne/modules/meteo/temp_temod.c b/sw/airborne/modules/meteo/temp_temod.c index 24d4094cf6..72cdaaac9c 100644 --- a/sw/airborne/modules/meteo/temp_temod.c +++ b/sw/airborne/modules/meteo/temp_temod.c @@ -31,7 +31,7 @@ #include "led.h" #include "mcu_periph/uart.h" #include "pprzlink/messages.h" -#include "subsystems/datalink/downlink.h" +#include "modules/datalink/downlink.h" // sd-log #if TEMP_TEMOD_SDLOG diff --git a/sw/airborne/modules/meteo/temp_tmp102.c b/sw/airborne/modules/meteo/temp_tmp102.c index cc2edcf220..e0153da4ea 100644 --- a/sw/airborne/modules/meteo/temp_tmp102.c +++ b/sw/airborne/modules/meteo/temp_tmp102.c @@ -33,7 +33,7 @@ #include "led.h" #include "mcu_periph/uart.h" #include "pprzlink/messages.h" -#include "subsystems/datalink/downlink.h" +#include "modules/datalink/downlink.h" uint8_t tmp_meas_started; diff --git a/sw/airborne/modules/meteo/wind_estimator.c b/sw/airborne/modules/meteo/wind_estimator.c index 3db8b573be..23fadbbd41 100644 --- a/sw/airborne/modules/meteo/wind_estimator.c +++ b/sw/airborne/modules/meteo/wind_estimator.c @@ -81,7 +81,7 @@ #define SEND_WIND_ESTIMATOR TRUE #endif -#include "subsystems/datalink/downlink.h" +#include "modules/datalink/downlink.h" static void send_wind_estimator(struct transport_tx *trans, struct link_device *dev) { @@ -97,7 +97,7 @@ static void send_wind_estimator(struct transport_tx *trans, struct link_device * } #if PERIODIC_TELEMETRY -#include "subsystems/datalink/telemetry.h" +#include "modules/datalink/telemetry.h" #endif #ifndef LOG_WIND_ESTIMATOR diff --git a/sw/airborne/modules/meteo/wind_gfi.c b/sw/airborne/modules/meteo/wind_gfi.c index a5240b4b24..83e2edaf66 100644 --- a/sw/airborne/modules/meteo/wind_gfi.c +++ b/sw/airborne/modules/meteo/wind_gfi.c @@ -33,7 +33,7 @@ #include "led.h" #include "mcu_periph/uart.h" #include "pprzlink/messages.h" -#include "subsystems/datalink/downlink.h" +#include "modules/datalink/downlink.h" struct i2c_transaction pcf_trans; diff --git a/sw/airborne/modules/meteo/windturbine.c b/sw/airborne/modules/meteo/windturbine.c index a831891f49..1050d70cd4 100644 --- a/sw/airborne/modules/meteo/windturbine.c +++ b/sw/airborne/modules/meteo/windturbine.c @@ -35,7 +35,7 @@ #include "mcu_periph/uart.h" #include "pprzlink/messages.h" -#include "subsystems/datalink/downlink.h" +#include "modules/datalink/downlink.h" void windturbine_periodic(void) diff --git a/sw/airborne/modules/mission/copilot.h b/sw/airborne/modules/mission/copilot.h index 8d5faaaffe..b15e7ed34e 100644 --- a/sw/airborne/modules/mission/copilot.h +++ b/sw/airborne/modules/mission/copilot.h @@ -44,7 +44,7 @@ #ifndef COPILOT_H #define COPILOT_H -#include "subsystems/datalink/datalink.h" +#include "modules/datalink/datalink.h" #include "modules/datalink/extra_pprz_dl.h" #include "pprz_mutex.h" diff --git a/sw/airborne/modules/mission/copilot_common.c b/sw/airborne/modules/mission/copilot_common.c index 82ec1d66dc..9fc221c5bb 100644 --- a/sw/airborne/modules/mission/copilot_common.c +++ b/sw/airborne/modules/mission/copilot_common.c @@ -42,7 +42,7 @@ */ #include "modules/mission/copilot.h" -#include "subsystems/datalink/telemetry.h" +#include "modules/datalink/telemetry.h" bool send_cam_snapshot; bool send_cam_payload; diff --git a/sw/airborne/modules/mission/copilot_fixedwing.c b/sw/airborne/modules/mission/copilot_fixedwing.c index 362ccb1ea8..6882408e43 100644 --- a/sw/airborne/modules/mission/copilot_fixedwing.c +++ b/sw/airborne/modules/mission/copilot_fixedwing.c @@ -42,7 +42,7 @@ */ #include "modules/mission/copilot.h" -#include "subsystems/datalink/telemetry.h" +#include "modules/datalink/telemetry.h" // needed for WP_MOVED confirmation #include "firmwares/fixedwing/nav.h" diff --git a/sw/airborne/modules/mission/copilot_rotorcraft.c b/sw/airborne/modules/mission/copilot_rotorcraft.c index 9e7fc6bb78..f53a968a5e 100644 --- a/sw/airborne/modules/mission/copilot_rotorcraft.c +++ b/sw/airborne/modules/mission/copilot_rotorcraft.c @@ -42,7 +42,7 @@ */ #include "modules/mission/copilot.h" -#include "subsystems/datalink/telemetry.h" +#include "modules/datalink/telemetry.h" // needed for WP_MOVED confirmation #include "firmwares/rotorcraft/navigation.h" diff --git a/sw/airborne/modules/mission/mission_common.c b/sw/airborne/modules/mission/mission_common.c index 93d8529c6f..6682152b7c 100644 --- a/sw/airborne/modules/mission/mission_common.c +++ b/sw/airborne/modules/mission/mission_common.c @@ -29,8 +29,8 @@ #include #include "generated/flight_plan.h" #include "generated/airframe.h" -#include "subsystems/datalink/datalink.h" -#include "subsystems/datalink/downlink.h" +#include "modules/datalink/datalink.h" +#include "modules/datalink/downlink.h" struct _mission mission = { 0 }; diff --git a/sw/airborne/modules/multi/ctc/ctc.c b/sw/airborne/modules/multi/ctc/ctc.c index a0f25bffa3..827fcdd944 100644 --- a/sw/airborne/modules/multi/ctc/ctc.c +++ b/sw/airborne/modules/multi/ctc/ctc.c @@ -25,8 +25,8 @@ #include #include "modules/multi/ctc/ctc.h" -//#include "subsystems/datalink/datalink.h" // dl_buffer -#include "subsystems/datalink/telemetry.h" +//#include "modules/datalink/datalink.h" // dl_buffer +#include "modules/datalink/telemetry.h" #include "subsystems/navigation/common_nav.h" #include "firmwares/fixedwing/stabilization/stabilization_attitude.h" #include "autopilot.h" diff --git a/sw/airborne/modules/multi/ctc/ctc_target.c b/sw/airborne/modules/multi/ctc/ctc_target.c index ed69bec38e..2cd8a75d4a 100644 --- a/sw/airborne/modules/multi/ctc/ctc_target.c +++ b/sw/airborne/modules/multi/ctc/ctc_target.c @@ -25,8 +25,8 @@ #include #include "modules/multi/ctc/ctc_target.h" -//#include "subsystems/datalink/datalink.h" // dl_buffer -#include "subsystems/datalink/telemetry.h" +//#include "modules/datalink/datalink.h" // dl_buffer +#include "modules/datalink/telemetry.h" #include "firmwares/rotorcraft/navigation.h" #include "autopilot.h" diff --git a/sw/airborne/modules/multi/dcf/dcf.c b/sw/airborne/modules/multi/dcf/dcf.c index dd313bd95b..51886d6e65 100644 --- a/sw/airborne/modules/multi/dcf/dcf.c +++ b/sw/airborne/modules/multi/dcf/dcf.c @@ -23,8 +23,8 @@ #include #include "modules/muti/dcf/dcf.h" -//#include "subsystems/datalink/datalink.h" // dl_buffer -#include "subsystems/datalink/telemetry.h" +//#include "modules/datalink/datalink.h" // dl_buffer +#include "modules/datalink/telemetry.h" #include "subsystems/navigation/common_nav.h" #include "autopilot.h" #include "std.h" diff --git a/sw/airborne/modules/multi/fc_rotor/fc_rotor.c b/sw/airborne/modules/multi/fc_rotor/fc_rotor.c index 8cff7fc1d1..e46b2cae7f 100644 --- a/sw/airborne/modules/multi/fc_rotor/fc_rotor.c +++ b/sw/airborne/modules/multi/fc_rotor/fc_rotor.c @@ -20,7 +20,7 @@ */ #include "math/pprz_algebra_float.h" #include "modules/core/abi.h" -#include "subsystems/datalink/datalink.h" +#include "modules/datalink/datalink.h" #include "autopilot.h" #include "modules/multi/fc_rotor/fc_rotor.h" #include "firmwares/rotorcraft/navigation.h" diff --git a/sw/airborne/modules/multi/formation.c b/sw/airborne/modules/multi/formation.c index 1e4aab4e7f..569e784727 100644 --- a/sw/airborne/modules/multi/formation.c +++ b/sw/airborne/modules/multi/formation.c @@ -9,7 +9,7 @@ #include "std.h" #include "state.h" -#include "subsystems/datalink/downlink.h" +#include "modules/datalink/downlink.h" #include "firmwares/fixedwing/nav.h" #include "firmwares/fixedwing/guidance/guidance_v.h" diff --git a/sw/airborne/modules/multi/formation.h b/sw/airborne/modules/multi/formation.h index 760923d5bb..485201ad11 100644 --- a/sw/airborne/modules/multi/formation.h +++ b/sw/airborne/modules/multi/formation.h @@ -7,7 +7,7 @@ #ifndef FORMATION_H #define FORMATION_H -#include "subsystems/datalink/datalink.h" // dl_buffer +#include "modules/datalink/datalink.h" // dl_buffer #include "generated/airframe.h" // AC_ID #include "modules/multi/traffic_info.h" diff --git a/sw/airborne/modules/multi/potential.c b/sw/airborne/modules/multi/potential.c index 5f81686ad6..8f56579d11 100644 --- a/sw/airborne/modules/multi/potential.c +++ b/sw/airborne/modules/multi/potential.c @@ -5,7 +5,7 @@ #include -#include "subsystems/datalink/downlink.h" +#include "modules/datalink/downlink.h" #include "pprzlink/dl_protocol.h" #include "potential.h" diff --git a/sw/airborne/modules/multi/rssi.c b/sw/airborne/modules/multi/rssi.c index 7947c3ae3f..ea33542673 100644 --- a/sw/airborne/modules/multi/rssi.c +++ b/sw/airborne/modules/multi/rssi.c @@ -25,7 +25,7 @@ #include "modules/multi/rssi.h" -#include "subsystems/datalink/datalink.h" +#include "modules/datalink/datalink.h" #include "pprzlink/messages.h" #include "modules/core/abi.h" // rssi messages subscription diff --git a/sw/airborne/modules/multi/tcas.c b/sw/airborne/modules/multi/tcas.c index 3b34c0ca93..af3085f42a 100644 --- a/sw/airborne/modules/multi/tcas.c +++ b/sw/airborne/modules/multi/tcas.c @@ -30,7 +30,7 @@ #include "firmwares/fixedwing/nav.h" #include "generated/flight_plan.h" // SECURITY_HEIGHT -#include "subsystems/datalink/downlink.h" +#include "modules/datalink/downlink.h" float tcas_alt_setpoint; float tcas_tau_ta, tcas_tau_ra, tcas_dmod, tcas_alim; diff --git a/sw/airborne/modules/multi/tcas.h b/sw/airborne/modules/multi/tcas.h index 622bca66d7..2817bf52fa 100644 --- a/sw/airborne/modules/multi/tcas.h +++ b/sw/airborne/modules/multi/tcas.h @@ -29,7 +29,7 @@ #define TCAS_H #include "std.h" -//#include "subsystems/datalink/datalink.h" // dl_buffer +//#include "modules/datalink/datalink.h" // dl_buffer #include "pprzlink/messages.h" // TCAS_RA #include "generated/airframe.h" // AC_INFO #include "modules/multi/traffic_info.h" diff --git a/sw/airborne/modules/multi/traffic_info.c b/sw/airborne/modules/multi/traffic_info.c index 0bed4243e7..361eb1f15d 100644 --- a/sw/airborne/modules/multi/traffic_info.c +++ b/sw/airborne/modules/multi/traffic_info.c @@ -29,7 +29,7 @@ #include "generated/airframe.h" // AC_ID #include "generated/flight_plan.h" // NAV_MSL0 -#include "subsystems/datalink/datalink.h" +#include "modules/datalink/datalink.h" #include "pprzlink/dl_protocol.h" // datalink messages #include "pprzlink/messages.h" // telemetry messages diff --git a/sw/airborne/modules/nav/nav_catapult.c b/sw/airborne/modules/nav/nav_catapult.c index b094fb27e8..8744593682 100644 --- a/sw/airborne/modules/nav/nav_catapult.c +++ b/sw/airborne/modules/nav/nav_catapult.c @@ -43,7 +43,7 @@ #include "mcu_periph/uart.h" #include "pprzlink/messages.h" -#include "subsystems/datalink/downlink.h" +#include "modules/datalink/downlink.h" // Default values for take-off procedure diff --git a/sw/airborne/modules/nav/nav_fish.c b/sw/airborne/modules/nav/nav_fish.c index ddcf9d24ac..914cfadc05 100644 --- a/sw/airborne/modules/nav/nav_fish.c +++ b/sw/airborne/modules/nav/nav_fish.c @@ -44,7 +44,7 @@ #include "math/pprz_geodetic_float.h" #include "generated/flight_plan.h" #include -#include "subsystems/datalink/telemetry.h" +#include "modules/datalink/telemetry.h" #include #include diff --git a/sw/airborne/modules/nav/nav_geofence.h b/sw/airborne/modules/nav/nav_geofence.h index 5b41c2a53f..fea34bf078 100644 --- a/sw/airborne/modules/nav/nav_geofence.h +++ b/sw/airborne/modules/nav/nav_geofence.h @@ -32,7 +32,7 @@ */ #ifdef GEOFENCE_DATALINK_LOST_TIME -#include "subsystems/datalink/datalink.h" +#include "modules/datalink/datalink.h" /* * from the airfame config file: * go to HOME mode if datalink lost for GEOFENCE_DATALINK_LOST_TIME diff --git a/sw/airborne/modules/nav/nav_rover_base.c b/sw/airborne/modules/nav/nav_rover_base.c index 8ffeb4bd22..b2618d3a60 100644 --- a/sw/airborne/modules/nav/nav_rover_base.c +++ b/sw/airborne/modules/nav/nav_rover_base.c @@ -246,7 +246,7 @@ static void nav_oval(struct EnuCoor_f *wp1, struct EnuCoor_f *wp2, float radius) } #if PERIODIC_TELEMETRY -#include "subsystems/datalink/telemetry.h" +#include "modules/datalink/telemetry.h" static void send_segment(struct transport_tx *trans, struct link_device *dev) { diff --git a/sw/airborne/modules/nav/nav_survey_rectangle_rotorcraft.c b/sw/airborne/modules/nav/nav_survey_rectangle_rotorcraft.c index 5177b41f99..ffab5d9bf9 100644 --- a/sw/airborne/modules/nav/nav_survey_rectangle_rotorcraft.c +++ b/sw/airborne/modules/nav/nav_survey_rectangle_rotorcraft.c @@ -40,10 +40,10 @@ #include "mcu_periph/uart.h" #include "pprzlink/messages.h" -#include "subsystems/datalink/downlink.h" +#include "modules/datalink/downlink.h" #if PERIODIC_TELEMETRY -#include "subsystems/datalink/telemetry.h" +#include "modules/datalink/telemetry.h" #endif #include "firmwares/rotorcraft/navigation.h" diff --git a/sw/airborne/modules/obstacle_avoidance/guidance_OA.c b/sw/airborne/modules/obstacle_avoidance/guidance_OA.c index 32749638b8..a0d9c23316 100644 --- a/sw/airborne/modules/obstacle_avoidance/guidance_OA.c +++ b/sw/airborne/modules/obstacle_avoidance/guidance_OA.c @@ -31,8 +31,8 @@ #include "firmwares/rotorcraft/stabilization/stabilization_attitude.h" #include "firmwares/rotorcraft/guidance/guidance_v.h" #include "autopilot.h" -#include "subsystems/datalink/downlink.h" -#include "subsystems/datalink/telemetry.h" +#include "modules/datalink/downlink.h" +#include "modules/datalink/telemetry.h" #include "modules/energy/electrical.h" #include "std.h" //#include "modules/read_matrix_serial/read_matrix_serial.h" diff --git a/sw/airborne/modules/obstacle_avoidance/obstacle_avoidance.c b/sw/airborne/modules/obstacle_avoidance/obstacle_avoidance.c index dff4033c55..e9dd6068ae 100644 --- a/sw/airborne/modules/obstacle_avoidance/obstacle_avoidance.c +++ b/sw/airborne/modules/obstacle_avoidance/obstacle_avoidance.c @@ -32,7 +32,7 @@ #include "state.h" #include "math/pprz_algebra_float.h" #include "math/pprz_geodetic_int.h" -#include "subsystems/datalink/telemetry.h" +#include "modules/datalink/telemetry.h" #include "modules/stereocam/stereocam.h" #include "modules/obstacle_avoidance/guidance_OA.h" #include "modules/obstacle_avoidance/obstacle_avoidance.h" diff --git a/sw/airborne/modules/optical_flow/mateksys_3901_l0x.c b/sw/airborne/modules/optical_flow/mateksys_3901_l0x.c index 49c739a95f..c8a68bada2 100644 --- a/sw/airborne/modules/optical_flow/mateksys_3901_l0x.c +++ b/sw/airborne/modules/optical_flow/mateksys_3901_l0x.c @@ -35,7 +35,7 @@ // Messages #include "pprzlink/messages.h" -#include "subsystems/datalink/downlink.h" +#include "modules/datalink/downlink.h" // Define configuration parameters @@ -82,7 +82,7 @@ struct Mateksys3901l0X mateksys3901l0x = { static void mateksys3901l0x_parse(uint8_t byte); #if PERIODIC_TELEMETRY -#include "subsystems/datalink/telemetry.h" +#include "modules/datalink/telemetry.h" /** * Downlink message flow and lidar (included velocity estimation, not yet tested) diff --git a/sw/airborne/modules/optical_flow/px4flow.c b/sw/airborne/modules/optical_flow/px4flow.c index 2718145ee4..a034681b0b 100644 --- a/sw/airborne/modules/optical_flow/px4flow.c +++ b/sw/airborne/modules/optical_flow/px4flow.c @@ -37,7 +37,7 @@ // Messages #include "mcu_periph/uart.h" #include "pprzlink/messages.h" -#include "subsystems/datalink/downlink.h" +#include "modules/datalink/downlink.h" struct mavlink_heartbeat heartbeat; struct mavlink_optical_flow optical_flow; diff --git a/sw/airborne/modules/optical_flow/px4flow_i2c.c b/sw/airborne/modules/optical_flow/px4flow_i2c.c index 07ef1876cd..41a704fe49 100644 --- a/sw/airborne/modules/optical_flow/px4flow_i2c.c +++ b/sw/airborne/modules/optical_flow/px4flow_i2c.c @@ -36,7 +36,7 @@ // Messages #include "pprzlink/messages.h" -#include "subsystems/datalink/downlink.h" +#include "modules/datalink/downlink.h" /* * acceptable quality of optical flow (0-min,1-max) diff --git a/sw/airborne/modules/pca9685/pca9685_i2c.c b/sw/airborne/modules/pca9685/pca9685_i2c.c index aa10a54c10..f3b5e02138 100644 --- a/sw/airborne/modules/pca9685/pca9685_i2c.c +++ b/sw/airborne/modules/pca9685/pca9685_i2c.c @@ -40,7 +40,7 @@ #include "mcu_periph/uart.h" #if DOWNLINK -#include "subsystems/datalink/telemetry.h" +#include "modules/datalink/telemetry.h" #endif diff --git a/sw/airborne/modules/radio_control/cc2500_frsky/cc2500_paparazzi.c b/sw/airborne/modules/radio_control/cc2500_frsky/cc2500_paparazzi.c index 2c86ad0173..e94046ef63 100644 --- a/sw/airborne/modules/radio_control/cc2500_frsky/cc2500_paparazzi.c +++ b/sw/airborne/modules/radio_control/cc2500_frsky/cc2500_paparazzi.c @@ -35,7 +35,7 @@ static uint16_t frsky_raw[RADIO_CTL_NB]; #if PERIODIC_TELEMETRY -#include "subsystems/datalink/telemetry.h" +#include "modules/datalink/telemetry.h" static void send_cc2500_ppm(struct transport_tx *trans, struct link_device *dev) { diff --git a/sw/airborne/modules/radio_control/cc2500_frsky/cc2500_smartport.c b/sw/airborne/modules/radio_control/cc2500_frsky/cc2500_smartport.c index f5e3052161..60841ca964 100644 --- a/sw/airborne/modules/radio_control/cc2500_frsky/cc2500_smartport.c +++ b/sw/airborne/modules/radio_control/cc2500_frsky/cc2500_smartport.c @@ -4,7 +4,7 @@ #include "cc2500_settings.h" #include "cc2500_smartport.h" -#include "subsystems/datalink/downlink.h" +#include "modules/datalink/downlink.h" #ifdef UNUSED #undef UNUSED diff --git a/sw/airborne/modules/radio_control/hott.c b/sw/airborne/modules/radio_control/hott.c index 69eb8b6698..67135797a5 100644 --- a/sw/airborne/modules/radio_control/hott.c +++ b/sw/airborne/modules/radio_control/hott.c @@ -34,7 +34,7 @@ struct SHott hott; // Telemetry function #if PERIODIC_TELEMETRY -#include "subsystems/datalink/telemetry.h" +#include "modules/datalink/telemetry.h" static void send_hott(struct transport_tx *trans, struct link_device *dev) { diff --git a/sw/airborne/modules/radio_control/ppm.c b/sw/airborne/modules/radio_control/ppm.c index e981a2a849..53e66065fb 100644 --- a/sw/airborne/modules/radio_control/ppm.c +++ b/sw/airborne/modules/radio_control/ppm.c @@ -50,7 +50,7 @@ static bool ppm_data_valid; #if PERIODIC_TELEMETRY -#include "subsystems/datalink/telemetry.h" +#include "modules/datalink/telemetry.h" static void send_ppm(struct transport_tx *trans, struct link_device *dev) { diff --git a/sw/airborne/modules/radio_control/sbus.c b/sw/airborne/modules/radio_control/sbus.c index 0fedc98973..1702cedab8 100644 --- a/sw/airborne/modules/radio_control/sbus.c +++ b/sw/airborne/modules/radio_control/sbus.c @@ -40,7 +40,7 @@ struct Sbus sbus; // Telemetry function #if PERIODIC_TELEMETRY -#include "subsystems/datalink/telemetry.h" +#include "modules/datalink/telemetry.h" static void send_sbus(struct transport_tx *trans, struct link_device *dev) { diff --git a/sw/airborne/modules/radio_control/sbus_dual.c b/sw/airborne/modules/radio_control/sbus_dual.c index f5141fa778..eb4617ce9f 100644 --- a/sw/airborne/modules/radio_control/sbus_dual.c +++ b/sw/airborne/modules/radio_control/sbus_dual.c @@ -49,7 +49,7 @@ struct Sbus sbus1, sbus2; // Telemetry function #if PERIODIC_TELEMETRY -#include "subsystems/datalink/telemetry.h" +#include "modules/datalink/telemetry.h" static void send_sbus(struct transport_tx *trans, struct link_device *dev) { diff --git a/sw/airborne/modules/radio_control/superbitrf_rc.h b/sw/airborne/modules/radio_control/superbitrf_rc.h index f47ccdda83..8a2db4871c 100644 --- a/sw/airborne/modules/radio_control/superbitrf_rc.h +++ b/sw/airborne/modules/radio_control/superbitrf_rc.h @@ -26,7 +26,7 @@ #ifndef RADIO_CONTROL_SUPERBITRF_RC_H #define RADIO_CONTROL_SUPERBITRF_RC_H -#include "subsystems/datalink/superbitrf.h" +#include "modules/datalink/superbitrf.h" /* Theoretically you could have 14 channel over DSM2/DSMX */ #ifndef RADIO_CONTROL_NB_CHANNEL diff --git a/sw/airborne/modules/range_finder/cf_deck_multi_ranger.c b/sw/airborne/modules/range_finder/cf_deck_multi_ranger.c index e22cf3c872..9d3e2f0ed8 100644 --- a/sw/airborne/modules/range_finder/cf_deck_multi_ranger.c +++ b/sw/airborne/modules/range_finder/cf_deck_multi_ranger.c @@ -28,7 +28,7 @@ #include "peripherals/vl53l1x_nonblocking.h" #include "peripherals/vl53l1x_api.h" #include "modules/core/abi.h" -#include "subsystems/datalink/downlink.h" +#include "modules/datalink/downlink.h" // By default, do early init to be compatible with the flow_deck // Blocking i2c is only possible with ChibiOS diff --git a/sw/airborne/modules/range_finder/laser_range_array.c b/sw/airborne/modules/range_finder/laser_range_array.c index c88589f9ec..67992e8c79 100644 --- a/sw/airborne/modules/range_finder/laser_range_array.c +++ b/sw/airborne/modules/range_finder/laser_range_array.c @@ -37,7 +37,7 @@ #include "message_pragmas.h" #include "pprzlink/messages.h" -#include "subsystems/datalink/downlink.h" +#include "modules/datalink/downlink.h" /* Main device strcuture */ struct laser_range_array_t { diff --git a/sw/airborne/modules/range_finder/teraranger_one.c b/sw/airborne/modules/range_finder/teraranger_one.c index 9811461ea3..21153de000 100644 --- a/sw/airborne/modules/range_finder/teraranger_one.c +++ b/sw/airborne/modules/range_finder/teraranger_one.c @@ -26,7 +26,7 @@ #include "modules/range_finder/teraranger_one.h" #include "mcu_periph/i2c.h" #include "modules/core/abi.h" -#include "subsystems/datalink/downlink.h" +#include "modules/datalink/downlink.h" // check if I2C device is selected #ifndef TERARANGER_ONE_I2C_DEV diff --git a/sw/airborne/modules/relative_localization_filter/relative_localization_filter.c b/sw/airborne/modules/relative_localization_filter/relative_localization_filter.c index 839511c76d..fe71245697 100644 --- a/sw/airborne/modules/relative_localization_filter/relative_localization_filter.c +++ b/sw/airborne/modules/relative_localization_filter/relative_localization_filter.c @@ -24,7 +24,7 @@ */ #include "relative_localization_filter.h" -#include "subsystems/datalink/telemetry.h" +#include "modules/datalink/telemetry.h" #include "state.h" // To get current states #include "modules/datalink/extra_pprz_dl.h" diff --git a/sw/airborne/modules/sensors/airspeed_amsys.c b/sw/airborne/modules/sensors/airspeed_amsys.c index ea120435f1..40c05008d6 100644 --- a/sw/airborne/modules/sensors/airspeed_amsys.c +++ b/sw/airborne/modules/sensors/airspeed_amsys.c @@ -28,7 +28,7 @@ #include "mcu_periph/i2c.h" #include "mcu_periph/uart.h" #include "pprzlink/messages.h" -#include "subsystems/datalink/downlink.h" +#include "modules/datalink/downlink.h" #include //#include diff --git a/sw/airborne/modules/sensors/airspeed_ets.c b/sw/airborne/modules/sensors/airspeed_ets.c index 693ad198e2..003399f2ef 100644 --- a/sw/airborne/modules/sensors/airspeed_ets.c +++ b/sw/airborne/modules/sensors/airspeed_ets.c @@ -46,7 +46,7 @@ #include "mcu_periph/sys_time.h" #include "pprzlink/messages.h" #include "modules/core/abi.h" -#include "subsystems/datalink/downlink.h" +#include "modules/datalink/downlink.h" #include #ifndef USE_AIRSPEED_ETS diff --git a/sw/airborne/modules/sensors/airspeed_ms45xx_i2c.c b/sw/airborne/modules/sensors/airspeed_ms45xx_i2c.c index 955a777808..8a72054d81 100644 --- a/sw/airborne/modules/sensors/airspeed_ms45xx_i2c.c +++ b/sw/airborne/modules/sensors/airspeed_ms45xx_i2c.c @@ -33,10 +33,10 @@ #include "mcu_periph/uart.h" #include "pprzlink/messages.h" -#include "subsystems/datalink/downlink.h" +#include "modules/datalink/downlink.h" #if PERIODIC_TELEMETRY -#include "subsystems/datalink/telemetry.h" +#include "modules/datalink/telemetry.h" #endif #ifndef USE_AIRSPEED_MS45XX diff --git a/sw/airborne/modules/sensors/airspeed_otf.c b/sw/airborne/modules/sensors/airspeed_otf.c index 9d58167987..531655167e 100644 --- a/sw/airborne/modules/sensors/airspeed_otf.c +++ b/sw/airborne/modules/sensors/airspeed_otf.c @@ -32,7 +32,7 @@ #include #include "mcu_periph/uart.h" #include "pprzlink/messages.h" -#include "subsystems/datalink/downlink.h" +#include "modules/datalink/downlink.h" #include #include "met_module.h" diff --git a/sw/airborne/modules/sensors/airspeed_sdp3x.c b/sw/airborne/modules/sensors/airspeed_sdp3x.c index 897ccb32a0..8529942c15 100644 --- a/sw/airborne/modules/sensors/airspeed_sdp3x.c +++ b/sw/airborne/modules/sensors/airspeed_sdp3x.c @@ -30,10 +30,10 @@ #include "mcu_periph/uart.h" #include "pprzlink/messages.h" -#include "subsystems/datalink/downlink.h" +#include "modules/datalink/downlink.h" #if PERIODIC_TELEMETRY -#include "subsystems/datalink/telemetry.h" +#include "modules/datalink/telemetry.h" #endif #ifndef USE_AIRSPEED_SDP3X diff --git a/sw/airborne/modules/sensors/airspeed_uADC.c b/sw/airborne/modules/sensors/airspeed_uADC.c index ec26b77dac..9f94745cc2 100644 --- a/sw/airborne/modules/sensors/airspeed_uADC.c +++ b/sw/airborne/modules/sensors/airspeed_uADC.c @@ -31,13 +31,13 @@ #include "mcu_periph/uart.h" #include "pprzlink/messages.h" -#include "subsystems/datalink/downlink.h" +#include "modules/datalink/downlink.h" #include #include #if FLIGHTRECORDER_SDLOG -#include "subsystems/datalink/telemetry.h" +#include "modules/datalink/telemetry.h" #include "modules/loggers/pprzlog_tp.h" #include "modules/loggers/sdlog_chibios.h" #endif diff --git a/sw/airborne/modules/sensors/alt_srf08.c b/sw/airborne/modules/sensors/alt_srf08.c index 329ab3fab9..b74653760f 100644 --- a/sw/airborne/modules/sensors/alt_srf08.c +++ b/sw/airborne/modules/sensors/alt_srf08.c @@ -31,7 +31,7 @@ #include "alt_srf08.h" #include "mcu_periph/uart.h" #include "pprzlink/messages.h" -#include "subsystems/datalink/downlink.h" +#include "modules/datalink/downlink.h" #include "led.h" diff --git a/sw/airborne/modules/sensors/aoa_adc.c b/sw/airborne/modules/sensors/aoa_adc.c index 3da6f59113..51ebf68fb4 100644 --- a/sw/airborne/modules/sensors/aoa_adc.c +++ b/sw/airborne/modules/sensors/aoa_adc.c @@ -36,7 +36,7 @@ // Messages #include "mcu_periph/uart.h" #include "pprzlink/messages.h" -#include "subsystems/datalink/downlink.h" +#include "modules/datalink/downlink.h" /// Default offset value (assuming 0 AOA is in the middle of the range) #ifndef AOA_OFFSET diff --git a/sw/airborne/modules/sensors/aoa_pwm.c b/sw/airborne/modules/sensors/aoa_pwm.c index 071fcb93c0..b17e11b8e9 100644 --- a/sw/airborne/modules/sensors/aoa_pwm.c +++ b/sw/airborne/modules/sensors/aoa_pwm.c @@ -35,7 +35,7 @@ #include "modules/sensors/aoa_pwm.h" #include "mcu_periph/pwm_input.h" #include "pprzlink/messages.h" -#include "subsystems/datalink/downlink.h" +#include "modules/datalink/downlink.h" #include "modules/core/abi.h" #include "generated/airframe.h" @@ -123,7 +123,7 @@ struct Aoa_Pwm ssa_pwm; enum Aoa_Type aoa_send_type; #if PERIODIC_TELEMETRY -#include "subsystems/datalink/telemetry.h" +#include "modules/datalink/telemetry.h" static void send_aoa(struct transport_tx *trans, struct link_device *dev) { diff --git a/sw/airborne/modules/sensors/baro_MS5534A.c b/sw/airborne/modules/sensors/baro_MS5534A.c index 6b32f80309..07c770d3b9 100644 --- a/sw/airborne/modules/sensors/baro_MS5534A.c +++ b/sw/airborne/modules/sensors/baro_MS5534A.c @@ -31,7 +31,7 @@ #include "mcu_periph/spi.h" #include "mcu_periph/uart.h" #ifndef BARO_NO_DOWNLINK -#include "subsystems/datalink/downlink.h" +#include "modules/datalink/downlink.h" #endif #include "modules/core/abi.h" #include "firmwares/fixedwing/nav.h" diff --git a/sw/airborne/modules/sensors/baro_amsys.c b/sw/airborne/modules/sensors/baro_amsys.c index ae8a2207ec..d7842f9674 100644 --- a/sw/airborne/modules/sensors/baro_amsys.c +++ b/sw/airborne/modules/sensors/baro_amsys.c @@ -33,7 +33,7 @@ //Messages #include "mcu_periph/uart.h" #include "pprzlink/messages.h" -#include "subsystems/datalink/downlink.h" +#include "modules/datalink/downlink.h" //#include "gps.h" #define BARO_AMSYS_ADDR 0xE4 diff --git a/sw/airborne/modules/sensors/baro_bmp.c b/sw/airborne/modules/sensors/baro_bmp.c index 8ac3e839f4..a79053001f 100644 --- a/sw/airborne/modules/sensors/baro_bmp.c +++ b/sw/airborne/modules/sensors/baro_bmp.c @@ -38,7 +38,7 @@ #include "mcu_periph/uart.h" #include "modules/core/abi.h" #include "pprzlink/messages.h" -#include "subsystems/datalink/downlink.h" +#include "modules/datalink/downlink.h" #ifndef BMP_I2C_DEV diff --git a/sw/airborne/modules/sensors/baro_bmp280_i2c.c b/sw/airborne/modules/sensors/baro_bmp280_i2c.c index 94a0b89988..6b58bda45e 100644 --- a/sw/airborne/modules/sensors/baro_bmp280_i2c.c +++ b/sw/airborne/modules/sensors/baro_bmp280_i2c.c @@ -31,11 +31,11 @@ #include "modules/core/abi.h" #include "mcu_periph/uart.h" #include "pprzlink/messages.h" -#include "subsystems/datalink/downlink.h" +#include "modules/datalink/downlink.h" #include "math/pprz_isa.h" #if DOWNLINK && !defined(BMP280_SYNC_SEND) -#include "subsystems/datalink/telemetry.h" +#include "modules/datalink/telemetry.h" #endif /** default slave address */ diff --git a/sw/airborne/modules/sensors/baro_bmp3.c b/sw/airborne/modules/sensors/baro_bmp3.c index 17bb73afa6..dfac6d5a33 100644 --- a/sw/airborne/modules/sensors/baro_bmp3.c +++ b/sw/airborne/modules/sensors/baro_bmp3.c @@ -32,7 +32,7 @@ #include "modules/core/abi.h" #include "mcu_periph/uart.h" #include "pprzlink/messages.h" -#include "subsystems/datalink/downlink.h" +#include "modules/datalink/downlink.h" /** default slave address */ #ifndef BMP3_SLAVE_ADDR diff --git a/sw/airborne/modules/sensors/baro_ets.c b/sw/airborne/modules/sensors/baro_ets.c index d7182dfb15..a90c6e7a95 100644 --- a/sw/airborne/modules/sensors/baro_ets.c +++ b/sw/airborne/modules/sensors/baro_ets.c @@ -52,7 +52,7 @@ #include "mcu_periph/uart.h" #include "pprzlink/messages.h" -#include "subsystems/datalink/downlink.h" +#include "modules/datalink/downlink.h" #endif //BARO_ETS_SYNC_SEND #define BARO_ETS_ADDR 0xE8 diff --git a/sw/airborne/modules/sensors/baro_hca.c b/sw/airborne/modules/sensors/baro_hca.c index a63b723b33..bf8661b6af 100644 --- a/sw/airborne/modules/sensors/baro_hca.c +++ b/sw/airborne/modules/sensors/baro_hca.c @@ -28,7 +28,7 @@ //Messages #include "mcu_periph/uart.h" #include "pprzlink/messages.h" -#include "subsystems/datalink/downlink.h" +#include "modules/datalink/downlink.h" #define BARO_HCA_ADDR 0xF0 diff --git a/sw/airborne/modules/sensors/baro_mpl3115.c b/sw/airborne/modules/sensors/baro_mpl3115.c index 771802b4c3..d3c374ed2e 100644 --- a/sw/airborne/modules/sensors/baro_mpl3115.c +++ b/sw/airborne/modules/sensors/baro_mpl3115.c @@ -33,7 +33,7 @@ //Messages #include "mcu_periph/uart.h" #include "pprzlink/messages.h" -#include "subsystems/datalink/downlink.h" +#include "modules/datalink/downlink.h" #ifndef BARO_MPL3115_I2C_DEV diff --git a/sw/airborne/modules/sensors/baro_ms5611_i2c.c b/sw/airborne/modules/sensors/baro_ms5611_i2c.c index 7b67e3ff01..335ea656ba 100644 --- a/sw/airborne/modules/sensors/baro_ms5611_i2c.c +++ b/sw/airborne/modules/sensors/baro_ms5611_i2c.c @@ -34,7 +34,7 @@ #include "modules/core/abi.h" #include "mcu_periph/uart.h" #include "pprzlink/messages.h" -#include "subsystems/datalink/downlink.h" +#include "modules/datalink/downlink.h" #ifndef MS5611_I2C_DEV diff --git a/sw/airborne/modules/sensors/baro_ms5611_spi.c b/sw/airborne/modules/sensors/baro_ms5611_spi.c index 2e8a108249..6d162e3695 100644 --- a/sw/airborne/modules/sensors/baro_ms5611_spi.c +++ b/sw/airborne/modules/sensors/baro_ms5611_spi.c @@ -34,7 +34,7 @@ #include "modules/core/abi.h" #include "mcu_periph/uart.h" #include "pprzlink/messages.h" -#include "subsystems/datalink/downlink.h" +#include "modules/datalink/downlink.h" #ifndef MS5611_SPI_DEV #define MS5611_SPI_DEV spi1 diff --git a/sw/airborne/modules/sensors/baro_scp_i2c.c b/sw/airborne/modules/sensors/baro_scp_i2c.c index 8aecdef9a2..20eb122c91 100644 --- a/sw/airborne/modules/sensors/baro_scp_i2c.c +++ b/sw/airborne/modules/sensors/baro_scp_i2c.c @@ -14,7 +14,7 @@ #include "mcu_periph/uart.h" #include "pprzlink/messages.h" -#include "subsystems/datalink/downlink.h" +#include "modules/datalink/downlink.h" #ifndef SENSOR_SYNC_SEND #warning set SENSOR_SYNC_SEND to use baro_scp_i2c diff --git a/sw/airborne/modules/sensors/cameras/jevois.c b/sw/airborne/modules/sensors/cameras/jevois.c index 7b496911a0..5e0a7c3b20 100644 --- a/sw/airborne/modules/sensors/cameras/jevois.c +++ b/sw/airborne/modules/sensors/cameras/jevois.c @@ -29,7 +29,7 @@ #include "mcu_periph/uart.h" #include "modules/core/abi.h" #include "math/pprz_algebra_float.h" -#include "subsystems/datalink/downlink.h" +#include "modules/datalink/downlink.h" #include #include diff --git a/sw/airborne/modules/sensors/cameras/jevois_mavlink.c b/sw/airborne/modules/sensors/cameras/jevois_mavlink.c index 29f41de825..1b1f103ec3 100644 --- a/sw/airborne/modules/sensors/cameras/jevois_mavlink.c +++ b/sw/airborne/modules/sensors/cameras/jevois_mavlink.c @@ -45,7 +45,7 @@ #include "modules/core/abi_sender_ids.h" #include "std.h" -#include "subsystems/datalink/telemetry.h" +#include "modules/datalink/telemetry.h" mavlink_system_t mavlink_system; diff --git a/sw/airborne/modules/sensors/mag_hmc5843.c b/sw/airborne/modules/sensors/mag_hmc5843.c index 64d30e1bb8..bb24333243 100644 --- a/sw/airborne/modules/sensors/mag_hmc5843.c +++ b/sw/airborne/modules/sensors/mag_hmc5843.c @@ -20,7 +20,7 @@ #include "mcu_periph/i2c.h" #include "mcu_periph/uart.h" #include "pprzlink/messages.h" -#include "subsystems/datalink/downlink.h" +#include "modules/datalink/downlink.h" #include #include "../../peripherals/hmc5843.h" diff --git a/sw/airborne/modules/sensors/mag_hmc58xx.c b/sw/airborne/modules/sensors/mag_hmc58xx.c index dd219e3fdf..28c1d1dbf2 100644 --- a/sw/airborne/modules/sensors/mag_hmc58xx.c +++ b/sw/airborne/modules/sensors/mag_hmc58xx.c @@ -28,7 +28,7 @@ #include "modules/sensors/mag_hmc58xx.h" #include "mcu_periph/uart.h" #include "pprzlink/messages.h" -#include "subsystems/datalink/downlink.h" +#include "modules/datalink/downlink.h" #include "generated/airframe.h" #ifndef HMC58XX_CHAN_X diff --git a/sw/airborne/modules/sensors/mag_ist8310.c b/sw/airborne/modules/sensors/mag_ist8310.c index 027174cf5d..23e1b90d2b 100644 --- a/sw/airborne/modules/sensors/mag_ist8310.c +++ b/sw/airborne/modules/sensors/mag_ist8310.c @@ -27,7 +27,7 @@ #include "modules/sensors/mag_ist8310.h" #include "mcu_periph/uart.h" #include "pprzlink/messages.h" -#include "subsystems/datalink/downlink.h" +#include "modules/datalink/downlink.h" #include "generated/airframe.h" #ifndef IST8310_CHAN_X diff --git a/sw/airborne/modules/sensors/mag_lis3mdl.c b/sw/airborne/modules/sensors/mag_lis3mdl.c index 4716be098d..1716ba9db2 100644 --- a/sw/airborne/modules/sensors/mag_lis3mdl.c +++ b/sw/airborne/modules/sensors/mag_lis3mdl.c @@ -27,7 +27,7 @@ #include "modules/sensors/mag_lis3mdl.h" #include "mcu_periph/uart.h" #include "pprzlink/messages.h" -#include "subsystems/datalink/downlink.h" +#include "modules/datalink/downlink.h" #include "generated/airframe.h" #ifndef LIS3MDL_CHAN_X diff --git a/sw/airborne/modules/sensors/mag_pitot_uart.c b/sw/airborne/modules/sensors/mag_pitot_uart.c index 7f9e940deb..f333e01b52 100644 --- a/sw/airborne/modules/sensors/mag_pitot_uart.c +++ b/sw/airborne/modules/sensors/mag_pitot_uart.c @@ -42,7 +42,7 @@ static uint8_t mp_msg_buf[128] __attribute__((aligned)); ///< The message buf #if PERIODIC_TELEMETRY -#include "subsystems/datalink/telemetry.h" +#include "modules/datalink/telemetry.h" static void mag_pitot_raw_downlink(struct transport_tx *trans, struct link_device *dev) { diff --git a/sw/airborne/modules/sensors/mag_rm3100.c b/sw/airborne/modules/sensors/mag_rm3100.c index f41ca01ef2..507a828a2b 100644 --- a/sw/airborne/modules/sensors/mag_rm3100.c +++ b/sw/airborne/modules/sensors/mag_rm3100.c @@ -27,7 +27,7 @@ #include "modules/sensors/mag_rm3100.h" #include "mcu_periph/uart.h" #include "pprzlink/messages.h" -#include "subsystems/datalink/downlink.h" +#include "modules/datalink/downlink.h" #include "generated/airframe.h" #ifndef RM3100_CHAN_X diff --git a/sw/airborne/modules/sensors/opticflow_pmw3901.c b/sw/airborne/modules/sensors/opticflow_pmw3901.c index e92729d3e3..a3aa3e1de4 100644 --- a/sw/airborne/modules/sensors/opticflow_pmw3901.c +++ b/sw/airborne/modules/sensors/opticflow_pmw3901.c @@ -26,7 +26,7 @@ #include "modules/sensors/opticflow_pmw3901.h" #include "modules/core/abi.h" -#include "subsystems/datalink/downlink.h" +#include "modules/datalink/downlink.h" #include "generated/modules.h" #include "state.h" diff --git a/sw/airborne/modules/sensors/rpm_sensor.c b/sw/airborne/modules/sensors/rpm_sensor.c index 2771109c42..ae4d2b6c47 100644 --- a/sw/airborne/modules/sensors/rpm_sensor.c +++ b/sw/airborne/modules/sensors/rpm_sensor.c @@ -38,7 +38,7 @@ uint16_t rpm; #if PERIODIC_TELEMETRY -#include "subsystems/datalink/telemetry.h" +#include "modules/datalink/telemetry.h" static void rpm_sensor_send_motor(struct transport_tx *trans, struct link_device *dev) { diff --git a/sw/airborne/modules/sensors/temp_adc.c b/sw/airborne/modules/sensors/temp_adc.c index b5c9820a88..b68150eac3 100644 --- a/sw/airborne/modules/sensors/temp_adc.c +++ b/sw/airborne/modules/sensors/temp_adc.c @@ -28,7 +28,7 @@ #include "mcu_periph/adc.h" #include "mcu_periph/uart.h" #include "pprzlink/messages.h" -#include "subsystems/datalink/downlink.h" +#include "modules/datalink/downlink.h" #include BOARD_CONFIG bool temp_adc_sync_send = false; @@ -49,7 +49,7 @@ float get_temp(uint8_t nr) { #if PERIODIC_TELEMETRY -#include "subsystems/datalink/telemetry.h" +#include "modules/datalink/telemetry.h" #endif #define LM35 0 diff --git a/sw/airborne/modules/sonar/sonar_adc.c b/sw/airborne/modules/sonar/sonar_adc.c index a11b73f421..5a263b85af 100644 --- a/sw/airborne/modules/sonar/sonar_adc.c +++ b/sw/airborne/modules/sonar/sonar_adc.c @@ -30,7 +30,7 @@ #include "mcu_periph/uart.h" #include "pprzlink/messages.h" -#include "subsystems/datalink/downlink.h" +#include "modules/datalink/downlink.h" /** Sonar offset. * Offset value in ADC diff --git a/sw/airborne/modules/sonar/sonar_bebop.c b/sw/airborne/modules/sonar/sonar_bebop.c index f5017eab3e..d8021109b6 100644 --- a/sw/airborne/modules/sonar/sonar_bebop.c +++ b/sw/airborne/modules/sonar/sonar_bebop.c @@ -40,7 +40,7 @@ #include "modules/core/abi.h" #include #include -#include "subsystems/datalink/downlink.h"//FIXME, include only when link need +#include "modules/datalink/downlink.h"//FIXME, include only when link need #include "filters/median_filter.h" diff --git a/sw/airborne/modules/sonar/sonar_pwm.c b/sw/airborne/modules/sonar/sonar_pwm.c index fcabe2234b..f23de8f5cb 100644 --- a/sw/airborne/modules/sonar/sonar_pwm.c +++ b/sw/airborne/modules/sonar/sonar_pwm.c @@ -41,11 +41,11 @@ #include "filters/median_filter.h" #if PERIODIC_TELEMETRY -#include "subsystems/datalink/telemetry.h" +#include "modules/datalink/telemetry.h" #include "pprzlink/messages.h" #endif #ifdef SENSOR_SYNC_SEND_SONAR -#include "subsystems/datalink/downlink.h" +#include "modules/datalink/downlink.h" #endif #include "generated/airframe.h" #ifdef SITL diff --git a/sw/airborne/modules/sonar/sonar_vl53l1x.c b/sw/airborne/modules/sonar/sonar_vl53l1x.c index e68ed286b8..0d4bc296cd 100644 --- a/sw/airborne/modules/sonar/sonar_vl53l1x.c +++ b/sw/airborne/modules/sonar/sonar_vl53l1x.c @@ -30,7 +30,7 @@ #include "state.h" #endif -#include "subsystems/datalink/downlink.h" +#include "modules/datalink/downlink.h" #ifndef SONAR_VL53L1X_I2C_ADDR diff --git a/sw/airborne/modules/stereocam/droplet/stereocam_droplet.c b/sw/airborne/modules/stereocam/droplet/stereocam_droplet.c index 684efec4cc..89f6832a70 100644 --- a/sw/airborne/modules/stereocam/droplet/stereocam_droplet.c +++ b/sw/airborne/modules/stereocam/droplet/stereocam_droplet.c @@ -57,7 +57,7 @@ struct link_device *xdev = STEREO_PORT; #define DOWNLINK_DEVICE DOWNLINK_AP_DEVICE #endif #include "pprzlink/messages.h" -#include "subsystems/datalink/downlink.h" +#include "modules/datalink/downlink.h" #include "led.h" diff --git a/sw/airborne/modules/stereocam/nav_line_avoid/avoid_navigation.c b/sw/airborne/modules/stereocam/nav_line_avoid/avoid_navigation.c index 6a9892d29f..1e5022e4a5 100644 --- a/sw/airborne/modules/stereocam/nav_line_avoid/avoid_navigation.c +++ b/sw/airborne/modules/stereocam/nav_line_avoid/avoid_navigation.c @@ -45,7 +45,7 @@ #define DOWNLINK_DEVICE DOWNLINK_AP_DEVICE #endif #include "pprzlink/messages.h" -#include "subsystems/datalink/downlink.h" +#include "modules/datalink/downlink.h" #include "led.h" diff --git a/sw/airborne/modules/stereocam/stereocam.c b/sw/airborne/modules/stereocam/stereocam.c index 46b927fe07..912bf79450 100644 --- a/sw/airborne/modules/stereocam/stereocam.c +++ b/sw/airborne/modules/stereocam/stereocam.c @@ -29,7 +29,7 @@ #include "modules/stereocam/stereocam.h" #include "mcu_periph/uart.h" -#include "subsystems/datalink/telemetry.h" +#include "modules/datalink/telemetry.h" #include "pprzlink/messages.h" #include "pprzlink/intermcu_msg.h" diff --git a/sw/airborne/modules/stereocam/stereocam_follow_me/follow_me.c b/sw/airborne/modules/stereocam/stereocam_follow_me/follow_me.c index 4723b30ab5..fa6675de14 100644 --- a/sw/airborne/modules/stereocam/stereocam_follow_me/follow_me.c +++ b/sw/airborne/modules/stereocam/stereocam_follow_me/follow_me.c @@ -16,7 +16,7 @@ #include "state.h" #include "navigation.h" -#include "subsystems/datalink/telemetry.h" +#include "modules/datalink/telemetry.h" #include "generated/flight_plan.h" #ifndef STEREOCAM_FOLLOW_ME_USE_OPTITRACK diff --git a/sw/airborne/modules/system_identification/sys_id_chirp.c b/sw/airborne/modules/system_identification/sys_id_chirp.c index 2060f3c086..de122f1253 100644 --- a/sw/airborne/modules/system_identification/sys_id_chirp.c +++ b/sw/airborne/modules/system_identification/sys_id_chirp.c @@ -28,7 +28,7 @@ #include "sys_id_chirp.h" #include "pprz_chirp.h" -#include "subsystems/datalink/telemetry.h" +#include "modules/datalink/telemetry.h" #include "generated/airframe.h" #include "mcu_periph/sys_time.h" #include "filters/low_pass_filter.h" diff --git a/sw/airborne/modules/telemetry/telemetry_intermcu_ap.c b/sw/airborne/modules/telemetry/telemetry_intermcu_ap.c index 0d1a7e8d68..9ef17eb72b 100644 --- a/sw/airborne/modules/telemetry/telemetry_intermcu_ap.c +++ b/sw/airborne/modules/telemetry/telemetry_intermcu_ap.c @@ -31,8 +31,8 @@ #include "pprzlink/intermcu_msg.h" #include "pprzlink/short_transport.h" #include "generated/periodic_telemetry.h" -#include "subsystems/datalink/telemetry.h" -#include "subsystems/datalink/datalink.h" +#include "modules/datalink/telemetry.h" +#include "modules/datalink/datalink.h" /* Telemetry InterMCU throughput */ struct telemetry_intermcu_t telemetry_intermcu; diff --git a/sw/airborne/modules/telemetry/telemetry_intermcu_fbw.c b/sw/airborne/modules/telemetry/telemetry_intermcu_fbw.c index 5df8d1d157..a4a80d2d75 100644 --- a/sw/airborne/modules/telemetry/telemetry_intermcu_fbw.c +++ b/sw/airborne/modules/telemetry/telemetry_intermcu_fbw.c @@ -28,7 +28,7 @@ #include "subsystems/intermcu.h" #include "pprzlink/pprz_transport.h" #include "pprzlink/intermcu_msg.h" -#include "subsystems/datalink/telemetry.h" +#include "modules/datalink/telemetry.h" #include "firmwares/rotorcraft/main_fbw.h" #define MSG_SIZE 256 diff --git a/sw/airborne/modules/uav_recovery/uav_recovery.c b/sw/airborne/modules/uav_recovery/uav_recovery.c index 0215854ac4..365754c72f 100644 --- a/sw/airborne/modules/uav_recovery/uav_recovery.c +++ b/sw/airborne/modules/uav_recovery/uav_recovery.c @@ -32,7 +32,7 @@ #include "generated/flight_plan.h" #include "generated/airframe.h" #include "inter_mcu.h" -#include "subsystems/datalink/datalink.h" +#include "modules/datalink/datalink.h" #include "modules/multi/traffic_info.h" #include "uav_recovery.h" @@ -79,7 +79,7 @@ bool deploy_parachute_var = 0; bool land_direction = 0; #if PERIODIC_TELEMETRY -#include "subsystems/datalink/telemetry.h" +#include "modules/datalink/telemetry.h" static void send_wind_info(struct transport_tx *trans, struct link_device *dev) { diff --git a/sw/airborne/peripherals/cc2500.c b/sw/airborne/peripherals/cc2500.c index d45a5f8d7d..f518b17cef 100644 --- a/sw/airborne/peripherals/cc2500.c +++ b/sw/airborne/peripherals/cc2500.c @@ -22,7 +22,7 @@ * Boston, MA 02111-1307, USA. */ -#include "subsystems/datalink/downlink.h" // TODO remove before PR +#include "modules/datalink/downlink.h" // TODO remove before PR #include "cc2500.h" @@ -63,7 +63,7 @@ static void cc2500_delayMicroseconds(uint32_t us) { float start = get_sys_time_float(); while(get_sys_time_float() < start + (us / 1.0e6)) ; } -// Fix naming conflict with subsystems/radio_control/cc2500_frsky delayMicroseconds +// Fix naming conflict with modules/radio_control/cc2500_frsky delayMicroseconds #ifdef delayMicroseconds #undef delayMicroseconds #endif diff --git a/sw/airborne/peripherals/cyrf6936.c b/sw/airborne/peripherals/cyrf6936.c index 7f2a38826f..994d8bbe96 100644 --- a/sw/airborne/peripherals/cyrf6936.c +++ b/sw/airborne/peripherals/cyrf6936.c @@ -32,7 +32,7 @@ #include "mcu_periph/uart.h" #include "pprzlink/messages.h" -#include "subsystems/datalink/downlink.h" +#include "modules/datalink/downlink.h" /* Static functions used in the different statuses */ static bool cyrf6936_write_register(struct Cyrf6936 *cyrf, const uint8_t addr, const uint8_t data); diff --git a/sw/airborne/pprz_debug.h b/sw/airborne/pprz_debug.h index 97c04baa7e..f080ce4b07 100644 --- a/sw/airborne/pprz_debug.h +++ b/sw/airborne/pprz_debug.h @@ -31,7 +31,7 @@ #include "std.h" #include "mcu_periph/uart.h" #include "pprzlink/messages.h" -#include "subsystems/datalink/downlink.h" +#include "modules/datalink/downlink.h" extern uint8_t pprz_debug_mod; extern uint8_t pprz_debug_err; diff --git a/sw/airborne/subsystems/intermcu/intermcu_ap.c b/sw/airborne/subsystems/intermcu/intermcu_ap.c index d79ecb9ea4..9c80631b89 100644 --- a/sw/airborne/subsystems/intermcu/intermcu_ap.c +++ b/sw/airborne/subsystems/intermcu/intermcu_ap.c @@ -56,7 +56,7 @@ static struct GpsState gps_imcu; #if PERIODIC_TELEMETRY -#include "subsystems/datalink/telemetry.h" +#include "modules/datalink/telemetry.h" /* Send FBW status */ static void send_status(struct transport_tx *trans, struct link_device *dev) diff --git a/sw/airborne/subsystems/navigation/waypoints.c b/sw/airborne/subsystems/navigation/waypoints.c index 7bb39c46ad..3508996872 100644 --- a/sw/airborne/subsystems/navigation/waypoints.c +++ b/sw/airborne/subsystems/navigation/waypoints.c @@ -25,7 +25,7 @@ #include "subsystems/navigation/waypoints.h" #include "state.h" -#include "subsystems/datalink/downlink.h" +#include "modules/datalink/downlink.h" #include "generated/flight_plan.h" const uint8_t nb_waypoint = NB_WAYPOINT; diff --git a/sw/airborne/test/chibios_test_telemetry.c b/sw/airborne/test/chibios_test_telemetry.c index b70fd584f8..db49efa012 100644 --- a/sw/airborne/test/chibios_test_telemetry.c +++ b/sw/airborne/test/chibios_test_telemetry.c @@ -37,7 +37,7 @@ #include "mcu.h" #include "mcu_periph/sys_time.h" #include "mcu_periph/uart.h" -#include "subsystems/datalink/downlink.h" +#include "modules/datalink/downlink.h" #include "led.h" /* diff --git a/sw/airborne/test/mcu_periph/test_adc.c b/sw/airborne/test/mcu_periph/test_adc.c index ad61e374d1..bae00a9a5a 100644 --- a/sw/airborne/test/mcu_periph/test_adc.c +++ b/sw/airborne/test/mcu_periph/test_adc.c @@ -27,7 +27,7 @@ #include "mcu_periph/sys_time.h" #include "led.h" #include "mcu_periph/adc.h" -#include "subsystems/datalink/downlink.h" +#include "modules/datalink/downlink.h" int main_periodic(void); static inline void main_init(void); diff --git a/sw/airborne/test/peripherals/test_ami601.c b/sw/airborne/test/peripherals/test_ami601.c index 8e84fa231a..0b4f628eac 100644 --- a/sw/airborne/test/peripherals/test_ami601.c +++ b/sw/airborne/test/peripherals/test_ami601.c @@ -26,7 +26,7 @@ #include "mcu_periph/sys_time.h" #include "led.h" #define DATALINK_C -#include "subsystems/datalink/downlink.h" +#include "modules/datalink/downlink.h" #include "mcu_periph/i2c.h" #include "peripherals/ami601.h" diff --git a/sw/airborne/test/peripherals/test_lis302dl_spi.c b/sw/airborne/test/peripherals/test_lis302dl_spi.c index f100509141..295df7a24a 100644 --- a/sw/airborne/test/peripherals/test_lis302dl_spi.c +++ b/sw/airborne/test/peripherals/test_lis302dl_spi.c @@ -29,7 +29,7 @@ #include "mcu.h" #include "mcu_periph/sys_time.h" #define DATALINK_C -#include "subsystems/datalink/downlink.h" +#include "modules/datalink/downlink.h" #include "led.h" #include "peripherals/lis302dl_spi.h" diff --git a/sw/airborne/test/peripherals/test_ms2100.c b/sw/airborne/test/peripherals/test_ms2100.c index 38979184fc..de330942e4 100644 --- a/sw/airborne/test/peripherals/test_ms2100.c +++ b/sw/airborne/test/peripherals/test_ms2100.c @@ -24,7 +24,7 @@ #include "mcu.h" #include "mcu_periph/sys_time.h" #define DATALINK_C -#include "subsystems/datalink/downlink.h" +#include "modules/datalink/downlink.h" #include "modules/datalink/pprz_dl.h" #include "peripherals/ms2100.h" #include "led.h" diff --git a/sw/airborne/test/subsystems/test_ahrs.c b/sw/airborne/test/subsystems/test_ahrs.c index 4f7c08328a..d8ffb6f0da 100644 --- a/sw/airborne/test/subsystems/test_ahrs.c +++ b/sw/airborne/test/subsystems/test_ahrs.c @@ -40,11 +40,11 @@ #include "led.h" #include "mcu_periph/i2c.h" #include "pprzlink/messages.h" -#include "subsystems/datalink/downlink.h" -#include "subsystems/datalink/telemetry.h" +#include "modules/datalink/downlink.h" +#include "modules/datalink/telemetry.h" #include "modules/datalink/pprz_dl.h" -#include "subsystems/datalink/datalink.h" +#include "modules/datalink/datalink.h" #include "generated/settings.h" #include "generated/modules.h" diff --git a/sw/airborne/test/subsystems/test_imu.c b/sw/airborne/test/subsystems/test_imu.c index 972731fd92..69ceb2e8da 100644 --- a/sw/airborne/test/subsystems/test_imu.c +++ b/sw/airborne/test/subsystems/test_imu.c @@ -34,7 +34,7 @@ #include "led.h" #include "mcu_periph/i2c.h" #include "pprzlink/messages.h" -#include "subsystems/datalink/downlink.h" +#include "modules/datalink/downlink.h" #include "modules/datalink/pprz_dl.h" #include "modules/imu/imu.h" diff --git a/sw/airborne/test/subsystems/test_radio_control.c b/sw/airborne/test/subsystems/test_radio_control.c index a26eb37ebd..14b85ea81f 100644 --- a/sw/airborne/test/subsystems/test_radio_control.c +++ b/sw/airborne/test/subsystems/test_radio_control.c @@ -24,7 +24,7 @@ #include "mcu.h" #include "mcu_periph/sys_time.h" #define DATALINK_C -#include "subsystems/datalink/downlink.h" +#include "modules/datalink/downlink.h" #include "modules/datalink/pprz_dl.h" #include "modules/radio_control/radio_control.h" diff --git a/sw/airborne/test/subsystems/test_settings.c b/sw/airborne/test/subsystems/test_settings.c index 75eaa2b23f..1ecc608540 100644 --- a/sw/airborne/test/subsystems/test_settings.c +++ b/sw/airborne/test/subsystems/test_settings.c @@ -32,8 +32,8 @@ #include "std.h" #include "mcu.h" #include "mcu_periph/sys_time.h" -#include "subsystems/datalink/downlink.h" -#include "subsystems/datalink/datalink.h" +#include "modules/datalink/downlink.h" +#include "modules/datalink/datalink.h" #include "modules/datalink/pprz_dl.h" #include "modules/core/settings.h" #include "generated/settings.h" diff --git a/sw/airborne/test/test_actuators_pwm.c b/sw/airborne/test/test_actuators_pwm.c index baa8092af7..6cbf46c324 100644 --- a/sw/airborne/test/test_actuators_pwm.c +++ b/sw/airborne/test/test_actuators_pwm.c @@ -40,8 +40,8 @@ #include "generated/airframe.h" #include "generated/settings.h" -#include "subsystems/datalink/datalink.h" -#include "subsystems/datalink/downlink.h" +#include "modules/datalink/datalink.h" +#include "modules/datalink/downlink.h" #include "modules/datalink/pprz_dl.h" #include "mcu.h" diff --git a/sw/airborne/test/test_baro_board.c b/sw/airborne/test/test_baro_board.c index 7a02dc6e0b..b141e7f615 100644 --- a/sw/airborne/test/test_baro_board.c +++ b/sw/airborne/test/test_baro_board.c @@ -32,7 +32,7 @@ #include "led.h" #define DATALINK_C -#include "subsystems/datalink/downlink.h" +#include "modules/datalink/downlink.h" #include "modules/datalink/pprz_dl.h" #include "modules/sensors/baro.h" diff --git a/sw/airborne/test/test_can.c b/sw/airborne/test/test_can.c index b8f03dc21d..45be2913ef 100644 --- a/sw/airborne/test/test_can.c +++ b/sw/airborne/test/test_can.c @@ -28,7 +28,7 @@ #include "mcu_periph/sys_time.h" #include "led.h" #define DATALINK_C -#include "subsystems/datalink/downlink.h" +#include "modules/datalink/downlink.h" #include "modules/datalink/pprz_dl.h" #include "mcu_periph/can.h" diff --git a/sw/airborne/test/test_datalink.c b/sw/airborne/test/test_datalink.c index b968bab8d5..94fdb3d90e 100644 --- a/sw/airborne/test/test_datalink.c +++ b/sw/airborne/test/test_datalink.c @@ -29,8 +29,8 @@ #include BOARD_CONFIG #include "mcu.h" #include "mcu_periph/sys_time.h" -#include "subsystems/datalink/downlink.h" -#include "subsystems/datalink/datalink.h" +#include "modules/datalink/downlink.h" +#include "modules/datalink/datalink.h" #include "modules/datalink/pprz_dl.h" static inline void main_init(void); diff --git a/sw/airborne/test/test_manual.c b/sw/airborne/test/test_manual.c index dd3efa6c7f..2b0a4c8931 100644 --- a/sw/airborne/test/test_manual.c +++ b/sw/airborne/test/test_manual.c @@ -30,8 +30,8 @@ #include "generated/airframe.h" #include "generated/settings.h" -#include "subsystems/datalink/datalink.h" -#include "subsystems/datalink/downlink.h" +#include "modules/datalink/datalink.h" +#include "modules/datalink/downlink.h" #include "modules/datalink/pprz_dl.h" #include "mcu.h" diff --git a/sw/airborne/test/test_math_trig_compressed.c b/sw/airborne/test/test_math_trig_compressed.c index 2bd02e634e..f3e6e2cacb 100644 --- a/sw/airborne/test/test_math_trig_compressed.c +++ b/sw/airborne/test/test_math_trig_compressed.c @@ -81,7 +81,7 @@ #include BOARD_CONFIG #include "mcu.h" #include "mcu_periph/sys_time.h" -#include "subsystems/datalink/downlink.h" +#include "modules/datalink/downlink.h" #include "led.h" #include "math/pprz_trig_int.h" #include "math/pprz_algebra_int.h" diff --git a/sw/airborne/test/test_module.c b/sw/airborne/test/test_module.c index 59f26043e3..0dab604a46 100644 --- a/sw/airborne/test/test_module.c +++ b/sw/airborne/test/test_module.c @@ -35,7 +35,7 @@ #include "mcu_periph/sys_time.h" #include "led.h" -#include "subsystems/datalink/downlink.h" +#include "modules/datalink/downlink.h" #include "generated/modules.h" #include "modules/core/abi.h" diff --git a/sw/airborne/test/test_telemetry.c b/sw/airborne/test/test_telemetry.c index fbddbcb7fd..ba6d0b40ed 100644 --- a/sw/airborne/test/test_telemetry.c +++ b/sw/airborne/test/test_telemetry.c @@ -30,7 +30,7 @@ #include BOARD_CONFIG #include "mcu.h" #include "mcu_periph/sys_time.h" -#include "subsystems/datalink/downlink.h" +#include "modules/datalink/downlink.h" #include "modules/datalink/pprz_dl.h" #include "led.h" diff --git a/sw/simulator/nps/nps_autopilot_fixedwing.c b/sw/simulator/nps/nps_autopilot_fixedwing.c index cd50437944..db66ef7bd1 100644 --- a/sw/simulator/nps/nps_autopilot_fixedwing.c +++ b/sw/simulator/nps/nps_autopilot_fixedwing.c @@ -53,11 +53,11 @@ #include "autopilot.h" // for datalink_time hack -#include "subsystems/datalink/datalink.h" +#include "modules/datalink/datalink.h" #if USE_SONAR // for sonar/lidar agl -#include "subsystems/datalink/downlink.h" +#include "modules/datalink/downlink.h" #endif struct NpsAutopilot nps_autopilot; diff --git a/sw/simulator/nps/nps_autopilot_rotorcraft.c b/sw/simulator/nps/nps_autopilot_rotorcraft.c index 0ff4f588f6..5d74aeb4a5 100644 --- a/sw/simulator/nps/nps_autopilot_rotorcraft.c +++ b/sw/simulator/nps/nps_autopilot_rotorcraft.c @@ -46,10 +46,10 @@ #include "modules/core/abi.h" #include "pprzlink/messages.h" -#include "subsystems/datalink/downlink.h" +#include "modules/datalink/downlink.h" // for datalink_time hack -#include "subsystems/datalink/datalink.h" +#include "modules/datalink/datalink.h" #include "modules/actuators/actuators.h" struct NpsAutopilot nps_autopilot; diff --git a/sw/simulator/nps/nps_ivy.c b/sw/simulator/nps/nps_ivy.c index 4f6513d658..826fc48cd4 100644 --- a/sw/simulator/nps/nps_ivy.c +++ b/sw/simulator/nps/nps_ivy.c @@ -20,7 +20,7 @@ #include "generated/settings.h" #include "pprzlink/dl_protocol.h" -#include "subsystems/datalink/downlink.h" +#include "modules/datalink/downlink.h" #if USE_GPS #include "modules/gps/gps.h" diff --git a/sw/tools/generators/gen_periodic.ml b/sw/tools/generators/gen_periodic.ml index f7fcaf8692..37c0869c9b 100644 --- a/sw/tools/generators/gen_periodic.ml +++ b/sw/tools/generators/gen_periodic.ml @@ -200,7 +200,7 @@ let generate = fun telemetry out_file -> fprintf out "#define _VAR_PERIODIC_H_\n\n"; fprintf out "#include \"std.h\"\n"; fprintf out "#include \"generated/airframe.h\"\n"; - fprintf out "#include \"subsystems/datalink/telemetry_common.h\"\n"; + fprintf out "#include \"modules/datalink/telemetry_common.h\"\n"; fprintf out "\n"; fprintf out "#ifndef TELEMETRY_FREQUENCY\n"; fprintf out "#ifdef PERIODIC_FREQUENCY\n"; diff --git a/tests/modules/generated/periodic_telemetry.h b/tests/modules/generated/periodic_telemetry.h index 841bea7a2f..963703ba1b 100644 --- a/tests/modules/generated/periodic_telemetry.h +++ b/tests/modules/generated/periodic_telemetry.h @@ -3,7 +3,7 @@ #include "std.h" #include "generated/airframe.h" -#include "subsystems/datalink/telemetry_common.h" +#include "modules/datalink/telemetry_common.h" #define TELEMETRY_FREQUENCY 60 #define TELEMETRY_PPRZ_NB_MSG 1 diff --git a/tests/modules/test_arch/subsystems/datalink/superbitrf.h b/tests/modules/test_arch/modules/datalink/superbitrf.h similarity index 98% rename from tests/modules/test_arch/subsystems/datalink/superbitrf.h rename to tests/modules/test_arch/modules/datalink/superbitrf.h index 330f6ffd45..ae2931ce76 100644 --- a/tests/modules/test_arch/subsystems/datalink/superbitrf.h +++ b/tests/modules/test_arch/modules/datalink/superbitrf.h @@ -20,7 +20,7 @@ */ /** - * @file subsystems/datalink/superbitrf.h + * @file modules/datalink/superbitrf.h * DSM2 and DSMX datalink implementation for the cyrf6936 2.4GHz radio chip trough SPI * * Dummy for tests so you don't have to remove the superbitrf.xml settings file.