@@ -302,138 +302,138 @@ 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)
/*
* uint8_t boottobrew = 0;
#define WINDUP_GUARD_GAIN 100
uint16_t windup_guard = WINDUP_GUARD_GAIN;
uint16_t k_p = 1;
uint16_t k_i = 1;
uint16_t k_d = 1;*/
#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
#define EEPROM_BASE_ADDR 0x08080000
#define EEPROM_BYTE_SIZE 0x0FFF
uint32_t EEPROM_ReadWord(uint16_t Addr)
{
uint32 *wAddr;
wAddr=(uint32 *)(EEPROM_BASE_ADDR+Addr);
uint32 res;
res = *wAddr++;
while(Length--){
*Buffer++=*wAddr++;
}
*/
void save_settings()
DATA_EEPROM_Unlock();
// Try programming a word at an address divisible by 4
DATA_EEPROM_ProgramWord(EEPROM_ADDR_BOOTTOBREW, boottobrew);
DATA_EEPROM_ProgramWord(EEPROM_ADDR_WINDUP_GUARD, windup_guard);
DATA_EEPROM_ProgramWord(EEPROM_ADDR_K_P, k_p);
DATA_EEPROM_ProgramWord(EEPROM_ADDR_K_I, k_i);
DATA_EEPROM_ProgramWord(EEPROM_ADDR_K_D, k_d);
DATA_EEPROM_ProgramWord(EEPROM_BASE_ADDR + EEPROM_ADDR_BOOTTOBREW, boottobrew);
DATA_EEPROM_ProgramWord(EEPROM_BASE_ADDR + EEPROM_ADDR_WINDUP_GUARD, windup_guard);
DATA_EEPROM_ProgramWord(EEPROM_BASE_ADDR + EEPROM_ADDR_K_P, k_p);
DATA_EEPROM_ProgramWord(EEPROM_BASE_ADDR + EEPROM_ADDR_K_I, k_i);
DATA_EEPROM_ProgramWord(EEPROM_BASE_ADDR + EEPROM_ADDR_K_D, k_d);
DATA_EEPROM_Lock();
void save_setpoints()
DATA_EEPROM_ProgramWord(EEPROM_ADDR_BREWTEMP, setpoint_brew);
DATA_EEPROM_ProgramWord(EEPROM_ADDR_STEAMTEMP, setpoint_steam);
DATA_EEPROM_ProgramWord(EEPROM_BASE_ADDR + EEPROM_ADDR_BREWTEMP, setpoint_brew);
DATA_EEPROM_ProgramWord(EEPROM_BASE_ADDR + EEPROM_ADDR_STEAMTEMP, setpoint_steam);
// TODO: Save/restore temperature setpoint settings
void restore_settings()
while(FLASH_GetStatus()==FLASH_BUSY);
boottobrew = (*(__IO uint32_t*)EEPROM_ADDR_BOOTTOBREW);
boottobrew = (*(__IO uint32_t*)EEPROM_BASE_ADDR + EEPROM_ADDR_BOOTTOBREW);
windup_guard = (*(__IO uint32_t*)EEPROM_ADDR_WINDUP_GUARD);
windup_guard = (*(__IO uint32_t*)EEPROM_BASE_ADDR + EEPROM_ADDR_WINDUP_GUARD);
k_p = (*(__IO uint32_t*)EEPROM_ADDR_K_P);
k_p = (*(__IO uint32_t*)EEPROM_BASE_ADDR + EEPROM_ADDR_K_P);
k_i = (*(__IO uint32_t*)EEPROM_ADDR_K_I);
k_i = (*(__IO uint32_t*)EEPROM_BASE_ADDR + EEPROM_ADDR_K_I);
k_d = (*(__IO uint32_t*)EEPROM_ADDR_K_D);
k_d = (*(__IO uint32_t*)EEPROM_BASE_ADDR + EEPROM_ADDR_K_D);
setpoint_brew = (*(__IO uint32_t*)EEPROM_ADDR_BREWTEMP);
setpoint_brew = (*(__IO uint32_t*)EEPROM_BASE_ADDR + EEPROM_ADDR_BREWTEMP);
setpoint_steam = (*(__IO uint32_t*)EEPROM_ADDR_STEAMTEMP);
setpoint_steam = (*(__IO uint32_t*)EEPROM_BASE_ADDR + EEPROM_ADDR_STEAMTEMP);
void user_input(uint16_t* to_modify)
if(CHANGE_ELAPSED) {
// TODO: Make function that takes reference to a var and increase/decreases it based on buttonpress
if(!GPIO_ReadInputDataBit(SW_UP) ) {
CHANGE_RESET;
(*to_modify)++;
else if(!GPIO_ReadInputDataBit(SW_DOWN) && (*to_modify) > 0) {
(*to_modify)--;
void machine()
uint8_t last_state = state;
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];
itoa_fp(temp, temp_frac, tempstr);
ssd1306_DrawString("Temp: ", 3, 40);
ssd1306_DrawString(" ", 3, 72);
Status change: