X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=Src%2Fmain.c;h=7b5b75d0e3921e514183d9feb8bd79c6cdc78492;hb=abb212223d07a11a335151a64e111d8a670e93f5;hp=1810399209057f4e002d6337bc2436feb19391c8;hpb=7ba1753f4c2bdd08f9fd88445ecc988100605199;p=home-hw.git

diff --git a/Src/main.c b/Src/main.c
index 1810399..7b5b75d 100644
--- a/Src/main.c
+++ b/Src/main.c
@@ -37,12 +37,15 @@
   ******************************************************************************
   */
 /* Includes ------------------------------------------------------------------*/
-#include "util.h"
 #include "main.h"
 #include "stm32f1xx_hal.h"
-#include "usb.h"
 
 /* USER CODE BEGIN Includes */
+#include "util.h"
+#include "usb.h"
+#include "app.h"
+
+#include <string.h>
 
 /* USER CODE END Includes */
 
@@ -62,6 +65,7 @@ static void MX_GPIO_Init(void);
 static void MX_I2C1_Init(void);
 static void MX_I2C2_Init(void);
 static void MX_USB_PCD_Init(void);
+static void MX_TIM4_Init(void);
 
 /* USER CODE BEGIN PFP */
 /* Private function prototypes -----------------------------------------------*/
@@ -117,21 +121,55 @@ int main(void)
   MX_I2C1_Init();
   MX_I2C2_Init();
   MX_USB_PCD_Init();
+  MX_TIM4_Init();
   /* USER CODE BEGIN 2 */
+  //display_init();
   usb_start(&usb);
+  bmp_init();
+
+  LL_TIM_EnableCounter(TIM4);
+  LL_TIM_EnableIT_UPDATE(TIM4);
+  LL_TIM_GenerateEvent_UPDATE(TIM4);
+
+#if 0
+  {
+    byte buf[5] = { 0xff, 0xff, 10, 0xff, 0xff };
+    display_buffer(buf);
+  }
+#endif
 
   /* USER CODE END 2 */
 
   /* Infinite loop */
   /* USER CODE BEGIN WHILE */
-  int cnt = 0;
   while (1)
   {
-    LL_GPIO_SetOutputPin(LED_GPIO_Port, LED_Pin);
-    LL_mDelay(500);
-    LL_GPIO_ResetOutputPin(LED_GPIO_Port, LED_Pin);
-    LL_mDelay(500);
-    debug_printf("Counter = %d\n", cnt++);
+    if (rx_packet_state == 1 && !tx_packet_state)
+      {
+    static byte led_state;
+    if (led_state)
+      LL_GPIO_SetOutputPin(LED_GPIO_Port, LED_Pin);
+    else
+      LL_GPIO_ResetOutputPin(LED_GPIO_Port, LED_Pin);
+    led_state ^= 1;
+
+	// display_buffer(rx_packet);
+	tx_packet_state = 1;
+	tx_packet[0] = adjusted_temp >> 8;
+	tx_packet[1] = adjusted_temp & 0xff;
+	tx_packet[2] = adjusted_press >> 8;
+	tx_packet[3] = adjusted_press & 0xff;
+	usb_ep_send(&usb, 0x82, tx_packet, 8);
+	rx_packet_state = 0;
+	usb_ep_receive(&usb, 0x01, rx_packet, 64);
+      }
+
+    bmp_step();
+
+    // debug_printf("Counter = %d\n", cnt);
+    // display_counter(cnt);
+
+    __WFI();
 
   /* USER CODE END WHILE */
 
@@ -278,9 +316,49 @@ static void MX_I2C2_Init(void)
 
 }
 
+/* TIM4 init function */
+static void MX_TIM4_Init(void)
+{
+
+  LL_TIM_InitTypeDef TIM_InitStruct;
+  LL_TIM_OC_InitTypeDef TIM_OC_InitStruct;
+
+  /* Peripheral clock enable */
+  LL_APB1_GRP1_EnableClock(LL_APB1_GRP1_PERIPH_TIM4);
+
+  /* TIM4 interrupt Init */
+  NVIC_SetPriority(TIM4_IRQn, NVIC_EncodePriority(NVIC_GetPriorityGrouping(),0, 0));
+  NVIC_EnableIRQ(TIM4_IRQn);
+
+  TIM_InitStruct.Prescaler = 7200;
+  TIM_InitStruct.CounterMode = LL_TIM_COUNTERMODE_UP;
+  TIM_InitStruct.Autoreload = 1000;
+  TIM_InitStruct.ClockDivision = LL_TIM_CLOCKDIVISION_DIV1;
+  LL_TIM_Init(TIM4, &TIM_InitStruct);
+
+  LL_TIM_DisableARRPreload(TIM4);
+
+  LL_TIM_SetClockSource(TIM4, LL_TIM_CLOCKSOURCE_INTERNAL);
+
+  TIM_OC_InitStruct.OCMode = LL_TIM_OCMODE_FROZEN;
+  TIM_OC_InitStruct.OCState = LL_TIM_OCSTATE_DISABLE;
+  TIM_OC_InitStruct.OCNState = LL_TIM_OCSTATE_DISABLE;
+  TIM_OC_InitStruct.CompareValue = 0;
+  TIM_OC_InitStruct.OCPolarity = LL_TIM_OCPOLARITY_HIGH;
+  LL_TIM_OC_Init(TIM4, LL_TIM_CHANNEL_CH1, &TIM_OC_InitStruct);
+
+  LL_TIM_OC_DisableFast(TIM4, LL_TIM_CHANNEL_CH1);
+
+  LL_TIM_SetTriggerOutput(TIM4, LL_TIM_TRGO_RESET);
+
+  LL_TIM_DisableMasterSlaveMode(TIM4);
+
+}
+
 /* USB init function */
 static void MX_USB_PCD_Init(void)
 {
+
   hpcd_USB_FS.Instance = USB;
   hpcd_USB_FS.Init.dev_endpoints = 8;
   hpcd_USB_FS.Init.speed = PCD_SPEED_FULL;
@@ -292,6 +370,7 @@ static void MX_USB_PCD_Init(void)
   {
     _Error_Handler(__FILE__, __LINE__);
   }
+
 }
 
 /** Configure pins as