V1.37

yincheng.zhong

2024-12-13 aef7e985db5668aee622b656748c1216fbd5ff75

 Src/main.c

@@ -334,7 +334,8 @@
   hardware_pici = STMFLASH_ReadHalfWord(FLASH_HARDWARE_VERSION_MAP+2);
   hardware_type = STMFLASH_ReadHalfWord(FLASH_HARDWARE_VERSION_MAP+4);
   //deca_sleep(1000);
   g_com_map[VERSION] = (1<<8)|33;
   g_com_map[VERSION] = (1<<8)|37;
    
//    g_com_map[DEV_ID]=1158;
//    #ifdef DEBUG_MODE
//   // g_com_map[GROUP_ID]=21;
@@ -352,7 +353,7 @@
//    g_com_map[IMU_ENABLE] = 0;
   imu_enable=g_com_map[IMU_ENABLE];
   motor_enable=g_com_map[MOTOR_ENABLE];

    g_com_map[LORA_SEND_INDEX] = 1;
   group_id=g_com_map[GROUP_ID];
   dev_id = g_com_map[DEV_ID];
   slottime=ceil((double)g_com_map[MAX_REPORT_ANC_NUM]*SLOT_SCALE)+3;
@@ -481,22 +482,22 @@
        lora_irq_flag = 1;
        }
    }
    if(GPIO_Pin == GPIO_PIN_1)//按键
    {
      //   SystemClock_Config();
        anjian_flag=1;
        anjian_num++;
        if(anjian_num==2)
        {                        
        g_com_map[LORA_SEND_INDEX] = !g_com_map[LORA_SEND_INDEX];
        save_com_map_to_flash();
        Set4LEDColor(YELLOW,YELLOW,YELLOW,YELLOW);
        delay_ms(100);
        Set4LEDColor_Off();
        delay_ms(100);
        SCB->AIRCR = 0X05FA0000|(unsigned int)0x04; //软复位回到bootloader
        }
    }
//    if(GPIO_Pin == GPIO_PIN_1)//按键
//    {
//      //   SystemClock_Config();
//        anjian_flag=1;
//        anjian_num++;
//        if(anjian_num==2)
//        {                        
//        g_com_map[LORA_SEND_INDEX] = !g_com_map[LORA_SEND_INDEX];
//        save_com_map_to_flash();
//        Set4LEDColor(YELLOW,YELLOW,YELLOW,YELLOW);
//        delay_ms(100);
//        Set4LEDColor_Off();
//        delay_ms(100);
//        SCB->AIRCR = 0X05FA0000|(unsigned int)0x04; //软复位回到bootloader
//        }
//    }
    if(GPIO_Pin == GPIO_PIN_0)//加速度
    {
      //   SystemClock_Config();
@@ -865,7 +866,7 @@
  /** Configure LSE Drive Capability
  */
  HAL_PWR_EnableBkUpAccess();
  __HAL_RCC_LSEDRIVE_CONFIG(RCC_LSEDRIVE_LOW);
  __HAL_RCC_LSEDRIVE_CONFIG(RCC_LSEDRIVE_HIGH);

  /** Initializes the RCC Oscillators according to the specified parameters
  * in the RCC_OscInitTypeDef structure.