diff --git a/.trunk/trunk.yaml b/.trunk/trunk.yaml index b42e2be31..b0561679a 100644 --- a/.trunk/trunk.yaml +++ b/.trunk/trunk.yaml @@ -9,14 +9,14 @@ plugins: lint: enabled: - prettier@3.5.3 - - trufflehog@3.88.16 + - trufflehog@3.88.17 - yamllint@1.36.0 - bandit@1.8.3 - - checkov@3.2.384 + - checkov@3.2.386 - terrascan@1.19.9 - trivy@0.60.0 - taplo@0.9.3 - - ruff@0.9.10 + - ruff@0.10.0 - isort@6.0.1 - markdownlint@0.44.0 - oxipng@9.1.4 diff --git a/src/graphics/EInkDynamicDisplay.cpp b/src/graphics/EInkDynamicDisplay.cpp index 4a062cf7e..8e4adf87e 100644 --- a/src/graphics/EInkDynamicDisplay.cpp +++ b/src/graphics/EInkDynamicDisplay.cpp @@ -331,7 +331,7 @@ void EInkDynamicDisplay::checkConsecutiveFastRefreshes() LOG_DEBUG("refresh=FAST, reason=UNLIMITED_FAST_MODE_ACTIVE, frameFlags=0x%x", frameFlags); return; } - + // If too many FAST refreshes consecutively - force a FULL refresh if (fastRefreshCount >= EINK_LIMIT_FASTREFRESH) { refresh = FULL; diff --git a/src/modules/CannedMessageModule.cpp b/src/modules/CannedMessageModule.cpp index 5f623720a..2a5ec00ab 100644 --- a/src/modules/CannedMessageModule.cpp +++ b/src/modules/CannedMessageModule.cpp @@ -1058,8 +1058,8 @@ void CannedMessageModule::drawFrame(OLEDDisplay *display, OLEDDisplayUiState *st } else if (cannedMessageModule->runState == CANNED_MESSAGE_RUN_STATE_FREETEXT) { requestFocus(); // Tell Screen::setFrames to move to our module's frame #if defined(USE_EINK) && defined(USE_EINK_DYNAMICDISPLAY) - EInkDynamicDisplay* einkDisplay = static_cast(display); - einkDisplay->enableUnlimitedFastMode(); // Enable unlimited fast refresh while typing + EInkDynamicDisplay *einkDisplay = static_cast(display); + einkDisplay->enableUnlimitedFastMode(); // Enable unlimited fast refresh while typing #endif #if defined(USE_VIRTUAL_KEYBOARD) diff --git a/variants/seeed_xiao_nrf52840_kit/variant.cpp b/variants/seeed_xiao_nrf52840_kit/variant.cpp index f7e175f2d..22072312a 100644 --- a/variants/seeed_xiao_nrf52840_kit/variant.cpp +++ b/variants/seeed_xiao_nrf52840_kit/variant.cpp @@ -1,8 +1,8 @@ #include "variant.h" +#include "configuration.h" #include "nrf.h" #include "wiring_constants.h" #include "wiring_digital.h" -#include "configuration.h" #include #include #include @@ -58,8 +58,6 @@ const uint32_t g_ADigitalPinMap[] = { 31, // D32 is P0.10 (VBAT) }; - - /* Copyright (c) 2014-2015 Arduino LLC. All right reserved. Copyright (c) 2016 Sandeep Mistry All right reserved. @@ -80,7 +78,6 @@ const uint32_t g_ADigitalPinMap[] = { Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ - void initVariant() { // LED1 & LED2 diff --git a/variants/seeed_xiao_nrf52840_kit/variant.h b/variants/seeed_xiao_nrf52840_kit/variant.h index 9d6345f0a..20362cb52 100644 --- a/variants/seeed_xiao_nrf52840_kit/variant.h +++ b/variants/seeed_xiao_nrf52840_kit/variant.h @@ -43,7 +43,6 @@ extern "C" { * Buttons */ - // Digital PINs #define D0 (0ul) #define D1 (1ul) @@ -57,8 +56,8 @@ extern "C" { #define D9 (9ul) #define D10 (10ul) -/*Due to the lack of pins,and have to make sure gps standby work well we have temporarily removed the button. -There are some technical solutions that can solve this problem, +/*Due to the lack of pins,and have to make sure gps standby work well we have temporarily removed the button. +There are some technical solutions that can solve this problem, and we are currently exploring and researching them*/ // #define BUTTON_PIN D0 // This is the Program Button @@ -86,7 +85,6 @@ static const uint8_t A4 = PIN_A4; static const uint8_t A5 = PIN_A5; #define ADC_RESOLUTION 12 - #define PIN_SERIAL2_RX (-1) #define PIN_SERIAL2_TX (-1) @@ -99,7 +97,6 @@ static const uint8_t A5 = PIN_A5; #define PIN_SPI_MOSI (10) #define PIN_SPI_SCK (8) - static const uint8_t SS = D4; static const uint8_t MOSI = PIN_SPI_MOSI; static const uint8_t MISO = PIN_SPI_MISO; @@ -117,29 +114,27 @@ static const uint8_t SCK = PIN_SPI_SCK; #define SX126X_TXEN RADIOLIB_NC - #define SX126X_RXEN D4 -#define SX126X_DIO2_AS_RF_SWITCH // DIO2 is used to control the RF switch really necessary!!! +#define SX126X_DIO2_AS_RF_SWITCH // DIO2 is used to control the RF switch really necessary!!! #define SX126X_DIO3_TCXO_VOLTAGE 1.8 /* * Wire Interfaces */ -#define I2C_NO_RESCAN // I2C is a bit finicky, don't scan too much +#define I2C_NO_RESCAN // I2C is a bit finicky, don't scan too much #define WIRE_INTERFACES_COUNT 1 // 2 -#define PIN_WIRE_SDA (24) //change to use the correct pins if needed -#define PIN_WIRE_SCL (25) //change to use the correct pins if needed +#define PIN_WIRE_SDA (24) // change to use the correct pins if needed +#define PIN_WIRE_SCL (25) // change to use the correct pins if needed static const uint8_t SDA = PIN_WIRE_SDA; static const uint8_t SCL = PIN_WIRE_SCL; - // GPS L76KB #define GPS_L76K #ifdef GPS_L76K -#define PIN_GPS_RX D6 +#define PIN_GPS_RX D6 #define PIN_GPS_TX D7 #define HAS_GPS 1 #define GPS_BAUDRATE 9600 @@ -149,8 +144,6 @@ static const uint8_t SCL = PIN_WIRE_SCL; #define PIN_GPS_STANDBY D0 #endif - - // Battery #define BAT_READ \