mirror of
https://github.com/paparazzi/paparazzi.git
synced 2026-05-28 09:58:23 +08:00
[sim] fix segfault when trying to send I2C_ERRORS
tried to fix the source of the problem, but didn't find it, so just don't send I2C_ERRORS in SITL
This commit is contained in:
+1
-12
@@ -56,6 +56,7 @@ CFLAGS += $(INCLUDES)
|
||||
CFLAGS += $($(TARGET).CFLAGS)
|
||||
CFLAGS += $(LOCAL_CFLAGS)
|
||||
CFLAGS += -O2
|
||||
CFLAGS += -g
|
||||
|
||||
ifneq ($(SIM_TYPE),JSBSIM)
|
||||
CFLAGS += -std=gnu99
|
||||
@@ -63,9 +64,6 @@ endif
|
||||
|
||||
LDFLAGS = -lm
|
||||
|
||||
ifeq ($(SIM_TYPE),BOOZ)
|
||||
LDFLAGS += $($(TARGET).LDFLAGS)
|
||||
endif
|
||||
ifeq ($(SIM_TYPE),JSBSIM)
|
||||
LDFLAGS += $($(TARGET).LDFLAGS)
|
||||
endif
|
||||
@@ -92,11 +90,6 @@ check_jsbsim:
|
||||
# fi
|
||||
|
||||
|
||||
ifeq ($(SIM_TYPE),BOOZ)
|
||||
$(OBJDIR)/simsitl : $($(TARGET).objs)
|
||||
@echo LD $@
|
||||
$(Q)$(CC) -o $@ $($(TARGET).objs) $(LDFLAGS)
|
||||
else
|
||||
ifeq ($(SIM_TYPE),JSBSIM)
|
||||
$(OBJDIR)/simsitl : $($(TARGET).objs)
|
||||
@echo LD $@
|
||||
@@ -106,7 +99,6 @@ $(OBJDIR)/simsitl : $($(TARGET).objs) $(SITLCMA) $(SIMSITLML)
|
||||
@echo LD $@
|
||||
$(Q)$(OCAMLC) -g -custom $(CAMLINCLUDES) -o $@ unix.cma str.cma xml-light.cma glibivy-ocaml.cma lib-pprz.cma lablgtk.cma $($(TARGET).objs) $(MYGTKINITCMO) $(SITLCMA) $(SIMSITLML)
|
||||
endif
|
||||
endif
|
||||
|
||||
|
||||
# The id of the A/C is hardcoded in the code (to be improved with dynlink ?)
|
||||
@@ -140,9 +132,6 @@ $(OBJDIR)/%.o: %.cpp $(OBJDIR)/../Makefile.ac
|
||||
$(Q)test -d $(dir $@) || mkdir -p $(dir $@)
|
||||
$(Q)$(CC) $(CFLAGS) -c -o $@ $<
|
||||
|
||||
avr_clean:
|
||||
rm -rf $(OBJDIR)
|
||||
|
||||
|
||||
#
|
||||
# Dependencies
|
||||
|
||||
Reference in New Issue
Block a user