diff --git a/sw/airborne/boards/lisa_l/baro_board.c b/sw/airborne/boards/lisa_l/baro_board.c
index 8c13f2d055..533b0885cd 100644
--- a/sw/airborne/boards/lisa_l/baro_board.c
+++ b/sw/airborne/boards/lisa_l/baro_board.c
@@ -85,9 +85,9 @@ void baro_board_send_config_abs(void) {
 #pragma message "Using High LisaL Baro Gain: Do not use below 1000hPa"
   baro_board_write_to_register(BARO_ABS_ADDR, 0x01, 0x86, 0x83);
 #else
-#pragma message "Using Low LisaL Baro Gain, capable of measuring below 1000hPa or more" 
+#pragma message "Using Low LisaL Baro Gain, capable of measuring below 1000hPa or more"
   //config register should be 0x84 in low countries, or 0x86 in normal countries
-  baro_board_write_to_register(BARO_ABS_ADDR, 0x01, 0x84, 0x83); 
+  baro_board_write_to_register(BARO_ABS_ADDR, 0x01, 0x84, 0x83);
 #endif
 }
 
diff --git a/sw/airborne/firmwares/rotorcraft/autopilot.h b/sw/airborne/firmwares/rotorcraft/autopilot.h
index ad9bc6f23f..82cf02b576 100644
--- a/sw/airborne/firmwares/rotorcraft/autopilot.h
+++ b/sw/airborne/firmwares/rotorcraft/autopilot.h
@@ -45,7 +45,7 @@
 #define AP_MODE_HOVER_CLIMB       10
 #define AP_MODE_HOVER_Z_HOLD      11
 #define AP_MODE_NAV               12
-#define AP_MODE_RC_DIRECT	  13	// Safety Pilot Direct Commands for helicopter direct control: appropriately chosen as mode "13" 
+#define AP_MODE_RC_DIRECT	  13	// Safety Pilot Direct Commands for helicopter direct control: appropriately chosen as mode "13"
 
 
 extern uint8_t autopilot_mode;
diff --git a/sw/airborne/modules/nav/nav_catapult.c b/sw/airborne/modules/nav/nav_catapult.c
index 442629871c..096ad3c0b6 100644
--- a/sw/airborne/modules/nav/nav_catapult.c
+++ b/sw/airborne/modules/nav/nav_catapult.c
@@ -113,7 +113,7 @@ void nav_catapult_highrate_module(void)
 //###############################################################################################
 // Code that runs in 4Hz Nav
 
-bool_t nav_catapult_init(void) 
+bool_t nav_catapult_init(void)
 {
 
   nav_catapult_armed = TRUE;
@@ -124,7 +124,7 @@ bool_t nav_catapult_init(void)
 
 
 
-bool_t nav_catapult(uint8_t _to, uint8_t _climb) 
+bool_t nav_catapult(uint8_t _to, uint8_t _climb)
 {
   float alt = WaypointAlt(_climb);
 
diff --git a/sw/ground_segment/cockpit/live.ml b/sw/ground_segment/cockpit/live.ml
index 1f830ff35b..e7122f2c05 100644
--- a/sw/ground_segment/cockpit/live.ml
+++ b/sw/ground_segment/cockpit/live.ml
@@ -127,7 +127,7 @@ let show_fp = fun ac ->
 let hide_fp = fun ac ->
   ac.fp_group#hide ();
   ac.fp_show#set_active false
-  
+
 (* callback for FP check button in menu *)
 let show_mission = fun ac on_off ->
   let a = find_ac ac in