Skip to content

Commit 33075a5

Browse files
committed
hotfix
1 parent 1730f92 commit 33075a5

File tree

10 files changed

+268
-2148
lines changed

10 files changed

+268
-2148
lines changed

custom_components/reterminal_dashboard/frontend/editor.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<aside class="sidebar">
2121
<div>
2222
<h1><span class="logo-dot"></span> ESPHome Designer <span
23-
style="font-size: 10px; color: var(--muted); vertical-align: middle;">v0.7.0</span></h1>
23+
style="font-size: 10px; color: var(--muted); vertical-align: middle;">v0.7.1</span></h1>
2424
<div style="margin-top: 4px; font-size: 10px;">
2525
<a href="https://github.com/koosoli/esphomedesigner" target="_blank"
2626
style="color: var(--accent); text-decoration: none; display: flex; align-items: center; gap: 4px;">

custom_components/reterminal_dashboard/frontend/js/io/devices.js

Lines changed: 84 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
window.DEVICE_PROFILES = {
99
reterminal_e1001: {
1010
name: "reTerminal E1001 (Monochrome)",
11-
displayModel: "7.50inv2",
11+
displayModel: "7.50inv2p",
1212
displayPlatform: "waveshare_epaper",
1313
pins: {
1414
display: { cs: "GPIO10", dc: "GPIO11", reset: { number: "GPIO12", inverted: false }, busy: { number: "GPIO13", inverted: true } },
@@ -81,8 +81,90 @@ window.DEVICE_PROFILES = {
8181
sht4x: false
8282
}
8383
},
84+
<<<<<<< Updated upstream
85+
=======
86+
m5stack_coreink: {
87+
name: "M5Stack CoreInk (200x200)",
88+
displayModel: "1.54in-m5coreink-m09",
89+
displayPlatform: "waveshare_epaper",
90+
resolution: { width: 200, height: 200 },
91+
features: {
92+
psram: false,
93+
buzzer: true,
94+
buttons: true,
95+
lcd: false,
96+
epaper: true
97+
},
98+
pins: {
99+
display: { cs: "GPIO9", dc: "GPIO15", reset: "GPIO0", busy: { number: "GPIO4", inverted: true } },
100+
i2c: { sda: "GPIO21", scl: "GPIO22" },
101+
spi: { clk: "GPIO18", mosi: "GPIO23" },
102+
batteryEnable: { number: "GPIO12", ignore_strapping_warning: true }, // Power Hold Pin
103+
batteryAdc: "GPIO35",
104+
buzzer: "GPIO2",
105+
buttons: {
106+
left: { number: "GPIO39", mode: "INPUT" },
107+
right: { number: "GPIO37", mode: "INPUT" },
108+
refresh: { number: "GPIO38", mode: "INPUT" }
109+
}
110+
},
111+
battery: {
112+
attenuation: "12db",
113+
multiplier: 2.0,
114+
calibration: { min: 3.30, max: 4.15 }
115+
},
116+
i2c_config: { scan: true }, // Internal I2C for RTC
117+
},
118+
m5stack_paper: {
119+
name: "M5Paper (540x960)",
120+
displayModel: "M5Paper",
121+
displayPlatform: "it8951e",
122+
resolution: { width: 540, height: 960 },
123+
features: {
124+
psram: true,
125+
buzzer: false,
126+
buttons: true, // Has multifunction button
127+
lcd: false,
128+
epaper: true,
129+
touch: true // Has GT911
130+
},
131+
pins: {
132+
display: { cs: "GPIO15", dc: null, reset: "GPIO23", busy: "GPIO27" }, // DC not used for IT8951E
133+
i2c: { sda: "GPIO21", scl: "GPIO22" }, // For GT911 and others
134+
spi: { clk: "GPIO14", mosi: "GPIO12", miso: "GPIO13" }, // M5Paper SPI
135+
batteryEnable: null,
136+
batteryAdc: "GPIO35",
137+
buzzer: null,
138+
buttons: {
139+
left: { number: "GPIO39", mode: "INPUT" },
140+
right: { number: "GPIO37", mode: "INPUT" },
141+
refresh: { number: "GPIO38", mode: "INPUT" }
142+
}
143+
},
144+
m5paper: {
145+
battery_power_pin: "GPIO5",
146+
main_power_pin: "GPIO2"
147+
},
148+
battery: {
149+
attenuation: "11db",
150+
multiplier: 2.0,
151+
calibration: { min: 3.27, max: 4.15 } // Standard LiPo
152+
},
153+
touch: {
154+
platform: "gt911",
155+
i2c_id: "bus_a",
156+
interrupt_pin: "GPIO36",
157+
update_interval: "never", // Interrupt used
158+
transform: { mirror_x: false, mirror_y: false, swap_xy: false },
159+
calibration: { x_min: 0, x_max: 540, y_min: 0, y_max: 960 }
160+
},
161+
external_components: [
162+
" - source: github://Passific/m5paper_esphome"
163+
]
164+
},
165+
>>>>>>> Stashed changes
84166
esp32_s3_photopainter: {
85-
name: "Waveshare PhotoPainter (7-Color)",
167+
name: "Waveshare PhotoPainter (6-Color)",
86168
displayModel: "7.30in-f",
87169
displayPlatform: "waveshare_epaper",
88170
pins: {

custom_components/reterminal_dashboard/frontend/js/io/hardware_generators.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -503,7 +503,11 @@ function generatePSRAMSection(profile) {
503503
}
504504

505505
// Default: let ESPHome auto-detect PSRAM (safest for unknown boards)
506-
return [];
506+
// But we MUST provide the psram: key to enable it.
507+
return [
508+
"psram:",
509+
""
510+
];
507511
}
508512

509513

0 commit comments

Comments
 (0)