Skip to content

Commit 9d6346d

Browse files
authored
Merge branch 'master' into modbushttp-solplanet
2 parents 4a9e167 + b66d653 commit 9d6346d

302 files changed

Lines changed: 8126 additions & 2598 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.dockerignore

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,31 @@
11
.cache
2+
.claude
3+
.idea
4+
.omc
5+
.playwright-mcp
26
.storybook
7+
.venv
38
.vscode
9+
.wolf
410
*.conf
11+
*.db
512
*.Dockerfile
613
*.gz
714
*.image
815
*.json
16+
*.log
917
*.sh
1018
*.yaml
19+
asset-stats.html
1120
Dockerfile
1221
evcc
1322
evcc.exe
1423
builddir
24+
dist
1525
node_modules
26+
playwright-report
1627
release
28+
test-results
1729
!entrypoint.sh
1830
!evcc.dist.yaml
1931
!package*.json

.github/workflows/claude-code-review-run.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,9 @@ jobs:
100100
- name: Run Claude Code Review
101101
id: review
102102
continue-on-error: true # always report status below, even on failure
103-
uses: anthropics/claude-code-action@v1
103+
# pinned: v1 (Claude Code 2.1.216) fails every Bash call with
104+
# "bwrap: Can't create file at /home/.mcp.json: Permission denied"
105+
uses: anthropics/claude-code-action@af0559ee4f514d1ef21826982bed13f7edc3c35e # v1 @ 2.1.215
104106
with:
105107
claude_code_oauth_token: ${{ secrets.CLAUDE_CODE_OAUTH_TOKEN }}
106108
# Provided explicitly so the review can post on fork PRs; also required

.github/workflows/claude-issue-agent-run.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,9 @@ jobs:
4949
fetch-depth: 0
5050

5151
- name: Run Claude
52-
uses: anthropics/claude-code-action@v1
52+
# pinned: v1 (Claude Code 2.1.216) fails every Bash call with
53+
# "bwrap: Can't create file at /home/.mcp.json: Permission denied"
54+
uses: anthropics/claude-code-action@af0559ee4f514d1ef21826982bed13f7edc3c35e # v1 @ 2.1.215
5355
with:
5456
claude_code_oauth_token: ${{ secrets.CLAUDE_CODE_OAUTH_TOKEN }}
5557
github_token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/claude-issue-agent.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,9 @@ jobs:
4545
fetch-depth: 0
4646

4747
- name: Run Claude PR Labeler
48-
uses: anthropics/claude-code-action@v1
48+
# pinned: v1 (Claude Code 2.1.216) fails every Bash call with
49+
# "bwrap: Can't create file at /home/.mcp.json: Permission denied"
50+
uses: anthropics/claude-code-action@af0559ee4f514d1ef21826982bed13f7edc3c35e # v1 @ 2.1.215
4951
with:
5052
claude_code_oauth_token: ${{ secrets.CLAUDE_CODE_OAUTH_TOKEN }}
5153
github_token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/claude.yml

Lines changed: 0 additions & 74 deletions
This file was deleted.

api/api.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -208,8 +208,8 @@ type Dimmer interface {
208208

209209
// Curtailer provides EEG §9 curtailment
210210
type Curtailer interface {
211-
Curtailed() (bool, error) // curtailed if feed-in is limited to less than nominal (<100%)
212-
SetCurtailPercent(int) error // limit feed-in to the given percent of nominal (0..100, 100 = uncurtailed)
211+
CurtailedPercent() (int, error) // feed-in limit as percent of nominal (0..100, 100 = uncurtailed)
212+
SetCurtailPercent(int) error // limit feed-in to the given percent of nominal (0..100, 100 = uncurtailed)
213213
}
214214

215215
// ChargeController allows to start/stop the charging session on the vehicle side

api/implement/implementations.go

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

assets/css/app.css

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -745,6 +745,14 @@ html.app .modal-dialog {
745745
outline: revert;
746746
}
747747

748+
/* selects match :focus-visible on click, CustomSelect sets .focus-ring-visible instead */
749+
.keyboard-focus-ring:focus-visible,
750+
.keyboard-focus-ring.focus-ring-visible {
751+
outline: var(--bs-focus-ring-width) solid var(--bs-focus-ring-color);
752+
outline-offset: 2px;
753+
border-radius: var(--bs-border-radius);
754+
}
755+
748756
.round-box {
749757
border-radius: 1rem;
750758
color: var(--evcc-default-text);

assets/js/components/Battery/BatterySuggestionIcon.stories.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import BatterySuggestionIcon from "./BatterySuggestionIcon.vue";
22
import { ICON_SIZE } from "@/types/evcc";
33
import type { Meta, StoryFn } from "@storybook/vue3";
44

5-
const actions = ["normal", "hold", "charge", "holdcharge"] as const;
5+
const actions = ["normal", "hold", "charge", "holdcharge", "discharge"] as const;
66

77
export default {
88
title: "Battery/BatterySuggestionIcon",

assets/js/components/Battery/BatterySuggestionIcon.vue

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,11 @@
88
></shopicon-regular-powersupply>
99
<!-- holdcharge: prevent charging -->
1010
<BatteryHoldCharge v-else-if="action === 'holdcharge'" :size="size" />
11+
<!-- discharge: battery-to-grid export -->
12+
<shopicon-regular-powersupply
13+
v-else-if="action === 'discharge'"
14+
:size="size"
15+
></shopicon-regular-powersupply>
1116
<!-- hold: prevent discharging -->
1217
<BatteryHold v-else :size="size" />
1318
</template>

0 commit comments

Comments
 (0)