Remove input_channel argument from ValueConsumer

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 2.7.1-alpha
+current_version = 3.0.0-alpha1
 commit = True
 tag = False
 parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(\-(?P<release>[a-z]+))?

.clang-format

@@ -1,3 +1,9 @@
 ---
 BasedOnStyle: Google
 IndentWidth: 2
+IncludeBlocksStyle: Regroup
+IncludeCategories:
+  - Regex: '"sensesp\.h"'
+    Priority: -1000
+  - Regex: '"esp32-hal-log\.h"'
+    Priority: -900

.editorconfig

@@ -12,5 +12,5 @@ insert_final_newline = true
 [Makefile]
 indent_style = tab
 
-[*.{c,h,cpp,hpp}]
+[*.{c,h,cpp,hpp,js,ts,jsx,tsx,css,scss,html,xml,json,yml,md}]
 indent_size = 2

.github/workflows/test.yml

@@ -4,7 +4,6 @@ on: [push, pull_request]
 
 jobs:
   build:
-
     runs-on: ubuntu-latest
     strategy:
       matrix:
@@ -26,13 +25,19 @@ jobs:
         target_device:
           - esp32dev
     steps:
-      - uses: actions/checkout@v1
-      - name: Set up Python
-        uses: actions/setup-python@v1
+      - uses: actions/checkout@v3
+      - uses: actions/cache@v3
+        with:
+          path: |
+            ~/.cache/pip
+            ~/.platformio/.cache
+          key: ${{ runner.os }}-pio
+      - uses: actions/setup-python@v4
+        with:
+          python-version: "3.11"
       - name: Install dependencies
         run: |
-          python -m pip install --upgrade pip
-          pip install platformio
+          pip install --upgrade platformio
       - name: Run PlatformIO
         run: ci/run-ci.sh
         env:

Doxyfile

@@ -38,7 +38,7 @@ PROJECT_NAME           = SensESP
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = 2.7.1-alpha
+PROJECT_NUMBER         = 3.0.0-alpha
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a

VERSION

@@ -1 +1 @@
-2.7.1-alpha
+3.0.0-alpha

ci/platformio-esp32dev.ini

@@ -15,3 +15,9 @@ board_build.partitions = min_spiffs.csv
 monitor_filters = esp32_exception_decoder
 build_flags =
    -D LED_BUILTIN=2
+   -D CORE_DEBUG_LEVEL=ARDUHAL_LOG_LEVEL_VERBOSE
+   ; Arduino Core bug workaround: define the log tag for the Arduino
+   ; logging macros.
+   -D TAG='"Arduino"'
+   ; Use the ESP-IDF logging library - required by SensESP.
+   -D USE_ESP_IDF_LOG

docs/pages/migration/index.md

@@ -4,14 +4,77 @@ title: Migrating From Version 1
 nav_order: 70
 ---
 
-# Migrating SensESP Version 1 Projects to Version 2
+# Migration Guides for SensESP Major Versions
+
+## Migrating SensESP Version 2 Projects to Version 3
+
+
+
+### Logging
+
+Previous SensESP versions logged to the serial port using the `debugX` functions, where `X` is the log level.
+This pattern was inherited from the RemoteDebug library.
+SensESP v3 has switched to using standard ESP-IDF logging functions.
+They allow redirecting log messages to different outputs, which will be used in future SensESP versions to provide logging to the web interface.
+
+To enable logging in SensESP v3, change the `build_flags` in your `platformio.ini` file to include the following:
+
+```ini
+build_flags =
+   -D LED_BUILTIN=2
+   ; Max (and default) debugging level in Arduino ESP32 Core
+   -D CORE_DEBUG_LEVEL=ARDUHAL_LOG_LEVEL_VERBOSE
+   ; Arduino Core bug workaround: define the log tag for the Arduino
+   ; logging macros.
+   -D TAG='"ARDUINO"'
+   ; Use the ESP-IDF logging library - required by SensESP.
+   -D USE_ESP_IDF_LOG
+```
+
+The `debugX` functions are still available, but they are now just wrappers around the ESP-IDF logging functions.
+In any new code, use the `ESP_LOGX` functions, where `X` is the log level.
+These require a tag argument, which is a string that identifies the source of the log message.
+You can use any tag you like, but for simple programs, you can use the `__FILE__` macro, which expands to the name of the current file.
+
+The allowed log levels are:
+
+- `NONE`: No log output
+- `ERROR`: Critical errors, software module can not recover on its own
+- `WARN`: Error conditions from which recovery measures have been taken
+- `INFO`: Information messages which describe normal flow of events
+- `DEBUG`: Extra information which is not necessary for normal use (values, pointers, sizes, etc).
+- `VERBOSE`: Bigger chunks of debugging information, or frequent messages which can potentially flood the output.
+
+Here is an example of how to use the `ESP_LOGX` functions:
+
+```c++
+ESP_LOGI(__FILE__, "Initializing NMEA2000");
+...
+ESP_LOGD(__FILE__, "Sending value %d to fobulator %s", value, fobulator_name);
+...
+ESP_LOGE(__FILE__, "Failed to initialize NMEA2000");
+```
+
+To enable logging in previous SensESP versions, you had to call `SetupSerialDebug(115200)` as the first line in your `setup()` function.
+In new SensESP versions, replace this with the new `SetupLogging()` function call to set logging defaults.
+The old `SetupSerialDebug` function is still available, but it is now just a wrapper around `SetupLogging`.
+
+It is possible to change the log level for individual tags.
+Here is an example of how to set the overall log level to `INFO` and the log level for the `main.cpp` tag to `DEBUG`:
+
+```c++
+esp_log_level_set("*", ESP_LOG_INFO);
+esp_log_level_set("main.cpp", ESP_LOG_DEBUG);
+```
+
+## Migrating SensESP Version 1 Projects to Version 2
 
 SensESP version 2 has a number of backwards-incompatible changes compared to the previous version.
 Most of the changes are trivial, while some others require a bit of more work to update the code.
 
 This document walks through the most important changes, and explains how to update your project to the new version.
 
-## ESP8266 Support Removed
+### ESP8266 Support Removed
 
 If your project uses ESP8266 hardware, you will either have to update to an ESP32 device, *or* you can keep using SensESP version 1. To peg your project to SensESP v1, change the SensESP dependency in your project's `platformio.ini` file `lib_deps` section to this:
 
@@ -20,9 +83,9 @@ lib_deps =
     SignalK/SensESP @ ^1.0.8
 ```
 
-## Main Program Structure
+### Main Program Structure
 
-### Setup and Loop Functions
+#### Setup and Loop Functions
 
 SensESP builds on [ReactESP](https://github.com/mairas/ReactESP), which is an event-based framework for developing ESP32 firmware.
 Previous versions of ReactESP defined the Arduino Framework default `setup()` and `loop()` functions internally and relied on a lambda function for initializing the program and defining the top-level functionality:
@@ -56,7 +119,7 @@ void setup() {
 void loop() { app.tick(); }
 ```
 
-### Namespace Usage
+#### Namespace Usage
 
 In projects with a lot of dependencies, it is common that some upstream library exports some very generic symbol names, which then causes conflicts or hard-to-debug issues in the code being developed. The standard C++ approach to mitigate these issues is to use a namespace.
 
@@ -87,7 +150,7 @@ namespace sensesp {
 }
 ```
 
-## External Sensors
+### External Sensors
 
 All Sensor classes requiring external libraries have been removed.
 Reducing the number of external dependencies improves code stability and improves build times.
@@ -97,7 +160,7 @@ Most, however, have been removed in favor of a more generic approach, namely the
 The `RepeatSensor` class allows you to easily interface any external hardware sensor libraries with SensESP.
 See the `RepeatSensor` tutorials ([part 1](../tutorials/bmp280), [part 2](../tutorials/bmp280)) for more details.
 
-## Renamed Classes and Types
+### Renamed Classes and Types
 
 Type-specific Consumer and Producer class names have been renamed to more closely match the native C++ types.
 
@@ -109,15 +172,15 @@ Similarly, names with other types have been renamed to more closely match the st
 
 To better reflect the intent and the functionality, the `Enable` class has been renamed to `Startable`.
 
-## Class Interface Changes
+### Class Interface Changes
 
 Some class public interfaces have been changed.
 
 The [`DigitalInputState`](https://signalk.org/SensESP/generated/docs/classsensesp_1_1_digital_input_state.html) constructor no longer accepts the `interrupt_type` argument because that class never used interrupts.
 
 The [`DigitalInputChange`](https://signalk.org/SensESP/generated/docs/classsensesp_1_1_digital_input_change.html) implementation has been simplified and the constructor no longer requres the `read_delay` argument.
 
-## System Info Sensors
+### System Info Sensors
 
 SensESP v1 had so called "standard sensors" that transmit information on the operation of the device: free memory, number of event loop executions per second, device IP address, and so on.
 The standard sensors were initialized using a SensESP constructor or builder bitfield argument:
@@ -135,7 +198,7 @@ sensesp_app = builder.enable_free_mem_sensor()
                      ->get_app();
 ```
 
-## Remote Debugger Disabled
+### Remote Debugger Disabled
 
 The Remote Debugger allows you to connect to the device over telnet and view the log messages and even reset the device, all without a USB cable connection.
 Even though this is a neat and useful feature, it was not widely known and uses *a lot* of memory.
@@ -161,7 +224,7 @@ build_flags =
     -D DEBUG_DISABLED
 ```
 
-## Over-The-Air (OTA) Firmware Updates
+### Over-The-Air (OTA) Firmware Updates
 
 OTA firmware updates have been supported already for a long time.
 To improve security, OTA updates are now enabled only if an OTA password is defined in the App builder:

examples/analog_input.cpp

@@ -1,7 +1,8 @@
 
+#include "sensesp/sensors/analog_input.h"
+
 #include <Arduino.h>
 
-#include "sensesp/sensors/analog_input.h"
 #include "sensesp/signalk/signalk_output.h"
 #include "sensesp/transforms/linear.h"
 #include "sensesp_app.h"
@@ -16,9 +17,7 @@ reactesp::ReactESP app;
 // The setup function performs one-time application initialization.
 void setup() {
 // Some initialization boilerplate when in debug mode...
-#ifndef SERIAL_DEBUG_DISABLED
-  SetupSerialDebug(115200);
-#endif
+  SetupLogging();
 
   // Create the global SensESPApp() object.
   SensESPAppBuilder builder;
@@ -90,9 +89,6 @@ void setup() {
   analog_input->connect_to(new Linear(multiplier, offset, linear_config_path))
       ->connect_to(new SKOutputFloat(sk_path, "",
                                      new SKMetadata("ratio", "Indoor light")));
-
-  // Start the SensESP application running
-  sensesp_app->start();
 }
 
 // The loop function is called in an endless loop during program execution.

examples/async_repeat_sensor.cpp

@@ -17,10 +17,7 @@ reactesp::ReactESP app;
 
 // The setup function performs one-time application initialization.
 void setup() {
-// Some initialization boilerplate when in debug mode...
-#ifndef SERIAL_DEBUG_DISABLED
-  SetupSerialDebug(115200);
-#endif
+  SetupLogging();
 
   // Create the global SensESPApp() object.
   SensESPAppBuilder builder;
@@ -56,9 +53,6 @@ void setup() {
   // Connect the output of the digital input to the SKOutput object which
   // transmits the results to the Signal K server.
   digital->connect_to(new SKOutputFloat(sk_path, ""));
-
-  // Start the SensESP application running
-  sensesp_app->start();
 }
 
 // The loop function is called in an endless loop during program execution.

examples/chain_counter.cpp

@@ -1,10 +1,10 @@
-#include "sensesp_app.h"
-#include "sensesp_app_builder.h"
 #include "sensesp/sensors/digital_input.h"
 #include "sensesp/signalk/signalk_output.h"
 #include "sensesp/system/lambda_consumer.h"
 #include "sensesp/transforms/debounce.h"
 #include "sensesp/transforms/integrator.h"
+#include "sensesp_app.h"
+#include "sensesp_app_builder.h"
 
 using namespace sensesp;
 
@@ -25,7 +25,7 @@ using namespace sensesp;
 ReactESP app;
 
 void setup() {
-  SetupSerialDebug(115200);
+  SetupLogging();
 
   SensESPAppBuilder builder;
   sensesp_app = builder.set_hostname("ChainCounter")
@@ -48,17 +48,17 @@ void setup() {
                               counter_read_delay, counter_config_path);
 
   /**
-   * An IntegratorT<int, float> called "accumulator" adds up all the counts it
+   * An Integrator<int, float> called "accumulator" adds up all the counts it
    * receives (which are ints) and multiplies each count by gypsy_circum, which
    * is the amount of chain, in meters, that is moved by each revolution of the
    * windlass. (Since gypsy_circum is a float, the output of this transform must
-   * be a float, which is why we use IntegratorT<int, float>). It can be
+   * be a float, which is why we use Integrator<int, float>). It can be
    * configured in the Config UI at accum_config_path.
    */
   float gypsy_circum = 0.32;
   String accum_config_path = "/accumulator/circum";
   auto* accumulator =
-      new IntegratorT<int, float>(gypsy_circum, 0.0, accum_config_path);
+      new Integrator<int, float>(gypsy_circum, 0.0, accum_config_path);
 
   /**
    * There is no path for the amount of anchor rode deployed in the current
@@ -96,8 +96,8 @@ void setup() {
    */
   int read_delay = 10;
   String read_delay_config_path = "/button_watcher/read_delay";
-  auto* button_watcher = new DigitalInputChange(
-      BUTTON_PIN, INPUT, read_delay, read_delay_config_path);
+  auto* button_watcher = new DigitalInputChange(BUTTON_PIN, INPUT, read_delay,
+                                                read_delay_config_path);
 
   /**
    * Create a DebounceInt to make sure we get a nice, clean signal from the
@@ -144,9 +144,6 @@ void setup() {
 
   /* Connect the button_watcher to the debounce to the button_consumer. */
   button_watcher->connect_to(debounce)->connect_to(button_consumer);
-
-  /* Finally, start the SensESPApp */
-  sensesp_app->start();
 }
 
 // The loop function is called in an endless loop during program execution.

examples/constant_sensor.cpp

@@ -12,17 +12,15 @@
  */
 
 #include "sensesp/sensors/constant_sensor.h"
+
 #include "sensesp_app_builder.h"
 
 using namespace sensesp;
 
 reactesp::ReactESP app;
 
 void setup() {
-  // Some initialization boilerplate when in debug mode...
-#ifndef SERIAL_DEBUG_DISABLED
-  SetupSerialDebug(115200);
-#endif
+  SetupLogging();
 
   // Create the builder object
   SensESPAppBuilder builder;
@@ -37,9 +35,6 @@ void setup() {
   constant_sensor->connect_to(
       new SKOutputFloat("tanks.freshWater.capacity", "",
                         new SKMetadata("m3", "Fresh Water Tank Capacity")));
-
-  // Start the SensESP application running
-  sensesp_app->start();
 }
 
 void loop() { app.tick(); }