Compare commits
No commits in common. "master" and "pcb-v2.1" have entirely different histories.
9
firmware/.gitignore
vendored
9
firmware/.gitignore
vendored
@ -1,12 +1,3 @@
|
||||
*.elf
|
||||
memmap.map
|
||||
obj/
|
||||
*.creator
|
||||
*.user
|
||||
*.user*
|
||||
*.cflags
|
||||
*.cxxflags
|
||||
*.files
|
||||
*.includes
|
||||
*.config
|
||||
.qtc_clangd/*
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
################################Shimatta Makefile####################################
|
||||
#CPU: STM32F030F4P6
|
||||
#CPU: STM32F030
|
||||
#Compiler: arm-none-eabi
|
||||
#####################################################################################
|
||||
|
||||
@ -13,7 +13,6 @@ endif
|
||||
#Add Files and Folders below#########################################################
|
||||
CFILES = main.c syscalls/syscalls.c setup/system_init.c startup/startup_stm32f0xx.c
|
||||
CFILES += temp-adc.c
|
||||
CFILES += dmx.c
|
||||
ASFILES = sk6812.S
|
||||
INCLUDEPATH = -Iinclude -Iinclude/cmsis
|
||||
|
||||
@ -31,15 +30,14 @@ mapfile = memmap
|
||||
|
||||
|
||||
###################################################################################
|
||||
CROSS_COMPILE ?= arm-none-eabi-
|
||||
CC := $(CROSS_COMPILE)gcc
|
||||
OBJCOPY := $(CROSS_COMPILE)objcopy
|
||||
OBJDUMP := $(CROSS_COMPILE)objdump
|
||||
SIZE := $(CROSS_COMPILE)size
|
||||
CC=arm-none-eabi-gcc
|
||||
OBJCOPY=arm-none-eabi-objcopy
|
||||
OBJDUMP=arm-none-eabi-objdump
|
||||
SIZE=arm-none-eabi-size
|
||||
|
||||
LFLAGS = -mlittle-endian -mthumb -mcpu=cortex-m0 -mthumb-interwork
|
||||
LFLAGS += -mfloat-abi=soft --disable-newlib-supplied-syscalls -nostartfiles
|
||||
LFLAGS += -Tstartup/stm32f030.ld -Wl,-Map=$(mapfile).map -Wl,--gc-sections -Wl,--print-memory-usage -g
|
||||
LFLAGS += -Tstartup/stm32f030.ld -Wl,-Map=$(mapfile).map -Wl,--gc-sections -g
|
||||
|
||||
CFLAGS = -c -fmessage-length=0 -mlittle-endian -mthumb -mcpu=cortex-m0 -mthumb-interwork
|
||||
CFLAGS += -mfloat-abi=soft -nostartfiles -Wall -g3 -O0
|
||||
@ -51,6 +49,8 @@ ASOBJ = $(ASFILES:%.S=$(OBJDIR)/%.S.o)
|
||||
|
||||
default: $(target).elf
|
||||
|
||||
binary: $(target).bin $(target).hex
|
||||
|
||||
%.bin: %.elf
|
||||
$(OBJCOPY) -O binary $^ $@
|
||||
%.hex: %.elf
|
||||
@ -64,16 +64,18 @@ $(target).elf: $(OBJ) $(ASOBJ)
|
||||
|
||||
#Compiling
|
||||
$(OBJ):
|
||||
@echo [CC] $@
|
||||
@mkdir -p $(@D)
|
||||
@echo Compiling $@
|
||||
$(eval OUTPATH=$(dir $@))
|
||||
@mkdir -p $(OUTPATH)
|
||||
$(QUIET)$(CC) $(CFLAGS) -MMD -MT $@ $(INCLUDEPATH) $(DEFINES) -o $@ $(@:$(OBJDIR)/%.c.o=%.c)
|
||||
|
||||
$(ASOBJ):
|
||||
@echo [AS] $@
|
||||
@mkdir -p $(@D)
|
||||
@echo Compiling $@
|
||||
$(eval OUTPATH=$(dir $@))
|
||||
@mkdir -p $(OUTPATH)
|
||||
$(QUIET)$(CC) $(CFLAGS) -MMD -MT $@ $(INCLUDEPATH) $(DEFINES) -o $@ $(@:$(OBJDIR)/%.S.o=%.S)
|
||||
|
||||
.PHONY: clean mrproper objcopy disassemble binary
|
||||
.PHONY: qtproject clean mrproper objcopy disassemble
|
||||
|
||||
disassemble: $(target).elf
|
||||
$(OBJDUMP) -D -s $< > $(target).lss
|
||||
@ -83,12 +85,19 @@ objcopy: $(target).bin $(target).hex
|
||||
mrproper:
|
||||
rm -f $(target).pro
|
||||
|
||||
binary: $(target).bin $(target).hex
|
||||
|
||||
clean:
|
||||
@echo [CLEAN] $(OBJDIR)
|
||||
@rm -f $(target).elf $(target).bin $(target).hex $(OBJ) $(ASOBJ) $(mapfile).map $(target).lss
|
||||
@rm -rf $(OBJDIR)/*
|
||||
rm -f $(target).elf $(target).bin $(target).hex $(OBJ) $(ASOBJ) $(mapfile).map $(target).lss
|
||||
rm -rfv $(OBJDIR)
|
||||
|
||||
qtproject:
|
||||
echo -e "TEMPLATE = app\nCONFIG -= console app_bundle qt" > $(target).pro
|
||||
echo -e "SOURCES += $(CFILES) $(ASFILES)" >> $(target).pro
|
||||
echo -ne "INCLUDEPATH += " >> $(target).pro
|
||||
echo "$(INCLUDEPATH)" | sed "s!-I!./!g" >> $(target).pro
|
||||
echo -ne "HEADERS += " >> $(target).pro
|
||||
find -name "*.h" | tr "\\n" " " >> $(target).pro
|
||||
echo -ne "\nDEFINES += " >> $(target).pro
|
||||
echo "$(DEFINES)" | sed "s/-D//g" >> $(target).pro
|
||||
|
||||
-include $(CFILES:%.c=$(OBJDIR)/%.c.d) $(ASFILES:%.S=$(OBJDIR)/%.S.d)
|
||||
|
||||
|
||||
136
firmware/dmx.c
136
firmware/dmx.c
@ -1,136 +0,0 @@
|
||||
#include <ring-light/dmx.h>
|
||||
#include <stm32f0xx.h>
|
||||
|
||||
static uint32_t dmx_base_channel;
|
||||
|
||||
|
||||
enum dmx_rx_state_enum {
|
||||
DMX_RX_WAIT_FOR_BREAK = 0,
|
||||
DMX_RX_DATA,
|
||||
};
|
||||
|
||||
static volatile enum dmx_rx_state_enum dmx_state;
|
||||
|
||||
|
||||
static volatile bool break_received;
|
||||
|
||||
/**
|
||||
* @brief DMX data received. Contains the whole DMX universe including the first 0 byte.
|
||||
* The controller does check the first byte to be zero.
|
||||
*/
|
||||
static volatile uint8_t dmx_channel_data[DMX_UNIVERSE_SIZE + 1];
|
||||
|
||||
void dmx_init(uint32_t base_channel)
|
||||
{
|
||||
int i;
|
||||
volatile uint8_t *ptr;
|
||||
|
||||
for (i = 0, ptr = dmx_channel_data; i < DMX_USED_CHANNEL_COUNT; i++, ptr++) {
|
||||
*ptr = 0u;
|
||||
}
|
||||
|
||||
dmx_base_channel = base_channel;
|
||||
break_received = false;
|
||||
|
||||
/* Enable GPIOA and USART1 clock */
|
||||
RCC->AHBENR |= RCC_AHBENR_GPIOAEN | RCC_AHBENR_DMAEN;
|
||||
RCC->APB2ENR |= RCC_APB2ENR_USART1EN;
|
||||
|
||||
/* Switch RXTX pin low, activating permanent READ mode */
|
||||
GPIOA->MODER |= (0x1<<(2*5));
|
||||
GPIOA->BRR |= (1<<5);
|
||||
|
||||
/* Switch PA10 to RX alternate function of USART1 (AF1) */
|
||||
GPIOA->MODER |= (0x2<<(2*10));
|
||||
GPIOA->AFR[1] |=(0x1<<(4*2));
|
||||
|
||||
/* Set baudrate: 48MHz / 250k = 129 */
|
||||
USART1->BRR = 192u;
|
||||
USART1->CR3 = USART_CR3_EIE;
|
||||
USART1->CR2 = USART_CR2_STOP_1;
|
||||
USART1->CR1 = USART_CR1_RXNEIE | USART_CR1_RE | USART_CR1_UE;
|
||||
|
||||
/* Map USART1 RX to DMA Channel 3 */
|
||||
SYSCFG->CFGR1 &= ~SYSCFG_CFGR1_USART1RX_DMA_RMP;
|
||||
|
||||
DMA1_Channel3->CCR = DMA_CCR_PL_1 | DMA_CCR_MINC | DMA_CCR_TCIE;
|
||||
|
||||
NVIC_EnableIRQ(DMA1_Channel2_3_IRQn);
|
||||
NVIC_EnableIRQ(USART1_IRQn);
|
||||
}
|
||||
|
||||
|
||||
const uint8_t *dmx_get_data()
|
||||
{
|
||||
return (const uint8_t *)dmx_channel_data;
|
||||
}
|
||||
|
||||
void USART1_IRQHandler(void)
|
||||
{
|
||||
uint32_t isr;
|
||||
|
||||
isr = USART1->ISR;
|
||||
USART1->ICR = USART_ICR_ORECF | USART_ICR_NCF | USART_ICR_FECF;
|
||||
|
||||
if (isr & USART_ISR_FE) {
|
||||
/* Frame error received. Start of DMX frame */
|
||||
/* Flush RX data */
|
||||
USART1->CR3 &= ~USART_CR3_DMAR;
|
||||
USART1->RQR = USART_RQR_RXFRQ;
|
||||
DMA1_Channel3->CCR &= ~DMA_CCR_EN;
|
||||
while (DMA1_Channel3->CCR & DMA_CCR_EN);
|
||||
DMA1_Channel3->CMAR = (uint32_t)dmx_channel_data;
|
||||
DMA1_Channel3->CPAR = (uint32_t)&USART1->RDR;
|
||||
DMA1_Channel3->CNDTR = DMX_UNIVERSE_SIZE + 1;
|
||||
DMA1_Channel3->CCR |= DMA_CCR_EN;
|
||||
USART1->RQR = USART_RQR_RXFRQ;
|
||||
USART1->CR3 |= USART_CR3_DMAR;
|
||||
break_received = true;
|
||||
dmx_state = DMX_RX_DATA;
|
||||
} else if (isr & USART_ISR_RXNE) {
|
||||
if (dmx_state != DMX_RX_DATA) {
|
||||
USART1->RQR = USART_RQR_RXFRQ;
|
||||
}
|
||||
}
|
||||
|
||||
__DSB();
|
||||
}
|
||||
|
||||
void DMA_CH2_3_DMA2_CH1_2_IRQHandler(void)
|
||||
{
|
||||
uint32_t isr;
|
||||
|
||||
isr = DMA1->ISR;
|
||||
/* Only clear the interupts of channel 2 (bits 11:9) */
|
||||
DMA1->IFCR = isr & 0xF00;
|
||||
|
||||
if (isr & DMA_ISR_TCIF3) {
|
||||
DMA1->ISR;
|
||||
dmx_state = DMX_RX_WAIT_FOR_BREAK;
|
||||
}
|
||||
__DSB();
|
||||
}
|
||||
|
||||
bool dmx_poll_break_received(void)
|
||||
{
|
||||
bool ret;
|
||||
|
||||
/* Atomically reset the flag */
|
||||
__disable_irq();
|
||||
ret = break_received;
|
||||
break_received = false;
|
||||
__enable_irq();
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
bool dmx_enough_data_received()
|
||||
{
|
||||
uint32_t received_count = (DMX_UNIVERSE_SIZE + 1) - DMA1_Channel3->CNDTR;
|
||||
|
||||
if (received_count > (dmx_base_channel + DMX_USED_CHANNEL_COUNT)) {
|
||||
return true;
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
@ -1,49 +0,0 @@
|
||||
#ifndef _DMX_H_
|
||||
#define _DMX_H_
|
||||
|
||||
|
||||
|
||||
#include <stdint.h>
|
||||
#include <stdbool.h>
|
||||
|
||||
#define DMX_UNIVERSE_SIZE (512u)
|
||||
#define DMX_USED_CHANNEL_COUNT (129u)
|
||||
|
||||
/**
|
||||
* @brief Init DMX reception
|
||||
*
|
||||
* DMX data is received from the base channel onwards:
|
||||
* - R LED1
|
||||
* - G LED1
|
||||
* - B LED1
|
||||
* - W LED1
|
||||
* - R LED2
|
||||
* ...
|
||||
* - W LED32
|
||||
* - W DISCRETE
|
||||
*
|
||||
* In Sum: 129 8 bit channels
|
||||
*
|
||||
* @param base_channel Base channel the ring light will listen on
|
||||
*/
|
||||
void dmx_init(uint32_t base_channel);
|
||||
|
||||
/**
|
||||
* @brief Returns the array of the 129 DMX channels
|
||||
* @return
|
||||
*/
|
||||
const uint8_t *dmx_get_data(void);
|
||||
|
||||
/**
|
||||
* @brief Check if a break was received. This resets the flag
|
||||
* @return true if a break was received since the last time calling this function
|
||||
*/
|
||||
bool dmx_poll_break_received(void);
|
||||
|
||||
/**
|
||||
* @brief The DMX receiver has received all data for the ring light. It can be read
|
||||
* @return
|
||||
*/
|
||||
bool dmx_enough_data_received(void);
|
||||
|
||||
#endif /* _DMX_H_ */
|
||||
201
firmware/main.c
201
firmware/main.c
@ -2,23 +2,19 @@
|
||||
#include <cmsis/core_cm0.h>
|
||||
#include <stdbool.h>
|
||||
#include <ring-light/temp-adc.h>
|
||||
#include <ring-light/dmx.h>
|
||||
|
||||
#define RING_MAX_LED 32u
|
||||
#define MAX_TEMP_CELSIUS 70
|
||||
#define RING_MAX_LED 30u
|
||||
|
||||
enum ring_modes {
|
||||
RING_MODE_WHITE_DISCRETE, /*!< only discrete white LEDs */
|
||||
RING_MODE_RED, /*!< only red SK6812 */
|
||||
RING_MODE_GREEN, /*!< only green SK6812 */
|
||||
RING_MODE_BLUE, /*!< only blue SK6812 */
|
||||
RING_MODE_ALL, /*!< control all LEDs at once */
|
||||
RING_MODE_ARC, /*!< SK6812 closing ring */
|
||||
RING_MODE_QUARTER, /*!< SK6812 walking quarter */
|
||||
RING_MODE_IN_FARBE_UND_BUNT, /*!< SK6812 color mix */
|
||||
RING_MODE_MAX, /*!< end of list */
|
||||
RING_MODE_WAIT_DMX,
|
||||
RING_MODE_WAIT_DMX_BREAK
|
||||
RING_MODE_ALL,
|
||||
RING_MODE_RED,
|
||||
RING_MODE_GREEN,
|
||||
RING_MODE_BLUE,
|
||||
RING_MODE_WHITE,
|
||||
RING_MODE_ARC,
|
||||
RING_MODE_QUARTER,
|
||||
RING_MODE_IN_FARBE_UND_BUNT,
|
||||
RING_MODE_MAX
|
||||
};
|
||||
|
||||
volatile int32_t temperature;
|
||||
@ -26,7 +22,6 @@ volatile int32_t temperature;
|
||||
extern void sk6812_send_led(uint32_t rgbw);
|
||||
|
||||
volatile uint32_t wait_tick = 0;
|
||||
volatile bool blink_tick = false;
|
||||
|
||||
static void wait_for_ticks(uint32_t ticks)
|
||||
{
|
||||
@ -37,22 +32,13 @@ static void wait_for_ticks(uint32_t ticks)
|
||||
int main(void)
|
||||
{
|
||||
uint32_t led_val = 0x00UL;
|
||||
uint32_t last_led_val = 0x00UL;
|
||||
uint32_t led_calc_val[RING_MAX_LED] = {0x00UL};
|
||||
uint8_t led_pwm_val = 0u;
|
||||
const uint8_t *dmx_data;
|
||||
|
||||
bool button_pressed = false;
|
||||
bool force_led_update;
|
||||
bool overtemp_flag = false;
|
||||
enum ring_modes mode;
|
||||
enum ring_modes mode = RING_MODE_ALL;
|
||||
|
||||
/* Led value / mode before going to DMX */
|
||||
uint32_t led_val_before_dmx = 0u;
|
||||
enum ring_modes mode_before_dmx = RING_MODE_RED; /* Init to save value */
|
||||
|
||||
RCC->AHBENR |= RCC_AHBENR_GPIOAEN | RCC_AHBENR_GPIOBEN;
|
||||
RCC->APB1ENR |= RCC_APB1ENR_TIM3EN | RCC_APB1ENR_TIM14EN;
|
||||
RCC->AHBENR |= RCC_AHBENR_GPIOAEN;
|
||||
RCC->APB1ENR |= RCC_APB1ENR_TIM3EN;
|
||||
|
||||
GPIOA->MODER |= (2<<7*2)|(2<<6*2)|(1<<3*2);
|
||||
|
||||
@ -61,11 +47,6 @@ int main(void)
|
||||
/* enable TIM3 on encoder inputs */
|
||||
GPIOA->AFR[0] |= (1<<7*4)|(1<<6*4);
|
||||
|
||||
/* enable PWM output for magic LED regulator */
|
||||
GPIOB->MODER |= (2<<1*2);
|
||||
GPIOB->AFR[0] &= ~(0<<1*4);
|
||||
|
||||
/*! -# init the TIM3 to read the encoder */
|
||||
TIM3->ARR = 0xFFFF;
|
||||
TIM3->CNT = 0;
|
||||
TIM3->CR2 = 0;
|
||||
@ -75,69 +56,17 @@ int main(void)
|
||||
TIM3->PSC = 0;
|
||||
TIM3->CR1 = TIM_CR1_CEN;
|
||||
|
||||
/*! -# Init TIM14 for PWM control of the magic LED driver */
|
||||
/*! -# Count up to 255 (8 bit resolution) */
|
||||
TIM14->ARR = 0x00FFu;
|
||||
TIM14->CNT = 0u;
|
||||
TIM14->CCR1 = 0u;
|
||||
/*! -# Set prescaler to 11 ==> ca. 17 KHz */
|
||||
TIM14->PSC = 11u - 1u;
|
||||
/*! -# PWM Mode 1 + prefetch */
|
||||
TIM14->CCMR1 = TIM_CCMR1_OC1M_2 | TIM_CCMR1_OC1M_1 | TIM_CCMR1_OC1PE;
|
||||
/*! -# Enable Output compare 1 */
|
||||
TIM14->CCER = TIM_CCER_CC1E;
|
||||
/*! -# Finally, enable TIM14 */
|
||||
TIM14->CR2 = 0;
|
||||
TIM14->CR1 = TIM_CR1_CEN;
|
||||
|
||||
/*! -# Set initial state to all 25% */
|
||||
led_val = 64u;
|
||||
mode = RING_MODE_WHITE_DISCRETE;
|
||||
|
||||
temperature_adc_init();
|
||||
dmx_init(0u);
|
||||
|
||||
SysTick_Config(800000);
|
||||
while(1) {
|
||||
force_led_update = false;
|
||||
temperature = temperature_adc_get_temp();
|
||||
|
||||
if (led_val != last_led_val || button_pressed) {
|
||||
force_led_update = true;
|
||||
}
|
||||
|
||||
/*! -# Gradually dim down the LED brightness in case the temperature is too high */
|
||||
if (overtemp_flag) {
|
||||
if (temperature < (MAX_TEMP_CELSIUS-15) * 10) {
|
||||
overtemp_flag = false;
|
||||
}
|
||||
} else {
|
||||
overtemp_flag = temperature > ((MAX_TEMP_CELSIUS) * 10) ? true : false;
|
||||
}
|
||||
if (overtemp_flag) {
|
||||
if (led_val > 2 && mode < RING_MODE_MAX)
|
||||
led_val--;
|
||||
}
|
||||
|
||||
if (dmx_poll_break_received()) {
|
||||
/* DMX received. Go to DMX mode.
|
||||
* Save old state
|
||||
*/
|
||||
if (mode < RING_MODE_MAX) {
|
||||
led_val_before_dmx = led_val;
|
||||
mode_before_dmx = mode;
|
||||
}
|
||||
mode = RING_MODE_WAIT_DMX;
|
||||
}
|
||||
|
||||
led_pwm_val = 0u;
|
||||
switch (mode)
|
||||
{
|
||||
case RING_MODE_ALL:
|
||||
for(int i = 0; i < RING_MAX_LED; i ++) {
|
||||
led_calc_val[i] = (led_val << 24) + (led_val << 16) + (led_val << 8) + led_val;
|
||||
led_calc_val[i] = (led_val << 24) + (led_val << 16) + (led_val << 8) + led_val;
|
||||
}
|
||||
led_pwm_val = led_val;
|
||||
break;
|
||||
case RING_MODE_RED:
|
||||
for(int i = 0; i < RING_MAX_LED; i ++) {
|
||||
@ -146,24 +75,23 @@ int main(void)
|
||||
break;
|
||||
case RING_MODE_GREEN:
|
||||
for(int i = 0; i < RING_MAX_LED; i ++) {
|
||||
led_calc_val[i] = led_val << 24;
|
||||
led_calc_val[i] = led_val << 24;
|
||||
}
|
||||
break;
|
||||
case RING_MODE_BLUE:
|
||||
for(int i = 0; i < RING_MAX_LED; i ++) {
|
||||
led_calc_val[i] = led_val << 8;
|
||||
led_calc_val[i] = led_val << 8;
|
||||
}
|
||||
break;
|
||||
case RING_MODE_WHITE_DISCRETE:
|
||||
case RING_MODE_WHITE:
|
||||
for(int i = 0; i < RING_MAX_LED; i ++) {
|
||||
led_calc_val[i] = 0u;
|
||||
led_calc_val[i] = led_val;
|
||||
}
|
||||
led_pwm_val = led_val;
|
||||
break;
|
||||
case RING_MODE_ARC:
|
||||
for(int i = 0; i < RING_MAX_LED; i ++) {
|
||||
if(led_val > i*8) {
|
||||
led_calc_val[i] = 0xFFFFFFFFUL;
|
||||
led_calc_val[i] = 0xFFFFFFFFUL;
|
||||
}
|
||||
else {
|
||||
led_calc_val[i] = 0x00000000UL;
|
||||
@ -173,7 +101,7 @@ int main(void)
|
||||
case RING_MODE_QUARTER:
|
||||
for(int i = 0; i < RING_MAX_LED; i ++) {
|
||||
if((led_val / 7 > i) && (led_val / 7 < (i + 7))) {
|
||||
led_calc_val[i] = 0xFFFFFFFFUL;
|
||||
led_calc_val[i] = 0xFFFFFFFFUL;
|
||||
}
|
||||
else {
|
||||
led_calc_val[i] = 0x00000000UL;
|
||||
@ -193,107 +121,48 @@ int main(void)
|
||||
case 2:
|
||||
led_calc_val[i] = 0x0000FF00UL;
|
||||
break;
|
||||
|
||||
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
break;
|
||||
case RING_MODE_WAIT_DMX:
|
||||
force_led_update = false;
|
||||
if (dmx_enough_data_received() && !overtemp_flag) {
|
||||
dmx_data = dmx_get_data();
|
||||
mode = RING_MODE_WAIT_DMX_BREAK;
|
||||
if (dmx_data[0] != 0)
|
||||
break;
|
||||
for (int i = 0; i < RING_MAX_LED; i++) {
|
||||
led_calc_val[i] = (dmx_data[1 + i*4 + 3]) |
|
||||
(dmx_data[1 + i*4 + 2] << 8) |
|
||||
(dmx_data[1 + i*4 + 0] << 16) |
|
||||
(dmx_data[1 + i*4 + 1] << 24);
|
||||
}
|
||||
led_pwm_val = dmx_data[129];
|
||||
force_led_update = true;
|
||||
} else if (overtemp_flag) {
|
||||
force_led_update = true;
|
||||
for (int i = 0; i < RING_MAX_LED; i++) {
|
||||
led_calc_val[i] = 0ul;
|
||||
}
|
||||
led_pwm_val = 0;
|
||||
}
|
||||
break;
|
||||
case RING_MODE_WAIT_DMX_BREAK:
|
||||
force_led_update = false;
|
||||
break;
|
||||
default:
|
||||
for(int i = 0; i < RING_MAX_LED; i ++) {
|
||||
led_calc_val[i] = 0x00000000UL;
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
||||
if (overtemp_flag) {
|
||||
force_led_update = true;
|
||||
led_calc_val[0] = blink_tick ? 0x00FF0000UL : 0UL;
|
||||
__disable_irq();
|
||||
for(int i = 0; i < RING_MAX_LED; i ++) {
|
||||
sk6812_send_led(led_calc_val[i]);
|
||||
}
|
||||
|
||||
if (force_led_update) {
|
||||
TIM14->CCR1 = led_pwm_val;
|
||||
|
||||
for(int i = 0; i < RING_MAX_LED; i ++) {
|
||||
/* Allow interrupts in between LEDs.
|
||||
* They must not exceed the reset length of 80us of SK6812.
|
||||
*/
|
||||
__disable_irq();
|
||||
sk6812_send_led(led_calc_val[i]);
|
||||
__enable_irq();
|
||||
}
|
||||
last_led_val = led_val;
|
||||
}
|
||||
|
||||
/* Only wait in case of non-DMX mode */
|
||||
if (!(mode == RING_MODE_WAIT_DMX_BREAK || mode == RING_MODE_WAIT_DMX) || overtemp_flag)
|
||||
wait_for_ticks(5);
|
||||
__enable_irq();
|
||||
wait_for_ticks(5);
|
||||
|
||||
if((int16_t)TIM3->CNT > (int16_t)led_val) {
|
||||
led_val = 0u;
|
||||
} else if(((int16_t)led_val - (int16_t)TIM3->CNT) > UINT8_MAX) {
|
||||
}
|
||||
else if(((int16_t)led_val - (int16_t)TIM3->CNT) > UINT8_MAX) {
|
||||
led_val = 255u;
|
||||
} else {
|
||||
}
|
||||
else {
|
||||
led_val = (int16_t)led_val - (int16_t)TIM3->CNT;
|
||||
}
|
||||
|
||||
TIM3->CNT = 0u;
|
||||
|
||||
|
||||
if(button_pressed) {
|
||||
if(GPIOA->IDR & GPIO_IDR_0) {
|
||||
button_pressed = false;
|
||||
}
|
||||
} else if(!(GPIOA->IDR & GPIO_IDR_0)) {
|
||||
}
|
||||
else if(!(GPIOA->IDR & GPIO_IDR_0)) {
|
||||
mode = (mode + 1) % RING_MODE_MAX;
|
||||
button_pressed = true;
|
||||
/* Button pressed */
|
||||
if (mode > RING_MODE_MAX) {
|
||||
/* In DMX mode. Abort DMX mode */
|
||||
mode = mode_before_dmx;
|
||||
led_val = led_val_before_dmx;
|
||||
} else {
|
||||
/* Normal mode switching */
|
||||
mode = (mode + 1) % RING_MODE_MAX;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void SysTick_Handler(void)
|
||||
{
|
||||
static uint32_t tick = 10;
|
||||
|
||||
if (!--tick) {
|
||||
tick = 10;
|
||||
blink_tick = !blink_tick;
|
||||
}
|
||||
|
||||
|
||||
void SysTick_Handler(void) {
|
||||
wait_tick++;
|
||||
}
|
||||
}
|
||||
@ -93,7 +93,7 @@ void __setup_clocks(void)
|
||||
RCC->CFGR = tmp;
|
||||
|
||||
/* Turn off HSI */
|
||||
RCC->CR &= ~RCC_CR_HSION;
|
||||
RCC->CR &= ~RCC_CR_HSEON;
|
||||
}
|
||||
|
||||
void __system_init(void)
|
||||
|
||||
@ -38,14 +38,16 @@ MEMORY
|
||||
|
||||
SECTIONS
|
||||
{
|
||||
.vectors : ALIGN(4)
|
||||
.vectors :
|
||||
{
|
||||
. = ALIGN(4);
|
||||
KEEP(*(.vectors))
|
||||
. = ALIGN(4);
|
||||
} >FLASH
|
||||
|
||||
.text : ALIGN(4)
|
||||
.text :
|
||||
{
|
||||
. = ALIGN(4);
|
||||
*(.text) /* .text sections (code) */
|
||||
*(.text*) /* .text* sections (code) */
|
||||
*(.rodata) /* .rodata sections (constants, strings, etc.) */
|
||||
@ -55,54 +57,49 @@ SECTIONS
|
||||
*(.eh_frame)
|
||||
KEEP(*(.init)) /* Constructors */
|
||||
KEEP(*(.fini)) /* Destructors */
|
||||
. = ALIGN(4);
|
||||
} >FLASH =0xFF
|
||||
} >FLASH
|
||||
|
||||
.ARM.extab : ALIGN(4)
|
||||
.ARM.extab :
|
||||
{
|
||||
*(.ARM.extab* .gnu.linkonce.armextab.*)
|
||||
. = ALIGN(4);
|
||||
} >FLASH =0xFF
|
||||
*(.ARM.extab* .gnu.linkonce.armextab.*)
|
||||
} >FLASH
|
||||
|
||||
.ARM : ALIGN(4)
|
||||
.ARM :
|
||||
{
|
||||
__exidx_start = .;
|
||||
*(.ARM.exidx*)
|
||||
__exidx_end = .;
|
||||
. = ALIGN(4);
|
||||
} >FLASH =0xFF
|
||||
} >FLASH
|
||||
|
||||
/* Constructor/Destructor tables */
|
||||
.preinit_array : ALIGN(4)
|
||||
.preinit_array :
|
||||
{
|
||||
PROVIDE_HIDDEN (__preinit_array_start = .);
|
||||
KEEP (*(.preinit_array*))
|
||||
PROVIDE_HIDDEN (__preinit_array_end = .);
|
||||
. = ALIGN(4);
|
||||
} >FLASH =0xFF
|
||||
} >FLASH
|
||||
|
||||
.init_array : ALIGN(4)
|
||||
.init_array :
|
||||
{
|
||||
PROVIDE_HIDDEN (__init_array_start = .);
|
||||
KEEP (*(SORT(.init_array.*)))
|
||||
KEEP (*(.init_array*))
|
||||
PROVIDE_HIDDEN (__init_array_end = .);
|
||||
. = ALIGN(4);
|
||||
} >FLASH =0xFF
|
||||
} >FLASH
|
||||
|
||||
.fini_array : ALIGN(4)
|
||||
.fini_array :
|
||||
{
|
||||
PROVIDE_HIDDEN (__fini_array_start = .);
|
||||
KEEP (*(.fini_array*))
|
||||
KEEP (*(SORT(.fini_array.*)))
|
||||
PROVIDE_HIDDEN (__fini_array_end = .);
|
||||
. = ALIGN(4);
|
||||
} >FLASH =0xFF
|
||||
} >FLASH
|
||||
|
||||
/* Initialized Data */
|
||||
__ld_load_data = LOADADDR(.data);
|
||||
.data : ALIGN(4)
|
||||
.data :
|
||||
{
|
||||
. = ALIGN(4);
|
||||
__ld_sdata = .;
|
||||
*(.data)
|
||||
*(.data*)
|
||||
@ -111,8 +108,9 @@ SECTIONS
|
||||
} >RAM AT> FLASH
|
||||
|
||||
/* Uninitialized static data */
|
||||
.bss : ALIGN(4)
|
||||
.bss :
|
||||
{
|
||||
. = ALIGN(4);
|
||||
__ld_sbss = .;
|
||||
*(.bss)
|
||||
*(.bss*)
|
||||
@ -121,8 +119,9 @@ SECTIONS
|
||||
__ld_ebss = .;
|
||||
} >RAM
|
||||
|
||||
.heap_stack (NOLOAD) : ALIGN(4)
|
||||
.heap_stack (NOLOAD) :
|
||||
{
|
||||
. = ALIGN(4);
|
||||
__ld_sheap = .;
|
||||
. = . + __ld_heap_size;
|
||||
__ld_eheap = .;
|
||||
|
||||
@ -54,8 +54,6 @@ int32_t temperature_adc_get_temp(void)
|
||||
temp = ((temp_lf_s23_8 / 16) * vdd_lf_s23_8 / FLOAT_TO_S23_8(3.3)) * 16;
|
||||
temp = (get_temp_sensor_cal() << 10) - temp;
|
||||
temp = (temp * 10 / slope) + 300;
|
||||
|
||||
return temp;
|
||||
}
|
||||
|
||||
static uint32_t get_vrefint_cal(void)
|
||||
@ -96,9 +94,9 @@ void DMA_CH1_IRQHandler(void)
|
||||
uint32_t isr;
|
||||
|
||||
isr = DMA1->ISR;
|
||||
DMA1->IFCR = isr & 0xF;
|
||||
DMA1->IFCR = isr;
|
||||
|
||||
if (isr & DMA_ISR_TCIF1) {
|
||||
process_adc_samples();
|
||||
}
|
||||
}
|
||||
}
|
||||
1
housing/.gitignore
vendored
1
housing/.gitignore
vendored
@ -1,2 +1 @@
|
||||
*.FCStd?
|
||||
*.stl
|
||||
|
||||
Binary file not shown.
@ -929,11 +929,9 @@ Wire Wire Line
|
||||
Text Notes 3250 2100 0 50 ~ 0
|
||||
22 uH
|
||||
Text Notes 2150 4650 0 50 ~ 0
|
||||
Max Current = 60 mA\nYou may use 27k for 88mA. This turned out to be fine.
|
||||
Max Current = 60 mA
|
||||
Text Notes 850 3900 0 50 ~ 0
|
||||
f = 1.08 MHz
|
||||
Text Notes 1650 1850 0 50 ~ 0
|
||||
For the calculation of the component values see 'lp8867-calc.py'
|
||||
Text Notes 6050 2800 0 50 ~ 0
|
||||
(15pF)
|
||||
$EndSCHEMATC
|
||||
|
||||
2
pcb/lp8867-calc.py
Executable file → Normal file
2
pcb/lp8867-calc.py
Executable file → Normal file
@ -35,7 +35,7 @@ switching_freq = 1.1e6
|
||||
output_voltage_nom = 24 + 0.9
|
||||
inductor_value = 22e-6
|
||||
input_voltage = 12
|
||||
output_current_per_lane = 110e-3
|
||||
output_current_per_lane = 60e-3
|
||||
desired_e_series = es.E12
|
||||
r1 = 560e3
|
||||
r2 = 100e3
|
||||
|
||||
@ -1058,7 +1058,7 @@ P 1950 1200
|
||||
F 0 "SW1" H 1950 875 50 0000 C CNN
|
||||
F 1 "5FS1S102M6QE " H 1950 966 50 0000 C CNN
|
||||
F 2 "shimatta_switch:NINIGI-5FS1S102M6QE" H 1950 1200 50 0001 C CNN
|
||||
F 3 "https://www.tme.eu/Document/d3fdab2d1ef2b3e44d3477e847fc8839/slide_switch_5F.PDF" H 1950 1200 50 0001 C CNN
|
||||
F 3 "~" H 1950 1200 50 0001 C CNN
|
||||
1 1950 1200
|
||||
1 0 0 1
|
||||
$EndComp
|
||||
|
||||
Loading…
Reference in New Issue
Block a user