.

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 9a8d8812edca60873a43f3dd6bf0b65968a1363c..0f2686b4af8ddff958bf14daaa9167cf4c79c7e2 100644 (file)
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,8 +2,32 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="352ce63a-b52a-41a2-979b-becda7920939" name="Default" comment=".">
+      <change afterPath="$PROJECT_DIR$/tools/xplanet/config" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/tools/xplanet/earth_lights_4800.tif" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/tools/xplanet/world.topo.bathy.200401.3x5400x2700.png" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/tools/xplanet/world.topo.bathy.200402.3x5400x2700.png" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/tools/xplanet/world.topo.bathy.200403.3x5400x2700.png" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/tools/xplanet/world.topo.bathy.200404.3x5400x2700.png" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/tools/xplanet/world.topo.bathy.200405.3x5400x2700.png" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/tools/xplanet/world.topo.bathy.200406.3x5400x2700.png" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/tools/xplanet/world.topo.bathy.200407.3x5400x2700.png" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/tools/xplanet/world.topo.bathy.200408.3x5400x2700.png" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/tools/xplanet/world.topo.bathy.200409.3x5400x2700.png" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/tools/xplanet/world.topo.bathy.200410.3x5400x2700.png" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/tools/xplanet/world.topo.bathy.200411.3x5400x2700.png" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/tools/xplanet/world.topo.bathy.200412.3x5400x2700.png" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/tools/xplanet/xplanet-suncurve" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/config/tv.php" beforeDir="false" afterPath="$PROJECT_DIR$/config/tv.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/scripts/cron/cron.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/cron/cron.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/scripts/lib/domoticz.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/domoticz.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/scripts/lib/redis.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/redis.php" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/scripts/lib/scenes.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/scenes.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/servers/startdaemon" beforeDir="false" afterPath="$PROJECT_DIR$/servers/startdaemon" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/servers/stopdaemon" beforeDir="false" afterPath="$PROJECT_DIR$/servers/stopdaemon" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/tools/pop/pop.py" beforeDir="false" afterPath="$PROJECT_DIR$/tools/pop/pop.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/tools/pop/startpopdaemon" beforeDir="false" afterPath="$PROJECT_DIR$/tools/pop/startpopdaemon" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/tools/pop/stoppopdaemon" beforeDir="false" afterPath="$PROJECT_DIR$/tools/pop/stoppopdaemon" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -239,13 +263,6 @@
     <property name="settings.editor.selected.configurable" value="preferences.pluginManager" />
   </component>
   <component name="RecentsManager">
-    <key name="MoveFile.RECENT_KEYS">
-      <recent name="T:\Drive\Works\home\style\fonts\webfonts" />
-      <recent name="T:\Drive\Works\home\style\fonts\webfonts\520" />
-      <recent name="T:\Drive\Works\home\images" />
-      <recent name="D:\CloudStation\Works\home\style\fonts" />
-      <recent name="T:\CloudStation\Drive\Works\home\tools\jarvis" />
-    </key>
     <key name="CopyFile.RECENT_KEYS">
       <recent name="T:\Drive\Works\home\tools\pop" />
       <recent name="T:\Drive\Works\home\scripts\lib" />
@@ -253,6 +270,13 @@
       <recent name="T:\CloudStation\Drive\Works\home\images\backgrounds" />
       <recent name="T:\CloudStation\Drive\Works\home\scripts" />
     </key>
+    <key name="MoveFile.RECENT_KEYS">
+      <recent name="T:\Drive\Works\home\tools\xplanet" />
+      <recent name="T:\Drive\Works\home\style\fonts\webfonts" />
+      <recent name="T:\Drive\Works\home\style\fonts\webfonts\520" />
+      <recent name="T:\Drive\Works\home\images" />
+      <recent name="D:\CloudStation\Works\home\style\fonts" />
+    </key>
   </component>
   <component name="RunManager">
     <configuration default="true" type="Applet">
@@ -795,14 +819,8 @@
       <workItem from="1580459154087" duration="3479000" />
       <workItem from="1580545354824" duration="796000" />
       <workItem from="1580720992873" duration="177000" />
-      <workItem from="1580894754542" duration="1011000" />
-    </task>
-    <task id="LOCAL-00242" summary=".">
-      <created>1573630565923</created>
-      <option name="number" value="00242" />
-      <option name="presentableId" value="LOCAL-00242" />
-      <option name="project" value="LOCAL" />
-      <updated>1573630565923</updated>
+      <workItem from="1580894754542" duration="2587000" />
+      <workItem from="1581367617869" duration="9744000" />
     </task>
     <task id="LOCAL-00243" summary=".">
       <created>1574066196695</created>
@@ -1140,7 +1158,14 @@
       <option name="project" value="LOCAL" />
       <updated>1580894984838</updated>
     </task>
-    <option name="localTasksCounter" value="291" />
+    <task id="LOCAL-00291" summary=".">
+      <created>1580934552925</created>
+      <option name="number" value="00291" />
+      <option name="presentableId" value="LOCAL-00291" />
+      <option name="project" value="LOCAL" />
+      <updated>1580934552925</updated>
+    </task>
+    <option name="localTasksCounter" value="292" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -1187,17 +1212,21 @@
       <screen x="0" y="0" width="1920" height="1160" />
     </state>
     <state x="552" y="238" key="#Plugins/0.0.1920.1160@0.0.1920.1160" timestamp="1575647067016" />
+    <state x="1019" y="324" key="#com.intellij.fileTypes.FileTypeChooser" timestamp="1581408286817">
+      <screen x="0" y="0" width="2560" height="1040" />
+    </state>
+    <state x="1019" y="324" key="#com.intellij.fileTypes.FileTypeChooser/0.0.2560.1040@0.0.2560.1040" timestamp="1581408286817" />
     <state x="960" y="247" key="#com.intellij.openapi.updateSettings.impl.PluginUpdateInfoDialog" timestamp="1580459136096">
       <screen x="0" y="0" width="2560" height="1040" />
     </state>
     <state x="720" y="247" key="#com.intellij.openapi.updateSettings.impl.PluginUpdateInfoDialog/0.0.1920.1040@0.0.1920.1040" timestamp="1577298128269" />
     <state x="960" y="247" key="#com.intellij.openapi.updateSettings.impl.PluginUpdateInfoDialog/0.0.2560.1040@0.0.2560.1040" timestamp="1580459136096" />
-    <state x="935" y="114" key="CommitChangelistDialog2" timestamp="1580894974592">
+    <state x="935" y="114" key="CommitChangelistDialog2" timestamp="1580934539460">
       <screen x="0" y="0" width="2560" height="1040" />
     </state>
     <state x="701" y="114" key="CommitChangelistDialog2/0.0.1920.1040@0.0.1920.1040" timestamp="1577381105204" />
     <state x="701" y="127" key="CommitChangelistDialog2/0.0.1920.1160@0.0.1920.1160" timestamp="1575647157027" />
-    <state x="935" y="114" key="CommitChangelistDialog2/0.0.2560.1040@0.0.2560.1040" timestamp="1580894974592" />
+    <state x="935" y="114" key="CommitChangelistDialog2/0.0.2560.1040@0.0.2560.1040" timestamp="1580934539460" />
     <state x="92" y="92" width="2376" height="856" key="DiffContextDialog" timestamp="1580377344165">
       <screen x="0" y="0" width="2560" height="1040" />
     </state>
@@ -1211,17 +1240,17 @@
       <screen x="0" y="0" width="2560" height="1040" />
     </state>
     <state x="872" y="242" key="Vcs.Push.Dialog.v2/0.0.2560.1040@0.0.2560.1040" timestamp="1580377827629" />
-    <state x="976" y="343" key="com.intellij.ide.util.TipDialog" timestamp="1580894755111">
+    <state x="976" y="343" key="com.intellij.ide.util.TipDialog" timestamp="1581367635392">
       <screen x="0" y="0" width="2560" height="1040" />
     </state>
     <state x="732" y="343" key="com.intellij.ide.util.TipDialog/0.0.1920.1040@0.0.1920.1040" timestamp="1577380394903" />
     <state x="732" y="383" key="com.intellij.ide.util.TipDialog/0.0.1920.1160@0.0.1920.1160" timestamp="1575647093028" />
-    <state x="976" y="343" key="com.intellij.ide.util.TipDialog/0.0.2560.1040@0.0.2560.1040" timestamp="1580894755111" />
-    <state x="977" y="257" width="607" height="536" key="find.popup" timestamp="1580460367675">
+    <state x="976" y="343" key="com.intellij.ide.util.TipDialog/0.0.2560.1040@0.0.2560.1040" timestamp="1581367635392" />
+    <state x="977" y="257" width="607" height="536" key="find.popup" timestamp="1581412193715">
       <screen x="0" y="0" width="2560" height="1040" />
     </state>
     <state x="732" y="257" width="607" height="536" key="find.popup/0.0.1920.1040@0.0.1920.1040" timestamp="1577380471547" />
-    <state x="977" y="257" width="607" height="536" key="find.popup/0.0.2560.1040@0.0.2560.1040" timestamp="1580460367675" />
+    <state x="977" y="257" width="607" height="536" key="find.popup/0.0.2560.1040@0.0.2560.1040" timestamp="1581412193715" />
     <state x="936" y="240" key="run.anything.popup" timestamp="1578386519646">
       <screen x="0" y="0" width="2560" height="1040" />
     </state>

diff --git a/config/tv.php b/config/tv.php
index 7463034c3f61d3c38df9ecf3419bb5ce69449863..db1c602b74bfccccf3ee57a463fb3f6ea39cdd1e 100644 (file)
--- a/config/tv.php
+++ b/config/tv.php
@@ -1,21 +1,21 @@
 <?php
-$mapdvb = connectRedis()->igbget('dvbchannels');
-if (!$mapdvb) {
-    $mapdvb = array();
-    $m3u = getUrlContent('http://192.168.13.60:9981/playlist/channels', 30);
-    $lines = explode("\n", $m3u);
-    $name = '';
-    foreach ($lines as $line) {
-        $line = trim($line);
-        if (strpos($line, '#EXTINF:') === 0) {
-            $e = explode(',', $line);
-            $name = array_pop($e);
-        } else if (strpos($line, 'http') === 0) {
-            $mapdvb[$name] = $line;
-        }
-    }
-    connectRedis()->igbsetex('dvbchannels', 3600, $mapdvb);
-}
+//$mapdvb = connectRedis()->igbget('dvbchannels');
+//if (!$mapdvb) {
+//    $mapdvb = array();
+//    $m3u = getUrlContent('http://192.168.13.60:9981/playlist/channels', 30);
+//    $lines = explode("\n", $m3u);
+//    $name = '';
+//    foreach ($lines as $line) {
+//        $line = trim($line);
+//        if (strpos($line, '#EXTINF:') === 0) {
+//            $e = explode(',', $line);
+//            $name = array_pop($e);
+//        } else if (strpos($line, 'http') === 0) {
+//            $mapdvb[$name] = $line;
+//        }
+//    }
+//    connectRedis()->igbsetex('dvbchannels', 3600, $mapdvb);
+//}
 
 $tv = array(
     'Replay' => array('freebox' => 'replay'),

diff --git a/scripts/cron/cron.php b/scripts/cron/cron.php
index ff1437cf4347002ca702b63839ce9af36d2ec84b..44ee2739bccdcd02ffb1e90cf872e29efcf2eab9 100644 (file)
--- a/scripts/cron/cron.php
+++ b/scripts/cron/cron.php
@@ -29,6 +29,7 @@ function cronOneLoop($cronmin)
     cronHarmony($cronmin);
     cronInterface($cronmin);
     if ($cronmin % 15 == 0) {
+        cronXPlane($cronmin);
         cronPodcasts($cronmin);
     }
     cronEcoMode($cronmin);
@@ -40,6 +41,13 @@ function cronOneLoop($cronmin)
     cronHeartbeat($cronmin);
 }
 
+function cronXPlanet($cronmin){
+    $path=ROOT.'/tools/xplanet/';
+    $suncurve=$path.'xplanet-suncurve';
+
+    `$path`;
+}
+
 function cronGuest($cronmin)
 {
     setState('guest', hasGuest() ? '1' : '0');

diff --git a/scripts/lib/domoticz.php b/scripts/lib/domoticz.php
index 4266b3cf9d69f09f0bdd7ef152bfb9037ee15c29..c3ec15e9b7d6463b96d394ff0bb7fd2e0ee499f8 100644 (file)
--- a/scripts/lib/domoticz.php
+++ b/scripts/lib/domoticz.php
@@ -6,7 +6,7 @@ function runDomoticzCommand($params)
 
     unset($params['delay']);
 
-    $ip = '192.168.13.68';
+    $ip = '192.168.13.60';
     return httpRequest('http://' . $ip . ':8084/json.htm', 'GET', $params);
 }
 

diff --git a/scripts/lib/redis.php b/scripts/lib/redis.php
index f1455449611b7e5078da4bf057802414e82fe2e4..9a42c94049de5847c4a4fb9de88ca3b331886d73 100644 (file)
--- a/scripts/lib/redis.php
+++ b/scripts/lib/redis.php
@@ -8,7 +8,7 @@ class StringSetIb
 
     protected function filterArguments(Array $arguments)
     {
-        $arguments[1] = igbinary_serialize($arguments[1]);
+        $arguments[1] = serialize($arguments[1]);
         return $arguments;
     }
 }
@@ -19,7 +19,7 @@ class StringSetexIb
 
     protected function filterArguments(Array $arguments)
     {
-        $arguments[2] = igbinary_serialize($arguments[2]);
+        $arguments[2] = serialize($arguments[2]);
         return $arguments;
     }
 }
@@ -30,7 +30,7 @@ class StringGetIb
 
     public function parseResponse($data)
     {
-        return @igbinary_unserialize($data);
+        return @unserialize($data);
     }
 }
 

diff --git a/scripts/lib/scenes.php b/scripts/lib/scenes.php
index 79ced190e5fe424a8a9b6202a53bb5d84ea5d891..e9917699b1e7899b6d392c3064e9d77d28982024 100644 (file)
--- a/scripts/lib/scenes.php
+++ b/scripts/lib/scenes.php
@@ -456,6 +456,7 @@ $scenes = [
         ['type' => 'scene', 'scene' => 'chambre/planetarium/off'],
         ['type' => 'ifttt', 'event' => 'coffee_off'],
         ['type' => 'scene', 'scene' => 'home/hueoff'],
+        ['type' => 'scene', 'scene' => 'salon/off', 'delay' => 2],
         //['type' => 'ifttt', 'event' => 'oven_off'],
     ],
     'home/welcome' => [

diff --git a/servers/startdaemon b/servers/startdaemon
index a234bed4285ea067ebf5d8d84669c737e6af979a..3b74ad6c695350075a8ef4c9766ec38a6f260d53 100644 (file)
--- a/servers/startdaemon
+++ b/servers/startdaemon
@@ -1,2 +1,2 @@
 #!/bin/sh
-/sbin/start-stop-daemon --start --quiet --user pi --chuid pi --name home-$1 --make-pidfile --pidfile /run/home-$1.pid  --background --startas /bin/bash -- -c "exec /var/www/home/servers/_startdaemon.php $1"
\ No newline at end of file
+/sbin/start-stop-daemon --start --quiet --user pi --chuid pi --name home-$1 --make-pidfile --pidfile /var/run/home-$1.pid  --background --startas /bin/bash -- -c "exec /var/www/home/servers/_startdaemon.php $1"
\ No newline at end of file

diff --git a/servers/stopdaemon b/servers/stopdaemon
index afdfb444c1e648b2fe3b650411d737c78507644d..ee79be968e3b2f1844ff3d3908f3b4f28006a0ad 100644 (file)
--- a/servers/stopdaemon
+++ b/servers/stopdaemon
@@ -1,3 +1,3 @@
 #!/bin/sh
-/sbin/start-stop-daemon --stop --pidfile /run/home-$1.pid --retry 10
+/sbin/start-stop-daemon --stop --pidfile /var/run/home-$1.pid --retry 10
 pkill -f $1.php
\ No newline at end of file

diff --git a/tools/pop/pop.py b/tools/pop/pop.py
index c91ebcfbe3bb64e33ddfed41002b18e0f9b7a7dd..88a2b29c7ee55eece65e58e92cbcf653d3f30c53 100644 (file)
--- a/tools/pop/pop.py
+++ b/tools/pop/pop.py
@@ -1,7 +1,7 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 
 from bluepy import btle
-from urllib2 import urlopen
+from urllib import request
 import sys
 
 device = sys.argv[1]
@@ -18,11 +18,12 @@ class MyDelegate(btle.DefaultDelegate):
         btle.DefaultDelegate.__init__(self)
 
     def handleNotification(self, cHandle, data):
-        cmd = map[ord(data[0])]
+        print(data[0])
+        cmd = map[data[0]]
         print("Notification was received %s" % cmd)
         req = "https://" + room + ".home.tortuga.enhydra.fr/scripts/pop.php?button=" + device + "&action=" + cmd
         try:
-            urlopen(req)
+            request.urlopen(req)
         except:
             print('request timeout')
 
@@ -41,12 +42,11 @@ while True:
     p.setDelegate(MyDelegate())
 
     # Setup to turn notifications on, e.g.
-    #svc = p.getServiceByUUID("0000fe61-0000-1000-8000-00805f9b34fb")
-    #ch = svc.getCharacteristics()[0]
+    svc = p.getServiceByUUID("0000fe61-0000-1000-8000-00805f9b34fb")
+    ch = svc.getCharacteristics()[0]
 
     # Main loop --------
-
-    #p.writeCharacteristic(ch.valHandle+1, "\x02\x00")
+    p.writeCharacteristic(ch.valHandle+1, b'\x02\x00')
 
     while True:
         try:

diff --git a/tools/pop/startpopdaemon b/tools/pop/startpopdaemon
index 88d43a3413963cd9be529301fd8d88153721f382..aafdab7ebc98af9d410d3f8d552c92a5781a1cc8 100644 (file)
--- a/tools/pop/startpopdaemon
+++ b/tools/pop/startpopdaemon
@@ -1,2 +1,2 @@
 #!/bin/sh
-/sbin/start-stop-daemon --start --quiet --user root --chuid root --name pop-$1 --make-pidfile --pidfile /run/pop-$1.pid  --background --startas /bin/bash -- -c "exec /var/www/home/tools/pop/pop.py $1 >> /var/log/pop/$1.log"
\ No newline at end of file
+/sbin/start-stop-daemon --start --quiet --user root --chuid root --name pop-$1 --make-pidfile --pidfile /var/run/pop-$1.pid  --background --startas /bin/bash -- -c "exec /var/www/home/tools/pop/pop.py $1 >> /var/log/pop/$1.log"
\ No newline at end of file

diff --git a/tools/pop/stoppopdaemon b/tools/pop/stoppopdaemon
index 735466783504ed210905cf7491ecd4bcb694fb5e..880a1b1b8332923b8cf1feda0bc232588f5dc434 100644 (file)
--- a/tools/pop/stoppopdaemon
+++ b/tools/pop/stoppopdaemon
@@ -1,2 +1,2 @@
 #!/bin/sh
-/sbin/start-stop-daemon --stop --pidfile /run/pop-$1.pid --retry 10
\ No newline at end of file
+/sbin/start-stop-daemon --stop --pidfile /var/run/pop-$1.pid --retry 10
\ No newline at end of file

diff --git a/tools/xplanet/config b/tools/xplanet/config
new file mode 100644 (file)
index 0000000..259442b
--- /dev/null
+++ b/tools/xplanet/config
@@ -0,0 +1,5 @@
+[earth]
+"Earth"
+grid=no
+map=/var/www/home/tools/xplanet/earth.png
+night_map=/var/www/home/tools/xplanet/earth_lights_4800.tif

diff --git a/tools/xplanet/earth_lights_4800.tif b/tools/xplanet/earth_lights_4800.tif
new file mode 100644 (file)
index 0000000..e442930
Binary files /dev/null and b/tools/xplanet/earth_lights_4800.tif differ

diff --git a/tools/xplanet/world.topo.bathy.200401.3x5400x2700.png b/tools/xplanet/world.topo.bathy.200401.3x5400x2700.png
new file mode 100644 (file)
index 0000000..1f1f382
Binary files /dev/null and b/tools/xplanet/world.topo.bathy.200401.3x5400x2700.png differ

diff --git a/tools/xplanet/world.topo.bathy.200402.3x5400x2700.png b/tools/xplanet/world.topo.bathy.200402.3x5400x2700.png
new file mode 100644 (file)
index 0000000..1aa5799
Binary files /dev/null and b/tools/xplanet/world.topo.bathy.200402.3x5400x2700.png differ

diff --git a/tools/xplanet/world.topo.bathy.200403.3x5400x2700.png b/tools/xplanet/world.topo.bathy.200403.3x5400x2700.png
new file mode 100644 (file)
index 0000000..472bd5a
Binary files /dev/null and b/tools/xplanet/world.topo.bathy.200403.3x5400x2700.png differ

diff --git a/tools/xplanet/world.topo.bathy.200404.3x5400x2700.png b/tools/xplanet/world.topo.bathy.200404.3x5400x2700.png
new file mode 100644 (file)
index 0000000..16dd34c
Binary files /dev/null and b/tools/xplanet/world.topo.bathy.200404.3x5400x2700.png differ

diff --git a/tools/xplanet/world.topo.bathy.200405.3x5400x2700.png b/tools/xplanet/world.topo.bathy.200405.3x5400x2700.png
new file mode 100644 (file)
index 0000000..5e6d260
Binary files /dev/null and b/tools/xplanet/world.topo.bathy.200405.3x5400x2700.png differ

diff --git a/tools/xplanet/world.topo.bathy.200406.3x5400x2700.png b/tools/xplanet/world.topo.bathy.200406.3x5400x2700.png
new file mode 100644 (file)
index 0000000..c502a85
Binary files /dev/null and b/tools/xplanet/world.topo.bathy.200406.3x5400x2700.png differ

diff --git a/tools/xplanet/world.topo.bathy.200407.3x5400x2700.png b/tools/xplanet/world.topo.bathy.200407.3x5400x2700.png
new file mode 100644 (file)
index 0000000..9f33405
Binary files /dev/null and b/tools/xplanet/world.topo.bathy.200407.3x5400x2700.png differ

diff --git a/tools/xplanet/world.topo.bathy.200408.3x5400x2700.png b/tools/xplanet/world.topo.bathy.200408.3x5400x2700.png
new file mode 100644 (file)
index 0000000..4bc350f
Binary files /dev/null and b/tools/xplanet/world.topo.bathy.200408.3x5400x2700.png differ

diff --git a/tools/xplanet/world.topo.bathy.200409.3x5400x2700.png b/tools/xplanet/world.topo.bathy.200409.3x5400x2700.png
new file mode 100644 (file)
index 0000000..b3948b3
Binary files /dev/null and b/tools/xplanet/world.topo.bathy.200409.3x5400x2700.png differ

diff --git a/tools/xplanet/world.topo.bathy.200410.3x5400x2700.png b/tools/xplanet/world.topo.bathy.200410.3x5400x2700.png
new file mode 100644 (file)
index 0000000..f4f3093
Binary files /dev/null and b/tools/xplanet/world.topo.bathy.200410.3x5400x2700.png differ

diff --git a/tools/xplanet/world.topo.bathy.200411.3x5400x2700.png b/tools/xplanet/world.topo.bathy.200411.3x5400x2700.png
new file mode 100644 (file)
index 0000000..dda4ed9
Binary files /dev/null and b/tools/xplanet/world.topo.bathy.200411.3x5400x2700.png differ

diff --git a/tools/xplanet/world.topo.bathy.200412.3x5400x2700.png b/tools/xplanet/world.topo.bathy.200412.3x5400x2700.png
new file mode 100644 (file)
index 0000000..346ab22
Binary files /dev/null and b/tools/xplanet/world.topo.bathy.200412.3x5400x2700.png differ

diff --git a/tools/xplanet/xplanet-suncurve b/tools/xplanet/xplanet-suncurve
new file mode 100644 (file)
index 0000000..2661e43
--- /dev/null
+++ b/tools/xplanet/xplanet-suncurve
@@ -0,0 +1,4 @@
+#!/bin/sh
+month=$(date +%m)
+ln -sf "/var/www/home/tools/xplanet/world.topo.bathy.2004$month.3x5400x2700.png" "/var/www/home/tools/xplanet/earth.png"
+xplanet -config /var/www/home/tools/xplanet/config -longitude 2.3343236 -geometry 1600x1200 -projection rectangular -num_times 1 -output /var/www/home/images/suncurve.png
\ No newline at end of file