Add solar type

evcc-io · Jan 19, 2025 · d54f9eb · d54f9eb
1 parent 280d051
commit d54f9eb
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 5 deletions.
diff --git a/api/tariff.go b/api/tariff.go
@@ -10,4 +10,5 @@ const (
 	TariffTypePriceDynamic
 	TariffTypePriceForecast
 	TariffTypeCo2
+	TariffTypeSolar
 )
diff --git a/api/tarifftype_enumer.go b/api/tarifftype_enumer.go
diff --git a/cmd/tariff.go b/cmd/tariff.go
@@ -65,8 +65,20 @@ func runTariff(cmd *cobra.Command, args []string) {
 			fatal(err)
 		}
 
+		unit := "Price/Cost"
+		switch tf.Type() {
+		case api.TariffTypeCo2:
+			unit += "Footprint (gCO2/kWh)"
+		case api.TariffTypeSolar:
+			unit = "Yield (W)"
+		default:
+			if c := conf.Tariffs.Currency; c != "" {
+				unit += fmt.Sprintf(" (%s/kWh)", c)
+			}
+		}
+
 		tw := tabwriter.NewWriter(os.Stdout, 0, 0, 4, ' ', 0)
-		fmt.Fprintln(tw, "From\tTo\tPrice/Cost")
+		fmt.Fprintln(tw, "From\tTo\t"+unit)
 		const format = "2006-01-02 15:04:05"
 
 		for _, r := range rates {

diff --git a/templates/definition/tariff/forecast-solar.yaml b/templates/definition/tariff/forecast-solar.yaml
@@ -23,6 +23,7 @@ params:
   - name: apikey
 render: |
   type: custom
+  tariff: solar
   forecast:
     source: http
     uri: https://api.forecast.solar/{{ if .apikey }}{{ .apikey }}/{{ end }}estimate/{{ .lat }}/{{ .lon }}/{{ .dec }}/{{ .az }}/{{ .kwp }}