Fix bug in clock setup. HSE was accidentally stopped instead of HSI. This didn't have any bad effects though

* Remove SK6812 White mode. Discrete LEDs are just fine
* Move discrete White mode at the beginning of the list

firmware/.gitignore

@@ -1,3 +1,12 @@
 *.elf
 memmap.map
 obj/
+*.creator
+*.user
+*.user*
+*.cflags
+*.cxxflags
+*.files
+*.includes
+*.config
+.qtc_clangd/*

firmware/main.c

@@ -3,18 +3,19 @@
 #include <stdbool.h>
 #include <ring-light/temp-adc.h>
 
-#define RING_MAX_LED	30u
+#define RING_MAX_LED	32u
+#define MAX_TEMP_CELSIUS 70
 
 enum ring_modes {
-	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
+	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 */
 };
 
 volatile int32_t temperature;
@@ -33,12 +34,13 @@ int main(void)
 {
 	uint32_t led_val = 0x00UL;
 	uint32_t led_calc_val[RING_MAX_LED] = {0x00UL};
+	uint8_t led_pwm_val = 0u;
 
 	bool button_pressed = false;
 	enum ring_modes mode = RING_MODE_ALL;
 
-	RCC->AHBENR |= RCC_AHBENR_GPIOAEN;
-	RCC->APB1ENR |= RCC_APB1ENR_TIM3EN;
+	RCC->AHBENR |= RCC_AHBENR_GPIOAEN | RCC_AHBENR_GPIOBEN;
+	RCC->APB1ENR |= RCC_APB1ENR_TIM3EN | RCC_APB1ENR_TIM14EN;
 
 	GPIOA->MODER |= (2<<7*2)|(2<<6*2)|(1<<3*2);
 
@@ -47,6 +49,11 @@ 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;
@@ -56,17 +63,45 @@ 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();
 
 	SysTick_Config(800000);
 	while(1) {
 		temperature = temperature_adc_get_temp();
+
+		/*! -# Gradually dim down the LED brightness in case the temperature is too high */
+		if (temperature > ((MAX_TEMP_CELSIUS) * 10)) {
+			if (led_val > 20)
+				led_val--;
+		}
+
+		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 ++) {
@@ -75,23 +110,24 @@ 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:
+		case RING_MODE_WHITE_DISCRETE:
 			for(int i = 0; i < RING_MAX_LED; i ++) {
-				led_calc_val[i] = led_val; 
+				led_calc_val[i] = 0u;
 			}
+			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;
@@ -101,7 +137,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;
@@ -121,7 +157,7 @@ int main(void)
 				case 2:
 					led_calc_val[i] = 0x0000FF00UL;
 					break;
-				
+
 				default:
 					break;
 				}
@@ -133,6 +169,8 @@ int main(void)
 			}
 			break;
 		}
+
+		TIM14->CCR1 = led_pwm_val;
 		__disable_irq();
 		for(int i = 0; i < RING_MAX_LED; i ++) {
 			sk6812_send_led(led_calc_val[i]);
@@ -165,4 +203,4 @@ int main(void)
 
 void SysTick_Handler(void) {
 	wait_tick++;
-}
+}

firmware/setup/system_init.c

@@ -93,7 +93,7 @@ void __setup_clocks(void)
 	RCC->CFGR = tmp;
 
 	/* Turn off HSI */
-	RCC->CR &= ~RCC_CR_HSEON;
+	RCC->CR &= ~RCC_CR_HSION;
 }
 
 void __system_init(void)

firmware/startup/stm32f030.ld

@@ -38,16 +38,14 @@ MEMORY
 
 SECTIONS
 {
-	.vectors :
+	.vectors : ALIGN(4)
 	{
-		. = ALIGN(4);
 		KEEP(*(.vectors))
 		. = ALIGN(4);
 	} >FLASH
 	
-	.text :
+	.text : ALIGN(4)
 	{
-		. = ALIGN(4);
 		*(.text)           /* .text sections (code) */
     		*(.text*)          /* .text* sections (code) */
     		*(.rodata)         /* .rodata sections (constants, strings, etc.) */
@@ -57,49 +55,54 @@ SECTIONS
 		*(.eh_frame)
 		KEEP(*(.init))	   /* Constructors */
 		KEEP(*(.fini))     /* Destructors  */
-	} >FLASH
+		. = ALIGN(4);
+	} >FLASH =0xFF
 	
-	.ARM.extab : 
+	.ARM.extab : ALIGN(4)
 	{ 
-		*(.ARM.extab* .gnu.linkonce.armextab.*) 
-	} >FLASH
+		*(.ARM.extab* .gnu.linkonce.armextab.*)
+		. = ALIGN(4);
+	} >FLASH =0xFF
 	
-	.ARM :
+	.ARM : ALIGN(4)
 	{
     		__exidx_start = .;
       		*(.ARM.exidx*)
       		__exidx_end = .;
-   	} >FLASH
+      		. = ALIGN(4);
+   	} >FLASH =0xFF
 	
 	/* Constructor/Destructor tables */
- 	.preinit_array     :
+ 	.preinit_array : ALIGN(4)
 	{
     		PROVIDE_HIDDEN (__preinit_array_start = .);
     		KEEP (*(.preinit_array*))
     		PROVIDE_HIDDEN (__preinit_array_end = .);
-  	} >FLASH
+		. = ALIGN(4);
+  	} >FLASH =0xFF
   	
-	.init_array :
+	.init_array : ALIGN(4)
   	{
     		PROVIDE_HIDDEN (__init_array_start = .);
     		KEEP (*(SORT(.init_array.*)))
     		KEEP (*(.init_array*))
     		PROVIDE_HIDDEN (__init_array_end = .);
-  	} >FLASH
+		. = ALIGN(4);
+  	} >FLASH =0xFF
   
-	.fini_array :
+	.fini_array : ALIGN(4)
 	{
     		PROVIDE_HIDDEN (__fini_array_start = .);
     		KEEP (*(.fini_array*))
     		KEEP (*(SORT(.fini_array.*)))
     		PROVIDE_HIDDEN (__fini_array_end = .);
-  	} >FLASH
+		. = ALIGN(4);
+  	} >FLASH =0xFF
 	
 	/* Initialized Data */
 	__ld_load_data = LOADADDR(.data);
-	.data : 
+	.data : ALIGN(4)
 	{
-		. = ALIGN(4);
 		__ld_sdata = .;
 		*(.data)
 		*(.data*)
@@ -108,9 +111,8 @@ SECTIONS
 	} >RAM AT> FLASH
 	
 	/* Uninitialized static data */
-	.bss :
+	.bss : ALIGN(4)
 	{
-		. = ALIGN(4);
 		__ld_sbss = .;
 		*(.bss)
 		*(.bss*)
@@ -119,9 +121,8 @@ SECTIONS
 		__ld_ebss = .;
 	} >RAM
 
-	.heap_stack (NOLOAD) :
+	.heap_stack (NOLOAD) : ALIGN(4)
 	{
-		. = ALIGN(4);
 		__ld_sheap = .;
 		. = . + __ld_heap_size;
 		__ld_eheap = .;

firmware/temp-adc.c

@@ -54,6 +54,8 @@ 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)
@@ -99,4 +101,4 @@ void DMA_CH1_IRQHandler(void)
 	if (isr & DMA_ISR_TCIF1) {
 		process_adc_samples();
 	}
-}
+}

housing/.gitignore

@@ -1 +1,2 @@
 *.FCStd?
+*.stl

pcb/WhiteLEDs.sch

@@ -929,9 +929,11 @@ Wire Wire Line
 Text Notes 3250 2100 0    50   ~ 0
 22 uH
 Text Notes 2150 4650 0    50   ~ 0
-Max Current = 60 mA
+Max Current = 60 mA\nYou may use 27k for 88mA. This turned out to be fine.
 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

pcb/lp8867-calc.py

@@ -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 = 60e-3
+output_current_per_lane = 110e-3
 desired_e_series = es.E12
 r1 = 560e3
 r2 = 100e3

pcb/microscope-ring-light.sch

@@ -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 "~" 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
 	1    1950 1200
 	1    0    0    1   
 $EndComp