diff --git a/src/avrdude.conf.in b/src/avrdude.conf.in index 10486045..15440fc9 100644 --- a/src/avrdude.conf.in +++ b/src/avrdude.conf.in @@ -1350,7 +1350,7 @@ programmer parent "tumpa" # tumpa-b programmer parent "ft2232h_jtag" # tumpa_jtag id = "tumpa_jtag"; - desc = "TIAO USB Multi-Protocol Adapter (JTAG)"; + desc = "TIAO USB Multi-Protocol Adapter in JTAG mode"; usbpid = 0x8a98; usbvendor = "TIAO"; buff = ~11; @@ -2255,7 +2255,7 @@ programmer # butterfly_mk programmer # jtagmkI id = "jtagmkI", "jtag1"; - desc = "Atmel JTAG ICE (mkI)"; + desc = "Atmel JTAG ICE mkI"; type = "jtagmki"; prog_modes = PM_JTAGmkI; extra_features = HAS_VTARG_READ; diff --git a/src/doc/programmers.sed b/src/doc/programmers.sed index bd4b120b..c159f519 100644 --- a/src/doc/programmers.sed +++ b/src/doc/programmers.sed @@ -1,5 +1,18 @@ -# Transform the avrdude -p \? output into a texinfo table -s/^ *\([^ ]*\) *= \([^(]*\).(/@cindex @code{\1}\n@cindex \2\n@item @code{\1} @tab \2 (/ +# Transform the avrdude -c \? output into a texinfo table +s/^ *\([^ ]*\) *= \(.*\) (/@cindex @code{\1}\n@cindex \2\n@item @code{\1} @tab \2 (/ +s/MPLAB(R) PICkit 5, PICkit 4 and SNAP/MPLAB(R) PICkit 5\n@cindex MPLAB(R) PICkit 4\n@cindex MPLAB(R) SNAP/ +s/@cindex Microchip PICkit 2 programmer/&\n@cindex PICkit 2 programmer/ +# s/@cindex Atmel bootloader (AVR109, AVR911)/@cindex Atmel bootloader AVR109\n@cindex Atmel bootloader AVR911/ +s/@cindex Atmel bootloader (Butterfly Development Board)/@cindex Atmel bootloader (Butterfly)/ +s/@cindex Atmel STK500 (probes v2 first then v1)/@cindex Atmel STK500/ +s/@cindex bootloader (AVR109, AVR911)/@cindex bootloader AVR109\n@cindex bootloader AVR911/ +s/@cindex bootloader (Butterfly Development Board)/@cindex bootloader (Butterfly)/ +s/@cindex Curiosity nano (nEDBG)/@cindex Curiosity nano/ +s/@cindex Digilent JTAG HS2 (MPSSE)/@cindex Digilent JTAG HS2/ +s/@cindex Lancos SI-Prog (same as ponyser)/@cindex Lancos SI-Prog/ +s/@cindex MPLAB(R) SNAP (PIC)/@cindex MPLAB(R) SNAP/ +s/@cindex Openmoko debug board (v3)/@cindex Openmoko debug board/ +s/@cindex STK500 (probes v2 first then v1)/@cindex STK500\n@cindex Atmel STK500/ s/2232hio.based on FT2232H with buffer and LEDs/FT2232H with buffer and LEDs/ s/FT4232H.based generic programmer/FT4232H programmer/ s/ABCmini Board, aka Dick Smith HOTCHIP/ABCmini Board\n@cindex Dick Smith HOTCHIP/ @@ -11,26 +24,25 @@ s/AVR as programmer with Arduino-as-ISP FW/AVR as programmer/ s/Arduino Gemma bootloader disguised as USBtiny/Arduino Gemma bootloader/ s/Arduino-branded USBtiny ISP Programmer/Arduino-branded USBtiny/ s/AT-ISP v1.1 programming cable for AVR-SDK1/AT-ISP v1.1 cable/ -s/Atmel Low Cost Serial Programmer/Atmel Low Cost Programmer/ +s/Atmel Low.Cost Serial Programmer/Atmel low-cost programmer AVR910/ s/FT2232H\/D.based generic programmer/FT2232H\/D programmer/ s/Serial Atmel AVR ISP using STK500/Serial Atmel AVR ISP/ s/Serial Atmel AVR ISP using STK500v2/Serial Atmel AVR ISP/ s/Bascom SAMPLE programming cable/Bascom SAMPLE cable/ s/Brian S. Dean's parallel programmer/Brian S. Dean's programmer/ -s/The Bus Pirate in AVR programming mode/The Bus Pirate/ +s/The Bus Pirate in AVR programming mode/The Bus Pirate\n@cindex BusPirate/ s/The Bus Pirate in bitbang mode/The Bus Pirate/ s/Mikrokopter.de Butterfly bootloader/Mikrokopter.de Butterfly/ s/BitWizard ftdi_atmega builtin programmer/BitWizard ftdi_atmega/ -s/serial port: reset=dtr sck=!rts sdo=!txd sdi=!cts/Serial port as programmer/ +s/serial port: reset=dtr sck=!rts sdo=!txd sdi=!cts/Serial port programmer/ s/CH341A programmer: note AVR F_CPU > 6.8 MHz/CH341A programmer/ s/Direct AVR Parallel Access cable/Direct AVR Parallel cable/ -s/serial port: reset=rts sck=dtr sdo=txd sdi=cts/Serial port as programmer/ -s/serial port: reset=!dtr sck=rts sdo=txd sdi=cts/Serial port as programmer/ +s/serial port: reset=rts sck=dtr sdo=txd sdi=cts/Serial port programmer/ +s/serial port: reset=!dtr sck=rts sdo=txd sdi=cts/Serial port programmer/ s/Emulates bootloader programming without the part/Emulating a bootloader (dryboot)/ s/Emulates programming without a programmer/Emulating a HW programmer (dryrun)/ s/AVR ISP programmer from eHaJo.de/AVR ISP programmer/ -s/FLIP bootloader using USB DFU v1/FLIP bootloader/ -s/FLIP bootloader using USB DFU v2/FLIP bootloader/ +s/FLIP bootloader using USB DFU .*/FLIP bootloader/ s/FT2232H\/D.based generic programmer/FT2232H\/D programmer/ s/FT2232H.based generic JTAG programmer/FT2232H JTAG programmer/ s/FT232H.based generic programmer/FT232H programmer/ @@ -43,7 +55,7 @@ s/AVR ISP programmer from iascaled.com/AVR ISP programmer/ s/Amontec JTAGKey\/JTAGKey-Tiny\/JTAGKey2/Amontec JTAGKey/ s/KT-LINK FT2232H: IO switching, voltage buffers/KT-LINK FT2232H/ s/Use Linux SPI device in \/dev\/spidev\*/Linux \/dev\/spidev\* programmer/ -s/Luminary Micro LM3S811 Eval Board/Luminary Micro LM3S811/ +s/Luminary Micro LM3S811 Eval Board.*/Luminary Micro LM3S811/ s/Crossbow MIB510 programming board/Crossbow MIB510/ s/Jason Kyle's pAVR Serial Programmer/Jason Kyle's pAVR/ s/ponyprog serial: reset=!txd sck=rts sdo=dtr sdi=cts/Serial port programmer/ @@ -52,7 +64,9 @@ s/Program via the Serprog protocol from Flashrom/Flashcom serprog protocol/ s/FTDI TTL232R-5V with ICSP adapter/FTDI TTL232R-5V/ s/TIAO USB Multi-Protocol Adapter/TIAO USB programmer/ s/uncompatino with all pairs of pins shorted/Uncompatino programmer/ -s/Urboot bootloaders using urprotocol/Urboot bootloader/ +s/Urboot bootloaders using urprotocol/Urboot bootloader\n@cindex Urclock programmer\n@cindex Urprotocol/ s/Any usbasp clone with correct VID\/PID/Usbasp clones/ s/Wiring bootloader using STK500 v2 protocol/Wiring bootloader/ -s/XBeeBoot Over-The-Air bootloader/XBeeBoot OTA bootloader/ +s/XBeeBoot Over-The-Air bootloader.*/XBeeBoot OTA bootloader/ +s/@cindex Atmel \(.*\)/&\n@cindex \u\1/ +s/@cindex MPLAB(R) \(.*\)/&\n@cindex \u\1/