improved distance label placement when centrelines drawn

[trains.git] / pic.make

diff --git a/pic.make b/pic.make
index 7dc84f1ca1a8014e40840b7dc899d380082ebb49..d445442b7335a2ee17a4b33b84c7d9d2e41cf69f 100644 (file)
--- a/pic.make
+++ b/pic.make
@@ -1,18 +1,48 @@
+# recommended programming order
+#   one test on PIC#0
+#      first time:                             erase, write FOO-entire0.hex
+#      subsequently if only FOO.asm changed:   update FOO.hex
+#   for all pics
+#      first time:     for each individually   erase, write perpicNUM.hex
+#                      then for all            update FOO.hex
+#      subsequently:   for all                 update FOO.hex
+#   other possibilities are not ruled out
+#
+# filename conventions - contents of hex files
+#   FOO.hex            FOO.o (only)
+#   FOO-withcfg.hex    FOO.o                           config.o
+#   FOO-entire0.hex    FOO.o           idlocs0.o       config.o
+#   perpicNUMBER.hex                   idlocsNUMBER.o  config.o
 
-all:           $(TARGETS)
+#ASFLAGS=      -Dmclock=20000 -Dsclock=20000
+CLOCKS=                -Dmclock=32000 -Dsclock=4000
+ASFLAGS=       $(CLOCKS)
 
-o=>$@.new && mv -f $@.new $@
+HEXMERGER=     $(CEBPIC)merge-hex
+MERGEHEX=      ./$^ $o
 
-LINK=          gplink -o $@ $^
+PIC=           18f458
+LINK=          gplink -m -o $@ $^
+ASSEMBLE=      gpasm -p$(PIC)  $(ASFLAGS)
+DOASSEMBLE=    $(ASSEMBLE) -c $< && mv $*.lst $*+asm.lst
 
-%.hex:         %.o
-               $(LINK)
+PIC_HEADER=    /usr/share/gputils/header/p$(PIC).inc
 
-%.o:           %.asm
-               gpasm -p 18f458 -c $<
+%.o:           %.asm $(INCLUDES)
+               $(DOASSEMBLE)
+
+TIA_DIR=       ../iwjpictest
+TIA_TIA=       $(TIA_DIR)/to-insn-aliases
+TIA_ALIASES=   $(TIA_DIR)/insn-aliases.inc
+TIA=           $(TIA_TIA) -A $(TIA_ALIASES) -H $(PIC_HEADER)
+
+%.disasm:      %.hex %.map $(TIA_TIA) $(TIA_ALIASES)
+               gpdasm -p$(PIC) $(word 1,$+) >$@.tmp
+               $(TIA) -M $(word 2,$+) <$@.tmp $o
+               @rm $@.tmp
 
 .PRECIOUS:     %.o
 
 pic-clean:
-               -rm -f -- *~ *.new
-               -rm -f *.hex *.cod *.lst *.o
+               -rm -f -- *~ *.new *.tmp *.disasm
+               -rm -f *.hex *.cod *.lst *.o *.map