Merge branch 'devel' into ack-mgmt

Author: gbr1

src/Arduino_Alvik.cpp

@@ -132,9 +132,8 @@ int Arduino_Alvik::begin(const bool verbose, const uint8_t core){
 
 
   uart->begin(UART_BAUD_RATE);
-  uart->flush();
 
-  
+
   pinMode(CHECK_STM32, INPUT_PULLDOWN);
   pinMode(RESET_STM32, OUTPUT);
   pinMode(NANO_CHK, OUTPUT);
@@ -151,6 +150,11 @@ int Arduino_Alvik::begin(const bool verbose, const uint8_t core){
   delay(100);
   reset_hw();
 
+  uart->flush();
+  while (uart->available()){
+    uart->read();
+  }
+
   wait_for_ack();
 
   set_illuminator(true);

src/default_colors.h

@@ -15,15 +15,16 @@
 
 #include "Arduino.h"
 
-#define WHITE_DEFAULT_RED 444
-#define WHITE_DEFAULT_GREEN 342
-#define WHITE_DEFAULT_BLUE 345
-#define BLACK_DEFAULT_RED 153
-#define BLACK_DEFAULT_GREEN 135
-#define BLACK_DEFAULT_BLUE 123
+#define WHITE_DEFAULT_RED 450
+#define WHITE_DEFAULT_GREEN 500
+#define WHITE_DEFAULT_BLUE 510
+#define BLACK_DEFAULT_RED 160
+#define BLACK_DEFAULT_GREEN 200
+#define BLACK_DEFAULT_BLUE 190
 //int16_t WHITE_CAL[3] = {444, 342, 345};
 //int16_t BLACK_CAL[3] = {153, 135, 123};
 
+
 #define WHITE_OFFSET 0
 #define BLACK_OFFSET 6
 #define COLOR_SIZE 20
@@ -41,7 +42,7 @@
 #define LIGHT_GREEN_MAX 140
 #define GREEN_MAX 170
 #define LIGHT_BLUE_MAX 210
-#define BLUE_MAX 260
+#define BLUE_MAX 250
 #define VIOLET_MAX 280
 #define BROWN_MAX_VALUE 0.5
 #define BROWN_MAX_SATURATION 0.45

src/definitions.h

@@ -27,6 +27,9 @@
 #define UART 0
 #define UART_BAUD_RATE 460800
 
+#define DL1 left_led
+#define DL2 right_led
+
 #define CHARGE_THRESHOLD 97
 
 #define NO_ACK 0xFF