From f70f7a41ef2ea3aee9133da2e6e56b4fbaed4382 Mon Sep 17 00:00:00 2001
From: lolzik-2 <lolzikbazzer0@gmail.com>
Date: Mon, 9 Nov 2026 19:58:33 +0400
Subject: [PATCH 1/6] Refactor IR signal handling to always use raw data

Updated IR receiver setup and signal processing to always use raw data, aligning with version 1.11.1 behavior.
---
 src/modules/ir/ir_read.cpp | 55 ++++++++++++--------------------------
 1 file changed, 17 insertions(+), 38 deletions(-)

diff --git a/src/modules/ir/ir_read.cpp b/src/modules/ir/ir_read.cpp
index 2f9cc95680..85b15a9ab1 100644
--- a/src/modules/ir/ir_read.cpp
+++ b/src/modules/ir/ir_read.cpp
@@ -77,11 +77,13 @@ static String getParsedProtocolName(const decode_results &r) {
 }
 
 void IrRead::setup() {
+    // === КАК В 1.11.1 ===
     irrecv.enableIRIn();
 
 #ifdef USE_BOOST
     PPM.enableOTG();
 #endif
+    // Проверяем, что пин приёмника есть в списке IR_RX_PINS
     const std::vector<std::pair<String, int>> pins = IR_RX_PINS;
     int count = 0;
     for (auto pin : pins) {
@@ -89,9 +91,12 @@ void IrRead::setup() {
     }
     if (count == 0) gsetIrRxPin(true);
 
-    setup_ir_pin(bruceConfigPins.irRx, INPUT);
+    // КАК В 1.11.1: обычный INPUT, без setup_ir_pin (он и был источником шума).
+    pinMode(bruceConfigPins.irRx, INPUT);
+
     if (headless) return;
     returnToMenu = true;
+
     std::vector<Option> quickRemoteOptions = {
         {"TV",
          [&]() {
@@ -241,16 +246,11 @@ void IrRead::read_signal() {
 
     _read_signal = true;
 
-    raw = (results.decode_type == decode_type_t::UNKNOWN) || hasACState(results.decode_type);
+    // КАК В 1.11.1: всегда пишем RAW, без разбора протокола.
+    raw = true;
 
     display_banner();
 
-    if (!raw) {
-        String proto = getParsedProtocolName(results);
-        padprintln("Protocol: " + (proto.length() ? proto : "UNKNOWN"));
-        padprintln("Bits: " + String(results.bits));
-    }
-
     padprint("RAW Data Captured:");
     String raw_signal = parse_raw_signal();
     _captured_raw_signal = raw_signal;
@@ -269,32 +269,15 @@ void IrRead::discard_signal() {
 }
 
 void IrRead::emulate_signal() {
+    // В 1.11.1 эмуляции не было. Здесь реализуем её только через RAW,
+    // потому что raw всегда = true (как в 1.11.1).
     IRCode code;
-    if (raw) {
-        code.type = "raw";
-        code.frequency = IR_FREQUENCY;
-        code.data = _captured_raw_signal;
-    } else {
-        code.type = "parsed";
-        code.protocol = getParsedProtocolName(results);
-        code.address = uint32ToString(results.address);
-        code.command = (results.decode_type == decode_type_t::NEC)
-            ? uint32ToString(necCommandWithInverse(results.command))
-            : uint32ToString(results.command);
-        code.bits = results.bits;
-        code.data = resultToHexidecimal(&results);
-        if (code.protocol == "") {
-            code.type = "raw";
-            code.frequency = IR_FREQUENCY;
-            code.data = _captured_raw_signal;
-        }
-    }
+    code.type = "raw";
+    code.frequency = IR_FREQUENCY;
+    code.data = _captured_raw_signal;
+
     sendIRCommand(&code);
-    if (code.type == "parsed" &&
-        (code.protocol == "RC5" || code.protocol == "RC5X" || code.protocol == "RC6")) {
-        delay(35);
-        sendIRCommand(&code);
-    }
+
     _emulate_mode = true;
     display_banner();
     tft.setTextSize(FP);
@@ -329,12 +312,10 @@ String IrRead::parse_state_signal() {
 }
 
 String IrRead::parse_raw_signal() {
-
     rawcode = resultToRawArray(&results);
     raw_data_len = getCorrectedRawLength(&results);
 
     String signal_code = "";
-
     for (uint16_t i = 0; i < raw_data_len; i++) { signal_code += String(rawcode[i]) + " "; }
 
     delete[] rawcode;
@@ -353,6 +334,8 @@ void IrRead::append_to_file_str(const String &btn_name) {
         strDeviceContent += "duty_cycle: " + String(DUTY_CYCLE) + "\n";
         strDeviceContent += "data: " + parse_raw_signal() + "\n";
     } else {
+        // Эта ветка в текущей логике недостижима (raw всегда true),
+        // но оставлена для совместимости с ir_read.h.
         strDeviceContent += "type: parsed\n";
         switch (results.decode_type) {
             case decode_type_t::RC5: {
@@ -421,7 +404,6 @@ void IrRead::save_device() {
             {"SD Card",  [&]() { fs = &SD; }      },
             {"LittleFS", [&]() { fs = &LittleFS; }},
         };
-
         loopOptions(options);
     } else if (sdCardAvailable) {
         fs = &SD;
@@ -448,7 +430,6 @@ void IrRead::save_device() {
 }
 
 String IrRead::loop_headless(int max_loops) {
-
     while (!irrecv.decode(&results)) {
         max_loops -= 1;
         if (max_loops <= 0) {
@@ -496,7 +477,6 @@ bool IrRead::write_file(String filename, FS *fs) {
             {"Overwrite ",    [&]() { ch = 2; }},
             {"Change name",   [&]() { ch = 3; }},
         };
-
         loopOptions(options);
 
         switch (ch) {
@@ -515,7 +495,6 @@ bool IrRead::write_file(String filename, FS *fs) {
     }
 
     File file = (*fs).open("/BruceIR/" + filename + ".ir", FILE_WRITE);
-
     if (!file) { return false; }
 
     file.println("Filetype: Bruce IR File");

From a9e3c55f291c3b3acaec4f4ac2cde4d1ec436623 Mon Sep 17 00:00:00 2001
From: lolzik-2 <lolzikbazzer0@gmail.com>
Date: Mon, 9 Nov 2026 20:02:28 +0400
Subject: [PATCH 2/6] Uncomment m5stack environments and update FastLED source

---
 platformio.ini | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/platformio.ini b/platformio.ini
index 49d7584766..630035817e 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -11,8 +11,8 @@
 [platformio]
 default_envs =
 	m5stack-cardputer
-	;m5stack-sticks3
-	;m5stack-cplus2
+	m5stack-sticks3
+	m5stack-cplus2
 	;m5stack-cplus1_1
 	;LAUNCHER_m5stack-cplus1_1
 	;m5stack-core2
@@ -129,7 +129,7 @@ build_flags =
 	-DEEPROMSIZE=128
 	-DLH=8
 	-DLW=6
-	-flto
+	;-flto
 	-ffunction-sections
 	-fdata-sections
 	-Os
@@ -202,7 +202,7 @@ lib_deps =
 	bitbank2/AnimatedGIF
 	bitbank2/PNGdec @ ^1.1.2
 	ESP32Async/ESPAsyncWebServer
-	fastled/FastLED @^3.10.3
+	https://github.com/bmorcelli/FastLED
 	jgromes/RadioLib @ ^7.4.0
 	; Pinned to fixed commits so upstream changes never break our patches
 	; (applied by patch_library_conflicts.py): IRQ-less I2C polling for

From aade28b500618c144cb06b5c5e972dc244c61dfc Mon Sep 17 00:00:00 2001
From: lolzik-2 <lolzikbazzer0@gmail.com>
Date: Mon, 9 Nov 2026 20:18:49 +0400
Subject: [PATCH 3/6] Remove clock display and show 'BRUCE' instead

Removed clock display functionality and updated display to show 'BRUCE'.
---
 src/core/display.cpp | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

diff --git a/src/core/display.cpp b/src/core/display.cpp
index 3b4f210baa..8c20a8a1e8 100644
--- a/src/core/display.cpp
+++ b/src/core/display.cpp
@@ -927,19 +927,11 @@ void drawStatusBar() {
         tft.drawLine(5, 25, tftWidth - 6, 25, bruceConfig.priColor);
     }
 
-    if (clock_set) {
-        setTftDisplay(12, 12, bruceConfig.priColor, 1, bruceConfig.bgColor);
-        tft.fillRect(12, 12, 60, LH, bruceConfig.bgColor);
-#if defined(HAS_RTC)
-        updateTimeStr(_rtc.getTimeStruct());
-#else
-        updateTimeStr(rtc.getTimeStruct());
-#endif
-        tft.print(timeStr);
-    } else {
-        setTftDisplay(12, 12, bruceConfig.priColor, 1, bruceConfig.bgColor);
-        tft.print("BRUCE " + String(BRUCE_VERSION));
-    }
+    // === УБРАЛИ ЧАСЫ ===
+    setTftDisplay(12, 12, bruceConfig.priColor, 1, bruceConfig.bgColor);
+    tft.fillRect(12, 12, 60, LH, bruceConfig.bgColor);
+    tft.print("BRUCE"); 
+    // ===================
 
     int iconCount = 0;
     bool showSD = sdcardMounted;

From c130a6e12bfb55752e1812ca123be517bb4bd452 Mon Sep 17 00:00:00 2001
From: lolzik-2 <lolzikbazzer0@gmail.com>
Date: Mon, 9 Nov 2026 20:33:18 +0400
Subject: [PATCH 4/6] Add header file for conditioners menu function

---
 src/modules/ir/conditioners.h | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 src/modules/ir/conditioners.h

diff --git a/src/modules/ir/conditioners.h b/src/modules/ir/conditioners.h
new file mode 100644
index 0000000000..3bae656c42
--- /dev/null
+++ b/src/modules/ir/conditioners.h
@@ -0,0 +1,8 @@
+#ifndef __CONDITIONERS_H__
+#define __CONDITIONERS_H__
+
+#include <Arduino.h>
+
+void conditionersMenu();
+
+#endif

From 9461f8399c0230128caa899cd1e6c89490d9fa21 Mon Sep 17 00:00:00 2001
From: lolzik-2 <lolzikbazzer0@gmail.com>
Date: Mon, 9 Nov 2026 20:34:23 +0400
Subject: [PATCH 5/6] Implement Gree AC control functions and menu

---
 src/modules/ir/conditioners.cpp | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 src/modules/ir/conditioners.cpp

diff --git a/src/modules/ir/conditioners.cpp b/src/modules/ir/conditioners.cpp
new file mode 100644
index 0000000000..000a0670d2
--- /dev/null
+++ b/src/modules/ir/conditioners.cpp
@@ -0,0 +1,27 @@
+#include "conditioners.h"
+#include "core/display.h"
+#include "core/mykeyboard.h"
+#include "custom_ir.h"
+#include <globals.h>
+#include <ir_Gree.h>
+
+void sendGreeAC(bool power, int temp, int mode) {
+    IRGreeAC ac(bruceConfigPins.irTx);
+    ac.begin();
+    ac.setPower(power);
+    ac.setTemp(temp);
+    ac.setMode(mode); // 0=Auto, 1=Cool, 2=Dry, 3=Fan, 4=Heat
+    ac.setFan(0);     // 0=Auto
+    ac.send();
+    delay(200); 
+}
+
+void conditionersMenu() {
+    options = {
+        {"ON (Cool 22)",  [=]() { displayRedStripe("Sending ON..."); sendGreeAC(true, 22, 1); displaySuccess("Done!"); }},
+        {"ON (Heat 24)",  [=]() { displayRedStripe("Sending HEAT..."); sendGreeAC(true, 24, 4); displaySuccess("Done!"); }},
+        {"OFF",           [=]() { displayRedStripe("Sending OFF..."); sendGreeAC(false, 22, 1); displaySuccess("Done!"); }},
+        {"Back",          yield}
+    };
+    loopOptions(options);
+}

From 0f6876dad06c0f567b4831e8af8faf535b7e4ca2 Mon Sep 17 00:00:00 2001
From: lolzik-2 <lolzikbazzer0@gmail.com>
Date: Mon, 9 Nov 2026 20:38:19 +0400
Subject: [PATCH 6/6] Update options menu with new AC item and renames

---
 src/core/menu_items/IRMenu.cpp | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/core/menu_items/IRMenu.cpp b/src/core/menu_items/IRMenu.cpp
index 987881e0fc..0e1183f2bf 100644
--- a/src/core/menu_items/IRMenu.cpp
+++ b/src/core/menu_items/IRMenu.cpp
@@ -6,16 +6,19 @@
 #include "modules/ir/custom_ir.h"
 #include "modules/ir/ir_jammer.h"
 #include "modules/ir/ir_read.h"
+#include "modules/ir/conditioners.h" // <--- ДОБАВЛЕНО ДЛЯ AC
 
 void IRMenu::optionsMenu() {
 #if defined(ARDUINO_M5STICK_S3)
     bool prevPower = M5.Power.getExtOutput();
     M5.Power.setExtOutput(true); // ENABLE 5V OUTPUT
 #endif
+
     options = {
-        {"TV-B-Gone", StartTvBGone              },
-        {"Custom IR", otherIRcodes              },
-        {"IR Read",   [=]() { IrRead(); }       },
+        {"TV-B-gone", StartTvBGone              }, // Переименовано
+        {"Custom IR", otherIRcodes              }, // Переименовано
+        {"Ir read",   [=]() { IrRead(); }       }, // Переименовано
+        {"AC",        [=]() { conditionersMenu(); } }, // <--- НОВЫЙ ПУНКТ
 #if !defined(LITE_VERSION)
         {"IR Jammer", startIrJammer             }, // Simple frequency-adjustable jammer
 #endif