Mercurial > public > ostc4
diff Discovery/Inc/data_exchange_main.h @ 416:bcf447646e07
Merged in Ideenmodellierer/ostc4/Improment_NVM (pull request #37)
Improment NVM
| author | heinrichsweikamp <bitbucket@heinrichsweikamp.com> |
|---|---|
| date | Wed, 15 Jan 2020 10:53:15 +0000 |
| parents | b11e50415982 |
| children | eb2060caca7d |
line wrap: on
line diff
--- a/Discovery/Inc/data_exchange_main.h Wed Jan 08 15:35:15 2020 +0100 +++ b/Discovery/Inc/data_exchange_main.h Wed Jan 15 10:53:15 2020 +0000 @@ -45,6 +45,7 @@ void DataEX_copy_to_LifeData(_Bool *modeChangeFlag); void DataEX_copy_to_deco(void); void DateEx_copy_to_dataOut(void); +void DataEX_merge_deviceData(void); uint32_t DataEX_lost_connection_count(void); void DataEX_control_connection_while_asking_for_sleep(void); uint8_t DataEX_check_RTE_version__needs_update(void);