Rainbow case: TODO

[home-hw.git] / usb / Src / main.c

diff --git a/usb/Src/main.c b/usb/Src/main.c
index e8d8abbef682c59fbc4479618ebb5cbe05e011c9..e934fa9ce2ffd911f87a278c2e714fa4e340f977 100644 (file)
--- a/usb/Src/main.c
+++ b/usb/Src/main.c
@@ -123,7 +123,7 @@ int main(void)
   MX_USB_PCD_Init();
   MX_TIM4_Init();
   /* USER CODE BEGIN 2 */
   MX_USB_PCD_Init();
   MX_TIM4_Init();
   /* USER CODE BEGIN 2 */

-  //display_init();
+  display_init();

   usb_start(&usb);
   bmp_init();
 
   usb_start(&usb);
   bmp_init();
 


@@ -131,12 +131,10 @@ int main(void)
   LL_TIM_EnableIT_UPDATE(TIM4);
   LL_TIM_GenerateEvent_UPDATE(TIM4);
 
   LL_TIM_EnableIT_UPDATE(TIM4);
   LL_TIM_GenerateEvent_UPDATE(TIM4);
 

-#if 0

   {
     byte buf[5] = { 0xff, 0xff, 10, 0xff, 0xff };
     display_buffer(buf);
   }
   {
     byte buf[5] = { 0xff, 0xff, 10, 0xff, 0xff };
     display_buffer(buf);
   }

-#endif

 
   /* USER CODE END 2 */
 
 
   /* USER CODE END 2 */
 


@@ -146,14 +144,14 @@ int main(void)
   {
     if (rx_packet_state == 1 && !tx_packet_state)
       {
   {
     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);
+       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;
        put_u32_be(tx_packet, adjusted_temp);
        put_u32_be(tx_packet + 4, adjusted_press);
        tx_packet_state = 1;
        put_u32_be(tx_packet, adjusted_temp);
        put_u32_be(tx_packet + 4, adjusted_press);


@@ -161,6 +159,7 @@ int main(void)
        usb_ep_send(&usb, 0x82, tx_packet, 12);
        rx_packet_state = 0;
        usb_ep_receive(&usb, 0x01, rx_packet, 64);
        usb_ep_send(&usb, 0x82, tx_packet, 12);
        rx_packet_state = 0;
        usb_ep_receive(&usb, 0x01, rx_packet, 64);

+       bmp_request = 1;

       }
 
     bmp_step();
       }
 
     bmp_step();