-
Notifications
You must be signed in to change notification settings - Fork 1k
STM32F1 merge other (BluePill and Maple Mini) #61
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Closed
Closed
Changes from all commits
Commits
Show all changes
11 commits
Select commit
Hold shift + click to select a range
e737f89
BluePill F103C8 variant added.
fpistm 69c09fb
Maple Mini STM32F103CB added.
5ef765c
Aligns configuration with master
fpistm 1902beb
Add extra include path for USB CDC
fpistm 47ca5c2
Add USB IRQHandler for BluePill and MapleMini variants
f3b6c46
BluePill pin mapping reordered
dc7f4d5
Add missing {build.upload_flags}
fpistm 6ec7b0b
Align Pins name and pins index after merged of #83
fpistm 66bb1db
Update after update for HAL drivers for F1 (#78)
fpistm 8cc1fd2
Update after the AF update for STM32F1
fpistm cf38a1f
Remove SCLK definition
fpistm File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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 hidden or 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 hidden or 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 |
|---|---|---|
| @@ -0,0 +1,212 @@ | ||
| /**************************************************************************** | ||
| * | ||
| * USBSerial core library for Arduino STM32 + HAL + CubeMX (HALMX). | ||
| * | ||
| * Copyright (c) 2016 by Vassilis Serasidis <[email protected]> | ||
| * Home: http://www.serasidis.gr | ||
| * email: [email protected] | ||
| * | ||
| * Arduino_STM32 forum: http://www.stm32duino.com | ||
| * | ||
| * Permission to use, copy, modify, and/or distribute this software for | ||
| * any purpose with or without fee is hereby granted, provided that the | ||
| * above copyright notice and this permission notice appear in all copies. | ||
| * | ||
| * Some functions follow the sam and samd arduino core libray files. | ||
| * | ||
| * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL | ||
| * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED | ||
| * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR | ||
| * BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES | ||
| * OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, | ||
| * WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, | ||
| * ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS | ||
| * | ||
| ****************************************************************************/ | ||
|
|
||
| #include <chip.h> | ||
|
|
||
| #if defined(SERIAL_USB) && defined(USBCON) | ||
| #include <USBSerial.h> | ||
| #include "variant.h" | ||
|
|
||
| // Constructors //////////////////////////////////////////////////////////////// | ||
| USBSerial::USBSerial(){ | ||
| // Make sure Rx ring buffer is initialized back to empty. | ||
| rx_buffer.iHead = rx_buffer.iTail = 0; | ||
| //tx_buffer.iHead = tx_buffer.iTail = 0; | ||
| } | ||
|
|
||
| void USBSerial::init(void){ | ||
| /* Re-enumerate the USB */ | ||
| volatile unsigned int i; | ||
|
|
||
| #ifdef USB_DISC_PIN | ||
| pinMode(USB_DISC_PIN, OUTPUT); | ||
| digitalWrite(USB_DISC_PIN, HIGH); | ||
| for(i=0;i<512;i++); | ||
| digitalWrite(USB_DISC_PIN, LOW); | ||
| #else | ||
| #error "USB_DISC_PIN definition missing" | ||
| #endif | ||
| MX_USB_DEVICE_Init(); | ||
| } | ||
|
|
||
|
|
||
| void USBSerial::begin(uint32_t baud_count){ | ||
| init(); | ||
| // suppress "unused parameter" warning | ||
| (void)baud_count; | ||
| } | ||
|
|
||
| void USBSerial::begin(uint32_t baud_count, uint8_t config){ | ||
| init(); | ||
| //suppress "unused parameter" warning | ||
| (void)baud_count; | ||
| (void)config; | ||
| } | ||
|
|
||
| void USBSerial::end(void){ | ||
|
|
||
| } | ||
|
|
||
|
|
||
| int USBSerial::availableForWrite(void){ | ||
| //return (CDC_SERIAL_BUFFER_SIZE - available()); | ||
| //return (uint32_t)(CDC_SERIAL_BUFFER_SIZE + tx_buffer.iHead - tx_buffer.iTail) % CDC_SERIAL_BUFFER_SIZE; | ||
| return 0; | ||
| } | ||
|
|
||
|
|
||
| int USBSerial::available(void){ | ||
| return (uint32_t)(CDC_SERIAL_BUFFER_SIZE + rx_buffer.iHead - rx_buffer.iTail) % CDC_SERIAL_BUFFER_SIZE; | ||
| } | ||
|
|
||
| int USBSerial::peek(void) | ||
| { | ||
| if ( rx_buffer.iHead == rx_buffer.iTail ) | ||
| return -1; | ||
|
|
||
| return rx_buffer.buffer[rx_buffer.iTail]; | ||
| } | ||
|
|
||
| int USBSerial::read(void) | ||
| { | ||
| // if the head isn't ahead of the tail, we don't have any characters | ||
| if ( rx_buffer.iHead == rx_buffer.iTail ) | ||
| return -1; | ||
|
|
||
| uint8_t uc = rx_buffer.buffer[rx_buffer.iTail]; | ||
| rx_buffer.iTail = (unsigned int)(rx_buffer.iTail + 1) % CDC_SERIAL_BUFFER_SIZE; | ||
|
|
||
| return uc; | ||
| } | ||
|
|
||
| void USBSerial::flush(void){ | ||
| //It's not implemented yet. | ||
| } | ||
|
|
||
| size_t USBSerial::write(const uint8_t *buffer, size_t size){ | ||
| unsigned long timeout=millis()+5; | ||
| if(hUsbDeviceFS.dev_state == USBD_STATE_CONFIGURED) | ||
| { | ||
| while(millis()<timeout) | ||
| { | ||
| if(CDC_Transmit_FS((uint8_t*)buffer, size) == USBD_OK) | ||
| { | ||
| return size; | ||
| } | ||
| } | ||
| } | ||
|
|
||
| return 0; | ||
|
|
||
|
|
||
| /* uint8_t i; | ||
|
|
||
| if(hUsbDeviceFS.dev_state == USBD_STATE_CONFIGURED){ | ||
|
|
||
| //HAL_NVIC_DisableIRQ(USB_LP_CAN1_RX0_IRQn); | ||
| for(i=0;i<200;i++) | ||
| if(CDC_Transmit_FS((uint8_t*)buffer, size) == USBD_OK){ | ||
| return size; | ||
| //break; | ||
| } | ||
|
|
||
|
|
||
| //HAL_NVIC_EnableIRQ(USB_LP_CAN1_RX0_IRQn); | ||
| } | ||
| return 0; */ | ||
| } | ||
|
|
||
| size_t USBSerial::write(uint8_t c) { | ||
| return write(&c, 1); | ||
| } | ||
|
|
||
| void USBSerial::CDC_RxHandler (uint8_t* Buf, uint16_t Len){ | ||
|
|
||
| for(uint16_t i=0;i<Len;i++){ | ||
| if(available() < (CDC_SERIAL_BUFFER_SIZE - 1)){ | ||
| rx_buffer.buffer[rx_buffer.iHead] = *Buf++; | ||
| rx_buffer.iHead = (uint16_t)(rx_buffer.iHead + 1) % CDC_SERIAL_BUFFER_SIZE; | ||
| }else | ||
| break; | ||
| } | ||
| } | ||
|
|
||
|
|
||
| // This operator is a convenient way for a sketch to check whether the | ||
| // port has actually been configured and opened by the host (as opposed | ||
| // to just being connected to the host). It can be used, for example, in | ||
| // setup() before printing to ensure that an application on the host is | ||
| // actually ready to receive and display the data. | ||
| // We add a short delay before returning to fix a bug observed by Federico | ||
| // where the port is configured (lineState != 0) but not quite opened. | ||
| USBSerial::operator bool() | ||
| { | ||
| // this is here to avoid spurious opening after upload | ||
| if (millis() < 500) | ||
| return false; | ||
|
|
||
| bool result = false; | ||
|
|
||
| /* if (_usbLineInfo.lineState > 0) | ||
| { | ||
| result = true; | ||
| } | ||
|
|
||
| delay(10); */ | ||
| return result; | ||
| } | ||
|
|
||
| uint32_t USBSerial::baud() { | ||
| //return _usbLineInfo.dwDTERate; | ||
| return 0; | ||
| } | ||
|
|
||
| uint8_t USBSerial::stopbits() { | ||
| //return _usbLineInfo.bCharFormat; | ||
| return 0; | ||
| } | ||
|
|
||
| uint8_t USBSerial::paritytype() { | ||
| //return _usbLineInfo.bParityType; | ||
| return 0; | ||
| } | ||
|
|
||
| uint8_t USBSerial::numbits() { | ||
| //return _usbLineInfo.bDataBits; | ||
| return 0; | ||
| } | ||
|
|
||
| bool USBSerial::dtr() { | ||
| //return _usbLineInfo.lineState & 0x1; | ||
| return 0; | ||
| } | ||
|
|
||
| bool USBSerial::rts() { | ||
| //return _usbLineInfo.lineState & 0x2; | ||
| return 0; | ||
| } | ||
|
|
||
| #endif |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Move STLink method before DFUUploadMethod. STLink will be the default Upload method.