Changeset - bdb054218ca3
[Not reviewed]
default
0 1 0
Ethan Zonca - 10 years ago 2014-09-03 22:37:07
ez@ethanzonca.com
Remove debug output and enable boot to brew functionality
1 file changed with 5 insertions and 10 deletions:
main.c
5
10
0 comments (0 inline, 0 general)
main.c
Show inline comments
 
@@ -24,100 +24,101 @@ 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 k_p = 1;
 
uint16_t k_i = 1;
 
uint16_t k_d = 1;
 
 
// 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();
 
 
int main(void)
 
{
 
 
    // Init clocks
 
    SystemInit();
 
 
    // Init GPIO
 
    init_gpio();
 
 
    // Init USB
 
    //Set_USBClock();
 
    //USB_Interrupts_Config();
 
    //USB_Init();
 
 
    // 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();
 
 
    // Startup screen 
 
    ssd1306_DrawString("therm v0.1", 1, 40);
 
    ssd1306_DrawString("protofusion.org/therm", 3, 0);
 
    delay(1500);
 
    ssd1306_clearscreen();
 
    
 
    restore_settings();
 
    delay(1500);
 
    delay(1500);
 
    ssd1306_clearscreen();
 
    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(); 
 
    }
 
}
 
 
// Read temperature and update global temp vars
 
int16_t temp = 0;
 
uint8_t temp_frac = 0;
 
 
void update_temp() {
 
    // Assert CS
 
    GPIO_ResetBits(MAX_CS);
 
    delay(1);
 
 
    // This may not clock at all... might need to send 16 bits first
 
@@ -256,116 +257,110 @@ void process()
 
 
            GPIO_SetBits(LED_STAT);
 
            last_ssr_on = ticks;
 
        }
 
    }
 
    
 
    // Kill SSR after elapsed period less than SSR_PERIOD 
 
    if(ticks - last_ssr_on > ssr_output)
 
    {
 
        GPIO_ResetBits(LED_STAT);
 
    }
 
}
 
 
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 state = STATE_IDLE;
 
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)
 
 
/*
 
 * 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 	0x0808001C
 
#define EEPROM_ADDR_BOOTTOBREW		0x08080020
 
#define EEPROM_ADDR_K_P			0x8080024
 
#define EEPROM_ADDR_K_I			0x8080028
 
#define EEPROM_ADDR_K_D			0x808002C
 
 
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()
 
{
 
    DATA_EEPROM_Unlock();
 
    while(FLASH_GetStatus()==FLASH_BUSY);
 
    boottobrew = (*(__IO uint32_t*)EEPROM_ADDR_BOOTTOBREW);
 
    
 
    while(FLASH_GetStatus()==FLASH_BUSY);
 
    windup_guard = (*(__IO uint32_t*)EEPROM_ADDR_WINDUP_GUARD);
 
    
 
    while(FLASH_GetStatus()==FLASH_BUSY);
 
    k_p = (*(__IO uint32_t*)EEPROM_ADDR_K_P);
 
 
    while(FLASH_GetStatus()==FLASH_BUSY);
 
    k_i = (*(__IO uint32_t*)EEPROM_ADDR_K_I);
 
 
    while(FLASH_GetStatus()==FLASH_BUSY);
 
    k_d = (*(__IO uint32_t*)EEPROM_ADDR_K_D);
 
    
 
    DATA_EEPROM_Lock();
 
 
    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);
 
 
    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);
0 comments (0 inline, 0 general)