set move->moving

[trains.git] / pic.make

diff --git a/pic.make b/pic.make
index 47252c7b449c75938649d1d9f0bd5e3f09b3a599..dbd6cc8d0e1dc01f042ba515f9da79b41997876e 100644 (file)
--- a/pic.make
+++ b/pic.make
@@ -1,6 +1,6 @@
 # recommended programming order
 #   one test on PIC#0
-#      first time:                             erase, write FOO-entire0.hex
+#      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
@@ -8,30 +8,47 @@
 #      subsequently:   for all                 update FOO.hex
 #   other possibilities are not ruled out
 #
+# For actual program from detpic, we program (with odyssey-train):
+#      odyssey-train <n> write program+code.hex
+# and then later
+#        write/update  program+program/code.hex
+# etc.
+#
 # 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
+#   FOO+entire0.hex    FOO.o           idlocs0.o       config.o
 #   perpicNUMBER.hex                   idlocsNUMBER.o  config.o
 
-PROGRAM_HEXES= $(addsuffix .hex, $(PROGRAMS)) \
-               $(addsuffix -withcfg.hex, $(PROGRAMS))
+#ASFLAGS=      -Dmclock=20000 -Dsclock=20000
+CLOCKS=                -Dmclock=32000 -Dsclock=4000
+ASFLAGS=       $(CLOCKS)
 
-all:           $(TARGETS) $(PROGRAM_HEXES)
-LINK=          gplink -o $@ $^
-ASSEMBLE=      gpasm -p 18f458
+HEXMERGER=     $(CEBPIC)merge-hex
+MERGEHEX=      ./$^ $o
 
-%-withcfg.hex: %.o config.o $(LIBS)
-               $(LINK)
+PIC=           18f458
+LINK=          gplink -m -o $@ $^
+ASSEMBLE=      gpasm -p$(PIC)  $(ASFLAGS)
+DOASSEMBLE=    $(ASSEMBLE) -c $< && mv $*.lst $*+asm.lst
 
-%.hex:         %.o $(LIBS)
-               $(LINK)
+PIC_HEADER=    /usr/share/gputils/header/p$(PIC).inc
 
 %.o:           %.asm $(INCLUDES)
-               $(ASSEMBLE) -c $<
+               $(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 *.tmp
-               -rm -f *.hex *.cod *.lst *.o
+               -rm -f -- *~ *.new *.tmp *.disasm
+               -rm -f *.hex *.cod *.lst *.o *.map