adapted FW v.2.0

Author: sds1979v

SeeeduinoDapLink.code-workspace

@@ -33,7 +33,6 @@
 #endif
 #include "DAP_config.h"
 #include "DAP.h"
-#include "dap_strings.h"
 
 #if (DAP_PACKET_SIZE < 64U)
 #error "Minimum Packet Size is 64!"
@@ -62,14 +61,22 @@
 volatile uint8_t    DAP_TransferAbort;  // Transfer Abort Flag
 
 
-// static const char DAP_FW_Ver [] = DAP_FW_VER;
+#ifdef DAP_VENDOR
+const char DAP_Vendor [] = DAP_VENDOR;
+#endif
+#ifdef DAP_PRODUCT
+const char DAP_Product[] = DAP_PRODUCT;
+#endif
+#ifdef DAP_SER_NUM
+const char DAP_SerNum [] = DAP_SER_NUM;
+#endif
+const char DAP_FW_Ver [] = DAP_FW_VER;
 
 #if TARGET_DEVICE_FIXED
-static const char TargetDeviceVendor [] = TARGET_DEVICE_VENDOR;
-static const char TargetDeviceName   [] = TARGET_DEVICE_NAME;
+const char TargetDeviceVendor [] = TARGET_DEVICE_VENDOR;
+const char TargetDeviceName   [] = TARGET_DEVICE_NAME;
 #endif
 
-
 // Get DAP Information
 //   id:      info identifier
 //   info:    pointer to info data
@@ -79,23 +86,26 @@ static uint8_t DAP_Info(uint8_t id, uint8_t *info) {
 
   switch (id) {
     case DAP_ID_VENDOR:
-      length = DAP_GetVendorString((char *)info);
+#ifdef DAP_VENDOR
+      memcpy(info, DAP_Vendor, sizeof(DAP_Vendor));
+      length = (uint8_t)sizeof(DAP_Vendor);
+#endif
       break;
     case DAP_ID_PRODUCT:
-      length = DAP_GetProductString((char *)info);
+#ifdef DAP_PRODUCT
+      memcpy(info, DAP_Product, sizeof(DAP_Product));
+      length = (uint8_t)sizeof(DAP_Product);
+#endif
       break;
     case DAP_ID_SER_NUM:
-      length = DAP_GetSerNumString((char *)info);
+#ifdef DAP_SER_NUM
+      length = USBDevice.getSerialDescriptor((uint16_t*) info);
+#endif
       break;
-    case DAP_ID_FW_VER: {
-// --- begin DAPLink change ---
-      length = DAP_GetFirmwareVersionString((char *)info);
-// Original:
-//       memcpy(info, DAP_FW_Ver, sizeof(DAP_FW_Ver));
-//       length = (uint8_t)sizeof(DAP_FW_Ver);
-// --- end DAPLink change ---
+    case DAP_ID_FW_VER:
+      memcpy(info, DAP_FW_Ver, sizeof(DAP_FW_Ver));
+      length = (uint8_t)sizeof(DAP_FW_Ver);
       break;
-    }
     case DAP_ID_DEVICE_VENDOR:
 #if TARGET_DEVICE_FIXED
       length = (uint8_t)sizeof(TargetDeviceVendor);

src/DAP.c src/DAP.cppsrc/DAP.c renamed to src/DAP.cpp

@@ -330,3 +330,4 @@ __STATIC_FORCEINLINE void PIN_DELAY_FAST (void) {
 
 
 #endif  /* __DAP_H__ */
+

src/DAP.h

@@ -25,6 +25,7 @@
 // #include "HID-Project.h"
 // #endif
 
+
 #ifndef __DAP_CONFIG_H__
 #define __DAP_CONFIG_H__
 
@@ -123,7 +124,7 @@ Provides definitions about:
 #define SWO_STREAM              0               ///< SWO Streaming Trace: 1 = available, 0 = not available.
 
 /// Clock frequency of the Test Domain Timer. Timer value is returned with \ref TIMESTAMP_GET.
-#define TIMESTAMP_CLOCK         100000000U      ///< Timestamp clock in Hz (0 = timestamps not supported).
+#define TIMESTAMP_CLOCK         48000000U      ///< Timestamp clock in Hz (0 = timestamps not supported).
 /// Debug Unit is connected to fixed Target Device.
 /// The Debug Unit may be part of an evaluation board and always connected to a fixed
 /// known device.  In this case a Device Vendor and Device Name string is stored which
@@ -202,7 +203,7 @@ Provides definitions about:
 //**************************************************************************************************
 //**
 //Faster Port Manipulation
-inline void digitalWrite_fast(int pin, bool val)
+inline void digitalWrite_fast_(int pin, bool val)
 {
    if (val)  
       PORT->Group[g_APinDescription[pin].ulPort].OUTSET.reg = (1ul << g_APinDescription[pin].ulPin);
@@ -211,7 +212,7 @@ inline void digitalWrite_fast(int pin, bool val)
 }
 
 
-inline int digitalRead_fast(int pin)
+inline int digitalRead_fast_(int pin)
 {
    return !!(PORT->Group[g_APinDescription[pin].ulPort].IN.reg & (1ul << g_APinDescription[pin].ulPin));
 }
@@ -308,7 +309,7 @@ Set the SWCLK/TCK DAP hardware I/O pin to high level.
 */
 static __forceinline void     PIN_SWCLK_TCK_SET (void) {
   if(Fast){ 
-    digitalWrite_fast(PIN_SWCLK, HIGH);}
+    digitalWrite_fast_(PIN_SWCLK, HIGH);}
   else{
     digitalWrite(PIN_SWCLK, HIGH);  }
 }
@@ -318,7 +319,7 @@ Set the SWCLK/TCK DAP hardware I/O pin to low level.
 */
 static __forceinline void     PIN_SWCLK_TCK_CLR (void) {
   if(Fast){  
-    digitalWrite_fast(PIN_SWCLK, LOW);}
+    digitalWrite_fast_(PIN_SWCLK, LOW);}
   else {
     digitalWrite(PIN_SWCLK, HIGH);}
 }
@@ -331,7 +332,7 @@ static __forceinline void     PIN_SWCLK_TCK_CLR (void) {
 */
 static __forceinline uint32_t PIN_SWDIO_TMS_IN  (void) {
   if(Fast){ 
-    return (digitalRead_fast(PIN_SWDIO) == HIGH) ? 1 : 0;}
+    return (digitalRead_fast_(PIN_SWDIO) == HIGH) ? 1 : 0;}
   else {
     return (digitalRead(PIN_SWDIO) == HIGH) ? 1 : 0;}
 
@@ -342,7 +343,7 @@ Set the SWDIO/TMS DAP hardware I/O pin to high level.
 */
 static __forceinline void     PIN_SWDIO_TMS_SET (void) {
   if(Fast){ 
-    digitalWrite_fast(PIN_SWDIO, HIGH);}
+    digitalWrite_fast_(PIN_SWDIO, HIGH);}
   else {
     digitalWrite(PIN_SWDIO, HIGH);}
 
@@ -353,7 +354,7 @@ Set the SWDIO/TMS DAP hardware I/O pin to low level.
 */
 static __forceinline void     PIN_SWDIO_TMS_CLR (void) {
   if(Fast){ 
-    digitalWrite_fast(PIN_SWDIO, LOW);}
+    digitalWrite_fast_(PIN_SWDIO, LOW);}
   else  {
     digitalWrite(PIN_SWDIO, LOW);}
 }
@@ -363,7 +364,7 @@ static __forceinline void     PIN_SWDIO_TMS_CLR (void) {
 */
 static __forceinline uint32_t PIN_SWDIO_IN      (void) {
   if(Fast){ 
-    return (digitalRead_fast(PIN_SWDIO) == HIGH) ? 1 : 0;}
+    return (digitalRead_fast_(PIN_SWDIO) == HIGH) ? 1 : 0;}
   else {
     return (digitalRead(PIN_SWDIO) == HIGH) ? 1 : 0;}
 }
@@ -373,7 +374,7 @@ static __forceinline uint32_t PIN_SWDIO_IN      (void) {
 */
 static __forceinline void     PIN_SWDIO_OUT     (uint32_t bit) {
   if(Fast){ 
-    digitalWrite_fast(PIN_SWDIO, (bit & 1) ? HIGH : LOW);}
+    digitalWrite_fast_(PIN_SWDIO, (bit & 1) ? HIGH : LOW);}
   else {
     digitalWrite(PIN_SWDIO, (bit & 1) ? HIGH : LOW);}
 }
@@ -402,7 +403,7 @@ static __forceinline void     PIN_SWDIO_OUT_DISABLE (void) {
 */
 static __forceinline uint32_t PIN_TDI_IN  (void) {
 if(Fast){ 
-  return (digitalRead_fast(PIN_TDI) == HIGH) ? 1 : 0;}
+  return (digitalRead_fast_(PIN_TDI) == HIGH) ? 1 : 0;}
 else{
   return (digitalRead(PIN_TDI) == HIGH) ? 1 : 0;}
 }
@@ -412,7 +413,7 @@ else{
 */
 static __forceinline void     PIN_TDI_OUT (uint32_t bit) {
 if(Fast){   
-  digitalWrite_fast(PIN_TDI, (bit & 1) ? HIGH : LOW);}
+  digitalWrite_fast_(PIN_TDI, (bit & 1) ? HIGH : LOW);}
 else{
   digitalWrite(PIN_TDI, (bit & 1) ? HIGH : LOW);}
 }
@@ -425,7 +426,7 @@ else{
 */
 static __forceinline uint32_t PIN_TDO_IN  (void) {
 if(Fast){   
-  return (digitalRead_fast(PIN_TDO) == HIGH) ? 1 : 0;}
+  return (digitalRead_fast_(PIN_TDO) == HIGH) ? 1 : 0;}
 else{
   return (digitalRead(PIN_TDO) == HIGH) ? 1 : 0;}
 }
@@ -456,7 +457,7 @@ static __forceinline void     PIN_nTRST_OUT  (uint32_t bit) {
 */
 static __forceinline uint32_t PIN_nRESET_IN  (void) {
 if(Fast){   
-  return (digitalRead_fast(PIN_nRESET) == HIGH) ? 1 : 0;}
+  return (digitalRead_fast_(PIN_nRESET) == HIGH) ? 1 : 0;}
 else{
   return (digitalRead(PIN_nRESET) == HIGH) ? 1 : 0;}
 }
@@ -468,7 +469,7 @@ else{
 */
 static __forceinline void     PIN_nRESET_OUT (uint32_t bit) {
 if(Fast){   
-  digitalWrite_fast(PIN_nRESET, (bit & 1) ? HIGH : LOW);}
+  digitalWrite_fast_(PIN_nRESET, (bit & 1) ? HIGH : LOW);}
 else{
   digitalWrite(PIN_nRESET, (bit & 1) ? HIGH : LOW);}
 }
@@ -496,7 +497,7 @@ It is recommended to provide the following LEDs for status indication:
 */
 static __inline void LED_CONNECTED_OUT (uint32_t bit) {
 if(Fast){   
-  digitalWrite_fast(PIN_LED_CONNECTED, bit ? HIGH : LOW);}
+  digitalWrite_fast_(PIN_LED_CONNECTED, bit ? HIGH : LOW);}
 else{
   digitalWrite(PIN_LED_CONNECTED, bit ? HIGH : LOW);}
 }
@@ -508,7 +509,7 @@ else{
 */
 static __inline void LED_RUNNING_OUT (uint32_t bit) {
 if(Fast){   
-  digitalWrite_fast(PIN_LED_RUNNING, bit ? HIGH : LOW);}
+  digitalWrite_fast_(PIN_LED_RUNNING, bit ? HIGH : LOW);}
 else{
   digitalWrite(PIN_LED_RUNNING, bit ? HIGH : LOW);}
 }
@@ -531,7 +532,14 @@ default, the DWT timer is used.  The frequency of this timer is configured with
 \return Current timestamp value.
 */
 __STATIC_INLINE uint32_t TIMESTAMP_GET (void) {
-  return (DWT->CYCCNT) / (CPU_CLOCK / TIMESTAMP_CLOCK);
+  uint32_t ticks = SysTick->VAL;
+  	// Configure SysTick to trigger every millisecond using the CPU Clock
+	SysTick->CTRL = 0;					    // Disable SysTick
+	SysTick->LOAD = 0xFFFFFF;				// Set reload register for MAX Value
+	SysTick->VAL = 0;					      // Reset the SysTick counter value
+	SysTick->CTRL = 0x00000005;			// Enable SysTick,No Interrupt, Use CPU Clock
+  return(ticks);
+  //return (DWT->CYCCNT) / (CPU_CLOCK / TIMESTAMP_CLOCK);
 }
 
 ///@}
@@ -580,4 +588,3 @@ static __inline uint32_t RESET_TARGET (void) {
 
 
 #endif /* __DAP_CONFIG_H__ */
-