auto-sync

firmware/console/binary/tunerstudio_configuration.h

@@ -91,7 +91,8 @@ typedef struct {
 	float veValue;
 	float maxDelta;
 	float minDelta;
-	int unused3[18];
+	float currentAccelDelta;
+	int unused3[17];
 } TunerStudioOutputChannels;
 
 #endif /* TUNERSTUDIO_CONFIGURATION_H_ */

firmware/rusefi.cpp

@@ -276,5 +276,5 @@ int getRusEfiVersion(void) {
 		return 1; // this is here to make the compiler happy about the unused array
 	if (UNUSED_CCM_SIZE[0] == 0)
 		return 1; // this is here to make the compiler happy about the unused array
-	return 20150322;
+	return 20150323;
 }

firmware/util/cyclic_buffer.cpp

@@ -9,54 +9,47 @@
  * @author Daniel Hill - Modified to use C++ - Mar 2, 2014
  */
 
-
 #include "cyclic_buffer.h"
 #include <string.h>
 
-//ctor
+cyclic_buffer::cyclic_buffer() : cyclic_buffer(CB_MAX_SIZE) {
-cyclic_buffer::cyclic_buffer()
+}
-{
+
-  memset((void*)elements, 0, sizeof(elements)); // I would usually use static_cast, but due to the elements being volatile we cannot.
+cyclic_buffer::cyclic_buffer(int size) {
 	currentIndex = 0;
-  count = 0;
+	setSize(size);
 }
 
 //cpctor
-cyclic_buffer::cyclic_buffer(const cyclic_buffer& cb)
+cyclic_buffer::cyclic_buffer(const cyclic_buffer& cb) {
-{
 	//Deep copy the data
 	currentIndex = cb.currentIndex;
 	count = cb.count;
-  for(int i = 0; i < CB_MAX_SIZE; ++i)
+	size = cb.size;
-  {
+	for (int i = 0; i < size; ++i) {
 		elements[i] = cb.elements[i];
 	}
 }
 
 //dtor
-cyclic_buffer::~cyclic_buffer()
+cyclic_buffer::~cyclic_buffer() {
-{
 	//No dynamic allocation - safe to leave
 }
 
 //overloaded =operator
-cyclic_buffer& cyclic_buffer::operator=(const cyclic_buffer& rhCb)
+cyclic_buffer& cyclic_buffer::operator=(const cyclic_buffer& rhCb) {
-{
 	//Deep copy
 	currentIndex = rhCb.currentIndex;
 	count = rhCb.count;
-  for(int i = 0; i < CB_MAX_SIZE; ++i)
+	for (int i = 0; i < size; ++i) {
-  {
 		elements[i] = rhCb.elements[i];
 	}
 	return *this;
 }
 
-void cyclic_buffer::add(int value)
+void cyclic_buffer::add(int value) {
-{
 	++currentIndex;
-  if(currentIndex == CB_MAX_SIZE)
+	if (currentIndex == size) {
-  {
 		currentIndex = 0;
 	}
 	elements[currentIndex] = value;
@@ -64,26 +57,29 @@ void cyclic_buffer::add(int value)
 	++count;
 }
 
+void cyclic_buffer::setSize(int size) {
+	clear();
+	this->size = size;
+}
+
 void cyclic_buffer::clear() {
+	memset((void*) elements, 0, sizeof(elements)); // I would usually use static_cast, but due to the elements being volatile we cannot.
+	count = 0;
 	count = 0;
 }
 
-int cyclic_buffer::sum(int length)
+int cyclic_buffer::sum(int length) {
-{
+	if (length > count) {
-  if(length > count)
-  {
 		length = count;
 	}
 
 	int ci = currentIndex; // local copy to increase thread-safety
 	int result = 0;
 
-  for(int i = 0; i < length; ++i)
+	for (int i = 0; i < length; ++i) {
-  {
 		int index = ci - i;
-		while (index < 0)
+		while (index < 0) {
-		{
+			index += size;
-      index += CB_MAX_SIZE;
 		}
 
 		result += elements[index];

firmware/util/cyclic_buffer.h

@@ -10,13 +10,13 @@
 #ifndef CYCLIC_BUFFER_H
 #define CYCLIC_BUFFER_H
 
-static const short CB_MAX_SIZE = 16;
+static const short CB_MAX_SIZE = 64;
 
 class cyclic_buffer
 {
   public:
-  //ctor
 	cyclic_buffer();
+    cyclic_buffer(int size);
   //cpctor
     cyclic_buffer(const cyclic_buffer& cb);
   //dtor
@@ -29,13 +29,14 @@ class cyclic_buffer
   public:
     void add(int value);
     int sum(int length);
+    void setSize(int size);
     void clear();
 
-
   private:
     volatile int elements[CB_MAX_SIZE];
     volatile int currentIndex;
     volatile int count;
+    int size;
 };
 
 #endif //CYCLIC_BUFFER_H