summaryrefslogtreecommitdiff
path: root/src/components/motor/MotorController.h
diff options
context:
space:
mode:
authorMark Russell <mruss660@gmail.com>2021-09-16 20:20:39 (GMT)
committerMark Russell <mruss660@gmail.com>2021-09-16 20:20:39 (GMT)
commitb9e56843a29672b2befa65bf036f6db21078291f (patch)
treec2fa91e352127c09abd0f9b4959cd1f47d628ea8 /src/components/motor/MotorController.h
parentcdf99b08f42c3826a8608d756bc7cda0a476ed98 (diff)
parent3eb73774a39e255cd4b5de76441a59f1525a989c (diff)
resolve conflict in src/systemtask/Messages.h
Diffstat (limited to 'src/components/motor/MotorController.h')
-rw-r--r--src/components/motor/MotorController.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/src/components/motor/MotorController.h b/src/components/motor/MotorController.h
index d2c9fe5..cf78088 100644
--- a/src/components/motor/MotorController.h
+++ b/src/components/motor/MotorController.h
@@ -1,12 +1,10 @@
#pragma once
#include <cstdint>
-#include "app_timer.h"
#include "components/settings/Settings.h"
namespace Pinetime {
namespace Controllers {
- static constexpr uint8_t pinMotor = 16;
class MotorController {
public: