From b3f0382d7064b3f75a7c5a65606bf464fd06e96f Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@home-assistant.io>
Date: Thu, 10 Sep 2026 16:00:21 -0500
Subject: [PATCH] [sensor] Remove deprecated raw_state member

---
 .../modbus_controller/number/modbus_number.cpp |  1 -
 .../modbus_controller/sensor/modbus_sensor.cpp |  1 -
 esphome/components/sensor/sensor.cpp           |  7 ++-----
 esphome/components/sensor/sensor.h             | 18 ++++--------------
 4 files changed, 6 insertions(+), 21 deletions(-)

diff --git a/esphome/components/modbus_controller/number/modbus_number.cpp b/esphome/components/modbus_controller/number/modbus_number.cpp
index aff05cd517..223aa12bec 100644
--- a/esphome/components/modbus_controller/number/modbus_number.cpp
+++ b/esphome/components/modbus_controller/number/modbus_number.cpp
@@ -23,7 +23,6 @@ void ModbusNumber::parse_and_publish(std::span<const uint8_t> data) {
     }
   }
   ESP_LOGD(TAG, "Number new state : %.02f", result);
-  // this->sensor_->raw_state = result;
   this->publish_state(result);
 }
 
diff --git a/esphome/components/modbus_controller/sensor/modbus_sensor.cpp b/esphome/components/modbus_controller/sensor/modbus_sensor.cpp
index b2bc2b5fd0..2035f2220a 100644
--- a/esphome/components/modbus_controller/sensor/modbus_sensor.cpp
+++ b/esphome/components/modbus_controller/sensor/modbus_sensor.cpp
@@ -22,7 +22,6 @@ void ModbusSensor::parse_and_publish(std::span<const uint8_t> data) {
     }
   }
   ESP_LOGD(TAG, "Sensor new state: %.02f", result);
-  // this->sensor_->raw_state = result;
   this->publish_state(result);
 }
 
diff --git a/esphome/components/sensor/sensor.cpp b/esphome/components/sensor/sensor.cpp
index 59e011932b..c83cb483df 100644
--- a/esphome/components/sensor/sensor.cpp
+++ b/esphome/components/sensor/sensor.cpp
@@ -42,7 +42,7 @@ const LogString *state_class_to_string(StateClass state_class) {
 
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-Sensor::Sensor() : state(NAN), raw_state(NAN) {}
+Sensor::Sensor() : state(NAN), raw_state_(NAN) {}
 #pragma GCC diagnostic pop
 
 int8_t Sensor::get_accuracy_decimals() {
@@ -66,10 +66,7 @@ StateClass Sensor::get_state_class() {
 }
 
 void Sensor::publish_state(float state) {
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-  this->raw_state = state;
-#pragma GCC diagnostic pop
+  this->raw_state_ = state;
 #ifdef USE_SENSOR_FILTER
   this->raw_callback_.call(state);
 #endif
diff --git a/esphome/components/sensor/sensor.h b/esphome/components/sensor/sensor.h
index f4ea4af985..8c0c479463 100644
--- a/esphome/components/sensor/sensor.h
+++ b/esphome/components/sensor/sensor.h
@@ -96,13 +96,8 @@ class Sensor : public EntityBase {
 
   /// Getter-syntax for .state.
   float get_state() const { return this->state; }
-  /// Getter-syntax for .raw_state
-  float get_raw_state() const {
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-    return this->raw_state;
-#pragma GCC diagnostic pop
-  }
+  /// Get the last state received by publish_state(), before any filters were applied.
+  float get_raw_state() const { return this->raw_state_; }
 
   /** Publish a new state to the front-end.
    *
@@ -137,16 +132,11 @@ class Sensor : public EntityBase {
    */
   float state;
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-  /// @deprecated Use get_raw_state() instead. This member will be removed in ESPHome 2026.10.0.
-  ESPDEPRECATED("Use get_raw_state() instead of .raw_state. Will be removed in 2026.10.0", "2026.4.0")
-  float raw_state;
-#pragma GCC diagnostic pop
-
   void internal_send_state_to_frontend(float state);
 
  protected:
+  float raw_state_;  ///< The last state passed to publish_state(), before filters.
+
 #ifdef USE_SENSOR_FILTER
   LazyCallbackManager<void(float)> raw_callback_;  ///< Storage for raw state callbacks.
 #endif