This commit is contained in:
rusefi 2019-11-12 22:17:29 -05:00
parent a23f6bb23e
commit 2ebaa5cf20
2 changed files with 6 additions and 6 deletions

View File

@ -8,15 +8,14 @@
#ifndef ERROR_HANDLING_H_ #ifndef ERROR_HANDLING_H_
#define ERROR_HANDLING_H_ #define ERROR_HANDLING_H_
#include "global.h"
#include "obd_error_codes.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" extern "C"
{ {
#endif /* __cplusplus */ #endif /* __cplusplus */
#include "global.h"
#include "obd_error_codes.h"
/** /**
* Something is wrong, but we can live with it: some minor sensor is disconnected * Something is wrong, but we can live with it: some minor sensor is disconnected
* or something like that * or something like that
@ -31,7 +30,7 @@ typedef uint8_t fatal_msg_t[200];
* *
* see also warning() * see also warning()
*/ */
EXTERNC void firmwareError(obd_code_e code, const char *fmt, ...); void firmwareError(obd_code_e code, const char *fmt, ...);
#define hasFirmwareError() hasFirmwareErrorFlag #define hasFirmwareError() hasFirmwareErrorFlag

View File

@ -15,6 +15,8 @@
#ifndef GLOBAL_H_ #ifndef GLOBAL_H_
#define GLOBAL_H_ #define GLOBAL_H_
#include "common_headers.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" extern "C"
{ {
@ -22,7 +24,6 @@ extern "C"
// todo: remove this from here and rely on os_access.h. unfortunately hal.h includes ch.h :( // todo: remove this from here and rely on os_access.h. unfortunately hal.h includes ch.h :(
#include <hal.h> #include <hal.h>
#include "common_headers.h"
// this is about MISRA not liking 'time.h'. todo: figure out something // this is about MISRA not liking 'time.h'. todo: figure out something
#if defined __GNUC__ #if defined __GNUC__