-
Notifications
You must be signed in to change notification settings - Fork 150
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'upstream/master' into feature/driver_an…
…d_hal_update
- Loading branch information
Showing
31 changed files
with
1,357 additions
and
947 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,57 +1,69 @@ | ||
| /** TODO fix / remove this example | ||
| * anticipated issue that it only shows 1 byte every 100ms | ||
| * which may be misleading to user | ||
| * | ||
| * also, it should probably use serial print to pipe out | ||
| * data instead of the patch's display. | ||
| */ | ||
| #include "daisy_patch.h" | ||
|
|
||
| using namespace daisy; | ||
|
|
||
| DaisyPatch hw; | ||
| /** Consts */ | ||
| const size_t kUartBufferSize = 512; | ||
|
|
||
| DaisyPatch hw; | ||
| UartHandler uart; | ||
| uint8_t uart_buffer[kUartBufferSize]; | ||
| char receive_str[kUartBufferSize]; | ||
|
|
||
| /** Happens automatically whenever transaction completes */ | ||
| void uartCallback(uint8_t* data, | ||
| size_t size, | ||
| void* context, | ||
| UartHandler::Result res) | ||
| { | ||
| /** Clear receive_str */ | ||
| std::fill(&receive_str[0], &receive_str[kUartBufferSize - 1], 0); | ||
| /** Copy new data into the receive str */ | ||
| std::copy(&data[0], &data[size - 1], &receive_str[0]); | ||
| } | ||
|
|
||
| int main(void) | ||
| { | ||
| // Initialize the Daisy Patch | ||
| hw.Init(); | ||
|
|
||
| // Configure the Uart Peripheral | ||
| UartHandler::Config uart_conf; | ||
| uart_conf.periph = UartHandler::Config::Peripheral::USART_1; | ||
| uart_conf.mode = UartHandler::Config::Mode::RX; | ||
| uart_conf.pin_config.tx = Pin(PORTB, 6); | ||
| uart_conf.pin_config.rx = Pin(PORTB, 7); | ||
|
|
||
| // Initialize the Uart Peripheral | ||
| uart.Init(uart_conf); | ||
|
|
||
| // Start the FIFO Receive | ||
| uart.DmaReceiveFifo(); | ||
|
|
||
| uint8_t pop = 0; | ||
| while(1) { | ||
| // if there's data, pop it from the FIFO | ||
| if(uart.ReadableFifo()){ | ||
| pop = uart.PopFifo(); | ||
| hw.seed.SetLed(false); | ||
| } | ||
| else{ | ||
| hw.seed.SetLed(true); | ||
| } | ||
|
|
||
| // clear the display | ||
| // Initialize the Daisy Patch | ||
| hw.Init(); | ||
|
|
||
| // Configure the Uart Peripheral | ||
| UartHandler::Config uart_conf; | ||
| uart_conf.periph = UartHandler::Config::Peripheral::USART_1; | ||
| uart_conf.mode = UartHandler::Config::Mode::RX; | ||
| uart_conf.pin_config.tx = Pin(PORTB, 6); | ||
| uart_conf.pin_config.rx = Pin(PORTB, 7); | ||
|
|
||
| // Initialize the Uart Peripheral | ||
| uart.Init(uart_conf); | ||
| uart.DmaListenStart(uart_buffer, kUartBufferSize, uartCallback, nullptr); | ||
|
|
||
| while(1) | ||
| { | ||
| // clear the display | ||
| hw.display.Fill(false); | ||
|
|
||
| // draw the title text | ||
| // draw the title text | ||
| char cstr[26]; | ||
| sprintf(cstr, "Uart DMA Fifo Rx"); | ||
| hw.display.SetCursor(0, 0); | ||
| hw.display.WriteString(cstr, Font_7x10, true); | ||
|
|
||
| // draw the last popped data | ||
| sprintf(cstr, "%d", pop); | ||
| // draw the last popped data | ||
| hw.display.SetCursor(0, 12); | ||
| hw.display.WriteString(cstr, Font_7x10, true); | ||
| // update the display | ||
| hw.display.Update(); | ||
| hw.display.WriteString(receive_str, Font_7x10, true); | ||
|
|
||
| // update the display | ||
| hw.display.Update(); | ||
|
|
||
| // wait 100 ms | ||
| // wait 100 ms | ||
| System::Delay(100); | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.