Changeset - 0ee0ed9a3b7d
Parent rev.
Child rev.
[Not reviewed]
default
0 3 0
Ethan Zonca - 10 years ago 2014-09-25 21:34:24
ez@ethanzonca.com
Added clock startup failure check
3 files changed with 14 insertions and 7 deletions:
main.c
9
7
system_stm32l1xx.c
3
system_stm32l1xx.h
2
0 comments (0 inline, 0 general)
main.c
➞
Show inline comments
 
#include "main.h"
 
#include "stm32l100c_discovery.h"
 
#include "ssd1306.h"
 
#include "config.h"
 
#include "eeprom_min.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
 
// TODO: Eliminate screen buffer since we aren't using it...
 
 
// 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 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?
 
volatile uint32_t ticks = 0;
 
 
// Increase on each press, and increase at a fast rate after duration elapsed of continuously holding down... somehow...
 
uint32_t change_time_reset = 0;
 
#define CHANGE_PERIOD_MS 100
 
#define CHANGE_ELAPSED (ticks - change_time_reset) > CHANGE_PERIOD_MS
 
#define CHANGE_RESET change_time_reset = ticks
 
 
 
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
 
@@ -83,51 +81,60 @@ int main(void)
 
    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();
 
 
    // Check for problems on startup
 
    if(clock_fail) {
 
        ssd1306_DrawString("ERROR: Check Xtal", 3, 0);
 
        delay(2000);
 
    }
 
 
    // Startup screen
 
    ssd1306_DrawString("therm v0.1", 1, 40);
 
    ssd1306_DrawString("protofusion.org/therm", 3, 0);
 
 
 
 
    delay(1500);
 
    ssd1306_clearscreen();
 
 
    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();
 
    }
 
}
 
 
// Read temperature and update global temp vars
 
int16_t temp = 0;
 
uint8_t temp_frac = 0;
 
 
@@ -349,61 +356,57 @@ void restore_settings()
 
    windup_guard = (*(__IO uint32_t*)(EEPROM_BASE_ADDR + EEPROM_ADDR_WINDUP_GUARD));
 
 
    while(Minimal_FLASH_GetStatus()==FLASH_BUSY);
 
    k_p = (*(__IO uint32_t*)(EEPROM_BASE_ADDR + EEPROM_ADDR_K_P));
 
 
    while(Minimal_FLASH_GetStatus()==FLASH_BUSY);
 
    k_i = (*(__IO uint32_t*)(EEPROM_BASE_ADDR + EEPROM_ADDR_K_I));
 
 
    while(Minimal_FLASH_GetStatus()==FLASH_BUSY);
 
    k_d = (*(__IO uint32_t*)(EEPROM_BASE_ADDR + EEPROM_ADDR_K_D));
 
 
    while(Minimal_FLASH_GetStatus()==FLASH_BUSY);
 
    setpoint_brew = (*(__IO uint32_t*)(EEPROM_BASE_ADDR + EEPROM_ADDR_BREWTEMP));
 
 
    while(Minimal_FLASH_GetStatus()==FLASH_BUSY);
 
    setpoint_steam = (*(__IO uint32_t*)(EEPROM_BASE_ADDR + EEPROM_ADDR_STEAMTEMP));
 
 
    Minimal_EEPROM_Lock();
 
}
 
 
 
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) {
 
            CHANGE_RESET;
 
            (*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);
 
@@ -734,49 +737,48 @@ void machine()
 
    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_Mode = SPI_Mode_Master;
 
    SPI_InitStructure.SPI_DataSize = SPI_DataSize_16b; // Andysworkshop
system_stm32l1xx.c
➞
Show inline comments
 
@@ -274,48 +274,50 @@ void SystemCoreClockUpdate (void)
 
        /* HSE selected as PLL clock entry */
 
        SystemCoreClock = (((HSE_VALUE) * pllmul) / plldiv);
 
      }
 
      break;
 
    default: /* MSI used as system clock */
 
      msirange = (RCC->ICSCR & RCC_ICSCR_MSIRANGE) >> 13;
 
      SystemCoreClock = (32768 * (1 << (msirange + 1)));
 
      break;
 
  }
 
  /* Compute HCLK clock frequency --------------------------------------------*/
 
  /* Get HCLK prescaler */
 
  tmp = AHBPrescTable[((RCC->CFGR & RCC_CFGR_HPRE) >> 4)];
 
  /* HCLK clock frequency */
 
  SystemCoreClock >>= tmp;
 
}
 

			




	
	
	
		
 
/**

			




	
	
	
		
 
  * @brief  Configures the System clock frequency, AHB/APBx prescalers and Flash 

			




	
	
	
		
 
  *         settings.

			




	
	
	
		
 
  * @note   This function should be called only once the RCC clock configuration  

			




	
	
	
		
 
  *         is reset to the default reset state (done in SystemInit() function).             

			




	
	
	
		
 
  * @param  None

			




	
	
	
		
 
  * @retval None

			




	
	
	
		
 
  */

			




	
	
	
		
 
uint8_t clock_fail = 0;

			




	
	
	
		
 

			




	
	
	
		
 
static void SetSysClock(void)

			




	
	
	
		
 
{

			




	
	
	
		
 
  __IO uint32_t StartUpCounter = 0, HSEStatus = 0;

			




	
	
	
		
 
  

			




	
	
	
		
 
  /* SYSCLK, HCLK, PCLK2 and PCLK1 configuration ---------------------------*/

			




	
	
	
		
 
  /* Enable HSE */

			




	
	
	
		
 
  RCC->CR |= ((uint32_t)RCC_CR_HSEON);

			




	
	
	
		
 
 

			




	
	
	
		
 
  /* Wait till HSE is ready and if Time out is reached exit */

			




	
	
	
		
 
  do

			




	
	
	
		
 
  {

			




	
	
	
		
 
    HSEStatus = RCC->CR & RCC_CR_HSERDY;

			




	
	
	
		
 
    StartUpCounter++;

			




	
	
	
		
 
  } while((HSEStatus == 0) && (StartUpCounter != HSE_STARTUP_TIMEOUT));

			




	
	
	
		
 

			




	
	
	
		
 
  if ((RCC->CR & RCC_CR_HSERDY) != RESET)

			




	
	
	
		
 
  {

			




	
	
	
		
 
    HSEStatus = (uint32_t)0x01;

			




	
	
	
		
 
  }

			




	
	
	
		
 
  else

			




	
	
	
		
 
  {

			




	
	
	
		
 
    HSEStatus = (uint32_t)0x00;

			




	
	
	
		
 
  }

			




	
	
	
		
 
  

			




	
	
		
 
@@ -353,44 +355,45 @@ static void SetSysClock(void)

			




	
	
	
		
 
    /*  PLL configuration */

			




	
	
	
		
 
    RCC->CFGR &= (uint32_t)((uint32_t)~(RCC_CFGR_PLLSRC | RCC_CFGR_PLLMUL |

			




	
	
	
		
 
                                        RCC_CFGR_PLLDIV));

			




	
	
	
		
 
    RCC->CFGR |= (uint32_t)(RCC_CFGR_PLLSRC_HSE | RCC_CFGR_PLLMUL24 | RCC_CFGR_PLLDIV3);

			




	
	
	
		
 

			




	
	
	
		
 
    /* Enable PLL */

			




	
	
	
		
 
    RCC->CR |= RCC_CR_PLLON;

			




	
	
	
		
 

			




	
	
	
		
 
    /* Wait till PLL is ready */

			




	
	
	
		
 
    while((RCC->CR & RCC_CR_PLLRDY) == 0)

			




	
	
	
		
 
    {

			




	
	
	
		
 
    }

			




	
	
	
		
 
        

			




	
	
	
		
 
    /* Select PLL as system clock source */

			




	
	
	
		
 
    RCC->CFGR &= (uint32_t)((uint32_t)~(RCC_CFGR_SW));

			




	
	
	
		
 
    RCC->CFGR |= (uint32_t)RCC_CFGR_SW_PLL;

			




	
	
	
		
 

			




	
	
	
		
 
    /* Wait till PLL is used as system clock source */

			




	
	
	
		
 
    while ((RCC->CFGR & (uint32_t)RCC_CFGR_SWS) != (uint32_t)RCC_CFGR_SWS_PLL)

			




	
	
	
		
 
    {

			




	
	
	
		
 
    }

			




	
	
	
		
 
  }

			




	
	
	
		
 
  else

			




	
	
	
		
 
  {

			




	
	
	
		
 
	clock_fail = 1;

			




	
	
	
		
 
//	while(1);

			




	
	
	
		
 
    /* If HSE fails to start-up, the application will have wrong clock

			




	
	
	
		
 
       configuration. User can add here some code to deal with this error */

			




	
	
	
		
 
  }

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
/**

			




	
	
	
		
 
  * @}

			




	
	
	
		
 
  */

			




	
	
	
		
 

			




	
	
	
		
 
/**

			




	
	
	
		
 
  * @}

			




	
	
	
		
 
  */

			




	
	
	
		
 

			




	
	
	
		
 
/**

			




	
	
	
		
 
  * @}

			




	
	
	
		
 
  */

			




	
	
	
		
 

			




	
	
	
		
 
/******************* (C) COPYRIGHT 2013 STMicroelectronics *****END OF FILE****/

			




	
	
	
		
 

			




        

    


    
    

    

        

                

                    system_stm32l1xx.h
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -37,48 +37,50 @@

			




	
	
	
		
 
  * @brief Define to prevent recursive inclusion

			




	
	
	
		
 
  */

			




	
	
	
		
 
#ifndef __SYSTEM_STM32L1XX_H

			




	
	
	
		
 
#define __SYSTEM_STM32L1XX_H

			




	
	
	
		
 

			




	
	
	
		
 
#ifdef __cplusplus

			




	
	
	
		
 
 extern "C" {

			




	
	
	
		
 
#endif 

			




	
	
	
		
 

			




	
	
	
		
 
/** @addtogroup STM32L1xx_System_Includes

			




	
	
	
		
 
  * @{

			




	
	
	
		
 
  */

			




	
	
	
		
 

			




	
	
	
		
 
/**

			




	
	
	
		
 
  * @}

			




	
	
	
		
 
  */

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
/** @addtogroup STM32L1xx_System_Exported_types

			




	
	
	
		
 
  * @{

			




	
	
	
		
 
  */

			




	
	
	
		
 

			




	
	
	
		
 
extern uint32_t SystemCoreClock;          /*!< System Clock Frequency (Core Clock) */

			




	
	
	
		
 

			




	
	
	
		
 
extern uint8_t clock_fail;

			




	
	
	
		
 

			




	
	
	
		
 
/**

			




	
	
	
		
 
  * @}

			




	
	
	
		
 
  */

			




	
	
	
		
 

			




	
	
	
		
 
/** @addtogroup STM32L1xx_System_Exported_Constants

			




	
	
	
		
 
  * @{

			




	
	
	
		
 
  */

			




	
	
	
		
 

			




	
	
	
		
 
/**

			




	
	
	
		
 
  * @}

			




	
	
	
		
 
  */

			




	
	
	
		
 

			




	
	
	
		
 
/** @addtogroup STM32L1xx_System_Exported_Macros

			




	
	
	
		
 
  * @{

			




	
	
	
		
 
  */

			




	
	
	
		
 

			




	
	
	
		
 
/**

			




	
	
	
		
 
  * @}

			




	
	
	
		
 
  */

			




	
	
	
		
 

			




	
	
	
		
 
/** @addtogroup STM32L1xx_System_Exported_Functions

			




	
	
	
		
 
  * @{

			




	
	
	
		
 
  */

			




	
	
	
		
 
  

			




        

    



    


    



    



      

      





    
    0 comments (0 inline, 0 general)
    





    


  

  







  


    




    








    
        Server instance: zserverv-1627831
    
    
        This site is powered by
            Kallithea,
        which is
        © 2010–2021 by various authors & licensed under GPLv3.
            – Support