diff -r c5e5bdc5ef49 -r 162fe523c37d src/main.cpp --- a/src/main.cpp Tue Oct 11 21:49:43 2016 +0200 +++ b/src/main.cpp Wed Oct 26 22:41:16 2016 +0200 @@ -12,8 +12,7 @@ #include "SSD1322.h" #include "hp34comm.h" - -#if (defined STM32F303x8) || (defined STM32L432xx) +#if (defined STM32L432xx) // display #define DSP_MOSI PA_7 //A6 #define DSP_MISO PA_6 //A5 @@ -26,6 +25,19 @@ // misc #define DBGPIN PA_12 +#elif (defined STM32F303x8) +// display +#define DSP_MOSI PA_7 //A6 +#define DSP_MISO PA_6 //A5 +#define DSP_SCLK PA_5 //A4 +#define DSP_CS PA_4 +#define DSP_RST PB_5 //D11 +#define DSP_DC PB_4 //D12 +// UART for RX (CPU->DP) and TX (DP->CPU) combined +#define HP_RX PA_10 // serial1 RX +// misc +#define DBGPIN PA_12 + #elif defined STM32F446xx // display #define DSP_MOSI PB_15 @@ -497,7 +509,6 @@ for (uint8_t i=0; i<8; i++) err[i] = 0; while(1) { - if (hp != NULL) { if (hp->cmd_available()) { led = 1; @@ -541,12 +552,8 @@ } led = 0; } - } - else { - show(0x00, "hello", 6); - } - - Thread::wait(10); + else + Thread::wait(1); } }