Skip to content

Commit 5752dbd

Browse files
committed
fix(p4): put the P4 on the sidecar pin too — it was stuck at esp_tsdb 2.0.3
#45 moved only the AtomS3R onto the sidecar header, so the P4 kept its older `ref: tigomonitor` pin and silently stayed on 21.4 s commits. That branch is also at 2.0.3, so the P4 was missing everything released since. The two could not simply share a ref. The sidecar branch is based on upstream 2.3.0, whose manifest does not list `esp32p4`; the `tigomonitor` branch carries that manifest entry but not the sidecar. Pinning the sidecar ref on a P4 therefore failed at dependency resolution, before compiling anything — which is what a contributor ran into when following #45's instructions. Fixed upstream-of-here by adding the one missing manifest line to the fork (RAR/esp_tsdb@ebfc360 = 3fb785f + `- esp32p4`), so every board can now share a single ref. Full esp_tsdb host suite still passes on it. All six configs that pin esp_tsdb now point at ebfc360 — both board files, both P4 test configs, and the Config Builder's two entries. The other two inherit it via !include. No `ref: tigomonitor` remains in tracked source. Verified: P4 compiles against the new ref and the fetched dependency is confirmed to be the fork with esp32p4 in its manifest (not a cached resolve — flash moved 1,432,902 -> 1,437,230 bytes). 46/46 site tests.
1 parent 2820ac0 commit 5752dbd

5 files changed

Lines changed: 26 additions & 15 deletions

File tree

boards/esp32p4-evboard.yaml

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,12 +43,19 @@ esp32:
4343
# `esp_task_stack_is_sane_cache_disabled` (discussion #31).
4444
execute_from_psram: true
4545
components:
46-
# esp_tsdb backs the History view; littlefs is its filesystem. The P4
47-
# target still needs the RAR/esp_tsdb fork (upstream 2.1.0's manifest
48-
# doesn't list esp32p4 yet); S3/other targets use `zakery292/esp_tsdb^2.1.0`.
46+
# esp_tsdb backs the History view; littlefs is its filesystem.
47+
#
48+
# Same fork ref as the AtomS3R, for two reasons at once. The P4 has always
49+
# needed the fork because upstream's manifest still doesn't list esp32p4;
50+
# every board now also needs it for the sidecar header, without which a
51+
# history commit costs 21.4 s instead of 633 ms (see the AtomS3R config).
52+
#
53+
# This ref replaces `tigomonitor`, which was pinned here before and sat at
54+
# 2.0.3 — so the P4 was missing everything since, sidecar included. Pinned
55+
# by SHA rather than branch so it cannot move under a build.
4956
- name: zakery292/esp_tsdb
5057
source: https://github.com/RAR/esp_tsdb.git
51-
ref: tigomonitor
58+
ref: ebfc360f00263ab90116ee3e556a9153ab4041a2
5259
- joltwallet/littlefs^1.16
5360
sdkconfig_options:
5461
# CPU frequency (P4 runs at 400MHz)

boards/esp32s3-atoms3r.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ esp32:
5050
# and this is the reference config people copy.
5151
- name: zakery292/esp_tsdb
5252
source: https://github.com/RAR/esp_tsdb.git
53-
ref: 3fb785ffe0e280e7645a598f1cf82f6babe72143
53+
ref: ebfc360f00263ab90116ee3e556a9153ab4041a2
5454
# LittleFS — backing filesystem for the tsdb partition
5555
- joltwallet/littlefs^1.16
5656
sdkconfig_options:

boards/test-p4-ble-tigomonitor.yaml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,13 @@ esp32:
2525
# esp_task_stack_is_sane_cache_disabled (discussion #31).
2626
execute_from_psram: true
2727
components:
28-
# Upstream 2.1.0 has everything we need code-wise, but its manifest still
29-
# lacks the esp32p4 target, so P4 stays on the RAR/esp_tsdb fork's
30-
# `tigomonitor` branch (= 2.1.0 + esp32p4 manifest entry) until that lands.
28+
# Same fork ref as the board configs: needed on P4 because upstream's
29+
# manifest still lacks the esp32p4 target, and needed everywhere for the
30+
# sidecar header (21.4 s -> 633 ms per history commit). Replaces the
31+
# `tigomonitor` branch, which sat at 2.0.3 and had neither.
3132
- name: zakery292/esp_tsdb
3233
source: https://github.com/RAR/esp_tsdb.git
33-
ref: tigomonitor
34+
ref: ebfc360f00263ab90116ee3e556a9153ab4041a2
3435
# LittleFS — backing filesystem for the tsdb partition
3536
- joltwallet/littlefs^1.16
3637
sdkconfig_options:

boards/test-p4-tigomonitor.yaml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,13 @@ esp32:
2525
# esp_task_stack_is_sane_cache_disabled (discussion #31).
2626
execute_from_psram: true
2727
components:
28-
# Upstream 2.1.0 has everything we need code-wise, but its manifest still
29-
# lacks the esp32p4 target, so P4 stays on the RAR/esp_tsdb fork's
30-
# `tigomonitor` branch (= 2.1.0 + esp32p4 manifest entry) until that lands.
28+
# Same fork ref as the board configs: needed on P4 because upstream's
29+
# manifest still lacks the esp32p4 target, and needed everywhere for the
30+
# sidecar header (21.4 s -> 633 ms per history commit). Replaces the
31+
# `tigomonitor` branch, which sat at 2.0.3 and had neither.
3132
- name: zakery292/esp_tsdb
3233
source: https://github.com/RAR/esp_tsdb.git
33-
ref: tigomonitor
34+
ref: ebfc360f00263ab90116ee3e556a9153ab4041a2
3435
# LittleFS — backing filesystem for the tsdb partition
3536
- joltwallet/littlefs^1.16
3637
sdkconfig_options:

site/boards.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ export const BOARDS = [
1818
frameworkComponents: ['joltwallet/littlefs^1.16'],
1919
hostedComponent: {
2020
source: 'https://github.com/RAR/esp_tsdb.git',
21-
ref: '3fb785ffe0e280e7645a598f1cf82f6babe72143',
21+
ref: 'ebfc360f00263ab90116ee3e556a9153ab4041a2',
2222
},
2323
sdkconfig: {
2424
CONFIG_ESP32S3_DEFAULT_CPU_FREQ_240: 'y',
@@ -239,7 +239,9 @@ font:
239239
// boards crash-loop at boot with esp_task_stack_is_sane_cache_disabled (#31).
240240
frameworkAdvanced: { enable_idf_experimental_features: true, execute_from_psram: true },
241241
frameworkComponents: ['joltwallet/littlefs^1.16'],
242-
hostedComponent: { source: 'https://github.com/RAR/esp_tsdb.git', ref: 'tigomonitor' },
242+
// Same ref as the AtomS3R: the P4 needs the fork for its manifest target,
243+
// and every board needs it for the sidecar header. Was `tigomonitor` (2.0.3).
244+
hostedComponent: { source: 'https://github.com/RAR/esp_tsdb.git', ref: 'ebfc360f00263ab90116ee3e556a9153ab4041a2' },
243245
sdkconfig: {
244246
CONFIG_ESP32P4_DEFAULT_CPU_FREQ_400: 'y',
245247
CONFIG_UART_ISR_IN_IRAM: 'y',

0 commit comments

Comments
 (0)