   default: // others do checksum
     break;
   }  
->>>>>>> 9423c3c07ba8665de06a1a0f3cdad7d726b30174
 }
 
 void initEEPROM() {
   xv_config.id = 0x05;
   strcpy(xv_config.version, "1.2.2");
-<<<<<<< HEAD
-  xv_config.motor_pwm_pin = 9;   // pin connected N-Channel Mosfet  (only pin controlled with Timer3)
-=======
   xv_config.motor_pwm_pin = 9;  // pin connected N-Channel Mosfet
->>>>>>> 9423c3c07ba8665de06a1a0f3cdad7d726b30174
 
   xv_config.rpm_setpoint = 300;  // desired RPM
   xv_config.rpm_min = 200;

uint8_t motor_rph_low_byte = 0;
uint8_t data0, data2;
uint16_t dist, quality;
>>>>>>> 9423c3c07ba8665de06a1a0f3cdad7d726b30174
uint16_t motor_rph = 0;
uint16_t angle;


PID rpmPID(&motor_rpm, &pwm_val, &xv_config.rpm_setpoint, xv_config.Kp, xv_config.Ki, xv_config.Kd, DIRECT);

uint8_t inByte = 0;  // incoming serial byte
uint16_t data_status = 0;
uint16_t data_4deg_index = 0;
uint16_t data_loop_index = 0;
