LapCounter finished and working

src/modules/gps/gps.cpp

@@ -128,6 +128,7 @@ int Gps::loop(unsigned long timeout_ms) {
         gpsTriggerGlobalWrite(start_line_trigger_);
         arm_sign_ = 0;
         state_changed_at_ = now;
+        router::send(module::All, task::AllStartLineTriggered);
       }
       break;
     };
@@ -173,7 +174,11 @@ GpsData Gps::getData() {
   output.course_.valid_ = gps_->course.isValid();
   output.course_.value_ = gps_->course.deg();
 
+  output.time_ = gps_->time.value();
+  output.time_write_time_ = millis() - gps_->time.age();
+
   output.num_fix_ = gps_->sentencesWithFix();
+  gps_->time.minute();
 
   return output;
 }

src/modules/lap_counter/lap_counter.cpp

@@ -4,6 +4,9 @@
 #include "lap_counter.h"
 #include "base/router.h"
 #include "data/general_store.h"
+#include "data/gps_store.h"
+#include "data/track_store.h"
+#include "custom_types.h"
 
 int LapCounter::push(const Task &task) { return queue_.push(task); }
 
@@ -11,4 +14,62 @@ LapCounter::LapCounter() : logger_(nullptr) {};
 
 LapCounter::LapCounter(SystemLogger *logger) : logger_(logger) {};
 
-LapCounter::~LapCounter() {}
+LapCounter::~LapCounter() {}
+
+int LapCounter::init() {
+  counting_ = false;
+  count_ = false;
+}
+
+int LapCounter::loop() {
+  Task active_task;
+  int res = queue_.pop(active_task);
+
+  if (res == 0) {
+    if (active_task.target_ == module::LapCounter) {
+
+    } else if (active_task.target_ == module::All) {
+      switch (active_task.type_) {
+
+      case task::AllStartLineTriggered: {
+        GpsData gps;
+        gpsGlobalRead(gps);
+
+        uint32_t base_cs = hhmmsscc_to_cs(gps.time_);
+
+        uint32_t elapsed_cs = (millis() - gps.time_write_time_) / 10;
+
+        uint32_t time_cs = base_cs + elapsed_cs;
+
+        if (!counting_) {
+          counting_ = true;
+          last_trigger_time_ = time_cs;
+
+          router::send(module::Lcd, task::DisplayMsgLapCounterStart, 1000);
+
+        } else {
+          uint32_t lap_time = time_cs - last_trigger_time_;
+
+          lap_times_idx_ = (lap_times_idx_ + 1) & 63;
+
+          lap_times_[lap_times_idx_] = lap_time;
+          count_++;
+
+          last_trigger_time_ = time_cs;
+
+          lastLapTimeGlobalWrite(lap_time);
+
+          router::send(module::Lcd, task::DisplayMsgLapCounterLapTime, 1000);
+        }
+
+        break;
+      }
+
+      default:
+        break;
+      }
+    }
+  }
+
+  return 0;
+}

src/modules/lap_counter/lap_counter.h

@@ -6,11 +6,19 @@
 #include "base/ring_buffer.h"
 #include "custom_types.h"
 #include "modules/logger/system_logger.h"
+#include <inttypes.h>
 
 class LapCounter : public ModuleBase {
 private:
   SystemLogger *logger_;
   RingBuffer<Task, 16> queue_;
+  
+  bool counting_ = false;
+  uint16_t count_ = 0;
+  uint32_t last_trigger_time_ = 0;
+  uint32_t lap_times_[64];
+  int16_t lap_times_idx_ = -1;
+
 
 public:
   int push(const Task &task) override;

src/modules/lcd/lcd.cpp

@@ -4,10 +4,10 @@
 
 #include "lcd.h"
 
+#include "data/general_store.h"
+#include "modules/gps/gps.h"
 #include <Wire.h>
 #include <string.h>
-#include "modules/gps/gps.h"
-#include "data/general_store.h"
 
 #define MOD "modules/lcd/lcd.h"
 
@@ -60,20 +60,23 @@ void Lcd::print(int i, int base) {
 
 bool Lcd::isMessageTask(task::Type type) {
   switch (type) {
-    case task::DisplayMsgGpsFix:
-    case task::DisplayMsgTrackDetectOk:
-    case task::DisplayMsgConfigNoTracks:
-    case task::DisplayMsgBatteryLow:
-    case task::DisplayMsgEngineTempLow:
-    case task::DisplayMsgEngineTempHigh:
-      return true;
+  case task::DisplayMsgGpsFix:
+  case task::DisplayMsgTrackDetectOk:
+  case task::DisplayMsgConfigNoTracks:
+  case task::DisplayMsgBatteryLow:
+  case task::DisplayMsgEngineTempLow:
+  case task::DisplayMsgEngineTempHigh:
+  case task::DisplayMsgLapCounterLapTime:
+  case task::DisplayMsgLapCounterStart:
+    return true;
 
-    default:
-      return false;
+  default:
+    return false;
   }
 }
 
-void Lcd::activateMessage(screen::LcdScreen msg_screen, unsigned long duration_ms) {
+void Lcd::activateMessage(screen::LcdScreen msg_screen,
+                          unsigned long duration_ms) {
   if (duration_ms == 0) {
     duration_ms = frame_duration_;
   }
@@ -149,19 +152,19 @@ int Lcd::renderGpsDebug() {
 
 int Lcd::renderDriverPrimary() {
   this->clear();
-  
+
   GpsData gps_data;
   gpsGlobalRead(gps_data);
-  
+
   float vbat;
   vbatGlobalRead(vbat);
   float teng;
   tengGlobalRead(teng);
-  
+
   int line_trigger;
   gpsTriggerGlobalRead(line_trigger);
 
-  display_->setCursor(0,0);
+  display_->setCursor(0, 0);
   this->print("GPS:");
   if (gps_data.num_fix_ != 0) {
     this->print("Y");
@@ -169,14 +172,13 @@ int Lcd::renderDriverPrimary() {
     this->print("N");
   }
 
-  display_->setCursor(7,0);
+  display_->setCursor(7, 0);
   this->print("TRIG:");
-  switch (line_trigger)
-  {
+  switch (line_trigger) {
   case 0:
     this->print("I");
     break;
-  
+
   case 1:
     this->print("A");
     break;
@@ -189,23 +191,23 @@ int Lcd::renderDriverPrimary() {
     this->print("NULL");
     break;
   }
-  
-  display_->setCursor(0,2);
+
+  display_->setCursor(0, 2);
   this->print("SPD:");
   if (gps_data.speed_.valid_) {
     this->print(gps_data.speed_.value_, 1);
   } else {
     this->print("NA");
   }
-  
-  display_->setCursor(0,3);
+
+  display_->setCursor(0, 3);
   this->print("V:");
   this->print(vbat, 1);
 
-  display_->setCursor(10,3);
+  display_->setCursor(10, 3);
   this->print("T:");
   this->print(teng, 1);
-  
+
   return 0;
 }
 
@@ -278,29 +280,60 @@ int Lcd::renderMsgEngineTempHigh() {
   return 0;
 }
 
-int Lcd::push(const Task &task) {
-  return queue_.push(task);
+int Lcd::renderMsgLapCounterStart() {
+  this->clear();
+  display_->setCursor(5, 1);
+  this->print("LAP COUNTER");
+  display_->setCursor(6, 2);
+  this->print("STARTED");
+  return 0;
 }
 
+int Lcd::renderMsgLapCounterLapTime() {
+
+  uint32_t time_cs;
+  lastLapTimeGlobalRead(time_cs);
+
+  uint32_t minutes = (time_cs / 6000);
+  uint32_t seconds = (time_cs / 100) % 60;
+  uint32_t cs      = time_cs % 100;
+
+  this->clear();
+
+  display_->setCursor(6, 1);
+  this->print("LAP TIME");
+
+  display_->setCursor(6, 2);
+
+  if (minutes < 10) this->print('0');
+  this->print(minutes, 10);
+
+  this->print(':');
+
+  if (seconds < 10) this->print('0');
+  this->print(seconds, 10);
+
+  this->print('.');
+
+  if (cs < 10) this->print('0');
+  this->print(cs, 10);
+
+  return 0;
+}
+
+int Lcd::push(const Task &task) { return queue_.push(task); }
+
 Lcd::Lcd()
-    : display_cleared_(false),
-      logger_(nullptr),
-      screen_(screen::Blank),
-      data_screen_(screen::Blank),
-      message_screen_(screen::Blank),
-      last_render_(0),
-      frame_duration_(2000) {
+    : display_cleared_(false), logger_(nullptr), screen_(screen::Blank),
+      data_screen_(screen::Blank), message_screen_(screen::Blank),
+      last_render_(0), frame_duration_(2000) {
   display_ = new LiquidCrystal_I2C(0x27, 20, 4);
 }
 
 Lcd::Lcd(SystemLogger *logger)
-    : display_cleared_(false),
-      logger_(logger),
-      screen_(screen::Blank),
-      data_screen_(screen::Blank),
-      message_screen_(screen::Blank),
-      last_render_(0),
-      frame_duration_(2000) {
+    : display_cleared_(false), logger_(logger), screen_(screen::Blank),
+      data_screen_(screen::Blank), message_screen_(screen::Blank),
+      last_render_(0), frame_duration_(2000) {
   display_ = new LiquidCrystal_I2C(0x27, 20, 4);
 }
 
@@ -447,48 +480,55 @@ int Lcd::loop(unsigned long timeout_ms) {
     }
 
     switch (next_task.type_) {
-      case task::DisplayGpsDebug:
-        data_screen_ = screen::GpsDebug;
-        if (!message_active_) {
-          screen_ = data_screen_;
-          force_render_ = true;
-        }
-        break;
+    case task::DisplayGpsDebug:
+      data_screen_ = screen::GpsDebug;
+      if (!message_active_) {
+        screen_ = data_screen_;
+        force_render_ = true;
+      }
+      break;
 
-      case task::DisplayDriverPrimary:
-        data_screen_ = screen::DriverPrimary;
-        if (!message_active_) {
-          screen_ = data_screen_;
-          force_render_ = true;
-        }
-        break;
+    case task::DisplayDriverPrimary:
+      data_screen_ = screen::DriverPrimary;
+      if (!message_active_) {
+        screen_ = data_screen_;
+        force_render_ = true;
+      }
+      break;
 
-      case task::DisplayMsgGpsFix:
-        activateMessage(screen::MsgGpsFix, next_task.data_);
-        break;
+    case task::DisplayMsgGpsFix:
+      activateMessage(screen::MsgGpsFix, next_task.data_);
+      break;
 
-      case task::DisplayMsgTrackDetectOk:
-        activateMessage(screen::MsgTrackDetectOk, next_task.data_);
-        break;
+    case task::DisplayMsgTrackDetectOk:
+      activateMessage(screen::MsgTrackDetectOk, next_task.data_);
+      break;
 
-      case task::DisplayMsgConfigNoTracks:
-        activateMessage(screen::MsgConfigNoTracks, next_task.data_);
-        break;
-        
-      case task::DisplayMsgBatteryLow:
-        activateMessage(screen::MsgBatteryLow, next_task.data_);
-        break;
-        
-      case task::DisplayMsgEngineTempLow:
-        activateMessage(screen::MsgEngineTempLow, next_task.data_);
-        break;
-        
-      case task::DisplayMsgEngineTempHigh:
-        activateMessage(screen::MsgEngineTempHigh, next_task.data_);
-        break;
+    case task::DisplayMsgConfigNoTracks:
+      activateMessage(screen::MsgConfigNoTracks, next_task.data_);
+      break;
 
-      default:
-        break;
+    case task::DisplayMsgBatteryLow:
+      activateMessage(screen::MsgBatteryLow, next_task.data_);
+      break;
+
+    case task::DisplayMsgEngineTempLow:
+      activateMessage(screen::MsgEngineTempLow, next_task.data_);
+      break;
+
+    case task::DisplayMsgEngineTempHigh:
+      activateMessage(screen::MsgEngineTempHigh, next_task.data_);
+      break;
+
+    case task::DisplayMsgLapCounterStart:
+      activateMessage(screen::MsgLapCounterStart, next_task.data_);
+      break;
+
+    case task::DisplayMsgLapCounterLapTime:
+      activateMessage(screen::MsgLapCounterLapTime, next_task.data_);
+
+    default:
+      break;
     }
 
     now = millis();
@@ -513,48 +553,56 @@ int Lcd::loop(unsigned long timeout_ms) {
   }
 
   switch (screen_) {
-    case screen::Blank:
-      this->clear();
-      break;
+  case screen::Blank:
+    this->clear();
+    break;
 
-    case screen::GpsDebug:
-      this->renderGpsDebug();
-      break;
+  case screen::GpsDebug:
+    this->renderGpsDebug();
+    break;
 
-    case screen::DriverPrimary:
-      this->renderDriverPrimary();
-      break;
+  case screen::DriverPrimary:
+    this->renderDriverPrimary();
+    break;
 
-    case screen::MsgGpsFix:
-      this->renderMsgGpsFix();
-      break;
+  case screen::MsgGpsFix:
+    this->renderMsgGpsFix();
+    break;
 
-    case screen::MsgGpsTrigger:
-      this->renderMsgGpsTrigger();
-      break;
+  case screen::MsgGpsTrigger:
+    this->renderMsgGpsTrigger();
+    break;
 
-    case screen::MsgTrackDetectOk:
-      this->renderMsgTrackDetectOk();
-      break;
+  case screen::MsgTrackDetectOk:
+    this->renderMsgTrackDetectOk();
+    break;
 
-    case screen::MsgConfigNoTracks:
-      this->renderMsgConfigNoTracks();
-      break;
-      
-    case screen::MsgBatteryLow:
-      this->renderMsgBatteryLow();
-      break;
-      
-    case screen::MsgEngineTempLow:
-      this->renderMsgEngineTempLow();
-      break;
-      
-    case screen::MsgEngineTempHigh:
-      this->renderMsgEngineTempHigh();
-      break;
+  case screen::MsgConfigNoTracks:
+    this->renderMsgConfigNoTracks();
+    break;
 
-    default:
-      break;
+  case screen::MsgBatteryLow:
+    this->renderMsgBatteryLow();
+    break;
+
+  case screen::MsgEngineTempLow:
+    this->renderMsgEngineTempLow();
+    break;
+
+  case screen::MsgEngineTempHigh:
+    this->renderMsgEngineTempHigh();
+    break;
+
+  case screen::MsgLapCounterStart:
+    this->renderMsgLapCounterStart();
+    break;
+
+  case screen::MsgLapCounterLapTime:
+    this->renderMsgLapCounterLapTime();
+    break;
+
+  default:
+    break;
   }
 
   last_render_ = now;

src/modules/lcd/lcd.h

@@ -29,6 +29,8 @@ enum LcdScreen : uint8_t {
   MsgBatteryLow,
   MsgEngineTempLow,
   MsgEngineTempHigh,
+  MsgLapCounterStart,
+  MsgLapCounterLapTime,
 };
 
 } // namespace screen
@@ -74,6 +76,8 @@ private:
   int renderMsgBatteryLow();
   int renderMsgEngineTempLow();
   int renderMsgEngineTempHigh();
+  int renderMsgLapCounterStart();
+  int renderMsgLapCounterLapTime();
 
 public:
   int push(const Task &task) override;