From 2cdccea809e7c266a9a5ed001a645eed3b6f43dc Mon Sep 17 00:00:00 2001 From: Giampaolo Mancini Date: Fri, 6 Aug 2021 15:13:17 +0200 Subject: [PATCH] Refactor Encoders class and remove statics --- src/Arduino_MachineControl.h | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/Arduino_MachineControl.h b/src/Arduino_MachineControl.h index 2fe6102..f181699 100644 --- a/src/Arduino_MachineControl.h +++ b/src/Arduino_MachineControl.h @@ -390,12 +390,11 @@ extern AnalogOutClass analog_out; TODO: writeme Use QEI library for mbed since it implements index pin */ - -static QEI _enc_0(PJ_8, PH_12, PH_11, 0); -static QEI _enc_1(PC_13, PI_7, PJ_10, 0); - class EncoderClass { public: + EncoderClass() + : enc_0{PJ_8, PH_12, PH_11, 0} + , enc_1{PC_13, PI_7, PJ_10, 0} {}; QEI& operator[](int index) { switch (index) { case 0: @@ -405,8 +404,8 @@ class EncoderClass { } } private: - QEI& enc_0 = _enc_0; - QEI& enc_1 = _enc_1; + QEI enc_0; + QEI enc_1; }; extern EncoderClass encoders;