From 589d00fd4e05c5b45855935f6c646d4060ff42ea Mon Sep 17 00:00:00 2001
From: eddyem <eddyem@yandex.ru>
Date: Mon, 3 Aug 2015 17:36:47 +0300
Subject: [PATCH] Add GPS time synchronisation

---
 GPS/GPS.bin        | Bin 8796 -> 9212 bytes
 GPS/GPS.c          |   1 -
 GPS/hardware_ini.c |   2 +-
 GPS/main.c         |  60 +++++++++++++++++++++++++++++++++++++++++----
 GPS/main.h         |   5 ++++
 GPS/uart.c         |   1 +
 6 files changed, 62 insertions(+), 7 deletions(-)

diff --git a/GPS/GPS.bin b/GPS/GPS.bin
index f688aecfb3ef2fe068c4e9665158c38cebf02663..6f0e549cc597153805276b3a65ad50dad6a90750 100755
GIT binary patch
delta 2696
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
Mk_VuG;(<l{3uNqFk^lez

delta 2227
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

diff --git a/GPS/GPS.c b/GPS/GPS.c
index e5991e8..1633345 100644
--- a/GPS/GPS.c
+++ b/GPS/GPS.c
@@ -163,7 +163,6 @@ uint8_t *nextpos(uint8_t **buf, int pos){
  */
 void GPS_parse_answer(uint8_t *buf){
 	uint8_t *ptr;
-	DBG(buf);
 	if(strncmp(buf+3, U("RMC"), 3)){ // not RMC message
 		GPS_send_start_seq();
 		return;
diff --git a/GPS/hardware_ini.c b/GPS/hardware_ini.c
index 2ca2dd3..17d4e6b 100644
--- a/GPS/hardware_ini.c
+++ b/GPS/hardware_ini.c
@@ -68,7 +68,7 @@ void GPIO_init(){
  */
 void SysTick_init(){
 	systick_set_clocksource(STK_CSR_CLKSOURCE_AHB_DIV8); // Systyck: 72/8=9MHz
-	STK_RVR = 8999; // 9000 pulses: 1kHz
+	STK_RVR = STK_RVR_DEFAULT_VAL; // 9000 pulses: 1kHz
 	systick_interrupt_enable();
 	systick_counter_enable();
 }
diff --git a/GPS/main.c b/GPS/main.c
index 49d3fc4..8a25db6 100644
--- a/GPS/main.c
+++ b/GPS/main.c
@@ -31,6 +31,13 @@ volatile uint32_t systick_val = 0;
 volatile uint32_t timer_val = 0;
 volatile int clear_ST_on_connect = 1;
 
+volatile int need_sync = 1;
+
+volatile uint32_t last_corr_time = 0; // time of last PPS correction (seconds from midnight)
+
+// STK_CVR values for all milliseconds (RVR0) and last millisecond (RVR1)
+volatile uint32_t RVR0 = STK_RVR_DEFAULT_VAL, RVR1 = STK_RVR_DEFAULT_VAL;
+
 curtime current_time = {25,61,61};
 
 void time_increment(){
@@ -76,6 +83,7 @@ int main(){
 			usbdatalen = parce_incoming_buf(usbdatabuf, usbdatalen);
 		}
 		if((string = check_UART2())){
+			P(string);
 			GPS_parse_answer(string);
 		}
 		if(systick_val){
@@ -84,6 +92,10 @@ int main(){
 			systick_val = 0;
 			P(", timer value: ");
 			print_int(timer_val);
+			P(", RVR0 = ");
+			print_int(RVR0);
+			P(", RVR1 = ");
+			print_int(RVR1);
 			P("\n");
 		}
 	}
@@ -94,7 +106,11 @@ int main(){
  * SysTick interrupt: increment global time & send data buffer through USB
  */
 void sys_tick_handler(){
-	if(++Timer == 1000){
+	++Timer;
+	if(Timer == 999){
+		STK_RVR = RVR1;
+	}else if(Timer == 1000){
+		STK_RVR = RVR0;
 		time_increment();
 	}
 	usb_send_buffer();
@@ -102,17 +118,50 @@ void sys_tick_handler(){
 // STK_CVR - current systick val
 // STK_RVR - ticks till interrupt - 1
 
-// PA4 interrupt
+// PA4 interrupt - PPS signal
 void exti4_isr(){
+	uint32_t t = 0, ticks;
+	static uint32_t ticksavr = 0, N = 0;
 	if(EXTI_PR & EXTI4){
 		// correct
 		systick_val = STK_CVR;
+		STK_CVR = RVR0;
+		systick_val = RVR0 + 1 - systick_val; // Systick counts down!
 		timer_val = Timer;
+		Timer = 0;
+		if(timer_val < 10) timer_val += 1000; // our closks go faster than real
+		else if(timer_val < 990){ // something wrong
+			RVR0 = RVR1 = STK_RVR_DEFAULT_VAL;
+			STK_RVR = RVR0;
+			need_sync = 1;
+			goto theend;
+		}else
+			time_increment(); // ms counter less than 1000 - we need to increment time
+		t = current_time.H * 3600 + current_time.M * 60 + current_time.S;
 		if(clear_ST_on_connect){
-			STK_CVR = 0;
 			clear_ST_on_connect = 0;
-			time_increment();
+		}else{
+			//  || (last_corr_time == 86399 && t == 0)
+			if(t - last_corr_time == 1){ // PPS interval == 1s
+				ticks =  systick_val + timer_val*(RVR0 + 1);
+				++N;
+				ticksavr += ticks;
+				if(N > 20){
+					ticks = ticksavr / N;
+					RVR0 = ticks / 1000 - 1; // main RVR value
+					STK_RVR = RVR0;
+					RVR1 = RVR0 + ticks % 1000 - 1; // last millisecond RVR value (with fine correction)
+					N = 0;
+					ticksavr = 0;
+					need_sync = 0;
+				}
+			}else{
+				N = 0;
+				ticksavr = 0;
+			}
 		}
+	theend:
+		last_corr_time = t;
 		EXTI_PR = EXTI4;
 	}
 }
@@ -131,7 +180,7 @@ void set_time(uint8_t *buf){
 	inline uint8_t atou(uint8_t *b){
 		return (b[0]-'0')*10 + b[1]-'0';
 	}
-	uint8_t H = atou(buf) + 3;
+	uint8_t H = atou(buf) + TIMEZONE_GMT_PLUS;
 	if(H > 23) H -= 24;
 	current_time.H = H;
 	current_time.M = atou(&buf[2]);
@@ -156,6 +205,7 @@ void print_curtime(){
 		if(T < 10) usb_send('0');
 		print_int(T);
 		if(GPS_status == GPS_NOT_VALID) P(" (not valid)");
+		if(need_sync) P(" need synchronisation");
 		newline();
 	}else
 		P("Waiting for satellites\n");
diff --git a/GPS/main.h b/GPS/main.h
index eda190b..7767d51 100644
--- a/GPS/main.h
+++ b/GPS/main.h
@@ -49,6 +49,9 @@ extern void *memcpy(void *dest, const void *src, int n);
 #define U16(x)  ((uint16_t) x)
 #define U32(x)  ((uint32_t) x)
 
+#define STK_RVR_DEFAULT_VAL  (8999)
+#define TIMEZONE_GMT_PLUS    (3)
+
 typedef struct{
 	uint8_t H;
 	uint8_t M;
@@ -59,6 +62,8 @@ extern curtime current_time;
 extern volatile uint32_t Timer; // global timer (milliseconds)
 extern volatile int clear_ST_on_connect; // flag for clearing Systick counter on next PPS
 
+extern volatile int need_sync;
+
 void Delay(uint16_t time);
 void set_time(uint8_t *buf);
 
diff --git a/GPS/uart.c b/GPS/uart.c
index 0a528d7..e1e3b34 100644
--- a/GPS/uart.c
+++ b/GPS/uart.c
@@ -258,6 +258,7 @@ void fill_uart_RXbuff(uint32_t UART, uint8_t byte){
 	}
 	curbuff = &RX_buffer[bufidx];
 	if(curbuff->end == UART_BUF_DATA_SIZE){ // end of buffer - forget about data
+		curbuff->end = 0;
 		return;
 	}
 	curbuff->buf[curbuff->end++] = byte; // put byte into buffer