hathach пре 13 година
родитељ
комит
a21ca6c0f1
7 измењених фајлова са 12 додато и 8 уклоњено
  1. 1 1
      .cproject
  2. 1 2
      .project
  3. 2 1
      tinyusb/common/arch/arch_lpc134x.h
  4. 2 2
      tinyusb/common/arch/arch_lpc43xx.h
  5. 1 0
      tinyusb/device/dcd.h
  6. 4 1
      tinyusb/tusb.c
  7. 1 1
      tinyusb/tusb_cfg.h

+ 1 - 1
.cproject

@@ -28,7 +28,7 @@
 					<folderInfo id="com.crt.advproject.config.lib.debug.341253724." name="/" resourcePath="">
 						<toolChain id="com.crt.advproject.toolchain.lib.debug.972883292" name="Code Red MCU Tools" superClass="com.crt.advproject.toolchain.lib.debug">
 							<targetPlatform binaryParser="org.eclipse.cdt.core.ELF;org.eclipse.cdt.core.GNU_ELF" id="com.crt.advproject.platform.lib.debug.241809325" name="ARM-based MCU (Debug)" superClass="com.crt.advproject.platform.lib.debug"/>
-							<builder buildPath="${workspace_loc:/tinyusb/Debug}" id="com.crt.advproject.builder.lib.debug.2144305142" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Gnu Make Builder" superClass="com.crt.advproject.builder.lib.debug"/>
+							<builder buildPath="${workspace_loc:/tinyusb/Debug}" enableAutoBuild="true" id="com.crt.advproject.builder.lib.debug.2144305142" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Gnu Make Builder" superClass="com.crt.advproject.builder.lib.debug"/>
 							<tool id="com.crt.advproject.cpp.lib.debug.1524252612" name="MCU C++ Compiler" superClass="com.crt.advproject.cpp.lib.debug"/>
 							<tool id="com.crt.advproject.gcc.lib.debug.858148136" name="MCU C Compiler" superClass="com.crt.advproject.gcc.lib.debug">
 								<option id="com.crt.advproject.gcc.arch.704503495" name="Architecture" superClass="com.crt.advproject.gcc.arch" value="com.crt.advproject.gcc.target.cm3" valueType="enumerated"/>

+ 1 - 2
.project

@@ -7,7 +7,6 @@
 	<buildSpec>
 		<buildCommand>
 			<name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>
-			<triggers>clean,full,incremental,</triggers>
 			<arguments>
 				<dictionary>
 					<key>?name?</key>
@@ -43,7 +42,7 @@
 				</dictionary>
 				<dictionary>
 					<key>org.eclipse.cdt.make.core.enableAutoBuild</key>
-					<value>false</value>
+					<value>true</value>
 				</dictionary>
 				<dictionary>
 					<key>org.eclipse.cdt.make.core.enableCleanBuild</key>

+ 2 - 1
tinyusb/common/arch/arch_lpc134x.h

@@ -43,8 +43,9 @@
 #endif
 
 #include "arm_mx.h"
+#include "LPC13Uxx.h"
 
-#define ARM ARM_M3
+#define ARM_M3
 
 #define DEVICE_ROMDRIVER
 

+ 2 - 2
tinyusb/common/arch/arch_lpc43xx.h

@@ -42,8 +42,8 @@
  extern "C" {
 #endif
 
-#define ARM ARM_M4
-//#define ARM ARM_M0
+#define ARM_M4
+//#define ARM_M0
 
 #include "arm_mx.h"
 

+ 1 - 0
tinyusb/device/dcd.h

@@ -48,6 +48,7 @@
 #include "romdriver/mw_usbd_rom_api.h"
 #endif
 
+
 #ifdef __cplusplus
  }
 #endif

+ 4 - 1
tinyusb/tusb.c

@@ -36,7 +36,10 @@
  */
 
 #include "tusb.h"
-#include "LPC13Uxx.h" // TODO HAL
+
+#ifdef CFG_TUSB_DEVICE
+  #include "device/dcd.h"
+#endif
 
 ErrorCode_t tusb_init(void)
 {

+ 1 - 1
tinyusb/tusb_cfg.h

@@ -47,7 +47,7 @@
 #define CFG_TUSB_HOST
 #define CFG_TUSB_DEVICE
 
-
+// TODO APP
 #define USB_MAX_IF_NUM          8
 #define USB_MAX_EP_NUM          5