fix build pipeline

Author: matth-x

.github/workflows/documentation.yml

@@ -13,8 +13,8 @@ permissions:
   contents: write
 
 jobs:
-  build_simulator:
-    name: Build Simulator
+  measure_heap:
+    name: Heap measurements
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v3
@@ -34,7 +34,7 @@ jobs:
       with:
         repository: matth-x/MicroOcppSimulator
         path: MicroOcppSimulator
-        ref: 2cb07cdbe53954a694a29336ab31eac2d2b48673
+        ref: 65b1c2e9c8a3f40907a823a0bc2f657423ebef65
         submodules: 'recursive'
     - name: Clean MicroOcpp submodule
       run: |
@@ -47,32 +47,8 @@ jobs:
       run: cmake -S ./MicroOcppSimulator -B ./MicroOcppSimulator/build -DCMAKE_CXX_FLAGS="-DMO_OVERRIDE_ALLOCATION=1 -DMO_ENABLE_HEAP_PROFILER=1"
     - name: Compile
       run: cmake --build ./MicroOcppSimulator/build -j 32 --target mo_simulator
-    - name: Upload Simulator executable
-      uses: actions/upload-artifact@v4
-      with:
-        name: Simulator executable
-        path: |
-          MicroOcppSimulator/build/mo_simulator
-          MicroOcppSimulator/public/bundle.html.gz
-        if-no-files-found: error
-        retention-days: 1
-
-  measure_heap:
-    needs: build_simulator
-    name: Heap measurements
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v3
-    - uses: actions/setup-python@v4
-      with:
-        python-version: 3.x
     - name: Install Python dependencies
       run: pip install requests paramiko pandas
-    - name: Get Simulator
-      uses: actions/download-artifact@v4
-      with:
-        name: Simulator executable
-        path: MicroOcppSimulator
     - name: Measure heap and create reports
       run: |
         mkdir -p docs/assets/tables
@@ -81,23 +57,25 @@ jobs:
         TEST_DRIVER_URL: ${{ secrets.TEST_DRIVER_URL }}
         TEST_DRIVER_CONFIG: ${{ secrets.TEST_DRIVER_CONFIG }}
         TEST_DRIVER_KEY: ${{ secrets.TEST_DRIVER_KEY }}
+        TEST_DRIVER_CERT: ${{ secrets.TEST_DRIVER_CERT }}
         MO_SIM_CONFIG: ${{ secrets.MO_SIM_CONFIG }}
         MO_SIM_OCPP_SERVER: ${{ secrets.MO_SIM_OCPP_SERVER }}
-        MO_SIM_API_CERT: ${{ secrets.MO_SIM_API_CERT }}
-        MO_SIM_API_KEY: ${{ secrets.MO_SIM_API_KEY }}
-        MO_SIM_API_CONFIG: ${{ secrets.MO_SIM_API_CONFIG }}
-        SSH_LOCAL_PRIV: ${{ secrets.SSH_LOCAL_PRIV }}
-        SSH_HOST_PUB: ${{ secrets.SSH_HOST_PUB }}
+        MO_SIM_OCPP_CERT: ${{ secrets.MO_SIM_OCPP_CERT }}
+        MO_SIM_RMT_CTRL_CONFIG: ${{ secrets.MO_SIM_RMT_CTRL_CONFIG }}
+        MO_SIM_RMT_CTRL_CERT: ${{ secrets.MO_SIM_RMT_CTRL_CERT }}
     - name: Upload reports
       uses: actions/upload-artifact@v4
       with:
         name: Memory usage reports CSV
         path: docs/assets/tables
         if-no-files-found: error
 
-  build_firmware_size:
+  build_firmware:
     name: Build firmware
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        part: [v16, v201, v16_v201]
     steps:
     - uses: actions/checkout@v3
     - name: Cache pip
@@ -119,35 +97,28 @@ jobs:
         python -m pip install --upgrade pip
         pip install --upgrade platformio
     - name: Run PlatformIO
-      run: pio ci --lib="." --build-dir="${{ github.workspace }}/../build" --keep-build-dir --project-conf="./tests/benchmarks/firmware_size/platformio.ini" ./tests/benchmarks/firmware_size/main.cpp
-    - name: Move firmware files # change path to location without parent dir ('..') statement (to make upload-artifact happy)
+      run: pio ci --lib="." --build-dir="${{ github.workspace }}/../build" --keep-build-dir --project-conf="./tests/benchmarks/firmware_size/platformio.ini" -e ${{ matrix.part }} ./tests/benchmarks/firmware_size/main.cpp
+    - name: Move firmware file # change path to location without parent dir ('..') statement (to make upload-artifact happy)
       run: |
         mkdir firmware
-        mv "${{ github.workspace }}/../build/.pio/build/v16/firmware.elf"  firmware/firmware_v16.elf
-        mv "${{ github.workspace }}/../build/.pio/build/v201/firmware.elf" firmware/firmware_v201.elf
-    - name: Upload firmware linker files
+        mv "${{ github.workspace }}/../build/.pio/build/${{ matrix.part }}/firmware.elf"  "firmware/firmware_${{ matrix.part }}.elf"
+    - name: Upload firmware linker file
       uses: actions/upload-artifact@v4
       with:
-        name: Firmware linker files
+        name: Firmware linker file ${{ matrix.part }}
         path: firmware
         if-no-files-found: error
         retention-days: 1
 
-  evaluate_firmware:
-    needs: build_firmware_size
-    name: Static firmware analysis
+  build_bloaty:
+    name: Build Google bloaty
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v3
-    - uses: actions/setup-python@v4
-      with:
-        python-version: 3.x
     - uses: actions/cache@v2
       with:
         key: ${{ github.ref }}
         path: .cache
-    - name: Install Python dependencies
-      run: pip install pandas 
     - name: Get build tools
       run: |
         sudo apt update
@@ -165,16 +136,53 @@ jobs:
       run: |
         cmake -B tools/bloaty/build -G Ninja -S tools/bloaty
         cmake --build tools/bloaty/build -j 32
-    - name: Get firmware linker files
+    - name: Upload bloaty executable
+      uses: actions/upload-artifact@v4
+      with:
+        name: Google bloaty
+        path: tools/bloaty/build/bloaty
+        if-no-files-found: error
+        retention-days: 1
+
+  evaluate_firmware:
+    needs: [build_firmware, build_bloaty]
+    name: Static firmware analysis
+    steps:
+    - uses: actions/checkout@v3
+    - uses: actions/cache@v2
+      with:
+        key: ${{ github.ref }}
+        path: .cache
+    - name: Set up Python
+      uses: actions/setup-python@v4
+    - name: Install Python dependencies
+      run: pip install pandas
+    - name: Get firmware linker file
+      uses: actions/download-artifact@v4
+      with:
+        name: Firmware linker file v16
+        path: firmware
+    - name: Get firmware linker file
+      uses: actions/download-artifact@v4
+      with:
+        name: Firmware linker file v201
+        path: firmware
+    - name: Get firmware linker file
       uses: actions/download-artifact@v4
       with:
-        name: Firmware linker files
+        name: Firmware linker file v16_v201
         path: firmware
+    - name: Get bloaty executable
+      uses: actions/download-artifact@v4
+      with:
+        name: Google bloaty
+        path: tools/bloaty/build/bloaty
     - name: Run bloaty
       run: |
         mkdir -p docs/assets/tables
         tools/bloaty/build/bloaty firmware/firmware_v16.elf  -d compileunits --csv -n 0 > docs/assets/tables/bloaty_v16.csv
         tools/bloaty/build/bloaty firmware/firmware_v201.elf -d compileunits --csv -n 0 > docs/assets/tables/bloaty_v201.csv
+        tools/bloaty/build/bloaty firmware/firmware_v16_v201.elf -d compileunits --csv -n 0 > docs/assets/tables/bloaty_v16_v201.csv
     - name: Evaluate and create reports
       run: python tests/benchmarks/scripts/eval_firmware_size.py
     - name: Upload reports

src/MicroOcpp.h

@@ -186,16 +186,12 @@ bool mo_beginTransaction_authorized2(MO_Context *ctx, unsigned int evseId, const
 
 #if MO_ENABLE_V201
 //Same as mo_beginTransaction, but function name fits better for OCPP 2.0.1 and more options for 2.0.1.
-//Attempt to authorize a pending transaction, or create new transactino to authorize. If local
+//Attempt to authorize a pending transaction, or create new transaction to authorize. If local
 //authorization is enabled, will search the local whitelist if server response takes too long.
 //Backwards-compatible: if MO is initialized with 1.6, then this is the same as `mo_beginTransaction()`
 bool mo_authorizeTransaction(const char *idToken); //idTokenType ISO14443 is assumed
 bool mo_authorizeTransaction2(MO_Context *ctx, unsigned int evseId, const char *idToken, MO_IdTokenType type);
 bool mo_authorizeTransaction3(MO_Context *ctx, unsigned int evseId, const char *idToken, MO_IdTokenType type, bool validateIdToken, const char *groupIdToken);
-
-//Same as `mo_beginAuthorization()`, but skip authorization. `groupIdToken` can be NULL
-bool mo_setTransactionAuthorized(const char *idToken, const char *groupIdToken); //idTokenType ISO14443 is assumed
-bool mo_setTransactionAuthorized2(MO_Context *ctx, unsigned int evseId, const char *idToken, MO_IdTokenType type, const char *groupIdToken);
 #endif //MO_ENABLE_V201
 
 /*

src/MicroOcpp/Model/Diagnostics/DiagnosticsService.cpp

@@ -509,6 +509,7 @@ MO_UploadLogStatus DiagnosticsService::getUploadStatus() {
     return status;
 }
 
+#if MO_ENABLE_V16
 v16::DiagnosticsStatus DiagnosticsService::getUploadStatus16() {
 
     MO_UploadLogStatus status = getUploadStatus();
@@ -535,6 +536,7 @@ v16::DiagnosticsStatus DiagnosticsService::getUploadStatus16() {
     }
     return res;
 }
+#endif //MO_ENABLE_V16
 
 void DiagnosticsService::setDiagnosticsReader(size_t (*diagnosticsReader)(char *buf, size_t size, void *user_data), void(*onClose)(void *user_data), void *user_data) {
     this->diagnosticsReader = diagnosticsReader;

src/MicroOcpp/Model/RemoteControl/RemoteControlService.h

@@ -5,6 +5,7 @@
 #ifndef MO_REMOTECONTROLSERVICE_H
 #define MO_REMOTECONTROLSERVICE_H
 
+#include <MicroOcpp/Core/Operation.h>
 #include <MicroOcpp/Model/RemoteControl/RemoteControlDefs.h>
 #include <MicroOcpp/Model/SmartCharging/SmartChargingModel.h>
 #include <MicroOcpp/Model/Transactions/Transaction.h>

src/MicroOcpp/Model/Reset/ResetService.cpp

@@ -15,7 +15,7 @@
 #include <MicroOcpp/Model/Transactions/TransactionService201.h>
 #include <MicroOcpp/Debug.h>
 
-#if MO_ENABLE_V16
+#if MO_ENABLE_V16 || MO_ENABLE_V201
 
 #ifndef MO_RESET_DELAY
 #define MO_RESET_DELAY 10
@@ -38,6 +38,10 @@ void (*defaultExecuteResetImpl)() = nullptr;
 
 #endif //MO_PLATFORM
 
+#endif //MO_ENABLE_V16 || MO_ENABLE_V201
+
+#if MO_ENABLE_V16
+
 using namespace MicroOcpp;
 
 v16::ResetService::ResetService(Context& context)

src/MicroOcpp/Model/SmartCharging/SmartChargingService.cpp

@@ -232,7 +232,7 @@ void SmartChargingServiceEvse::trackTransaction() {
             }
         } else {
             //check if transaction has just been completed
-            if (trackTxRmtProfileId >= 0 || trackTxStart.isDefined() || trackTransactionId16 >= 0) {
+            if (trackTxRmtProfileId >= 0 || trackTxStart.isDefined() || *trackTransactionId201) {
                 //yes, clear data
                 update = true;
                 trackTxRmtProfileId = -1;

src/MicroOcpp/Model/Transactions/TransactionService16.cpp

@@ -28,6 +28,8 @@
 #include <MicroOcpp/Core/Request.h>
 #include <MicroOcpp/Core/Connection.h>
 
+#if MO_ENABLE_V16
+
 #ifndef MO_TX_CLEAN_ABORTED
 #define MO_TX_CLEAN_ABORTED 1
 #endif
@@ -1499,3 +1501,5 @@ TransactionServiceEvse* TransactionService::getEvse(unsigned int evseId) {
 
     return evses[evseId];
 }
+
+#endif //MO_ENABLE_V16

src/MicroOcpp/Operations/Heartbeat.cpp

@@ -10,7 +10,6 @@
 #if MO_ENABLE_V16 || MO_ENABLE_V201
 
 using namespace MicroOcpp;
-using namespace MicroOcpp::v16;
 
 Heartbeat::Heartbeat(Context& context) : MemoryManaged("v16.Operation.", "Heartbeat"), context(context) {