fix some bug reported by TravisCI

conf/airframes/examples/demo.xml

@@ -65,7 +65,7 @@ demo4.srcs += $(SRC_ARCH)/armVIC.c
 demo4.CFLAGS += -DUSE_UART0 -DUART0_BAUD=B38400
 demo4.srcs += $(SRC_ARCH)/mcu_periph/uart_arch.c
 
-demo4.CFLAGS += -DDOWNLINK -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_DEVICE=UART0
+demo4.CFLAGS += -DDOWNLINK -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_DEVICE=uart0
 demo4.srcs += subsystems/datalink/downlink.c subsystems/datalink/pprz_transport.c
 
 #
@@ -88,7 +88,7 @@ demo5.srcs += $(SRC_ARCH)/armVIC.c
 demo5.CFLAGS += -DUSE_UART0 -DUART0_BAUD=B38400
 demo5.srcs += $(SRC_ARCH)/mcu_periph/uart_arch.c
 
-demo5.CFLAGS += -DDOWNLINK -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_DEVICE=UART0
+demo5.CFLAGS += -DDOWNLINK -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_DEVICE=uart0
 demo5.srcs += subsystems/datalink/downlink.c subsystems/datalink/pprz_transport.c
 
 demo5.CFLAGS += -DDATALINK=PPRZ -DPPRZ_UART=UART0
@@ -114,7 +114,7 @@ demo6.CFLAGS += -DUSE_USB_SERIAL
 demo6.srcs += $(SRC_ARCH)/lpcusb/usbhw_lpc.c $(SRC_ARCH)/lpcusb/usbcontrol.c $(SRC_ARCH)/lpcusb/usbstdreq.c $(SRC_ARCH)/lpcusb/usbinit.c
 demo6.srcs += $(SRC_ARCH)/usb_ser_hw.c
 
-demo6.CFLAGS += -DDOWNLINK -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_DEVICE=UsbS
+demo6.CFLAGS += -DDOWNLINK -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_DEVICE=usb_serial
 demo6.srcs += subsystems/datalink/downlink.c subsystems/datalink/pprz_transport.c
 
 //demo6.CFLAGS += -DDATALINK=PPRZ -DPPRZ_UART=UART0
@@ -137,7 +137,7 @@ test_spk.CFLAGS += -DUSE_LED
 test_spk.srcs += $(SRC_ARCH)/armVIC.c
 
 test_spk.CFLAGS += -DDOWNLINK -DDOWNLINK_TRANSPORT=PprzTransport -DUSE_USB_SERIAL
-test_spk.CFLAGS += -DDOWNLINK_DEVICE=UsbS -DPPRZ_UART=UsbS -DDATALINK=PPRZ
+test_spk.CFLAGS += -DDOWNLINK_DEVICE=usb_serial -DPPRZ_UART=UsbS -DDATALINK=PPRZ
 test_spk.srcs += subsystems/datalink/downlink.c $(SRC_ARCH)/usb_ser_hw.c subsystems/datalink/pprz_transport.c
 test_spk.srcs += $(SRC_ARCH)/lpcusb/usbhw_lpc.c $(SRC_ARCH)/lpcusb/usbcontrol.c
 test_spk.srcs += $(SRC_ARCH)/lpcusb/usbstdreq.c $(SRC_ARCH)/lpcusb/usbinit.c

conf/airframes/turntable.xml

@@ -26,7 +26,7 @@ main.srcs += mcu_periph/sys_time.c $(MB)/turntable_systime.c
 main.CFLAGS += -DUSE_UART0 -DUART0_BAUD=B115200
 main.srcs += mcu_periph/uart.c
 main.srcs += $(SRC_ARCH)/mcu_periph/uart_arch.c
-main.CFLAGS += -DDOWNLINK -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_DEVICE=UART0
+main.CFLAGS += -DDOWNLINK -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_DEVICE=uart0
 
 main.srcs += subsystems/datalink/downlink.c subsystems/datalink/pprz_transport.c
 

conf/airframes/turntable_usb.xml

@@ -27,7 +27,7 @@ main.CFLAGS += -DUSE_USB_SERIAL
 main.srcs += $(SRC_ARCH)/usb_ser_hw.c
 main.srcs += $(SRC_ARCH)/lpcusb/usbhw_lpc.c $(SRC_ARCH)/lpcusb/usbinit.c
 main.srcs += $(SRC_ARCH)/lpcusb/usbcontrol.c $(SRC_ARCH)/lpcusb/usbstdreq.c
-main.CFLAGS += -DDOWNLINK -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_DEVICE=UsbS
+main.CFLAGS += -DDOWNLINK -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_DEVICE=usb_serial
 
 main.srcs += subsystems/datalink/downlink.c subsystems/datalink/pprz_transport.c
 

conf/airframes/wind_tunnel.xml

@@ -24,7 +24,7 @@ ap.srcs += $(SRC_ARCH)/armVIC.c
 ap.CFLAGS += -DUSE_UART0 -DUART0_BAUD=B38400
 ap.srcs += $(SRC_ARCH)/mcu_periph/uart_arch.c
 
-ap.CFLAGS += -DDOWNLINK -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_DEVICE=UART0
+ap.CFLAGS += -DDOWNLINK -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_DEVICE=uart0
 ap.srcs += subsystems/datalink/downlink.c subsystems/datalink/pprz_transport.c
 
 ap.CFLAGS += -DDATALINK=PPRZ -DPPRZ_UART=UART0
@@ -54,7 +54,7 @@ mb.srcs += $(SRC_ARCH)/armVIC.c
 mb.CFLAGS += -DUSE_UART0 -DUART0_BAUD=B38400
 mb.srcs += $(SRC_ARCH)/mcu_periph/uart_arch.c
 
-mb.CFLAGS += -DDOWNLINK -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_DEVICE=UART0
+mb.CFLAGS += -DDOWNLINK -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_DEVICE=uart0
 mb.srcs += subsystems/datalink/downlink.c subsystems/datalink/pprz_transport.c
 
 mb.CFLAGS += -DDATALINK=PPRZ -DPPRZ_UART=UART0

conf/firmwares/setup.makefile

@@ -85,8 +85,9 @@ setup_actuators.CFLAGS += -DUSE_$(MODEM_PORT)
 setup_actuators.CFLAGS += -D$(MODEM_PORT)_BAUD=$(MODEM_BAUD)
 setup_actuators.srcs   += mcu_periph/uart.c $(SRC_ARCH)/mcu_periph/uart_arch.c
 
-setup_actuators.CFLAGS += -DDOWNLINK -DDOWNLINK_DEVICE=$(MODEM_PORT) -DPPRZ_UART=$(MODEM_PORT)
+SETUP_ACTUATORS_MODEM_PORT_LOWER=$(shell echo $(MODEM_PORT) | tr A-Z a-z)
-setup_actuators.CFLAGS += -DDOWNLINK_TRANSPORT=PprzTransport -DDATALINK=PPRZ
+setup_actuators.CFLAGS += -DDOWNLINK -DDOWNLINK_DEVICE=$(SETUP_ACTUATORS_MODEM_PORT_LOWER) -DPPRZ_UART=$(MODEM_PORT)
+setup_actuators.CFLAGS += -DDOWNLINK_TRANSPORT=pprz_tp -DDATALINK=PPRZ
 setup_actuators.srcs += subsystems/datalink/downlink.c subsystems/datalink/pprz_transport.c
 # we actually don't really use the generated periodic telemetry in this firmware,
 # but still needed to register e.g. the UART_ERRORS message #if DOWNLINK

conf/firmwares/subsystems/rotorcraft/telemetry_xbee_api.makefile

@@ -6,10 +6,12 @@
 # MODEM_BAUD
 #
 
+XBEE_MODEM_PORT_LOWER=$(shell echo $(MODEM_PORT) | tr A-Z a-z)
+
 ap.CFLAGS += -DUSE_$(MODEM_PORT)
 ap.CFLAGS += -D$(MODEM_PORT)_BAUD=$(MODEM_BAUD) -DXBEE_BAUD=$(MODEM_BAUD)
 
-ap.CFLAGS += -DDOWNLINK -DPERIODIC_TELEMETRY -DDOWNLINK_DEVICE=$(MODEM_PORT) -DXBEE_UART=$(MODEM_PORT)
+ap.CFLAGS += -DDOWNLINK -DPERIODIC_TELEMETRY -DDOWNLINK_DEVICE=$(XBEE_MODEM_PORT_LOWER) -DXBEE_UART=$(MODEM_PORT)
-ap.CFLAGS += -DDOWNLINK_TRANSPORT=XBeeTransport -DDATALINK=XBEE -DDefaultPeriodic='&telemetry_Main'
+ap.CFLAGS += -DDOWNLINK_TRANSPORT=xbee_tp -DDATALINK=XBEE -DDefaultPeriodic='&telemetry_Main'
 ap.srcs += subsystems/datalink/downlink.c subsystems/datalink/xbee.c subsystems/datalink/telemetry.c
 ap.srcs += $(SRC_FIRMWARE)/datalink.c $(SRC_FIRMWARE)/rotorcraft_telemetry.c

conf/firmwares/test_progs.makefile

@@ -65,8 +65,9 @@ COMMON_TEST_SRCS += $(SRC_ARCH)/led_hw.c
 COMMON_TEST_SRCS += $(SRC_ARCH)/mcu_periph/gpio_arch.c
 endif
 
+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)
-COMMON_TELEMETRY_CFLAGS += -DDOWNLINK -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_DEVICE=$(MODEM_PORT)
+COMMON_TELEMETRY_CFLAGS += -DDOWNLINK -DDOWNLINK_TRANSPORT=pprz_tp -DDOWNLINK_DEVICE=$(COMMON_TELEMETRY_MODEM_PORT_LOWER)
 COMMON_TELEMETRY_CFLAGS += -DDefaultPeriodic='&telemetry_Main'
 COMMON_TELEMETRY_CFLAGS += -DDATALINK=PPRZ  -DPPRZ_UART=$(MODEM_PORT)
 COMMON_TELEMETRY_SRCS    = mcu_periph/uart.c

conf/messages.xml

@@ -551,7 +551,7 @@
     <field name="start_angle" type="float" unit="deg"/>
     <field name="angle" type="float" unit="deg"/>
     <field name="last_block" type="float"/>
-    <field name="count" type="int16" unit=""/>
+    <field name="count" type="uint16" unit=""/>
     <field name="shutter" type="uint8" unit="s"/>
   </message>
 

conf/modules/extra_dl.xml

@@ -15,7 +15,7 @@
 EXTRA_DL_PORT_LOWER = $(shell echo $(EXTRA_DL_PORT) | tr A-Z a-z)
     </raw>
     <define name="EXTRA_DOWNLINK_DEVICE" value="$(EXTRA_DL_PORT_LOWER)"/>
-    <define name="EXTRA_PPRZ_UART" value="$(EXTRA_DL_PORT_LOWER)"/>
+    <define name="EXTRA_PPRZ_UART" value="$(EXTRA_DL_PORT)"/>
     <define name="USE_$(EXTRA_DL_PORT)"/>
     <define name="$(EXTRA_DL_PORT)_BAUD" value="$(EXTRA_DL_BAUD)"/>
     <file name="extra_pprz_dl.c"/>

sw/airborne/modules/digital_cam/dc.c

@@ -111,8 +111,9 @@ void dc_send_shot_position(void)
 uint8_t dc_info(void) {
 #ifdef DOWNLINK_SEND_DC_INFO
   float course = DegOfRad(stateGetNedToBodyEulers_f()->psi);
+  int16_t mode = dc_autoshoot;
   DOWNLINK_SEND_DC_INFO(DefaultChannel, DefaultDevice,
-                        &dc_autoshoot,
+                        &mode,
                         &stateGetPositionEnu_f()->x,
                         &stateGetPositionEnu_f()->y,
                         &course,

sw/airborne/modules/nav/nav_catapult.c

@@ -197,7 +197,7 @@ bool_t nav_catapult_run(uint8_t _to, uint8_t _climb)
     WaypointX(_climb) = nav_catapult_x + (dir_x / dir_L) * 300;
     WaypointY(_climb) = nav_catapult_y + (dir_y / dir_L) * 300;
 
-    DownlinkSendWp(DefaultChannel, DefaultDevice, _climb);
+    DownlinkSendWp(DefaultChannel, DefaultDevice(DefaultChannel).trans_tx, DefaultChannel, DefaultDevice(DefaultDevice).device, _climb);
   }
 
 

sw/airborne/subsystems/datalink/ivy_transport.c

@@ -68,7 +68,11 @@ static void put_bytes(struct ivy_transport *trans, struct device *dev __attribut
         i += 4;
         break;
       case DL_TYPE_UINT64:
+#if __WORDSIZE == 64
+        trans->ivy_p += sprintf(trans->ivy_p, "%lu", (uint64_t)(*((uint64_t*)(b+i))));
+#else
         trans->ivy_p += sprintf(trans->ivy_p, "%llu", (uint64_t)(*((uint64_t*)(b+i))));
+#endif
         i += 8;
         break;
       case DL_TYPE_INT8:
@@ -84,7 +88,11 @@ static void put_bytes(struct ivy_transport *trans, struct device *dev __attribut
         i += 4;
         break;
       case DL_TYPE_INT64:
-        trans->ivy_p += sprintf(trans->ivy_p, "%lld", (int64_t)(*((int64_t*)(b+i))));
+#if __WORDSIZE == 64
+        trans->ivy_p += sprintf(trans->ivy_p, "%ld", (uint64_t)(*((uint64_t*)(b+i))));
+#else
+        trans->ivy_p += sprintf(trans->ivy_p, "%lld", (uint64_t)(*((uint64_t*)(b+i))));
+#endif
         i += 8;
         break;
       case DL_TYPE_FLOAT:

sw/tools/generators/gen_periodic.ml

@@ -212,7 +212,7 @@ let _ =
       fprintf out_h "extern struct pprz_telemetry telemetry_%s;\n" process_name;
       fprintf out_h "#endif /* PERIODIC_C_%s */\n" (String.uppercase process_name);
 
-      lprintf out_h "static inline void periodic_telemetry_send_%s(struct transport_tx *trans, struct device *dev) {  /* %dHz */\n" process_name freq; (*TODO pass transport+device with correct types *)
+      lprintf out_h "static inline void periodic_telemetry_send_%s(struct transport_tx *trans __attribute__((unused), struct device *dev __attribute__((unused)) {  /* %dHz */\n" process_name freq; (*TODO pass transport+device with correct types *)
       right ();
       output_modes out_h process_name modes freq modules_name;
       left ();