@@ -36,24 +36,25 @@ enum state {
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();
@@ -84,28 +85,28 @@ int main(void)
// Init SPI busses
init_spi();
// Init OLED over SPI
ssd1306_Init();
ssd1306_clearscreen();
// Startup screen
ssd1306_DrawString("therm v0.1", 1, 40);
ssd1306_DrawString("protofusion.org/therm", 3, 0);
delay(1500);
restore_settings();
if(boottobrew)
state = STATE_PREHEAT_BREW; // Go to brew instead of idle if configured thusly
GPIO_ResetBits(LED_STAT);
// Main loop
while(1)
{
// Process sensor inputs
process();
// Run state machine
machine();
}
@@ -268,25 +269,24 @@ void process()
void draw_setpoint() {
char tempstr[3];
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)
@@ -311,49 +311,44 @@ 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_Lock();
// TODO: Save/restore temperature setpoint settings
void restore_settings()
while(FLASH_GetStatus()==FLASH_BUSY);
boottobrew = (*(__IO uint32_t*)EEPROM_ADDR_BOOTTOBREW);
windup_guard = (*(__IO uint32_t*)EEPROM_ADDR_WINDUP_GUARD);
k_p = (*(__IO uint32_t*)EEPROM_ADDR_K_P);
k_i = (*(__IO uint32_t*)EEPROM_ADDR_K_I);
k_d = (*(__IO uint32_t*)EEPROM_ADDR_K_D);
char tempstr[6];
itoa(windup_guard, tempstr);
ssd1306_DrawString("Read: ", 3, 40);
ssd1306_DrawString(" ", 3, 72);
ssd1306_DrawString(tempstr, 3, 72);
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);
Status change: