Merge pull request #10 from hathach/devlocal

merge for local develop

4 files changed, 63 insertions, 49 deletions

diff --git a/examples/device/device_composite/ses/device_composite.emProject b/examples/device/device_composite/ses/device_composite.emProject
index 35463b25d..371ef8bb7 100644
--- a/examples/device/device_composite/ses/device_composite.emProject
+++ b/examples/device/device_composite/ses/device_composite.emProject
@@ -19,7 +19,7 @@
       arm_target_device_name="nRF52840_xxAA"
       arm_target_interface_type="SWD"
       build_treat_warnings_as_errors="Yes"
-      c_preprocessor_definitions="NRF52840_XXAA;__nRF_FAMILY;ARM_MATH_CM4;FLASH_PLACEMENT=1;BOARD_PCA10056"
+      c_preprocessor_definitions="NRF52840_XXAA;__nRF_FAMILY;ARM_MATH_CM4;FLASH_PLACEMENT=1;BOARD_PCA10056;CFG_TUSB_MCU=OPT_MCU_NRF5X"
       c_user_include_directories="../src;$(rootDir)/hw/cmsis/Include;$(rootDir)/hw;$(rootDir)/src;$(nrfxDir)/..;$(nrfxDir);$(nrfxDir)/mdk;$(nrfxDir)/hal;$(nrfxDir)/drivers/include"
       debug_register_definition_file="ses_nrf5x/nrf52840_Registers.xml"
       debug_target_connection="J-Link"
@@ -118,8 +118,8 @@
       arm_target_device_name="ATSAMD51J19"
       arm_target_interface_type="SWD"
       build_treat_warnings_as_errors="Yes"
-      c_preprocessor_definitions="__SAME51_FAMILY;__SAMD51J19A__;ARM_MATH_CM4;FLASH_PLACEMENT=1;BOARD_METRO_M4_EXPRESS;USE_SIMPLE_ASSERT"
-      c_user_include_directories="../src;$(rootDir)/hw/cmsis/Include;$(rootDir)/hw;$(rootDir)/src;$(asf4Dir);$(asf4Dir)/include;$(asf4Dir)/hri;$(asf4Dir)/hal/include;$(asf4Dir)/hal/utils/include;$(asf4Dir)/hpl/port"
+      c_preprocessor_definitions="__SAME51_FAMILY;__SAMD51J19A__;ARM_MATH_CM4;FLASH_PLACEMENT=1;USE_SIMPLE_ASSERT;BOARD_METRO_M4_EXPRESS;CIRCUITPY_GCLK_INIT_1ST=0xffff;CFG_TUSB_MCU=OPT_MCU_SAMD51"
+      c_user_include_directories="../src;$(rootDir)/hw/cmsis/Include;$(rootDir)/hw;$(rootDir)/src;$(asf4Dir);$(asf4Dir)/include;$(asf4Dir)/config;$(asf4Dir)/hri;$(asf4Dir)/hal/include;$(asf4Dir)/hal/utils/include;$(asf4Dir)/hpl/port;$(asf4Dir)/hpl/gclk"
       debug_register_definition_file="ses_samd51/ATSAME51J19A_Registers.xml"
       debug_target_connection="J-Link"
       gcc_entry_point="Reset_Handler"
@@ -156,6 +156,23 @@
                 <folder Name="gcc">
                   <file file_name="../../../../hw/mcu/microchip/samd/asf4/samd51/gcc/system_samd51.c" />
                 </folder>
+                <folder Name="hpl">
+                  <folder Name="core">
+                    <file file_name="../../../../../../../adafruit/circuitpython/thach_cp/ports/atmel-samd/asf4/samd51/hpl/core/hpl_init.c" />
+                  </folder>
+                  <folder Name="osc32kctrl">
+                    <file file_name="../../../../hw/mcu/microchip/samd/asf4/samd51/hpl/osc32kctrl/hpl_osc32kctrl.c" />
+                  </folder>
+                  <folder Name="oscctrl">
+                    <file file_name="../../../../hw/mcu/microchip/samd/asf4/samd51/hpl/oscctrl/hpl_oscctrl.c" />
+                  </folder>
+                  <folder Name="mclk">
+                    <file file_name="../../../../hw/mcu/microchip/samd/asf4/samd51/hpl/mclk/hpl_mclk.c" />
+                  </folder>
+                  <folder Name="gclk">
+                    <file file_name="../../../../hw/mcu/microchip/samd/asf4/samd51/hpl/gclk/hpl_gclk.c" />
+                  </folder>
+                </folder>
               </folder>
             </folder>
           </folder>
@@ -163,15 +180,6 @@
       </folder>
     </folder>
     <configuration Name="Debug" build_treat_warnings_as_errors="Yes" />
-    <folder Name="src">
-      <file file_name="../src/main.c" />
-      <folder Name="segger_rtt">
-        <file file_name="../src/segger_rtt/SEGGER_RTT.c" />
-        <file file_name="../src/segger_rtt/SEGGER_RTT.h" />
-        <file file_name="../src/segger_rtt/SEGGER_RTT_Conf.h" />
-        <file file_name="../src/segger_rtt/SEGGER_RTT_SES.c" />
-      </folder>
-    </folder>
     <folder Name="ses_samd51">
       <file file_name="ses_samd51/ATSAME51J19A_MemoryMap.xml" />
       <file file_name="ses_samd51/ATSAME51J19A_Registers.xml" />
@@ -181,5 +189,11 @@
       <file file_name="ses_samd51/SAME51_Startup.s" />
       <file file_name="ses_samd51/SAME51_Target.js" />
     </folder>
+    <folder
+      Name="src"
+      exclude=""
+      filter="*.c;*.h"
+      path="../src"
+      recurse="Yes" />
   </project>
 </solution>
diff --git a/examples/device/device_composite/src/main.c b/examples/device/device_composite/src/main.c
index 11b73ebf9..4c8730242 100644
--- a/examples/device/device_composite/src/main.c
+++ b/examples/device/device_composite/src/main.c
@@ -36,9 +36,6 @@
 */
 /**************************************************************************/
 
-//--------------------------------------------------------------------+
-// INCLUDE
-//--------------------------------------------------------------------+
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
@@ -47,15 +44,39 @@
 #include "tusb.h"
 
 //--------------------------------------------------------------------+
-// MACRO CONSTANT TYPEDEF
-//--------------------------------------------------------------------+
-
-//--------------------------------------------------------------------+
-// INTERNAL OBJECT & FUNCTION DECLARATION
+// MACRO CONSTANT TYPEDEF PROTYPES
 //--------------------------------------------------------------------+
 void print_greeting(void);
 void led_blinking_task(void);
 
+/*------------- MAIN -------------*/
+int main(void)
+{
+  board_init();
+  print_greeting();
+
+  tusb_init();
+
+  while (1)
+  {
+    tusb_task();
+
+    led_blinking_task();
+
+#if CFG_TUD_CDC
+    extern void virtual_com_task(void);
+    virtual_com_task();
+#endif
+
+#if CFG_TUD_HID
+    extern void usb_hid_task(void);
+    usb_hid_task();
+#endif
+  }
+
+  return 0;
+}
+
 //--------------------------------------------------------------------+
 // USB CDC
 //--------------------------------------------------------------------+
@@ -90,8 +111,6 @@ void tud_cdc_line_state_cb(uint8_t itf, bool dtr, bool rts)
     tud_cdc_write_str("tinyusb usb cdc\n");
   }
 }
-#else
-#define virtual_com_task()
 #endif
 
 //--------------------------------------------------------------------+
@@ -151,32 +170,8 @@ void tud_hid_generic_set_report_cb(uint8_t report_id, hid_report_type_t report_t
 {
   // TODO not Implemented
 }
-
-#else
-#define usb_hid_task()
 #endif
 
-
-/*------------- MAIN -------------*/
-int main(void)
-{
-  board_init();
-  print_greeting();
-
-  tusb_init();
-
-  while (1)
-  {
-    tusb_task();
-
-    led_blinking_task();
-    virtual_com_task();
-    usb_hid_task();
-  }
-
-  return 0;
-}
-
 //--------------------------------------------------------------------+
 // tinyusb callbacks
 //--------------------------------------------------------------------+
diff --git a/examples/device/device_composite/src/tusb_config.h b/examples/device/device_composite/src/tusb_config.h
index 680036859..b5b4fe088 100644
--- a/examples/device/device_composite/src/tusb_config.h
+++ b/examples/device/device_composite/src/tusb_config.h
@@ -48,7 +48,12 @@
 //--------------------------------------------------------------------
 // COMMON CONFIGURATION
 //--------------------------------------------------------------------
-#define CFG_TUSB_MCU                OPT_MCU_NRF5X
+
+// defined by compiler flags for flexibility
+#ifndef CFG_TUSB_MCU
+  #error CFG_TUSB_MCU should be defined using compiler flags
+#endif
+
 #define CFG_TUSB_RHPORT0_MODE       OPT_MODE_DEVICE
 
 #define CFG_TUSB_DEBUG              2
@@ -82,7 +87,7 @@
 
 //------------- CLASS -------------//
 #define CFG_TUD_CDC                 1
-#define CFG_TUD_MSC                 1
+#define CFG_TUD_MSC                 0
 
 #define CFG_TUD_HID                 0
 #define CFG_TUD_HID_KEYBOARD        0
diff --git a/examples/device/nrf52840_freertos/segger/nrf5x_freertos.emProject b/examples/device/nrf52840_freertos/segger/nrf5x_freertos.emProject
index 661dc12a6..f36a76fed 100644
--- a/examples/device/nrf52840_freertos/segger/nrf5x_freertos.emProject
+++ b/examples/device/nrf52840_freertos/segger/nrf5x_freertos.emProject
@@ -19,7 +19,7 @@
       arm_target_device_name="nRF52840_xxAA"
       arm_target_interface_type="SWD"
       build_treat_warnings_as_errors="Yes"
-      c_preprocessor_definitions="NRF52840_XXAA;__nRF_FAMILY;ARM_MATH_CM4;FLASH_PLACEMENT=1;BOARD_PCA10056"
+      c_preprocessor_definitions="NRF52840_XXAA;__nRF_FAMILY;ARM_MATH_CM4;FLASH_PLACEMENT=1;BOARD_PCA10056;CFG_TUSB_MCU=OPT_MCU_NRF5X"
       c_user_include_directories="../src;$(tusbDir)/hw/cmsis/Include;$(tusbDir)/hw;$(tusbDir)/src;$(nrfxDir)/..;$(nrfxDir);$(nrfxDir)/mdk;$(nrfxDir)/hal;$(nrfxDir)/drivers/include;$(freertosDir)/Source/include;$(freertosDir)/Source/portable/GCC/ARM_CM4F"
       debug_register_definition_file="$(ProjectDir)/nrf52840_Registers.xml"
       debug_target_connection="J-Link"