hardfault исправлен, передавался неправильный указатель в функции Dallas_ReplaceLostedSensor

примерная примерная такая же по размеру структура данных модбас которая будет в итоге, все помещается
hardfault при отключении датчика
2025-03-03 13:52:22 +03:00 · 2025-03-03 13:48:21 +03:00 · 2025-03-03 13:45:03 +03:00
12 changed files with 177 additions and 109 deletions
--- a/Core/Dallas/dallas_tools.c
+++ b/Core/Dallas/dallas_tools.c
@@ -41,7 +41,7 @@ HAL_StatusTypeDef Dallas_ReplaceLostedSensor(DALLAS_SensorHandleTypeDef *sensor)
    if(DS18B20_Search(&DS, &OW) != HAL_OK)
      return HAL_ERROR;
    
-    if(sensor->Init.init_func(sensor->hdallas->onewire, sensor) != HAL_OK)
+    if(sensor->Init.init_func(sensor->hdallas, sensor) != HAL_OK)
      return HAL_ERROR;
    
    return HAL_OK;
--- a/Core/Dallas/ds18b20_driver.c
+++ b/Core/Dallas/ds18b20_driver.c
@@ -17,6 +17,9 @@ OneWire_t OW;
  */
 HAL_StatusTypeDef DS18B20_IsValidAddress(uint8_t *ROM)
 {
+  if(ROM == NULL)
+    return HAL_ERROR;
+  
  uint8_t check_family = (*ROM == DS18B20_FAMILY_CODE);
 	/* Calculate CRC */
 	uint8_t crc = OneWire_CRC8(ROM, 7);
@@ -34,6 +37,9 @@ HAL_StatusTypeDef DS18B20_IsValidAddress(uint8_t *ROM)
  */
 HAL_StatusTypeDef DS18B20_IsValid(uint8_t *ROM)
 {
+  if(ROM == NULL)
+    return HAL_ERROR;
+  
  if(*ROM == DS18B20_FAMILY_CODE)
    return HAL_OK;
  else
@@ -49,6 +55,11 @@ HAL_StatusTypeDef DS18B20_IsValid(uint8_t *ROM)
 uint8_t DS18B20_GetResolution(OneWire_t* OW, uint8_t *ROM) {
 	uint8_t conf;

+  if(OW == NULL)
+    return HAL_ERROR;
+  if(ROM == NULL)
+    return HAL_ERROR;
+  
 	/* Check valid ROM */
 	if (DS18B20_IsValid(ROM) != HAL_OK) 
    return 0;
@@ -85,6 +96,11 @@ uint8_t DS18B20_GetResolution(OneWire_t* OW, uint8_t *ROM) {
 HAL_StatusTypeDef DS18B20_SetResolution(OneWire_t* OW, uint8_t *ROM,
 		DS18B20_Res_t Resolution)
 {
+  if(OW == NULL)
+    return HAL_ERROR;
+  if(ROM == NULL)
+    return HAL_ERROR;
+  
 	uint8_t th, tl, conf;

 	/* Check valid ROM */
@@ -146,6 +162,11 @@ HAL_StatusTypeDef DS18B20_SetResolution(OneWire_t* OW, uint8_t *ROM,
  */
 HAL_StatusTypeDef DS18B20_StartConvT(OneWire_t* OW, uint8_t *ROM)
 {
+  if(OW == NULL)
+    return HAL_ERROR;
+  if(ROM == NULL)
+    return HAL_ERROR;
+  
 	/* Check if device is DS18B20 */
 	if(DS18B20_IsValid(ROM) != HAL_OK)
    return HAL_ERROR;
@@ -167,6 +188,9 @@ HAL_StatusTypeDef DS18B20_StartConvT(OneWire_t* OW, uint8_t *ROM)
  */
 HAL_StatusTypeDef DS18B20_StartConvTAll(OneWire_t* OW)
 {
+  if(OW == NULL)
+    return HAL_ERROR;
+  
 	/* Reset pulse */
 	OneWire_Reset(OW);

@@ -189,6 +213,15 @@ HAL_StatusTypeDef DS18B20_StartConvTAll(OneWire_t* OW)
  */
 HAL_StatusTypeDef DS18B20_CalcTemperature(OneWire_t* OW, uint8_t *ROM, uint8_t *Scratchpad, float *Destination)
 {
+  if(OW == NULL)
+    return HAL_ERROR;
+  if(ROM == NULL)
+    return HAL_ERROR;
+  if(Scratchpad == NULL)
+    return HAL_ERROR;
+  if(Destination == NULL)
+    return HAL_ERROR;
+  
 	uint16_t temperature;
 	uint8_t resolution;
 	int8_t digit, minus = 0;
@@ -265,6 +298,10 @@ HAL_StatusTypeDef DS18B20_CalcTemperature(OneWire_t* OW, uint8_t *ROM, uint8_t *
  */
 HAL_StatusTypeDef DS18B20_ReadScratchpad(OneWire_t* OW, uint8_t *ROM, uint8_t *Scratchpad)
 {
+  if(OW == NULL)
+    return HAL_ERROR;
+  if(ROM == NULL)
+    return HAL_ERROR;
  if(Scratchpad == NULL)
    return HAL_ERROR;
  
@@ -301,6 +338,8 @@ HAL_StatusTypeDef DS18B20_ReadScratchpad(OneWire_t* OW, uint8_t *ROM, uint8_t *S
  */
 HAL_StatusTypeDef DS18B20_WaitForEndConvertion(OneWire_t* OW)
 {
+  if(OW == NULL)
+    return HAL_ERROR;
  uint32_t tickstart = HAL_GetTick();
  
 	/* Wait until line is released, then coversion is completed */
@@ -326,6 +365,11 @@ HAL_StatusTypeDef DS18B20_WaitForEndConvertion(OneWire_t* OW)
 HAL_StatusTypeDef DS18B20_SetTempAlarm(OneWire_t* OW, uint8_t *ROM, int8_t Low,
 		int8_t High)
 {
+  if(OW == NULL)
+    return HAL_ERROR;
+  if(ROM == NULL)
+    return HAL_ERROR;
+  
 	uint8_t tl, th, conf;

 	/* Check if device is DS18B20 */
@@ -394,6 +438,11 @@ HAL_StatusTypeDef DS18B20_SetTempAlarm(OneWire_t* OW, uint8_t *ROM, int8_t Low,
 HAL_StatusTypeDef DS18B20_WriteUserBytes(OneWire_t* OW, uint8_t *ROM, int16_t UserBytes12,
 		int16_t UserBytes34, uint8_t UserBytesMask)
 {
+  if(OW == NULL)
+    return HAL_ERROR;
+  if(ROM == NULL)
+    return HAL_ERROR;
+  
 	uint8_t ub1, ub2, conf, ub3, ub4;
  uint8_t UserByte1 = UserBytes12 & 0xFF;
  uint8_t UserByte2 = UserBytes12 >> 8;
@@ -512,6 +561,10 @@ HAL_StatusTypeDef DS18B20_WriteUserBytes(OneWire_t* OW, uint8_t *ROM, int16_t Us
  */
 HAL_StatusTypeDef DS18B20_Search(DS18B20_Drv_t *DS, OneWire_t *OW)
 {
+  if(OW == NULL)
+    return HAL_ERROR;
+  
+  
  OW->RomCnt = 0;
 	/* Search all OneWire devices ROM */
 	while(1)
--- a/Core/Dallas/pch_sensors.c
+++ b/Core/Dallas/pch_sensors.c
@@ -133,8 +133,6 @@ HAL_StatusTypeDef PCHSens_ReadTemperature(PCHSens_ModuleTypeDef *module)
  if(module == NULL)
    return HAL_ERROR;
  
-  result = Dallas_StartConvertTAll(module->hdallas, DALLAS_WAIT_BUS, 0);
-  
  result = PCHSens_SensorHandleActions(module->hdallas, &module->sens1);
  result = PCHSens_SensorHandleActions(module->hdallas, &module->sens2);
  result = PCHSens_SensorHandleActions(module->hdallas, &module->sens3);
@@ -143,7 +141,10 @@ HAL_StatusTypeDef PCHSens_ReadTemperature(PCHSens_ModuleTypeDef *module)
  return result;
 }

-
+HAL_StatusTypeDef PCHSens_Covert(PCHSens_DallasBusHandle *hbus)
+{
+  return Dallas_StartConvertTAll(hbus->hdallas, DALLAS_WAIT_BUS, 0);
+}
 HAL_StatusTypeDef PCHSens_CheckSensor(DALLAS_HandleTypeDef *hdallas, PCHSens_SensorTypeDef* sensor)
 {
  HAL_StatusTypeDef result;
@@ -272,7 +273,8 @@ void PCHSens_FirstInit(void)
 	OneWire_Init(&OW);
  DS18B20_Search(&DS, &OW);
  
-  hdallas1.onewire = &OW;
+  DallasBus.hdallas = &hdallas1;
+  DallasBus.hdallas->onewire = &OW;
  PCHSens_InitModule(&hdallas1, &module1, REG_PCH_NUMB_11|REG_PCH_DIODE_NUMB_1);
  
  PCHSens_FindUnknownSensors(&DallasBus);
--- a/Core/Dallas/pch_sensors.h
+++ b/Core/Dallas/pch_sensors.h
@@ -164,6 +164,7 @@ HAL_StatusTypeDef PCHSens_InitNewSensor(DALLAS_HandleTypeDef *hdallas, PCHSens_S
 HAL_StatusTypeDef PCHSens_AddSensor(DALLAS_HandleTypeDef *hdallas, PCHSens_SensorTypeDef* sensor);
 HAL_StatusTypeDef PCHSens_InitModule(DALLAS_HandleTypeDef *hdallas, PCHSens_ModuleTypeDef* module, uint16_t param);
 HAL_StatusTypeDef PCHSens_ReadTemperature(PCHSens_ModuleTypeDef *module);
+HAL_StatusTypeDef PCHSens_Covert(PCHSens_DallasBusHandle *hbus);
 HAL_StatusTypeDef PCHSens_CheckSensor(DALLAS_HandleTypeDef *hdallas, PCHSens_SensorTypeDef* sensor);
 HAL_StatusTypeDef PCHSens_FindUnknownSensors(PCHSens_DallasBusHandle *hbus);
 HAL_StatusTypeDef PCHSens_DefineUnknownSensor(PCHSens_DallasBusHandle *hbus, PCHSens_SensorTypeDef *sensor);
--- a/Core/Inc/main.h
+++ b/Core/Inc/main.h
@@ -31,7 +31,7 @@ extern "C" {

 /* Includes ------------------------------------------------------------------*/
 #include "py32f0xx_hal.h"
-
+#include "interface_config.h"
 /* Private includes ----------------------------------------------------------*/
 /* Private defines -----------------------------------------------------------*/
 #define GPIO_LED_2 GPIO_PIN_1
--- a/Core/Modbus/interface_config.h
+++ b/Core/Modbus/interface_config.h
@@ -21,23 +21,16 @@
 #define MODBUS_VENDOR_NAME            "NIO-12"
 #define MODBUS_PRODUCT_CODE           "12345"
 #define MODBUS_REVISION               "Ver. 1.0"
-#define MODBUS_VENDOR_URL             "https://git.arktika.cyou/Andrey/Diod_Test"
-#define MODBUS_PRODUCT_NAME           "Diode Tester"
-#define MODBUS_MODEL_NAME             "STM32F103"
-#define MODBUS_USER_APPLICATION_NAME  "diode_tester"
+#define MODBUS_VENDOR_URL             "https://git.arktika.cyou/set506/DS18B20_Library/src/branch/py32f002b_dallas"
+#define MODBUS_PRODUCT_NAME           "Dallas Driver"
+#define MODBUS_MODEL_NAME             "PY32F002B"
+#define MODBUS_USER_APPLICATION_NAME  "PY32Dallas"

-//#define MODBUS_UART_NUMB 							1							///< Номер используемого UART, по нему выставляется дефайн USED_MB_UART = USARTx
 #define MODBUS_SPEED									115200			  ///< Скорость UART для модбас
-//#define MODBUS_GPIOX									GPIOA					///< Порт для UART RX/TX
-//#define MODBUS_GPIO_PIN_RX						GPIO_PIN_9		///< Пин для UART RX
-//#define MODBUS_GPIO_PIN_TX						GPIO_PIN_10		///< Пин для UART TX
-
-//#define MODBUS_TIM_NUMB 							2							///< number of used tim, accord to this define sets define USED_MB_TIM = TIMx 
-//#define MODBUS_TIM_AHB_FREQ						72						///< TIM AHB Bus Freq
-
 // defines for modbus behaviour 
 #define MODBUS_DEVICE_ID 							1			///< девайс текущего устройства
-//#define MODBUS_MAX_TIMEOUT 						500 	///< максимальнйы тайтаут MB is ms
+
+#define MODBUS_DATA_SIZE              27 ///< maximum number of data: DWORD (NOT MESSAGE SIZE)


 #define RS_UART_Init                  MX_USART1_UART_Init
--- a/Core/Modbus/modbus.h
+++ b/Core/Modbus/modbus.h
@@ -37,7 +37,7 @@
 #define	Addr_SIZE								2						///< size of (Addr)
 #define Qnt_SIZE								2						///< size of (Qnt)
 #define ByteCnt_SIZE						1						///< size of (ByteCnt)
-#define DATA_SIZE 							27 				///< maximum number of data: DWORD (NOT MESSAGE SIZE)
+#define DATA_SIZE 							MODBUS_DATA_SIZE 				///< maximum number of data: DWORD (NOT MESSAGE SIZE)
 #define CRC_SIZE 								2 					///< size of (MB_CRC) in bytes

 /** @brief Size of whole message */
--- a/Core/Modbus/modbus_data.h
+++ b/Core/Modbus/modbus_data.h
@@ -13,8 +13,9 @@

 #ifndef _MODBUS_DATA_H_
 #define _MODBUS_DATA_H_
-  
+
 #include "stdint.h"
+#include "ds18b20_driver.h"
 //--------------DEFINES FOR REGISTERS---------------
 // DEFINES FOR ARRAYS
 /** 
@@ -37,8 +38,8 @@
  */
 typedef struct //MB_DataInRegsTypeDef
 {
-  uint16_t ForwardVoltage;
-  uint16_t ReversePeakVoltage;
+  uint16_t SensTemperature[DS18B20_DEVICE_AMOUNT];
+  uint16_t Resolution;
 }MB_DataInRegsTypeDef;


--- a/Core/Src/main.c
+++ b/Core/Src/main.c
@@ -58,17 +58,20 @@ int main(void)
  RS_Receive_IT(&hmodbus1, &MODBUS_MSG);
  

-//  PCHSens_FirstInit();
+  PCHSens_FirstInit();
  /* infinite loop */
  while (1)
  {
    GPIOA->ODR ^= GPIO_LED_2;
+    
+    PCHSens_Covert(&DallasBus);
+    
    PCHSens_ReadTemperature(&module1);
-    PCHSens_ReadTemperature(&module2);
-    PCHSens_ReadTemperature(&module3);
-    PCHSens_ReadTemperature(&module4);
-    PCHSens_ReadTemperature(&module5);
-    PCHSens_ReadTemperature(&module6);
+//    PCHSens_ReadTemperature(&module2);
+//    PCHSens_ReadTemperature(&module3);
+//    PCHSens_ReadTemperature(&module4);
+//    PCHSens_ReadTemperature(&module5);
+//    PCHSens_ReadTemperature(&module6);
    
  }
 }
--- a/Core/Src/usart.c
+++ b/Core/Src/usart.c
@@ -19,7 +19,6 @@
 /* USER CODE END Header */
 /* Includes ------------------------------------------------------------------*/
 #include "usart.h"
-
 /* USER CODE BEGIN 0 */

 /* USER CODE END 0 */
@@ -39,7 +38,7 @@ void MX_USART1_UART_Init(void)

  /* USER CODE END USART1_Init 1 */
  huart1.Instance = USART1;
-  huart1.Init.BaudRate = 115200;
+  huart1.Init.BaudRate = MODBUS_SPEED;
  huart1.Init.WordLength = UART_WORDLENGTH_8B;
  huart1.Init.StopBits = UART_STOPBITS_1;
  huart1.Init.Parity = UART_PARITY_NONE;
--- a/MDK-ARM/PY32Dallas.uvoptx
+++ b/MDK-ARM/PY32Dallas.uvoptx
@@ -153,7 +153,24 @@
          <Name>(105=-1,-1,-1,-1,0)</Name>
        </SetRegEntry>
      </TargetDriverDllRegistry>
-      <Breakpoint/>
+      <Breakpoint>
+        <Bp>
+          <Number>0</Number>
+          <Type>0</Type>
+          <LineNumber>152</LineNumber>
+          <EnabledFlag>1</EnabledFlag>
+          <Address>134221440</Address>
+          <ByteObject>0</ByteObject>
+          <HtxType>0</HtxType>
+          <ManyObjects>0</ManyObjects>
+          <SizeOfObject>0</SizeOfObject>
+          <BreakByAccess>0</BreakByAccess>
+          <BreakIfRCount>1</BreakIfRCount>
+          <Filename>..\Core\Dallas\dallas_tools.c</Filename>
+          <ExecCommand></ExecCommand>
+          <Expression>\\Project\../Core/Dallas/dallas_tools.c\152</Expression>
+        </Bp>
+      </Breakpoint>
      <WatchWindow1>
        <Ww>
          <count>0</count>
@@ -188,45 +205,40 @@
        <Ww>
          <count>6</count>
          <WinNumber>1</WinNumber>
-          <ItemText>\\Project\../Core/Dallas/pch_sensors.c\module1.sens1.action.connectROM</ItemText>
+          <ItemText>start,0x0A</ItemText>
        </Ww>
        <Ww>
          <count>7</count>
          <WinNumber>1</WinNumber>
-          <ItemText>start,0x0A</ItemText>
+          <ItemText>end,0x0A</ItemText>
        </Ww>
        <Ww>
          <count>8</count>
          <WinNumber>1</WinNumber>
-          <ItemText>end,0x0A</ItemText>
+          <ItemText>(uint16_t)htim1.Instance-&gt;CNT-start,0x0A</ItemText>
        </Ww>
        <Ww>
          <count>9</count>
          <WinNumber>1</WinNumber>
-          <ItemText>(uint16_t)htim1.Instance-&gt;CNT-start,0x0A</ItemText>
+          <ItemText>end-start,0x0A</ItemText>
        </Ww>
        <Ww>
          <count>10</count>
          <WinNumber>1</WinNumber>
-          <ItemText>end-start,0x0A</ItemText>
+          <ItemText>((uint16_t)htim1.Instance-&gt;CNT-start &lt;(end-start)),0x0A</ItemText>
        </Ww>
        <Ww>
          <count>11</count>
          <WinNumber>1</WinNumber>
-          <ItemText>((uint16_t)htim1.Instance-&gt;CNT-start &lt;(end-start)),0x0A</ItemText>
+          <ItemText>((uint16_t)htim1.Instance-&gt;CNT-start &lt; us*tim_1us_period),0x0A</ItemText>
        </Ww>
        <Ww>
          <count>12</count>
          <WinNumber>1</WinNumber>
-          <ItemText>((uint16_t)htim1.Instance-&gt;CNT-start &lt; us*tim_1us_period),0x0A</ItemText>
-        </Ww>
-        <Ww>
-          <count>13</count>
-          <WinNumber>1</WinNumber>
          <ItemText>(uint16_t)htim1.Instance-&gt;CNT-start,0x0A</ItemText>
        </Ww>
        <Ww>
-          <count>14</count>
+          <count>13</count>
          <WinNumber>1</WinNumber>
          <ItemText>hmodbus1</ItemText>
        </Ww>
@@ -235,7 +247,7 @@
        <Ww>
          <count>0</count>
          <WinNumber>2</WinNumber>
-          <ItemText>UnknownSensors</ItemText>
+          <ItemText>DallasBus</ItemText>
        </Ww>
        <Ww>
          <count>1</count>
@@ -296,6 +308,10 @@
      <pSingCmdsp></pSingCmdsp>
      <pMultCmdsp></pMultCmdsp>
      <SystemViewers>
+        <Entry>
+          <Name>System Viewer\TIM14</Name>
+          <WinId>35904</WinId>
+        </Entry>
        <Entry>
          <Name>System Viewer\USART1</Name>
          <WinId>35905</WinId>
@@ -348,6 +364,30 @@
      <tvExp>0</tvExp>
      <tvExpOptDlg>0</tvExpOptDlg>
      <bDave2>0</bDave2>
+      <PathWithFileName>..\Core\Modbus\interface_config.h</PathWithFileName>
+      <FilenameWithoutPath>interface_config.h</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>1</GroupNumber>
+      <FileNumber>4</FileNumber>
+      <FileType>5</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\Core\Modbus\modbus_data.h</PathWithFileName>
+      <FilenameWithoutPath>modbus_data.h</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>1</GroupNumber>
+      <FileNumber>5</FileNumber>
+      <FileType>5</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
      <PathWithFileName>..\Core\Inc\py32f002b_hal_conf.h</PathWithFileName>
      <FilenameWithoutPath>py32f002b_hal_conf.h</FilenameWithoutPath>
      <RteFlg>0</RteFlg>
@@ -363,7 +403,7 @@
    <RteFlg>0</RteFlg>
    <File>
      <GroupNumber>2</GroupNumber>
-      <FileNumber>4</FileNumber>
+      <FileNumber>6</FileNumber>
      <FileType>1</FileType>
      <tvExp>0</tvExp>
      <tvExpOptDlg>0</tvExpOptDlg>
@@ -375,7 +415,7 @@
    </File>
    <File>
      <GroupNumber>2</GroupNumber>
-      <FileNumber>5</FileNumber>
+      <FileNumber>7</FileNumber>
      <FileType>1</FileType>
      <tvExp>0</tvExp>
      <tvExpOptDlg>0</tvExpOptDlg>
@@ -387,7 +427,7 @@
    </File>
    <File>
      <GroupNumber>2</GroupNumber>
-      <FileNumber>6</FileNumber>
+      <FileNumber>8</FileNumber>
      <FileType>1</FileType>
      <tvExp>0</tvExp>
      <tvExpOptDlg>0</tvExpOptDlg>
@@ -399,7 +439,7 @@
    </File>
    <File>
      <GroupNumber>2</GroupNumber>
-      <FileNumber>7</FileNumber>
+      <FileNumber>9</FileNumber>
      <FileType>1</FileType>
      <tvExp>0</tvExp>
      <tvExpOptDlg>0</tvExpOptDlg>
@@ -411,7 +451,7 @@
    </File>
    <File>
      <GroupNumber>2</GroupNumber>
-      <FileNumber>8</FileNumber>
+      <FileNumber>10</FileNumber>
      <FileType>1</FileType>
      <tvExp>0</tvExp>
      <tvExpOptDlg>0</tvExpOptDlg>
@@ -423,7 +463,7 @@
    </File>
    <File>
      <GroupNumber>2</GroupNumber>
-      <FileNumber>9</FileNumber>
+      <FileNumber>11</FileNumber>
      <FileType>1</FileType>
      <tvExp>0</tvExp>
      <tvExpOptDlg>0</tvExpOptDlg>
@@ -443,7 +483,7 @@
    <RteFlg>0</RteFlg>
    <File>
      <GroupNumber>3</GroupNumber>
-      <FileNumber>10</FileNumber>
+      <FileNumber>12</FileNumber>
      <FileType>1</FileType>
      <tvExp>0</tvExp>
      <tvExpOptDlg>0</tvExpOptDlg>
@@ -455,7 +495,7 @@
    </File>
    <File>
      <GroupNumber>3</GroupNumber>
-      <FileNumber>11</FileNumber>
+      <FileNumber>13</FileNumber>
      <FileType>1</FileType>
      <tvExp>0</tvExp>
      <tvExpOptDlg>0</tvExpOptDlg>
@@ -467,7 +507,7 @@
    </File>
    <File>
      <GroupNumber>3</GroupNumber>
-      <FileNumber>12</FileNumber>
+      <FileNumber>14</FileNumber>
      <FileType>1</FileType>
      <tvExp>0</tvExp>
      <tvExpOptDlg>0</tvExpOptDlg>
@@ -479,7 +519,7 @@
    </File>
    <File>
      <GroupNumber>3</GroupNumber>
-      <FileNumber>13</FileNumber>
+      <FileNumber>15</FileNumber>
      <FileType>1</FileType>
      <tvExp>0</tvExp>
      <tvExpOptDlg>0</tvExpOptDlg>
@@ -491,7 +531,7 @@
    </File>
    <File>
      <GroupNumber>3</GroupNumber>
-      <FileNumber>14</FileNumber>
+      <FileNumber>16</FileNumber>
      <FileType>1</FileType>
      <tvExp>0</tvExp>
      <tvExpOptDlg>0</tvExpOptDlg>
@@ -503,7 +543,7 @@
    </File>
    <File>
      <GroupNumber>3</GroupNumber>
-      <FileNumber>15</FileNumber>
+      <FileNumber>17</FileNumber>
      <FileType>1</FileType>
      <tvExp>0</tvExp>
      <tvExpOptDlg>0</tvExpOptDlg>
@@ -515,7 +555,7 @@
    </File>
    <File>
      <GroupNumber>3</GroupNumber>
-      <FileNumber>16</FileNumber>
+      <FileNumber>18</FileNumber>
      <FileType>1</FileType>
      <tvExp>0</tvExp>
      <tvExpOptDlg>0</tvExpOptDlg>
@@ -527,7 +567,7 @@
    </File>
    <File>
      <GroupNumber>3</GroupNumber>
-      <FileNumber>17</FileNumber>
+      <FileNumber>19</FileNumber>
      <FileType>1</FileType>
      <tvExp>0</tvExp>
      <tvExpOptDlg>0</tvExpOptDlg>
@@ -539,7 +579,7 @@
    </File>
    <File>
      <GroupNumber>3</GroupNumber>
-      <FileNumber>18</FileNumber>
+      <FileNumber>20</FileNumber>
      <FileType>1</FileType>
      <tvExp>0</tvExp>
      <tvExpOptDlg>0</tvExpOptDlg>
@@ -551,7 +591,7 @@
    </File>
    <File>
      <GroupNumber>3</GroupNumber>
-      <FileNumber>19</FileNumber>
+      <FileNumber>21</FileNumber>
      <FileType>1</FileType>
      <tvExp>0</tvExp>
      <tvExpOptDlg>0</tvExpOptDlg>
@@ -571,7 +611,7 @@
    <RteFlg>0</RteFlg>
    <File>
      <GroupNumber>4</GroupNumber>
-      <FileNumber>20</FileNumber>
+      <FileNumber>22</FileNumber>
      <FileType>1</FileType>
      <tvExp>0</tvExp>
      <tvExpOptDlg>0</tvExpOptDlg>
@@ -583,7 +623,7 @@
    </File>
    <File>
      <GroupNumber>4</GroupNumber>
-      <FileNumber>21</FileNumber>
+      <FileNumber>23</FileNumber>
      <FileType>5</FileType>
      <tvExp>0</tvExp>
      <tvExpOptDlg>0</tvExpOptDlg>
@@ -595,7 +635,7 @@
    </File>
    <File>
      <GroupNumber>4</GroupNumber>
-      <FileNumber>22</FileNumber>
+      <FileNumber>24</FileNumber>
      <FileType>1</FileType>
      <tvExp>0</tvExp>
      <tvExpOptDlg>0</tvExpOptDlg>
@@ -607,7 +647,7 @@
    </File>
    <File>
      <GroupNumber>4</GroupNumber>
-      <FileNumber>23</FileNumber>
+      <FileNumber>25</FileNumber>
      <FileType>5</FileType>
      <tvExp>0</tvExp>
      <tvExpOptDlg>0</tvExpOptDlg>
@@ -619,7 +659,7 @@
    </File>
    <File>
      <GroupNumber>4</GroupNumber>
-      <FileNumber>24</FileNumber>
+      <FileNumber>26</FileNumber>
      <FileType>1</FileType>
      <tvExp>0</tvExp>
      <tvExpOptDlg>0</tvExpOptDlg>
@@ -631,7 +671,7 @@
    </File>
    <File>
      <GroupNumber>4</GroupNumber>
-      <FileNumber>25</FileNumber>
+      <FileNumber>27</FileNumber>
      <FileType>5</FileType>
      <tvExp>0</tvExp>
      <tvExpOptDlg>0</tvExpOptDlg>
@@ -643,7 +683,7 @@
    </File>
    <File>
      <GroupNumber>4</GroupNumber>
-      <FileNumber>26</FileNumber>
+      <FileNumber>28</FileNumber>
      <FileType>1</FileType>
      <tvExp>0</tvExp>
      <tvExpOptDlg>0</tvExpOptDlg>
@@ -655,7 +695,7 @@
    </File>
    <File>
      <GroupNumber>4</GroupNumber>
-      <FileNumber>27</FileNumber>
+      <FileNumber>29</FileNumber>
      <FileType>5</FileType>
      <tvExp>0</tvExp>
      <tvExpOptDlg>0</tvExpOptDlg>
@@ -667,7 +707,7 @@
    </File>
    <File>
      <GroupNumber>4</GroupNumber>
-      <FileNumber>28</FileNumber>
+      <FileNumber>30</FileNumber>
      <FileType>1</FileType>
      <tvExp>0</tvExp>
      <tvExpOptDlg>0</tvExpOptDlg>
@@ -679,7 +719,7 @@
    </File>
    <File>
      <GroupNumber>4</GroupNumber>
-      <FileNumber>29</FileNumber>
+      <FileNumber>31</FileNumber>
      <FileType>5</FileType>
      <tvExp>0</tvExp>
      <tvExpOptDlg>0</tvExpOptDlg>
@@ -699,7 +739,7 @@
    <RteFlg>0</RteFlg>
    <File>
      <GroupNumber>5</GroupNumber>
-      <FileNumber>30</FileNumber>
+      <FileNumber>32</FileNumber>
      <FileType>1</FileType>
      <tvExp>0</tvExp>
      <tvExpOptDlg>0</tvExpOptDlg>
@@ -711,7 +751,7 @@
    </File>
    <File>
      <GroupNumber>5</GroupNumber>
-      <FileNumber>31</FileNumber>
+      <FileNumber>33</FileNumber>
      <FileType>5</FileType>
      <tvExp>0</tvExp>
      <tvExpOptDlg>0</tvExpOptDlg>
@@ -723,19 +763,7 @@
    </File>
    <File>
      <GroupNumber>5</GroupNumber>
-      <FileNumber>32</FileNumber>
-      <FileType>5</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>..\Core\Modbus\interface_config.h</PathWithFileName>
-      <FilenameWithoutPath>interface_config.h</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>5</GroupNumber>
-      <FileNumber>33</FileNumber>
+      <FileNumber>34</FileNumber>
      <FileType>1</FileType>
      <tvExp>0</tvExp>
      <tvExpOptDlg>0</tvExpOptDlg>
@@ -747,7 +775,7 @@
    </File>
    <File>
      <GroupNumber>5</GroupNumber>
-      <FileNumber>34</FileNumber>
+      <FileNumber>35</FileNumber>
      <FileType>5</FileType>
      <tvExp>0</tvExp>
      <tvExpOptDlg>0</tvExpOptDlg>
@@ -757,18 +785,6 @@
      <RteFlg>0</RteFlg>
      <bShared>0</bShared>
    </File>
-    <File>
-      <GroupNumber>5</GroupNumber>
-      <FileNumber>35</FileNumber>
-      <FileType>5</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>..\Core\Modbus\modbus_data.h</PathWithFileName>
-      <FilenameWithoutPath>modbus_data.h</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
    <File>
      <GroupNumber>5</GroupNumber>
      <FileNumber>36</FileNumber>
--- a/MDK-ARM/PY32Dallas.uvprojx
+++ b/MDK-ARM/PY32Dallas.uvprojx
@@ -395,6 +395,16 @@
              <FileType>1</FileType>
              <FilePath>..\Core\Src\system_py32f002b.c</FilePath>
            </File>
+            <File>
+              <FileName>interface_config.h</FileName>
+              <FileType>5</FileType>
+              <FilePath>..\Core\Modbus\interface_config.h</FilePath>
+            </File>
+            <File>
+              <FileName>modbus_data.h</FileName>
+              <FileType>5</FileType>
+              <FilePath>..\Core\Modbus\modbus_data.h</FilePath>
+            </File>
            <File>
              <FileName>py32f002b_hal_conf.h</FileName>
              <FileType>5</FileType>
@@ -560,11 +570,6 @@
              <FileType>5</FileType>
              <FilePath>..\Core\Modbus\crc_algs.h</FilePath>
            </File>
-            <File>
-              <FileName>interface_config.h</FileName>
-              <FileType>5</FileType>
-              <FilePath>..\Core\Modbus\interface_config.h</FilePath>
-            </File>
            <File>
              <FileName>modbus.c</FileName>
              <FileType>1</FileType>
@@ -575,11 +580,6 @@
              <FileType>5</FileType>
              <FilePath>..\Core\Modbus\modbus.h</FilePath>
            </File>
-            <File>
-              <FileName>modbus_data.h</FileName>
-              <FileType>5</FileType>
-              <FilePath>..\Core\Modbus\modbus_data.h</FilePath>
-            </File>
            <File>
              <FileName>rs_message.c</FileName>
              <FileType>1</FileType>
Author	SHA1	Message	Date
Razvalyaev	b96e00b166	hardfault исправлен, передавался неправильный указатель в функции Dallas_ReplaceLostedSensor	2025-03-03 13:52:22 +03:00
Razvalyaev	aa5b4b3fcb	примерная примерная такая же по размеру структура данных модбас которая будет в итоге, все помещается hardfault при отключении датчика	2025-03-03 13:48:21 +03:00
Razvalyaev	e4b2830fcc	добавил проверки на пустой указатель в драйвере ds18b20	2025-03-03 13:45:03 +03:00