[paparazzicenter] add checkbox to enable PRINT_CONFIG

This commit is contained in:
Felix Ruess
2013-03-20 19:45:29 +01:00
parent 1436e2324c
commit ae48da938d
7 changed files with 224 additions and 17 deletions
+1 -1
View File
@@ -155,7 +155,7 @@ $(SETTINGS_TELEMETRY) : $(PERIODIC_H)
%.upload: %.compile %.upload: %.compile
cd $(AIRBORNE); $(MAKE) TARGET=$* upload cd $(AIRBORNE); $(MAKE) TARGET=$* upload
jsbsim jsbsim.compile: jsbsim.ac_h jsbsim jsbsim.compile: jsbsim.ac_h print_version
cd $(AIRBORNE); $(MAKE) TARGET=jsbsim ARCHI=jsbsim ARCH=jsbsim all cd $(AIRBORNE); $(MAKE) TARGET=jsbsim ARCHI=jsbsim ARCH=jsbsim all
sim sim.compile: sim.ac_h print_version sim sim.compile: sim.ac_h print_version
@@ -20,9 +20,6 @@
<define name="LOITER_TRIM"/> <define name="LOITER_TRIM"/>
<define name="STRONG_WIND"/> <define name="STRONG_WIND"/>
<!-- print config info at compile time -->
<define name="PRINT_CONFIG"/>
<subsystem name="radio_control" type="ppm"/> <subsystem name="radio_control" type="ppm"/>
<!-- Communication --> <!-- Communication -->
@@ -26,9 +26,6 @@
<define name="AHRS_TRIGGERED_ATTITUDE_LOOP"/> <define name="AHRS_TRIGGERED_ATTITUDE_LOOP"/>
<!-- print configuration options at compile time -->
<define name="PRINT_CONFIG"/>
<subsystem name="imu" type="aspirin_v1.5"/> <subsystem name="imu" type="aspirin_v1.5"/>
<subsystem name="ahrs" type="float_dcm"/> <subsystem name="ahrs" type="float_dcm"/>
<subsystem name="ins" type="alt_float"/> <subsystem name="ins" type="alt_float"/>
@@ -30,9 +30,6 @@
</subsystem> </subsystem>
<subsystem name="ins"/> <subsystem name="ins"/>
<!-- print the configuration during compiling -->
<define name="PRINT_CONFIG"/>
<define name="KILL_ON_GROUND_DETECT" value="TRUE"/> <define name="KILL_ON_GROUND_DETECT" value="TRUE"/>
</firmware> </firmware>
+4
View File
@@ -45,6 +45,10 @@ ifneq ($(MAKECMDGOALS),clean)
endif endif
endif endif
ifdef PRINT_CONFIG
$(TARGET).CFLAGS += -DPRINT_CONFIG
endif
# sort cflags and sources to throw out duplicates # sort cflags and sources to throw out duplicates
# #
#$(info CFLAGS_orig = $($(TARGET).CFLAGS)) #$(info CFLAGS_orig = $($(TARGET).CFLAGS))
File diff suppressed because it is too large Load Diff
+5 -2
View File
@@ -384,8 +384,11 @@ let build_handler = fun ~file gui ac_combo (target_combo:Gtk_tools.combo) (log:s
try ( try (
let ac_name = Gtk_tools.combo_value ac_combo let ac_name = Gtk_tools.combo_value ac_combo
and target = Gtk_tools.combo_value target_combo in and target = Gtk_tools.combo_value target_combo in
let target = if target="sim" then target else sprintf "%s.compile" target in let target_cmd = if gui#checkbutton_printconfig#active then
Utils.command ~file gui log ac_name target sprintf "PRINT_CONFIG=1 %s.compile" target
else
sprintf "%s.compile" target in
Utils.command ~file gui log ac_name target_cmd
) with _ -> log "ERROR: Nothing to build!!!\n" in ) with _ -> log "ERROR: Nothing to build!!!\n" in
ignore (gui#button_build#connect#clicked ~callback); ignore (gui#button_build#connect#clicked ~callback);