Merge branch 'developing' into main

GorgonMeducer · Sep 27, 2021 · 0105427 · 0105427
2 parents 81fb972 + 311f24c
commit 0105427
Show file tree

Hide file tree

Showing 9 changed files with 46 additions and 22 deletions.
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# Pico_Template (v1.3.0)
+# Pico_Template (v1.3.1)
 An MDK template for Raspberry Pi Pico
 
 - Compiler: Arm Compiler 6.15 and above (Using non-intrusive wrapper to support pico-sdk which is written in GCC)
@@ -8,7 +8,7 @@ An MDK template for Raspberry Pi Pico
 - Provide users an option to use the ***stdio*** solution from ***pico-sdk (by default)*** or retarget the ***stdin/stdout*** to a user specified location directly. (See note in ***env_wrapper.c***).
 - Support Debug in MDK
   - [Using J-Link](https://wiki.segger.com/Raspberry_Pi_Pico) (Not Validated in MDK)
-  - [Using CMSIS-DAP](https://github.com/majbthrd/pico-debug) (Validated in MDK)
+  - [Using CMSIS-DAP](https://github.com/majbthrd/pico-debug) (Validated in MDK and **highly recommended**)
 - Add dedicated project configurations for:
   - [**AC6-flash**] Running code in Flash (XIP)
   - [**AC6-RunInSRAM**] Running code in SRAM (code is still stored in FLASH)
@@ -124,7 +124,7 @@ Pico-Template provides a dedicated project configuration for downloading and deb
 
 1. Boot the Pico with the BOOTSEL button pressed. 
 2. Drag and drop **pico-debug-gimmecache.uf2 **to RPI-RP2 mass-storage driver in the explorer. It immediately reboots as a CMSIS-DAP adapter. Pico-debug loads as a RAM only .uf2 image, meaning that it is never written to flash and doesn't replace existing user code.
-3. Open your project which is based on our Pico-Template and switch to DebugInSRAM configuration.
+3. Open your project which is based on our Pico-Template and switch to ***DebugInSRAM*** configuration.
 4. Compile and Debug
 5. Enjoy...
 

diff --git a/main.c b/main.c
@@ -92,6 +92,10 @@ int main(void)
 
     while (true) {
         breath_led();
+        //gpio_put(PICO_DEFAULT_LED_PIN, 1);
+        //sleep_ms(500);
+        //gpio_put(PICO_DEFAULT_LED_PIN, 0);
+        //sleep_ms(500);
     }
     //return 0;
 }
diff --git a/project/mdk/RP2040_debug_in_sram.sct b/project/mdk/RP2040_debug_in_sram.sct
@@ -44,6 +44,16 @@ LR_IROM1 0x20000000 SRAM_SIZE  {    ; load region size_region
         startup_RP2040.o (+RO)
     }
 
+    ER_MUTEX_ARRAY +0 {
+        * (.mutex_array.*)
+        * (.mutex_array)
+    }
+
+    RW_IRAM_CODE +0 {
+        * (+RO-CODE)
+        * (+XO)
+    }
+
     ARM_LIB_STACK +0 ALIGN 8  EMPTY STACK_0_SIZE {
     }
 
@@ -54,10 +64,7 @@ LR_IROM1 0x20000000 SRAM_SIZE  {    ; load region size_region
     ARM_LIB_HEAP_ONE +0 ALIGN 8 EMPTY HEAP_1_SIZE  {
     }
 
-    ER_MUTEX_ARRAY +0 {
-        * (.mutex_array.*)
-        * (.mutex_array)
-    }
+
 
     ;ER_PREINIT_ARRAY +0 {
     ;    * (.preinit_array.*)
@@ -72,10 +79,7 @@ LR_IROM1 0x20000000 SRAM_SIZE  {    ; load region size_region
         *(.uninitialized_data*)
     }
 
-    RW_IRAM_CODE +0 {
-        * (+RO-CODE)
-        * (+XO)
-    }
+
 
 }
 
diff --git a/project/mdk/debug_with_cmsis-dap.ini b/project/mdk/debug_with_cmsis-dap.ini
@@ -1,3 +1,10 @@
 
-RESET
-G, Reset_Handler
+FUNC void reset_pico(void)
+{
+    exec("RESET");
+    exec("G, Reset_Handler");
+}
+
+DEFINE BUTTON "Reset Pico", "reset_pico()"
+
+reset_pico();
diff --git a/project/mdk/debug_with_cmsis-dap_in_ram.ini b/project/mdk/debug_with_cmsis-dap_in_ram.ini
@@ -1,5 +1,5 @@
 
-LOAD .\Objects\template.axf INCREMENTAL
+
 
 FUNC void debug_from_ram(void)
 {

diff --git a/project/mdk/startup_RP2040.c b/project/mdk/startup_RP2040.c
@@ -159,6 +159,7 @@ void __pico_entry(void)
 __NO_RETURN void Reset_Handler(void)
 {
     SCB->VTOR = (uintptr_t)__VECTOR_TABLE;
+    __set_MSP((uintptr_t)(&__INITIAL_SP));
   //SystemInit();                             /* CMSIS System Initialization */
   __PROGRAM_START();                        /* Enter PreMain (C library entry point) */
 }

diff --git a/project/mdk/template.uvoptx b/project/mdk/template.uvoptx
@@ -89,7 +89,7 @@
         <sRfunc>1</sRfunc>
         <sRbox>1</sRbox>
         <tLdApp>1</tLdApp>
-        <tGomain>1</tGomain>
+        <tGomain>0</tGomain>
         <tRbreak>1</tRbreak>
         <tRwatch>1</tRwatch>
         <tRmem>1</tRmem>
@@ -135,7 +135,7 @@
         <SetRegEntry>
           <Number>0</Number>
           <Key>DLGTARM</Key>
-          <Name>(1010=-1,-1,-1,-1,0)(1007=-1,-1,-1,-1,0)(1008=-1,-1,-1,-1,0)(1012=-1,-1,-1,-1,0)(1009=-1,-1,-1,-1,0)</Name>
+          <Name>(1010=724,527,1135,1029,0)(1007=-1,-1,-1,-1,0)(1008=-1,-1,-1,-1,0)(1012=-1,-1,-1,-1,0)(1009=-1,-1,-1,-1,0)</Name>
         </SetRegEntry>
         <SetRegEntry>
           <Number>0</Number>
@@ -167,6 +167,13 @@
           <AccSizeX>0</AccSizeX>
         </Mm>
       </MemoryWindow1>
+      <ToolboxButtons>
+        <Wi>
+          <IntNumber>0</IntNumber>
+          <FirstString>Reset Pico</FirstString>
+          <SecondString>reset_pico()</SecondString>
+        </Wi>
+      </ToolboxButtons>
       <Tracepoint>
         <THDelay>0</THDelay>
       </Tracepoint>
@@ -181,7 +188,7 @@
         <viewmode>1</viewmode>
         <vrSel>0</vrSel>
         <aSym>0</aSym>
-        <aTbox>0</aTbox>
+        <aTbox>1</aTbox>
         <AscS1>0</AscS1>
         <AscS2>0</AscS2>
         <AscS3>0</AscS3>
@@ -471,7 +478,7 @@
         <sRfunc>1</sRfunc>
         <sRbox>1</sRbox>
         <tLdApp>1</tLdApp>
-        <tGomain>0</tGomain>
+        <tGomain>1</tGomain>
         <tRbreak>1</tRbreak>
         <tRwatch>1</tRwatch>
         <tRmem>1</tRmem>
@@ -502,7 +509,7 @@
         <SetRegEntry>
           <Number>0</Number>
           <Key>CMSIS_AGDI</Key>
-          <Name>-X"Any" -UAny -O206 -S0 -C0 -P00000000 -N00("ARM CoreSight SW-DP") -D00(0BC12477) -L00(0) -TO65554 -TC10000000 -TT10000000 -TP20 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO7 -FD20000000 -FC1000 -FN0</Name>
+          <Name>-X"Any" -UAny -O718 -S0 -C0 -P00000000 -N00("ARM CoreSight SW-DP") -D00(0BC12477) -L00(0) -TO65554 -TC10000000 -TT10000000 -TP20 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO7 -FD20000000 -FC1000 -FN0</Name>
         </SetRegEntry>
         <SetRegEntry>
           <Number>0</Number>
@@ -517,7 +524,7 @@
         <SetRegEntry>
           <Number>0</Number>
           <Key>DLGTARM</Key>
-          <Name>(1010=-1,-1,-1,-1,0)(1007=105,137,312,358,0)(1008=90,121,466,357,0)(1012=-1,-1,-1,-1,0)(1009=-1,-1,-1,-1,0)</Name>
+          <Name>(1010=745,553,1156,1055,0)(1007=105,137,312,358,0)(1008=90,121,466,357,0)(1012=-1,-1,-1,-1,0)(1009=-1,-1,-1,-1,0)</Name>
         </SetRegEntry>
         <SetRegEntry>
           <Number>0</Number>
@@ -545,7 +552,7 @@
         <Mm>
           <WinNumber>1</WinNumber>
           <SubType>1</SubType>
-          <ItemText>0x4005801C</ItemText>
+          <ItemText>0x2000AC00</ItemText>
           <AccSizeX>0</AccSizeX>
         </Mm>
       </MemoryWindow1>

diff --git a/project/mdk/template.uvprojx b/project/mdk/template.uvprojx
@@ -313,7 +313,7 @@
           </ArmAdsMisc>
           <Cads>
             <interw>1</interw>
-            <Optim>7</Optim>
+            <Optim>6</Optim>
             <oTime>0</oTime>
             <SplitLS>0</SplitLS>
             <OneElfS>1</OneElfS>

diff --git a/project/mdk/wrapper/runtime.c b/project/mdk/wrapper/runtime.c
@@ -126,6 +126,7 @@ void runtime_init(void) {
             hw_clear_alias(padsbank0_hw)->io[28] = hw_clear_alias(padsbank0_hw)->io[29] = PADS_BANK0_GPIO0_IE_BITS;
 #endif
 #endif
+
     extern mutex_t __mutex_array_start;
     extern mutex_t __mutex_array_end;
-Original file line number
+Diff line change
@@ Expand Up / @@ -126,6 +126,7 @@ void runtime_init(void) { @@
                 hw_clear_alias(padsbank0_hw)->io[28] = hw_clear_alias(padsbank0_hw)->io[29] = PADS_BANK0_GPIO0_IE_BITS;
     #endif
     #endif
         extern mutex_t __mutex_array_start;
         extern mutex_t __mutex_array_end;
@@ Expand Down @@