From 28d63c727084ff477f5ac734c59003a909d29e2e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=90=D1=80=D1=82=D0=B5=D0=BC=20=D0=A7=D0=B0=D0=BC=D0=B0?=
 =?UTF-8?q?=D0=B9=D0=BA=D0=B8=D0=BD?= <achamaikin@141922.ru>
Date: Tue, 5 May 2026 12:25:11 +0300
Subject: [PATCH] latest version before merge

---
 .DS_Store          | Bin 10244 -> 10244 bytes
 Core/.DS_Store     | Bin 10244 -> 10244 bytes
 Core/Inc/.DS_Store | Bin 6148 -> 6148 bytes
 Core/Inc/board.h   |   3 ++-
 Core/Inc/isr_opt.h |  11 +++++++++++
 Core/Src/.DS_Store | Bin 6148 -> 6148 bytes
 6 files changed, 13 insertions(+), 1 deletion(-)
 create mode 100644 Core/Inc/isr_opt.h

diff --git a/.DS_Store b/.DS_Store
index 5f376416c99570fc504246acd469fa3c4d0f1db8..355c45986b7835386703d4e8264150188113c0ce 100755
GIT binary patch
delta 82
zcmV-Y0ImOoP=rvBPXQ6JP`eKS5wi>ss{s-O07C$80CE6jWOHL|VsCG30h6>5jubO8
oH7p=AH8p)KAbUA7Ff1T6HZ-$V5}XaQ2O#?dlhqeVvo;mE0@kJ&NB{r;

delta 66
zcmZn(XbG6$&nU1lU^hRbz-AtS)r^zR2zHB@o0{t=n3$W@>L^rO8W{lD#%7zdh34>1
VED+tyuJD^>@_%uY&EBHtm;k8Q6yE><

diff --git a/Core/.DS_Store b/Core/.DS_Store
index 605af8f4992e8f654c32f077e31069361acdd92d..17ac7ce899400122149201c9820996b3e00abb59 100755
GIT binary patch
delta 180
zcmZn(XbG4g&dJTdz{tVCAi+IRL0y`e0muVlNgxKY1sE8Tlgf(=l5+BsCKfK8Y@ouz
z3X*1-d_(-~<hugu8;h9PHnVfEaES1Nbp$gMF(juHC+8&P=jSkPUMi8qKCz*Tk$W<a
zz+X<7IK$@u0(aOZmPtyo0yP1F0?-W%u0ZSHZrND)o_R9AisfV<m93K-1xq%^iPkbr
HEE59&<nb!v

delta 133
zcmZn(XbG4g&d4*dP;8=}<YWUC7I6k301=D~3<3=K$w@i+NkE>!W<jQJteX{>)-!Hq
z=V0Mr6rao^@prR~<R!Mr!i=XT|7T>~tRfK0F31eh&%mI-4J2HF`gnjEzcWwfSFxOI
c&m%E8MrGmTH3IsRZ%OKHE|jfh0&3O-0N~pnw*UYD

diff --git a/Core/Inc/.DS_Store b/Core/Inc/.DS_Store
index e23fe3c9f173271e7411e368eaa7ccb7e82c78ed..4f090d2d01075974d8d0757c5de1bab4474cc07e 100755
GIT binary patch
delta 75
zcmZoMXfc=|#>B)qu~2NHo+2aX#(>?7jGU8sSac_+vP4Y&&Jwk`p0$H%W5X1t&Fmcf
d96+U;1v$PmPv#eK<X`{-Mg|6!%@HDNm;n*Q688WA

delta 189
zcmZoMXfc=|#>B!ku~2NHo+2a9#(>?7iytsEG4f32VbYalV{l?fWJqSnW+-JS@XX0i
zPRhwoVqjnp0OIwNwV2ZNd4aMSKs7}S=?tkrG9E}LF_bXqF=U{sXZ#7&GjDPmQ>rpM
zLl%P}gC&D85M!ugN(ZUi{D5gP(`I%Keh#4HHeY1^&ODi4#F2xMfq@Aq&9FH_WDPR_
DCafv}

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 31d6e099e9293497585d86e240cf29df7c92c48d..5d3e20ab76e49415ada171027621002963b65320 100755
GIT binary patch
delta 31
ncmZoMXfc@J&&azmU^g=(?_?ep-OZ^ii<l=i=xk=^_{$Ffnmh@=

delta 58
zcmZoMXfc@J&&aniU^g=(-((&ZU0F5;Cx%3ZWQJ^pQicN0oc!dZoctsP1_l8jUcXt3
MWh3)uc8<UN0Io?6wg3PC