Templates/DS18B20_Library
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Переструктурирован проект, перенесена ветка тестирования modbus и чуть скомпрессированная библиотека dallas

Browse Source
This commit is contained in:
Razvalyaev
2025-03-03 13:05:37 +03:00
parent 0f2736b8a5
commit b6978c385a
14 changed files with 387 additions and 4321 deletions
Download Patch File Download Diff File Expand all files Collapse all files

125
Core/Dallas/dallas_tools.c
View File

@@ -18,6 +18,7 @@
/* Declarations and definitions --------------------------------------------*/ /* Declarations and definitions --------------------------------------------*/
DALLAS_HandleTypeDef hdallas1;
/* Functions ---------------------------------------------------------------*/ /* Functions ---------------------------------------------------------------*/
/** /**
@@ -25,7 +26,7 @@
* @param sensor Óêàçàòåëü íà ñòðóêòóðó äàò÷èêà * @param sensor Óêàçàòåëü íà ñòðóêòóðó äàò÷èêà
* @retval HAL Status * @retval HAL Status
*/ */
HAL_StatusTypeDef Dallas_ReplaceLostedSensor(DALLAS_HandleTypeDef *sensor) HAL_StatusTypeDef Dallas_ReplaceLostedSensor(DALLAS_SensorHandleTypeDef *sensor)
{ {
HAL_StatusTypeDef result; HAL_StatusTypeDef result;
@@ -40,7 +41,7 @@ HAL_StatusTypeDef Dallas_ReplaceLostedSensor(DALLAS_HandleTypeDef *sensor)
if(DS18B20_Search(&DS, &OW) != HAL_OK) if(DS18B20_Search(&DS, &OW) != HAL_OK)
return HAL_ERROR; return HAL_ERROR;
if(sensor->Init.init_func(sensor->onewire, sensor) != HAL_OK) if(sensor->Init.init_func(sensor->hdallas->onewire, sensor) != HAL_OK)
return HAL_ERROR; return HAL_ERROR;
return HAL_OK; return HAL_OK;
@@ -58,18 +59,18 @@ HAL_StatusTypeDef Dallas_ReplaceLostedSensor(DALLAS_HandleTypeDef *sensor)
* @param sensor Óêàçàòåëü íà ñòðóêòóðó äàò÷èêà * @param sensor Óêàçàòåëü íà ñòðóêòóðó äàò÷èêà
* @retval HAL Status * @retval HAL Status
*/ */
HAL_StatusTypeDef Dallas_AddNewSensors(OneWire_t *onewire, DALLAS_HandleTypeDef *sensor) HAL_StatusTypeDef Dallas_AddNewSensors(DALLAS_HandleTypeDef *hdallas, DALLAS_SensorHandleTypeDef *sensor)
{ {
HAL_StatusTypeDef result; HAL_StatusTypeDef result;
if(onewire == NULL) if(hdallas == NULL)
return HAL_ERROR; return HAL_ERROR;
if(sensor == NULL) if(sensor == NULL)
return HAL_ERROR; return HAL_ERROR;
sensor->onewire = onewire; sensor->hdallas = hdallas;
result = sensor->Init.init_func(onewire, sensor); result = sensor->Init.init_func(hdallas, sensor);
return result; return result;
} }
@@ -82,31 +83,31 @@ HAL_StatusTypeDef Dallas_AddNewSensors(OneWire_t *onewire, DALLAS_HandleTypeDef
* @param sensor Óêàçàòåëü íà ñòðóêòóðó äàò÷èêà * @param sensor Óêàçàòåëü íà ñòðóêòóðó äàò÷èêà
* @retval HAL Status * @retval HAL Status
*/ */
HAL_StatusTypeDef Dallas_SensorInitByROM(OneWire_t *onewire, DALLAS_HandleTypeDef *sensor) HAL_StatusTypeDef Dallas_SensorInitByROM(DALLAS_HandleTypeDef *hdallas, DALLAS_SensorHandleTypeDef *sensor)
{ {
HAL_StatusTypeDef result; HAL_StatusTypeDef result;
if(onewire == NULL) if(hdallas == NULL)
return HAL_ERROR; return HAL_ERROR;
if(sensor == NULL) if(sensor == NULL)
return HAL_ERROR; return HAL_ERROR;
uint8_t ROM[8] = {0}; uint8_t ROM[8] = {0};
ROM[0] = (sensor->Init.ROM >> (7*8)) & 0xFF; ROM[0] = (sensor->Init.InitParam >> (7*8)) & 0xFF;
ROM[1] = (sensor->Init.ROM >> (6*8)) & 0xFF; ROM[1] = (sensor->Init.InitParam >> (6*8)) & 0xFF;
ROM[2] = (sensor->Init.ROM >> (5*8)) & 0xFF; ROM[2] = (sensor->Init.InitParam >> (5*8)) & 0xFF;
ROM[3] = (sensor->Init.ROM >> (4*8)) & 0xFF; ROM[3] = (sensor->Init.InitParam >> (4*8)) & 0xFF;
ROM[4] = (sensor->Init.ROM >> (3*8)) & 0xFF; ROM[4] = (sensor->Init.InitParam >> (3*8)) & 0xFF;
ROM[5] = (sensor->Init.ROM >> (2*8)) & 0xFF; ROM[5] = (sensor->Init.InitParam >> (2*8)) & 0xFF;
ROM[6] = (sensor->Init.ROM >> (1*8)) & 0xFF; ROM[6] = (sensor->Init.InitParam >> (1*8)) & 0xFF;
ROM[7] = (sensor->Init.ROM >> (0*8)) & 0xFF; ROM[7] = (sensor->Init.InitParam >> (0*8)) & 0xFF;
if(DS18B20_IsValidAddress(ROM) != HAL_OK) if(DS18B20_IsValidAddress(ROM) != HAL_OK)
return HAL_ERROR; return HAL_ERROR;
uint8_t comparebytes = DALLAS_ROM_SIZE; uint8_t comparebytes = DALLAS_ROM_SIZE;
int ROM_ind = 0; int ROM_ind = 0;
for(int i = 0; i < onewire->RomCnt; i++) for(int i = 0; i < hdallas->onewire->RomCnt; i++)
{ {
comparebytes = DALLAS_ROM_SIZE; comparebytes = DALLAS_ROM_SIZE;
for(int rom_byte = 0; rom_byte < DALLAS_ROM_SIZE; rom_byte++) for(int rom_byte = 0; rom_byte < DALLAS_ROM_SIZE; rom_byte++)
@@ -125,7 +126,7 @@ HAL_StatusTypeDef Dallas_SensorInitByROM(OneWire_t *onewire, DALLAS_HandleTypeDe
if(comparebytes == 0) if(comparebytes == 0)
{ {
result = Dallas_SensorInit(onewire, sensor, &DS.DevAddr[ROM_ind]); result = Dallas_SensorInit(hdallas, sensor, &DS.DevAddr[ROM_ind]);
return result; return result;
} }
else else
@@ -144,35 +145,34 @@ HAL_StatusTypeDef Dallas_SensorInitByROM(OneWire_t *onewire, DALLAS_HandleTypeDe
* @param sensor Óêàçàòåëü íà ñòðóêòóðó äàò÷èêà * @param sensor Óêàçàòåëü íà ñòðóêòóðó äàò÷èêà
* @retval HAL Status * @retval HAL Status
*/ */
HAL_StatusTypeDef Dallas_SensorInitByUserBytes(OneWire_t *onewire, DALLAS_HandleTypeDef *sensor) HAL_StatusTypeDef Dallas_SensorInitByUserBytes(DALLAS_HandleTypeDef *hdallas, DALLAS_SensorHandleTypeDef *sensor)
{ {
HAL_StatusTypeDef result; HAL_StatusTypeDef result;
if(onewire == NULL) if(hdallas == NULL)
return HAL_ERROR; return HAL_ERROR;
if(sensor == NULL) if(sensor == NULL)
return HAL_ERROR; return HAL_ERROR;
uint8_t UserByte1 = sensor->Init.UserBytes12 & 0xFF; uint8_t UserByte1 = sensor->Init.InitParam & 0xFF;
uint8_t UserByte2 = sensor->Init.UserBytes12 >> 8; uint8_t UserByte2 = sensor->Init.InitParam >> 8;
uint8_t UserByte3 = sensor->Init.UserBytes34 & 0xFF; uint8_t UserByte3 = (sensor->Init.InitParam >> 16) & 0xFF;
uint8_t UserByte4 = sensor->Init.UserBytes34 >> 8; uint8_t UserByte4 = (sensor->Init.InitParam >> 16) >> 8;
uint8_t UserByte12Cmp = 0; uint8_t UserByte12Cmp = 0;
uint8_t UserByte34Cmp = 0; uint8_t UserByte34Cmp = 0;
DALLAS_ScratchpadTypeDef scratchpad; for(int i = 0; i < hdallas->onewire->RomCnt; i++)
for(int i = 0; i < onewire->RomCnt; i++)
{ {
/* Ïðîâåðêà ïðèñóòñòâóåò ëè âûáðàííûé äàò÷èê íà ëèíèè */ /* Ïðîâåðêà ïðèñóòñòâóåò ëè âûáðàííûé äàò÷èê íà ëèíèè */
result = DS18B20_ReadScratchpad(onewire, (uint8_t *)&DS.DevAddr[i], (uint8_t *)&scratchpad); result = DS18B20_ReadScratchpad(hdallas->onewire, (uint8_t *)&DS.DevAddr[i], (uint8_t *)&hdallas->scratchpad);
if (result != HAL_OK) if (result != HAL_OK)
return result; return result;
/* Ñðàâíåíèå UserByte1 è UserByte2, åñëè îíè íå ðàâíû íóëþ */ /* Ñðàâíåíèå UserByte1 è UserByte2, åñëè îíè íå ðàâíû íóëþ */
if(sensor->Init.UserBytes12 != NULL) if((sensor->Init.InitParam & 0xFFFF) != NULL)
{ {
if( (scratchpad.tHighRegister == UserByte1) && if( (hdallas->scratchpad.tHighRegister == UserByte1) &&
(scratchpad.tLowRegister == UserByte2)) (hdallas->scratchpad.tLowRegister == UserByte2))
{ {
UserByte12Cmp = 1; UserByte12Cmp = 1;
} }
@@ -182,10 +182,10 @@ HAL_StatusTypeDef Dallas_SensorInitByUserBytes(OneWire_t *onewire, DALLAS_Handle
UserByte12Cmp = 1; UserByte12Cmp = 1;
} }
/* Ñðàâíåíèå UserByte3 è UserByte4, åñëè îíè íå ðàâíû íóëþ */ /* Ñðàâíåíèå UserByte3 è UserByte4, åñëè îíè íå ðàâíû íóëþ */
if(sensor->Init.UserBytes34 != NULL) if((sensor->Init.InitParam & 0xFFFF0000) != NULL)
{ {
if( (scratchpad.UserByte3 == UserByte3) && if( (hdallas->scratchpad.UserByte3 == UserByte3) &&
(scratchpad.UserByte4 == UserByte4)) (hdallas->scratchpad.UserByte4 == UserByte4))
{ {
UserByte34Cmp = 1; UserByte34Cmp = 1;
} }
@@ -199,13 +199,12 @@ HAL_StatusTypeDef Dallas_SensorInitByUserBytes(OneWire_t *onewire, DALLAS_Handle
{ {
// sensor->isInitialized = 1; // sensor->isInitialized = 1;
// sensor->Init.init_func = (HAL_StatusTypeDef (*)())Dallas_SensorInitByUserBytes; // sensor->Init.init_func = (HAL_StatusTypeDef (*)())Dallas_SensorInitByUserBytes;
result = Dallas_SensorInit(onewire, sensor, &DS.DevAddr[i]); result = Dallas_SensorInit(hdallas, sensor, &DS.DevAddr[i]);
return result; return result;
} }
} }
sensor->sensROM = 0; sensor->sensROM = 0;
memset(&sensor->scratchpad, 0, sizeof(DALLAS_ScratchpadTypeDef));
/* Âîçâðàùàåì îøèáêó åñëè íå íàøëè */ /* Âîçâðàùàåì îøèáêó åñëè íå íàøëè */
return HAL_ERROR; return HAL_ERROR;
} }
@@ -218,20 +217,16 @@ HAL_StatusTypeDef Dallas_SensorInitByUserBytes(OneWire_t *onewire, DALLAS_Handle
* @details Ïîðÿäêîâûé íîìåð äàò÷èêà â ñïèñêå íàéäåííûõ. * @details Ïîðÿäêîâûé íîìåð äàò÷èêà â ñïèñêå íàéäåííûõ.
* Ò.å. êàêèì ïî ñ÷åòó ýòîò äàò÷èê áûë íàéäåí * Ò.å. êàêèì ïî ñ÷åòó ýòîò äàò÷èê áûë íàéäåí
*/ */
HAL_StatusTypeDef Dallas_SensorInitByInd(OneWire_t *onewire, DALLAS_HandleTypeDef *sensor) HAL_StatusTypeDef Dallas_SensorInitByInd(DALLAS_HandleTypeDef *hdallas, DALLAS_SensorHandleTypeDef *sensor)
{ {
HAL_StatusTypeDef result; HAL_StatusTypeDef result;
if(onewire == NULL) if(hdallas == NULL)
return HAL_ERROR; return HAL_ERROR;
if(sensor == NULL) if(sensor == NULL)
return HAL_ERROR; return HAL_ERROR;
// sensor->onewire = onewire; result = Dallas_SensorInit(hdallas, sensor, &DS.DevAddr[sensor->Init.InitParam]);
// sensor->sensROM = &DS.DevAddr[sensor->Init.SensInd];
// sensor->Init.init_func = (HAL_StatusTypeDef (*)())Dallas_SensorInitByInd;
result = Dallas_SensorInit(onewire, sensor, &DS.DevAddr[sensor->Init.SensInd]);
return result; return result;
} }
@@ -243,27 +238,27 @@ HAL_StatusTypeDef Dallas_SensorInitByInd(OneWire_t *onewire, DALLAS_HandleTypeDe
* @param ROM ROM äàò÷èêà, êîòîðûé íàäî èíèöèàëèçèðîâàòü * @param ROM ROM äàò÷èêà, êîòîðûé íàäî èíèöèàëèçèðîâàòü
* @retval HAL Status * @retval HAL Status
*/ */
HAL_StatusTypeDef Dallas_SensorInit(OneWire_t *onewire, DALLAS_HandleTypeDef *sensor, uint8_t (*ROM)[DALLAS_ROM_SIZE]) HAL_StatusTypeDef Dallas_SensorInit(DALLAS_HandleTypeDef *hdallas, DALLAS_SensorHandleTypeDef *sensor, uint8_t (*ROM)[DALLAS_ROM_SIZE])
{ {
HAL_StatusTypeDef result; HAL_StatusTypeDef result;
if(sensor == NULL) if(sensor == NULL)
return HAL_ERROR; return HAL_ERROR;
if(onewire == 0) if(hdallas == 0)
return HAL_ERROR; return HAL_ERROR;
sensor->onewire = onewire; sensor->hdallas = hdallas;
sensor->sensROM = 0; sensor->sensROM = 0;
sensor->sensROM = *(uint64_t *)(ROM); sensor->sensROM = *(uint64_t *)(ROM);
// for(int i = 0; i < DALLAS_ROM_SIZE; i++) // for(int i = 0; i < DALLAS_ROM_SIZE; i++)
// sensor->sensROM |= ((uint64_t)(*ROM)[i] << (56 - 8*i)); // sensor->sensROM |= ((uint64_t)(*ROM)[i] << (56 - 8*i));
/* Ïðîâåðêà ïðèñóòñòâóåò ëè âûáðàííûé äàò÷èê íà ëèíèè */ /* Ïðîâåðêà ïðèñóòñòâóåò ëè âûáðàííûé äàò÷èê íà ëèíèè */
result = DS18B20_ReadScratchpad(sensor->onewire, (uint8_t *)&sensor->sensROM, (uint8_t *)&sensor->scratchpad); result = DS18B20_ReadScratchpad(hdallas->onewire, (uint8_t *)&sensor->sensROM, (uint8_t *)&hdallas->scratchpad);
if (result == HAL_OK) if (result == HAL_OK)
{ {
/* Óñòàíîâêà ðàçðåøåíèÿ */ /* Óñòàíîâêà ðàçðåøåíèÿ */
result = DS18B20_SetResolution(onewire, (uint8_t *)ROM, sensor->Init.Resolution); result = DS18B20_SetResolution(hdallas->onewire, (uint8_t *)ROM, sensor->Init.Resolution);
if (result == HAL_OK) if (result == HAL_OK)
{ {
sensor->isInitialized = 1; sensor->isInitialized = 1;
@@ -289,14 +284,14 @@ HAL_StatusTypeDef Dallas_SensorInit(OneWire_t *onewire, DALLAS_HandleTypeDef *se
* @param sens_ind Ïîðÿäêîâûé íîìåð äàò÷èêà â ñòðóêòóðå * @param sens_ind Ïîðÿäêîâûé íîìåð äàò÷èêà â ñòðóêòóðå
* @retval HAL Status * @retval HAL Status
*/ */
HAL_StatusTypeDef Dallas_SensorDeInit(DALLAS_HandleTypeDef *sensor) HAL_StatusTypeDef Dallas_SensorDeInit(DALLAS_SensorHandleTypeDef *sensor)
{ {
if(sensor == NULL) if(sensor == NULL)
return HAL_ERROR; return HAL_ERROR;
DALLAS_InitStructTypeDef initbuff = sensor->Init; DALLAS_InitStructTypeDef initbuff = sensor->Init;
memset(sensor, 0, sizeof(DALLAS_HandleTypeDef)); memset(sensor, 0, sizeof(DALLAS_SensorHandleTypeDef));
sensor->Init = initbuff; sensor->Init = initbuff;
@@ -310,16 +305,16 @@ HAL_StatusTypeDef Dallas_SensorDeInit(DALLAS_HandleTypeDef *sensor)
* @param dallas_delay_ms Âðåìÿ îæèäàíèÿ îêîí÷àíèÿ êîíâåðñèè * @param dallas_delay_ms Âðåìÿ îæèäàíèÿ îêîí÷àíèÿ êîíâåðñèè
* @retval HAL Status * @retval HAL Status
*/ */
HAL_StatusTypeDef Dallas_StartConvertTAll(OneWire_t *onewire, DALLAS_WaitConvertionTypeDef waitCondition, uint8_t dallas_delay_ms) HAL_StatusTypeDef Dallas_StartConvertTAll(DALLAS_HandleTypeDef *hdallas, DALLAS_WaitConvertionTypeDef waitCondition, uint8_t dallas_delay_ms)
{ {
HAL_StatusTypeDef result; HAL_StatusTypeDef result;
uint8_t rxDummyData; uint8_t rxDummyData;
if(onewire == NULL) if(hdallas == NULL)
return HAL_ERROR; return HAL_ERROR;
// Îòïðàâêà êîìàíäû íà÷àëà ïðåîáðàçîâàíèÿ òåìïåðàòóðû // Îòïðàâêà êîìàíäû íà÷àëà ïðåîáðàçîâàíèÿ òåìïåðàòóðû
result = DS18B20_StartConvTAll(onewire); result = DS18B20_StartConvTAll(hdallas->onewire);
if(result != HAL_OK) if(result != HAL_OK)
{ {
return result; return result;
@@ -331,7 +326,7 @@ HAL_StatusTypeDef Dallas_StartConvertTAll(OneWire_t *onewire, DALLAS_WaitConvert
// Îæèäàíèå çàâåðøåíèÿ ïðåîáðàçîâàíèÿ, ïóòåì ïðîâåðêè øèíû // Îæèäàíèå çàâåðøåíèÿ ïðåîáðàçîâàíèÿ, ïóòåì ïðîâåðêè øèíû
if (waitCondition == DALLAS_WAIT_BUS) if (waitCondition == DALLAS_WAIT_BUS)
{ {
result = DS18B20_WaitForEndConvertion(onewire); result = DS18B20_WaitForEndConvertion(hdallas->onewire);
return result; return result;
} }
@@ -374,7 +369,7 @@ HAL_StatusTypeDef Dallas_StartConvertTAll(OneWire_t *onewire, DALLAS_WaitConvert
* @param waitCondition Óñëîâèå îæèäàíèÿ çàâåðøåíèÿ ïðåîáðàçîâàíèÿ * @param waitCondition Óñëîâèå îæèäàíèÿ çàâåðøåíèÿ ïðåîáðàçîâàíèÿ
* @retval HAL Status * @retval HAL Status
*/ */
HAL_StatusTypeDef Dallas_ConvertT(DALLAS_HandleTypeDef *sensor, DALLAS_WaitConvertionTypeDef waitCondition) HAL_StatusTypeDef Dallas_ConvertT(DALLAS_SensorHandleTypeDef *sensor, DALLAS_WaitConvertionTypeDef waitCondition)
{ {
HAL_StatusTypeDef result; HAL_StatusTypeDef result;
uint8_t rxDummyData; uint8_t rxDummyData;
@@ -390,7 +385,7 @@ HAL_StatusTypeDef Dallas_ConvertT(DALLAS_HandleTypeDef *sensor, DALLAS_WaitConve
return result; return result;
// Îòïðàâêà êîìàíäû íà÷àëà ïðåîáðàçîâàíèÿ òåìïåðàòóðû // Îòïðàâêà êîìàíäû íà÷àëà ïðåîáðàçîâàíèÿ òåìïåðàòóðû
result = DS18B20_StartConvT(sensor->onewire, (uint8_t *)&sensor->sensROM); result = DS18B20_StartConvT(sensor->hdallas->onewire, (uint8_t *)&sensor->sensROM);
if(result != HAL_OK) if(result != HAL_OK)
{ {
return result; return result;
@@ -399,7 +394,7 @@ HAL_StatusTypeDef Dallas_ConvertT(DALLAS_HandleTypeDef *sensor, DALLAS_WaitConve
// Îæèäàíèå çàâåðøåíèÿ ïðåîáðàçîâàíèÿ, ïóòåì ïðîâåðêè øèíû // Îæèäàíèå çàâåðøåíèÿ ïðåîáðàçîâàíèÿ, ïóòåì ïðîâåðêè øèíû
if (waitCondition == DALLAS_WAIT_BUS) if (waitCondition == DALLAS_WAIT_BUS)
{ {
result = DS18B20_WaitForEndConvertion(sensor->onewire); result = DS18B20_WaitForEndConvertion(sensor->hdallas->onewire);
if(result == HAL_TIMEOUT) if(result == HAL_TIMEOUT)
{ {
sensor->f.timeout_convertion_cnt++; sensor->f.timeout_convertion_cnt++;
@@ -412,7 +407,7 @@ HAL_StatusTypeDef Dallas_ConvertT(DALLAS_HandleTypeDef *sensor, DALLAS_WaitConve
{ {
uint32_t delayValueMs = 0; uint32_t delayValueMs = 0;
switch (sensor->scratchpad.ConfigRegister) switch (sensor->hdallas->scratchpad.ConfigRegister)
{ {
case DALLAS_CONFIG_9_BITS: case DALLAS_CONFIG_9_BITS:
delayValueMs = DALLAS_DELAY_MS_9_BITS; delayValueMs = DALLAS_DELAY_MS_9_BITS;
@@ -452,7 +447,7 @@ HAL_StatusTypeDef Dallas_ConvertT(DALLAS_HandleTypeDef *sensor, DALLAS_WaitConve
* @param sensor Óêàçàòåëü íà ñòðóêòóðó äàò÷èêà * @param sensor Óêàçàòåëü íà ñòðóêòóðó äàò÷èêà
* @retval HAL Status * @retval HAL Status
*/ */
HAL_StatusTypeDef Dallas_ReadTemperature(DALLAS_HandleTypeDef *sensor) HAL_StatusTypeDef Dallas_ReadTemperature(DALLAS_SensorHandleTypeDef *sensor)
{ {
HAL_StatusTypeDef result; HAL_StatusTypeDef result;
@@ -467,7 +462,7 @@ HAL_StatusTypeDef Dallas_ReadTemperature(DALLAS_HandleTypeDef *sensor)
return result; return result;
result = DS18B20_CalcTemperature(sensor->onewire, (uint8_t *)&sensor->sensROM, (uint8_t *)&sensor->scratchpad, &sensor->temperature); result = DS18B20_CalcTemperature(sensor->hdallas->onewire, (uint8_t *)&sensor->sensROM, (uint8_t *)&sensor->hdallas->scratchpad, &sensor->temperature);
if (result != HAL_OK) if (result != HAL_OK)
{ {
@@ -483,14 +478,14 @@ HAL_StatusTypeDef Dallas_ReadTemperature(DALLAS_HandleTypeDef *sensor)
* @param sensor Óêàçàòåëü íà ñòðóêòóðó äàò÷èêà * @param sensor Óêàçàòåëü íà ñòðóêòóðó äàò÷èêà
* @retval HAL Status * @retval HAL Status
*/ */
HAL_StatusTypeDef Dallas_IsConnected(DALLAS_HandleTypeDef *sensor) HAL_StatusTypeDef Dallas_IsConnected(DALLAS_SensorHandleTypeDef *sensor)
{ {
HAL_StatusTypeDef result; HAL_StatusTypeDef result;
if(sensor->isInitialized == 0) if(sensor->isInitialized == 0)
return HAL_ERROR; return HAL_ERROR;
result = DS18B20_ReadScratchpad(sensor->onewire, (uint8_t *)&sensor->sensROM, (uint8_t *)&sensor->scratchpad); result = DS18B20_ReadScratchpad(sensor->hdallas->onewire, (uint8_t *)&sensor->sensROM, (uint8_t *)&sensor->hdallas->scratchpad);
if (result == HAL_OK) if (result == HAL_OK)
{ {
@@ -522,7 +517,7 @@ HAL_StatusTypeDef Dallas_IsConnected(DALLAS_HandleTypeDef *sensor)
* @retval HAL Status * @retval HAL Status
* @details ñòàðøèé áàéò - UserByte4/UserByte2, ìëàäøèé - UserByte3/UserByte1. * @details ñòàðøèé áàéò - UserByte4/UserByte2, ìëàäøèé - UserByte3/UserByte1.
*/ */
HAL_StatusTypeDef Dallas_WriteUserBytes(DALLAS_HandleTypeDef *sensor, uint16_t UserBytes12, uint16_t UserBytes34, uint8_t UserBytesMask) HAL_StatusTypeDef Dallas_WriteUserBytes(DALLAS_SensorHandleTypeDef *sensor, uint16_t UserBytes12, uint16_t UserBytes34, uint8_t UserBytesMask)
{ {
HAL_StatusTypeDef result; HAL_StatusTypeDef result;
@@ -534,13 +529,13 @@ HAL_StatusTypeDef Dallas_WriteUserBytes(DALLAS_HandleTypeDef *sensor, uint16_t U
if (result != HAL_OK) if (result != HAL_OK)
return result; return result;
result = DS18B20_WriteUserBytes(sensor->onewire, (uint8_t *)&sensor->sensROM, UserBytes12, UserBytes34, UserBytesMask); result = DS18B20_WriteUserBytes(sensor->hdallas->onewire, (uint8_t *)&sensor->sensROM, UserBytes12, UserBytes34, UserBytesMask);
if (result != HAL_OK) if (result != HAL_OK)
{ {
sensor->f.other_err_cnt++; sensor->f.write_err_cnt++;
return result; return result;
} }
result = DS18B20_ReadScratchpad(sensor->onewire, (uint8_t *)&sensor->sensROM, (uint8_t *)&sensor->scratchpad); result = DS18B20_ReadScratchpad(sensor->hdallas->onewire, (uint8_t *)&sensor->sensROM, (uint8_t *)&sensor->hdallas->scratchpad);
if (result != HAL_OK) if (result != HAL_OK)
{ {
return result; return result;

57
Core/Dallas/dallas_tools.h
View File

@@ -61,24 +61,31 @@ typedef struct
/** @brief Структура флагов ошибок датчиков DALLAS */ /** @brief Структура флагов ошибок датчиков DALLAS */
typedef struct typedef struct
{ {
unsigned disconnect_cnt; ///< Ñ÷åò÷èê îòêëþ÷åíèé äàò÷èêà uint8_t disconnect_cnt; ///< Ñ÷åò÷èê îòêëþ÷åíèé äàò÷èêà
unsigned read_temperature_err_cnt; ///< Ñ÷åò÷èê îøèáîê ÷òåíèÿ òåìïåðàòóðû uint8_t read_temperature_err_cnt; ///< Ñ÷åò÷èê îøèáîê ÷òåíèÿ òåìïåðàòóðû
unsigned timeout_convertion_cnt; ///< Ñ÷åò÷èê îøèáîê òàéìàóòà êîíâåðòàöèè uint8_t timeout_convertion_cnt; ///< Ñ÷åò÷èê îøèáîê òàéìàóòà êîíâåðòàöèè
unsigned other_err_cnt; ///< Ñ÷åò÷èê äðóãèõ îøèáîê uint8_t write_err_cnt; ///< Ñ÷åò÷èê äðóãèõ îøèáîê
}DALLAS_FlagsTypeDef; }DALLAS_FlagsTypeDef;
/** @brief Структура инициализации датчика DALLAS */ /** @brief Структура инициализации датчика DALLAS */
typedef struct typedef struct __packed
{ {
uint64_t ROM; ///< Óíèêàëüíûé ROM-êîä äàò÷èêà uint64_t InitParam; ///< Ïàðàìåòð äëÿ èíèöèàëèçàöèè: ROM/UserBytes/Èíäåêñ
uint16_t UserBytes12; ///< Ïîëüçîâàòåëüñêèå áàéòû 1 è 2
uint16_t UserBytes34; ///< Ïîëüçîâàòåëüñêèå áàéòû 3 è 4
uint8_t SensInd; ///< Èíäåêñ ñåíñîðà
uint8_t Resolution; ///< Разрешение датчика uint8_t Resolution; ///< Разрешение датчика
HAL_StatusTypeDef (*init_func)(); ///< Функция инициализации HAL_StatusTypeDef (*init_func)(); ///< Функция инициализации
} DALLAS_InitStructTypeDef; } DALLAS_InitStructTypeDef;
/** @brief Còðóêòóðà îáðàáîò÷èêà DALLAS äëÿ îáùåíèÿ ñ äàò÷èêîì*/
typedef struct
{
OneWire_t *onewire;
DALLAS_ScratchpadTypeDef scratchpad;
}DALLAS_HandleTypeDef;
extern DALLAS_HandleTypeDef hdallas1;
/** @brief Основная структура обработчика датчика DALLAS */ /** @brief Основная структура обработчика датчика DALLAS */
typedef struct typedef struct
{ {
@@ -86,16 +93,14 @@ typedef struct
unsigned isInitialized:1; ///< Флаг инициализации unsigned isInitialized:1; ///< Флаг инициализации
unsigned isLost:1; ///< Флаг потери связи unsigned isLost:1; ///< Флаг потери связи
OneWire_t *onewire; ///< Èíòåðôåéñ OneWire DALLAS_HandleTypeDef *hdallas;
uint64_t sensROM; ///< ROM-код датчика uint64_t sensROM; ///< ROM-код датчика
DALLAS_ScratchpadTypeDef scratchpad; ///< Scratchpad äàò÷èêà
float temperature; ///< Текущая температура float temperature; ///< Текущая температура
DALLAS_InitStructTypeDef Init; ///< Структура инициализации DALLAS_InitStructTypeDef Init; ///< Структура инициализации
DALLAS_FlagsTypeDef f; ///< Ôëàãè DALLAS_FlagsTypeDef f; ///< Ôëàãè
} DALLAS_SensorHandleTypeDef;
} DALLAS_HandleTypeDef;
@@ -112,29 +117,29 @@ typedef enum
/* Functions ---------------------------------------------------------------*/ /* Functions ---------------------------------------------------------------*/
/* Функция для нахождения нового датчика на место потерянного */ /* Функция для нахождения нового датчика на место потерянного */
HAL_StatusTypeDef Dallas_ReplaceLostedSensor(DALLAS_HandleTypeDef *sensor); HAL_StatusTypeDef Dallas_ReplaceLostedSensor(DALLAS_SensorHandleTypeDef *sensor);
/* Функция для иниицализации нового датчика в структуре */ /* Функция для иниицализации нового датчика в структуре */
HAL_StatusTypeDef Dallas_AddNewSensors(OneWire_t *onewire, DALLAS_HandleTypeDef *sensor); HAL_StatusTypeDef Dallas_AddNewSensors(DALLAS_HandleTypeDef *hdallas, DALLAS_SensorHandleTypeDef *sensor);
/* Инициализирует структуру датчика по ROM */ /* Инициализирует структуру датчика по ROM */
HAL_StatusTypeDef Dallas_SensorInitByROM(OneWire_t *onewire, DALLAS_HandleTypeDef *sensor); HAL_StatusTypeDef Dallas_SensorInitByROM(DALLAS_HandleTypeDef *hdallas, DALLAS_SensorHandleTypeDef *sensor);
/* Инициализирует структуру датчика по пользовательским байтам */ /* Инициализирует структуру датчика по пользовательским байтам */
HAL_StatusTypeDef Dallas_SensorInitByUserBytes(OneWire_t *onewire, DALLAS_HandleTypeDef *sensor); HAL_StatusTypeDef Dallas_SensorInitByUserBytes(DALLAS_HandleTypeDef *hdallas, DALLAS_SensorHandleTypeDef *sensor);
/* Инициализирует структуру датчика по порядковому номеру */ /* Инициализирует структуру датчика по порядковому номеру */
HAL_StatusTypeDef Dallas_SensorInitByInd(OneWire_t *onewire, DALLAS_HandleTypeDef *sensor); HAL_StatusTypeDef Dallas_SensorInitByInd(DALLAS_HandleTypeDef *hdallas, DALLAS_SensorHandleTypeDef *sensor);
/* Инициализирует датчик для работы */ /* Инициализирует датчик для работы */
HAL_StatusTypeDef Dallas_SensorInit(OneWire_t *onewire, DALLAS_HandleTypeDef *sensor, uint8_t (*ROM)[DALLAS_ROM_SIZE]); HAL_StatusTypeDef Dallas_SensorInit(DALLAS_HandleTypeDef *hdallas, DALLAS_SensorHandleTypeDef *sensor, uint8_t (*ROM)[DALLAS_ROM_SIZE]);
/* Деинициализирует структуру датчика */ /* Деинициализирует структуру датчика */
HAL_StatusTypeDef Dallas_SensorDeInit(DALLAS_HandleTypeDef *sensor); HAL_StatusTypeDef Dallas_SensorDeInit(DALLAS_SensorHandleTypeDef *sensor);
/* Запускает измерение температуры на всех датчиках */ /* Запускает измерение температуры на всех датчиках */
HAL_StatusTypeDef Dallas_StartConvertTAll(OneWire_t *onewire, DALLAS_WaitConvertionTypeDef waitCondition, uint8_t dallas_delay_ms); HAL_StatusTypeDef Dallas_StartConvertTAll(DALLAS_HandleTypeDef *hdallas, DALLAS_WaitConvertionTypeDef waitCondition, uint8_t dallas_delay_ms);
/* Измеряет температуру на датчике */ /* Измеряет температуру на датчике */
HAL_StatusTypeDef Dallas_ConvertT(DALLAS_HandleTypeDef *sensor, DALLAS_WaitConvertionTypeDef waitCondition); HAL_StatusTypeDef Dallas_ConvertT(DALLAS_SensorHandleTypeDef *sensor, DALLAS_WaitConvertionTypeDef waitCondition);
/* Читает измеренную датчиком температуру */ /* Читает измеренную датчиком температуру */
HAL_StatusTypeDef Dallas_ReadTemperature(DALLAS_HandleTypeDef *sensor); HAL_StatusTypeDef Dallas_ReadTemperature(DALLAS_SensorHandleTypeDef *sensor);
/* Проверяет подключен ли датчик (чтение scratchpad) */ /* Проверяет подключен ли датчик (чтение scratchpad) */
HAL_StatusTypeDef Dallas_IsConnected(DALLAS_HandleTypeDef *sensor); HAL_StatusTypeDef Dallas_IsConnected(DALLAS_SensorHandleTypeDef *sensor);
/* Записывает пользовательские байты */ /* Записывает пользовательские байты */
HAL_StatusTypeDef Dallas_WriteUserBytes(DALLAS_HandleTypeDef *sensor, uint16_t UserBytes12, uint16_t UserBytes34, uint8_t UserBytesMask); HAL_StatusTypeDef Dallas_WriteUserBytes(DALLAS_SensorHandleTypeDef *sensor, uint16_t UserBytes12, uint16_t UserBytes34, uint8_t UserBytesMask);
#endif // #ifndef DALLAS_TOOLS_H #endif // #ifndef DALLAS_TOOLS_H

58
Core/Dallas/ds18b20_driver.c
View File

@@ -256,8 +256,6 @@ HAL_StatusTypeDef DS18B20_CalcTemperature(OneWire_t* OW, uint8_t *ROM, uint8_t *
} }
uint8_t scratchpad_buff[8];
/** /**
* @brief The function is used as read scratchpad from device * @brief The function is used as read scratchpad from device
* @retval status in OK = 1, Failed = 0 * @retval status in OK = 1, Failed = 0
@@ -268,7 +266,7 @@ uint8_t scratchpad_buff[8];
HAL_StatusTypeDef DS18B20_ReadScratchpad(OneWire_t* OW, uint8_t *ROM, uint8_t *Scratchpad) HAL_StatusTypeDef DS18B20_ReadScratchpad(OneWire_t* OW, uint8_t *ROM, uint8_t *Scratchpad)
{ {
if(Scratchpad == NULL) if(Scratchpad == NULL)
Scratchpad = scratchpad_buff; return HAL_ERROR;
/* Reset line */ /* Reset line */
OneWire_Reset(OW); OneWire_Reset(OW);
@@ -475,35 +473,35 @@ HAL_StatusTypeDef DS18B20_WriteUserBytes(OneWire_t* OW, uint8_t *ROM, int16_t Us
} }
/** ///**
* @brief The function is used as search device that had temperature alarm // * @brief The function is used as search device that had temperature alarm
* triggered and store it in DS18B20 alarm data structure // * triggered and store it in DS18B20 alarm data structure
* @retval status of search, OK = 1, Failed = 0 // * @retval status of search, OK = 1, Failed = 0
* @param DS DS18B20 HandleTypedef // * @param DS DS18B20 HandleTypedef
* @param OW OneWire HandleTypedef // * @param OW OneWire HandleTypedef
*/ // */
uint8_t DS18B20_AlarmSearch(DS18B20_Drv_t *DS, OneWire_t* OW) //uint8_t DS18B20_AlarmSearch(DS18B20_Drv_t *DS, OneWire_t* OW)
{ //{
uint8_t t = 0; // uint8_t t = 0;
/* Reset Alarm in DS */ // /* Reset Alarm in DS */
for(uint8_t i = 0; i < OW->RomCnt; i++) // for(uint8_t i = 0; i < OW->RomCnt; i++)
{ // {
for(uint8_t j = 0; j < 8; j++) // for(uint8_t j = 0; j < 8; j++)
{ // {
DS->AlmAddr[i][j] = 0; // DS->AlmAddr[i][j] = 0;
} // }
} // }
/* Start alarm search */ // /* Start alarm search */
while (OneWire_Search(OW, DS18B20_CMD_ALARM_SEARCH)) // while (OneWire_Search(OW, DS18B20_CMD_ALARM_SEARCH))
{ // {
/* Store ROM of device which has alarm flag set */ // /* Store ROM of device which has alarm flag set */
OneWire_GetDevRom(OW, DS->AlmAddr[t]); // OneWire_GetDevRom(OW, DS->AlmAddr[t]);
t++; // t++;
} // }
return (t > 0) ? 1 : 0; // return (t > 0) ? 1 : 0;
} //}
/** /**
* @brief The function is used to initialize the DS18B20 sensor, and search * @brief The function is used to initialize the DS18B20 sensor, and search

4
Core/Dallas/ds18b20_driver.h
View File

@@ -26,7 +26,7 @@
#define DS_GPIO_Port GPIOB #define DS_GPIO_Port GPIOB
/* Data Structure ------------------------------------------------------------*/ /* Data Structure ------------------------------------------------------------*/
#define DS18B20_DEVICE_AMOUNT 8 #define DS18B20_DEVICE_AMOUNT 27
/* Register ------------------------------------------------------------------*/ /* Register ------------------------------------------------------------------*/
#define DS18B20_CMD_CONVERT 0x44 #define DS18B20_CMD_CONVERT 0x44
@@ -77,8 +77,6 @@ typedef enum {
typedef struct typedef struct
{ {
uint8_t DevAddr[DS18B20_DEVICE_AMOUNT][8]; uint8_t DevAddr[DS18B20_DEVICE_AMOUNT][8];
uint8_t AlmAddr[DS18B20_DEVICE_AMOUNT][8];
float Temperature[DS18B20_DEVICE_AMOUNT];
DS18B20_Res_t Resolution; DS18B20_Res_t Resolution;
} DS18B20_Drv_t; } DS18B20_Drv_t;
extern DS18B20_Drv_t DS; extern DS18B20_Drv_t DS;

146
Core/Dallas/pch_sensors.c
View File

@@ -8,30 +8,33 @@
/* Includes ----------------------------------------------------------------*/ /* Includes ----------------------------------------------------------------*/
#include "pch_sensors.h" #include "pch_sensors.h"
PCHSens_UnknownSensorsTypeDef UnknownSensors; PCHSens_DallasBusHandle DallasBus;
PCHSens_SensorActionsTypeDef action;
/* Declarations and definitions --------------------------------------------*/ /* Declarations and definitions --------------------------------------------*/
PCHSens_ModuleTypeDef module1; PCHSens_ModuleTypeDef module1;
PCHSens_ModuleTypeDef module2;
PCHSens_ModuleTypeDef module3;
PCHSens_ModuleTypeDef module4;
PCHSens_ModuleTypeDef module5;
PCHSens_ModuleTypeDef module6;
/* Functions ---------------------------------------------------------------*/ /* Functions ---------------------------------------------------------------*/
HAL_StatusTypeDef PCHSens_InitNewSensor(OneWire_t *onewire, PCHSens_SensorTypeDef* sensor, uint64_t ROM) HAL_StatusTypeDef PCHSens_InitNewSensor(DALLAS_HandleTypeDef *hdallas, PCHSens_SensorTypeDef* sensor, uint64_t ROM)
{ {
DALLAS_HandleTypeDef tempsens; DALLAS_SensorHandleTypeDef tempsens;
HAL_StatusTypeDef result; HAL_StatusTypeDef result;
if(onewire == NULL) if(hdallas == NULL)
return HAL_ERROR; return HAL_ERROR;
if(sensor == NULL) if(sensor == NULL)
return HAL_ERROR; return HAL_ERROR;
// sensor->UserBytes = (PCHSens_LocationTypeDef *)&sensor->sens.scratchpad.tHighRegister; // sensor->UserBytes = (PCHSens_LocationTypeDef *)&sensor->sens.scratchpad.tHighRegister;
sensor->sens.Init.ROM = ROM; sensor->sens.Init.InitParam = ROM;
sensor->sens.Init.UserBytes12 = sensor->Location.all;
sensor->sens.Init.init_func = &Dallas_SensorInitByROM; sensor->sens.Init.init_func = &Dallas_SensorInitByROM;
result = Dallas_AddNewSensors(onewire, &sensor->sens); result = Dallas_AddNewSensors(hdallas, &sensor->sens);
if(result != HAL_OK) if(result != HAL_OK)
{ {
sensor->not_found = 1; sensor->not_found = 1;
@@ -42,9 +45,10 @@ HAL_StatusTypeDef PCHSens_InitNewSensor(OneWire_t *onewire, PCHSens_SensorTypeDe
if(result != HAL_OK) if(result != HAL_OK)
return result; return result;
sensor->sens.Init.InitParam = sensor->Location.all;
sensor->sens.Init.init_func = &Dallas_SensorInitByUserBytes; sensor->sens.Init.init_func = &Dallas_SensorInitByUserBytes;
result = Dallas_AddNewSensors(onewire, &sensor->sens); result = Dallas_AddNewSensors(hdallas, &sensor->sens);
if(result == HAL_OK) if(result == HAL_OK)
{ {
sensor->not_found = 0; sensor->not_found = 0;
@@ -60,21 +64,21 @@ HAL_StatusTypeDef PCHSens_InitNewSensor(OneWire_t *onewire, PCHSens_SensorTypeDe
HAL_StatusTypeDef PCHSens_AddSensor(OneWire_t *onewire, PCHSens_SensorTypeDef* sensor) HAL_StatusTypeDef PCHSens_AddSensor(DALLAS_HandleTypeDef *hdallas, PCHSens_SensorTypeDef* sensor)
{ {
HAL_StatusTypeDef result; HAL_StatusTypeDef result;
if(onewire == NULL) if(hdallas == NULL)
return HAL_ERROR; return HAL_ERROR;
if(sensor == NULL) if(sensor == NULL)
return HAL_ERROR; return HAL_ERROR;
// sensor->UserBytes = (PCHSens_LocationTypeDef *)&sensor->sens.scratchpad.tHighRegister; // sensor->UserBytes = (PCHSens_LocationTypeDef *)&sensor->sens.scratchpad.tHighRegister;
sensor->sens.Init.UserBytes12 = sensor->Location.all; sensor->sens.Init.InitParam = sensor->Location.all;
sensor->sens.Init.init_func = &Dallas_SensorInitByUserBytes; sensor->sens.Init.init_func = &Dallas_SensorInitByUserBytes;
result = Dallas_AddNewSensors(onewire, &sensor->sens); result = Dallas_AddNewSensors(hdallas, &sensor->sens);
if(result == HAL_OK) if(result == HAL_OK)
{ {
@@ -88,38 +92,36 @@ HAL_StatusTypeDef PCHSens_AddSensor(OneWire_t *onewire, PCHSens_SensorTypeDef* s
return result; return result;
} }
HAL_StatusTypeDef PCHSens_InitModule(OneWire_t *onewire, PCHSens_ModuleTypeDef* module, uint16_t param) HAL_StatusTypeDef PCHSens_InitModule(DALLAS_HandleTypeDef *hdallas, PCHSens_ModuleTypeDef* module, uint16_t param)
{ {
if(onewire == NULL) if(hdallas == NULL)
return HAL_ERROR; return HAL_ERROR;
if(module == NULL) if(module == NULL)
return HAL_ERROR; return HAL_ERROR;
PCHSens_LocationTypeDef initlocation; PCHSens_LocationTypeDef initlocation;
initlocation.all = param; initlocation.all = param;
action.read = 1;
module->onewire = onewire; module->hdallas = hdallas;
module->refLocation = initlocation; module->refLocation = initlocation;
module->sens1.Location.all = module->refLocation.all; module->sens1.Location.all = module->refLocation.all;
module->sens1.Location.param.Location = 0; module->sens1.Location.param.Location = 0;
module->sens1.action.read = 1; PCHSens_AddSensor(hdallas, &module->sens1);
PCHSens_AddSensor(onewire, &module->sens1);
module->sens2.Location.all = module->refLocation.all; module->sens2.Location.all = module->refLocation.all;
module->sens2.Location.param.Location = 1; module->sens2.Location.param.Location = 1;
module->sens2.action.read = 1;
PCHSens_AddSensor(onewire, &module->sens2); PCHSens_AddSensor(hdallas, &module->sens2);
module->sens3.Location.all = module->refLocation.all; module->sens3.Location.all = module->refLocation.all;
module->sens3.Location.param.Location = 2; module->sens3.Location.param.Location = 2;
module->sens3.action.read = 1; PCHSens_AddSensor(hdallas, &module->sens3);
PCHSens_AddSensor(onewire, &module->sens3);
module->sens4.Location.all = module->refLocation.all; module->sens4.Location.all = module->refLocation.all;
module->sens4.Location.param.Location = 3; module->sens4.Location.param.Location = 3;
module->sens4.action.read = 1; PCHSens_AddSensor(hdallas, &module->sens4);
PCHSens_AddSensor(onewire, &module->sens4);
return HAL_OK; return HAL_OK;
} }
@@ -131,20 +133,18 @@ HAL_StatusTypeDef PCHSens_ReadTemperature(PCHSens_ModuleTypeDef *module)
if(module == NULL) if(module == NULL)
return HAL_ERROR; return HAL_ERROR;
result = Dallas_StartConvertTAll(module->onewire, DALLAS_WAIT_BUS, 0); result = Dallas_StartConvertTAll(module->hdallas, DALLAS_WAIT_BUS, 0);
result = PCHSens_SensorHandleActions(module->onewire, &module->sens1);
result = PCHSens_SensorHandleActions(module->onewire, &module->sens2);
result = PCHSens_SensorHandleActions(module->onewire, &module->sens3);
result = PCHSens_SensorHandleActions(module->onewire, &module->sens4);
PCHSens_DefineUnknownSensor(&UnknownSensors, NULL);
result = PCHSens_SensorHandleActions(module->hdallas, &module->sens1);
result = PCHSens_SensorHandleActions(module->hdallas, &module->sens2);
result = PCHSens_SensorHandleActions(module->hdallas, &module->sens3);
result = PCHSens_SensorHandleActions(module->hdallas, &module->sens4);
return result; return result;
} }
HAL_StatusTypeDef PCHSens_CheckSensor(OneWire_t *onewire, PCHSens_SensorTypeDef* sensor) HAL_StatusTypeDef PCHSens_CheckSensor(DALLAS_HandleTypeDef *hdallas, PCHSens_SensorTypeDef* sensor)
{ {
HAL_StatusTypeDef result; HAL_StatusTypeDef result;
PCHSens_LocationTypeDef initlocation; PCHSens_LocationTypeDef initlocation;
@@ -171,23 +171,19 @@ HAL_StatusTypeDef PCHSens_CheckSensor(OneWire_t *onewire, PCHSens_SensorTypeDef*
} }
HAL_StatusTypeDef PCHSens_FindUnknownSensors(OneWire_t *onewire, PCHSens_UnknownSensorsTypeDef *unknowns) HAL_StatusTypeDef PCHSens_FindUnknownSensors(PCHSens_DallasBusHandle *hbus)
{ {
HAL_StatusTypeDef result; HAL_StatusTypeDef result;
if(onewire == NULL) if(hbus == NULL)
return HAL_ERROR;
if(unknowns == NULL)
return HAL_ERROR; return HAL_ERROR;
unknowns->onewire = onewire; hbus->UnknownCnt = 0;
unknowns->UnknownCnt = 0;
DALLAS_ScratchpadTypeDef scratchpad;
PCHSens_LocationTypeDef *param = (PCHSens_LocationTypeDef *)&scratchpad.tHighRegister; PCHSens_LocationTypeDef *param = (PCHSens_LocationTypeDef *)&hbus->hdallas->scratchpad.tHighRegister;
for(int i = 0; i < onewire->RomCnt; i++) for(int i = 0; i < hbus->hdallas->onewire->RomCnt; i++)
{ {
/* Ïðîâåðêà ïðèñóòñòâóåò ëè âûáðàííûé äàò÷èê íà ëèíèè */ /* Ïðîâåðêà ïðèñóòñòâóåò ëè âûáðàííûé äàò÷èê íà ëèíèè */
result = DS18B20_ReadScratchpad(onewire, (uint8_t *)&DS.DevAddr[i], (uint8_t *)&scratchpad); result = DS18B20_ReadScratchpad(hbus->hdallas->onewire, (uint8_t *)&DS.DevAddr[i], (uint8_t *)&hbus->hdallas->scratchpad);
if(result != HAL_OK) if(result != HAL_OK)
__NOP(); __NOP();
@@ -195,31 +191,32 @@ HAL_StatusTypeDef PCHSens_FindUnknownSensors(OneWire_t *onewire, PCHSens_Unknown
(IS_REG_PCH_LOCATION(param) == 0) || (IS_REG_PCH_LOCATION(param) == 0) ||
(IS_REG_PCH_NUMB(param) == 0) ) (IS_REG_PCH_NUMB(param) == 0) )
{ {
unknowns->unknown_sensors[unknowns->UnknownCnt].Init.SensInd = i; // unknowns->unknown_sensors[unknowns->UnknownCnt].Init.InitParam = i;
unknowns->unknown_sensors[unknowns->UnknownCnt].Init.init_func = &Dallas_SensorInitByInd; // unknowns->unknown_sensors[unknowns->UnknownCnt].Init.init_func = &Dallas_SensorInitByInd;
result = Dallas_AddNewSensors(onewire, &unknowns->unknown_sensors[unknowns->UnknownCnt++]); // result = Dallas_AddNewSensors(hbus, &unknowns->unknown_sensors[unknowns->UnknownCnt]);
hbus->UnknownCnt++;
if(result != HAL_OK) if(result != HAL_OK)
__NOP(); __NOP();
} }
} }
return HAL_OK; return HAL_OK;
} }
HAL_StatusTypeDef PCHSens_DefineUnknownSensor(PCHSens_UnknownSensorsTypeDef *unknowns, PCHSens_SensorTypeDef *sensor) //HAL_StatusTypeDef PCHSens_DefineUnknownSensor(PCHSens_UnknownSensorsTypeDef *unknowns, PCHSens_SensorTypeDef *sensor)
{ //{
HAL_StatusTypeDef result; // HAL_StatusTypeDef result;
if(sensor == NULL) // if(sensor == NULL)
return HAL_ERROR; // return HAL_ERROR;
//
if((unknowns->ROMtoDefine != NULL) && (unknowns->LocationtoDefine.all != NULL) && (unknowns->senstoDefine != NULL)) // if((unknowns->ROMtoDefine != NULL) && (unknowns->LocationtoDefine.all != NULL) && (unknowns->senstoDefine != NULL))
{ // {
result = PCHSens_InitNewSensor(unknowns->onewire, unknowns->senstoDefine, unknowns->ROMtoDefine); // result = PCHSens_InitNewSensor(unknowns->onewire, unknowns->senstoDefine, unknowns->ROMtoDefine);
unknowns->ROMtoDefine = 0; // unknowns->ROMtoDefine = 0;
unknowns->LocationtoDefine.all = 0; // unknowns->LocationtoDefine.all = 0;
unknowns->senstoDefine = 0; // unknowns->senstoDefine = 0;
return result; // return result;
} // }
return HAL_OK; // return HAL_OK;
} //}
HAL_StatusTypeDef PCHSens_UndefineSensor(PCHSens_SensorTypeDef *sensor) HAL_StatusTypeDef PCHSens_UndefineSensor(PCHSens_SensorTypeDef *sensor)
{ {
@@ -237,28 +234,28 @@ HAL_StatusTypeDef PCHSens_UndefineSensor(PCHSens_SensorTypeDef *sensor)
return result; return result;
} }
HAL_StatusTypeDef PCHSens_SensorHandleActions(OneWire_t *onewire, PCHSens_SensorTypeDef *sensor) HAL_StatusTypeDef PCHSens_SensorHandleActions(DALLAS_HandleTypeDef *hdallas, PCHSens_SensorTypeDef *sensor)
{ {
HAL_StatusTypeDef result; HAL_StatusTypeDef result;
if(sensor == NULL) if(sensor == NULL)
return HAL_ERROR; return HAL_ERROR;
if(sensor->action.connectROM != NULL) if(action.connectROM != NULL)
{ {
result = PCHSens_InitNewSensor(onewire, sensor, sensor->action.connectROM); result = PCHSens_InitNewSensor(hdallas, sensor, action.connectROM);
sensor->action.connectROM = 0; action.connectROM = 0;
} }
if(sensor->action.read != NULL) if(action.read != NULL)
{ {
result = Dallas_ReadTemperature(&sensor->sens); result = Dallas_ReadTemperature(&sensor->sens);
if(result != HAL_OK) if(result != HAL_OK)
PCHSens_CheckSensor(onewire, sensor); PCHSens_CheckSensor(hdallas, sensor);
} }
if(sensor->action.deinit != NULL) if(action.deinit != NULL)
{ {
sensor->action.deinit = 0; action.deinit = 0;
result = PCHSens_UndefineSensor(sensor); result = PCHSens_UndefineSensor(sensor);
} }
@@ -275,10 +272,11 @@ void PCHSens_FirstInit(void)
OneWire_Init(&OW); OneWire_Init(&OW);
DS18B20_Search(&DS, &OW); DS18B20_Search(&DS, &OW);
PCHSens_InitModule(&OW, &module1, REG_PCH_NUMB_11|REG_PCH_DIODE_NUMB_1); hdallas1.onewire = &OW;
PCHSens_InitModule(&hdallas1, &module1, REG_PCH_NUMB_11|REG_PCH_DIODE_NUMB_1);
PCHSens_FindUnknownSensors(&OW, &UnknownSensors); PCHSens_FindUnknownSensors(&DallasBus);
PCHSens_DefineUnknownSensor(&UnknownSensors, NULL); // PCHSens_DefineUnknownSensor(&UnknownSensors, NULL);
// Dallas_SensorInitByInd(&OW, &AllSens.outdoor, 0); // Dallas_SensorInitByInd(&OW, &AllSens.outdoor, 0);
// Dallas_SensorInitByInd(&OW, &AllSens.indoor, 2); // Dallas_SensorInitByInd(&OW, &AllSens.indoor, 2);
// Dallas_SensorInitByInd(&OW, &AllSens.bathroom, 1); // Dallas_SensorInitByInd(&OW, &AllSens.bathroom, 1);

37
Core/Dallas/pch_sensors.h
View File

@@ -127,16 +127,14 @@ typedef struct
typedef struct typedef struct
{ {
DALLAS_HandleTypeDef sens; DALLAS_SensorHandleTypeDef sens;
// PCHSens_LocationTypeDef *UserBytes;
PCHSens_LocationTypeDef Location; PCHSens_LocationTypeDef Location;
PCHSens_SensorActionsTypeDef action;
unsigned not_found:1; unsigned not_found:1;
}PCHSens_SensorTypeDef; }PCHSens_SensorTypeDef;
typedef struct typedef struct
{ {
OneWire_t *onewire; DALLAS_HandleTypeDef *hdallas;
PCHSens_SensorTypeDef sens1; PCHSens_SensorTypeDef sens1;
PCHSens_SensorTypeDef sens2; PCHSens_SensorTypeDef sens2;
@@ -147,27 +145,28 @@ typedef struct
}PCHSens_ModuleTypeDef; }PCHSens_ModuleTypeDef;
extern PCHSens_ModuleTypeDef module1; extern PCHSens_ModuleTypeDef module1;
extern PCHSens_ModuleTypeDef module2;
extern PCHSens_ModuleTypeDef module3;
extern PCHSens_ModuleTypeDef module4;
extern PCHSens_ModuleTypeDef module5;
extern PCHSens_ModuleTypeDef module6;
typedef struct typedef struct
{ {
OneWire_t *onewire; DALLAS_HandleTypeDef *hdallas;
uint8_t UnknownCnt;
DALLAS_HandleTypeDef unknown_sensors[DS18B20_DEVICE_AMOUNT]; }PCHSens_DallasBusHandle;
uint8_t UnknownCnt; extern PCHSens_DallasBusHandle DallasBus;
uint64_t ROMtoDefine;
PCHSens_LocationTypeDef LocationtoDefine;
PCHSens_SensorTypeDef *senstoDefine;
}PCHSens_UnknownSensorsTypeDef;
/* Functions ---------------------------------------------------------------*/ /* Functions ---------------------------------------------------------------*/
HAL_StatusTypeDef PCHSens_FindUnknownSensors(OneWire_t *onewire, PCHSens_UnknownSensorsTypeDef *unknowns); HAL_StatusTypeDef PCHSens_InitNewSensor(DALLAS_HandleTypeDef *hdallas, PCHSens_SensorTypeDef* sensor, uint64_t ROM);
HAL_StatusTypeDef PCHSens_InitNewSensor(OneWire_t *onewire, PCHSens_SensorTypeDef* sensor, uint64_t ROM); HAL_StatusTypeDef PCHSens_AddSensor(DALLAS_HandleTypeDef *hdallas, PCHSens_SensorTypeDef* sensor);
HAL_StatusTypeDef PCHSens_AddSensor(OneWire_t *onewire, PCHSens_SensorTypeDef* sensor); HAL_StatusTypeDef PCHSens_InitModule(DALLAS_HandleTypeDef *hdallas, PCHSens_ModuleTypeDef* module, uint16_t param);
HAL_StatusTypeDef PCHSens_InitModule(OneWire_t *onewire, PCHSens_ModuleTypeDef* module, uint16_t param);
HAL_StatusTypeDef PCHSens_ReadTemperature(PCHSens_ModuleTypeDef *module); HAL_StatusTypeDef PCHSens_ReadTemperature(PCHSens_ModuleTypeDef *module);
HAL_StatusTypeDef PCHSens_CheckSensor(OneWire_t *onewire, PCHSens_SensorTypeDef* sensor); HAL_StatusTypeDef PCHSens_CheckSensor(DALLAS_HandleTypeDef *hdallas, PCHSens_SensorTypeDef* sensor);
HAL_StatusTypeDef PCHSens_DefineUnknownSensor(PCHSens_UnknownSensorsTypeDef *unknowns, PCHSens_SensorTypeDef *sensor); HAL_StatusTypeDef PCHSens_FindUnknownSensors(PCHSens_DallasBusHandle *hbus);
HAL_StatusTypeDef PCHSens_SensorHandleActions(OneWire_t *onewire, PCHSens_SensorTypeDef *sensor); HAL_StatusTypeDef PCHSens_DefineUnknownSensor(PCHSens_DallasBusHandle *hbus, PCHSens_SensorTypeDef *sensor);
HAL_StatusTypeDef PCHSens_SensorHandleActions(DALLAS_HandleTypeDef *hdallas, PCHSens_SensorTypeDef *sensor);
void PCHSens_FirstInit(void); void PCHSens_FirstInit(void);
#endif // #ifndef PCH_SENSORS_H #endif // #ifndef PCH_SENSORS_H

124
Core/Modbus/crc_algs.c
View File

@@ -13,96 +13,48 @@ uint8_t uchCRCHi = 0xFF;
uint8_t uchCRCLo = 0xFF; uint8_t uchCRCLo = 0xFF;
unsigned uIndex; unsigned uIndex;
/*Table of CRC values for high order byte*/
uint32_t crc32(uint8_t *data, uint32_t data_size) const unsigned char auchCRCHi[]=
{ {
static const unsigned int crc32_table[] = 0x00,0xC1,0x81,0x40,0x01,0xC0,0x80,0x41,0x01,0xC0,0x80,0x41,0x00,0xC1,0x81,0x40,
0x01,0xC0,0x80,0x41,0x00,0xC1,0x81,0x40,0x00,0xC1,0x81,0x40,0x01,0xC0,0x80,0x41,
0x01,0xC0,0x80,0x41,0x00,0xC1,0x81,0x40,0x00,0xC1,0x81,0x40,0x01,0xC0,0x80,0x41,
0x00,0xC1,0x81,0x40,0x01,0xC0,0x80,0x41,0x01,0xC0,0x80,0x41,0x00,0xC1,0x81,0x40,
0x01,0xC0,0x80,0x41,0x00,0xC1,0x81,0x40,0x00,0xC1,0x81,0x40,0x01,0xC0,0x80,0x41,
0x00,0xC1,0x81,0x40,0x01,0xC0,0x80,0x41,0x01,0xC0,0x80,0x41,0x00,0xC1,0x81,0x40,
0x00,0xC1,0x81,0x40,0x01,0xC0,0x80,0x41,0x01,0xC0,0x80,0x41,0x00,0xC1,0x81,0x40,
0x01,0xC0,0x80,0x41,0x00,0xC1,0x81,0x40,0x00,0xC1,0x81,0x40,0x01,0xC0,0x80,0x41,
0x01,0xC0,0x80,0x41,0x00,0xC1,0x81,0x40,0x00,0xC1,0x81,0x40,0x01,0xC0,0x80,0x41,
0x00,0xC1,0x81,0x40,0x01,0xC0,0x80,0x41,0x01,0xC0,0x80,0x41,0x00,0xC1,0x81,0x40,
0x00,0xC1,0x81,0x40,0x01,0xC0,0x80,0x41,0x01,0xC0,0x80,0x41,0x00,0xC1,0x81,0x40,
0x01,0xC0,0x80,0x41,0x00,0xC1,0x81,0x40,0x00,0xC1,0x81,0x40,0x01,0xC0,0x80,0x41,
0x00,0xC1,0x81,0x40,0x01,0xC0,0x80,0x41,0x01,0xC0,0x80,0x41,0x00,0xC1,0x81,0x40,
0x01,0xC0,0x80,0x41,0x00,0xC1,0x81,0x40,0x00,0xC1,0x81,0x40,0x01,0xC0,0x80,0x41,
0x01,0xC0,0x80,0x41,0x00,0xC1,0x81,0x40,0x00,0xC1,0x81,0x40,0x01,0xC0,0x80,0x41,
0x00,0xC1,0x81,0x40,0x01,0xC0,0x80,0x41,0x01,0xC0,0x80,0x41,0x00,0xC1,0x81,0x40,
};
/*Table of CRC values for low order byte*/
const char auchCRCLo[] =
{ {
0x00000000, 0x77073096, 0xEE0E612C, 0x990951BA, 0x076DC419, 0x706AF48F, 0xE963A535, 0x9E6495A3, 0x00,0xC0,0xC1,0x01,0xC3,0x03,0x02,0xC2,0xC6,0x06,0x07,0xC7,0x05,0xC5,0xC4,0x04,
0x0EDB8832, 0x79DCB8A4, 0xE0D5E91E, 0x97D2D988, 0x09B64C2B, 0x7EB17CBD, 0xE7B82D07, 0x90BF1D91, 0xCC,0x0C,0x0D,0xCD,0x0F,0xCF,0xCE,0x0E,0x0A,0xCA,0xCB,0x0B,0xC9,0x09,0x08,0xC8,
0x1DB71064, 0x6AB020F2, 0xF3B97148, 0x84BE41DE, 0x1ADAD47D, 0x6DDDE4EB, 0xF4D4B551, 0x83D385C7, 0xD8,0x18,0x19,0xD9,0x1B,0xDB,0xDA,0x1A,0x1E,0xDE,0xDF,0x1F,0xDD,0x1D,0x1C,0xDC,
0x136C9856, 0x646BA8C0, 0xFD62F97A, 0x8A65C9EC, 0x14015C4F, 0x63066CD9, 0xFA0F3D63, 0x8D080DF5, 0x14,0xD4,0xD5,0x15,0xD7,0x17,0x16,0xD6,0xD2,0x12,0x13,0xD3,0x11,0xD1,0xD0,0x10,
0x3B6E20C8, 0x4C69105E, 0xD56041E4, 0xA2677172, 0x3C03E4D1, 0x4B04D447, 0xD20D85FD, 0xA50AB56B, 0xF0,0x30,0x31,0xF1,0x33,0xF3,0xF2,0x32,0x36,0xF6,0xF7,0x37,0xF5,0x35,0x34,0xF4,
0x35B5A8FA, 0x42B2986C, 0xDBBBC9D6, 0xACBCF940, 0x32D86CE3, 0x45DF5C75, 0xDCD60DCF, 0xABD13D59, 0x3C,0xFC,0xFD,0x3D,0xFF,0x3F,0x3E,0xFE,0xFA,0x3A,0x3B,0xFB,0x39,0xF9,0xF8,0x38,
0x26D930AC, 0x51DE003A, 0xC8D75180, 0xBFD06116, 0x21B4F4B5, 0x56B3C423, 0xCFBA9599, 0xB8BDA50F, 0x28,0xE8,0xE9,0x29,0xEB,0x2B,0x2A,0xEA,0xEE,0x2E,0x2F,0xEF,0x2D,0xED,0xEC,0x2C,
0x2802B89E, 0x5F058808, 0xC60CD9B2, 0xB10BE924, 0x2F6F7C87, 0x58684C11, 0xC1611DAB, 0xB6662D3D, 0xE4,0x24,0x25,0xE5,0x27,0xE7,0xE6,0x26,0x22,0xE2,0xE3,0x23,0xE1,0x21,0x20,0xE0,
0x76DC4190, 0x01DB7106, 0x98D220BC, 0xEFD5102A, 0x71B18589, 0x06B6B51F, 0x9FBFE4A5, 0xE8B8D433, 0xA0,0x60,0x61,0xA1,0x63,0xA3,0xA2,0x62,0x66,0xA6,0xA7,0x67,0xA5,0x65,0x64,0xA4,
0x7807C9A2, 0x0F00F934, 0x9609A88E, 0xE10E9818, 0x7F6A0DBB, 0x086D3D2D, 0x91646C97, 0xE6635C01, 0x6C,0xAC,0xAD,0x6D,0xAF,0x6F,0x6E,0xAE,0xAA,0x6A,0x6B,0xAB,0x69,0xA9,0xA8,0x68,
0x6B6B51F4, 0x1C6C6162, 0x856530D8, 0xF262004E, 0x6C0695ED, 0x1B01A57B, 0x8208F4C1, 0xF50FC457, 0x78,0xB8,0xB9,0x79,0xBB,0x7B,0x7A,0xBA,0xBE,0x7E,0x7F,0xBF,0x7D,0xBD,0xBC,0x7C,
0x65B0D9C6, 0x12B7E950, 0x8BBEB8EA, 0xFCB9887C, 0x62DD1DDF, 0x15DA2D49, 0x8CD37CF3, 0xFBD44C65, 0xB4,0x74,0x75,0xB5,0x77,0xB7,0xB6,0x76,0x72,0xB2,0xB3,0x73,0xB1,0x71,0x70,0xB0,
0x4DB26158, 0x3AB551CE, 0xA3BC0074, 0xD4BB30E2, 0x4ADFA541, 0x3DD895D7, 0xA4D1C46D, 0xD3D6F4FB, 0x50,0x90,0x91,0x51,0x93,0x53,0x52,0x92,0x96,0x56,0x57,0x97,0x55,0x95,0x94,0x54,
0x4369E96A, 0x346ED9FC, 0xAD678846, 0xDA60B8D0, 0x44042D73, 0x33031DE5, 0xAA0A4C5F, 0xDD0D7CC9, 0x9C,0x5C,0x5D,0x9D,0x5F,0x9F,0x9E,0x5E,0x5A,0x9A,0x9B,0x5B,0x99,0x59,0x58,0x98,
0x5005713C, 0x270241AA, 0xBE0B1010, 0xC90C2086, 0x5768B525, 0x206F85B3, 0xB966D409, 0xCE61E49F, 0x88,0x48,0x49,0x89,0x4B,0x8B,0x8A,0x4A,0x4E,0x8E,0x8F,0x4F,0x8D,0x4D,0x4C,0x8C,
0x5EDEF90E, 0x29D9C998, 0xB0D09822, 0xC7D7A8B4, 0x59B33D17, 0x2EB40D81, 0xB7BD5C3B, 0xC0BA6CAD, 0x44,0x84,0x85,0x45,0x87,0x47,0x46,0x86,0x82,0x42,0x43,0x83,0x41,0x81,0x80,0x40,
0xEDB88320, 0x9ABFB3B6, 0x03B6E20C, 0x74B1D29A, 0xEAD54739, 0x9DD277AF, 0x04DB2615, 0x73DC1683, };
0xE3630B12, 0x94643B84, 0x0D6D6A3E, 0x7A6A5AA8, 0xE40ECF0B, 0x9309FF9D, 0x0A00AE27, 0x7D079EB1,
0xF00F9344, 0x8708A3D2, 0x1E01F268, 0x6906C2FE, 0xF762575D, 0x806567CB, 0x196C3671, 0x6E6B06E7,
0xFED41B76, 0x89D32BE0, 0x10DA7A5A, 0x67DD4ACC, 0xF9B9DF6F, 0x8EBEEFF9, 0x17B7BE43, 0x60B08ED5,
0xD6D6A3E8, 0xA1D1937E, 0x38D8C2C4, 0x4FDFF252, 0xD1BB67F1, 0xA6BC5767, 0x3FB506DD, 0x48B2364B,
0xD80D2BDA, 0xAF0A1B4C, 0x36034AF6, 0x41047A60, 0xDF60EFC3, 0xA867DF55, 0x316E8EEF, 0x4669BE79,
0xCB61B38C, 0xBC66831A, 0x256FD2A0, 0x5268E236, 0xCC0C7795, 0xBB0B4703, 0x220216B9, 0x5505262F,
0xC5BA3BBE, 0xB2BD0B28, 0x2BB45A92, 0x5CB36A04, 0xC2D7FFA7, 0xB5D0CF31, 0x2CD99E8B, 0x5BDEAE1D,
0x9B64C2B0, 0xEC63F226, 0x756AA39C, 0x026D930A, 0x9C0906A9, 0xEB0E363F, 0x72076785, 0x05005713,
0x95BF4A82, 0xE2B87A14, 0x7BB12BAE, 0x0CB61B38, 0x92D28E9B, 0xE5D5BE0D, 0x7CDCEFB7, 0x0BDBDF21,
0x86D3D2D4, 0xF1D4E242, 0x68DDB3F8, 0x1FDA836E, 0x81BE16CD, 0xF6B9265B, 0x6FB077E1, 0x18B74777,
0x88085AE6, 0xFF0F6A70, 0x66063BCA, 0x11010B5C, 0x8F659EFF, 0xF862AE69, 0x616BFFD3, 0x166CCF45,
0xA00AE278, 0xD70DD2EE, 0x4E048354, 0x3903B3C2, 0xA7672661, 0xD06016F7, 0x4969474D, 0x3E6E77DB,
0xAED16A4A, 0xD9D65ADC, 0x40DF0B66, 0x37D83BF0, 0xA9BCAE53, 0xDEBB9EC5, 0x47B2CF7F, 0x30B5FFE9,
0xBDBDF21C, 0xCABAC28A, 0x53B39330, 0x24B4A3A6, 0xBAD03605, 0xCDD70693, 0x54DE5729, 0x23D967BF,
0xB3667A2E, 0xC4614AB8, 0x5D681B02, 0x2A6F2B94, 0xB40BBE37, 0xC30C8EA1, 0x5A05DF1B, 0x2D02EF8D
};
unsigned int crc = 0xFFFFFFFF;
while (data_size--)
{
crc = (crc >> 8) ^ crc32_table[(crc ^ *data) & 255];
data++;
}
return crc^0xFFFFFFFF;
}
uint16_t crc16(uint8_t *data, uint32_t data_size) uint16_t crc16(uint8_t *data, uint32_t data_size)
{ {
/*Table of CRC values for high order byte*/
static unsigned char auchCRCHi[]=
{
0x00,0xC1,0x81,0x40,0x01,0xC0,0x80,0x41,0x01,0xC0,0x80,0x41,0x00,0xC1,0x81,0x40,
0x01,0xC0,0x80,0x41,0x00,0xC1,0x81,0x40,0x00,0xC1,0x81,0x40,0x01,0xC0,0x80,0x41,
0x01,0xC0,0x80,0x41,0x00,0xC1,0x81,0x40,0x00,0xC1,0x81,0x40,0x01,0xC0,0x80,0x41,
0x00,0xC1,0x81,0x40,0x01,0xC0,0x80,0x41,0x01,0xC0,0x80,0x41,0x00,0xC1,0x81,0x40,
0x01,0xC0,0x80,0x41,0x00,0xC1,0x81,0x40,0x00,0xC1,0x81,0x40,0x01,0xC0,0x80,0x41,
0x00,0xC1,0x81,0x40,0x01,0xC0,0x80,0x41,0x01,0xC0,0x80,0x41,0x00,0xC1,0x81,0x40,
0x00,0xC1,0x81,0x40,0x01,0xC0,0x80,0x41,0x01,0xC0,0x80,0x41,0x00,0xC1,0x81,0x40,
0x01,0xC0,0x80,0x41,0x00,0xC1,0x81,0x40,0x00,0xC1,0x81,0x40,0x01,0xC0,0x80,0x41,
0x01,0xC0,0x80,0x41,0x00,0xC1,0x81,0x40,0x00,0xC1,0x81,0x40,0x01,0xC0,0x80,0x41,
0x00,0xC1,0x81,0x40,0x01,0xC0,0x80,0x41,0x01,0xC0,0x80,0x41,0x00,0xC1,0x81,0x40,
0x00,0xC1,0x81,0x40,0x01,0xC0,0x80,0x41,0x01,0xC0,0x80,0x41,0x00,0xC1,0x81,0x40,
0x01,0xC0,0x80,0x41,0x00,0xC1,0x81,0x40,0x00,0xC1,0x81,0x40,0x01,0xC0,0x80,0x41,
0x00,0xC1,0x81,0x40,0x01,0xC0,0x80,0x41,0x01,0xC0,0x80,0x41,0x00,0xC1,0x81,0x40,
0x01,0xC0,0x80,0x41,0x00,0xC1,0x81,0x40,0x00,0xC1,0x81,0x40,0x01,0xC0,0x80,0x41,
0x01,0xC0,0x80,0x41,0x00,0xC1,0x81,0x40,0x00,0xC1,0x81,0x40,0x01,0xC0,0x80,0x41,
0x00,0xC1,0x81,0x40,0x01,0xC0,0x80,0x41,0x01,0xC0,0x80,0x41,0x00,0xC1,0x81,0x40,
};
/*Table of CRC values for low order byte*/
static char auchCRCLo[] =
{
0x00,0xC0,0xC1,0x01,0xC3,0x03,0x02,0xC2,0xC6,0x06,0x07,0xC7,0x05,0xC5,0xC4,0x04,
0xCC,0x0C,0x0D,0xCD,0x0F,0xCF,0xCE,0x0E,0x0A,0xCA,0xCB,0x0B,0xC9,0x09,0x08,0xC8,
0xD8,0x18,0x19,0xD9,0x1B,0xDB,0xDA,0x1A,0x1E,0xDE,0xDF,0x1F,0xDD,0x1D,0x1C,0xDC,
0x14,0xD4,0xD5,0x15,0xD7,0x17,0x16,0xD6,0xD2,0x12,0x13,0xD3,0x11,0xD1,0xD0,0x10,
0xF0,0x30,0x31,0xF1,0x33,0xF3,0xF2,0x32,0x36,0xF6,0xF7,0x37,0xF5,0x35,0x34,0xF4,
0x3C,0xFC,0xFD,0x3D,0xFF,0x3F,0x3E,0xFE,0xFA,0x3A,0x3B,0xFB,0x39,0xF9,0xF8,0x38,
0x28,0xE8,0xE9,0x29,0xEB,0x2B,0x2A,0xEA,0xEE,0x2E,0x2F,0xEF,0x2D,0xED,0xEC,0x2C,
0xE4,0x24,0x25,0xE5,0x27,0xE7,0xE6,0x26,0x22,0xE2,0xE3,0x23,0xE1,0x21,0x20,0xE0,
0xA0,0x60,0x61,0xA1,0x63,0xA3,0xA2,0x62,0x66,0xA6,0xA7,0x67,0xA5,0x65,0x64,0xA4,
0x6C,0xAC,0xAD,0x6D,0xAF,0x6F,0x6E,0xAE,0xAA,0x6A,0x6B,0xAB,0x69,0xA9,0xA8,0x68,
0x78,0xB8,0xB9,0x79,0xBB,0x7B,0x7A,0xBA,0xBE,0x7E,0x7F,0xBF,0x7D,0xBD,0xBC,0x7C,
0xB4,0x74,0x75,0xB5,0x77,0xB7,0xB6,0x76,0x72,0xB2,0xB3,0x73,0xB1,0x71,0x70,0xB0,
0x50,0x90,0x91,0x51,0x93,0x53,0x52,0x92,0x96,0x56,0x57,0x97,0x55,0x95,0x94,0x54,
0x9C,0x5C,0x5D,0x9D,0x5F,0x9F,0x9E,0x5E,0x5A,0x9A,0x9B,0x5B,0x99,0x59,0x58,0x98,
0x88,0x48,0x49,0x89,0x4B,0x8B,0x8A,0x4A,0x4E,0x8E,0x8F,0x4F,0x8D,0x4D,0x4C,0x8C,
0x44,0x84,0x85,0x45,0x87,0x47,0x46,0x86,0x82,0x42,0x43,0x83,0x41,0x81,0x80,0x40,
};
uchCRCHi = 0xFF; uchCRCHi = 0xFF;
uchCRCLo = 0xFF; uchCRCLo = 0xFF;
/* CRC Generation Function */ /* CRC Generation Function */

33
Core/Modbus/rs_message.c
View File

@@ -285,10 +285,13 @@ RS_StatusTypeDef RS_Abort(RS_HandleTypeDef *hRS, RS_AbortTypeDef AbortMode)
{ {
HAL_StatusTypeDef uart_res = 0; HAL_StatusTypeDef uart_res = 0;
hRS->htim->Instance->CNT = 0; hRS->htim->Instance->CNT = 0;
__HAL_TIM_CLEAR_IT(hRS->htim, TIM_IT_UPDATE);
if(hRS->sRS_Timeout) // if timeout setted if(hRS->sRS_Timeout) // if timeout setted
HAL_TIM_Base_Stop_IT(hRS->htim); // stop timeout {
TIM14->DIER &= ~(TIM_IT_UPDATE);
/* Disable the Peripheral */
TIM14->CR1 &= ~(TIM_CR1_CEN);
}
if((AbortMode&ABORT_RS) == 0x00) if((AbortMode&ABORT_RS) == 0x00)
{ {
@@ -410,7 +413,11 @@ RS_StatusTypeDef RS_UART_RxCpltCallback(RS_HandleTypeDef *hRS)
RS_Set_RX_End(hRS); RS_Set_RX_End(hRS);
if(hRS->sRS_Timeout) // if timeout setted if(hRS->sRS_Timeout) // if timeout setted
HAL_TIM_Base_Stop_IT(hRS->htim); // stop timeout {
TIM14->DIER &= ~(TIM_IT_UPDATE);
/* Disable the Peripheral */
TIM14->CR1 &= ~(TIM_CR1_CEN);
}
// parse received data // parse received data
RS_RES = RS_Parse_Message(hRS, hRS->pMessagePtr, hRS->pBufferPtr); // parse message RS_RES = RS_Parse_Message(hRS, hRS->pMessagePtr, hRS->pBufferPtr); // parse message
@@ -440,7 +447,11 @@ RS_StatusTypeDef RS_UART_RxCpltCallback(RS_HandleTypeDef *hRS)
RS_Set_RX_End(hRS); RS_Set_RX_End(hRS);
if(hRS->sRS_Timeout) // if timeout setted if(hRS->sRS_Timeout) // if timeout setted
HAL_TIM_Base_Stop_IT(hRS->htim); // stop timeout {
TIM14->DIER &= ~(TIM_IT_UPDATE);
/* Disable the Peripheral */
TIM14->CR1 &= ~(TIM_CR1_CEN);
}
// parse received data // parse received data
RS_RES = RS_Parse_Message(hRS, hRS->pMessagePtr, hRS->pBufferPtr); // parse message RS_RES = RS_Parse_Message(hRS, hRS->pMessagePtr, hRS->pBufferPtr); // parse message
@@ -493,7 +504,9 @@ void RS_UART_Handler(RS_HandleTypeDef *hRS)
if(hRS->sRS_Timeout) // if timeout setted if(hRS->sRS_Timeout) // if timeout setted
if((hRS->huart->RxXferCount+1 == hRS->huart->RxXferSize) && RS_Is_RX_Busy(hRS)) // if first byte is received and receive is active if((hRS->huart->RxXferCount+1 == hRS->huart->RxXferSize) && RS_Is_RX_Busy(hRS)) // if first byte is received and receive is active
{ {
HAL_TIM_Base_Start_IT(hRS->htim); TIM14->DIER |= (TIM_IT_UPDATE);
/* Disable the Peripheral */
TIM14->CR1 |= (TIM_CR1_CEN);
RS_Set_RX_Active_Flags(hRS); RS_Set_RX_Active_Flags(hRS);
} }
@@ -528,8 +541,12 @@ void RS_UART_Handler(RS_HandleTypeDef *hRS)
*/ */
void RS_TIM_Handler(RS_HandleTypeDef *hRS) void RS_TIM_Handler(RS_HandleTypeDef *hRS)
{ {
HAL_TIM_IRQHandler(hRS->htim); TIM14->SR = ~(TIM_IT_UPDATE);
HAL_TIM_Base_Stop_IT(hRS->htim); /* Disable the TIM Update interrupt */
TIM14->DIER &= ~(TIM_IT_UPDATE);
/* Disable the Peripheral */
TIM14->CR1 &= ~(TIM_CR1_CEN);
RS_Abort(hRS, ABORT_RS); RS_Abort(hRS, ABORT_RS);
RS_Handle_Receive_Start(hRS, hRS->pMessagePtr); RS_Handle_Receive_Start(hRS, hRS->pMessagePtr);

11
Core/Src/main.c
View File

@@ -24,6 +24,7 @@
#include "main.h" #include "main.h"
#include "gpio.h" #include "gpio.h"
#include "tim.h" #include "tim.h"
#include "usart.h"
#include "pch_sensors.h" #include "pch_sensors.h"
#include "rs_message.h" #include "rs_message.h"
@@ -51,6 +52,11 @@ int main(void)
MX_GPIO_Init(); MX_GPIO_Init();
MX_TIM1_Init(); MX_TIM1_Init();
HAL_TIM_Base_Start(&htim1); HAL_TIM_Base_Start(&htim1);
MX_USART1_UART_Init();
// MODBUS_FirstInit();
// RS_Receive_IT(&hmodbus1, &MODBUS_MSG);
PCHSens_FirstInit(); PCHSens_FirstInit();
/* infinite loop */ /* infinite loop */
@@ -58,6 +64,11 @@ int main(void)
{ {
GPIOA->ODR ^= GPIO_LED_2; GPIOA->ODR ^= GPIO_LED_2;
PCHSens_ReadTemperature(&module1); PCHSens_ReadTemperature(&module1);
PCHSens_ReadTemperature(&module2);
PCHSens_ReadTemperature(&module3);
PCHSens_ReadTemperature(&module4);
PCHSens_ReadTemperature(&module5);
PCHSens_ReadTemperature(&module6);
} }
} }

17
Core/Src/py32f002b_it.c
View File

@@ -75,6 +75,23 @@ void SysTick_Handler(void)
HAL_IncTick(); HAL_IncTick();
} }
//#include "rs_message.h"
///**
// * @brief This function handles USART1.
// */
//void USART1_IRQHandler(void)
//{
// RS_UART_Handler(&hmodbus1);
//}
///**
// * @brief This function handles TIM2 global interrupt.
// */
//void TIM14_IRQHandler(void)
//{
// /* USER CODE BEGIN TIM2_IRQn 0 */
// RS_TIM_Handler(&hmodbus1);
//}
/******************************************************************************/ /******************************************************************************/
/* PY32F002B Peripheral Interrupt Handlers */ /* PY32F002B Peripheral Interrupt Handlers */
/* Add here the Interrupt Handlers for the used peripherals. */ /* Add here the Interrupt Handlers for the used peripherals. */

37
MDK-ARM/Project.uvoptx → MDK-ARM/PY32Dallas.uvoptx
View File

@@ -193,42 +193,42 @@
<Ww> <Ww>
<count>7</count> <count>7</count>
<WinNumber>1</WinNumber> <WinNumber>1</WinNumber>
<ItemText>htim1.Instance-&gt;CNT,0x0A</ItemText> <ItemText>start,0x0A</ItemText>
</Ww> </Ww>
<Ww> <Ww>
<count>8</count> <count>8</count>
<WinNumber>1</WinNumber> <WinNumber>1</WinNumber>
<ItemText>start,0x0A</ItemText> <ItemText>end,0x0A</ItemText>
</Ww> </Ww>
<Ww> <Ww>
<count>9</count> <count>9</count>
<WinNumber>1</WinNumber> <WinNumber>1</WinNumber>
<ItemText>end,0x0A</ItemText> <ItemText>(uint16_t)htim1.Instance-&gt;CNT-start,0x0A</ItemText>
</Ww> </Ww>
<Ww> <Ww>
<count>10</count> <count>10</count>
<WinNumber>1</WinNumber> <WinNumber>1</WinNumber>
<ItemText>(uint16_t)htim1.Instance-&gt;CNT-start,0x0A</ItemText> <ItemText>end-start,0x0A</ItemText>
</Ww> </Ww>
<Ww> <Ww>
<count>11</count> <count>11</count>
<WinNumber>1</WinNumber> <WinNumber>1</WinNumber>
<ItemText>end-start,0x0A</ItemText> <ItemText>((uint16_t)htim1.Instance-&gt;CNT-start &lt;(end-start)),0x0A</ItemText>
</Ww> </Ww>
<Ww> <Ww>
<count>12</count> <count>12</count>
<WinNumber>1</WinNumber> <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>
<Ww> <Ww>
<count>13</count> <count>13</count>
<WinNumber>1</WinNumber> <WinNumber>1</WinNumber>
<ItemText>((uint16_t)htim1.Instance-&gt;CNT-start &lt; us*tim_1us_period),0x0A</ItemText> <ItemText>(uint16_t)htim1.Instance-&gt;CNT-start,0x0A</ItemText>
</Ww> </Ww>
<Ww> <Ww>
<count>14</count> <count>14</count>
<WinNumber>1</WinNumber> <WinNumber>1</WinNumber>
<ItemText>(uint16_t)htim1.Instance-&gt;CNT-start,0x0A</ItemText> <ItemText>hmodbus1</ItemText>
</Ww> </Ww>
</WatchWindow1> </WatchWindow1>
<WatchWindow2> <WatchWindow2>
@@ -247,6 +247,11 @@
<WinNumber>2</WinNumber> <WinNumber>2</WinNumber>
<ItemText>OW</ItemText> <ItemText>OW</ItemText>
</Ww> </Ww>
<Ww>
<count>3</count>
<WinNumber>2</WinNumber>
<ItemText>MB_DATA</ItemText>
</Ww>
</WatchWindow2> </WatchWindow2>
<Tracepoint> <Tracepoint>
<THDelay>0</THDelay> <THDelay>0</THDelay>
@@ -292,21 +297,9 @@
<pMultCmdsp></pMultCmdsp> <pMultCmdsp></pMultCmdsp>
<SystemViewers> <SystemViewers>
<Entry> <Entry>
<Name>System Viewer\GPIOA</Name> <Name>System Viewer\USART1</Name>
<WinId>35905</WinId> <WinId>35905</WinId>
</Entry> </Entry>
<Entry>
<Name>System Viewer\GPIOB</Name>
<WinId>35904</WinId>
</Entry>
<Entry>
<Name>System Viewer\GPIOC</Name>
<WinId>35902</WinId>
</Entry>
<Entry>
<Name>System Viewer\TIM1</Name>
<WinId>35903</WinId>
</Entry>
</SystemViewers> </SystemViewers>
<DebugDescription> <DebugDescription>
<Enable>1</Enable> <Enable>1</Enable>
@@ -444,7 +437,7 @@
<Group> <Group>
<GroupName>Drivers/PY32F002B_HAL_Driver</GroupName> <GroupName>Drivers/PY32F002B_HAL_Driver</GroupName>
<tvExp>0</tvExp> <tvExp>1</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
<cbSel>0</cbSel> <cbSel>0</cbSel>
<RteFlg>0</RteFlg> <RteFlg>0</RteFlg>

71
MDK-ARM/Project.uvprojx → MDK-ARM/PY32Dallas.uvprojx
View File

@@ -139,7 +139,7 @@
</Flash1> </Flash1>
<bUseTDR>1</bUseTDR> <bUseTDR>1</bUseTDR>
<Flash2>BIN\UL2CM3.DLL</Flash2> <Flash2>BIN\UL2CM3.DLL</Flash2>
<Flash3></Flash3> <Flash3>"" ()</Flash3>
<Flash4></Flash4> <Flash4></Flash4>
<pFcarmOut></pFcarmOut> <pFcarmOut></pFcarmOut>
<pFcarmGrp></pFcarmGrp> <pFcarmGrp></pFcarmGrp>
@@ -549,6 +549,75 @@
</Group> </Group>
<Group> <Group>
<GroupName>Modbus</GroupName> <GroupName>Modbus</GroupName>
<GroupOption>
<CommonProperty>
<UseCPPCompiler>0</UseCPPCompiler>
<RVCTCodeConst>0</RVCTCodeConst>
<RVCTZI>0</RVCTZI>
<RVCTOtherData>0</RVCTOtherData>
<ModuleSelection>0</ModuleSelection>
<IncludeInBuild>0</IncludeInBuild>
<AlwaysBuild>2</AlwaysBuild>
<GenerateAssemblyFile>2</GenerateAssemblyFile>
<AssembleAssemblyFile>2</AssembleAssemblyFile>
<PublicsOnly>2</PublicsOnly>
<StopOnExitCode>11</StopOnExitCode>
<CustomArgument></CustomArgument>
<IncludeLibraryModules></IncludeLibraryModules>
<ComprImg>1</ComprImg>
</CommonProperty>
<GroupArmAds>
<Cads>
<interw>2</interw>
<Optim>0</Optim>
<oTime>2</oTime>
<SplitLS>2</SplitLS>
<OneElfS>2</OneElfS>
<Strict>2</Strict>
<EnumInt>2</EnumInt>
<PlainCh>2</PlainCh>
<Ropi>2</Ropi>
<Rwpi>2</Rwpi>
<wLevel>0</wLevel>
<uThumb>2</uThumb>
<uSurpInc>2</uSurpInc>
<uC99>2</uC99>
<uGnu>2</uGnu>
<useXO>2</useXO>
<v6Lang>0</v6Lang>
<v6LangP>0</v6LangP>
<vShortEn>2</vShortEn>
<vShortWch>2</vShortWch>
<v6Lto>2</v6Lto>
<v6WtE>2</v6WtE>
<v6Rtti>2</v6Rtti>
<VariousControls>
<MiscControls></MiscControls>
<Define></Define>
<Undefine></Undefine>
<IncludePath></IncludePath>
</VariousControls>
</Cads>
<Aads>
<interw>2</interw>
<Ropi>2</Ropi>
<Rwpi>2</Rwpi>
<thumb>2</thumb>
<SplitLS>2</SplitLS>
<SwStkChk>2</SwStkChk>
<NoWarn>2</NoWarn>
<uSurpInc>2</uSurpInc>
<useXO>2</useXO>
<ClangAsOpt>0</ClangAsOpt>
<VariousControls>
<MiscControls></MiscControls>
<Define></Define>
<Undefine></Undefine>
<IncludePath></IncludePath>
</VariousControls>
</Aads>
</GroupArmAds>
</GroupOption>
<Files> <Files>
<File> <File>
<FileName>crc_algs.c</FileName> <FileName>crc_algs.c</FileName>

3986
MDK-ARM/Project.uvguix.I
View File

File diff suppressed because one or more lines are too long

2
MDK-ARM/RTE/_PY32F002Bx5_Project/RTE_Components.h
View File

@@ -3,7 +3,7 @@
* Auto generated Run-Time-Environment Configuration File * Auto generated Run-Time-Environment Configuration File
* *** Do not modify ! *** * *** Do not modify ! ***
* *
* Project: 'Project' * Project: 'PY32Dallas'
* Target: 'PY32F002Bx5_Project' * Target: 'PY32F002Bx5_Project'
*/ */