From 9bc7a143bfaff43bd23833f8c5e13b48d9532110 Mon Sep 17 00:00:00 2001 From: ragu Date: Wed, 27 Jul 2022 16:01:39 +0200 Subject: [PATCH] battery backend_accessible --- copri4/main/src/Mod/APIfunc.pm | 6 ++++++ copri4/main/src/Mod/APIshareeio.pm | 1 + copri4/main/src/Mod/APIsigclient.pm | 1 + 3 files changed, 8 insertions(+) diff --git a/copri4/main/src/Mod/APIfunc.pm b/copri4/main/src/Mod/APIfunc.pm index 793e374..b572d67 100755 --- a/copri4/main/src/Mod/APIfunc.pm +++ b/copri4/main/src/Mod/APIfunc.pm @@ -1969,9 +1969,12 @@ sub bikes_available(){ $return->{$id}->{bike_type}->{engine}->{manufacturer} = "dummy"; my $max_bars = 5; my $current_bars = 0; + my $backend_accessible = 1; + $backend_accessible = 0 if($record->{$id}->{int11} eq "2");#for asking user $return->{$id}->{bike_type}->{battery}->{charge_max_bars} = "$max_bars"; $return->{$id}->{bike_type}->{battery}->{charge_current_bars} = "$current_bars"; $return->{$id}->{bike_type}->{battery}->{charge_current_percent} = "0"; + $return->{$id}->{bike_type}->{battery}->{backend_accessible} = "$backend_accessible"; if($record->{$id}->{int19}){ $current_bars = $bw->battery_bars($max_bars,$record->{$id}->{int19}); $return->{$id}->{bike_type}->{battery}->{charge_current_bars} = "$current_bars"; @@ -2132,9 +2135,12 @@ sub bikes_all(){ $return->{$id}->{bike_type}->{engine}->{manufacturer} = "dummy"; my $max_bars = 5; my $current_bars = 0; + my $backend_accessible = 1; + $backend_accessible = 0 if($record->{$id}->{int11} eq "2");#for asking user $return->{$id}->{bike_type}->{battery}->{charge_max_bars} = "$max_bars"; $return->{$id}->{bike_type}->{battery}->{charge_current_bars} = "$current_bars"; $return->{$id}->{bike_type}->{battery}->{charge_current_percent} = "0"; + $return->{$id}->{bike_type}->{battery}->{backend_accessible} = "$backend_accessible"; if($record->{$id}->{int19}){ $current_bars = $bw->battery_bars($max_bars,$record->{$id}->{int19}); $return->{$id}->{bike_type}->{battery}->{charge_current_bars} = "$current_bars"; diff --git a/copri4/main/src/Mod/APIshareeio.pm b/copri4/main/src/Mod/APIshareeio.pm index 1dc5f6c..e13f58c 100644 --- a/copri4/main/src/Mod/APIshareeio.pm +++ b/copri4/main/src/Mod/APIshareeio.pm @@ -202,6 +202,7 @@ sub sig_booking_update { delete $booking_values->{co2saving}; delete $booking_values->{bike}; delete $booking_values->{response_text}; + delete $booking_values->{user_miniquery}; $response->{response_state} = "OK: event matched, but something seems to goes wrong on booking_update" if(!$booking_values->{response_state}); $response = {%$response, %$booking_values}; }else{ diff --git a/copri4/main/src/Mod/APIsigclient.pm b/copri4/main/src/Mod/APIsigclient.pm index 1f5757a..e0d17d3 100755 --- a/copri4/main/src/Mod/APIsigclient.pm +++ b/copri4/main/src/Mod/APIsigclient.pm @@ -209,6 +209,7 @@ sub sig_available { $response_out->{$bike}->{bike_type}->{battery}->{charge_max_bars} = "$max_bars"; $response_out->{$bike}->{bike_type}->{battery}->{charge_current_bars} = "$current_bars"; $response_out->{$bike}->{bike_type}->{battery}->{charge_current_percent} = "0"; + $response_out->{$bike}->{bike_type}->{battery}->{backend_accessible} = "1";#got it from backend if(looks_like_number($resp->{energy_level})){ $current_bars = $bw->battery_bars($max_bars,$resp->{energy_level}); $response_out->{$bike}->{bike_type}->{battery}->{charge_current_bars} = "$current_bars";