diff --git a/sw/configurator/Makefile b/sw/configurator/Makefile index 05726b70f1..8064de740a 100644 --- a/sw/configurator/Makefile +++ b/sw/configurator/Makefile @@ -38,11 +38,7 @@ configurator : $(CMO) medit : OCAMLC=ocamlc -I +lablgtk2 -I +camlimages -I ../lib/ocaml -I +lablGL medit : medit.ml - $(OCAMLC) -o $@ glibivy-ocaml.cma -I +lablgtk2 lablgtk.cma lablgnomecanvas.cma lablgl.cma gtkInit.cmo lib-pprz.cma xlib-pprz.cma ci_core.cma ci_png.cma $^ - @cat ../../pprz_src_test.sh > $@ - @echo 'lablgtk2 -I +camlimages -I $$PAPARAZZI_SRC/sw/lib/ocaml glibivy-ocaml.cma ci_core.cma ci_png.cma ci_gif.cma ci_jpeg.cma ci_tiff.cma ci_bmp.cma ci_ppm.cma ci_ps.cma lib-pprz.cma xlib-pprz.cma $$PAPARAZZI_SRC/sw/configurator/$< $$*' >> $@ - @chmod a+x $@ - + $(OCAMLC) -custom -o $@ glibivy-ocaml.cma -I +lablgtk2 lablgtk.cma lablgnomecanvas.cma lablgl.cma gtkInit.cmo lib-pprz.cma xlib-pprz.cma ci_core.cma ci_png.cma $^ %.cmo : %.ml diff --git a/sw/configurator/medit.ml b/sw/configurator/medit.ml index 10331aaf8f..dbfb118c1a 100644 --- a/sw/configurator/medit.ml +++ b/sw/configurator/medit.ml @@ -586,7 +586,7 @@ let calibrate_map = fun root zoomadj () -> ignore(cal#connect#clicked ~callback:(fun _ -> try let coords = fun w -> - (wp_east w/. Ref.world_unit, wp_north w/. Ref.world_unit, utm_of_name (wp_name w)) in + (wp_east w/. Ref.world_unit, -. wp_north w/. Ref.world_unit, utm_of_name (wp_name w)) in let wpts = waypoints () in