Mercurial > hp34970-firmware / file diff

--- a/src/main.cpp	Wed Oct 26 22:41:16 2016 +0200
+++ b/src/main.cpp	Sat Oct 29 23:44:31 2016 +0200
@@ -12,6 +12,8 @@
 #include "SSD1322.h"
 #include "hp34comm.h"
 
+#include "Keypad.h"
+
 #if (defined STM32L432xx)
 // display
 #define DSP_MOSI PA_7 //A6
@@ -21,6 +23,7 @@
 #define DSP_RST  PB_5 //D11
 #define DSP_DC   PB_4 //D12
 // UART for RX (CPU->DP) and TX (DP->CPU) combined
+#define HP_TX PA_9 // serial1 TX
 #define HP_RX PA_10 // serial1 RX
 // misc
 #define DBGPIN PA_12
@@ -67,6 +70,9 @@
 Timeout blinker;
 DigitalOut led(LED1);
 
+Keypad kpad(std::vector<int>({(int)PA_0, (int)PA_1}),
+	    std::vector<int>({(int)PA_8, (int)PA_11}));
+
 uint8_t curchar;
 uint8_t cmd;
 uint8_t nchars;
@@ -284,7 +290,7 @@
   wait(2);
   dsp->cls();
 
-  hp = new HPSerial(HP_RX);
+  hp = new HPSerial(HP_TX, HP_RX);
   //hp = NULL;
 }
 
@@ -530,26 +536,23 @@
 		}
 	      for (uint8_t i=0; i<7; i++)
 		err[i] = hp->nerrors(i);
-	      printf("CMD[%s:%d] %02X", (cmd.direction==HPSerial::Rx)?"Rx":"Tx", cmd.id,
-		     cmd.cmd);
+	      printf("CMD[%d] %02X", cmd.id, cmd.cmd);
 	      
-	      if (cmd.direction == HPSerial::Rx) {
-		if ((cmd.cmd == 0x00) || (cmd.cmd == 0x0C))
-		  printf(": '%s'\n", cmd.value);
-		else {
-		  printf(":");
-		  for (uint8_t i=0; i<cmd.size; i++)
-		    printf("%02x ", cmd.value[i]);
-		  printf("\n");	      
-		}
-		show(cmd.cmd, cmd.value, cmd.size);
+	      if ((cmd.cmd == 0x00) || (cmd.cmd == 0x0C))
+		printf(": '%s'\n", cmd.value);
+	      else {
+		printf(":");
+		for (uint8_t i=0; i<cmd.size; i++)
+		  printf("%02x ", cmd.value[i]);
+		printf("\n");	      
 	      }
-	      else
-		printf("\n");
+	      show(cmd.cmd, cmd.value, cmd.size);
+	    }
+	  else
+	    printf("\n");
 	  
-	      if (cmd.direction == HPSerial::Rx)
-		show(cmd.cmd, cmd.value, cmd.size);
-	    }
+	  show(cmd.cmd, cmd.value, cmd.size);
+	    
 	  led = 0;
 	}
       else