Ewaryst/RingClock
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

DMA NVIC priority increase.

Browse Source
This commit is contained in:
StefansE
2026-03-29 13:39:14 +02:00
parent b5000adf0e
commit cd2662eceb
7 changed files with 19 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.settings/stm32cubeide.project.prefs
View File

@@ -1,3 +1,3 @@
8DF89ED150041C4CBC7CB9A9CAA90856=3B9AC612F80B3672D4AEDF95B2FAE837
DC22A860405A8BF2F2C095E5B6529F12=B906B5FA0271D057D2544B3C1B4A8DE5
DC22A860405A8BF2F2C095E5B6529F12=3B9AC612F80B3672D4AEDF95B2FAE837
eclipse.preferences.version=1

2
Core/Src/dma.c
View File

@@ -44,7 +44,7 @@ void MX_DMA_Init(void)
/* DMA interrupt init */
/* DMA1_Channel5_IRQn interrupt configuration */
HAL_NVIC_SetPriority(DMA1_Channel5_IRQn, 0, 0);
HAL_NVIC_SetPriority(DMA1_Channel5_IRQn, 6, 0);
HAL_NVIC_EnableIRQ(DMA1_Channel5_IRQn);
}

17
Core/Src/main.c
View File

@@ -30,6 +30,7 @@
#include "ws2812_effect.h"
#include "ds1307.h"
#include "clock.h"
#include "myComms.h"
#include "usbd_cdc_if.h"
@@ -95,7 +96,8 @@ int main(void)
{
/* USER CODE BEGIN 1 */
// uint8_t UART_Buff[] = "Hello World\n";
// #define EFFECT_TIME 1000
/* USER CODE END 1 */
/* MCU Configuration--------------------------------------------------------*/
@@ -124,18 +126,13 @@ int main(void)
MX_USB_DEVICE_Init();
/* USER CODE BEGIN 2 */
uint32_t mytimer = 0;
// RTC config
ds1307_init();
// ds1307_config(0, 10, 19, THURSDAY, 26, MARCH, 2026, +1, 33);
HAL_TIM_Base_Start(&htim2);
ws2812_Init();
//ws_effect_setDisplayColoursNV();
/* USER CODE END 2 */
@@ -148,13 +145,11 @@ int main(void)
/* USER CODE BEGIN 3 */
uint8_t UART_Buff[] = "Hello World\n";
#define EFFECT_TIME 10000
//ws_effect_setDisplayColoursNV();
ds1307_update(&my_rtc);
ds1307_update(&my_rtc);
uint8_t hour = my_rtc.hours;
uint8_t minutes = my_rtc.minutes;

2
Core/Src/tim.c
View File

@@ -111,7 +111,7 @@ void HAL_TIM_Base_MspInit(TIM_HandleTypeDef* tim_baseHandle)
__HAL_LINKDMA(tim_baseHandle,hdma[TIM_DMA_ID_CC1],hdma_tim2_ch1);
/* TIM2 interrupt Init */
HAL_NVIC_SetPriority(TIM2_IRQn, 0, 0);
HAL_NVIC_SetPriority(TIM2_IRQn, 6, 0);
HAL_NVIC_EnableIRQ(TIM2_IRQn);
/* USER CODE BEGIN TIM2_MspInit 1 */

8
Core/Src/ws2812_effect.c
View File

@@ -32,22 +32,22 @@ void ws_effect_setDisplayColoursNV(void){
uint8_t rxBuf[3] = {0};
ds1307_read_user_RAM(NV_COLOUR_HOURS_ADDR, rxBuf, sizeof(rxBuf));
ds1307_read_user_RAM(NV_COLOUR_HOURS_ADDR, rxBuf, 3);
colour_hours.r = rxBuf[0];
colour_hours.g = rxBuf[1];
colour_hours.b = rxBuf[2];
ds1307_read_user_RAM(NV_COLOUR_MINUTES_ADDR, rxBuf, sizeof(rxBuf));
ds1307_read_user_RAM(NV_COLOUR_MINUTES_ADDR, rxBuf, 3);
colour_minutes.r = rxBuf[0];
colour_minutes.g = rxBuf[1];
colour_minutes.b = rxBuf[2];
ds1307_read_user_RAM(NV_COLOUR_SECONDS_ADDR, rxBuf, sizeof(rxBuf));
ds1307_read_user_RAM(NV_COLOUR_SECONDS_ADDR, rxBuf, 3);
colour_seconds.r = rxBuf[0];
colour_seconds.g = rxBuf[1];
colour_seconds.b = rxBuf[2];
ds1307_read_user_RAM(NV_COLOUR_BACKGND_ADDR, rxBuf, sizeof(rxBuf));
ds1307_read_user_RAM(NV_COLOUR_BACKGND_ADDR, rxBuf, 3);
colour_background.r = rxBuf[0];
colour_background.g = rxBuf[1];
colour_background.b = rxBuf[2];

11
LedRing.ioc
View File

@@ -46,10 +46,10 @@ Mcu.PinsNb=13
Mcu.ThirdPartyNb=0
Mcu.UserConstants=
Mcu.UserName=STM32F103C6Tx
MxCube.Version=6.14.0
MxDb.Version=DB.6.0.140
MxCube.Version=6.14.1
MxDb.Version=DB.6.0.141
NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false\:false
NVIC.DMA1_Channel5_IRQn=true\:0\:0\:false\:false\:true\:false\:true\:true
NVIC.DMA1_Channel5_IRQn=true\:6\:0\:true\:false\:true\:false\:true\:true
NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false\:false
NVIC.ForceEnableDMAVector=true
NVIC.HardFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false\:false
@@ -59,7 +59,7 @@ NVIC.PendSV_IRQn=true\:0\:0\:false\:false\:true\:false\:false\:false
NVIC.PriorityGroup=NVIC_PRIORITYGROUP_4
NVIC.SVCall_IRQn=true\:0\:0\:false\:false\:true\:false\:false\:false
NVIC.SysTick_IRQn=true\:15\:0\:false\:false\:true\:false\:true\:false
NVIC.TIM2_IRQn=true\:0\:0\:false\:false\:true\:true\:true\:true
NVIC.TIM2_IRQn=true\:6\:0\:true\:false\:true\:true\:true\:true
NVIC.USB_LP_CAN1_RX0_IRQn=true\:0\:0\:false\:false\:true\:false\:true\:true
NVIC.UsageFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false\:false
PA0-WKUP.Signal=S_TIM2_CH1_ETR
@@ -115,7 +115,7 @@ ProjectManager.ToolChainLocation=
ProjectManager.UAScriptAfterPath=
ProjectManager.UAScriptBeforePath=
ProjectManager.UnderRoot=true
ProjectManager.functionlistsort=1-SystemClock_Config-RCC-false-HAL-false,2-MX_GPIO_Init-GPIO-false-HAL-true,3-MX_DMA_Init-DMA-false-HAL-true,4-MX_TIM2_Init-TIM2-false-HAL-true,5-MX_I2C1_Init-I2C1-false-HAL-true,6-MX_USART2_UART_Init-USART2-false-HAL-true
ProjectManager.functionlistsort=1-SystemClock_Config-RCC-false-HAL-false,2-MX_GPIO_Init-GPIO-false-HAL-true,3-MX_DMA_Init-DMA-false-HAL-true,4-MX_TIM2_Init-TIM2-false-HAL-true,5-MX_I2C1_Init-I2C1-false-HAL-true,6-MX_USB_DEVICE_Init-USB_DEVICE-false-HAL-false
RCC.ADCFreqValue=36000000
RCC.AHBFreq_Value=72000000
RCC.APB1CLKDivider=RCC_HCLK_DIV2
@@ -158,3 +158,4 @@ VP_TIM2_VS_ClockSourceINT.Signal=TIM2_VS_ClockSourceINT
VP_USB_DEVICE_VS_USB_DEVICE_CDC_FS.Mode=CDC_FS
VP_USB_DEVICE_VS_USB_DEVICE_CDC_FS.Signal=USB_DEVICE_VS_USB_DEVICE_CDC_FS
board=custom
isbadioc=false

1
USB_DEVICE/App/usbd_cdc_if.c
View File

@@ -256,7 +256,6 @@ static int8_t CDC_Control_FS(uint8_t cmd, uint8_t* pbuf, uint16_t length)
* @param Len: Number of data received (in bytes)
* @retval Result of the operation: USBD_OK if all operations are OK else USBD_FAIL
*/
static int8_t CDC_Receive_FS(uint8_t* Buf, uint32_t *Len)
{
/* USER CODE BEGIN 6 */