therm Changeset - 30d4d968a3a1 · protofusion repositories

Changeset - 30d4d968a3a1

Parent rev.

Child rev.

[Not reviewed]

cortex-f0

1 4 0

Ethan Zonca - 9 years ago 2015-09-05 23:20:58
ez@ethanzonca.com

Cleanup: remove CAN and multisetpoint

5 files changed with 10 insertions and 173 deletions:

Makefile

display.c

flash.c

stm32f0xx_hal_conf.h

stm32f0xx_hal_msp.c

117

0 comments (0 inline, 0 general)

Makefile

➞

Show inline comments

 # STM32F0xx Makefile
 # #####################################
+#
 # Part of the uCtools project
 # uctools.github.com
+#
 #######################################
 # user configuration:
 #######################################
 # SOURCES: list of sources in the user application
-SOURCES = main.c usbd_conf.c usbd_cdc_if.c usb_device.c usbd_desc.c stm32f0xx_hal_msp.c stm32f0xx_it.c system_stm32f0xx.c gpio.c spi.c ssd1306.c stringhelpers.c display.c syslib.c storage.c flash.c max31855.c max31865.c
 SOURCES = main.c usbd_conf.c usbd_cdc_if.c usb_device.c usbd_desc.c stm32f0xx_it.c system_stm32f0xx.c gpio.c spi.c ssd1306.c stringhelpers.c display.c syslib.c storage.c flash.c max31855.c max31865.c
 # TARGET: name of the user application
 TARGET = main
 # BUILD_DIR: directory to place output files in
 BUILD_DIR = build
 # LD_SCRIPT: location of the linker script
 LD_SCRIPT = stm32f042c6_flash.ld
 # USER_DEFS user defined macros
 USER_DEFS = -D HSI48_VALUE=48000000 -D HSE_VALUE=16000000
 # USER_INCLUDES: user defined includes
 USER_INCLUDES =
 # USB_INCLUDES: includes for the usb library
 USB_INCLUDES = -Imiddlewares/ST/STM32_USB_Device_Library/Core/Inc
 USB_INCLUDES += -Imiddlewares/ST/STM32_USB_Device_Library/Class/CDC/Inc
 # USER_CFLAGS: user C flags (enable warnings, enable debug info)
 USER_CFLAGS = -Wall -g -ffunction-sections -fdata-sections -Os
+USER_CFLAGS = -Wall -g -ffunction-sections -fno-exceptions -fdata-sections -Os
 # USER_LDFLAGS:  user LD flags
 USER_LDFLAGS = -fno-exceptions -ffunction-sections -fdata-sections -Wl,--gc-sections
+USER_LDFLAGS = -fno-exceptions -ffunction-sections -fno-exceptions -fdata-sections -Wl,--gc-sections
 # TARGET_DEVICE: device to compile for
 TARGET_DEVICE = STM32F042x6
 #######################################
 # end of user configuration
 #######################################
+#
 #######################################
 # binaries
 #######################################
 CC = arm-none-eabi-gcc

display.c

➞

Show inline comments

@@ @@ -14,36 +14,24 @@ 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)
 ///////////////////////////////////////////////////////////////////////////////////////
 /// freaking multiple setpoint support ///
 uint8_t step_duration[10] = {0,0,0,0,0,0,0,0,0,0};
 int16_t step_setpoint[10] = {0,0,0,0,0,0,0,0,0,0};
 uint8_t final_setpoint = 0;
 // Multiple screens to set setpoint and duration on each screen
 // press center to go to the next one, and press left or right or something to confirm
 // When executing, complete on time AND(?) temperature. Maybe allow switching to OR via settings
 ////////////////////////////////////////////////////////////////////////////////////////////////
 uint8_t trigger_drawsetpoint = 1;
 int16_t last_temp = 21245;
 void display_process(therm_settings_t* set, therm_status_t* status)
+{
     uint8_t last_state = status->state;
     uint8_t temp_changed = status->temp != last_temp;
     last_temp = status->temp;
@@ @@ -214,63 +202,24 @@ void display_process(therm_settings_t* s @@
             if(SW_BTN_PRESSED) {
                 status->state = STATE_SETWINDUP;
+            }
             else {
                 user_input(&set->k_d);
+            }
             // Event Handler
             // N/A
         } break;
         case STATE_SETSTEPS:
+        {
             // Write text to OLED
             // [ step #1:: Duration: ### ]
             // [           Setpoint: ### ]
             char tempstr[6];
             itoa(final_setpoint, tempstr, 10);
             ssd1306_DrawString("Step #", 0, 0);
             ssd1306_DrawString(tempstr, 0, 40);
             ssd1306_DrawString("Duration: ", 0, 5);
             itoa(step_duration[final_setpoint], tempstr, 10);
             ssd1306_DrawString(tempstr, 0, 70);
             ssd1306_DrawString("Setpoint: ", 0, 0);
             itoa(step_setpoint[final_setpoint], tempstr, 10);
             ssd1306_DrawString(tempstr, 0, 70);
             ssd1306_DrawString("Press to accept", 3, 40);
             // Button handler - TODO: increment max_step if pressed
             // return and go to next state otherwise
             if(SW_BTN_PRESSED) {
                 status->state = STATE_SETSTEPS;
                 final_setpoint++;
+            }
         //    else if(SW_LEFT_PRESSED) {
         //        state++; // go to next state or something
         //    }
             else {
                 user_input(&set->k_p);
+            }
             // Event Handler
             // N/A
         } break;
         case STATE_SETWINDUP:
+        {
             // Write text to OLED
             // [ therm :: set windup ]
             // [ g = 12         ]
             ssd1306_DrawString("Windup Guard", 0, 40);
             ssd1306_drawlogo();
             char tempstr[6];
             itoa(set->windup_guard, tempstr, 10);
             ssd1306_DrawString("G=", 1, 45);
             ssd1306_DrawString("    ", 1, 57);

flash.c

➞

Show inline comments

 #include "stm32f0xx_hal.h"
 #include "ssd1306.h"
 #include "stm32f0xx_hal_flash.h"
 #include "flash.h"
 void flash_init(therm_settings_t* tosave)
+{
     ssd1306_clearscreen();
     uint16_t size = sizeof(therm_settings_t)-1;
     uint32_t flash_adr = END_ADDR - size;
     flash_adr -= 2;
     uint8_t* flash_ptr = (uint8_t *)flash_adr;
     // Check if flash is blank
     uint16_t i = 0;
     uint16_t count = 0;
     char tempstr[10];
     itoa(flash_adr, tempstr, 10);
     ssd1306_DrawString(tempstr, 1, 0);
     uint16_t test;
     for(i=0;i<size;i++)
+    {
         test = *flash_ptr;
         if(test==0xFF) count++;
+    }
     ssd1306_DrawString("END LOOP ", 0, 0);
     // If blank, do nothing and just use values from RAM
     count = size + 1;
     // If not blank, check the checksums
     if(count != size)
+    {
         ssd1306_DrawString("FLASH NOT BLANK", 1, 0);
         // Calculate Checksums
     uint8_t cksum0=0,cksum1=0;
     uint8_t rdSum0=0,rdSum1=0;
         flash_adr = END_ADDR - size;
         flash_ptr = (uint8_t *)flash_adr;
         for(i=1; i < size; i++)
+        {
             cksum0 += *flash_ptr++;
             cksum1 += cksum0;
+        }
         // Read flash checksums
         flash_adr -= 2;
         flash_ptr = (uint8_t *)flash_adr;
         rdSum0 = *flash_ptr++;
@@ @@ -61,36 +64,38 @@ void flash_init(therm_settings_t* tosave @@
+	}
+    }
     else {
         ssd1306_DrawString("FLASH BLANK", 1, 0);
+    }
+}
 void flash_save(therm_settings_t* tosave)
+{
 	    ssd1306_DrawString("BEGIN SAVE", 2, 0);
     ssd1306_clearscreen();
     ssd1306_DrawString("BEGIN SAVE", 0, 0);
             HAL_Delay(1500);
         flash_erase(tosave);
         flash_write(tosave);
         flash_checksum(tosave);
 	    ssd1306_DrawString("END SAVE", 2, 0);
             HAL_Delay(1500);
+}
 void flash_read(therm_settings_t *tosave)
+{
     ssd1306_clearscreen();
     ssd1306_DrawString("READING SAVE", 1, 0);
     char tempstr[10];
     itoa(sizeof(therm_settings_t), tempstr, 10);
     ssd1306_DrawString(tempstr, 2, 0);
     uint16_t size = sizeof(therm_settings_t)-1; // in Bytes
     uint32_t flash_adr = END_ADDR - size;
     uint8_t *flash_ptr = (uint8_t *)flash_adr;
     uint8_t *struct_ptr = (uint8_t*)tosave;
     uint16_t i;
     for(i=0;i<size;i++)

stm32f0xx_hal_conf.h

➞

Show inline comments

@@ @@ -40,25 +40,25 @@ @@
  extern "C" {
 #endif
 /* Exported types ------------------------------------------------------------*/
 /* Exported constants --------------------------------------------------------*/
 /* ########################## Module Selection ############################## */
 /**
   * @brief This is the list of modules to be used in the HAL driver
   */
 #define HAL_MODULE_ENABLED
 //#define HAL_ADC_MODULE_ENABLED
 #define HAL_CAN_MODULE_ENABLED
+//#define HAL_CAN_MODULE_ENABLED
 //#define HAL_CEC_MODULE_ENABLED
 //#define HAL_COMP_MODULE_ENABLED
 //#define HAL_CRC_MODULE_ENABLED
 //#define HAL_CRYP_MODULE_ENABLED
 //#define HAL_TSC_MODULE_ENABLED
 //#define HAL_DAC_MODULE_ENABLED
 //#define HAL_I2C_MODULE_ENABLED
 //#define HAL_I2S_MODULE_ENABLED
 //#define HAL_IWDG_MODULE_ENABLED
 //#define HAL_LCD_MODULE_ENABLED
 //#define HAL_LPTIM_MODULE_ENABLED
 //#define HAL_RNG_MODULE_ENABLED

stm32f0xx_hal_msp.c

➞

Show inline comments

deleted file

0 comments (0 inline, 0 general)