From 058c9740aad8bfcb654e9ed0684ff45629c2b685 Mon Sep 17 00:00:00 2001 From: Sara Damiano Date: Mon, 7 Oct 2024 14:39:49 -0400 Subject: [PATCH] Correct time offset typo Signed-off-by: Sara Damiano --- .github/workflows/prepare_release.yaml | 2 +- src/LoRa_AT_Common.h | 3 ++- src/LoRa_AT_Time.tpp | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/prepare_release.yaml b/.github/workflows/prepare_release.yaml index 615de6f..974d7f8 100644 --- a/.github/workflows/prepare_release.yaml +++ b/.github/workflows/prepare_release.yaml @@ -50,4 +50,4 @@ jobs: uses: EnviroDIY/workflows/.github/workflows/prepare_release.yaml@main secrets: inherit with: - include_dependencies: ${{ inputs.include_dependencies }} + include_dependencies: ${{ ( true ) || (github.event_name == 'workflow_dispatch' && github.event.inputs.publish == 'true') }} diff --git a/src/LoRa_AT_Common.h b/src/LoRa_AT_Common.h index 7dac7ad..214fb7e 100644 --- a/src/LoRa_AT_Common.h +++ b/src/LoRa_AT_Common.h @@ -60,7 +60,8 @@ __attribute__((error("Not available on this modem type"))) #define LORA_AT_ATTR_NOT_IMPLEMENTED __attribute__((error("Not implemented"))) -#if defined(__AVR__) && !defined(__AVR_ATmega4809__) +#if (defined(__AVR__) || defined(ARDUINO_ARCH_AVR)) && \ + !defined(__AVR_ATmega4809__) #define LORA_AT_PROGMEM PROGMEM typedef const __FlashStringHelper* GsmConstStr; #define GFP(x) (reinterpret_cast(x)) diff --git a/src/LoRa_AT_Time.tpp b/src/LoRa_AT_Time.tpp index 6f22d16..3b53cef 100644 --- a/src/LoRa_AT_Time.tpp +++ b/src/LoRa_AT_Time.tpp @@ -22,7 +22,7 @@ enum LoRa_AT_EpochStart { Y2K = 1, ///< Use an epoch starting 1/1/2000, as some RTC's and Arduinos do ///< (946684800s ahead of UNIX epoch, 630806400s ahead of GPS epoch) GPS = 2 ///< Use the GPS epoch starting Jan 5, 1980 (315878400s ahead of UNIX - ///< epoch, 630806400s behind of GPS epoch) + ///< epoch, 630806400s behind of Y2K epoch) }; template