alema/usbc_soldering_iron
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

indentation to tabs

Browse Source
This commit is contained in:
Alessandro Mauri 2026-04-19 23:07:36 +02:00
parent 4820010ef1
commit 2a38ba36b0
2 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
fw/display.c
View File

@ -162,7 +162,7 @@ uint8_t u8x8_byte_i2c(u8x8_t *u8x8, uint8_t msg, uint8_t arg_int, void *arg_ptr)
u8g2_t* display_init(void) u8g2_t* display_init(void)
{ {
#if SSD1306_128X32 && SSD1306_128X32 == 1 #if SSD1306_128X32 && SSD1306_128X32 == 1
u8g2_Setup_ssd1306_i2c_128x32_univision_f(&u8g2, U8G2_R0, u8x8_byte_i2c, u8x8_gpio_and_delay); u8g2_Setup_ssd1306_i2c_128x32_univision_f(&u8g2, U8G2_R0, u8x8_byte_i2c, u8x8_gpio_and_delay);
#elif SSD1312_96X16 && SSD1312_96X16 == 1 #elif SSD1312_96X16 && SSD1312_96X16 == 1
// NOTE: display size is wrong, hardware is 96x16, but driver is configured for 120x28 // NOTE: display size is wrong, hardware is 96x16, but driver is configured for 120x28
u8g2_Setup_ssd1312_i2c_128x32_f(&u8g2, U8G2_R0, u8x8_byte_i2c, u8x8_gpio_and_delay); u8g2_Setup_ssd1312_i2c_128x32_f(&u8g2, U8G2_R0, u8x8_byte_i2c, u8x8_gpio_and_delay);
@ -170,8 +170,8 @@ u8g2_t* display_init(void)
static_assert(0, "unsupported display size"); static_assert(0, "unsupported display size");
#endif #endif
// TODO: log errors and return NULL on failure // TODO: log errors and return NULL on failure
u8g2_InitDisplay(&u8g2); u8g2_InitDisplay(&u8g2);
u8g2_SetPowerSave(&u8g2, 0); u8g2_SetPowerSave(&u8g2, 0);
u8g2_SetContrast(&u8g2, 255); u8g2_SetContrast(&u8g2, 255);
return &u8g2; return &u8g2;
} }

25
fw/main.c
View File

@ -6,7 +6,6 @@
#include "lib_i2c.h" #include "lib_i2c.h"
#include "display.h" #include "display.h"
#include "filter.h" #include "filter.h"
#include "u8g2.h"
// Pin definitions // Pin definitions
@ -145,9 +144,9 @@ static inline void setup_i2c(void)
// Enable AFIO (Alternate Function IO) // Enable AFIO (Alternate Function IO)
RCC->APB2PCENR |= RCC_AFIOEN; RCC->APB2PCENR |= RCC_AFIOEN;
// Init I2C // Init I2C
i2c_init(I2C_TARGET, FUNCONF_SYSTEM_CORE_CLOCK, 100000); i2c_init(I2C_TARGET, FUNCONF_SYSTEM_CORE_CLOCK, 100000);
// To utilize the I2C bus we need to disable SWD first, since the pins overlap // To utilize the I2C bus we need to disable SWD first, since the pins overlap
AFIO->PCFR1 &= ~(0b0111 << 24); AFIO->PCFR1 &= ~(0b0111 << 24);
AFIO->PCFR1 |= 0b0100 << 24; AFIO->PCFR1 |= 0b0100 << 24;
@ -188,13 +187,13 @@ __attribute__((noreturn)) int main(void)
setup_i2c(); setup_i2c();
// Configure the IO as an interrupt. // Configure the IO as an interrupt.
// PIN_ENC_B is on port B, channel 11 // PIN_ENC_B is on port B, channel 11
AFIO->EXTICR1 = AFIO_EXTICR1_EXTI11_PB; // Port B channel (pin) 11 AFIO->EXTICR1 = AFIO_EXTICR1_EXTI11_PB; // Port B channel (pin) 11
EXTI->INTENR = EXTI_INTENR_MR11; // Enable EXT11 EXTI->INTENR = EXTI_INTENR_MR11; // Enable EXT11
EXTI->FTENR = EXTI_FTENR_TR11; // Falling edge trigger EXTI->FTENR = EXTI_FTENR_TR11; // Falling edge trigger
// enable interrupt // enable interrupt
NVIC_EnableIRQ(EXTI15_8_IRQn); NVIC_EnableIRQ(EXTI15_8_IRQn);
Delay_Ms(500); Delay_Ms(500);
@ -205,7 +204,7 @@ __attribute__((noreturn)) int main(void)
static int16_t temp_k; static int16_t temp_k;
poll_input(); // usb poll_input(); // usb
u32 start = funSysTick32(); u32 start = funSysTick32();
vbus_mv = U16_FP_EMA_K2(vbus_mv, ((u32)funAnalogRead(VBUS_ADC_CHANNEL)*VCC_MV*11)/4096); vbus_mv = U16_FP_EMA_K2(vbus_mv, ((u32)funAnalogRead(VBUS_ADC_CHANNEL)*VCC_MV*11)/4096);
current_ma = U16_FP_EMA_K2(current_ma, get_current_ma(funAnalogRead(CURRENT_ADC_CHANNEL))); current_ma = U16_FP_EMA_K2(current_ma, get_current_ma(funAnalogRead(CURRENT_ADC_CHANNEL)));
@ -231,9 +230,9 @@ __attribute__((noreturn)) int main(void)
u32 elapsed = funSysTick32() - start; u32 elapsed = funSysTick32() - start;
if (elapsed < Ticks_from_Ms(FRAME_TIME_MS)) { if (elapsed < Ticks_from_Ms(FRAME_TIME_MS)) {
DelaySysTick(Ticks_from_Ms(FRAME_TIME_MS) - elapsed); DelaySysTick(Ticks_from_Ms(FRAME_TIME_MS) - elapsed);
} else { } else {
printf("Frame took too long: %ld ms\n", elapsed/DELAY_MS_TIME); printf("Frame took too long: %ld ms\n", elapsed/DELAY_MS_TIME);
} }
} }
} }