From 4e45297145bd3d5fab9a0911509be542d4a94071 Mon Sep 17 00:00:00 2001
From: Andrey <rusefillc@gmail.com>
Date: Wed, 24 Nov 2021 22:17:29 -0500
Subject: [PATCH] minor progress

---
 .../controllers/trigger/trigger_decoder.cpp   |  2 +-
 firmware/util/containers/cyclic_buffer.h      | 24 +++++++++----------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/firmware/controllers/trigger/trigger_decoder.cpp b/firmware/controllers/trigger/trigger_decoder.cpp
index 7a5a3f3412..73004bd472 100644
--- a/firmware/controllers/trigger/trigger_decoder.cpp
+++ b/firmware/controllers/trigger/trigger_decoder.cpp
@@ -157,7 +157,7 @@ void prepareEventAngles(TriggerWaveform *shape,
 	if (triggerShapeSynchPointIndex == EFI_ERROR_CODE) {
 		return;
 	}
-	float firstAngle = shape->getAngle(triggerShapeSynchPointIndex);
+	angle_t firstAngle = shape->getAngle(triggerShapeSynchPointIndex);
 	assertAngleRange(firstAngle, "firstAngle", CUSTOM_TRIGGER_SYNC_ANGLE);
 
 	int riseOnlyIndex = 0;
diff --git a/firmware/util/containers/cyclic_buffer.h b/firmware/util/containers/cyclic_buffer.h
index 6cf43dc32a..3fabdfb999 100644
--- a/firmware/util/containers/cyclic_buffer.h
+++ b/firmware/util/containers/cyclic_buffer.h
@@ -28,10 +28,10 @@ class cyclic_buffer
   public:
     void add(T value);
     T get(int index) const;
-    T sum(int length) const;
-    T maxValue(int length) const;
-    T minValue(int length) const;
-    void setSize(unsigned int size);
+    T sum(size_t length) const;
+    T maxValue(size_t length) const;
+    T minValue(size_t length) const;
+    void setSize(size_t size);
     bool contains(T value) const;
     int getSize() const;
     int getCount() const;
@@ -44,7 +44,7 @@ class cyclic_buffer
     /**
      * number of elements added into this buffer, would be eventually bigger then size
      */
-    volatile unsigned count;
+    volatile size_t count;
 };
 
 template<typename T, size_t maxSize>
@@ -83,7 +83,7 @@ bool cyclic_buffer<T, maxSize>::contains(T value) const {
 }
 
 template<typename T, size_t maxSize>
-void cyclic_buffer<T, maxSize>::setSize(unsigned int size) {
+void cyclic_buffer<T, maxSize>::setSize(size_t size) {
 	clear();
 	this->size = size < maxSize ? size : maxSize;
 }
@@ -110,14 +110,14 @@ T cyclic_buffer<T, maxSize>::get(int index) const {
 }
 
 template<typename T, size_t maxSize>
-T cyclic_buffer<T, maxSize>::maxValue(int length) const {
+T cyclic_buffer<T, maxSize>::maxValue(size_t length) const {
 	if (length > count) {
 		// not enough data in buffer
 		length = count;
 	}
 	int ci = currentIndex; // local copy to increase thread-safety
 	T result = std::numeric_limits<T>::min();
-	for (int i = 0; i < length; ++i) {
+	for (size_t i = 0; i < length; ++i) {
 		int index = ci - i - 1;
 		while (index < 0) {
 			index += size;
@@ -131,13 +131,13 @@ T cyclic_buffer<T, maxSize>::maxValue(int length) const {
 }
 
 template<typename T, size_t maxSize>
-T cyclic_buffer<T, maxSize>::minValue(int length) const {
+T cyclic_buffer<T, maxSize>::minValue(size_t length) const {
 	if (length > count) {
 		length = count;
 	}
 	int ci = currentIndex; // local copy to increase thread-safety
 	T result = std::numeric_limits<T>::max();
-	for (int i = 0; i < length; ++i) {
+	for (size_t i = 0; i < length; ++i) {
 		int index = ci - i - 1;
 		while (index < 0) {
 			index += size;
@@ -151,7 +151,7 @@ T cyclic_buffer<T, maxSize>::minValue(int length) const {
 }
 
 template<typename T, size_t maxSize>
-T cyclic_buffer<T, maxSize>::sum(int length) const {
+T cyclic_buffer<T, maxSize>::sum(size_t length) const {
 	if (length > count) {
 		length = count;
 	}
@@ -159,7 +159,7 @@ T cyclic_buffer<T, maxSize>::sum(int length) const {
 	int ci = currentIndex; // local copy to increase thread-safety
 	T result = 0;
 
-	for (int i = 0; i < length; ++i) {
+	for (size_t i = 0; i < length; ++i) {
 		int index = ci - i - 1;
 		while (index < 0) {
 			index += size;