Added util directory

orlopau · Dec 2, 2023 · 71a9efa · 71a9efa
1 parent b3c790a
commit 71a9efa
Show file tree

Hide file tree

Showing 36 changed files with 34 additions and 82 deletions.
diff --git a/code/include/mocks.h b/code/include/mocks.h
@@ -2,7 +2,7 @@
 
 #include "battery.h"
 #include "loadcell.h"
-#include "millis.h"
+#include "util/millis.h"
 #include "user_interface.h"
 #include <math.h>
 #include <string.h>

diff --git a/code/notes.md b/code/notes.md
@@ -10,4 +10,10 @@ soldering k12
 https://www.aliexpress.com/item/4000456148198.html?spm=a2g0o.cart.0.0.4b184ae4xzGph2&mp=1
 
 tips:
-D32, D24, D16, D12, KF, ILS
+D32, D24, D16, D12, KF, ILS
+
+
+
+## Structure
+
+Use MVC to decouple the view layer.
diff --git a/code/src/button.cpp b/code/src/button.cpp
@@ -1,4 +1,4 @@
-#include "millis.h"
+#include "util/millis.h"
 #include "button.h"
 
 Button::Button(unsigned long debounceDelay, unsigned long doubleClickWaitTime, unsigned long longClickDelay)

diff --git a/code/src/embedded/dev/main_display.cpp b/code/src/embedded/dev/main_display.cpp
diff --git a/code/src/embedded/u8g_display.cpp b/code/src/embedded/u8g_display.cpp
@@ -4,7 +4,7 @@
 #include <qrcode.h>
 
 #include "u8g_display.h"
-#include "formatters.h"
+#include "util/formatters.h"
 #include "data/bitmaps.h"
 #include "constants.h"
 #include "data/localization.h"

diff --git a/code/src/loadcell.cpp b/code/src/loadcell.cpp
@@ -1,7 +1,7 @@
 #include <cmath>
 
 #include "loadcell.h"
-#include "millis.h"
+#include "util/millis.h"
 
 DefaultWeightSensor::~DefaultWeightSensor()
 {

diff --git a/code/src/loadcell.h b/code/src/loadcell.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "stdint.h"
-#include "ring_buffer.h"
+#include "util/ring_buffer.h"
 
 class LoadCell
 {
@@ -62,8 +62,6 @@ class DefaultWeightSensor : public WeightSensor
     long getRawWeight();
 
 private:
-    void updateAveraging(long lastWeight, long newWeight);
-
     LoadCell &loadCell;
     float weight = 0;
     float scale = 1;

diff --git a/code/src/mode_manager.cpp b/code/src/mode_manager.cpp
@@ -1,5 +1,5 @@
 #include "mode_manager.h"
-#include "millis.h"
+#include "util/millis.h"
 
 ModeManager::ModeManager(Mode *modes[], const int modeCount, Display &display, UserInput &input, Battery &battery)
     : modes(modes), modeCount(modeCount), currentMode(0), inModeChange(false), display(display), input(input), battery(battery),

diff --git a/code/src/modes/mode_calibrate.cpp b/code/src/modes/mode_calibrate.cpp
@@ -1,5 +1,5 @@
 #include "mode_calibrate.h"
-#include "logger.h"
+#include "util/logger.h"
 #include "data/localization.h"
 
 #define TAG "MODE-CAL"

diff --git a/code/src/modes/mode_calibrate.h b/code/src/modes/mode_calibrate.h
@@ -2,7 +2,7 @@
 
 #include "loadcell.h"
 #include "user_interface.h"
-#include "stopwatch.h"
+#include "util/stopwatch.h"
 #include "mode.h"
 
 #define DEFAULT_CALIBRATION_WEIGHT 100

diff --git a/code/src/modes/mode_espresso.h b/code/src/modes/mode_espresso.h
@@ -2,7 +2,7 @@
 
 #include "loadcell.h"
 #include "mode.h"
-#include "stopwatch.h"
+#include "util/stopwatch.h"
 #include "user_interface.h"
 #include "regression.h"
 

diff --git a/code/src/modes/mode_recipe.cpp b/code/src/modes/mode_recipe.cpp
@@ -1,7 +1,7 @@
 #include <cstring>
 
 #include "mode_recipe.h"
-#include "millis.h"
+#include "util/millis.h"
 #include "data/localization.h"
 
 #include "modes/steps/step_switcher.h"

diff --git a/code/src/modes/mode_scale.h b/code/src/modes/mode_scale.h
@@ -3,7 +3,7 @@
 #include "mode.h"
 #include "loadcell.h"
 #include "user_interface.h"
-#include "stopwatch.h"
+#include "util/stopwatch.h"
 
 class ModeScale : public Mode
 {

diff --git a/code/src/modes/steps/step_brewing.cpp b/code/src/modes/steps/step_brewing.cpp
@@ -1,5 +1,5 @@
 #include "step_brewing.h"
-#include "millis.h"
+#include "util/millis.h"
 
 RecipeBrewing::RecipeBrewing(RecipeStepState &state, Display &display, UserInput &input, WeightSensor &weightSensor)
     : state(state), display(display), input(input), weightSensor(weightSensor)

diff --git a/code/src/regression.h b/code/src/regression.h
@@ -2,7 +2,7 @@
 #include <math.h>
 #include <climits>
 
-#include "ring_buffer.h"
+#include "util/ring_buffer.h"
 
 namespace Regression
 {

diff --git a/code/src/formatters.cpp → code/src/util/formatters.cpp b/code/src/formatters.cpp → code/src/util/formatters.cpp
diff --git a/code/src/formatters.h → code/src/util/formatters.h b/code/src/formatters.h → code/src/util/formatters.h
diff --git a/code/src/logger.h → code/src/util/logger.h b/code/src/logger.h → code/src/util/logger.h
diff --git a/code/src/millis.cpp → code/src/util/millis.cpp b/code/src/millis.cpp → code/src/util/millis.cpp
diff --git a/code/src/millis.h → code/src/util/millis.h b/code/src/millis.h → code/src/util/millis.h
diff --git a/code/src/ring_buffer.h → code/src/util/ring_buffer.h b/code/src/ring_buffer.h → code/src/util/ring_buffer.h
diff --git a/code/src/stopwatch.cpp → code/src/util/stopwatch.cpp b/code/src/stopwatch.cpp → code/src/util/stopwatch.cpp
diff --git a/code/src/stopwatch.h → code/src/util/stopwatch.h b/code/src/stopwatch.h → code/src/util/stopwatch.h
diff --git a/code/test/native/test_button/main.cpp b/code/test/native/test_button/main.cpp
@@ -1,7 +1,7 @@
 #include <unity.h>
 
 #include "button.h"
-#include "millis.h"
+#include "util/millis.h"
 
 #define DEBOUNCE_DELAY 50
 #define DOUBLE_CLICK_WAIT_TIME 200

diff --git a/code/test/native/test_default_weight_sensor/main.cpp b/code/test/native/test_default_weight_sensor/main.cpp
@@ -1,6 +1,6 @@
 #include <unity.h>
 
-#include "millis.h"
+#include "util/millis.h"
 #include "button.h"
 #include "loadcell.h"
 

diff --git a/code/test/native/test_fifo_queue/main.cpp b/code/test/native/test_fifo_queue/main.cpp
@@ -1,4 +1,4 @@
-#include "ring_buffer.h"
+#include "util/ring_buffer.h"
 #include <unity.h>
 
 /*

diff --git a/code/test/native/test_mode_espresso/main.cpp b/code/test/native/test_mode_espresso/main.cpp
@@ -1,6 +1,6 @@
 #include "mocks.h"
 #include "modes/mode_espresso.h"
-#include "stopwatch.h"
+#include "util/stopwatch.h"
 #include <unity.h>
 
 #include <chrono>

diff --git a/code/test/native/test_mode_manager/main.cpp b/code/test/native/test_mode_manager/main.cpp
@@ -2,7 +2,7 @@
 
 #include "unity.h"
 #include "mode_manager.h"
-#include "millis.h"
+#include "util/millis.h"
 #include "mocks.h"
 
 class MockMode : public Mode

diff --git a/code/test/native/test_mode_recipes/main.cpp b/code/test/native/test_mode_recipes/main.cpp
@@ -1,8 +1,8 @@
 #include <unity.h>
 #include "mocks.h"
-#include "stopwatch.h"
+#include "util/stopwatch.h"
 #include "modes/mode_recipe.h"
-#include "millis.h"
+#include "util/millis.h"
 
 static Stopwatch *stopwatch;
 static MockWeightSensor *weightSensor;

diff --git a/code/test/native/test_mode_scale/main.cpp b/code/test/native/test_mode_scale/main.cpp
@@ -1,7 +1,7 @@
 #include <unity.h>
 #include "modes/mode_scale.h"
 #include "mocks.h"
-#include "stopwatch.h"
+#include "util/stopwatch.h"
 
 #include <chrono>
 #include <thread>

diff --git a/code/test/native/test_step_brewing/main.cpp b/code/test/native/test_step_brewing/main.cpp
@@ -1,4 +1,4 @@
-#include "millis.h"
+#include "util/millis.h"
 #include "mocks.h"
 #include "modes/steps/step_brewing.h"
 #include <unity.h>

diff --git a/code/test/native/test_step_config_ratio/main.cpp b/code/test/native/test_step_config_ratio/main.cpp
@@ -1,4 +1,4 @@
-#include "millis.h"
+#include "util/millis.h"
 #include "mocks.h"
 #include "modes/steps/step_config_ratio.h"
 #include <unity.h>

diff --git a/code/test/native/test_step_config_weight/main.cpp b/code/test/native/test_step_config_weight/main.cpp
@@ -1,4 +1,4 @@
-#include "millis.h"
+#include "util/millis.h"
 #include "mocks.h"
 #include "modes/steps/step_config_weight.h"
 #include <unity.h>

diff --git a/code/test/native/test_step_prepare/main.cpp b/code/test/native/test_step_prepare/main.cpp
@@ -1,4 +1,4 @@
-#include "millis.h"
+#include "util/millis.h"
 #include "mocks.h"
 #include "modes/steps/step_prepare.h"
 #include <unity.h>

diff --git a/code/test/native/test_step_switcher/main.cpp b/code/test/native/test_step_switcher/main.cpp
@@ -1,4 +1,4 @@
-#include "millis.h"
+#include "util/millis.h"
 #include "mocks.h"
 #include "modes/steps/step_switcher.h"
 #include <unity.h>

diff --git a/code/test/native/test_stopwatch/stopwatch.cpp b/code/test/native/test_stopwatch/stopwatch.cpp
@@ -1,5 +1,5 @@
 #include "unity.h"
-#include "stopwatch.h"
+#include "util/stopwatch.h"
 
 #include <chrono>
 #include <thread>