diff --git a/CMakeLists.txt b/CMakeLists.txt
index 95c89d2b..19897c72 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -35,6 +35,13 @@ option(USE_LIBUSBWIN32 "Prefer libusb-win32 over libusb" OFF)
option(DEBUG_CMAKE "Enable debugging output for this CMake project" OFF)
option(BUILD_SHARED_LIBS "Build shared libraries" OFF)
+if(WIN32)
+ # Prefer static libraries over DLLs on Windows
+ option(USE_STATIC_LIBS "Use static libraries" ON)
+else()
+ option(USE_STATIC_LIBS "Use static libraries" OFF)
+endif()
+
include(CheckIncludeFile)
include(CheckSymbolExists)
include(FetchContent)
@@ -110,14 +117,14 @@ endif()
# Detect installed libraries
# =====================================
-# Prefer static libraries over DLLs on Windows
-if(WIN32)
+if(USE_STATIC_LIBS)
set(PREFERRED_LIBELF libelf.a elf)
set(PREFERRED_LIBUSB libusb.a usb)
set(PREFERRED_LIBUSB_1_0 libusb-1.0.a usb-1.0)
set(PREFERRED_LIBHIDAPI libhidapi.a libhidapi-libusb.a libhidapi-hidraw.a hidapi hidapi-libusb hidapi-hidraw)
set(PREFERRED_LIBFTDI libftdi.a ftdi)
set(PREFERRED_LIBFTDI1 libftdi1.a ftdi1)
+ set(PREFERRED_LIBREADLINE libreadline.a)
else()
set(PREFERRED_LIBELF elf)
set(PREFERRED_LIBUSB usb)
@@ -125,6 +132,7 @@ else()
set(PREFERRED_LIBHIDAPI hidapi hidapi-libusb hidapi-hidraw)
set(PREFERRED_LIBFTDI ftdi)
set(PREFERRED_LIBFTDI1 ftdi1)
+ set(PREFERRED_LIBREADLINE readline)
endif()
# -------------------------------------
@@ -212,7 +220,7 @@ endif()
# -------------------------------------
# Find libreadline
-find_library(HAVE_LIBREADLINE NAMES readline)
+find_library(HAVE_LIBREADLINE NAMES ${PREFERRED_LIBREADLINE})
if(HAVE_LIBREADLINE)
set(LIB_LIBREADLINE ${HAVE_LIBREADLINE})
endif()
diff --git a/NEWS b/NEWS
index ca827290..888796ca 100644
--- a/NEWS
+++ b/NEWS
@@ -15,9 +15,17 @@ Changes since version 7.0:
* Issues fixed:
+ - Fix micronucleus bootloader to check for unresponsive USB
+ devices #945
+ - Fix src/CMakeLists.txt to honor CMAKE_INSTALL_LIBDIR #972
+
* Pull requests:
- Fix .Dd macro in manpage #949
+ - fix M1 homebrew path #950
+ - CMake Enhancements #962
+ - Reduce programmer desc string length in avrdude.conf
+ to < 80 characters #1000
* Internals:
diff --git a/build.sh b/build.sh
index baea4516..0b664807 100755
--- a/build.sh
+++ b/build.sh
@@ -50,7 +50,13 @@ case "${ostype}" in
then
build_flags="${build_flags} -D CMAKE_C_FLAGS=-I/opt/local/include -D CMAKE_EXE_LINKER_FLAGS=-L/opt/local/lib"
else
- build_flags="${build_flags} -D CMAKE_C_FLAGS=-I/usr/local/include -D CMAKE_EXE_LINKER_FLAGS=-L/usr/local/Cellar"
+ # Apple M1 (may be new version of homebrew also)
+ if [ -d /opt/homebrew ]
+ then
+ build_flags="${build_flags} -D CMAKE_C_FLAGS=-I/opt/homebrew/include -D CMAKE_EXE_LINKER_FLAGS=-L/opt/homebrew/Cellar"
+ else
+ build_flags="${build_flags} -D CMAKE_C_FLAGS=-I/usr/local/include -D CMAKE_EXE_LINKER_FLAGS=-L/usr/local/Cellar"
+ fi
fi
;;
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index a8e0262b..bd3c6dee 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -51,15 +51,10 @@ include_directories(BEFORE ${CMAKE_CURRENT_BINARY_DIR})
add_compile_definitions(CONFIG_DIR=\"${CONFIG_DIR}\")
if(WIN32)
- set(EXTRA_WINDOWS_SOURCES "${PROJECT_BINARY_DIR}/src/windows.rc")
+ set(EXTRA_WINDOWS_RESOURCES "${PROJECT_BINARY_DIR}/src/windows.rc")
set(EXTRA_WINDOWS_LIBRARIES setupapi ws2_32)
endif()
-if(NOT WIN32)
- set(LIB_MATH m)
- add_compile_options(-Wall) # -Wextra
-endif()
-
if(MSVC)
add_compile_definitions(_CRT_SECURE_NO_WARNINGS=1)
add_compile_definitions(_CRT_NONSTDC_NO_WARNINGS=1)
@@ -79,6 +74,9 @@ if(MSVC)
set(EXTRA_WINDOWS_INCLUDES ${EXTRA_WINDOWS_INCLUDES}
"msvc"
)
+else()
+ set(LIB_MATH m)
+ add_compile_options(-Wall) # -Wextra
endif()
# =====================================
@@ -216,6 +214,7 @@ add_library(libavrdude
xbee.c
${FLEX_Parser_OUTPUTS}
${BISON_Parser_OUTPUTS}
+ "${EXTRA_WINDOWS_SOURCES}"
)
set_target_properties(libavrdude PROPERTIES
@@ -253,7 +252,7 @@ add_executable(avrdude
term.h
whereami.c
whereami.h
- "${EXTRA_WINDOWS_SOURCES}"
+ "${EXTRA_WINDOWS_RESOURCES}"
)
target_link_libraries(avrdude PUBLIC libavrdude)
@@ -264,8 +263,8 @@ target_link_libraries(avrdude PUBLIC libavrdude)
install(TARGETS avrdude DESTINATION bin)
install(TARGETS libavrdude
- LIBRARY DESTINATION lib
- ARCHIVE DESTINATION lib
+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
PUBLIC_HEADER DESTINATION include COMPONENT dev
)
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/avrdude.conf" TYPE SYSCONF)
diff --git a/src/avrdude.conf.in b/src/avrdude.conf.in
index 362b6167..ba7f4f8e 100644
--- a/src/avrdude.conf.in
+++ b/src/avrdude.conf.in
@@ -947,9 +947,10 @@ programmer
;
# commercial version of USBtiny, using a separate VID/PID
+# https://github.com/IowaScaledEngineering/ckt-avrprogrammer
programmer
id = "iseavrprog";
- desc = "USBtiny-based USB programmer, https://github.com/IowaScaledEngineering/ckt-avrprogrammer";
+ desc = "USBtiny-based programmer, https://iascaled.com";
type = "usbtiny";
connection_type = usb;
usbvid = 0x1209;
diff --git a/src/micronucleus.c b/src/micronucleus.c
index b3c25341..c3dd007d 100644
--- a/src/micronucleus.c
+++ b/src/micronucleus.c
@@ -139,6 +139,22 @@ static int micronucleus_check_connection(pdata_t* pdata)
}
}
+static bool micronucleus_is_device_responsive(pdata_t* pdata, struct usb_device* device)
+{
+ pdata->usb_handle = usb_open(device);
+ if (pdata->usb_handle == NULL)
+ {
+ return false;
+ }
+
+ int result = micronucleus_check_connection(pdata);
+
+ usb_close(pdata->usb_handle);
+ pdata->usb_handle = NULL;
+
+ return result >= 0;
+}
+
static int micronucleus_reconnect(pdata_t* pdata)
{
struct usb_device* device = usb_device(pdata->usb_handle);
@@ -696,6 +712,7 @@ static int micronucleus_open(PROGRAMMER* pgm, char* port)
usb_init();
bool show_retry_message = true;
+ bool show_unresponsive_device_message = true;
time_t start_time = time(NULL);
for (;;)
@@ -717,6 +734,19 @@ static int micronucleus_open(PROGRAMMER* pgm, char* port)
pdata->major_version = (uint8_t)(device->descriptor.bcdDevice >> 8);
pdata->minor_version = (uint8_t)(device->descriptor.bcdDevice >> 0);
+ if (!micronucleus_is_device_responsive(pdata, device))
+ {
+ if (show_unresponsive_device_message)
+ {
+ avrdude_message(MSG_INFO, "%s: WARNING: Unresponsive Micronucleus device detected, please reconnect...\n",
+ progname);
+
+ show_unresponsive_device_message = false;
+ }
+
+ continue;
+ }
+
avrdude_message(MSG_NOTICE, "%s: Found device with Micronucleus V%d.%d, bus:device: %s:%s\n",
progname,
pdata->major_version, pdata->minor_version,