therm Changeset - 109bc69daf49 · protofusion repositories

Changeset - 109bc69daf49

Parent rev.

Child rev.

[Not reviewed]

default

0 2 2

Ethan Zonca - 11 years ago 2014-09-25 21:28:44
ez@ethanzonca.com

Moved eeprom_min to lib

4 files changed with 103 insertions and 101 deletions:

Makefile

eeprom_min.c

eeprom_min.h

main.c

101

0 comments (0 inline, 0 general)

Makefile

➞

Show inline comments

@@ @@ -30,24 +30,25 @@ vpath %.c $(DISCOVERY) $(STD_PERIPH)/src @@
           $(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+=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

eeprom_min.c

➞

Show inline comments

@@ new file 100644 @@
 #include "stm32l100c_discovery.h"
 void Minimal_EEPROM_Unlock(void)
+{
   if((FLASH->PECR & FLASH_PECR_PELOCK) != RESET)
+  {
     /* Unlocking the Data memory and FLASH_PECR register access*/
     FLASH->PEKEYR = FLASH_PEKEY1;
     FLASH->PEKEYR = FLASH_PEKEY2;
+  }
+}
 void Minimal_EEPROM_Lock(void)
+{
   /* Set the PELOCK Bit to lock the data memory and FLASH_PECR register access */
   FLASH->PECR |= FLASH_PECR_PELOCK;
+}
 FLASH_Status Minimal_FLASH_GetStatus(void)
+{
   FLASH_Status FLASHstatus = FLASH_COMPLETE;
   if((FLASH->SR & FLASH_FLAG_BSY) == FLASH_FLAG_BSY)
+  {
     FLASHstatus = FLASH_BUSY;
+  }
   else
+  {
     if((FLASH->SR & (uint32_t)FLASH_FLAG_WRPERR)!= (uint32_t)0x00)
+    {
       FLASHstatus = FLASH_ERROR_WRP;
+    }
     else
+    {
       if((FLASH->SR & (uint32_t)0x1E00) != (uint32_t)0x00)
+      {
         FLASHstatus = FLASH_ERROR_PROGRAM;
+      }
       else
+      {
         FLASHstatus = FLASH_COMPLETE;
+      }
+    }
+  }
   /* Return the FLASH Status */
   return FLASHstatus;
+}
 FLASH_Status Minimal_FLASH_WaitForLastOperation(uint32_t Timeout)
+{
   __IO FLASH_Status status = FLASH_COMPLETE;
   /* Check for the FLASH Status */
   status = Minimal_FLASH_GetStatus();
   /* Wait for a FLASH operation to complete or a TIMEOUT to occur */
   while((status == FLASH_BUSY) && (Timeout != 0x00))
+  {
     status = Minimal_FLASH_GetStatus();
     Timeout--;
+  }
   if(Timeout == 0x00 )
+  {
     status = FLASH_TIMEOUT;
+  }
   /* Return the operation status */
   return status;
+}
 void Minimal_EEPROM_ProgramWord(uint32_t Address, uint32_t Data)
+{
   // Wait for last operation to be completed
   FLASH_Status status = FLASH_COMPLETE;
   status = Minimal_FLASH_WaitForLastOperation(FLASH_ER_PRG_TIMEOUT);
   if(status == FLASH_COMPLETE)
+  {
     *(__IO uint32_t *)Address = Data;
     // Wait for last operation to be completed
     status = Minimal_FLASH_WaitForLastOperation(FLASH_ER_PRG_TIMEOUT);
+  }
   // Return the Write Status
   return status;
+}

eeprom_min.h

➞

Show inline comments

@@ new file 100644 @@
 #ifndef EEPROM_MIN_H
 #define EEPROM_MIN_H
 #define EEPROM_BASE_ADDR    0x08080000
 #define EEPROM_BYTE_SIZE    0x0FFF
 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);
 #endif

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
@@ @@ -299,155 +300,54 @@ uint8_t goto_mode = 2; @@
 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 	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
 void Minimal_EEPROM_Unlock(void)
+{
   if((FLASH->PECR & FLASH_PECR_PELOCK) != RESET)
+  {
     /* Unlocking the Data memory and FLASH_PECR register access*/
     FLASH->PEKEYR = FLASH_PEKEY1;
     FLASH->PEKEYR = FLASH_PEKEY2;
+  }
+}
 void Minimal_EEPROM_Lock(void)
+{
   /* Set the PELOCK Bit to lock the data memory and FLASH_PECR register access */
   FLASH->PECR |= FLASH_PECR_PELOCK;
+}
 FLASH_Status Minimal_FLASH_GetStatus(void)
+{
   FLASH_Status FLASHstatus = FLASH_COMPLETE;
   if((FLASH->SR & FLASH_FLAG_BSY) == FLASH_FLAG_BSY)
+  {
     FLASHstatus = FLASH_BUSY;
+  }
   else
+  {
     if((FLASH->SR & (uint32_t)FLASH_FLAG_WRPERR)!= (uint32_t)0x00)
+    {
       FLASHstatus = FLASH_ERROR_WRP;
+    }
     else
+    {
       if((FLASH->SR & (uint32_t)0x1E00) != (uint32_t)0x00)
+      {
         FLASHstatus = FLASH_ERROR_PROGRAM;
+      }
       else
+      {
         FLASHstatus = FLASH_COMPLETE;
+      }
+    }
+  }
   /* Return the FLASH Status */
   return FLASHstatus;
+}
 FLASH_Status Minimal_FLASH_WaitForLastOperation(uint32_t Timeout)
+{
   __IO FLASH_Status status = FLASH_COMPLETE;
   /* Check for the FLASH Status */
   status = Minimal_FLASH_GetStatus();
   /* Wait for a FLASH operation to complete or a TIMEOUT to occur */
   while((status == FLASH_BUSY) && (Timeout != 0x00))
+  {
     status = Minimal_FLASH_GetStatus();
     Timeout--;
+  }
   if(Timeout == 0x00 )
+  {
     status = FLASH_TIMEOUT;
+  }
   /* Return the operation status */
   return status;
+}
 void Minimal_EEPROM_ProgramWord(uint32_t Address, uint32_t Data)
+{
   // Wait for last operation to be completed
   FLASH_Status status = FLASH_COMPLETE;
   status = Minimal_FLASH_WaitForLastOperation(FLASH_ER_PRG_TIMEOUT);
   if(status == FLASH_COMPLETE)
+  {
     *(__IO uint32_t *)Address = Data;
     // Wait for last operation to be completed
     status = Minimal_FLASH_WaitForLastOperation(FLASH_ER_PRG_TIMEOUT);
+  }
   // Return the Write Status
   return status;
+}
 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_Unlock();
     Minimal_EEPROM_ProgramWord(EEPROM_BASE_ADDR + EEPROM_ADDR_BREWTEMP, setpoint_brew);
     Minimal_EEPROM_ProgramWord(EEPROM_BASE_ADDR + EEPROM_ADDR_STEAMTEMP, setpoint_steam);
     Minimal_EEPROM_Lock();
+}
 // TODO: Save/restore temperature setpoint settings
 void restore_settings()
+{
     Minimal_EEPROM_Unlock();
     while(Minimal_FLASH_GetStatus()==FLASH_BUSY);
     boottobrew = (*(__IO uint32_t*)(EEPROM_BASE_ADDR + EEPROM_ADDR_BOOTTOBREW));
     while(Minimal_FLASH_GetStatus()==FLASH_BUSY);
     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));

0 comments (0 inline, 0 general)