Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
commit
5489c47a27
|
@ -15,7 +15,9 @@
|
||||||
*/
|
*/
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#define SPLIT_USB_DETECT // Force this on for now
|
#ifndef USB_VBUS_PIN
|
||||||
|
# define SPLIT_USB_DETECT // Force this on when dedicated pin is not used
|
||||||
|
#endif
|
||||||
|
|
||||||
#if defined(STM32F1XX)
|
#if defined(STM32F1XX)
|
||||||
# define USE_GPIOV1
|
# define USE_GPIOV1
|
||||||
|
|
|
@ -13,8 +13,8 @@
|
||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
#include "quantum.h"
|
||||||
#include "usb_util.h"
|
#include "usb_util.h"
|
||||||
#include "wait.h"
|
|
||||||
|
|
||||||
__attribute__((weak)) void usb_disable(void) {}
|
__attribute__((weak)) void usb_disable(void) {}
|
||||||
__attribute__((weak)) bool usb_connected_state(void) { return true; }
|
__attribute__((weak)) bool usb_connected_state(void) { return true; }
|
||||||
|
|
Loading…
Reference in New Issue