From f2bdcbe977d8384cb5143576b411ca04db25c147 Mon Sep 17 00:00:00 2001
From: MCUdude <hansibull@gmail.com>
Date: Fri, 11 Feb 2022 22:46:11 +0100
Subject: [PATCH] Add missing USBtiny derived programmers ArduinoISP and the
 Arduino.org ISP are commercial versions of the USBtiny programmer with
 different USB VIDs/PIDs

---
 src/avrdude.conf.in | 38 ++++++++++++++++++++++++++++----------
 1 file changed, 28 insertions(+), 10 deletions(-)

diff --git a/src/avrdude.conf.in b/src/avrdude.conf.in
index 4b4766fb..e5aacbd7 100644
--- a/src/avrdude.conf.in
+++ b/src/avrdude.conf.in
@@ -886,6 +886,24 @@ programmer
   usbpid     = 0x0c9f;
 ;
 
+programmer
+  id    = "arduinoisp";
+  desc  = "Arduino ISP Programmer";
+  type  = "usbtiny";
+  connection_type = usb;
+  usbvid     = 0x2341;
+  usbpid     = 0x0049;
+;
+
+programmer
+  id    = "arduinoisporg";
+  desc  = "Arduino ISP Programmer";
+  type  = "usbtiny";
+  connection_type = usb;
+  usbvid     = 0x2A03;
+  usbpid     = 0x0049;
+;
+
 # commercial version of USBtiny, using a separate VID/PID
 programmer
   id    = "ehajo-isp";
@@ -896,6 +914,16 @@ programmer
   usbpid     = 0x0BA5;
 ;
 
+# commercial version of USBtiny, using a separate VID/PID
+programmer
+  id    = "iseavrprog";
+  desc  = "USBtiny-based USB programmer, https://github.com/IowaScaledEngineering/ckt-avrprogrammer";
+  type  = "usbtiny";
+  connection_type = usb;
+  usbvid     = 0x1209;
+  usbpid     = 0x6570;
+;
+
 programmer
   id = "micronucleus";
   desc = "Micronucleus Bootloader";
@@ -914,16 +942,6 @@ programmer
   usbpid = 0x0478;
 ;
 
-# commercial version of USBtiny, using a separate VID/PID
-programmer
-  id    = "iseavrprog";
-  desc  = "USBtiny-based USB programmer, https://github.com/IowaScaledEngineering/ckt-avrprogrammer";
-  type  = "usbtiny";
-  connection_type = usb;
-  usbvid     = 0x1209;
-  usbpid     = 0x6570;
-;
-
 programmer
   id    = "butterfly";
   desc  = "Atmel Butterfly Development Board";