diff --git a/.DS_Store b/.DS_Store index 5f37641..355c459 100755 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/Core/.DS_Store b/Core/.DS_Store index 605af8f..17ac7ce 100755 Binary files a/Core/.DS_Store and b/Core/.DS_Store differ diff --git a/Core/Inc/.DS_Store b/Core/Inc/.DS_Store index e23fe3c..4f090d2 100755 Binary files a/Core/Inc/.DS_Store and b/Core/Inc/.DS_Store differ diff --git a/Core/Inc/board.h b/Core/Inc/board.h index 1fb8a8f..3b5814a 100755 --- a/Core/Inc/board.h +++ b/Core/Inc/board.h @@ -55,7 +55,8 @@ typedef struct __attribute__((packed)) { uint8_t stationType; // Байт 4: тип станции uint8_t boardVersion; // Байт 5: версия платы uint8_t addrEdcan; // Байт 6: адрес EDCAN - uint8_t reserved[57]; // Байты 7-63: зарезервированы + uint8_t maxPower; // Байт 7: максимальная мощность станции (5кВт/bit) + uint8_t reserved[56]; // Байты 8-63: зарезервированы } InfoBlock_t; extern InfoBlock_t *InfoBlock; diff --git a/Core/Inc/isr_opt.h b/Core/Inc/isr_opt.h new file mode 100644 index 0000000..a9582fe --- /dev/null +++ b/Core/Inc/isr_opt.h @@ -0,0 +1,11 @@ +#ifndef ISR_OPT_H +#define ISR_OPT_H + +/* GCC: быстрые функции, вызываемые из IRQ / из HAL из IRQ-контекста */ +#if defined(__GNUC__) +#define ISR_FAST __attribute__((optimize("Ofast"))) +#else +#define ISR_FAST +#endif + +#endif /* ISR_OPT_H */ diff --git a/Core/Src/.DS_Store b/Core/Src/.DS_Store index 31d6e09..5d3e20a 100755 Binary files a/Core/Src/.DS_Store and b/Core/Src/.DS_Store differ