diff --git a/RTC/.cproject b/RTC/.cproject
index 2954495..9e08d34 100644
--- a/RTC/.cproject
+++ b/RTC/.cproject
@@ -108,7 +108,7 @@
-
+
diff --git a/RTC/Core/Inc/stm32f4xx_it.h b/RTC/Core/Inc/stm32f4xx_it.h
index daccc11..7277f93 100644
--- a/RTC/Core/Inc/stm32f4xx_it.h
+++ b/RTC/Core/Inc/stm32f4xx_it.h
@@ -57,7 +57,6 @@ void DebugMon_Handler(void);
void PendSV_Handler(void);
void SysTick_Handler(void);
void RTC_Alarm_IRQHandler(void);
-
void EXTI15_10_IRQHandler(void);
void TIM4_IRQHandler(void);
/* USER CODE BEGIN EFP */
diff --git a/RTC/Core/Src/main.c b/RTC/Core/Src/main.c
index 85fc718..b65951d 100644
--- a/RTC/Core/Src/main.c
+++ b/RTC/Core/Src/main.c
@@ -597,6 +597,13 @@ int main(void)
transmit_uart("Resetting motor position and calculating new dates and times.\r\n");
+ BSP_MotorControl_Move(0, FORWARD, 300);
+ BSP_MotorControl_WaitWhileActive(0);
+ BSP_MotorControl_Move(0, FORWARD, 300);
+ BSP_MotorControl_WaitWhileActive(0);
+ BSP_MotorControl_Move(0, FORWARD, 300);
+ BSP_MotorControl_WaitWhileActive(0);
+
BSP_MotorControl_GoHome(0);
BSP_MotorControl_WaitWhileActive(0);
@@ -619,6 +626,16 @@ int main(void)
transmit_uart("File was not opened!\r\n");
}
+ f_puts("Cancer", &fil);
+
+ /* Close file */
+ fres = f_close(&fil);
+ if (fres == FR_OK) {
+ transmit_uart("File is closed.\r\n");
+ } else if (fres != FR_OK) {
+ transmit_uart("File was not closed.\r\n");
+ }
+
//Calculate sunrise and sunset time for tomorrow
calc_sunrise_sunset(&initialDate, &sunrise, &sunset, &tomorrowsDate);
@@ -906,6 +923,9 @@ static void MX_GPIO_Init(void)
/*Configure GPIO pin Output Level */
HAL_GPIO_WritePin(LD2_GPIO_Port, LD2_Pin, GPIO_PIN_RESET);
+ /*Configure GPIO pin Output Level */
+ HAL_GPIO_WritePin(GPIOB, GPIO_PIN_6, GPIO_PIN_SET);
+
/*Configure GPIO pin : B1_Pin */
GPIO_InitStruct.Pin = B1_Pin;
GPIO_InitStruct.Mode = GPIO_MODE_IT_FALLING;
diff --git a/RTC/FATFS/Target/user_diskio.c b/RTC/FATFS/Target/user_diskio.c
index 813cd6a..6556944 100644
--- a/RTC/FATFS/Target/user_diskio.c
+++ b/RTC/FATFS/Target/user_diskio.c
@@ -82,8 +82,9 @@ DSTATUS USER_initialize (
)
{
/* USER CODE BEGIN INIT */
- Stat = STA_NOINIT;
- return Stat;
+ SD_disk_initialize (pdrv);
+ //Stat = STA_NOINIT;
+ //return Stat;
/* USER CODE END INIT */
}
@@ -97,8 +98,9 @@ DSTATUS USER_status (
)
{
/* USER CODE BEGIN STATUS */
- Stat = STA_NOINIT;
- return Stat;
+ SD_disk_status (pdrv);
+ //Stat = STA_NOINIT;
+ //return Stat;
/* USER CODE END STATUS */
}
@@ -118,7 +120,8 @@ DRESULT USER_read (
)
{
/* USER CODE BEGIN READ */
- return RES_OK;
+ SD_disk_read (pdrv,buff,sector,count);
+ //return RES_OK;
/* USER CODE END READ */
}
@@ -140,7 +143,8 @@ DRESULT USER_write (
{
/* USER CODE BEGIN WRITE */
/* USER CODE HERE */
- return RES_OK;
+ SD_disk_write (pdrv, buff, sector, count);
+ //return RES_OK;
/* USER CODE END WRITE */
}
#endif /* _USE_WRITE == 1 */
@@ -160,8 +164,9 @@ DRESULT USER_ioctl (
)
{
/* USER CODE BEGIN IOCTL */
- DRESULT res = RES_ERROR;
- return res;
+ SD_disk_ioctl (pdrv, cmd, buff);
+ //DRESULT res = RES_ERROR;
+ //return res;
/* USER CODE END IOCTL */
}
#endif /* _USE_IOCTL == 1 */
diff --git a/RTC/RTC.ioc b/RTC/RTC.ioc
index 547ef03..52a1c79 100644
--- a/RTC/RTC.ioc
+++ b/RTC/RTC.ioc
@@ -17,12 +17,13 @@ Mcu.Package=LQFP64
Mcu.Pin0=PC13-ANTI_TAMP
Mcu.Pin1=PC14-OSC32_IN
Mcu.Pin10=PB3
-Mcu.Pin11=VP_FATFS_VS_Generic
-Mcu.Pin12=VP_RTC_VS_RTC_Activate
-Mcu.Pin13=VP_RTC_VS_RTC_Calendar
-Mcu.Pin14=VP_RTC_VS_RTC_Alarm_B_Intern
-Mcu.Pin15=VP_RTC_VS_RTC_Alarm_A_Intern
-Mcu.Pin16=VP_SYS_VS_Systick
+Mcu.Pin11=PB6
+Mcu.Pin12=VP_FATFS_VS_Generic
+Mcu.Pin13=VP_RTC_VS_RTC_Activate
+Mcu.Pin14=VP_RTC_VS_RTC_Calendar
+Mcu.Pin15=VP_RTC_VS_RTC_Alarm_B_Intern
+Mcu.Pin16=VP_RTC_VS_RTC_Alarm_A_Intern
+Mcu.Pin17=VP_SYS_VS_Systick
Mcu.Pin2=PC15-OSC32_OUT
Mcu.Pin3=PH0 - OSC_IN
Mcu.Pin4=PH1 - OSC_OUT
@@ -31,7 +32,7 @@ Mcu.Pin6=PA3
Mcu.Pin7=PA5
Mcu.Pin8=PA13
Mcu.Pin9=PA14
-Mcu.PinsNb=17
+Mcu.PinsNb=18
Mcu.ThirdPartyNb=0
Mcu.UserConstants=
Mcu.UserName=STM32F401RETx
@@ -86,6 +87,11 @@ PB3.GPIOParameters=GPIO_Label
PB3.GPIO_Label=SWO
PB3.Locked=true
PB3.Signal=SYS_JTDO-SWO
+PB6.GPIOParameters=GPIO_Speed,PinState
+PB6.GPIO_Speed=GPIO_SPEED_FREQ_MEDIUM
+PB6.Locked=true
+PB6.PinState=GPIO_PIN_SET
+PB6.Signal=GPIO_Output
PC13-ANTI_TAMP.GPIOParameters=GPIO_PuPd,GPIO_Label,GPIO_ModeDefaultEXTI
PC13-ANTI_TAMP.GPIO_Label=B1 [Blue PushButton]
PC13-ANTI_TAMP.GPIO_ModeDefaultEXTI=GPIO_MODE_IT_FALLING
@@ -132,7 +138,7 @@ ProjectManager.StackSize=0x400
ProjectManager.TargetToolchain=STM32CubeIDE
ProjectManager.ToolChainLocation=
ProjectManager.UnderRoot=true
-ProjectManager.functionlistsort=1-MX_GPIO_Init-GPIO-false-HAL-true,2-SystemClock_Config-RCC-false-HAL-false,3-MX_USART2_UART_Init-USART2-false-HAL-true,4-MX_RTC_Init-RTC-false-HAL-true
+ProjectManager.functionlistsort=1-MX_GPIO_Init-GPIO-false-HAL-true,2-SystemClock_Config-RCC-false-HAL-false,3-MX_USART2_UART_Init-USART2-false-HAL-true,4-MX_RTC_Init-RTC-false-HAL-true,5-MX_FATFS_Init-FATFS-false-HAL-false
RCC.48MHZClocksFreq_Value=48000000
RCC.AHBFreq_Value=84000000
RCC.APB1CLKDivider=RCC_HCLK_DIV2