Mercurial > hp34970-firmware / file comparison
comparison: src/main.cpp
src/main.cpp
- changeset 17
- 162fe523c37d
- parent 13
- 0fdeed7c083e
- child 18
- 4fd621551d55
equal
deleted
inserted
replaced
| 16:c5e5bdc5ef49 | 17:162fe523c37d |
|---|---|
| 10 #include "Arial12x12.h" | 10 #include "Arial12x12.h" |
| 11 | 11 |
| 12 #include "SSD1322.h" | 12 #include "SSD1322.h" |
| 13 #include "hp34comm.h" | 13 #include "hp34comm.h" |
| 14 | 14 |
| 15 | 15 #if (defined STM32L432xx) |
| 16 #if (defined STM32F303x8) || (defined STM32L432xx) | |
| 17 // display | 16 // display |
| 18 #define DSP_MOSI PA_7 //A6 | 17 #define DSP_MOSI PA_7 //A6 |
| 19 #define DSP_MISO PA_6 //A5 | 18 #define DSP_MISO PA_6 //A5 |
| 20 #define DSP_SCLK PA_5 //A4 | 19 #define DSP_SCLK PA_5 //A4 |
| 21 #define DSP_CS PB_0 //D3 | 20 #define DSP_CS PB_0 //D3 |
| 21 #define DSP_RST PB_5 //D11 | |
| 22 #define DSP_DC PB_4 //D12 | |
| 23 // UART for RX (CPU->DP) and TX (DP->CPU) combined | |
| 24 #define HP_RX PA_10 // serial1 RX | |
| 25 // misc | |
| 26 #define DBGPIN PA_12 | |
| 27 | |
| 28 #elif (defined STM32F303x8) | |
| 29 // display | |
| 30 #define DSP_MOSI PA_7 //A6 | |
| 31 #define DSP_MISO PA_6 //A5 | |
| 32 #define DSP_SCLK PA_5 //A4 | |
| 33 #define DSP_CS PA_4 | |
| 22 #define DSP_RST PB_5 //D11 | 34 #define DSP_RST PB_5 //D11 |
| 23 #define DSP_DC PB_4 //D12 | 35 #define DSP_DC PB_4 //D12 |
| 24 // UART for RX (CPU->DP) and TX (DP->CPU) combined | 36 // UART for RX (CPU->DP) and TX (DP->CPU) combined |
| 25 #define HP_RX PA_10 // serial1 RX | 37 #define HP_RX PA_10 // serial1 RX |
| 26 // misc | 38 // misc |
| 495 void loop() { // run over and over | 507 void loop() { // run over and over |
| 496 unsigned int err[8]; | 508 unsigned int err[8]; |
| 497 for (uint8_t i=0; i<8; i++) | 509 for (uint8_t i=0; i<8; i++) |
| 498 err[i] = 0; | 510 err[i] = 0; |
| 499 while(1) { | 511 while(1) { |
| 500 if (hp != NULL) { | |
| 501 if (hp->cmd_available()) | 512 if (hp->cmd_available()) |
| 502 { | 513 { |
| 503 led = 1; | 514 led = 1; |
| 504 HPSerial::CMD cmd; | 515 HPSerial::CMD cmd; |
| 505 if (hp->pop(cmd)) | 516 if (hp->pop(cmd)) |
| 539 if (cmd.direction == HPSerial::Rx) | 550 if (cmd.direction == HPSerial::Rx) |
| 540 show(cmd.cmd, cmd.value, cmd.size); | 551 show(cmd.cmd, cmd.value, cmd.size); |
| 541 } | 552 } |
| 542 led = 0; | 553 led = 0; |
| 543 } | 554 } |
| 544 } | 555 else |
| 545 else { | 556 Thread::wait(1); |
| 546 show(0x00, "hello", 6); | |
| 547 } | |
| 548 | |
| 549 Thread::wait(10); | |
| 550 } | 557 } |
| 551 } | 558 } |
| 552 | 559 |
| 553 int main() | 560 int main() |
| 554 { | 561 { |
