Added some safeguards to avoid issues related to data struct sizes

This commit is contained in:
Raphael Coeffic
2021-11-10 11:07:02 +01:00
parent c9b20063ec
commit baba1c5e9d
4 changed files with 28 additions and 20 deletions
@@ -19,8 +19,9 @@
* GNU General Public License for more details.
*/
#ifndef _DATACONSTANTS_H_
#define _DATACONSTANTS_H_
#if defined(_DATACONSTANTS_H_)
#error "This file MUST NOT be included side-by-side with dataconstants.h"
#endif
#include <storage/yaml/yaml_defs.h>
#include <hal.h>
@@ -1046,5 +1047,3 @@ enum CalibrationState {
CALIB_STORE,
CALIB_FINISHED
};
#endif // _DATACONSTANTS_H_
@@ -19,9 +19,6 @@
* GNU General Public License for more details.
*/
// No include guards here, this file may be included many times in different namespaces
// i.e. BACKUP RAM Backup/Restore functions
#pragma once
#include <inttypes.h>
@@ -19,11 +19,10 @@
* GNU General Public License for more details.
*/
#ifndef _MYEEPROM_H_
#define _MYEEPROM_H_
#if defined(_MYEEPROM_H_)
#error "This file MUST NOT be included side-by-side with myeeprom.h"
#endif
// #include "datastructs.h"
// #include "libopenui/src/bitfield.h"
#if defined(SDCARD_YAML)
#define EEPROM_VER 221
@@ -278,5 +277,3 @@ PACK(union u_int8int16_t {
constexpr uint8_t EE_GENERAL = 0x01;
constexpr uint8_t EE_MODEL = 0x02;
#endif // _MYEEPROM_H_