gilles/ecowitt2weewx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #6 from Djblaik/main

Browse Source 
Fixed missing  outdoorTempGust, solarradiation and uvi data
This commit is contained in:
Jeremias Wolff
2023-05-29 09:32:42 +02:00
committed by GitHub
parent d9ec3ffbee 2899d38167
commit 79814c7f23
1 changed files with 23 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
app/Commands/EcowittExportCommand.php
View File

@@ -55,6 +55,7 @@ class EcowittExportCommand extends Command
if (empty($this->ecowitt_account) || empty($this->ecowitt_passphrase)) { if (empty($this->ecowitt_account) || empty($this->ecowitt_passphrase)) {
$this->error('Ecowitt Username or passphrase required!'); $this->error('Ecowitt Username or passphrase required!');
return 1; return 1;
} }
@@ -66,7 +67,6 @@ class EcowittExportCommand extends Command
$this->endDate = Carbon::parse($this->argument('endDate'))->endOfDay(); $this->endDate = Carbon::parse($this->argument('endDate'))->endOfDay();
$device_ids->each(function ($deviceId) use ($session_id) { $device_ids->each(function ($deviceId) use ($session_id) {
$startDate = $this->startDate->clone(); $startDate = $this->startDate->clone();
$endDate = $this->endDate->clone(); $endDate = $this->endDate->clone();
// declare output variable // declare output variable
@@ -91,7 +91,7 @@ class EcowittExportCommand extends Command
$ecowitt = $response->json(); $ecowitt = $response->json();
$this->times = data_get($ecowitt,'times',[]); $this->times = data_get($ecowitt, 'times', []);
// Temperature in C // Temperature in C
$this->debug('fetch outdoor temp'); $this->debug('fetch outdoor temp');
@@ -99,7 +99,7 @@ class EcowittExportCommand extends Command
// Feels Like in C // Feels Like in C
$this->debug('fetch outdoor temp gust'); $this->debug('fetch outdoor temp gust');
$outdoorTempGust = $this->getData($ecowitt, 'list.tempf.list.sendible_temp'); $outdoorTempGust = $this->getData($ecowitt, 'list.tempf.list.apparent_temp');
// Dew Point in C // Dew Point in C
$this->debug('collecting: Dew Point in C'); $this->debug('collecting: Dew Point in C');
@@ -119,11 +119,18 @@ class EcowittExportCommand extends Command
// solar in lx -- Solar and UVI // solar in lx -- Solar and UVI
$this->debug('collecting: solar in lx -- Solar and UVI'); $this->debug('collecting: solar in lx -- Solar and UVI');
$solarradiation = $this->getData($ecowitt, 'list.solarradiation.list.solarradiation'); $solarradiation = $this->getData($ecowitt, 'list.so_uv.list.solarradiation');
// uv // uv
$this->debug('collecting: uv'); $this->debug('collecting: uv');
$uvi = $this->getData($ecowitt, 'list.uv.list.uv'); $uvi = $this->getData($ecowitt, 'list.so_uv.list.uv');
//replace empty values with 0
foreach ($uvi as $key => $value) {
if (empty($value)) {
$uvi[$key] = '0';
}
}
// rainrate in mm/hr b // rainrate in mm/hr b
$this->debug('collecting: rainrate in mm/hr b'); $this->debug('collecting: rainrate in mm/hr b');
@@ -179,10 +186,9 @@ class EcowittExportCommand extends Command
$outputData[] = $tmp; $outputData[] = $tmp;
} }
$startDate = $startDate->addDay()->startOfDay(); $startDate = $startDate->addDay()->startOfDay();
} while ( $startDate->lte($endDate) ); } while ($startDate->lte($endDate));
$this->export(getcwd() . "/ecowitt_{$deviceId}.csv", $outputData);
$this->export(getcwd()."/ecowitt_{$deviceId}.csv", $outputData);
}); });
} }
@@ -191,6 +197,7 @@ class EcowittExportCommand extends Command
return collect(data_get($stack, $key)) return collect(data_get($stack, $key))
->mapWithKeys(function ($value, $idx) { ->mapWithKeys(function ($value, $idx) {
$dateTime = data_get($this->times, $idx); $dateTime = data_get($this->times, $idx);
return [$dateTime => $value ?: null]; return [$dateTime => $value ?: null];
}); });
} }
@@ -229,7 +236,7 @@ class EcowittExportCommand extends Command
->asForm() ->asForm()
->post('https://webapi.www.ecowitt.net/index/get_devices', [ ->post('https://webapi.www.ecowitt.net/index/get_devices', [
'uid' => '', 'uid' => '',
'type' => 1 'type' => 1,
]); ]);
$devices = collect(data_get($deviceResponse->json(), 'device_list')); $devices = collect(data_get($deviceResponse->json(), 'device_list'));
@@ -244,12 +251,13 @@ class EcowittExportCommand extends Command
* @param string $fileName * @param string $fileName
* @param array $data * @param array $data
*/ */
protected function export(string $fileName, array $data) { protected function export(string $fileName, array $data)
if(isset($data['0'])){ {
if (isset($data['0'])) {
$fp = fopen($fileName, 'w+'); $fp = fopen($fileName, 'w+');
fputs($fp, implode(',',array_keys($data['0'])) . "\n"); fwrite($fp, implode(',', array_keys($data['0']))."\n");
foreach($data AS $values){ foreach ($data as $values) {
fputs($fp, implode(',', $values) . "\n"); fwrite($fp, implode(',', $values)."\n");
} }
fclose($fp); fclose($fp);
} }
@@ -261,14 +269,11 @@ class EcowittExportCommand extends Command
*/ */
protected function debug(string $msg, ...$args) protected function debug(string $msg, ...$args)
{ {
if ($this->option('debug')) { if ($this->option('debug')) {
$this->info($msg); $this->info($msg);
if (!empty($args)) { if (! empty($args)) {
dump($args); dump($args);
} }
} }
} }
} }