working ethernet

1 files changed, 40 insertions, 8 deletions

diff --git a/app/main.c b/app/main.c
index 48828c8..368839c 100644
--- a/app/main.c
+++ b/app/main.c
@@ -1,6 +1,26 @@
 #include "project.h"
 
 
+static void cmd_dispatch()
+{
+uint8_t c;
+while (!ring_read_byte(&rx1_ring,&c)) {
+
+  printf("KEY> %c\r\n",c);
+
+switch(c) {
+
+    case 'R':
+      gps_reset ();
+      break;
+    case 'A':
+      gps_almanac ();
+      break;
+}
+}
+}
+
+
 static void
 board_setup (void)
 {
@@ -10,13 +30,17 @@ board_setup (void)
   rcc_periph_clock_enable (RCC_GPIOB);
   rcc_periph_clock_enable (RCC_GPIOC);
   rcc_periph_clock_enable (RCC_GPIOD);
-  rcc_periph_clock_enable (RCC_USART6);
+  rcc_periph_clock_enable (RCC_USART1);
+  rcc_periph_clock_enable (RCC_USART3);
+  rcc_periph_clock_enable (RCC_SYSCFG);
 
-  nvic_set_priority (NVIC_EXTI0_IRQ, 0);
-  nvic_set_priority (NVIC_EXTI15_10_IRQ, 1);
-  nvic_set_priority (NVIC_USART6_IRQ, 2);
-  nvic_set_priority (NVIC_ETH_IRQ, 3);
-  nvic_set_priority (NVIC_SYSTICK_IRQ, 4) ;
+
+  nvic_set_priority (NVIC_EXTI2_IRQ, 0);
+  nvic_set_priority (NVIC_EXTI0_IRQ, 1);
+  nvic_set_priority (NVIC_EXTI15_10_IRQ, 2);
+  nvic_set_priority (NVIC_USART1_IRQ, 3);
+  nvic_set_priority (NVIC_ETH_IRQ, 4);
+  nvic_set_priority (NVIC_SYSTICK_IRQ, 5) ;
 }
 
 
@@ -32,9 +56,13 @@ system_init (void)
   msf_init();
   dcf77_init();
 
+  printf ("LWIP\r\n");
   start_lwip();
+  printf ("STETH\r\n");
   steth_init();
 
+  //gps_init();
+
 }
 
 int
@@ -48,8 +76,12 @@ main (void)
 
 
   while (1) {
-    msf_dispatch();
-    dcf77_dispatch();
+//    msf_dispatch();
+//    dcf77_dispatch();
+
+    //gps_dispatch();
+  
+    cmd_dispatch();
 
     dispatch_lwip();
     steth_dispatch();