Skip to content

Commit

Permalink
env: clean Makefile
Browse files Browse the repository at this point in the history
  • Loading branch information
@edy555
edy555 committed Mar 8, 2020
1 parent 608482a commit c40d78d
Showing 1 changed file with 2 additions and 9 deletions.
11 changes: 2 additions & 9 deletions Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -118,12 +118,9 @@ CSRC = $(STARTUPSRC) \
$(PLATFORMSRC) \
$(BOARDSRC) \
$(STREAMSSRC) \
$(SHELLSRC) \
usbcfg.c \
main.c si5351.c tlv320aic3204.c dsp.c plot.c ui.c ili9341.c numfont20x22.c Font5x7.c flash.c adc.c

# $(TESTSRC) \
# C++ sources that can be compiled in ARM or THUMB mode depending on the global
# setting.
CPPSRC =
Expand Down Expand Up @@ -153,8 +150,7 @@ ASMSRC = $(STARTUPASM) $(PORTASM) $(OSALASM)

INCDIR = $(STARTUPINC) $(KERNINC) $(PORTINC) $(OSALINC) \
$(HALINC) $(PLATFORMINC) $(BOARDINC) \
$(STREAMSINC) $(SHELLINC)
# $(TESTINC)
$(STREAMSINC)

#
# Project, sources and paths
Expand All @@ -176,7 +172,7 @@ CPPC = $(TRGT)g++
LD = $(TRGT)gcc
#LD = $(TRGT)g++
CP = $(TRGT)objcopy
AS = $(TRGT)gcc -x assembler-with-cpp
AS = $(TRGT)gcc -x assembler-with-cpp -ggdb
AR = $(TRGT)ar
OD = $(TRGT)objdump
SZ = $(TRGT)size
Expand Down Expand Up @@ -231,7 +227,4 @@ flash: build/ch.bin
dfu:
-@printf "reset dfu\r" >/dev/cu.usbmodem401

TAGS: Makefile
@etags *.[ch] NANOVNA_STM32_F072/*.[ch] $(shell find ChibiOS/os/hal/ports/STM32/STM32F0xx ChibiOS/os -name \*.\[ch\] -print)
@ls -l TAGS

2 comments on commit c40d78d

@SPRO900
Copy link

@SPRO900 SPRO900 commented on c40d78d Mar 8, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is a small problem with returning to the normal mode of control of marker movement. After activating the TRACKING mode, or any other mode in the SEARCH menu, the marker cannot be moved with the joystick. Can I fix this problem? Thank you for your work!
MENU: MARKER-SEARCH

@edy555
Copy link
Member Author

@edy555 edy555 commented on c40d78d Mar 8, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@SPRO900 To back to the mode of marker move, click the marker on the trace or click the upper side of the screen. see #124
and please use issues not here.

Please sign in to comment.