Merge pull request #34 from Fastium/FIX/init-dec_order

FIX initialisation and declaration order

.gitignore

@@ -6,4 +6,3 @@ BUILD
 mbed-os
 DISCO_h747i
 advdembsof_library
-update-client

.mbedignore

@@ -14,5 +14,4 @@ mbed-os/features/FEATURE_BOOTLOADER/*
 mbed-os/features/frameworks/mbed-client-cli/*
 mbed-os/features/frameworks/COMPONENT_FPGA_CI_TEST_SHIELD/*
 mbed-os/platform/randlib/*
-mbed-os/storage/kvstore/*
+mbed-os/storage/kvstore/*
-mbed-os-bootloader/*

CONTRIBUTING.md

@@ -0,0 +1,5 @@
+# Contributing to Mbed OS
+
+Mbed OS is an open-source, device software platform for the Internet of Things. Contributions are an important part of the platform, and our goal is to make it as simple as possible to become a contributor.
+
+To encourage productive collaboration, as well as robust, consistent and maintainable code, we have a set of guidelines for [contributing to Mbed OS](https://os.mbed.com/docs/mbed-os/latest/contributing/index.html).

LICENSE

@@ -0,0 +1,165 @@
+Apache License
+Version 2.0, January 2004
+http://www.apache.org/licenses/
+
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+1. Definitions.
+
+"License" shall mean the terms and conditions for use, reproduction, and
+distribution as defined by Sections 1 through 9 of this document.
+
+"Licensor" shall mean the copyright owner or entity authorized by the copyright
+owner that is granting the License.
+
+"Legal Entity" shall mean the union of the acting entity and all other entities
+that control, are controlled by, or are under common control with that entity.
+For the purposes of this definition, "control" means (i) the power, direct or
+indirect, to cause the direction or management of such entity, whether by
+contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the
+outstanding shares, or (iii) beneficial ownership of such entity.
+
+"You" (or "Your") shall mean an individual or Legal Entity exercising
+permissions granted by this License.
+
+"Source" form shall mean the preferred form for making modifications, including
+but not limited to software source code, documentation source, and configuration
+files.
+
+"Object" form shall mean any form resulting from mechanical transformation or
+translation of a Source form, including but not limited to compiled object code,
+generated documentation, and conversions to other media types.
+
+"Work" shall mean the work of authorship, whether in Source or Object form, made
+available under the License, as indicated by a copyright notice that is included
+in or attached to the work (an example is provided in the Appendix below).
+
+"Derivative Works" shall mean any work, whether in Source or Object form, that
+is based on (or derived from) the Work and for which the editorial revisions,
+annotations, elaborations, or other modifications represent, as a whole, an
+original work of authorship. For the purposes of this License, Derivative Works
+shall not include works that remain separable from, or merely link (or bind by
+name) to the interfaces of, the Work and Derivative Works thereof.
+
+"Contribution" shall mean any work of authorship, including the original version
+of the Work and any modifications or additions to that Work or Derivative Works
+thereof, that is intentionally submitted to Licensor for inclusion in the Work
+by the copyright owner or by an individual or Legal Entity authorized to submit
+on behalf of the copyright owner. For the purposes of this definition,
+"submitted" means any form of electronic, verbal, or written communication sent
+to the Licensor or its representatives, including but not limited to
+communication on electronic mailing lists, source code control systems, and
+issue tracking systems that are managed by, or on behalf of, the Licensor for
+the purpose of discussing and improving the Work, but excluding communication
+that is conspicuously marked or otherwise designated in writing by the copyright
+owner as "Not a Contribution."
+
+"Contributor" shall mean Licensor and any individual or Legal Entity on behalf
+of whom a Contribution has been received by Licensor and subsequently
+incorporated within the Work.
+
+2. Grant of Copyright License.
+
+Subject to the terms and conditions of this License, each Contributor hereby
+grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free,
+irrevocable copyright license to reproduce, prepare Derivative Works of,
+publicly display, publicly perform, sublicense, and distribute the Work and such
+Derivative Works in Source or Object form.
+
+3. Grant of Patent License.
+
+Subject to the terms and conditions of this License, each Contributor hereby
+grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free,
+irrevocable (except as stated in this section) patent license to make, have
+made, use, offer to sell, sell, import, and otherwise transfer the Work, where
+such license applies only to those patent claims licensable by such Contributor
+that are necessarily infringed by their Contribution(s) alone or by combination
+of their Contribution(s) with the Work to which such Contribution(s) was
+submitted. If You institute patent litigation against any entity (including a
+cross-claim or counterclaim in a lawsuit) alleging that the Work or a
+Contribution incorporated within the Work constitutes direct or contributory
+patent infringement, then any patent licenses granted to You under this License
+for that Work shall terminate as of the date such litigation is filed.
+
+4. Redistribution.
+
+You may reproduce and distribute copies of the Work or Derivative Works thereof
+in any medium, with or without modifications, and in Source or Object form,
+provided that You meet the following conditions:
+
+You must give any other recipients of the Work or Derivative Works a copy of
+this License; and
+You must cause any modified files to carry prominent notices stating that You
+changed the files; and
+You must retain, in the Source form of any Derivative Works that You distribute,
+all copyright, patent, trademark, and attribution notices from the Source form
+of the Work, excluding those notices that do not pertain to any part of the
+Derivative Works; and
+If the Work includes a "NOTICE" text file as part of its distribution, then any
+Derivative Works that You distribute must include a readable copy of the
+attribution notices contained within such NOTICE file, excluding those notices
+that do not pertain to any part of the Derivative Works, in at least one of the
+following places: within a NOTICE text file distributed as part of the
+Derivative Works; within the Source form or documentation, if provided along
+with the Derivative Works; or, within a display generated by the Derivative
+Works, if and wherever such third-party notices normally appear. The contents of
+the NOTICE file are for informational purposes only and do not modify the
+License. You may add Your own attribution notices within Derivative Works that
+You distribute, alongside or as an addendum to the NOTICE text from the Work,
+provided that such additional attribution notices cannot be construed as
+modifying the License.
+You may add Your own copyright statement to Your modifications and may provide
+additional or different license terms and conditions for use, reproduction, or
+distribution of Your modifications, or for any such Derivative Works as a whole,
+provided Your use, reproduction, and distribution of the Work otherwise complies
+with the conditions stated in this License.
+
+5. Submission of Contributions.
+
+Unless You explicitly state otherwise, any Contribution intentionally submitted
+for inclusion in the Work by You to the Licensor shall be under the terms and
+conditions of this License, without any additional terms or conditions.
+Notwithstanding the above, nothing herein shall supersede or modify the terms of
+any separate license agreement you may have executed with Licensor regarding
+such Contributions.
+
+6. Trademarks.
+
+This License does not grant permission to use the trade names, trademarks,
+service marks, or product names of the Licensor, except as required for
+reasonable and customary use in describing the origin of the Work and
+reproducing the content of the NOTICE file.
+
+7. Disclaimer of Warranty.
+
+Unless required by applicable law or agreed to in writing, Licensor provides the
+Work (and each Contributor provides its Contributions) on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied,
+including, without limitation, any warranties or conditions of TITLE,
+NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are
+solely responsible for determining the appropriateness of using or
+redistributing the Work and assume any risks associated with Your exercise of
+permissions under this License.
+
+8. Limitation of Liability.
+
+In no event and under no legal theory, whether in tort (including negligence),
+contract, or otherwise, unless required by applicable law (such as deliberate
+and grossly negligent acts) or agreed to in writing, shall any Contributor be
+liable to You for damages, including any direct, indirect, special, incidental,
+or consequential damages of any character arising as a result of this License or
+out of the use or inability to use the Work (including but not limited to
+damages for loss of goodwill, work stoppage, computer failure or malfunction, or
+any and all other commercial damages or losses), even if such Contributor has
+been advised of the possibility of such damages.
+
+9. Accepting Warranty or Additional Liability.
+
+While redistributing the Work or Derivative Works thereof, You may choose to
+offer, and charge a fee for, acceptance of support, warranty, indemnity, or
+other liability obligations and/or rights consistent with this License. However,
+in accepting such obligations, You may act only on Your own behalf and on Your
+sole responsibility, not on behalf of any other Contributor, and only if You
+agree to indemnify, defend, and hold each Contributor harmless for any liability
+incurred by, or claims asserted against, such Contributor by reason of your
+accepting any such warranty or additional liability.

main.cpp

@@ -8,9 +8,7 @@
 #include "mbed.h"  // NOLINT
 #include "mbed_trace.h"
 // #include "static_scheduling/bike_system.hpp"
-#include "FlashIAPBlockDevice.h"
 #include "static_scheduling_with_event/bike_system.hpp"
-#include "update-client/usb_serial_uc.hpp"
 
 #if defined(MBED_CONF_MBED_TRACE_ENABLE)
 #define TRACE_GROUP "MAIN"
@@ -21,25 +19,12 @@ int main() {
     mbed_trace_init();
 #endif
 
-    tr_info("Start");
-
-    FlashIAPBlockDevice flashIAPBlockDevice(MBED_ROM_START, MBED_ROM_SIZE);
-    update_client::USBSerialUC usbSerialUpdateClient(flashIAPBlockDevice);
-    update_client::UCErrorCode rc = usbSerialUpdateClient.start();
-    if (rc != update_client::UCErrorCode::UC_ERR_NONE) {
-        tr_error("Cannot initialize update client: %d", rc);
-    } else {
-        tr_info("Update client started");
-    }
-
     // static_scheduling::BikeSystem bikeSystem;
-    static_scheduling_with_event::BikeSystem bikeSystem;
+    // bikeSystem.start();
-
-    tr_debug("Starting Bike System");
     // bikeSystem.startWithEventQueue();
+
+    static_scheduling_with_event::BikeSystem bikeSystem;
     bikeSystem.start();
-    while (true) {
-    }
 }
 
 #endif  // MBED_TEST_MODE

mbed-os-bootloader/.clang-format

@@ -1,12 +0,0 @@
----
-BasedOnStyle: Google
-IndentWidth: 4
----
-Language: Cpp
-ColumnLimit: 90
-AlignConsecutiveAssignments: true
-DerivePointerAlignment: false
-PointerAlignment: Left
-BinPackArguments: false
-BinPackParameters: false
-IndentAccessModifiers: false

mbed-os-bootloader/.gitignore

@@ -1,8 +0,0 @@
-.build
-.mbed
-projectfiles
-*.py*
-mbed-os
-BUILD
-!BUILD/DISCO_H747I/GCC_ARM/mbed-os-bootloader.bin
-update-client

mbed-os-bootloader/.mbedignore

@@ -1,17 +0,0 @@
-mbed-os/drivers/device_key/*
-mbed-os/drivers/source/usb/USBMSD.cpp
-mbed-os/drivers/source/SFDP.cpp
-mbed-os/connectivity/cellular/*
-mbed-os/connectivity/drivers/*
-mbed-os/connectivity/FEATURE_BLE/*
-mbed-os/connectivity/libraries/*
-mbed-os/connectivity/lorawan/*
-mbed-os/connectivity/lwipstack/*
-mbed-os/connectivity/nanostack/*
-mbed-os/connectivity/netsocket/*
-mbed-os/connectivity/nfc/*
-mbed-os/features/FEATURE_BOOTLOADER/*
-mbed-os/features/frameworks/mbed-client-cli/*
-mbed-os/features/frameworks/COMPONENT_FPGA_CI_TEST_SHIELD/*
-mbed-os/platform/randlib/*
-mbed-os/storage/kvstore/*

mbed-os-bootloader/.pre-commit-config.yaml

@@ -1,26 +0,0 @@
-files: ^main.cpp
-repos:
-  - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.3.0
-    hooks:
-      - id: check-yaml
-        args: [--allow-multiple-documents]
-      - id: end-of-file-fixer
-      - id: trailing-whitespace
-  - repo: https://github.com/pre-commit/mirrors-clang-format
-    rev: "v14.0.6"
-    hooks:
-      - id: clang-format
-  - repo: https://github.com/cpplint/cpplint
-    rev: "1.6.1"
-    hooks:
-      - id: cpplint
-        name: cpplint
-        entry: cpplint --linelength=90 --filter=-build/include_subdir,-whitespace/indent,-build/namespaces,-build/c++11
-  - repo: local
-    hooks:
-      - id: cppcheck
-        name: cppcheck
-        require_serial: true
-        entry: cppcheck --enable=all --suppress=missingInclude --inline-suppr -i mbed-os --std=c++14 --error-exitcode=1
-        language: system

mbed-os-bootloader/main.cpp

@@ -1,53 +0,0 @@
-#include "mbed.h"
-#include "FlashIAPBlockDevice.h"
-#include "update-client/block_device_application.hpp"
-
-#include "mbed_trace.h"
-#if MBED_CONF_MBED_TRACE_ENABLE
-#define TRACE_GROUP "BOOTLOADER"
-#endif // MBED_CONF_MBED_TRACE_ENABLE
-
-#if MBED_CONF_MBED_TRACE_ENABLE
-static UnbufferedSerial g_uart(CONSOLE_TX, CONSOLE_RX);
-
-// Function that directly outputs to an unbuffered serial port in blocking mode.
-static void boot_debug(const char *s) {
-    size_t len = strlen(s);
-    g_uart.write(s, len);
-    g_uart.write("\r\n", 2);
-}
-#endif
-
-int main() {
-#if MBED_CONF_MBED_TRACE_ENABLE
-    mbed_trace_init();
-    mbed_trace_print_function_set(boot_debug);
-#endif // MBED_CONF_MBED_TRACE_ENABLE
-
-    tr_debug("BikeComputer bootloader\r");
-
-    FlashIAPBlockDevice flashIAPBlockDevice(MBED_ROM_START, MBED_ROM_SIZE);
-    int ret = flashIAPBlockDevice.init();
-    if(ret == 0) {
-        update_client::BlockDeviceApplication app(flashIAPBlockDevice, HEADER_ADDR - MBED_ROM_START, POST_APPLICATION_ADDR - MBED_ROM_START); //MBED_CONF_UPDATE_CLIENT_STORAGE_ADDRESS);//
-        tr_debug("Checking active application\n");
-
-        tr_debug("MBED_ROM_START : 0x%08x", MBED_ROM_START);
-        tr_debug("MBED_ROM_SIZE : 0x%08x", MBED_ROM_SIZE);
-        tr_debug("HEADER_ADDR : 0x%08x", HEADER_ADDR);
-        tr_debug("APPLICATION_ADDR : 0x%08x", APPLICATION_ADDR);
-        tr_debug("POST_APPLICATION_ADDR : 0x%08x\n", POST_APPLICATION_ADDR);
-
-        update_client::UCErrorCode ret = app.checkApplication();
-        if(ret == update_client::UCErrorCode::UC_ERR_NONE) {
-            tr_debug("Application is valid");
-            void *sp = *((void **) POST_APPLICATION_ADDR + 0);  // NOLINT(readability/casting)
-            void *pc = *((void **) POST_APPLICATION_ADDR + 1);  // NOLINT(readability/casting)
-            tr_debug("Starting application at address 0x%08x (sp 0x%08x, pc 0x%08x)", POST_APPLICATION_ADDR, (uint32_t) sp, (uint32_t) pc);
-            mbed_start_application(POST_APPLICATION_ADDR);
-        }
-        tr_error("Error on check of the application");
-    }
-	tr_error("Error on init flash IAP block device");
-    return -1;
-}

mbed-os-bootloader/mbed-os.lib

@@ -1 +0,0 @@
-https://github.com/ARMmbed/mbed-os.git#17dc3dc2e6e2817a8bd3df62f38583319f0e4fed

mbed-os-bootloader/mbed_app.json

@@ -1,32 +0,0 @@
-{
-    "macros": [
-      "MBED_CONF_MBED_TRACE_FEA_IPV6=0",
-      "MBED_BOOTLOADER_FLASH_BANK_SIZE=MBED_ROM_SIZE/2"
-    ],
-    "config": {
-      "main-stack-size": {
-       "value": 4096
-      }
-    },
-    "target_overrides": {
-      "*": {
-        "mbed-trace.enable": false,
-        "platform.stdio-convert-newlines": true,
-        "platform.stdio-baud-rate": 115200,
-        "platform.default-serial-baud-rate": 115200,
-        "platform.stdio-buffered-serial": true,
-        "platform.all-stats-enabled": true,
-        "target.printf_lib":"minimal-printf",
-        "platform.minimal-printf-enable-floating-point": true,
-        "platform.minimal-printf-set-floating-point-max-decimals": 2,
-        "update-client.storage-address": "(MBED_BOOTLOADER_FLASH_BANK_SIZE)",
-        "update-client.storage-size": "(MBED_BOOTLOADER_FLASH_BANK_SIZE)",
-        "update-client.storage-locations": 2
-      },
-      "DISCO_H747I": {
-        "target.restrict_size": "0x20000",
-        "mbed-trace.enable": true,
-        "mbed-trace.max-level": "TRACE_LEVEL_DEBUG"
-      }
-    }
-  }

mbed-os-bootloader/mbed_lib.json

@@ -1,22 +0,0 @@
-{
-  "name": "bootloader",
-  "target_overrides": {
-    "*": {
-      "target.header_format": [
-        ["magic", "const", "32be", "0x5a51b3d4"],
-        ["version", "const", "32be", "2"],
-        ["firmwareVersion", "timestamp", "64be", null],
-        ["firmwareSize", "size", "64be", ["application"]],
-        ["firmwareHash", "digest", "SHA256", "application"],
-        ["hashpad", "const", "64be", "0"],
-        ["hashpad", "const", "64be", "0"],
-        ["hashpad", "const", "64be", "0"],
-        ["hashpad", "const", "64be", "0"],
-        ["campaign", "const", "64be", "0"],
-        ["campaign", "const", "64be", "0"],
-        ["firmwareSignatureSize", "const", "32be", "0"],
-        ["headerCRC", "digest", "CRCITT32be", "header"]
-      ]
-    }
-  }
-}

mbed-os-bootloader/update-client.lib

@@ -1 +0,0 @@
-https://github.com/SergeAyer/update-client#82fe2add70c714d9ce943f1a7dc5fda7dba75dba

mbed_app.json

@@ -1,8 +1,6 @@
 {
     "macros": [
-      "MBED_CONF_MBED_TRACE_FEA_IPV6=0",
+      "MBED_CONF_MBED_TRACE_FEA_IPV6=0"
-      "MBED_BOOTLOADER_FLASH_BANK_SIZE=MBED_ROM_SIZE/2",
-      "USE_USB_SERIAL_UC=1"
     ],
     "config": {
       "main-stack-size": {
@@ -19,16 +17,11 @@
         "platform.all-stats-enabled": true,
         "target.printf_lib":"minimal-printf",
         "platform.minimal-printf-enable-floating-point": true,
-        "platform.minimal-printf-set-floating-point-max-decimals": 2,
+        "platform.minimal-printf-set-floating-point-max-decimals": 2
-        "update-client.storage-address": "(MBED_BOOTLOADER_FLASH_BANK_SIZE)",
-        "update-client.storage-size": "(MBED_BOOTLOADER_FLASH_BANK_SIZE)",
-        "update-client.storage-locations": 2
       },
       "DISCO_H747I": {
         "mbed-trace.enable": true,
-        "mbed-trace.max-level": "TRACE_LEVEL_DEBUG",
+        "mbed-trace.max-level": "TRACE_LEVEL_DEBUG"      
-        "target.bootloader_img":"./mbed-os-bootloader/BUILD/DISCO_H747I/GCC_ARM/mbed-os-bootloader.bin",
-        "target.header_offset": "0x20000"
       }
     }
   }

mbed_lib.json

@@ -1,22 +0,0 @@
-{
-  "name": "bootloader",
-  "target_overrides": {
-    "*": {
-      "target.header_format": [
-        ["magic", "const", "32be", "0x5a51b3d4"],
-        ["version", "const", "32be", "2"],
-        ["firmwareVersion", "timestamp", "64be", null],
-        ["firmwareSize", "size", "64be", ["application"]],
-        ["firmwareHash", "digest", "SHA256", "application"],
-        ["hashpad", "const", "64be", "0"],
-        ["hashpad", "const", "64be", "0"],
-        ["hashpad", "const", "64be", "0"],
-        ["hashpad", "const", "64be", "0"],
-        ["campaign", "const", "64be", "0"],
-        ["campaign", "const", "64be", "0"],
-        ["firmwareSignatureSize", "const", "32be", "0"],
-        ["headerCRC", "digest", "CRCITT32be", "header"]
-      ]
-    }
-  }
-}

my_candidate_applications.cpp

@@ -1,83 +0,0 @@
-#include "my_candidate_applications.h"
-
-#include "mbed_trace.h"
-#if MBED_CONF_MBED_TRACE_ENABLE
-#define TRACE_GROUP "MyCandidateApplications"
-#endif  // MBED_CONF_MBED_TRACE_ENABLE
-
-update_client::CandidateApplications *createCandidateApplications(
-    BlockDevice &blockDevice,
-    mbed::bd_addr_t storageAddr,
-    mbed::bd_size_t storageSize,
-    uint32_t headerSize,
-    uint32_t nSlots
-){
-    tr_debug("Create my candidate application");
-    update_client::CandidateApplications* candidate = new bike_computer::MyCandidateApplications(blockDevice, storageAddr, storageSize, headerSize, nSlots);
-    return candidate;
-}
-
-namespace bike_computer {
-
-MyCandidateApplications::MyCandidateApplications(
-    BlockDevice &blockDevice,
-    mbed::bd_addr_t storageAddr,
-    mbed::bd_size_t storageSize,
-    uint32_t headerSize,
-    uint32_t nSlots
-) : update_client::CandidateApplications(blockDevice, storageAddr, storageSize, headerSize, nSlots) {
-
-}
-
-uint32_t MyCandidateApplications::getSlotForCandidate() {
-    tr_debug("Get slot for candidate");
-
-    uint32_t nbrOfSlots = getNbrOfSlots();
-
-    for (uint32_t slotIndex = 0; slotIndex < nbrOfSlots; slotIndex++) {
-        if (! getBlockDeviceApplication(slotIndex).isValid()) {
-            return slotIndex;
-        }
-    }
-
-    // return the slot of the oldest firmware candidates
-    uint32_t oldestSlotIndex = 0;
-    uint64_t oldestFirmwareVersion = getBlockDeviceApplication(oldestSlotIndex).getFirmwareVersion();
-    for (uint32_t slotIndex = 1; slotIndex < nbrOfSlots; slotIndex++) {
-        mbed::bd_addr_t candidateAddress = 0;
-        mbed::bd_size_t slotSize = 0;
-        getCandidateAddress(slotIndex, candidateAddress, slotSize);
-        tr_debug("Checking application at slot %" PRIu32 " (address 0x%" PRIx64 ", size %" PRIu64 ")",
-                 slotIndex, candidateAddress, slotSize);
-
-        if (getBlockDeviceApplication(slotIndex).getFirmwareVersion() < oldestFirmwareVersion) {
-            oldestSlotIndex = slotIndex;
-            oldestFirmwareVersion = getBlockDeviceApplication(slotIndex).getFirmwareVersion();
-        }
-    }
-    return oldestSlotIndex;
-}
-
-//uint32_t MyCandidateApplications::getSlotForCandidate() {
-//    mbed::bd_addr_t _storageAddress = MBED_CONF_UPDATE_CLIENT_STORAGE_ADDRESS;
-//    tr_debug("Get slot for candidate");
-//
-//    FlashIAPBlockDevice flashIAPBlockDevice(MBED_ROM_START, MBED_ROM_SIZE);
-//    int ret = flashIAPBlockDevice.init();
-//
-//    if(ret == 0){
-//        for (int i = 0; i < getNbrOfSlots(); i++) {
-//            mbed::bd_addr_t headerAddress = HEADER_ADDR - MBED_ROM_START;
-//            mbed::bd_addr_t applicationAddress = _storageAddress + i * getSlotSize();
-//            update_client::BlockDeviceApplication activeApplication(flashIAPBlockDevice, headerAddress, applicationAddress);
-//            update_client::UCErrorCode rc = activeApplication.checkApplication();
-//
-//            if (update_client::UCErrorCode::UC_ERR_NONE != rc) {
-//                return _storageAddress + i * getSlotSize();
-//            }
-//        }
-//    }
-//    return -1;
-//}
-
-}

my_candidate_applications.h

@@ -1,24 +0,0 @@
-#pragma once
-#include "update-client/candidate_applications.hpp"
-
-namespace bike_computer {
-class MyCandidateApplications : public update_client::CandidateApplications {
-public:
-    MyCandidateApplications(
-        BlockDevice &blockDevice,
-        mbed::bd_addr_t storageAddr,
-        mbed::bd_size_t storageSize,
-        uint32_t headerSize,
-        uint32_t nSlots
-    );
-	virtual uint32_t getSlotForCandidate() override;
-};
-}
-
-update_client::CandidateApplications *createCandidateApplications(
-    BlockDevice &blockDevice,
-    mbed::bd_addr_t storageAddr,
-    mbed::bd_size_t storageSize,
-    uint32_t headerSize,
-    uint32_t nSlots
-);

static_scheduling/bike_system.cpp

@@ -61,7 +61,10 @@ BikeSystem::BikeSystem()
     : _gearDevice(_timer),
       _pedalDevice(_timer),
       _resetDevice(_timer),
+      _displayDevice(),
       _speedometer(_timer),
+      _sensorDevice(),
+      _taskLogger(),
       _cpuLogger(_timer) {}
 
 void BikeSystem::start() {
@@ -205,29 +208,18 @@ void BikeSystem::speedDistanceTask() {
         _timer, advembsof::TaskLogger::kSpeedTaskIndex, taskStartTime);
 }
 
-void BikeSystem::temperatureTask() {
+void BikeSystem::displayTask1() {
     auto taskStartTime = _timer.elapsed_time();
 
-    tr_warn("Tick1 %" PRIu64, _timer.elapsed_time().count());
+    _displayDevice.displayGear(_currentGear);
-
+    _displayDevice.displaySpeed(_currentSpeed);
-    // no need to protect access to data members (single threaded)
+    _displayDevice.displayDistance(_traveledDistance);
-    _currentTemperature = _sensorDevice.readTemperature();
-
-    tr_warn("Tick2 %" PRIu64, _timer.elapsed_time().count());
 
     ThisThread::sleep_for(std::chrono::duration_cast<std::chrono::milliseconds>(
-        kTemperatureTaskComputationTime - (_timer.elapsed_time() - taskStartTime)));
+        kDisplayTask1ComputationTime - (_timer.elapsed_time() - taskStartTime)));
-
-    // simulate task computation by waiting for the required task computation time
-
-    //    std::chrono::microseconds elapsedTime =
-    //    std::chrono::microseconds::zero(); while (elapsedTime <
-    //    kTemperatureTaskComputationTime) {
-    //        elapsedTime = _timer.elapsed_time() - taskStartTime;
-    //    }
 
     _taskLogger.logPeriodAndExecutionTime(
-        _timer, advembsof::TaskLogger::kTemperatureTaskIndex, taskStartTime);
+        _timer, advembsof::TaskLogger::kDisplayTask1Index, taskStartTime);
 }
 
 void BikeSystem::resetTask() {
@@ -243,27 +235,17 @@ void BikeSystem::resetTask() {
     _taskLogger.logPeriodAndExecutionTime(
         _timer, advembsof::TaskLogger::kResetTaskIndex, taskStartTime);
 }
-
+void BikeSystem::temperatureTask() {
-void BikeSystem::displayTask1() {
     auto taskStartTime = _timer.elapsed_time();
 
-    _displayDevice.displayGear(_currentGear);
+    // no need to protect access to data members (single threaded)
-    _displayDevice.displaySpeed(_currentSpeed);
+    _currentTemperature = _sensorDevice.readTemperature();
-    _displayDevice.displayDistance(_traveledDistance);
 
     ThisThread::sleep_for(std::chrono::duration_cast<std::chrono::milliseconds>(
-        kDisplayTask1ComputationTime - (_timer.elapsed_time() - taskStartTime)));
+        kTemperatureTaskComputationTime - (_timer.elapsed_time() - taskStartTime)));
-
-    // simulate task computation by waiting for the required task computation time
-
-    //    std::chrono::microseconds elapsedTime =
-    //    std::chrono::microseconds::zero(); while (elapsedTime <
-    //    kDisplayTask1ComputationTime) {
-    //        elapsedTime = _timer.elapsed_time() - taskStartTime;
-    //    }
 
     _taskLogger.logPeriodAndExecutionTime(
-        _timer, advembsof::TaskLogger::kDisplayTask1Index, taskStartTime);
+        _timer, advembsof::TaskLogger::kTemperatureTaskIndex, taskStartTime);
 }
 
 void BikeSystem::displayTask2() {
@@ -274,13 +256,6 @@ void BikeSystem::displayTask2() {
     ThisThread::sleep_for(std::chrono::duration_cast<std::chrono::milliseconds>(
         kDisplayTask2ComputationTime - (_timer.elapsed_time() - taskStartTime)));
 
-    // simulate task computation by waiting for the required task computation time
-
-    //    std::chrono::microseconds elapsedTime =
-    //    std::chrono::microseconds::zero(); while (elapsedTime <
-    //    kDisplayTask2ComputationTime) {
-    //        elapsedTime = _timer.elapsed_time() - taskStartTime;
-    //    }
     _taskLogger.logPeriodAndExecutionTime(
         _timer, advembsof::TaskLogger::kDisplayTask2Index, taskStartTime);
 }

static_scheduling/pedal_device.cpp

@@ -37,7 +37,7 @@ namespace static_scheduling {
 
 static constexpr std::chrono::microseconds kTaskRunTime = 200000us;
 
-PedalDevice::PedalDevice(Timer& timer) : _timer(timer) {}
+PedalDevice::PedalDevice(Timer& timer) : _timer(timer), _pedalRotationTime(0) {}
 
 std::chrono::milliseconds PedalDevice::getCurrentRotationTime() {
     std::chrono::microseconds initialTime = _timer.elapsed_time();

static_scheduling/pedal_device.hpp

@@ -46,9 +46,9 @@ class PedalDevice {
     void decreaseRotationSpeed();
 
     // data members
+    Timer& _timer;
     std::chrono::milliseconds _pedalRotationTime =
         bike_computer::kInitialPedalRotationTime;
-    Timer& _timer;
 };
 
 }  // namespace static_scheduling

static_scheduling/reset_device.cpp

@@ -43,7 +43,8 @@ namespace static_scheduling {
 
 static constexpr std::chrono::microseconds kTaskRunTime = 100000us;
 
-ResetDevice::ResetDevice(Timer& timer) : _timer(timer), _resetButton(PUSH_BUTTON) {
+ResetDevice::ResetDevice(Timer& timer)
+    : _resetButton(PUSH_BUTTON), _timer(timer), _pressTime(0) {
     _resetButton.rise(callback(this, &ResetDevice::onRise));
 }
 

static_scheduling_with_event/bike_system.cpp

@@ -62,12 +62,15 @@ static constexpr std::chrono::milliseconds kDisplayTask2ComputationTime = 100ms;
 static constexpr std::chrono::milliseconds kCPUTaskPeriod          = 1600ms;
 static constexpr std::chrono::milliseconds kCPUTaskDelay           = 1200ms;
 static constexpr std::chrono::milliseconds kCPUTaskComputationTime = 100ms;
-
+  
 BikeSystem::BikeSystem()
     : _gearDevice(),
       _pedalDevice(),
       _resetDevice(callback(this, &BikeSystem::onReset)),
+      _displayDevice(),
       _speedometer(_timer),
+      _sensorDevice(),
+      _taskLogger(),
       _cpuLogger(_timer) {}
 
 void BikeSystem::start() {
@@ -175,22 +178,19 @@ void BikeSystem::speedDistanceTask() {
     _taskLogger.logPeriodAndExecutionTime(
         _timer, advembsof::TaskLogger::kSpeedTaskIndex, taskStartTime);
 }
-
+  
-void BikeSystem::temperatureTask() {
+void BikeSystem::displayTask1() {
     auto taskStartTime = _timer.elapsed_time();
 
-    // tr_warn("Tick1 %" PRIu64, _timer.elapsed_time().count());
+    _displayDevice.displayGear(_currentGear);
-
+    _displayDevice.displaySpeed(_currentSpeed);
-    // no need to protect access to data members (single threaded)
+    _displayDevice.displayDistance(_traveledDistance);
-    _currentTemperature = _sensorDevice.readTemperature();
-
-    // tr_warn("Tick2 %" PRIu64, _timer.elapsed_time().count());
 
     ThisThread::sleep_for(std::chrono::duration_cast<std::chrono::milliseconds>(
-        kTemperatureTaskComputationTime - (_timer.elapsed_time() - taskStartTime)));
+        kDisplayTask1ComputationTime - (_timer.elapsed_time() - taskStartTime)));
 
     _taskLogger.logPeriodAndExecutionTime(
-        _timer, advembsof::TaskLogger::kTemperatureTaskIndex, taskStartTime);
+        _timer, advembsof::TaskLogger::kDisplayTask1Index, taskStartTime);
 }
 
 void BikeSystem::resetTask() {
@@ -208,18 +208,17 @@ void BikeSystem::resetTask() {
         _timer, advembsof::TaskLogger::kResetTaskIndex, taskStartTime);
 }
 
-void BikeSystem::displayTask1() {
+void BikeSystem::temperatureTask() {
     auto taskStartTime = _timer.elapsed_time();
 
-    _displayDevice.displayGear(_currentGear);
+    // no need to protect access to data members (single threaded)
-    _displayDevice.displaySpeed(_currentSpeed);
+    _currentTemperature = _sensorDevice.readTemperature();
-    _displayDevice.displayDistance(_traveledDistance);
 
     ThisThread::sleep_for(std::chrono::duration_cast<std::chrono::milliseconds>(
-        kDisplayTask1ComputationTime - (_timer.elapsed_time() - taskStartTime)));
+        kTemperatureTaskComputationTime - (_timer.elapsed_time() - taskStartTime)));
 
     _taskLogger.logPeriodAndExecutionTime(
-        _timer, advembsof::TaskLogger::kDisplayTask1Index, taskStartTime);
+        _timer, advembsof::TaskLogger::kTemperatureTaskIndex, taskStartTime);
 }
 
 void BikeSystem::displayTask2() {

update-client.lib

@@ -1 +0,0 @@
-https://github.com/SergeAyer/update-client#82fe2add70c714d9ce943f1a7dc5fda7dba75dba