Patched using inertial monitor project

zhusstt · May 20, 2013 · d9e3563 · d9e3563
1 parent b94d863
commit d9e3563
Show file tree

Hide file tree

Showing 80 changed files with 5,106 additions and 2,399 deletions.
diff --git a/Sensors/ppg_new.o b/Sensors/ppg_new.o
diff --git a/Sensors/pressure.o b/Sensors/pressure.o
diff --git a/Sensors/temperature.o b/Sensors/temperature.o
diff --git a/Util/USB/hw_config.o b/Util/USB/hw_config.o
diff --git a/Util/USB/mass_mal.o b/Util/USB/mass_mal.o
diff --git a/Util/USB/memory.o b/Util/USB/memory.o
diff --git a/Util/USB/scsi_data.o b/Util/USB/scsi_data.o
diff --git a/Util/USB/usb_bot.o b/Util/USB/usb_bot.o
diff --git a/Util/USB/usb_desc.o b/Util/USB/usb_desc.o
diff --git a/Util/USB/usb_endp.o b/Util/USB/usb_endp.o
diff --git a/Util/USB/usb_istr.o b/Util/USB/usb_istr.o
diff --git a/Util/USB/usb_prop.o b/Util/USB/usb_prop.o
diff --git a/Util/USB/usb_pwr.o b/Util/USB/usb_pwr.o
diff --git a/Util/USB/usb_scsi.o b/Util/USB/usb_scsi.o
diff --git a/Util/buffer.o b/Util/buffer.o
diff --git a/Util/delay.o b/Util/delay.o
diff --git a/Util/fat_fs/option/cc932.o b/Util/fat_fs/option/cc932.o
diff --git a/Util/fat_fs/option/ccsbcs.o b/Util/fat_fs/option/ccsbcs.o
diff --git a/Util/fat_fs/option/syscall.o b/Util/fat_fs/option/syscall.o
diff --git a/Util/fat_fs/src/fattime.o b/Util/fat_fs/src/fattime.o
diff --git a/Util/fat_fs/src/ff.o b/Util/fat_fs/src/ff.o
diff --git a/Util/fat_fs/src/rtc.o b/Util/fat_fs/src/rtc.o
diff --git a/Util/fat_fs/src/sd_spi_stm32.o b/Util/fat_fs/src/sd_spi_stm32.o
diff --git a/Util/rprintf.o b/Util/rprintf.o
diff --git a/adc.o b/adc.o
diff --git a/bootload.o b/bootload.o
diff --git a/gpio.o b/gpio.o
diff --git a/i2c_int.o b/i2c_int.o
diff --git a/interrupts.c b/interrupts.c
@@ -121,7 +121,7 @@ __attribute__((externally_visible)) void EXTI0_IRQHandler(void) {
 		}
 		if(USB_SOURCE==bootsource) {
 			if(file_opened) 
-				shutdown_filesystem();          //This should not happen
+				shutdown_filesystem(1,file_opened);//This should not happen
 			red_flash();				//Flash red led - provides some debouncing on jack removal
 			shutdown();				//Shuts down - only wakes up on power pin i.e. WKUP
 		}

diff --git a/interrupts.c~ b/interrupts.c~
diff --git a/interrupts.o b/interrupts.o
diff --git a/lib/CMSIS_CM3/core_cm3.o b/lib/CMSIS_CM3/core_cm3.o
diff --git a/lib/CMSIS_CM3/startup/gcc/startup_stm32f10x_md.o b/lib/CMSIS_CM3/startup/gcc/startup_stm32f10x_md.o
diff --git a/lib/CMSIS_CM3/system_stm32f10x.o b/lib/CMSIS_CM3/system_stm32f10x.o
diff --git a/lib/STM32F10x_StdPeriph_Driver/libstm32fw.a b/lib/STM32F10x_StdPeriph_Driver/libstm32fw.a
diff --git a/lib/STM32F10x_StdPeriph_Driver/src/misc.o b/lib/STM32F10x_StdPeriph_Driver/src/misc.o
diff --git a/lib/STM32F10x_StdPeriph_Driver/src/stm32f10x_adc.o b/lib/STM32F10x_StdPeriph_Driver/src/stm32f10x_adc.o
diff --git a/lib/STM32F10x_StdPeriph_Driver/src/stm32f10x_bkp.o b/lib/STM32F10x_StdPeriph_Driver/src/stm32f10x_bkp.o
diff --git a/lib/STM32F10x_StdPeriph_Driver/src/stm32f10x_can.o b/lib/STM32F10x_StdPeriph_Driver/src/stm32f10x_can.o
diff --git a/lib/STM32F10x_StdPeriph_Driver/src/stm32f10x_crc.o b/lib/STM32F10x_StdPeriph_Driver/src/stm32f10x_crc.o
diff --git a/lib/STM32F10x_StdPeriph_Driver/src/stm32f10x_dac.o b/lib/STM32F10x_StdPeriph_Driver/src/stm32f10x_dac.o
diff --git a/lib/STM32F10x_StdPeriph_Driver/src/stm32f10x_dbgmcu.o b/lib/STM32F10x_StdPeriph_Driver/src/stm32f10x_dbgmcu.o
diff --git a/lib/STM32F10x_StdPeriph_Driver/src/stm32f10x_dma.o b/lib/STM32F10x_StdPeriph_Driver/src/stm32f10x_dma.o
diff --git a/lib/STM32F10x_StdPeriph_Driver/src/stm32f10x_exti.o b/lib/STM32F10x_StdPeriph_Driver/src/stm32f10x_exti.o
diff --git a/lib/STM32F10x_StdPeriph_Driver/src/stm32f10x_flash.o b/lib/STM32F10x_StdPeriph_Driver/src/stm32f10x_flash.o
diff --git a/lib/STM32F10x_StdPeriph_Driver/src/stm32f10x_fsmc.o b/lib/STM32F10x_StdPeriph_Driver/src/stm32f10x_fsmc.o
diff --git a/lib/STM32F10x_StdPeriph_Driver/src/stm32f10x_gpio.o b/lib/STM32F10x_StdPeriph_Driver/src/stm32f10x_gpio.o
diff --git a/lib/STM32F10x_StdPeriph_Driver/src/stm32f10x_i2c.o b/lib/STM32F10x_StdPeriph_Driver/src/stm32f10x_i2c.o
diff --git a/lib/STM32F10x_StdPeriph_Driver/src/stm32f10x_iwdg.o b/lib/STM32F10x_StdPeriph_Driver/src/stm32f10x_iwdg.o
diff --git a/lib/STM32F10x_StdPeriph_Driver/src/stm32f10x_pwr.o b/lib/STM32F10x_StdPeriph_Driver/src/stm32f10x_pwr.o
diff --git a/lib/STM32F10x_StdPeriph_Driver/src/stm32f10x_rcc.o b/lib/STM32F10x_StdPeriph_Driver/src/stm32f10x_rcc.o
diff --git a/lib/STM32F10x_StdPeriph_Driver/src/stm32f10x_rtc.o b/lib/STM32F10x_StdPeriph_Driver/src/stm32f10x_rtc.o
diff --git a/lib/STM32F10x_StdPeriph_Driver/src/stm32f10x_sdio.o b/lib/STM32F10x_StdPeriph_Driver/src/stm32f10x_sdio.o
diff --git a/lib/STM32F10x_StdPeriph_Driver/src/stm32f10x_spi.o b/lib/STM32F10x_StdPeriph_Driver/src/stm32f10x_spi.o
diff --git a/lib/STM32F10x_StdPeriph_Driver/src/stm32f10x_tim.o b/lib/STM32F10x_StdPeriph_Driver/src/stm32f10x_tim.o
diff --git a/lib/STM32F10x_StdPeriph_Driver/src/stm32f10x_usart.o b/lib/STM32F10x_StdPeriph_Driver/src/stm32f10x_usart.o
diff --git a/lib/STM32F10x_StdPeriph_Driver/src/stm32f10x_wwdg.o b/lib/STM32F10x_StdPeriph_Driver/src/stm32f10x_wwdg.o
diff --git a/lib/STM32_USB-FS-Device_Driver/libstm32usb.a b/lib/STM32_USB-FS-Device_Driver/libstm32usb.a
diff --git a/lib/STM32_USB-FS-Device_Driver/src/otgd_fs_cal.o b/lib/STM32_USB-FS-Device_Driver/src/otgd_fs_cal.o
diff --git a/lib/STM32_USB-FS-Device_Driver/src/otgd_fs_dev.o b/lib/STM32_USB-FS-Device_Driver/src/otgd_fs_dev.o
diff --git a/lib/STM32_USB-FS-Device_Driver/src/otgd_fs_int.o b/lib/STM32_USB-FS-Device_Driver/src/otgd_fs_int.o
diff --git a/lib/STM32_USB-FS-Device_Driver/src/otgd_fs_pcd.o b/lib/STM32_USB-FS-Device_Driver/src/otgd_fs_pcd.o
diff --git a/lib/STM32_USB-FS-Device_Driver/src/usb_core.o b/lib/STM32_USB-FS-Device_Driver/src/usb_core.o
diff --git a/lib/STM32_USB-FS-Device_Driver/src/usb_init.o b/lib/STM32_USB-FS-Device_Driver/src/usb_init.o
diff --git a/lib/STM32_USB-FS-Device_Driver/src/usb_int.o b/lib/STM32_USB-FS-Device_Driver/src/usb_int.o
diff --git a/lib/STM32_USB-FS-Device_Driver/src/usb_mem.o b/lib/STM32_USB-FS-Device_Driver/src/usb_mem.o
diff --git a/lib/STM32_USB-FS-Device_Driver/src/usb_regs.o b/lib/STM32_USB-FS-Device_Driver/src/usb_regs.o
diff --git a/lib/STM32_USB-FS-Device_Driver/src/usb_sil.o b/lib/STM32_USB-FS-Device_Driver/src/usb_sil.o
diff --git a/main.bin b/main.bin
diff --git a/main.elf b/main.elf
diff --git a/main.map b/main.map
diff --git a/main.o b/main.o
diff --git a/pwr.c b/pwr.c
@@ -49,8 +49,4 @@ void shutdown_filesystem(uint8_t reason, uint8_t file_flags) {
 		f_truncate(&FATFS_logfile);		//Truncate the lenght - fix pre allocation
 		f_close(&FATFS_logfile);		//Close any opened file
 	}
-	if(file_flags&0x02)
-		wave_terminate(&FATFS_wavfile_accel);	//Close all opened files - terminate wav files correctly
-	if(file_flags&0x04)
-		wave_terminate(&FATFS_wavfile_gyro);	//Close all opened files - terminate wav files correctly
 }
diff --git a/pwr.c~ b/pwr.c~
@@ -0,0 +1,56 @@
+#include "pwr.h"
+
+/**
+  * @brief  Enables the power domain
+  * @param  None
+  * @retval None
+  */
+void setuppwr() {
+	PWR_DeInit();
+	RCC_APB1PeriphClockCmd(RCC_APB1Periph_PWR,ENABLE);//clk to the pwr control
+}
+
+/**
+  * @brief  Enables the wakeup pin functionality and places device in low power mode
+  * @param  None
+  * @retval None
+  */
+void shutdown() {
+	PWR_WakeUpPinCmd(ENABLE);			//enable the pin
+	PWR_EnterSTANDBYMode();				//only wakes on RTC signals or WKUP pin
+}
+
+/**
+  * @brief  Disables the wakeup pin functionality
+  * @param  None
+  * @retval None
+  */
+void disable_pin() {
+	PWR_WakeUpPinCmd(DISABLE);			//disable the pin
+}
+
+/**
+  * @brief  This function closes any open files, leaving a file footer in the FATFS_logfile
+  * @param  uint8_t reason: reason for shutdown, uses enum definitions in main.h, uint8_t file_flags: flag bits for open files
+  * @retval None
+  */
+void shutdown_filesystem(uint8_t reason, uint8_t file_flags) {
+	uint8_t c[25] = {};
+	if(reason==BUTTON_TURNOFF)
+		strncpy(c,"\r\nLogger turned off\r\n",sizeof(c));
+	else if(reason==USB_INSERTED)
+		strncpy(c,"\r\nUSB cable inserted\r\n",sizeof(c));
+	else
+		strncpy(c,"\r\nLow Battery\r\n",sizeof(c));
+	if(file_flags&0x01) {
+		uint32_t a;
+		f_write(&FATFS_logfile,c,strlen(c),&a);	//Write the error to the file
+		f_sync(&FATFS_logfile);			//Flush buffers
+		f_truncate(&FATFS_logfile);		//Truncate the lenght - fix pre allocation
+		f_close(&FATFS_logfile);		//Close any opened file
+	}
+	if(file_flags&0x02)
+		wave_terminate(&FATFS_wavfile_accel);	//Close all opened files - terminate wav files correctly
+	if(file_flags&0x04)
+		wave_terminate(&FATFS_wavfile_gyro);	//Close all opened files - terminate wav files correctly
+}
diff --git a/pwr.h b/pwr.h
@@ -1,4 +1,5 @@
 #pragma once
+#include <string.h>
 #include "stm32f10x.h"
 #include "main.h"
 #include "Util/fat_fs/inc/diskio.h"
@@ -7,4 +8,4 @@
 void setuppwr(void);
 void shutdown(void);
 void disable_pin(void);
-void shutdown_filesystem(void);
+void shutdown_filesystem(uint8_t reason, uint8_t file_flags);
diff --git a/pwr.h~ b/pwr.h~
@@ -0,0 +1,10 @@
+#pragma once
+#include "stm32f10x.h"
+#include "main.h"
+#include "Util/fat_fs/inc/diskio.h"
+#include "Util/fat_fs/inc/ff.h"
+
+void setuppwr(void);
+void shutdown(void);
+void disable_pin(void);
+void shutdown_filesystem(void);
diff --git a/pwr.o b/pwr.o
diff --git a/timer.o b/timer.o
diff --git a/usart.o b/usart.o
diff --git a/watchdog.o b/watchdog.o