Merge branch 'main' into has-bitclock

Author: stefanrueger

src/CMakeLists.txt

@@ -90,22 +90,27 @@ endif()
 if (CMAKE_SYSTEM_NAME STREQUAL "Linux")
     set(DEFAULT_PAR_PORT "/dev/parport0")
     set(DEFAULT_SER_PORT "/dev/ttyS0")
+    set(DEFAULT_SPI_PORT "/dev/spidev0.0:/dev/gpiochip0")
     set(DEFAULT_LINUXGPIO_PORT "gpiochip0")
 elseif (CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
     set(DEFAULT_PAR_PORT "/dev/ppi0")
     set(DEFAULT_SER_PORT "/dev/cuad0")
+    set(DEFAULT_SPI_PORT "unknown")
     set(DEFAULT_LINUXGPIO_PORT "unknown")
 elseif (CMAKE_SYSTEM_NAME STREQUAL "Solaris")
     set(DEFAULT_PAR_PORT "/dev/printers/0")
     set(DEFAULT_SER_PORT "/dev/term/a")
+    set(DEFAULT_SPI_PORT "unknown")
     set(DEFAULT_LINUXGPIO_PORT "unknown")
 elseif (CMAKE_SYSTEM_NAME STREQUAL "Windows")
     set(DEFAULT_PAR_PORT "lpt1")
     set(DEFAULT_SER_PORT "com1")
+    set(DEFAULT_SPI_PORT "unknown")
     set(DEFAULT_LINUXGPIO_PORT "unknown")
 else()
     set(DEFAULT_PAR_PORT "unknown")
     set(DEFAULT_SER_PORT "unknown")
+    set(DEFAULT_SPI_PORT "unknown")
     set(DEFAULT_LINUXGPIO_PORT "unknown")
 endif()
 
@@ -147,6 +152,7 @@ add_custom_command(
         -D HAVE_LINUXGPIO=$<BOOL:${HAVE_LINUXGPIO}>
         -D DEFAULT_PAR_PORT=${DEFAULT_PAR_PORT}
         -D DEFAULT_SER_PORT=${DEFAULT_SER_PORT}
+        -D DEFAULT_SPI_PORT=${DEFAULT_SPI_PORT}
         -D DEFAULT_LINUXGPIO_PORT=${DEFAULT_LINUXGPIO_PORT}
         -P "${CMAKE_CURRENT_SOURCE_DIR}/configure.cmake"
     DEPENDS avrdude.conf.in

src/avrdude.1

@@ -328,14 +328,15 @@ need to be specified to
 .It Fl p \-part Ar partname
 This option specifies the MCU connected to the programmer. The MCU
 descriptions are read from the config file. To see a list of currently
-supported MCUs use ? as partname, which will print the part ids and official
-part names. In connection with -v, this will also print a list of variant
-part names followed by an optional colon, the package code and some
-absolute maximum ratings. The part id, their official part name, any of
-the full variant part names or their initial part up to a dash can be used
-to specify a part with the -p option. If -p ? is specified with a specific
-programmer, see -c below, then only those parts are output that the
-programmer expects to be able to handle, together with the programming
+supported MCUs use ? as partname, which will print the part ids and
+official part names. Depending on the used shell, ? may need to be quoted
+as in "?" or \\?. In connection with -v, this will also print a list of
+variant part names followed by an optional colon, the package code and
+some absolute maximum ratings. The part id, their official part name, any
+of the full variant part names or their initial part up to a dash can be
+used to specify a part with the -p option. If -p ? is specified with a
+specific programmer, see -c below, then only those parts are output that
+the programmer expects to be able to handle, together with the programming
 interface(s) that can be used in that combination. In reality there can be
 deviations from this list, particularly if programming is directly via a
 bootloader.
@@ -415,15 +416,15 @@ keyword in your
 .Pa ${HOME}/.config/avrdude/avrdude.rc
 or
 .Pa ${HOME}/.avrduderc
-file to assign a default programmer to keep from having to specify
-this option on every invocation.
-A full list of all supported programmers is output to the terminal
-by using ? as programmer-id.
-If -c ? is specified with a specific part, see
--p above, then only those programmers are output that expect
-to be able to handle this part, together with the programming interface(s) that can be
-used in that combination. In reality there can be deviations from this list,
-particularly if programming is directly via a bootloader.
+file to assign a default programmer to keep from having to specify this
+option on every invocation. A full list of all supported programmers is
+output to the terminal by using ? as programmer-id. Depending on the used
+shell, ? may need to be quoted as in "?" or \\?. If -c ? is specified with
+a specific part, see -p above, then only those programmers are output that
+expect to be able to handle this part, together with the programming
+interface(s) that can be used in that combination. In reality there can be
+deviations from this list, particularly if programming is directly via a
+bootloader.
 .It Fl c \-programmer Ar wildcard/flags
 Run developer options for programmers that are matched by wildcard. Whilst
 their main use is for developers some flags can be of utility for users, e.g.,
@@ -634,7 +635,8 @@ or
 To see a list of currently plugged-in serial ports use -P ?s. In order to
 see a list of all possible serial adapters known to
 .Nm
-use -P ?sa.
+use -P ?sa. Depending on the used shell, ? may need to be quoted as in "?"
+or \\?.
 .Pp
 On Win32 operating systems, the parallel ports are referred to as lpt1
 through lpt3, referring to the addresses 0x378, 0x278, and 0x3BC,
@@ -2098,8 +2100,9 @@ Show help menu and exit.
 .El
 .El
 .Ss Programmers accepting exitspec parameter
-Currently, only the flip2, linuxspi, linuxgpio, raspberry_pi_gpio and old school parallel
-port programmers such as stk200 and dapa support exitspec parameter.
+Currently, only the flip2, linuxspi, linuxgpio, raspberry_pi_gpio,
+pickit4_mplab, pickit5 and old-school parallel port programmers such as
+stk200 and dapa support exitspec parameter.
 These let the user decide in which state the programmer pins after ended programming session.
 Multiple exitspec options can be separated with commas.
 .Bl -tag -offset indent -width indent
@@ -2152,6 +2155,13 @@ This option will leave the 8 data pins on the parallel port active.
 This option will leave the 8 data pins on the parallel port inactive.
 .Pq \&i. \&e. Em low
 .El
+.It Ar Pickit 4 (MPLAB)
+.It Ar Pickit 5
+.Bl -tag -offset indent -width indent
+.It Ar vcc
+This option will leave the power supply from the programmer enabled after
+avrdude finished the operation. Disabled by default.
+.El
 .El
 .Sh FILES
 .Bl -tag -offset indent -width /dev/ppi0XXX

src/configure.ac

@@ -500,36 +500,43 @@ case $target in
 	i[[3456]]86-*-linux*|x86_64-*-linux*)
 		DEFAULT_PAR_PORT="/dev/parport0"
 		DEFAULT_SER_PORT="/dev/ttyS0"
+		DEFAULT_SPI_PORT="/dev/spidev0.0:/dev/gpiochip0"
 		DEFAULT_LINUXGPIO_PORT="gpiochip0"
 		;;
 	*-*-linux*)
 		DEFAULT_PAR_PORT="unknown"
 		DEFAULT_SER_PORT="/dev/ttyS0"
+		DEFAULT_SPI_PORT="/dev/spidev0.0:/dev/gpiochip0"
 		DEFAULT_LINUXGPIO_PORT="gpiochip0"
 		;;
 	i[[3456]]86-*-*freebsd*|amd64-*-*freebsd*)
 		DEFAULT_PAR_PORT="/dev/ppi0"
 		DEFAULT_SER_PORT="/dev/cuad0"
+		DEFAULT_SPI_PORT="unknown"
 		DEFAULT_LINUXGPIO_PORT="unknown"
 		;;
 	*-*-*freebsd*)
 		DEFAULT_PAR_PORT="unknown"
 		DEFAULT_SER_PORT="/dev/cuad0"
+		DEFAULT_SPI_PORT="unknown"
 		DEFAULT_LINUXGPIO_PORT="unknown"
 		;;
 	*-*-solaris*)
 		DEFAULT_PAR_PORT="/dev/printers/0"
 		DEFAULT_SER_PORT="/dev/term/a"
+		DEFAULT_SPI_PORT="unknown"
 		DEFAULT_LINUXGPIO_PORT="unknown"
 		;;
 	*-*-msdos* | *-*-mingw32* | *-*-cygwin* | *-*-windows*)
 		DEFAULT_PAR_PORT="lpt1"
 		DEFAULT_SER_PORT="com1"
+		DEFAULT_SPI_PORT="unknown"
 		DEFAULT_LINUXGPIO_PORT="unknown"
 		;;
 	*)
 		DEFAULT_PAR_PORT="unknown"
 		DEFAULT_SER_PORT="unknown"
+		DEFAULT_SPI_PORT="unknown"
 		DEFAULT_LINUXGPIO_PORT="unknown"
 		;;
 esac
@@ -556,6 +563,9 @@ else
 	confsubst="-e /^@HAVE_PARPORT_BEGIN@/,/^@HAVE_PARPORT_END@/d"
 fi
 
+AC_MSG_CHECKING([for SPI device])
+AC_MSG_RESULT([$DEFAULT_SPI_PORT])
+AC_SUBST([DEFAULT_SPI_PORT])
 
 if test "x$enabled_linuxgpio" = xyes; then
 	AC_MSG_CHECKING([for default linuxgpio port])