Browse Source

Remove useless attachToDisplay

Alexey Edelev 4 years ago
parent
commit
1cdda3ec00

+ 7 - 7
Arduino/eScooterControl/eScooterControl.ino

@@ -51,6 +51,12 @@ void setup() {
     ButtonControl::instance()->dispatch();
   });
 
+  delay(500);
+  Display::instance();
+  gDisplayThread.assignCallback([](){
+    Display::instance()->updateDisplayBuffer();
+  });
+
   delay(1000);
   AccelerationControl::instance();
   gAcceleratorPedalThread.assignCallback([](){
@@ -62,13 +68,7 @@ void setup() {
   });
 
   delay(500);
-  Speedometer::instance()->attachToDisplay(Display::instance());
-
-  delay(500);
-  Display::instance();
-  gDisplayThread.assignCallback([](){
-    Display::instance()->updateDisplayBuffer();
-  });
+  Speedometer::instance();
 
   gBatteryThread.assignCallback([](){
     Display::instance()->setBatteryLevel(fakeBatteryLevel);

+ 1 - 8
Arduino/eScooterControl/speedometer.cpp

@@ -45,16 +45,11 @@ void callback() {
 Speedometer::Speedometer() : mMomentSpeed(0)
  ,mLastHallTime(0)
  ,mHallCounter(0)
- ,mDisplay(nullptr)
 {
   pinMode(HallSensorPin, INPUT_PULLUP);
   attachInterrupt(digitalPinToInterrupt(HallSensorPin), callback, RISING);
 }
 
-void Speedometer::attachToDisplay(Display *display) {
-  mDisplay = display;
-}
-
 void Speedometer::incrementHallCounter()
 {
   mHallCounter++;
@@ -65,8 +60,6 @@ void Speedometer::incrementHallCounter()
     mMomentSpeed = TireLengthCoef / (currentTime - mLastHallTime);
     mLastHallTime = currentTime;
   
-    if (mDisplay != nullptr) {
-      mDisplay->setSpeed(mMomentSpeed);
-    }
+    Display::instance()->setSpeed(mMomentSpeed);
   }
 }

+ 1 - 5
Arduino/eScooterControl/speedometer.h

@@ -32,11 +32,9 @@
 
 #include "singleton.h"
 
-class Display;
-
 class Speedometer : public Singleton<Speedometer> {
 public:
-  void attachToDisplay(Display *display);
+  void attachToDisplay();
   void incrementHallCounter();
 
 private:
@@ -46,6 +44,4 @@ private:
   byte mMomentSpeed;
   unsigned long mLastHallTime;
   byte mHallCounter;//TODO: Not used for now, need for moment speed correction
-  
-  Display *mDisplay;
 };