Merge branch 'master' of github.com:PX4/Firmware into px4io-i2c-memory-squeeze

4 files changed, 9 insertions, 89 deletions

diff --git a/Debug/NuttX b/Debug/NuttX
index 8e6544842..3b95e96b2 100644
--- a/Debug/NuttX
+++ b/Debug/NuttX
@@ -174,11 +174,15 @@ end
 define showtaskstack
 	set $task = (struct _TCB *)$arg0
 
-	set $stack_free = 0
-	while ($stack_free < $task->adj_stack_size) && *(uint8_t *)($task->stack_alloc_ptr + $stack_free)
-		set $stack_free = $stack_free + 1
+	if $task == &g_idletcb
+		printf "can't measure idle stack\n"
+	else
+		set $stack_free = 0
+		while ($stack_free < $task->adj_stack_size) && *(uint8_t *)($task->stack_alloc_ptr + $stack_free)
+			set $stack_free = $stack_free + 1
+		end
+		printf"    stack 0x%08x-0x%08x (%d) %d free\n", $task->stack_alloc_ptr, $task->adj_stack_ptr, $task->adj_stack_size, $stack_free
 	end
-	printf"    stack 0x%08x-0x%08x (%d) %d free\n", $task->stack_alloc_ptr, $task->adj_stack_ptr, $task->adj_stack_size, $stack_free
 end
 
 #
diff --git a/Debug/PX4 b/Debug/PX4
index 806c49584..085cffe43 100644
--- a/Debug/PX4
+++ b/Debug/PX4
@@ -22,7 +22,7 @@ end
 
 define _perf_print
 	set $hdr = (struct perf_ctr_header *)$arg0
-	printf "%p\n", $hdr
+	#printf "%p\n", $hdr
 	printf "%s: ", $hdr->name
 	# PC_COUNT
 	if $hdr->type == 0
diff --git a/apps/namedapp/namedapp_list.h b/apps/namedapp/namedapp_list.h
deleted file mode 100644
index 72d1fa52d..000000000
--- a/apps/namedapp/namedapp_list.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/* List of application requirements, generated during make context. */
-{ "math_demo", SCHED_PRIORITY_DEFAULT, 8192, math_demo_main },
-{ "control_demo", SCHED_PRIORITY_DEFAULT, 2048, control_demo_main },
-{ "kalman_demo", SCHED_PRIORITY_MAX - 30, 2048, kalman_demo_main },
-{ "reboot", SCHED_PRIORITY_DEFAULT, 2048, reboot_main },
-{ "perf", SCHED_PRIORITY_DEFAULT, 2048, perf_main },
-{ "top", SCHED_PRIORITY_DEFAULT - 10, 3000, top_main },
-{ "boardinfo", SCHED_PRIORITY_DEFAULT, 2048, boardinfo_main },
-{ "mixer", SCHED_PRIORITY_DEFAULT, 4096, mixer_main },
-{ "eeprom", SCHED_PRIORITY_DEFAULT, 4096, eeprom_main },
-{ "param", SCHED_PRIORITY_DEFAULT, 4096, param_main },
-{ "bl_update", SCHED_PRIORITY_DEFAULT, 4096, bl_update_main },
-{ "preflight_check", SCHED_PRIORITY_DEFAULT, 2048, preflight_check_main },
-{ "delay_test", SCHED_PRIORITY_DEFAULT, 2048, delay_test_main },
-{ "uorb", SCHED_PRIORITY_DEFAULT, 4096, uorb_main },
-{ "mavlink", SCHED_PRIORITY_DEFAULT, 2048, mavlink_main },
-{ "mavlink_onboard", SCHED_PRIORITY_DEFAULT, 2048, mavlink_onboard_main },
-{ "gps", SCHED_PRIORITY_DEFAULT, 2048, gps_main },
-{ "commander", SCHED_PRIORITY_MAX - 30, 2048, commander_main },
-{ "sdlog", SCHED_PRIORITY_MAX - 30, 2048, sdlog_main },
-{ "sensors", SCHED_PRIORITY_MAX-5, 4096, sensors_main },
-{ "ardrone_interface", SCHED_PRIORITY_MAX - 15, 2048, ardrone_interface_main },
-{ "multirotor_att_control", SCHED_PRIORITY_MAX - 15, 2048, multirotor_att_control_main },
-{ "multirotor_pos_control", SCHED_PRIORITY_MAX - 25, 2048, multirotor_pos_control_main },
-{ "fixedwing_att_control", SCHED_PRIORITY_MAX - 30, 2048, fixedwing_att_control_main },
-{ "fixedwing_pos_control", SCHED_PRIORITY_MAX - 30, 2048, fixedwing_pos_control_main },
-{ "position_estimator", SCHED_PRIORITY_DEFAULT, 4096, position_estimator_main },
-{ "attitude_estimator_ekf", SCHED_PRIORITY_DEFAULT, 2048, attitude_estimator_ekf_main },
-{ "ms5611", SCHED_PRIORITY_DEFAULT, 2048, ms5611_main },
-{ "hmc5883", SCHED_PRIORITY_DEFAULT, 4096, hmc5883_main },
-{ "mpu6000", SCHED_PRIORITY_DEFAULT, 4096, mpu6000_main },
-{ "bma180", SCHED_PRIORITY_DEFAULT, 2048, bma180_main },
-{ "l3gd20", SCHED_PRIORITY_DEFAULT, 2048, l3gd20_main },
-{ "px4io", SCHED_PRIORITY_DEFAULT, 2048, px4io_main },
-{ "blinkm", SCHED_PRIORITY_DEFAULT, 2048, blinkm_main },
-{ "tone_alarm", SCHED_PRIORITY_DEFAULT, 2048, tone_alarm_main },
-{ "adc", SCHED_PRIORITY_DEFAULT, 2048, adc_main },
-{ "fmu", SCHED_PRIORITY_DEFAULT, 2048, fmu_main },
-{ "hil", SCHED_PRIORITY_DEFAULT, 2048, hil_main },
-{ "tests", SCHED_PRIORITY_DEFAULT, 12000, tests_main },
-{ "sercon", SCHED_PRIORITY_DEFAULT, 2048, sercon_main },
-{ "serdis", SCHED_PRIORITY_DEFAULT, 2048, serdis_main },
diff --git a/apps/namedapp/namedapp_proto.h b/apps/namedapp/namedapp_proto.h
deleted file mode 100644
index 09f5b4156..000000000
--- a/apps/namedapp/namedapp_proto.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/* List of application entry points, generated during make context. */
-EXTERN int math_demo_main(int argc, char *argv[]);
-EXTERN int control_demo_main(int argc, char *argv[]);
-EXTERN int kalman_demo_main(int argc, char *argv[]);
-EXTERN int reboot_main(int argc, char *argv[]);
-EXTERN int perf_main(int argc, char *argv[]);
-EXTERN int top_main(int argc, char *argv[]);
-EXTERN int boardinfo_main(int argc, char *argv[]);
-EXTERN int mixer_main(int argc, char *argv[]);
-EXTERN int eeprom_main(int argc, char *argv[]);
-EXTERN int param_main(int argc, char *argv[]);
-EXTERN int bl_update_main(int argc, char *argv[]);
-EXTERN int preflight_check_main(int argc, char *argv[]);
-EXTERN int delay_test_main(int argc, char *argv[]);
-EXTERN int uorb_main(int argc, char *argv[]);
-EXTERN int mavlink_main(int argc, char *argv[]);
-EXTERN int mavlink_onboard_main(int argc, char *argv[]);
-EXTERN int gps_main(int argc, char *argv[]);
-EXTERN int commander_main(int argc, char *argv[]);
-EXTERN int sdlog_main(int argc, char *argv[]);
-EXTERN int sensors_main(int argc, char *argv[]);
-EXTERN int ardrone_interface_main(int argc, char *argv[]);
-EXTERN int multirotor_att_control_main(int argc, char *argv[]);
-EXTERN int multirotor_pos_control_main(int argc, char *argv[]);
-EXTERN int fixedwing_att_control_main(int argc, char *argv[]);
-EXTERN int fixedwing_pos_control_main(int argc, char *argv[]);
-EXTERN int position_estimator_main(int argc, char *argv[]);
-EXTERN int attitude_estimator_ekf_main(int argc, char *argv[]);
-EXTERN int ms5611_main(int argc, char *argv[]);
-EXTERN int hmc5883_main(int argc, char *argv[]);
-EXTERN int mpu6000_main(int argc, char *argv[]);
-EXTERN int bma180_main(int argc, char *argv[]);
-EXTERN int l3gd20_main(int argc, char *argv[]);
-EXTERN int px4io_main(int argc, char *argv[]);
-EXTERN int blinkm_main(int argc, char *argv[]);
-EXTERN int tone_alarm_main(int argc, char *argv[]);
-EXTERN int adc_main(int argc, char *argv[]);
-EXTERN int fmu_main(int argc, char *argv[]);
-EXTERN int hil_main(int argc, char *argv[]);
-EXTERN int tests_main(int argc, char *argv[]);
-EXTERN int sercon_main(int argc, char *argv[]);
-EXTERN int serdis_main(int argc, char *argv[]);