Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: min change #10

Merged
merged 84 commits into from
Apr 22, 2024
Merged
Show file tree
Hide file tree
Changes from 80 commits
Commits
Show all changes
84 commits
Select commit Hold shift + click to select a range
5c891b3
gitignore: Files generated by "cmake ."
ndim Feb 25, 2024
dfcd5cc
Directly use AVRDUDE_FULL_VERSION string macro
ndim Feb 25, 2024
92e2dd4
Fix cmake not finding generated ac_cfg.h
ndim Feb 25, 2024
9616b37
Look for generated ac_cfg.h in builddir first
ndim Feb 25, 2024
274ac34
Add benchmark option -b to test-avrdude
stefanrueger Feb 26, 2024
6e6404c
Use alternative for /dev/null when not available
stefanrueger Feb 26, 2024
3b56768
Lowercase variable names in test-avrdude
stefanrueger Feb 27, 2024
df3c67f
Add normalised avrbench number suitable for markdown tables
stefanrueger Feb 27, 2024
f088a9b
Clarify -b option
stefanrueger Feb 27, 2024
cd41d2b
Change /dev/null to temp file to be Windows compatible
stefanrueger Feb 27, 2024
efd6bab
Widen chip erase tests to also capture -c urclock emulation
stefanrueger Feb 27, 2024
82c001b
Drop chip erase and checking test for test-avrdude -b
stefanrueger Feb 27, 2024
61ed3dd
Mention avrbench legend in test-avrdude -b summary
stefanrueger Feb 27, 2024
64c5d1d
Remove avrbench and generate 4-number benchmark table with legend
stefanrueger Feb 28, 2024
e35714b
Change 1-byte file upload for emulated chip erase
stefanrueger Feb 28, 2024
71a9cb4
Keep case of part in test-avrdude -b -p "-p part ..."
stefanrueger Feb 28, 2024
e5304a4
Merge pull request #1707 from ndim/fix-cmake-builds-related-to-ac_cfg.h
stefanrueger Feb 28, 2024
076e2e9
Merge pull request #1709 from stefanrueger/benchmark
stefanrueger Feb 28, 2024
27eb695
Update NEWS
stefanrueger Feb 28, 2024
34366a6
Update test-avrdude help message
stefanrueger Feb 29, 2024
07669a9
Document progress reporting in source code
stefanrueger Mar 27, 2024
b00c284
Replace msg_info() by msg_debug() in jtag3_prmsg() and jtag3_prevent()
dl8dtl Mar 28, 2024
7f9f82d
Add MSG2_LEFT_MARGIN flag in lieu of \v messaging convention
stefanrueger Mar 29, 2024
a26c434
Keep vertical tab at start of format string as conditional new line
stefanrueger Mar 29, 2024
f027493
Change return type for avr_(ms|us)timestamp() to uint64_t
stefanrueger Mar 29, 2024
d91a482
Remove unused avrdude_message()
stefanrueger Mar 29, 2024
0ff5e84
Merge pull request #1727 from dl8dtl/fix-1726
dl8dtl Mar 29, 2024
674128c
Update NEWS for recent PR/issue
dl8dtl Mar 29, 2024
39eea96
Add note about why avrdude_message2() is named that way.
dl8dtl Mar 29, 2024
8516243
Merge pull request #1730 from stefanrueger/remove_avrdude_message
dl8dtl Mar 29, 2024
67867a6
Update NEWS
dl8dtl Mar 29, 2024
0f21635
Merge branch 'main' into msg2_left_margin
stefanrueger Mar 29, 2024
9b7d4d8
To use Static Libs for macOS arduino_packing build
mcuee Mar 29, 2024
22a7bf9
Merge pull request #1728 from stefanrueger/msg2_left_margin
stefanrueger Mar 29, 2024
840a098
Update NEWS
stefanrueger Mar 29, 2024
82e4513
Merge branch 'main' into progress-reporting
stefanrueger Mar 29, 2024
cb61171
Merge pull request #1724 from stefanrueger/progress-reporting
stefanrueger Mar 29, 2024
93ed537
Add hiz and pullups feature for buspirate binary mode
therealdreg Apr 5, 2024
d939188
Update doc for buspirate hiz and pullups
therealdreg Apr 5, 2024
08f70fe
Update NEWS
stefanrueger Apr 5, 2024
a8097ea
Merge pull request #1729 from stefanrueger/timestamp
stefanrueger Apr 5, 2024
8976846
Merge pull request #1731 from mcuee/avrdude_packing_fix
stefanrueger Apr 5, 2024
f2b1c7e
Update NEWS
stefanrueger Apr 5, 2024
a5035c0
pup->pullups
therealdreg Apr 5, 2024
82928d3
Fix message levels in jtag3_print_data()
dl8dtl Apr 8, 2024
fdfa0ac
Consult -F option when signature cannot be read
stefanrueger Apr 12, 2024
3129ba2
Update avrintel based on current atdf
stefanrueger Apr 12, 2024
5361668
No longer warn when part configuration disables SPI interface
stefanrueger Apr 12, 2024
c53a3ed
Match programmer names irrespective of case
stefanrueger Apr 12, 2024
1a46faa
Check all ids of a programmer for exact match
stefanrueger Apr 12, 2024
ece8652
Include <ac_cfg.h> instead of "ac_cfg.h"
stefanrueger Apr 12, 2024
d441501
Adding `arduino_packing_release` github action (#1690)
mcuee Apr 13, 2024
b302e70
Merge pull request #1741 from dl8dtl/msg_debug_fixes
stefanrueger Apr 13, 2024
2ee8982
Merge pull request #1745 from stefanrueger/override-signature-check
stefanrueger Apr 13, 2024
e10370e
Merge pull request #1746 from stefanrueger/locate_programmer_starts_set
stefanrueger Apr 13, 2024
1d3f028
Merge pull request #1747 from stefanrueger/update-avrintel
stefanrueger Apr 13, 2024
428ea42
Update NEWS
stefanrueger Apr 13, 2024
6488cb6
Remove deprecated ucr2 part
stefanrueger Apr 14, 2024
ea701bc
Add support for libgpiod v2+ API
mhei Mar 27, 2024
94561c8
Move static buffer to PDATA region
stefanrueger Apr 14, 2024
af8d832
Make string variables local const
stefanrueger Apr 15, 2024
a5a94a0
Make static functions greppable
stefanrueger Apr 15, 2024
cff9d88
Make static const array local
stefanrueger Apr 15, 2024
9850a8f
Use cfg_malloc() instead of calloc()
stefanrueger Apr 15, 2024
97cd1aa
Update avrdude.texi better doc
therealdreg Apr 16, 2024
cfc5c93
Update avrdude.texi
therealdreg Apr 16, 2024
c930a27
Introduce magic memory tree
stefanrueger Apr 16, 2024
b00d601
Use mmt_malloc() macro instead of cfg_malloc() function
stefanrueger Apr 16, 2024
8231b36
Merge pull request #1733 from therealdreg/buspirate-hiz-and-pullups
stefanrueger Apr 16, 2024
4761a70
Merge pull request #1725 from mhei/support-for-libgpiodv2
stefanrueger Apr 16, 2024
6aece29
Merge pull request #1749 from stefanrueger/deprecated
stefanrueger Apr 16, 2024
5858898
Merge pull request #1750 from stefanrueger/static-buspirate
stefanrueger Apr 16, 2024
8fe729f
Update NEWS
stefanrueger Apr 16, 2024
6067c07
chore: minimize changes
koen1711 Apr 21, 2024
1ca431e
chore: update .gitignore
koen1711 Apr 21, 2024
d874e0b
fix: conflicts
koen1711 Apr 21, 2024
31c49f0
fix: wrong emsdk version
koen1711 Apr 21, 2024
f2d1fac
chore: actually fix conflicts
koen1711 Apr 21, 2024
90dbaa1
fix: logging
koen1711 Apr 21, 2024
e99921e
chore: add avrdude-worker.js to root dir at end of build
koen1711 Apr 21, 2024
f40617d
fix: es6
sverben Apr 21, 2024
e569767
chore: bump version
koen1711 Apr 22, 2024
aff70c4
chore: readd NEWS, remove comments
koen1711 Apr 22, 2024
98dc910
Merge remote-tracking branch 'origin/min-change' into min-change
koen1711 Apr 22, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/** @leaphy-robotics/webbased-code-owners
2 changes: 1 addition & 1 deletion .github/workflows/pull-request.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: Build pull request

env:
EM_VERSION: 3.1.56
EM_VERSION: 3.1.57
EM_CACHE_FOLDER: 'emsdk-cache'

on:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: Build avrdude with Emscripten

env:
EM_VERSION: 3.1.56
EM_VERSION: 3.1.57
EM_CACHE_FOLDER: 'emsdk-cache'

on:
Expand Down
7 changes: 6 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
node_modules/
cmake-build-release-emscripten/
.idea/
release-build
.idea
src/CMakeFiles
.DS_Store
.deps/
Expand Down Expand Up @@ -57,6 +59,9 @@ cscope.out
out/
build/
build_*/
CMakeFiles/
/CMakeCache.txt
cmake_install.cmake

# Visual Studio
.vs/
Expand Down
1 change: 0 additions & 1 deletion .gitmodules

This file was deleted.

51 changes: 38 additions & 13 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,13 @@
cmake_minimum_required(VERSION 3.5)
project(avrdude VERSION 7.3 LANGUAGES C CXX)

# check if we are doing emscripten
if (CMAKE_SYSTEM_NAME STREQUAL "Emscripten")
# print a message
message(STATUS "Building for Emscripten")
set(EMSCRIPTEN 1)
add_subdirectory(libserial)
endif ()

set(CMAKE_C_STANDARD 17)
set(CMAKE_C_STANDARD_REQUIRED True)
Expand Down Expand Up @@ -130,7 +137,6 @@ if(USE_STATIC_LIBS)
set(PREFERRED_LIBFTDI1 libftdi1.a ftdi1)
set(PREFERRED_LIBREADLINE libreadline.a readline)
set(PREFERRED_LIBSERIALPORT libserialport.a serialport)
set(PREFERRED_LIBGPIOD libgpiod.a gpiod)
else()
set(PREFERRED_LIBELF elf)
set(PREFERRED_LIBUSB usb)
Expand All @@ -140,7 +146,6 @@ else()
set(PREFERRED_LIBFTDI1 ftdi1)
set(PREFERRED_LIBREADLINE readline)
set(PREFERRED_LIBSERIALPORT serialport)
set(PREFERRED_LIBGPIOD gpiod)
endif()

# -------------------------------------
Expand Down Expand Up @@ -231,15 +236,33 @@ elseif(MSVC)
set(HAVE_LIBREADLINE 1)
endif()

add_subdirectory(libserial)

# -------------------------------------
# Find libgpiod, if needed
# Find libgpiod using pkg-config, if needed
if(HAVE_LINUXGPIO)
find_library(HAVE_LIBGPIOD NAMES ${PREFERRED_LIBGPIOD})
if(HAVE_LIBGPIOD)
set(LIB_LIBGPIOD ${HAVE_LIBGPIOD})
set(CMAKE_REQUIRED_LIBRARIES ${LIB_LIBGPIOD})
# defaults/fallbacks
set(HAVE_LIBGPIOD 0)
set(HAVE_LIBGPIOD_V2 0)

find_package(PkgConfig)
if(PKG_CONFIG_FOUND)
# check whether we have version >= 2.0
pkg_check_modules(LIBGPIODV2 libgpiod>=2.0)
if(LIBGPIODV2_FOUND)
set(HAVE_LIBGPIOD 1)
set(HAVE_LIBGPIOD_V2 1)
set(CMAKE_REQUIRED_LIBRARIES ${LIBGPIODV2_LIBRARIES})
set(LIB_LIBGPIOD ${LIBGPIODV2_LINK_LIBRARIES})
else()
# check whether we have at least an older version
pkg_check_modules(LIBGPIOD libgpiod)
if(LIBGPIOD_FOUND)
set(HAVE_LIBGPIOD 1)
set(CMAKE_REQUIRED_LIBRARIES ${LIBGPIOD_LIBRARIES})
set(LIB_LIBGPIOD ${LIBGPIOD_LINK_LIBRARIES})
endif()
endif()
else()
message(WARNING "For using libgpiod, pkg-config would be required which is not available.")
endif()
endif()

Expand Down Expand Up @@ -336,7 +359,8 @@ if (DEBUG_CMAKE)
message(STATUS "HAVE_LIBUSB_1_0_LIBUSB_H: ${HAVE_LIBUSB_1_0_LIBUSB_H}")
message(STATUS "HAVE_HIDAPI_HIDAPI_H: ${HAVE_HIDAPI_HIDAPI_H}")
message(STATUS "LIBUSB_COMPAT_DIR: ${LIBUSB_COMPAT_DIR}")
message(STATUS "HAVE_LIBGPIOD: ${HAVE_LIBGPIOD}")
message(STATUS "LIBGPIODV2_FOUND: ${LIBGPIODV2_FOUND}")
message(STATUS "LIBGPIOD_FOUND: ${LIBGPIOD_FOUND}")
message(STATUS "----------------------")
endif()

Expand Down Expand Up @@ -406,7 +430,9 @@ endif()

if(HAVE_LINUXGPIO)
message(STATUS "ENABLED linuxgpio")
if (HAVE_LIBGPIOD)
if (LIBGPIODV2_FOUND)
message(STATUS "DO HAVE libgpiod (v2.x)")
elseif(LIBGPIOD_FOUND)
message(STATUS "DO HAVE libgpiod")
else()
message(STATUS "DON'T HAVE libgpiod")
Expand All @@ -423,5 +449,4 @@ endif()

message(STATUS "----------------------")

add_subdirectory(interface)
add_subdirectory(test)
add_subdirectory(test)
Loading
Loading