update 1.8
This commit is contained in:
@@ -1,36 +0,0 @@
|
||||
/******************** (C) COPYRIGHT ********************************************
|
||||
* File Name : PRINTF.H
|
||||
* Author : MJX
|
||||
* Version : V1.00
|
||||
* Date : 2022/03/31
|
||||
* Description : Head-file of Debug printf switch
|
||||
*******************************************************************************
|
||||
* Copyright (c) 2021 Nanjing Qinheng Microelectronics Co., Ltd.
|
||||
* Attention: This software (modified or not) and binary are used for
|
||||
* microcontroller manufactured by Nanjing Qinheng Microelectronics.
|
||||
*******************************************************************************/
|
||||
|
||||
#ifndef __PRINTF_H__
|
||||
#define __PRINTF_H__
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
/*******************************************************************************/
|
||||
/* Defining the serial printout switch */
|
||||
#define DEBUG_SW 1 /* General print monitoring switch */
|
||||
|
||||
/* If the above macro is defined then the output is printed via the serial port, otherwise it is not processed */
|
||||
#if( DEBUG_SW == 1 )
|
||||
#define DUG_PRINTF( format, arg... ) printf( format, ##arg ) /* Uart printf output */
|
||||
#else
|
||||
#define DUG_PRINTF( format, arg... ) do{ if( 0 )printf( format, ##arg ); }while( 0 );
|
||||
#endif
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
||||
@@ -436,7 +436,7 @@ void UART2_DataRx_Deal( void )
|
||||
{
|
||||
/* Overflow handling */
|
||||
/* Save frame error status */
|
||||
DUG_PRINTF("U0_O:%08lx\n",(uint32_t)Uart.Rx_RemainLen);
|
||||
printf("U0_O:%08lx\n",(uint32_t)Uart.Rx_RemainLen);
|
||||
}
|
||||
else
|
||||
{
|
||||
|
||||
@@ -21,7 +21,6 @@ extern "C" {
|
||||
#include "string.h"
|
||||
#include "debug.h"
|
||||
#include "string.h"
|
||||
#include "PRINTF.h"
|
||||
#include "ch32v20x_usbfs_device.h"
|
||||
#include "ch32v20x_conf.h"
|
||||
|
||||
|
||||
@@ -93,7 +93,7 @@ void USBFS_Device_Endp_Init( void )
|
||||
USBOTG_FS->UEP0_DMA = (uint32_t)USBFS_EP0_Buf;
|
||||
|
||||
USBOTG_FS->UEP1_DMA = (uint32_t)USBFS_EP1_Buf;
|
||||
USBOTG_FS->UEP2_DMA = (uint32_t)USBFS_EP2_Buf;
|
||||
USBOTG_FS->UEP2_DMA = (uint32_t)UART2_Tx_Buf;
|
||||
USBOTG_FS->UEP3_DMA = (uint32_t)USBFS_EP3_Buf;
|
||||
USBOTG_FS->UEP4_DMA = (uint32_t)USBFS_EP4_Buf;
|
||||
|
||||
@@ -224,12 +224,12 @@ uint8_t USBFS_Endp_DataUp(uint8_t endp, uint8_t *pbuf, uint16_t len, uint8_t mod
|
||||
{
|
||||
memcpy( USBFSD_UEP_BUF(endp)+buf_load_offset, pbuf, len );
|
||||
}
|
||||
/* Set end-point busy */
|
||||
USBFS_Endp_Busy[ endp ] = 0x01;
|
||||
/* tx length */
|
||||
USBFSD_UEP_TLEN(endp) = len;
|
||||
/* response ack */
|
||||
USBFSD_UEP_CTRL(endp) = (USBFSD_UEP_CTRL(endp) & ~USBFS_UEP_T_RES_MASK) | USBFS_UEP_T_RES_ACK;
|
||||
/* Set end-point busy */
|
||||
USBFS_Endp_Busy[ endp ] = 0x01;
|
||||
}
|
||||
}
|
||||
else
|
||||
@@ -580,9 +580,9 @@ void USBHD_IRQHandler( void )
|
||||
|
||||
/* get hid descriptor */
|
||||
case USB_DESCR_TYP_HID:
|
||||
if( USBFS_SetupReqIndex == 0x00 )
|
||||
if( USBFS_SetupReqIndex == 0x02 )
|
||||
{
|
||||
pUSBFS_Descr = &MyCfgDescr[ 18 ];
|
||||
pUSBFS_Descr = &MyCfgDescr[ 84 ];
|
||||
len = 9;
|
||||
}
|
||||
else
|
||||
|
||||
Reference in New Issue
Block a user