Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 5 additions & 1 deletion components/math/example/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,11 @@ cmake_minimum_required(VERSION 3.20)
set(ENV{IDF_COMPONENT_MANAGER} "0")
include($ENV{IDF_PATH}/tools/cmake/project.cmake)

add_compile_options(-Wdouble-promotion)
# NOTE: -Wdouble-promotion (to keep this float-only example honest on targets
# without hardware double support) is applied to the example's own code in
# main/CMakeLists.txt, NOT globally: applying it project-wide also compiled it
# into ESP-IDF's own components, whose code trips it under IDF v6's newer GCC
# (e.g. esp_hw_support/port/esp32/rtc_clk.c) and fails their -Werror build.

# add the component directories that we want to use
set(EXTRA_COMPONENT_DIRS
Expand Down
4 changes: 4 additions & 0 deletions components/math/example/main/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,6 @@
idf_component_register(SRC_DIRS "."
INCLUDE_DIRS ".")

# Keep this example float-only (esp32 has no hardware double). Scoped to the
# example's own translation units so it does not reach ESP-IDF's components.
target_compile_options(${COMPONENT_LIB} PRIVATE -Wdouble-promotion)
2 changes: 1 addition & 1 deletion components/meshtastic/include/meshtastic.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ class MeshtasticNode : public BaseComponent {
std::vector<uint8_t> psk{1}; ///< The channel PSK. Default {1} = the public
///< default key. See meshtastic::expand_psk.

transmit_fn transmit; ///< Function used to transmit frames
transmit_fn transmit{nullptr}; ///< Function used to transmit frames
Comment thread
finger563 marked this conversation as resolved.

uint8_t hop_limit{3}; ///< Hop limit for originated broadcasts (0-7)
bool rebroadcast{false}; ///< Whether to rebroadcast (relay) others' packets
Expand Down
8 changes: 8 additions & 0 deletions components/meshtastic/src/meshtastic_crypto.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,15 @@
#include <array>
#include <cstring>

#include <mbedtls/build_info.h> // for MBEDTLS_VERSION_MAJOR
#if MBEDTLS_VERSION_MAJOR >= 4
// mbedtls 4.x (ESP-IDF v6+) moved the low-level AES API to a private header; the
// mbedtls_aes_* functions used below are unchanged and still available there.
// (PSA Crypto is the recommended long-term API.)
#include <mbedtls/private/aes.h>
#else
#include <mbedtls/aes.h>
#endif

namespace espp::meshtastic {

Expand Down
11 changes: 6 additions & 5 deletions components/st7123touch/include/st7123touch.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -48,11 +48,12 @@ class St7123Touch : public BasePeripheral<std::uint16_t> {
/// happier with the separate form (e.g. when reads run from an interrupt handler and the
/// longer combined transaction is more prone to I/O errors).
struct Config {
BasePeripheral::write_fn
write; ///< Write function (paired with <tt>read</tt> for separate reads)
BasePeripheral::read_fn read; ///< Read function (paired with <tt>write</tt> for separate reads)
BasePeripheral::write_then_read_fn
write_then_read; ///< Combined (repeated-START) write-then-read; takes precedence if set
BasePeripheral::write_fn write{
nullptr}; ///< Write function (paired with <tt>read</tt> for separate reads)
BasePeripheral::read_fn read{
nullptr}; ///< Read function (paired with <tt>write</tt> for separate reads)
BasePeripheral::write_then_read_fn write_then_read{
nullptr}; ///< Combined (repeated-START) write-then-read; takes precedence if set
uint8_t address = DEFAULT_ADDRESS; ///< I2C address of the chip
espp::Logger::Verbosity log_level{
espp::Logger::Verbosity::WARN}; ///< Log verbosity for the driver
Comment thread
finger563 marked this conversation as resolved.
Expand Down
Loading