Changeset 22 for trunk/fw_g473rct/SES/src/main.c

Timestamp:

Aug 29, 2025, 6:15:42 PM (24 hours ago)

Author:

f.jahn

Message:

DMA Rx funktioniert, aber BETA und nur feste Baudrate

File:

• trunk/fw_g473rct/SES/src/main.c (modified) (8 diffs)

trunk/fw_g473rct/SES/src/main.c

@@ -37 +37 @@
 #include "modbus.h"
 #include "chip_temperature.h"
+#include "battery_voltage.h"
+#include "ads1260.h"
 /* USER CODE END Includes */
 
@@ -57 +59 @@
 
 /* USER CODE BEGIN PV */
-modbus_t modbusData;
-#define ADCCONVERTEDVALUES_BUFFER_SIZE 2
-__IO uint32_t adc12Data[ADCCONVERTEDVALUES_BUFFER_SIZE] __attribute__((section(".RAM1")));
+modbus_t modbusData __attribute__((section(".RAM1")));
+
+__IO uint16_t adc12Data[2] __attribute__((section(".RAM1")));
 __IO uint32_t adc1Data[1] __attribute__((section(".RAM1")));
 __IO uint32_t adc2Data[1] __attribute__((section(".RAM1")));
@@ -66 +68 @@
 __IO uint32_t adc5Data[4] __attribute__((section(".RAM1")));
 int silentmode =0;
+static volatile uint32_t newADC1Data = 0;
+static volatile uint32_t newADC2Data = 0;
 /* USER CODE END PV */
 
@@ -71 +75 @@
 void SystemClock_Config(void);
 /* USER CODE BEGIN PFP */
-
+bool SetFlashReadProtection(bool state);
+uint8_t printprotectionstate(void);
+bool SetBootFromFlashAndReadOutProtection(void);
 /* USER CODE END PFP */
 
@@ -88 +94 @@
   /* USER CODE BEGIN 1 */
     uint8_t firstStartCatcher;
+        int mode_button_disable_time=0;
   /* USER CODE END 1 */
 
@@ -168 +175 @@
   
     //HAL_ADC_Start_DMA(&hadc2, (uint32_t*)adc2Data, 1);
-  if (HAL_ADCEx_MultiModeStart_DMA(&hadc1,(uint32_t *)adc12Data,ADCCONVERTEDVALUES_BUFFER_SIZE))  //Start ADC interleaved mode
+  if (HAL_ADCEx_MultiModeStart_DMA(&hadc1,(uint32_t *)adc12Data,1))  //Start ADC interleaved mode
   {
      /* Start Error */
@@ -189 +196 @@
 
     /* USER CODE BEGIN 3 */
+        if (newADC1Data == 1)
+    {
+          BATTERY_VOLTAGE_Exec( adc12Data[1]);
+        }
+
+
+            if(sys_data.s.parameter.command != 0)
+    {
+      if  (modbusData.current_query ==  MB_QUERY_NOTHING)
+      {
+        //printf("CMD = %d\n", sys_data.s.parameter.command);
+        switch (sys_data.s.parameter.command )
+        {
+          case COMMAND_STORE_CONFIG:                          EEPROM_storeConfig(&sys_data,0);                                                                                    break;
+          case COMMAND_FULL_RESTORE:                          EEPROM_fullRestore(&sys_data);                                                                                      break;
+          case COMMAND_FACTORY_RESTORE:                       EEPROM_factoryRestore(&sys_data, 1);                                                                                break;
+          case COMMAND_RESTORE_LAST_SAVED_VALUES:             EEPROM_readConfig(&sys_data);                                                                                               break;
+          case COMMAND_STORE_WITH_SERIAL_NUMBER:              EEPROM_storeConfig(&sys_data,1);                                                                                    break;        // Seriennummer schreiben
+          case COMMAND_RESTART:                               NVIC_SystemReset();                                                                                                                 break;
+          case COMMAND_BATTERY_CURRENT_OFFSET_CAL:            ADS_1260_BatteryCurrentOffsetCalibrationStart(&sys_data);                                   break;
+          case COMMAND_BATTERY_CURRENT_OFFSET_COMMONMODE_CAL: ADS_1260_BatteryCurrentOffsetCommonModeErrorComepensationStart(&sys_data);  break;
+          case COMMAND_BATTERY_CURRENT_OFFSET_TEMP_CAL:       ADS_1260_BatteryCurrentOffsetTemperatureErrorComepensationStart();                  break;
+          case COMMAND_BATTERY_CURRENT_GAIN_CAL:              ADS_1260_BatteryCurrentGainCalibrationStart(&sys_data);                                     break;
+          case COMMAND_BATTERY_CURRENT_GAIN_TEMP_SHUNT_CAL:   ADS_1260_BatteryCurrentGainTemperatureCalibrationShuntStart();                      break;
+//        case COMMAND_BATTERY_CURRENT_GAIN_TEMP_CHIP_CAL:    ADS_1260_BatteryCurrentGainTemperatureCalibrationChipStart(); break;
+          case COMMAND_SET_RDP_LEVEL0:                        SetFlashReadProtection(false);                                                                                      break;
+          case COMMAND_SET_RDP_LEVEL1:                        SetFlashReadProtection(true);                                                                                               break;
+          case COMMAND_SET_RDP_LEVEL1_AND_BOOTSEL:            SetBootFromFlashAndReadOutProtection();                                                                     break;
+          default:                                            printf("UNKNOWN COMMAND\n");
+        }
+        sys_data.s.parameter.command = 0;
+      }
+      else
+      {
+        //printf("wait with execution till modbus communnikation finished\n");
+      }
+    }
+
+    if((HAL_GPIO_ReadPin(GPIO_INPUT_BTN_MODE_GPIO_Port, GPIO_INPUT_BTN_MODE_Pin) == GPIO_PIN_RESET) && (mode_button_disable_time == 0))
+    {
+      HAL_Delay(10);
+      //Taste weiterhin gedrckt?
+      if(HAL_GPIO_ReadPin(GPIO_INPUT_BTN_MODE_GPIO_Port, GPIO_INPUT_BTN_MODE_Pin) == GPIO_PIN_RESET)
+      {
+        //Ja, dann Silent Mode umschalten
+        mode_button_disable_time=500;
+        if (silentmode == 0)
+        {
+          silentmode = 1;
+          HAL_GPIO_WritePin(LED_FUNC_GPIO_Port, LED_FUNC_Pin,GPIO_PIN_SET);
+        }
+        else
+        {
+          silentmode = 0;
+        }
+       }
+    }
+
         // Modbus Kommunikation
-        HAL_Delay(1000);
-        printf("data12d1=%d,data12d2=%d,data5=%d\r\n", adc12Data[0], adc12Data[1], adc5Data[2]);
+
+//      printf("data12d1=%d,data12d2=%d,data5=%d\r\n", adc12Data[0], adc12Data[1] , adc5Data[2]);
     if (mbGetFrameComplete(&modbusData) == true)
     {
@@ -258 +323 @@
 
 /* USER CODE BEGIN 4 */
-
+ void HAL_ADC_ConvCpltCallback(ADC_HandleTypeDef* hadc)
+ {
+    if (hadc->Instance==ADC1)
+        {
+          newADC1Data=1;
+        }
+
+        if (hadc->Instance==ADC2)
+        {
+          newADC2Data=1;
+        }
+ }
+
+
+ 
+/**
+
+  * @brief  Set flash read protection.
+
+  * @param  [in] state: Flash read protection state, true: enable protection, false: disable protection.
+
+  * @retval true:  Successful operation.
+
+  * @retval false: Operation failed.
+
+  */
+
+bool SetFlashReadProtection(bool state)
+{
+
+  FLASH_OBProgramInitTypeDef OptionsBytesStruct = {0};
+  HAL_FLASHEx_OBGetConfig(&OptionsBytesStruct);
+
+  if(state == true)
+  {
+    printf("Start enable readout protection\n");
+    if(OptionsBytesStruct.RDPLevel == OB_RDP_LEVEL_0)
+    {
+      OptionsBytesStruct.OptionType = OPTIONBYTE_RDP;
+      OptionsBytesStruct.RDPLevel   = OB_RDP_LEVEL_1;
+      if (HAL_FLASH_Unlock() != HAL_OK)
+      {
+        printf("Flash unlock error\n");
+      }
+      if (HAL_FLASH_OB_Unlock() != HAL_OK)
+      {
+        printf("Flash ob unlock error\n");
+      }
+
+      printf("...Flash unlock\n");
+      if(HAL_FLASHEx_OBProgram(&OptionsBytesStruct) != HAL_OK)
+      {
+        printf("...Enable lock error\n");
+        HAL_FLASH_OB_Lock();
+        return false;
+      }
+      HAL_FLASH_OB_Lock();
+      printf("Flash Optionbyte locked\n");
+      HAL_FLASH_Lock();
+      printf("Flash  locked\n");
+      printf("...Enable lock process finished\n");
+    }
+    else
+    {
+      printf("...Flash lock already active\n");
+    }
+  }
+  else
+  {
+    if(OptionsBytesStruct.RDPLevel == OB_RDP_LEVEL_1)
+    {
+      OptionsBytesStruct.OptionType = OPTIONBYTE_RDP;
+      OptionsBytesStruct.RDPLevel   = OB_RDP_LEVEL_0;
+
+      if (HAL_FLASH_Unlock() != HAL_OK)
+      {
+        printf("Flash unlock error\n");
+        return false;
+      }
+      printf("...Flash unlocked\n");
+
+      if (HAL_FLASH_OB_Unlock() != HAL_OK)
+      {
+        printf("Flash ob unlock error\n");
+        return false;
+      }
+      printf("...Flash ob unlocked\n");
+
+      if(HAL_FLASHEx_OBProgram(&OptionsBytesStruct) != HAL_OK)
+      {
+        HAL_FLASH_OB_Lock();
+        printf("Flash Optionbyte programm failed\n");
+        return false;
+      }
+
+      printf("Flash Optionbyte programmed\n");
+      HAL_FLASH_OB_Lock();
+      printf("Flash Optionbyte locked\n");
+      HAL_FLASH_Lock();
+      printf("Flash  locked\n");
+      printf("...Disable lock process finished\n");
+
+;
+    }
+  }
+  return true;
+}
+
+bool SetBootFromFlashAndReadOutProtection(void)
+{
+
+  FLASH_OBProgramInitTypeDef OptionsBytesStruct = {0};
+  HAL_FLASHEx_OBGetConfig(&OptionsBytesStruct);
+
+  //Konfiguriere RDP fr Readoutprotection and USER OPTION BYTE FR Boot from Flash
+  OptionsBytesStruct.OptionType = OPTIONBYTE_USER | OPTIONBYTE_RDP;
+
+  //Set Readout Protection Level 1
+  OptionsBytesStruct.OptionType = OPTIONBYTE_USER|OPTIONBYTE_RDP;
+  OptionsBytesStruct.RDPLevel   = OB_RDP_LEVEL_1;
+
+  //Selecting Boot from Main Flash Memory
+  OptionsBytesStruct.USERType =    OB_USER_nBOOT0 | OB_USER_nSWBOOT0 | OB_USER_nBOOT1 ;
+  OptionsBytesStruct.USERConfig  = OB_USER_nBOOT0 | OB_USER_nSWBOOT0;
+
+  if (HAL_FLASH_Unlock() != HAL_OK)
+  {
+    printf("Flash unlock error\n");
+  }
+  if (HAL_FLASH_OB_Unlock() != HAL_OK)
+  {
+    printf("Flash ob unlock error\n");
+  }
+
+  printf("...Flash unlock\n");
+  if(HAL_FLASHEx_OBProgram(&OptionsBytesStruct) != HAL_OK)
+  {
+    printf("...Enable lock error\n");
+    HAL_FLASH_OB_Lock();
+    return false;
+  }
+  HAL_FLASH_OB_Lock();
+  printf("Flash Optionbyte locked\n");
+  HAL_FLASH_Lock();
+  printf("Flash  locked\n");
+  printf("...Enable lock process finished\n");
+
+  return true;
+}
+uint8_t printprotectionstate(void)
+{
+  FLASH_OBProgramInitTypeDef OptionsBytesStruct = {0};
+  HAL_FLASHEx_OBGetConfig(&OptionsBytesStruct);
+  uint8_t result = 0;
+
+  if(OptionsBytesStruct.RDPLevel == OB_RDP_LEVEL_0)
+  {
+    //OptionsBytesStruct.OptionType = OPTIONBYTE_RDP;
+    //OptionsBytesStruct.RDPLevel   = OB_RDP_LEVEL_1;
+    printf("PROTECTION: OB_RDP_LEVEL_0\n");
+    result = 0;
+  }
+  else if(OptionsBytesStruct.RDPLevel == OB_RDP_LEVEL_1)
+  {
+    printf("PROTECTION: OB_RDP_LEVEL_1\n");
+    result = 1;
+  }
+  else if(OptionsBytesStruct.RDPLevel == OB_RDP_LEVEL_2)
+  {
+    printf("PROTECTION: OB_RDP_LEVEL_2\n");
+    result = 2;
+  }
+  return  result;
+}
 
 /* USER CODE END 4 */