Sync to head #7

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

Open

comdata wants to merge 365 commits into comdata:master from john30:master

.github/ISSUE_TEMPLATE/bug_report.yml

-Original file line number
+Diff line change
@@ Expand Up / @@ -8,7 +8,7 @@ body: @@
         id: description
         attributes:
           label: Description
-          description: A clear and concise description of what the bug is. Anything related to actual message definitions in [ebusd-configuration](https://github.com/john30/ebusd-configuration), serial bridge in [ebusd-esp](https://github.com/john30/ebusd-esp), or [eBUS adapter v3/v2](https://github.com/eBUS/adapter) do not belong here! Use the appropriate repository for those.
+          description: A clear and concise description of what the bug is. Anything related to actual message definitions in [ebusd-configuration](https://github.com/john30/ebusd-configuration), [eBUS Adapter Shield v5](https://github.com/john30/ebusd-esp32), serial bridge in [ebusd-esp](https://github.com/john30/ebusd-esp), or [eBUS adapter v3/v2](https://github.com/eBUS/adapter) do not belong here! Use the appropriate repository for those.
           placeholder: e.g. during startup, an error message as described below is reported instead of...
         validations:
           required: true
@@ Expand All / @@ -35,6 +35,11 @@ body: @@
           description: the ebusd version in use
           options:
             - current source from git
+            - '25.1'
+            - '24.1'
+            - '23.3'
+            - '23.2'
+            - '23.1'
             - '22.4'
             - '22.3'
             - '22.2'
@@ Expand All / @@ -58,6 +63,7 @@ body: @@
           label: Operating system
           description: the operating system in use
           options:
+            - Debian 12 (Bookworm) / Ubuntu 22-23 / Raspberry Pi OS 12 (including lite)
             - Debian 11 (Bullseye) / Ubuntu 20-21 / Raspbian 11 / Raspberry Pi OS 11 (including lite)
             - Debian 10 (Buster) / Ubuntu 18-19 / Raspbian 10 / Raspberry Pi OS 10 (including lite)
             - Debian 9 (Stretch) / Ubuntu 16-17 / Raspbian 9 / Raspberry Pi OS 9 (including lite)
@@ Expand Down Expand Up / @@ -93,17 +99,15 @@ body: @@
           label: Hardware interface
           description: the eBUS hardware interface in use
           options:
-            - adapter 3.1 USB
-            - adapter 3.1 WiFi
-            - adapter 3.1 Ethernet
-            - adapter 3.1 RPi
-            - adapter 3.0 USB
-            - adapter 3.0 WiFi
-            - adapter 3.0 Ethernet
-            - adapter 3.0 RPi
-            - adapter 2
-            - Esera USB
-            - Esera Ethernet
+            - Adapter Shield v5/C6/Stick via USB
+            - Adapter Shield v5/C6/Stick via WiFi
+            - Adapter Shield v5/C6/Stick via Ethernet
+            - Adapter Shield v5/C6 via Raspberry GPIO
+            - Adapter v3 USB
+            - Adapter v3 WiFi
+            - Adapter v3 Ethernet
+            - Adapter v3 RPi
+            - Adapter v2
             - other
         validations:
           required: true
@@ Expand Down @@

.github/ISSUE_TEMPLATE/feature_request.yml

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -8,7 +8,7 @@ body:
  
        id: description

        attributes:

          label: Description

          description: A clear and concise description of the requested feature, additional behaviour, different functionality. Anything related to actual message definitions in ebusd-configuration, serial bridge in ebusd-esp, or adapter v3/v2 do not belong here! Use the appropriate repository for those.

          placeholder: e.g. during startup, an error message as described below is reported instead of...

          description: A clear and concise description of the requested feature, additional behaviour, different functionality. Anything related to actual message definitions in ebusd-configuration, serial bridge in ebusd-esp, or adapter v5/v3/v2 do not belong here! Use the appropriate repository for those.

          placeholder: e.g. add direct integration with xxx...

        validations:

          required: true

.github/dependabot.yml

-Original file line number
+Diff line change
@@ -0,0 +1,6 @@
+    version: 2
+    updates:
+      - package-ecosystem: "github-actions"
+        directory: "/"
+        schedule:
+          interval: "weekly"

.github/workflows/build.yml

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -29,23 +29,23 @@ jobs:
  
        steps:

          -

            name: checkout

            uses: actions/checkout@v2

            uses: actions/checkout@v4

          -

            name: gh-describe

            id: gittag

            uses: proudust/gh-describe@v1.4.6

            uses: proudust/gh-describe@v2.1.0

          -

            name: set up QEMU

            uses: docker/setup-qemu-action@v1

            uses: docker/setup-qemu-action@v3

          -

            name: set up buildx

            id: buildx

            uses: docker/setup-buildx-action@v1

            uses: docker/setup-buildx-action@v3

            with:

              buildkitd-flags: --debug

          -

            name: login to docker hub

            uses: docker/login-action@v1

            uses: docker/login-action@v3

            with:

              username: ${{ secrets.DOCKERHUB_USERNAME }}

              password: ${{ secrets.DOCKERHUB_TOKEN }}

.github/workflows/coverage.yml

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -15,10 +15,10 @@ jobs:
  
        steps:

          -

            name: checkout

            uses: actions/checkout@v2

            uses: actions/checkout@v4

          -

            name: packages

            run: sudo apt-get update && sudo apt-get install -y libmosquitto1 libmosquitto-dev libssl1.1 libssl-dev

            run: sudo apt-get update && sudo apt-get install -y libmosquitto1 libmosquitto-dev libssl3 libssl-dev

          -

            name: build

            run: cmake -Dcoverage=1 -DBUILD_TESTING=1 . && make

    @@ -40,9 +40,10 @@ jobs:
  
            run: ./test_coverage.sh

          -

            name: push result

            uses: codecov/codecov-action@v3

            uses: codecov/codecov-action@v4

            with:

              name: codecov-umbrella

              token: ${{ secrets.CODECOV_TOKEN }}

              fail_ci_if_error: true

              verbose: true

              gcov: true

.github/workflows/preparerelease.yml

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -26,28 +26,28 @@ on:
  
            type: choice

            options:

              - ''

              - bookworm

              - bullseye

              - buster

              - stretch

    jobs:

      prepare-release:

        runs-on: ubuntu-latest

        steps:

          -

            name: checkout

            uses: actions/checkout@v2

            uses: actions/checkout@v4

          -

            name: gh-describe

            id: gittag

            uses: proudust/gh-describe@v1.4.6

            uses: proudust/gh-describe@v2.1.0

          -

            name: set up QEMU

            uses: docker/setup-qemu-action@v1

            uses: docker/setup-qemu-action@v3

          -

            name: set up buildx

            id: buildx

            uses: docker/setup-buildx-action@v1

            uses: docker/setup-buildx-action@v3

            with:

              buildkitd-flags: --debug

          -

    @@ -61,7 +61,7 @@ jobs:
  
              LIMITIMG: ${{ github.event.inputs.limitimg }}

          -

            name: archive

            uses: actions/upload-artifact@v2

            uses: actions/upload-artifact@v4

            with:

              name: debian packages

              path: |

.github/workflows/release.yml

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -15,19 +15,19 @@ jobs:
  
        steps:

          -

            name: checkout

            uses: actions/checkout@v2

            uses: actions/checkout@v4

          -

            name: set up QEMU

            uses: docker/setup-qemu-action@v1

            uses: docker/setup-qemu-action@v3

          -

            name: set up buildx

            id: buildx

            uses: docker/setup-buildx-action@v1

            uses: docker/setup-buildx-action@v3

            with:

              buildkitd-flags: --debug

          -

            name: login to docker hub

            uses: docker/login-action@v1

            uses: docker/login-action@v3

            with:

              username: ${{ secrets.DOCKERHUB_USERNAME }}

              password: ${{ secrets.DOCKERHUB_TOKEN }}

.gitignore

-Original file line number
+Diff line change
@@ Expand Up / @@ -10,7 +10,9 @@ Testing @@
     cmake_install.cmake
     Makefile
     Makefile.in
-    /build/*
+    /build/
+    /cmake-build-*/
+    build-/
     /aclocal.m4
     /autom4te.cache/
     /config.*
@@ Expand All / @@ -21,23 +23,20 @@ Makefile.in @@
     /stamp-h?
     .deps/
     *.o
+    *.a
     *.dirstamp
     *.gc*
     app.info
     /src/ebusd/ebusd
     /src/tools/ebusctl
     /src/tools/ebusfeed
-    /src/lib/utils/libutils.a
-    /src/lib/ebus/libebus.a
     /src/lib/ebus/contrib/test/test_tem
     /src/lib/ebus/test/test_symbol
     /src/lib/ebus/test/test_data
     /src/lib/ebus/test/test_message
     /src/lib/ebus/test/test_filereader
-    /src/lib/ebus/contrib/libebuscontrib.a
     /src/lib/ebus/contrib/test/test_contrib
     /docs/Doxyfile
     /docs/doxyfile.stamp
     /docs/html
-    /cmake-build-debug*/
-    /.idea/
+    /.idea/

CMakeLists.txt

-Original file line number
+Diff line change
@@ Expand Up / @@ -10,6 +10,11 @@ file(STRINGS "VERSION" VERSION) @@
     project(ebusd)
+    include(GNUInstallDirs)
+    include(CheckFunctionExists)
+    include(CheckCXXSourceRuns)
+    include(CheckIncludeFile)
     set(PACKAGE ${CMAKE_PROJECT_NAME})
     set(PACKAGE_NAME ${CMAKE_PROJECT_NAME})
     set(PACKAGE_TARNAME ${CMAKE_PROJECT_NAME})
@@ Expand Down Expand Up / @@ -45,13 +50,11 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") @@
     if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
       set(CMAKE_INSTALL_PREFIX "" CACHE PATH "..." FORCE)
     endif()
-    include(GNUInstallDirs)
-    include(CheckFunctionExists)
-    include(CheckCXXSourceRuns)
-    include(CheckIncludeFile)
     add_definitions(-fpic -Wall -Wno-unused-function -Wextra)
+    set(BUILD_SHARED_LIBS OFF)
     check_include_file(arpa/inet.h HAVE_ARPA_INET_H)
     check_include_file(dirent.h HAVE_DIRENT_H)
     check_include_file(fcntl.h HAVE_FCNTL_H)
@@ Expand All / @@ -61,25 +64,19 @@ check_include_file(pthread.h HAVE_PTHREAD_H) @@
     check_include_file(sys/ioctl.h HAVE_SYS_IOCTL_H)
     check_include_file(sys/select.h HAVE_SYS_SELECT_H)
     check_include_file(sys/time.h HAVE_SYS_TIME_H)
+    check_include_file(syslog.h HAVE_SYSLOG_H)
     check_include_file(time.h HAVE_TIME_H)
     check_include_file(termios.h HAVE_TERMIOS_H)
+    check_function_exists(cfsetspeed HAVE_CFSETSPEED)
     set(CMAKE_REQUIRED_LIBRARIES pthread rt)
     check_function_exists(pthread_setname_np HAVE_PTHREAD_SETNAME_NP)
     check_function_exists(pselect HAVE_PSELECT)
     check_function_exists(ppoll HAVE_PPOLL)
+    check_function_exists(timegm HAVE_TIMEGM)
     check_include_file(linux/serial.h HAVE_LINUX_SERIAL -DHAVE_LINUX_SERIAL=1)
     check_include_file(dev/usb/uftdiio.h HAVE_FREEBSD_UFTDI -DHAVE_FREEBSD_UFTDI=1)
-    check_function_exists(argp_parse HAVE_ARGP)
-    if(NOT HAVE_ARGP)
-      find_library(LIB_ARGP argp)
-      if (NOT LIB_ARGP)
-        message(FATAL_ERROR "argp library not available")
-      endif(NOT LIB_ARGP)
-      set(CMAKE_REQUIRED_LIBRARIES "${CMAKE_REQUIRED_LIBRARIES} ${LIB_ARGP}")
-    endif(NOT HAVE_ARGP)
     option(coverage "enable code coverage tracking." OFF)
     if(NOT coverage STREQUAL OFF)
       add_definitions(-g -O0 --coverage -Wall)
@@ Expand Down Expand Up / @@ -167,7 +164,7 @@ int main() { @@
       endif(HAVE_DIRECT_FLOAT_FORMAT_REV)
     endif(NOT HAVE_DIRECT_FLOAT_FORMAT)
-    add_definitions(-D_GNU_SOURCE -DHAVE_CONFIG_H -DSYSCONFDIR="${CMAKE_INSTALL_FULL_SYSCONFDIR}" -DLOCALSTATEDIR="${CMAKE_INSTALL_FULL_LOCALSTATEDIR}")
+    add_definitions(-D_GNU_SOURCE -DHAVE_CONFIG_H)
     configure_file(config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h)
     include_directories(${CMAKE_CURRENT_BINARY_DIR})
     include_directories(${ebusd_SOURCE_DIR}/src)
@@ Expand Down @@

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Sync to head #7

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!

Sync to head #7

Are you sure you want to change the base?

Uh oh!

Sync to head #7

Uh oh!

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!