diff --git a/CHANGED b/CHANGED index b612008..37eb437 100644 --- a/CHANGED +++ b/CHANGED @@ -1 +1 @@ - [enhancement] - add resetvalveerrors ic24 + Reviewed-by: Marko Oldenburg diff --git a/FHEM/74_GardenaSmartDevice.pm b/FHEM/74_GardenaSmartDevice.pm index 6429842..019095c 100644 --- a/FHEM/74_GardenaSmartDevice.pm +++ b/FHEM/74_GardenaSmartDevice.pm @@ -563,7 +563,7 @@ sub Set { if ( AttrVal( $name, 'model', 'unknown' ) eq 'mower' ); $list .= -'manualOverride:slider,1,1,59 cancelOverride:noArg resumeSchedule:noArg stopSchedule manualButtonTime:slider,0,2,100' +'manualOverride:slider,1,1,59 cancelOverride:noArg resumeSchedule:noArg stopSchedule manualButtonTime:slider,0,2,100 resetValveErrors:noArg' if ( AttrVal( $name, 'model', 'unknown' ) eq 'watering_computer' ); @@ -1065,7 +1065,7 @@ sub setState { ## add to opened ventils, if watering active push @opened_valves, $_ if ( ( ( ReadingsVal( $name, "watering-watering_timer_".$_."_duration", 0 ) =~ m{\A[1-9]([0-9]+)?\z}xms ) ? $_ : 0 ) > 0 ); ## set error type (pumpe required) - $error_type = ReadingsVal( $name, 'error-valve_error_'.$_.'_type', 'ok' ) if (ReadingsVal( $name, 'error-valve_error_'.$_.'_type', 'ok' ) ne 'ok'); + $error_type = ReadingsVal( $name, 'error-valve_error_'.$_.'_type', 'error' ) if (ReadingsVal( $name, 'error-valve_error_'.$_.'_type', 'error' ) ne 'ok'); ## find longest irrigation duration $longest_duration = ReadingsVal( $name, "watering-watering_timer_".$_."_irrigation_left", 0 ) if ( ( ReadingsVal( $name, "watering-watering_timer_".$_."_duration", 0 ) =~ m{\A[1-9]([0-9]+)?\z}xms @@ -1291,6 +1291,7 @@ sub ReadingLangGerman { 'pump_not_filled' => 'Pumpe nicht gefüllt', 'clean_fine_filter' => 'Filter reinigen', 'concurrent_limit_reached' => 'Grenze gleichzeitig geöffneter Ventile erreicht', + 'low_battery_prevents_starting' => 'Niedrieger Batteriestand verhindert Bewässerung', ); if ( @@ -1560,10 +1561,10 @@ sub SetPredefinedStartPoints {
  • mower_type-serial_number - serial number
  • radio-quality - percentage of the radio quality
  • radio-state - radio state (bad/poor/good/undefined)
  • -
  • scheduling-schedules_event_1_end_at - ending time of schedule 1
  • -
  • scheduling-schedules_event_1_id - ID of schedule 1
  • -
  • scheduling-schedules_event_1_start_at - starting time of schedule 1
  • -
  • scheduling-schedules_event_1_weekly - weekdays of schedule 1(comma-separated)
  • +
  • scheduling-schedules_event_n_end_at - ending time of schedule 1
  • +
  • scheduling-schedules_event_n_id - ID of schedule 1
  • +
  • scheduling-schedules_event_n_start_at - starting time of schedule 1
  • +
  • scheduling-schedules_event_n_weekly - weekdays of schedule 1(comma-separated)
  • ...more readings for additional schedules (if defined)
  • scheduling-schedules_events_count - number of pre-defined schedules
  • startpoint-1-enabled - starpoint 1 enabled (0/1)
  • @@ -1621,10 +1622,10 @@ sub SetPredefinedStartPoints {
  • radio-state - radio state (bad/poor/good/undefined)
  • scheduling-scheduled_watering_end - next schedule ending time
  • scheduling-scheduled_watering_next_start - next schedule starting time
  • -
  • scheduling-schedules_event_1_valve_1_end_at - ending time of schedule 1
  • -
  • scheduling-schedules_event_1_valve_1_id - ID of schedule 1
  • -
  • scheduling-schedules_event_1_valve_1_start_at - starting time of schedule 1
  • -
  • scheduling-schedules_event_1_valve_1_weekly - weekdays of schedule 1
  • +
  • scheduling-schedules_event_n_valve_1_end_at - ending time of schedule 1
  • +
  • scheduling-schedules_event_n_valve_1_id - ID of schedule 1
  • +
  • scheduling-schedules_event_n_valve_1_start_at - starting time of schedule 1
  • +
  • scheduling-schedules_event_n_valve_1_weekly - weekdays of schedule 1
  • scheduling-schedules_events_count - number of pre-defined schedules
  • scheduling-schedules_paused_until - date/time until schedule is paused (2038-01-18T00:00:00.000Z is defined as permanently by Gardena cloud)
  • state - state of device @@ -1674,10 +1675,10 @@ sub SetPredefinedStartPoints {
  • scheduling-scheduled_watering_next_start - next schedule starting time
  • scheduling-scheduled_watering_next_start_1 - next schedule starting time for valve 1
  • ...more readings for valves 2-6
  • -
  • scheduling-schedules_event_1_valve_1_end_at - ending time of schedule 1
  • -
  • scheduling-schedules_event_1_valve_1_id - ID of schedule 1
  • -
  • scheduling-schedules_event_1_valve_1_start_at - starting time of schedule 1
  • -
  • scheduling-schedules_event_1_valve_1_weekly - weekdays of schedule 1
  • +
  • scheduling-schedules_event_n_valve_1_end_at - ending time of schedule 1
  • +
  • scheduling-schedules_event_n_valve_1_id - ID of schedule 1
  • +
  • scheduling-schedules_event_n_valve_1_start_at - starting time of schedule 1
  • +
  • scheduling-schedules_event_n_valve_1_weekly - weekdays of schedule 1
  • scheduling-schedules_events_count - number of pre-defined schedules
  • ...more readings for further schedules/valves
  • scheduling-schedules_paused_until_1 - date/time until schedule is paused (2038-01-18T00:00:00.000Z is defined as permanently by Gardena cloud)
  • @@ -1800,6 +1801,7 @@ sub SetPredefinedStartPoints {
  • cancelOverride - stop (manual) watering
  • manualButtonTime n - set watering time for manual button (0 disables button)
  • manualOverride n - manual watering for n minutes
  • +
  • resetValveErrors - reset valve errormessage
  • resumeSchedule - enable schedule
  • stopSchedule n - disable schedule for n hours (Default: 2038-01-18T00:00:00.000Z, Gardena App reads it as "permanently")
  • @@ -1821,7 +1823,7 @@ sub SetPredefinedStartPoints {
  • manualDurationValve4 n - open valve 4 for n minutes
  • manualDurationValve5 n - open valve 5 for n minutes
  • manualDurationValve6 n - open valve 6 for n minutes
  • -
  • resetValveErrors n - reset valve errormessage
  • +
  • resetValveErrors - reset valve errormessage
  • resumeScheduleValve n - (re)start irrigation schedule for valve n
  • stopScheduleValve n m - stop irrigation schedule for valve n (Default: 2038-01-18T00:00:00.000Z, Gardena App reads it as "permanently")
  • @@ -1974,10 +1976,10 @@ sub SetPredefinedStartPoints {
  • mower_type-serial_number - Seriennummer
  • radio-quality - Indikator für die Funkverbindung in Prozent
  • radio-state - Verbindungsqualität (schlecht/schwach/gut/Undefiniert)
  • -
  • scheduling-schedules_event_1_end_at - Endzeit des Zeitplans 1
  • -
  • scheduling-schedules_event_1_id - ID des Zeitplans 1
  • -
  • scheduling-schedules_event_1_start_at - Startzeit des Zeitplans 1
  • -
  • scheduling-schedules_event_1_weekly - Wochentage des Zeitplans 1 (kommagetrennt)
  • +
  • scheduling-schedules_event_n_end_at - Endzeit des Zeitplans 1
  • +
  • scheduling-schedules_event_n_id - ID des Zeitplans 1
  • +
  • scheduling-schedules_event_n_start_at - Startzeit des Zeitplans 1
  • +
  • scheduling-schedules_event_n_weekly - Wochentage des Zeitplans 1 (kommagetrennt)
  • ...weitere Readings für zusätzliche Zeitpläne (falls angelegt)
  • scheduling-schedules_events_count - Anzahl angelegter Zeitpläne
  • startpoint-1-enabled - starpoint 1 enabled (0/1)
  • @@ -2035,10 +2037,10 @@ sub SetPredefinedStartPoints {
  • radio-state - Verbindungsqualität (schlecht/schwach/gut/Undefiniert)
  • scheduling-scheduled_watering_end - Endzeit des nächsten Zeitplans
  • scheduling-scheduled_watering_next_start - Startzeit des nächsten Zeitplans
  • -
  • scheduling-schedules_event_1_valve_1_end_at - Endzeit von Zeitplan 1
  • -
  • scheduling-schedules_event_1_valve_1_id - ID von Zeitplan 1
  • -
  • scheduling-schedules_event_1_valve_1_start_at - Startzeit von Zeitplan 1
  • -
  • scheduling-schedules_event_1_valve_1_weekly - Wochentage von Zeitplan 1
  • +
  • scheduling-schedules_event_n_valve_1_end_at - Endzeit von Zeitplan 1
  • +
  • scheduling-schedules_event_n_valve_1_id - ID von Zeitplan 1
  • +
  • scheduling-schedules_event_n_valve_1_start_at - Startzeit von Zeitplan 1
  • +
  • scheduling-schedules_event_n_valve_1_weekly - Wochentage von Zeitplan 1
  • scheduling-schedules_events_count - Anzahl angelegter Zeitpläne
  • scheduling-schedules_paused_until - Datum/Uhrzeit, bis wann Zeitplan pausiert ist (2038-01-18T00:00:00.000Z wird von Gardena-Cloud als dauerhaft angesehen)
  • state - Status des Geräts @@ -2088,10 +2090,10 @@ sub SetPredefinedStartPoints {
  • scheduling-scheduled_watering_next_start - Startzeit des nächsten Zeitplans
  • scheduling-scheduled_watering_next_start_1 - Startzeit des nächsten Zeitplans für Ventil 1
  • ...weitere Readings für Ventile 2-6
  • -
  • scheduling-schedules_event_1_valve_n_end_at - Endzeit des ersten definierten Zeitplans für Ventil n
  • -
  • scheduling-schedules_event_1_valve_n_id - ID des ersten definierten Zeitplans für Ventil n
  • -
  • scheduling-schedules_event_1_valve_n_start_at - Startzeit des ersten definierten Zeitplans für Ventil n
  • -
  • scheduling-schedules_event_1_valve_n_weekly - Wochentage des ersten definierten Zeitplans für Ventil n
  • +
  • scheduling-schedules_event_n_end_at - Endzeit des ersten definierten Zeitplans für Ventil n
  • +
  • scheduling-schedules_event_n_id - ID des ersten definierten Zeitplans für Ventil n
  • +
  • scheduling-schedules_event_n_start_at - Startzeit des ersten definierten Zeitplans für Ventil n
  • +
  • scheduling-schedules_event_n_weekly - Wochentage des ersten definierten Zeitplans für Ventil n
  • scheduling-schedules_events_count - Anzahl angelegter Zeitpläne
  • ...weitere Readings für zusätzliche Zeitpläne/Ventile
  • scheduling-schedules_paused_until_1 - Datum/Uhrzeit, bis wann Zeitplan pausiert ist (2038-01-18T00:00:00.000Z wird von Gardena-Cloud als dauerhaft angesehen)
  • @@ -2108,7 +2110,7 @@ sub SetPredefinedStartPoints {
  • valve-valve_name_1 - Eigener Name für Ventil 1
  • ...weitere Readings für Ventile 2-6 (if installed)
  • -
  • watering-watering_timer_1_duration - Gesamt-Dauer der aktuellen Bewässerung in Sekunden
  • +
  • watering-watering_timer_1_duration - Gesamt-Dauer der aktuellen Bewässerung in Sekunden
  • watering-watering_timer_1_irrigation_left - Verbleibende Dauer der aktuellen Bewässerung in Minuten
  • watering-watering_timer_1_state - Status des Timers
  • watering-watering_timer_1_valve_id - Ventil-ID des Timers
  • @@ -2118,30 +2120,30 @@ sub SetPredefinedStartPoints {

    Readings (model = sensor)

    Readings (model = sensor2) @@ -2149,122 +2151,182 @@ sub SetPredefinedStartPoints { "sensor2" hat keine Helligkeitsmessung oder Umgebungstemperatur, und es legt die Frost-Warnung in einem anderen Reading ab. Ansonsten ist er mehr oder weniger identisch zum "sensor".



    Readings (model = power)

    Readings (model = electronic_pressure_pump)


    Attribute (alle Modelle)


    set (model = mower)

    set (model = watering_computer)

    set (model = ic24)

    set (model = sensor)

    set (model = sensor2)

    set (model = power)

    set (model = electronic_pressure_pump) diff --git a/controls_GardenaSmartDevice.txt b/controls_GardenaSmartDevice.txt index 32327a6..9d97520 100644 --- a/controls_GardenaSmartDevice.txt +++ b/controls_GardenaSmartDevice.txt @@ -1,2 +1,2 @@ UPD 2022-07-21_19:43:48 49634 FHEM/73_GardenaSmartBridge.pm -UPD 2022-08-11_14:24:26 107803 FHEM/74_GardenaSmartDevice.pm +UPD 2022-08-23_11:24:15 113481 FHEM/74_GardenaSmartDevice.pm