Merge pull request #99 from pimoroni/render-update-change

Sync render updates to line interrupt, move ADC reads to DMA/interrupt
32blit · Jan 31, 2020 · b9fb768 · b9fb768
2 parents 5c7aa1b + d3a4076
commit b9fb768
Show file tree

Hide file tree

Showing 19 changed files with 551 additions and 237 deletions.
diff --git a/32blit-stm32/Inc/stm32h7xx_it.h b/32blit-stm32/Inc/stm32h7xx_it.h
@@ -57,10 +57,16 @@ void DebugMon_Handler(void);
 void PendSV_Handler(void);
 void SysTick_Handler(void);
 void DMA1_Stream0_IRQHandler(void);
+void DMA1_Stream1_IRQHandler(void);
+void DMA1_Stream2_IRQHandler(void);
+void ADC_IRQHandler(void);
+void ADC3_IRQHandler(void);
 void TIM3_IRQHandler(void);
 void TIM4_IRQHandler(void);
 void TIM6_DAC_IRQHandler(void);
 void OTG_HS_IRQHandler(void);
+void LTDC_IRQHandler(void);
+
 /* USER CODE BEGIN EFP */
 
 /* USER CODE END EFP */

diff --git a/32blit-stm32/STM32H750VBTx_FLASH.ld b/32blit-stm32/STM32H750VBTx_FLASH.ld
@@ -42,9 +42,10 @@ _Min_Stack_Size = 0x400; /* required amount of stack */
 MEMORY
 {
 DTCMRAM (xrw)       : ORIGIN = 0x20000000, LENGTH = 128K
-RAM_D1 (xrw)        : ORIGIN = 0x24000000, LENGTH = 212K
-LTDC (rw)           : ORIGIN = 0x24035000, LENGTH = 300K
-RAM_D2 (xrw)        : ORIGIN = 0x30000000, LENGTH = 288K
+RAM_D1 (xrw)        : ORIGIN = 0x24000000, LENGTH = 362K
+LTDC (rw)           : ORIGIN = 0x2405A800, LENGTH = 150K
+RAM_D2 (xrw)        : ORIGIN = 0x30000000, LENGTH = 138K
+FRAMEBUFFER (rw)    : ORIGIN = 0x30022800, LENGTH = 150K
 RAM_D3 (xrw)        : ORIGIN = 0x38000000, LENGTH = 64K
 ITCMISR (xrw)       : ORIGIN = 0x00000000, LENGTH = 4K
 ITCMRAM (xrw)       : ORIGIN = 0x00001000, LENGTH = 60K
@@ -146,7 +147,7 @@ SECTIONS
     . = ALIGN(4);
     _ebss = .;         /* define a global symbol at bss end */
     __bss_end__ = _ebss;
-  } >DTCMRAM
+  } >RAM_D1
 
   /* User_heap_stack section, used to check that there is enough RAM left */
   ._user_heap_stack :
@@ -157,7 +158,7 @@ SECTIONS
     . = . + _Min_Heap_Size;
     . = . + _Min_Stack_Size;
     . = ALIGN(8);
-  } >DTCMRAM
+  } >RAM_D1
 
   itcm_data = LOADADDR(.itcm);
   .itcm :
@@ -177,28 +178,18 @@ SECTIONS
     __ltdc_end = .;
   } >LTDC
 
-  .ss (NOLOAD):
-  {
-    . = ALIGN(4);
-    *(.ss)           /* spritesheet */
-  } >RAM_D2
-
   .fb (NOLOAD):
   {
     . = ALIGN(4);
-    *(.fb)           /* framebuffer */
-  } >RAM_D1
+    __fb_start = .;
+    KEEP(*(.fb))           /* framebuffer */
+    __fb_end = .;
+  } >FRAMEBUFFER
 
-  .m (NOLOAD):
+  .dma_data (NOLOAD):
   {
     . = ALIGN(4);
-    *(.m)           /* framebuffer */
-  } >RAM_D2
-
-  .dac_data (NOLOAD):
-  {
-    . = ALIGN(4);
-    *(.dac_data)           /* dac_data */
+    *(.dma_data)           /* dma_data */
   } >RAM_D3
 
   /* Remove information from the standard libraries */
@@ -212,4 +203,3 @@ SECTIONS
   .ARM.attributes 0 : { *(.ARM.attributes) }
 }
 
-