@@ -19,48 +19,50 @@ INCLUDE=-I$(CURDIR)
INCLUDE+=-I$(STMLIB)/CMSIS/Include
INCLUDE+=-I$(STMLIB)/CMSIS/Device/ST/STM32L1xx/Include
INCLUDE+=-I$(STD_PERIPH)/inc
INCLUDE+=-I$(DISCOVERY)
INCLUDE+=-I$(STMLIB)/$(OLEDDRV)
INCLUDE+=-I$(STMLIB)/$(USBDRV)
# vpath is used so object files are written to the current directory instead
# of the same directory as their source files
vpath %.c $(DISCOVERY) $(STD_PERIPH)/src \
$(STMLIB)/USB \
$(STMLIB)/STM32_USB-FS_Device_Library/Class/hid/src \
$(STMLIB)/STM32_USB-FS_Device_Library/Core/src
vpath %.s $(STARTUP)
ASRC=startup_stm32l1xx_mdp.s
# Project Source Files
SRC=main.c
SRC+=stm32l1xx_it.c
SRC+=system_stm32l1xx.c
SRC+=stm32l100c_discovery.c
SRC+=ssd1306.c
SRC+=eeprom_min.c
SRC+=gpio.c
SRC+=spi.c
SRC+=stringhelpers.c
# Discovery Source Files
#SRC+=stm32f4_discovery_lis302dl.c
#SRC+=stm32f4_discovery.c
#SRC+=stm32f4_discovery_audio_codec.c
# Standard Peripheral Source Files
SRC+=stm32l1xx_syscfg.c
SRC+=misc.c
SRC+=stm32l1xx_adc.c
SRC+=stm32l1xx_dac.c
SRC+=stm32l1xx_dma.c
SRC+=stm32l1xx_exti.c
SRC+=stm32l1xx_flash.c
SRC+=stm32l1xx_gpio.c
SRC+=stm32l1xx_i2c.c
SRC+=stm32l1xx_rcc.c
SRC+=stm32l1xx_spi.c
SRC+=stm32l1xx_tim.c
# USB Source Files
SRC+=usb_core.c
SRC+=usb_init.c
#ifndef CONFIG_H
#define CONFIG_H
#define SSR_PERIOD 200
#define LED_POWER GPIOB,GPIO_Pin_9
#define LED_STAT GPIOA,GPIO_Pin_15
#define MAX_CS GPIOB,GPIO_Pin_12
#define SW_BTN GPIOB, GPIO_Pin_3
#define SW_UP GPIOB, GPIO_Pin_4
#define SW_DOWN GPIOB, GPIO_Pin_6
#define SW_LEFT GPIOB, GPIO_Pin_5
#define SW_RIGHT GPIOB, GPIO_Pin_7
#define SW_UP GPIOB, GPIO_Pin_6
#define SW_DOWN GPIOB, GPIO_Pin_4
#define SW_LEFT GPIOB, GPIO_Pin_7
#define SW_RIGHT GPIOB, GPIO_Pin_5
#define SSR_PIN GPIOC, GPIO_Pin_13
#endif
// vim:softtabstop=4 shiftwidth=4 expandtab
#ifndef EEPROM_MIN_H
#define EEPROM_MIN_H
#define EEPROM_BASE_ADDR 0x08080000
#define EEPROM_BYTE_SIZE 0x0FFF
#define EEPROM_ADDR_WINDUP_GUARD 0x001C
#define EEPROM_ADDR_BOOTTOBREW 0x0020
#define EEPROM_ADDR_K_P 0x0024
#define EEPROM_ADDR_K_I 0x0028
#define EEPROM_ADDR_K_D 0x002C
#define EEPROM_ADDR_BREWTEMP 0x0030
#define EEPROM_ADDR_STEAMTEMP 0x0034
void Minimal_EEPROM_Unlock(void);
void Minimal_EEPROM_Lock(void);
FLASH_Status Minimal_FLASH_GetStatus(void);
FLASH_Status Minimal_FLASH_WaitForLastOperation(uint32_t Timeout);
void Minimal_EEPROM_ProgramWord(uint32_t Address, uint32_t Data);
new file 100644
#include "stm32l100c_discovery.h"
#include "gpio.h"
#include "config.h"
extern volatile uint32_t ticks;
// Increase on each press, and increase at a fast rate after duration elapsed of continuously holding down... somehow...
uint32_t change_time_reset = 0;
void user_input(uint16_t* to_modify)
{
if(CHANGE_ELAPSED) {
if(!GPIO_ReadInputDataBit(SW_UP) ) {
CHANGE_RESET;
(*to_modify)++;
}
else if(!GPIO_ReadInputDataBit(SW_DOWN) && (*to_modify) > 0) {
(*to_modify)--;
void init_gpio(void) {
GPIO_InitTypeDef GPIO_InitStruct;
// Enable SPI clocks
RCC_APB2PeriphClockCmd(RCC_APB2Periph_SPI1, ENABLE);
RCC_APB1PeriphClockCmd(RCC_APB1Periph_SPI2, ENABLE);
// Enable GPIO clocks
RCC_AHBPeriphClockCmd(RCC_AHBPeriph_GPIOC|RCC_AHBPeriph_GPIOB|RCC_AHBPeriph_GPIOA, ENABLE);
// Enable DMA clocks (Is AHB even the right thing???)
RCC_AHBPeriphClockCmd(RCC_AHBPeriph_DMA1, ENABLE); // EMZ TODO get the right ones
/*Configure GPIO pin : PC */
GPIO_InitStruct.GPIO_Pin = GPIO_Pin_13;
GPIO_InitStruct.GPIO_Mode = GPIO_Mode_OUT;
GPIO_InitStruct.GPIO_OType = GPIO_OType_PP;
GPIO_InitStruct.GPIO_PuPd = GPIO_PuPd_NOPULL;
GPIO_InitStruct.GPIO_Speed = GPIO_Speed_400KHz;
GPIO_Init(GPIOC, &GPIO_InitStruct);
/*Configure GPIO pin : PB */
GPIO_InitStruct.GPIO_Pin = GPIO_Pin_1|GPIO_Pin_2|GPIO_Pin_10|GPIO_Pin_12
|GPIO_Pin_9;
GPIO_Init(GPIOB, &GPIO_InitStruct);
/*Configure GPIO pin : PA */
GPIO_InitStruct.GPIO_Pin = GPIO_Pin_15;
GPIO_Init(GPIOA, &GPIO_InitStruct);
GPIO_InitStruct.GPIO_Pin = GPIO_Pin_3|GPIO_Pin_4|GPIO_Pin_5|GPIO_Pin_6
|GPIO_Pin_7;
GPIO_InitStruct.GPIO_Mode = GPIO_Mode_IN;
GPIO_InitStruct.GPIO_PuPd = GPIO_PuPd_UP;
/** SPI1 GPIO Configuration
PA5 ------> SPI1_SCK
PA7 ------> SPI1_MOSI
*/
/*Enable or disable the AHB peripheral clock */
RCC_AHBPeriphClockCmd(RCC_AHBPeriph_GPIOA, ENABLE);
/*Configure GPIO pin : PA: MOSI,SCK */
GPIO_InitStruct.GPIO_Pin = GPIO_Pin_5|GPIO_Pin_7;
GPIO_InitStruct.GPIO_Mode = GPIO_Mode_AF;
GPIO_InitStruct.GPIO_Speed = GPIO_Speed_10MHz;
/*Configure GPIO pin alternate function */
GPIO_PinAFConfig(GPIOA, GPIO_PinSource5, GPIO_AF_SPI1);
GPIO_PinAFConfig(GPIOA, GPIO_PinSource7, GPIO_AF_SPI1);
/** SPI2 GPIO Configuration
PB13 ------> SPI2_SCK
PB14 ------> SPI2_MISO
PB15 ------> SPI2_MOSI
RCC_AHBPeriphClockCmd(RCC_AHBPeriph_GPIOB, ENABLE);
// SPI PINSSS
/*Configure GPIO pin : PB, MOSI, SCK */
GPIO_InitStruct.GPIO_Pin = GPIO_Pin_13|GPIO_Pin_15;
GPIO_InitTypeDef GPIO_InitStruct2;
// MISO
GPIO_InitStruct2.GPIO_Pin = GPIO_Pin_14;
GPIO_InitStruct2.GPIO_Mode = GPIO_Mode_AF;
GPIO_InitStruct2.GPIO_PuPd = GPIO_PuPd_NOPULL;
GPIO_InitStruct2.GPIO_Speed = GPIO_Speed_10MHz;
GPIO_Init(GPIOB, &GPIO_InitStruct2);
//Configure GPIO pin alternate function
GPIO_PinAFConfig(GPIOB, GPIO_PinSource13, GPIO_AF_SPI2);
GPIO_PinAFConfig(GPIOB, GPIO_PinSource14, GPIO_AF_SPI2);
GPIO_PinAFConfig(GPIOB, GPIO_PinSource15, GPIO_AF_SPI2);
/** USB GPIO Configuration
PA11 ------> USB_DM
PA12 ------> USB_DP
GPIO_InitStruct.GPIO_Pin = GPIO_Pin_11|GPIO_Pin_12;
#ifndef GPIO_H
#define GPIO_H
#define CHANGE_PERIOD_MS 100
#define CHANGE_ELAPSED (ticks - change_time_reset) > CHANGE_PERIOD_MS
#define CHANGE_RESET change_time_reset = ticks
void user_input(uint16_t* to_modify);
void init_gpio(void);
#include "main.h"
#include "ssd1306.h"
#include "eeprom_min.h"
#include "spi.h"
// USB includes
#include "hw_config.h"
#include "usb_lib.h"
#include "usb_desc.h"
#include "usb_pwr.h"
#include "stringhelpers.h"
// TODO: Grab buttonpresses with interrupts
// USB Supporting Vars
extern __IO uint8_t Receive_Buffer[64];
extern __IO uint32_t Receive_length ;
extern __IO uint32_t length ;
uint8_t Send_Buffer[64];
uint32_t packet_sent=1;
uint32_t packet_receive=1;
// Globalish setting vars
uint8_t boottobrew = 0;
#define WINDUP_GUARD_GAIN 100
uint16_t windup_guard = WINDUP_GUARD_GAIN;
uint16_t windup_guard = 1;
uint16_t k_p = 1;
uint16_t k_i = 1;
uint16_t k_d = 1;
// ISR ticks var TODO: Double check functionality after volatilazation... needed on ARM?
// ISR ticks var
volatile uint32_t ticks = 0;
int16_t setpoint_brew = 0;
int16_t setpoint_steam = 0;
// State definition
enum state {
STATE_IDLE = 0,
STATE_SETP,
STATE_SETI,
STATE_SETD,
STATE_SETWINDUP,
STATE_SETBOOTTOBREW,
STATE_PREHEAT_BREW,
STATE_MAINTAIN_BREW,
STATE_PREHEAT_STEAM,
STATE_MAINTAIN_STEAM,
};
uint8_t state = STATE_IDLE;
static __IO uint32_t TimingDelay;
// Move to header file
void init_gpio();
void init_spi();
void process();
void machine();
void delay(__IO uint32_t nTime);
void restore_settings();
void save_settings();
void save_setpoints();
int main(void)
// Init clocks
SystemInit();
// Init GPIO
init_gpio();
// Turn on power LED
GPIO_SetBits(LED_POWER);
// TODO: Awesome pwm of power LED (TIM4_CH4 or TIM11_CH1)
// Configure 1ms SysTick (change if more temporal resolution needed)
RCC_ClocksTypeDef RCC_Clocks;
RCC_GetClocksFreq(&RCC_Clocks);
SysTick_Config(RCC_Clocks.HCLK_Frequency / 1000);
// Init SPI busses
init_spi();
// Init OLED over SPI
ssd1306_Init();
ssd1306_clearscreen();
// Check for problems on startup
@@ -161,97 +153,94 @@ void update_temp() {
temp_pre = temp_pre >> 2; // Drop 2 lowest bits
temp_frac = temp_pre & 0b11; // get fractional part
temp_frac *= 25; // each bit is .25 a degree, up to fixed point
temp_pre = temp_pre >> 2; // Drop 2 fractional bits
if(sign) {
temp = -temp_pre;
else {
temp = temp_pre;
// Deassert CS
delay(1);
GPIO_SetBits(MAX_CS);
// PID implementation
int16_t last_pid_temp = 0;
uint8_t last_pid_temp_frac = 0;
int16_t i_state = 0;
int16_t update_pid(uint16_t k_p, uint16_t k_i, uint16_t k_d, int16_t temp, uint8_t temp_frac, int16_t setpoint)
// Calculate instantaneous error
int16_t error = (int16_t)setpoint - (int16_t)temp; // TODO: Use fixed point fraction
// Proportional component
int16_t p_term = k_p * error;
// Error accumulator (integrator)
i_state += error;
// to prevent the iTerm getting huge despite lots of
// error, we use a "windup guard"
// (this happens when the machine is first turned on and
// it cant help be cold despite its best efforts)
// not necessary, but this makes windup guard values
// relative to the current iGain
int16_t windup_guard_res = WINDUP_GUARD_GAIN / k_i;
int16_t windup_guard_res = windup_guard / k_i;
// Calculate integral term with windup guard
if (i_state > windup_guard_res)
i_state = windup_guard_res;
else if (i_state < -windup_guard_res)
i_state = -windup_guard_res;
int16_t i_term = k_i * i_state;
// Calculate differential term (slope since last iteration)
int16_t d_term = (k_d * (temp - last_pid_temp));
// Save temperature for next iteration
last_pid_temp = temp;
last_pid_temp_frac = temp_frac;
int16_t result = p_term + i_term - d_term;
// Put out tenths of percent, 0-1000.
if(result > 1000)
result = 1000;
else if(result < -1000)
result = -1000;
// Return feedback
return result;
uint32_t last_ssr_on = 0;
uint32_t last_led = 0;
int32_t setpoint = 0;
int16_t ssr_output = 0; // Duty cycle of ssr, 0 to SSR_PERIOD
uint8_t pid_enabled = 0;
// Process things
void process()
update_temp(); // Read MAX31855
// TODO: Add calibration offset (linear)
if(ticks - last_led > 400)
GPIO_ToggleBits(LED_POWER);
last_led = ticks;
// Every 200ms, set the SSR on unless output is 0
if((ticks - last_ssr_on > SSR_PERIOD))
if(pid_enabled)
@@ -293,145 +282,128 @@ void draw_setpoint() {
itoa_fp(temp, temp_frac, tempstr);
//ssd1306_DrawString(" ", 3, 40);
ssd1306_DrawString(tempstr, 3, 40);
ssd1306_DrawString("-> ", 3, 80);
itoa(setpoint, tempstr);
ssd1306_DrawString(" ", 3, 95);
ssd1306_DrawString(tempstr, 3, 95);
uint8_t goto_mode = 2;
// State machine
uint8_t sw_btn_last = 0;
uint8_t sw_up_last = 0;
uint8_t sw_down_last = 0;
uint8_t sw_left_last = 0;
uint8_t sw_right_last = 0;
#define SW_BTN_PRESSED (sw_btn_last == 0 && sw_btn == 1) // rising edge on buttonpress
#define SW_UP_PRESSED (sw_up_last == 0 && sw_up == 1)
#define SW_DOWN_PRESSED (sw_down_last == 0 && sw_down == 1)
#define SW_LEFT_PRESSED (sw_left_last == 0 && sw_left == 1)
#define SW_RIGHT_PRESSED (sw_right_last == 0 && sw_right == 1)
void save_settings()
Minimal_EEPROM_Unlock();
// Try programming a word at an address divisible by 4
Minimal_EEPROM_ProgramWord(EEPROM_BASE_ADDR + EEPROM_ADDR_BOOTTOBREW, boottobrew);
Minimal_EEPROM_ProgramWord(EEPROM_BASE_ADDR + EEPROM_ADDR_WINDUP_GUARD, windup_guard);
Minimal_EEPROM_ProgramWord(EEPROM_BASE_ADDR + EEPROM_ADDR_K_P, k_p);
Minimal_EEPROM_ProgramWord(EEPROM_BASE_ADDR + EEPROM_ADDR_K_I, k_i);
Minimal_EEPROM_ProgramWord(EEPROM_BASE_ADDR + EEPROM_ADDR_K_D, k_d);
Minimal_EEPROM_Lock();
void save_setpoints()
Minimal_EEPROM_ProgramWord(EEPROM_BASE_ADDR + EEPROM_ADDR_BREWTEMP, setpoint_brew);
Minimal_EEPROM_ProgramWord(EEPROM_BASE_ADDR + EEPROM_ADDR_STEAMTEMP, setpoint_steam);
void restore_settings()
while(Minimal_FLASH_GetStatus()==FLASH_BUSY);
boottobrew = (*(__IO uint32_t*)(EEPROM_BASE_ADDR + EEPROM_ADDR_BOOTTOBREW));
windup_guard = (*(__IO uint32_t*)(EEPROM_BASE_ADDR + EEPROM_ADDR_WINDUP_GUARD));
k_p = (*(__IO uint32_t*)(EEPROM_BASE_ADDR + EEPROM_ADDR_K_P));
k_i = (*(__IO uint32_t*)(EEPROM_BASE_ADDR + EEPROM_ADDR_K_I));
k_d = (*(__IO uint32_t*)(EEPROM_BASE_ADDR + EEPROM_ADDR_K_D));
setpoint_brew = (*(__IO uint32_t*)(EEPROM_BASE_ADDR + EEPROM_ADDR_BREWTEMP));
setpoint_steam = (*(__IO uint32_t*)(EEPROM_BASE_ADDR + EEPROM_ADDR_STEAMTEMP));
int16_t last_temp = 21245;
void machine()
uint8_t last_state = state;
uint8_t temp_changed = temp != last_temp;
last_temp = temp;
uint8_t sw_btn = !GPIO_ReadInputDataBit(SW_BTN);
uint8_t sw_up = !GPIO_ReadInputDataBit(SW_UP);
uint8_t sw_down = !GPIO_ReadInputDataBit(SW_DOWN);
uint8_t sw_left = !GPIO_ReadInputDataBit(SW_LEFT);
uint8_t sw_right = !GPIO_ReadInputDataBit(SW_RIGHT);
switch(state)
// Idle state
case STATE_IDLE:
// Write text to OLED
// [ therm :: idle ]
ssd1306_DrawString("therm :: idle ", 0, 40);
pid_enabled = 0;
char tempstr[6];
ssd1306_DrawString("Temp: ", 3, 40);
ssd1306_DrawString(" ", 3, 72);
ssd1306_DrawString(tempstr, 3, 72);
if(temp_changed) {
ssd1306_drawlogo();
switch(goto_mode) {
case 2:
ssd1306_DrawString("-> brew ", 1, 40);
} break;
case 1:
ssd1306_DrawString("-> setup ", 1, 40);
case 0:
ssd1306_DrawString("-> reset ", 1, 40);
// Button handler
if(SW_BTN_PRESSED) {
@@ -717,193 +689,42 @@ void machine()
// Something is terribly wrong
default:
state = STATE_IDLE;
if(last_state != state) {
// Clear screen on state change
goto_mode = 2;
// Last buttonpress
sw_btn_last = sw_btn;
sw_up_last = sw_up;
sw_down_last = sw_down;
sw_left_last = sw_left;
sw_right_last = sw_right;
// Delay a number of systicks
void delay(__IO uint32_t nTime)
TimingDelay = nTime;
while(TimingDelay != 0);
// ISR-triggered decrement of delay and increment of tickcounter
void TimingDelay_Decrement(void)
if (TimingDelay != 0x00)
TimingDelay--;
ticks++;
void init_spi(void)
SPI_InitTypeDef SPI_InitStructure;
// OLED IC
SPI_Cmd(SPI1, DISABLE);
SPI_InitStructure.SPI_Direction = SPI_Direction_1Line_Tx;
SPI_InitStructure.SPI_Mode = SPI_Mode_Master;
SPI_InitStructure.SPI_DataSize = SPI_DataSize_8b;
SPI_InitStructure.SPI_CPOL = SPI_CPOL_High;
SPI_InitStructure.SPI_CPHA = SPI_CPHA_2Edge;
SPI_InitStructure.SPI_NSS = SPI_NSS_Soft;
SPI_InitStructure.SPI_BaudRatePrescaler = SPI_BaudRatePrescaler_4;
SPI_InitStructure.SPI_FirstBit = SPI_FirstBit_MSB;
SPI_InitStructure.SPI_CRCPolynomial = 7;
SPI_Init(SPI1, &SPI_InitStructure);
SPI_Cmd(SPI1, ENABLE); /* Enable the SPI */
// MAX IC
SPI_Cmd(SPI2, DISABLE);
SPI_InitStructure.SPI_Direction = SPI_Direction_2Lines_FullDuplex;
SPI_InitStructure.SPI_DataSize = SPI_DataSize_16b; // Andysworkshop
SPI_InitStructure.SPI_CPOL = SPI_CPOL_Low; // From andysworkshop
SPI_InitStructure.SPI_CPHA = SPI_CPHA_1Edge; // same
SPI_InitStructure.SPI_BaudRatePrescaler = SPI_BaudRatePrescaler_8;
SPI_Init(SPI2, &SPI_InitStructure);
SPI_Cmd(SPI2, ENABLE); /* Enable the SPI */
#ifndef __MAIN_H
#define __MAIN_H
#include "stm32l1xx.h"
void TimingDelay_Decrement(void);
void Delay(__IO uint32_t nTime);
#endif /* __MAIN_H */
#ifndef SPI_H
#define SPI_H
void init_spi(void);
@@ -269,24 +269,26 @@ void ssd1306_DrawChar(char ascii, unsign
for(i=0;i<5;i++)
WriteData(*srcPointer);
srcPointer++;
WriteData(0x00);
void ssd1306_DrawString(const char *dataPtr, unsigned char row, unsigned char xPos)
char *srcPointer;
srcPointer = (char*)dataPtr;
ssd1306_DrawChar(' ',row,xPos); // NBSP must be written first before the string start
while(1)
ssd1306_DrawChar(*srcPointer,row,xPos);
xPos+=6;
if(*srcPointer == 0) break;
@@ -3,24 +3,26 @@
#define SSD_RESET GPIOB,GPIO_Pin_2
#define SSD_A0 GPIOB,GPIO_Pin_10
#define SSD_CS GPIOB,GPIO_Pin_1
#define SSD_Reset_Low() GPIO_ResetBits(SSD_RESET)
#define SSD_Reset_High() GPIO_SetBits(SSD_RESET)
#define SSD_A0_Low() GPIO_ResetBits(SSD_A0)
#define SSD_A0_High() GPIO_SetBits(SSD_A0)
#define SSD_CS_Low() GPIO_ResetBits(SSD_CS)
#define SSD_CS_High() GPIO_SetBits(SSD_CS)
// Use stdperiph
#define SPI_SendByte(data) SPI_I2S_SendData(SPI1,data)
#define SPI_Wait() while(!(SPI1->SR&SPI_I2S_FLAG_TXE));while(SPI1->SR&SPI_I2S_FLAG_BSY);
void ssd1306_Init(void);
void ssd1306_DrawChar(char ascii, unsigned char row, unsigned char xPos);
void ssd1306_DrawString(const char *dataPtr, unsigned char row, unsigned char xPos);
void ssd1306_drawlogo();
void ssd1306_clearscreen();
Status change: