FIX cpplint errors

This commit is contained in:
fastium 2024-12-30 17:52:08 +01:00
parent 4c9a0e25a7
commit ca33d26769
7 changed files with 79 additions and 66 deletions

View File

@ -1,4 +1,4 @@
files: ^main.cpp|^static_scheduling|^static_scheduling_with_event|^TESTS files: ^main.cpp|^static_scheduling|^static_scheduling_with_event|^TESTS|^multi_tasking
repos: repos:
- repo: https://github.com/pre-commit/pre-commit-hooks - repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.3.0 rev: v4.3.0
@ -22,6 +22,5 @@ repos:
- id: cppcheck - id: cppcheck
name: cppcheck name: cppcheck
require_serial: true require_serial: true
entry: cppcheck --enable=all --suppress=missingInclude --inline-suppr -i mbed-os --std=c++14 --error-exitcode=1 entry: cppcheck --enable=all --suppress=missingInclude --suppress=missingIncludeSystem --suppress=unusedFunction --inline-suppr -i mbed-os --std=c++14 --error-exitcode=1
# --suppress=missingIncludeSystem
language: system language: system

View File

@ -38,17 +38,12 @@
namespace multi_tasking { namespace multi_tasking {
GearDevice::GearDevice() { GearDevice::GearDevice() {
disco::Joystick::getInstance().setUpCallback( disco::Joystick::getInstance().setUpCallback(callback(this, &GearDevice::onUp));
callback(this, &GearDevice::onUp)); disco::Joystick::getInstance().setDownCallback(callback(this, &GearDevice::onDown));
disco::Joystick::getInstance().setDownCallback(
callback(this, &GearDevice::onDown));
} }
uint8_t GearDevice::getCurrentGear() { uint8_t GearDevice::getCurrentGear() { return core_util_atomic_load_u8(&_currentGear); }
return core_util_atomic_load_u8(&_currentGear);
}
uint8_t GearDevice::getCurrentGearSize() const { uint8_t GearDevice::getCurrentGearSize() const {
return bike_computer::kMaxGearSize - core_util_atomic_load_u8(&_currentGear); return bike_computer::kMaxGearSize - core_util_atomic_load_u8(&_currentGear);
@ -66,4 +61,4 @@ void GearDevice::onDown() {
} }
} }
} // namespace static_scheduling } // namespace multi_tasking

View File

@ -33,7 +33,7 @@ namespace multi_tasking {
class GearDevice { class GearDevice {
public: public:
explicit GearDevice(); // NOLINT(runtime/references) GearDevice(); // NOLINT(runtime/references)
// make the class non copyable // make the class non copyable
GearDevice(GearDevice&) = delete; GearDevice(GearDevice&) = delete;
@ -51,4 +51,4 @@ class GearDevice {
volatile uint8_t _currentGear = bike_computer::kMinGear; volatile uint8_t _currentGear = bike_computer::kMinGear;
}; };
} // namespace static_scheduling } // namespace multi_tasking

View File

@ -1,3 +1,17 @@
// Copyright 2022 Haute école d'ingénierie et d'architecture de Fribourg
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
/**************************************************************************** /****************************************************************************
* @file pedal_device.cpp * @file pedal_device.cpp
* @author Rémi Heredero <remi@heredero.ch> * @author Rémi Heredero <remi@heredero.ch>
@ -23,18 +37,15 @@
namespace multi_tasking { namespace multi_tasking {
PedalDevice::PedalDevice() { PedalDevice::PedalDevice() {
disco::Joystick::getInstance().setLeftCallback( disco::Joystick::getInstance().setLeftCallback(callback(this, &PedalDevice::onLeft));
callback(this, &PedalDevice::onLeft)
);
disco::Joystick::getInstance().setRightCallback( disco::Joystick::getInstance().setRightCallback(
callback(this, &PedalDevice::onRight) callback(this, &PedalDevice::onRight));
);
} }
std::chrono::milliseconds PedalDevice::getCurrentRotationTime() { std::chrono::milliseconds PedalDevice::getCurrentRotationTime() {
uint32_t currentStep = core_util_atomic_load_u32(&_currentStep); uint32_t currentStep = core_util_atomic_load_u32(&_currentStep);
return bike_computer::kMinPedalRotationTime + currentStep * bike_computer::kDeltaPedalRotationTime; return bike_computer::kMinPedalRotationTime +
currentStep * bike_computer::kDeltaPedalRotationTime;
} }
void PedalDevice::increaseRotationSpeed() { void PedalDevice::increaseRotationSpeed() {
@ -51,12 +62,8 @@ namespace multi_tasking {
} }
} }
void PedalDevice::onLeft() { void PedalDevice::onLeft() { decreaseRotationSpeed(); }
decreaseRotationSpeed();
}
void PedalDevice::onRight() { void PedalDevice::onRight() { increaseRotationSpeed(); }
increaseRotationSpeed();
}
} } // namespace multi_tasking

View File

@ -51,10 +51,9 @@ class PedalDevice {
// data members // data members
volatile uint32_t _currentStep = static_cast<uint32_t>( volatile uint32_t _currentStep = static_cast<uint32_t>(
( (bike_computer::kInitialPedalRotationTime - bike_computer::kMinPedalRotationTime)
bike_computer::kInitialPedalRotationTime - bike_computer::kMinPedalRotationTime .count() /
).count() / bike_computer::kDeltaPedalRotationTime.count() bike_computer::kDeltaPedalRotationTime.count());
);
}; };
} // namespace static_scheduling } // namespace multi_tasking

View File

@ -1,3 +1,17 @@
// Copyright 2022 Haute école d'ingénierie et d'architecture de Fribourg
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
/**************************************************************************** /****************************************************************************
* @file reset_device.cpp * @file reset_device.cpp
* @author Rémi Heredero <remi@heredero.ch> * @author Rémi Heredero <remi@heredero.ch>

View File

@ -39,10 +39,9 @@ class ResetDevice {
ResetDevice& operator=(ResetDevice&) = delete; ResetDevice& operator=(ResetDevice&) = delete;
private: private:
// data members // data members
// instance representing the reset button // instance representing the reset button
InterruptIn _resetButton; InterruptIn _resetButton;
}; };
} // namespace static_scheduling } // namespace multi_tasking