From 8c0c0b5a53334221c94096483dbe087898d33a25 Mon Sep 17 00:00:00 2001
From: Pablo Gonzalez <pglez82@gmail.com>
Date: Thu, 28 Jan 2021 13:34:39 +0100
Subject: [PATCH 01/14] starting planetarium

---
 apps.json                            |  14 +++
 apps/planetarium/README.md           |   1 +
 apps/planetarium/planetarium-icon.js |   1 +
 apps/planetarium/planetarium.app.csv |  30 +++++
 apps/planetarium/planetarium.js      | 167 +++++++++++++++++++++++++++
 apps/planetarium/planetarium.png     | Bin 0 -> 2930 bytes
 6 files changed, 213 insertions(+)
 create mode 100644 apps/planetarium/README.md
 create mode 100644 apps/planetarium/planetarium-icon.js
 create mode 100644 apps/planetarium/planetarium.app.csv
 create mode 100644 apps/planetarium/planetarium.js
 create mode 100644 apps/planetarium/planetarium.png

diff --git a/apps.json b/apps.json
index 71cd4d041..ce523ded8 100644
--- a/apps.json
+++ b/apps.json
@@ -2674,4 +2674,18 @@
     {"name":"intervals.img","url":"intervals-icon.js","evaluate":true}
   ]
 }
+,
+{ "id": "planetarium",
+  "name": "Planetarium",
+  "shortName":"planetarium",
+  "icon": "planetarium.png",
+  "version":"0.01",
+  "description": "Planetarium.",
+  "tags": "",
+  "storage": [
+    {"name":"planetarium.app.js","url":"planetarium.app.js"},
+    {"name":"planetarium.app.csv","url":"planetarium.app.csv"},
+    {"name":"planetarium.img","url":"planetarium-icon.js","evaluate":true}
+  ]
+}
 ]
diff --git a/apps/planetarium/README.md b/apps/planetarium/README.md
new file mode 100644
index 000000000..2e07794e9
--- /dev/null
+++ b/apps/planetarium/README.md
@@ -0,0 +1 @@
+# Planetarium
\ No newline at end of file
diff --git a/apps/planetarium/planetarium-icon.js b/apps/planetarium/planetarium-icon.js
new file mode 100644
index 000000000..d901489c2
--- /dev/null
+++ b/apps/planetarium/planetarium-icon.js
@@ -0,0 +1 @@
+require("heatshrink").decompress(atob("mEwwg96xAWVhGIwAuWGCoXrCIZfFDZkJyAKTAAOZBaojEzIADGBoOChITEAgIUCGBAhCCwIlFA4YwIhIjCDQYtDAoIMBQhgUCzJMDR5xYGFwSPMHwYRED4KPMCQcIxKtHWApoCEYczmYXCPgYAEGgZGCAgMDC4pEGA4gVBGwIWCF6GqhWgC4kqBYYAGGgegC4QWCC4kKI4oQBC4guEC4wJDC4gtBGoIXDmWqBoQMBBQUwIAQXJKopSDJooXGmQRBBwYLBFgR2EC4QAEC4RIDToRQDC56pESYhHDAAYFBA4YvMD4oOEL5bMGaJIQFC5ZiEAoxRCC5I1KJoIXVBYJ4FEYgAGPAwwHSYIAGJAwwHEA5+HB5AvMZI4XKBwu72ELAQIHCAoQCBchQMCAQIADDgIfEDBYRBAAI5DCxYUDAxYYMAAgWPDIoVSAFAA=="))
\ No newline at end of file
diff --git a/apps/planetarium/planetarium.app.csv b/apps/planetarium/planetarium.app.csv
new file mode 100644
index 000000000..0f3938e81
--- /dev/null
+++ b/apps/planetarium/planetarium.app.csv
@@ -0,0 +1,30 @@
+1.76779,-0.29175,-1.5,AL CMA
+1.67531,-0.91971,-0.7,AL CAR
+3.73352,0.33480,-0.0,AL BOO
+3.83799,-1.06178,-0.0,AL1 CEN
+4.87356,0.67690,0.0,AL LYR
+1.38181,0.80282,0.1,AL AUR
+1.37243,-0.14315,0.1,BE ORI
+2.00408,0.09119,0.4,AL CMI
+0.42636,-0.99897,0.5,AL ERI
+1.54973,0.12928,0.5,AL ORI
+3.68187,-1.05370,0.6,BE CEN
+5.19577,0.15478,0.8,AL AQL
+1.20393,0.28814,0.8,AL TAU
+4.31710,-0.46132,1.0,AL SCO
+3.51331,-0.19480,1.0,AL VIR
+2.03032,0.48915,1.1,BE GEM
+6.01113,-0.51701,1.2,AL PSA
+3.34982,-1.04176,1.2,BE CRU
+5.41676,0.79029,1.2,AL CYG
+3.83799,-1.06178,1.3,AL2 CEN
+2.65452,0.20887,1.4,AL LEO
+1.82660,-0.50566,1.5,EP CMA
+1.98356,0.55656,1.6,AL GEM
+3.25765,-1.10128,1.6,AL1 CRU
+1.98356,0.55656,1.6,AL GEM
+3.27758,-0.99681,1.6,GA CRU
+4.59723,-0.64758,1.6,LA SCO
+1.41865,0.11082,1.6,GA ORI
+1.42372,0.49930,1.6,BE TAU
+2.41380,-1.21680,1.7,BE CAR
\ No newline at end of file
diff --git a/apps/planetarium/planetarium.js b/apps/planetarium/planetarium.js
new file mode 100644
index 000000000..da436b104
--- /dev/null
+++ b/apps/planetarium/planetarium.js
@@ -0,0 +1,167 @@
+var counter;
+var counterInterval;
+
+var settings;
+
+var work=false; //true if training false if resting
+var prep=true; //true if we are in prep phase (at the beginning of the session
+var setNum;
+
+var paused;
+
+function endPart() {
+  g.clear();
+  if (prep){
+    prep=false;
+    work = true;
+    counter = settings.workseg+settings.workmin*60;
+    startCounter();
+  }else if (work){
+    work = false;
+    counter = settings.restseg+settings.restmin*60;
+    startCounter();
+  }
+  else{
+    if (setNum>1)
+    {
+      setNum--;
+      work = true;
+      counter = settings.workseg+settings.workmin*60;
+      startCounter();
+    }
+    else
+    {
+       //End session
+      setWatch(showMenu, BTN2);
+      E.showMessage("Press BTN2 for\ngoing back\nto the menu","Well done!");
+    }
+  }
+}
+
+function printCounter(counter){
+  g.setFontAlign(0,0); // center font
+  g.setFont("Vector",80); // vector font, 80px  
+  // draw the current counter value
+  let minutes = Math.floor(counter/60);
+  let segs = counter % 60;
+  let textMinutes = minutes.toString().padStart(2, "0");
+  let textSegs = segs.toString().padStart(2,"0");
+  g.clearRect(0,80,239,160);
+  g.setFont("Vector",30);
+  if (prep)
+    g.setColor(125,125,0);
+  else if (work)
+    g.setColor(255,0,0);
+  else
+    g.setColor(0,255,0);
+  g.drawString(setNum,120,50);
+  if (prep)
+    g.drawString("PREPARATION",120,190);
+  else if (work)
+    g.drawString("WORK",120,190);
+  else
+    g.drawString("REST",120,190);
+  g.setFont("Vector",10);
+  g.drawString("Touch to pause",120,215);
+  g.setFont("Vector",80); 
+  g.drawString(textMinutes+":"+textSegs,120,120);
+}
+
+function signal_to_user(le){
+  if (settings.buzz)
+    Bangle.buzz(le);
+  else
+    Bangle.beep(le,4000);
+}
+
+function countDown() {
+  counter--;
+  if (counter<4 && counter>0)
+    signal_to_user(200);
+  if (counter==0)
+    signal_to_user(600);
+
+  if (counter<0) {
+    clearInterval(counterInterval);
+    counterInterval = undefined;
+    endPart();
+  }
+  else
+  {
+    printCounter(counter);
+  }
+  g.flip();
+}
+
+function startCounter(){
+  if (!counterInterval)
+    counterInterval = setInterval(countDown, 1000);
+}
+
+function pause()
+{
+  if (!paused)
+  {
+    clearInterval(counterInterval);
+    counterInterval = undefined;
+    setWatch(resume,BTN4);
+    setWatch(resume,BTN5);
+    paused=true;
+    g.clear();
+    g.setFont("Vector",60);
+    g.drawString("PAUSED",120,120);
+    g.setFont("Vector",20);
+    g.drawString("Touch to continue",120,180);
+  }
+}
+
+function resume(){
+  if (paused)
+  {
+    g.clear();
+    counterInterval = setInterval(countDown, 1000);
+    setWatch(pause,BTN4);
+    setWatch(pause,BTN5);
+    paused=false;
+  }
+}
+
+function startSession() {
+  E.showMenu();
+  paused=false;
+  setWatch(pause,BTN4);
+  setWatch(pause,BTN5);
+  require('Storage').write('intervals.settings.json',settings);
+  setNum = settings.sets;
+  counter = 5;//prep time
+  prep=true;
+  work=false;
+  startCounter();
+}
+
+function showMenu()
+{
+  settings = require('Storage').readJSON('intervals.settings.json',1)||
+      { sets:1,workseg:10,workmin:0,restseg:5,restmin:0,buzz:true};
+
+  var mainmenu = {
+  "" : { "title" : "-- Main Menu --" },
+  "START" : function() { startSession(); },
+  "Sets" : { value : settings.sets,min:0,max:20,step:1,onchange : v => { settings.sets=v; } },
+  "Work minutes" : { value : settings.workmin,min:0,max:59,step:1,onchange : v => { settings.workmin=v; } },
+  "Work seconds" : { value : settings.workseg,min:0,max:59,step:5,onchange : v => { settings.workseg=v; } },
+  "Rest minutes" : { value : settings.restmin,min:0,max:59,step:1,onchange : v => { settings.restmin=v; } },
+  "Rest seconds" : { value : settings.restseg,min:0,max:59,step:5,onchange : v => { settings.restseg=v; } },
+  "Signal type" :  { value : settings.buzz,format : v => v?"Buzz":"Beep",onchange : v => { settings.buzz=v; }}
+  };
+  
+  E.showMenu(mainmenu);
+}
+
+showMenu();
+
+
+
+
+
+
diff --git a/apps/planetarium/planetarium.png b/apps/planetarium/planetarium.png
new file mode 100644
index 0000000000000000000000000000000000000000..f6ca9ff41f50a570bb66426bc4e93bdc73a4aba0
GIT binary patch
literal 2930
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

literal 0
HcmV?d00001


From bd882648f55602c22eb0a2dae8e0741a04313d72 Mon Sep 17 00:00:00 2001
From: Pablo Gonzalez <pglez82@gmail.com>
Date: Thu, 28 Jan 2021 18:07:39 +0100
Subject: [PATCH 02/14] planetarium

---
 apps.json                             |   2 +-
 apps/intervals/intervals.app.js       | 312 +++++++++++------------
 apps/planetarium/planetarium-icon.js  |   2 +-
 apps/planetarium/planetarium.app.csv  |  30 ---
 apps/planetarium/planetarium.app.js   | 141 +++++++++++
 apps/planetarium/planetarium.data.csv | 343 ++++++++++++++++++++++++++
 apps/planetarium/planetarium.js       | 167 -------------
 apps/planetarium/planetarium.png      | Bin 2930 -> 1920 bytes
 8 files changed, 645 insertions(+), 352 deletions(-)
 delete mode 100644 apps/planetarium/planetarium.app.csv
 create mode 100644 apps/planetarium/planetarium.app.js
 create mode 100644 apps/planetarium/planetarium.data.csv
 delete mode 100644 apps/planetarium/planetarium.js

diff --git a/apps.json b/apps.json
index ce523ded8..f4546d95f 100644
--- a/apps.json
+++ b/apps.json
@@ -2684,7 +2684,7 @@
   "tags": "",
   "storage": [
     {"name":"planetarium.app.js","url":"planetarium.app.js"},
-    {"name":"planetarium.app.csv","url":"planetarium.app.csv"},
+    {"name":"planetarium.data.csv","url":"planetarium.data.csv"},
     {"name":"planetarium.img","url":"planetarium-icon.js","evaluate":true}
   ]
 }
diff --git a/apps/intervals/intervals.app.js b/apps/intervals/intervals.app.js
index da436b104..a158ca967 100644
--- a/apps/intervals/intervals.app.js
+++ b/apps/intervals/intervals.app.js
@@ -1,164 +1,170 @@
-var counter;
-var counterInterval;
-
-var settings;
-
-var work=false; //true if training false if resting
-var prep=true; //true if we are in prep phase (at the beginning of the session
-var setNum;
-
-var paused;
-
-function endPart() {
-  g.clear();
-  if (prep){
-    prep=false;
-    work = true;
-    counter = settings.workseg+settings.workmin*60;
-    startCounter();
-  }else if (work){
-    work = false;
-    counter = settings.restseg+settings.restmin*60;
-    startCounter();
-  }
-  else{
-    if (setNum>1)
-    {
-      setNum--;
-      work = true;
-      counter = settings.workseg+settings.workmin*60;
-      startCounter();
-    }
-    else
-    {
-       //End session
-      setWatch(showMenu, BTN2);
-      E.showMessage("Press BTN2 for\ngoing back\nto the menu","Well done!");
-    }
-  }
-}
-
-function printCounter(counter){
-  g.setFontAlign(0,0); // center font
-  g.setFont("Vector",80); // vector font, 80px  
-  // draw the current counter value
-  let minutes = Math.floor(counter/60);
-  let segs = counter % 60;
-  let textMinutes = minutes.toString().padStart(2, "0");
-  let textSegs = segs.toString().padStart(2,"0");
-  g.clearRect(0,80,239,160);
-  g.setFont("Vector",30);
-  if (prep)
-    g.setColor(125,125,0);
-  else if (work)
-    g.setColor(255,0,0);
-  else
-    g.setColor(0,255,0);
-  g.drawString(setNum,120,50);
-  if (prep)
-    g.drawString("PREPARATION",120,190);
-  else if (work)
-    g.drawString("WORK",120,190);
-  else
-    g.drawString("REST",120,190);
-  g.setFont("Vector",10);
-  g.drawString("Touch to pause",120,215);
-  g.setFont("Vector",80); 
-  g.drawString(textMinutes+":"+textSegs,120,120);
-}
-
-function signal_to_user(le){
-  if (settings.buzz)
-    Bangle.buzz(le);
-  else
-    Bangle.beep(le,4000);
-}
-
-function countDown() {
-  counter--;
-  if (counter<4 && counter>0)
-    signal_to_user(200);
-  if (counter==0)
-    signal_to_user(600);
-
-  if (counter<0) {
-    clearInterval(counterInterval);
-    counterInterval = undefined;
-    endPart();
-  }
-  else
-  {
-    printCounter(counter);
-  }
-  g.flip();
-}
-
-function startCounter(){
-  if (!counterInterval)
-    counterInterval = setInterval(countDown, 1000);
-}
-
-function pause()
+/*
+ * Degrees to radians
+ */
+function toRadians(degrees)
 {
-  if (!paused)
-  {
-    clearInterval(counterInterval);
-    counterInterval = undefined;
-    setWatch(resume,BTN4);
-    setWatch(resume,BTN5);
-    paused=true;
-    g.clear();
-    g.setFont("Vector",60);
-    g.drawString("PAUSED",120,120);
-    g.setFont("Vector",20);
-    g.drawString("Touch to continue",120,180);
-  }
+    return Math.PI * degrees / 180;
 }
 
-function resume(){
-  if (paused)
-  {
-    g.clear();
-    counterInterval = setInterval(countDown, 1000);
-    setWatch(pause,BTN4);
-    setWatch(pause,BTN5);
-    paused=false;
-  }
-}
-
-function startSession() {
-  E.showMenu();
-  paused=false;
-  setWatch(pause,BTN4);
-  setWatch(pause,BTN5);
-  require('Storage').write('intervals.settings.json',settings);
-  setNum = settings.sets;
-  counter = 5;//prep time
-  prep=true;
-  work=false;
-  startCounter();
-}
-
-function showMenu()
+/*
+ * Julian day number
+ * Assumes a proleptic gregorian calendar where the year 1 is preceded by the
+ * year 0.
+ */
+function toJulianDay(year, month, day, hours, minutes, seconds)
 {
-  settings = require('Storage').readJSON('intervals.settings.json',1)||
-      { sets:1,workseg:10,workmin:0,restseg:5,restmin:0,buzz:true};
+    day += hours / 24 + minutes / 1440 + seconds / 86400;
+    
+    if(month <= 2)
+    {
+        year -= 1;
+        month += 12;
+    }
+    
+    var A = Math.floor(year / 100);
+    var B = 2 - A + Math.floor(A / 4);
+    return Math.floor(365.25 * (year + 4716)) + Math.floor(30.6001 * (month + 1)) + day + B - 1524.5;
+}
 
-  var mainmenu = {
-  "" : { "title" : "-- Main Menu --" },
-  "START" : function() { startSession(); },
-  "Sets" : { value : settings.sets,min:0,max:20,step:1,onchange : v => { settings.sets=v; } },
-  "Work minutes" : { value : settings.workmin,min:0,max:59,step:1,onchange : v => { settings.workmin=v; } },
-  "Work seconds" : { value : settings.workseg,min:0,max:59,step:5,onchange : v => { settings.workseg=v; } },
-  "Rest minutes" : { value : settings.restmin,min:0,max:59,step:1,onchange : v => { settings.restmin=v; } },
-  "Rest seconds" : { value : settings.restseg,min:0,max:59,step:5,onchange : v => { settings.restseg=v; } },
-  "Signal type" :  { value : settings.buzz,format : v => v?"Buzz":"Beep",onchange : v => { settings.buzz=v; }}
-  };
+/*
+ * Sidereal time in Greenwich
+ */
+function siderealTime(julianDay)
+{
+    var T = (julianDay - 2451545.0) / 36525;
+    return toRadians(280.46061837 + 360.98564736629 * (julianDay - 2451545.0) + 0.000387933 * T * T - T * T * T / 38710000);
+}
+
+function binary_search(a, value) {
+    var lo = 0, hi = a.length - 1, mid;
+    while (lo <= hi) {
+        mid = Math.floor((lo+hi)/2);
+        if (a[mid] > value)
+            hi = mid - 1;
+        else if (a[mid] < value)
+            lo = mid + 1;
+        else
+            return mid;
+    }
+    return null;
+}
+
+function drawStars(lat,lon){
+  var longitude = toRadians(-lon);
+  var latitude = toRadians(lat);
   
-  E.showMenu(mainmenu);
+  date = new Date();
+
+  var julianDay = toJulianDay(date.getFullYear(), date.getMonth()+1,date.getDate(),
+                              date.getHours() + date.getTimezoneOffset() / 60,
+                              date.getMinutes(), date.getSeconds());
+  var size = 240;
+
+  storage = require('Storage');
+  f=storage.read("planetarium.csv","r");
+  linestart=0;
+  g.clear();
+
+  //Common calculations based only on time
+  var t = (julianDay - 2451545.0) / 36525;
+  var zeta = toRadians((2306.2181 * t + 0.30188 * t * t + 0.017998 * t * t * t) / 3600);
+  var theta = toRadians((2004.3109 * t - 0.42665 * t * t - 0.041833 * t * t * t) / 3600);
+  var z = toRadians((2306.2181 * t + 1.09468 * t * t + 0.018203 * t * t * t) / 3600);
+
+
+  let starNumber = 0;
+  //Each star has a number (the position on the file (line number)). These are the lines
+  //joining each star in the constellations.
+  constelation_lines=[/*Orion*/[7,68],[10,53],[53,56],[28,68],/*Taurus*/[13,172],[13,340],[293,340],[29,293],
+                      /*canis menor*/[155,8]];
+  var starPositions = {};
+
+  for (i=0;i<f.length;i++)
+  {
+    if (f[i]=='\n'){
+      var start = new Date().getTime();
+      starNumber++;
+      //console.log("Line from "+linestart.toString()+"to "+(i-1).toString());
+      line = f.substr(linestart,i-linestart);
+      //console.log(line);
+      linestart = i+1;
+      //Process the star
+      starInfo = line.split(',');
+      //console.log(starInfo[0]);
+      starRA = parseFloat(starInfo[0]);
+      starDE = parseFloat(starInfo[1]);
+      starMag = parseFloat(starInfo[2]);
+      //var start = new Date().getTime();
+      var dec = Math.asin(Math.sin(theta) * Math.cos(starDE) * Math.cos(starRA + zeta) + Math.cos(theta) * Math.sin(starDE));
+      var ascen = Math.atan2(Math.cos(starDE) * Math.sin(starRA + zeta), Math.cos(theta) * Math.cos(starDE) * Math.cos(starRA + zeta) - Math.sin(theta) * Math.sin(starDE)) + z;
+      var H = siderealTime(julianDay) - longitude - ascen;
+      //var end = new Date().getTime();
+      //console.log("Call to doSomething took " + (end - start) + " milliseconds.");
+      //Compute altitude
+      var alt = Math.asin(Math.sin(latitude) * Math.sin(dec) + Math.cos(latitude) * Math.cos(dec) * Math.cos(H));
+      if(alt >= 0)
+      {
+        //Compute azimuth  
+        var azi = Math.atan2(Math.sin(H), Math.cos(H) * Math.sin(latitude) - Math.tan(dec) * Math.cos(latitude));
+        var x = size / 2 + size / 2 * Math.cos(alt) * Math.sin(azi);
+        var y = size / 2 + size / 2 * Math.cos(alt) * Math.cos(azi);
+        starPositions[starNumber] = [x,y];
+        var magnitude = starMag<1.5?2:1;
+        g.fillCircle(x, y, magnitude);
+        if (starMag<1)
+          g.drawString(starInfo[3],x,y+2);
+        g.flip();
+
+      }
+    }
+  }
+
+  for (i=0;i<constelation_lines.length;i++)
+  {
+    constelation = constelation_lines[i];
+    positionStar1=starPositions[constelation[0]];
+    positionStar2=starPositions[constelation[1]];
+    //Both stars need to be visible
+    g.setColor(0,255,0);
+    if (positionStar1 && positionStar2)
+      g.drawLine(positionStar1[0],positionStar1[1],positionStar2[0],positionStar2[1]);
+    g.flip();
+  }
 }
 
-showMenu();
+Bangle.setGPSPower(1);
+
+var gps = { fix : 0};
+var gpsCount = 0;
+var prevSats = 0;
+g.clear();
+
+
+
+g.setFontAlign(0,0);
+
+Bangle.on('GPS',function(gp) {
+  gps = gp;
+  gpsCount++;
+  var msg;
+  if (gp.fix) {
+    lat = gp.lat;
+    lon = gp.lon;
+    Bangle.setGPSPower(0);
+    drawStars(lat,lon);
+  } else {
+    g.setFont("Vector",20); 
+    g.drawString("Waiting for position",120,120);
+    g.setFont("Vector",15); 
+    if (gp.satellites>prevSats || prevSats===0){
+      prevSats = gp.satellites;
+      g.clearRect(0,150,240,180);
+      g.drawString("Got "+gp.satellites+" satellites",120,160);
+    }
+    g.flip();
+  }
+});
+
 
 
 
diff --git a/apps/planetarium/planetarium-icon.js b/apps/planetarium/planetarium-icon.js
index d901489c2..215c5aa38 100644
--- a/apps/planetarium/planetarium-icon.js
+++ b/apps/planetarium/planetarium-icon.js
@@ -1 +1 @@
-require("heatshrink").decompress(atob("mEwwg96xAWVhGIwAuWGCoXrCIZfFDZkJyAKTAAOZBaojEzIADGBoOChITEAgIUCGBAhCCwIlFA4YwIhIjCDQYtDAoIMBQhgUCzJMDR5xYGFwSPMHwYRED4KPMCQcIxKtHWApoCEYczmYXCPgYAEGgZGCAgMDC4pEGA4gVBGwIWCF6GqhWgC4kqBYYAGGgegC4QWCC4kKI4oQBC4guEC4wJDC4gtBGoIXDmWqBoQMBBQUwIAQXJKopSDJooXGmQRBBwYLBFgR2EC4QAEC4RIDToRQDC56pESYhHDAAYFBA4YvMD4oOEL5bMGaJIQFC5ZiEAoxRCC5I1KJoIXVBYJ4FEYgAGPAwwHSYIAGJAwwHEA5+HB5AvMZI4XKBwu72ELAQIHCAoQCBchQMCAQIADDgIfEDBYRBAAI5DCxYUDAxYYMAAgWPDIoVSAFAA=="))
\ No newline at end of file
+require("heatshrink").decompress(atob("AEGIAAgVPhAWFAAOACyoYNCxQYMCxZjKFxgwKB42ClAwNFw+O9AwNH48u8RhMLpHu9xhMLg0ipwXBokiMQwXKCoIADC5JGHlwWDMI5ICC44wEVI4XCZxBfC8jzKBRAuCC66oIC4K9IwPuoUk90YYJAXIwVCSYR3HC5WBAgYvPCggAFDQoXGwhAIwVIC5cuBoohDeQoXGpwNFEIbDFC4uCaJL1BKQgXDiVEdQdCB4WCYIIACokhC4uEBgYABC4YJII4kuBgZhEBJAXEEwi3EBIhgDwEABwYuHGAoHDgAXDwIXJRwIXKHoaoGC4ZHDC4JgCC4MoUAIXF91CBgReDC4iwCkh3EwNCZwQXFPAgAPCwQXYYIYAOIwYwTCwgwRFwowRCwwwPFw4wPCxAwNFxIYMCxYYKCxpjICp4AQ"))
\ No newline at end of file
diff --git a/apps/planetarium/planetarium.app.csv b/apps/planetarium/planetarium.app.csv
deleted file mode 100644
index 0f3938e81..000000000
--- a/apps/planetarium/planetarium.app.csv
+++ /dev/null
@@ -1,30 +0,0 @@
-1.76779,-0.29175,-1.5,AL CMA
-1.67531,-0.91971,-0.7,AL CAR
-3.73352,0.33480,-0.0,AL BOO
-3.83799,-1.06178,-0.0,AL1 CEN
-4.87356,0.67690,0.0,AL LYR
-1.38181,0.80282,0.1,AL AUR
-1.37243,-0.14315,0.1,BE ORI
-2.00408,0.09119,0.4,AL CMI
-0.42636,-0.99897,0.5,AL ERI
-1.54973,0.12928,0.5,AL ORI
-3.68187,-1.05370,0.6,BE CEN
-5.19577,0.15478,0.8,AL AQL
-1.20393,0.28814,0.8,AL TAU
-4.31710,-0.46132,1.0,AL SCO
-3.51331,-0.19480,1.0,AL VIR
-2.03032,0.48915,1.1,BE GEM
-6.01113,-0.51701,1.2,AL PSA
-3.34982,-1.04176,1.2,BE CRU
-5.41676,0.79029,1.2,AL CYG
-3.83799,-1.06178,1.3,AL2 CEN
-2.65452,0.20887,1.4,AL LEO
-1.82660,-0.50566,1.5,EP CMA
-1.98356,0.55656,1.6,AL GEM
-3.25765,-1.10128,1.6,AL1 CRU
-1.98356,0.55656,1.6,AL GEM
-3.27758,-0.99681,1.6,GA CRU
-4.59723,-0.64758,1.6,LA SCO
-1.41865,0.11082,1.6,GA ORI
-1.42372,0.49930,1.6,BE TAU
-2.41380,-1.21680,1.7,BE CAR
\ No newline at end of file
diff --git a/apps/planetarium/planetarium.app.js b/apps/planetarium/planetarium.app.js
new file mode 100644
index 000000000..3f4c00297
--- /dev/null
+++ b/apps/planetarium/planetarium.app.js
@@ -0,0 +1,141 @@
+/*
+ * Degrees to radians
+ */
+function toRadians(degrees)
+{
+    return Math.PI * degrees / 180;
+}
+
+/*
+ * Julian day number
+ * Assumes a proleptic gregorian calendar where the year 1 is preceded by the
+ * year 0.
+ */
+function toJulianDay(year, month, day, hours, minutes, seconds)
+{
+    day += hours / 24 + minutes / 1440 + seconds / 86400;
+    
+    if(month <= 2)
+    {
+        year -= 1;
+        month += 12;
+    }
+    
+    var A = Math.floor(year / 100);
+    var B = 2 - A + Math.floor(A / 4);
+    return Math.floor(365.25 * (year + 4716)) + Math.floor(30.6001 * (month + 1)) + day + B - 1524.5;
+}
+
+/*
+ * Sidereal time in Greenwich
+ */
+function siderealTime(julianDay)
+{
+    var T = (julianDay - 2451545.0) / 36525;
+    return toRadians(280.46061837 + 360.98564736629 * (julianDay - 2451545.0) + 0.000387933 * T * T - T * T * T / 38710000);
+}
+
+function binary_search(a, value) {
+    var lo = 0, hi = a.length - 1, mid;
+    while (lo <= hi) {
+        mid = Math.floor((lo+hi)/2);
+        if (a[mid] > value)
+            hi = mid - 1;
+        else if (a[mid] < value)
+            lo = mid + 1;
+        else
+            return mid;
+    }
+    return null;
+}
+
+var longitudeSign = 1; //1 for west and -1 for east;
+var longitudeDegrees = 5;
+var longitudeMinutes = 37;
+var longitudeSeconds = 27.4;
+var longitude = toRadians(longitudeSign * (longitudeDegrees + longitudeMinutes / 60 + longitudeSeconds / 3600));
+var latitudeSign = 1; //1 for north -1 for south;
+var latitudeDegrees = 43;
+var latitudeMinutes = 25;
+var latitudeSeconds = 0.9;
+var latitude = toRadians(latitudeSign * (latitudeDegrees + latitudeMinutes / 60 + latitudeSeconds / 3600));
+var year = 2020;
+var month = 1;
+var day = 27;
+var hours = 22;
+var minutes = 0;
+var seconds = 0;
+var timeZone = 1;
+var julianDay = toJulianDay(year, month, day, hours - timeZone, minutes, seconds);
+var size = 240;
+
+storage = require('Storage');
+f=storage.read("planetarium.data.csv","r");
+linestart=0;
+g.clearRect(0, 0, 240, 240);
+
+//Common calculations based only on time
+var t = (julianDay - 2451545.0) / 36525;
+var zeta = toRadians((2306.2181 * t + 0.30188 * t * t + 0.017998 * t * t * t) / 3600);
+var theta = toRadians((2004.3109 * t - 0.42665 * t * t - 0.041833 * t * t * t) / 3600);
+var z = toRadians((2306.2181 * t + 1.09468 * t * t + 0.018203 * t * t * t) / 3600);
+
+
+let starNumber = 0;
+//Each star has a number (the position on the file (line number)). These are the lines
+//joining each star in the constellations.
+constelation_lines=[/*Orion*/[7,68],[10,53],[53,56],[28,68],/*Taurus*/[13,172],[13,340],[293,340],[29,293],
+                    /*canis menor*/[155,8]];
+var starPositions = {};
+
+for (i=0;i<f.length;i++)
+{
+  if (f[i]=='\n'){
+    var start = new Date().getTime();
+    starNumber++;
+    //console.log("Line from "+linestart.toString()+"to "+(i-1).toString());
+    line = f.substr(linestart,i-linestart);
+    //console.log(line);
+    linestart = i+1;
+    //Process the star
+    starInfo = line.split(',');
+    //console.log(starInfo[0]);
+    starRA = parseFloat(starInfo[0]);
+    starDE = parseFloat(starInfo[1]);
+    starMag = parseFloat(starInfo[2]);
+    //var start = new Date().getTime();
+    var dec = Math.asin(Math.sin(theta) * Math.cos(starDE) * Math.cos(starRA + zeta) + Math.cos(theta) * Math.sin(starDE));
+    var ascen = Math.atan2(Math.cos(starDE) * Math.sin(starRA + zeta), Math.cos(theta) * Math.cos(starDE) * Math.cos(starRA + zeta) - Math.sin(theta) * Math.sin(starDE)) + z;
+    var H = siderealTime(julianDay) - longitude - ascen;
+    //var end = new Date().getTime();
+    //console.log("Call to doSomething took " + (end - start) + " milliseconds.");
+    //Compute altitude
+    var alt = Math.asin(Math.sin(latitude) * Math.sin(dec) + Math.cos(latitude) * Math.cos(dec) * Math.cos(H));
+    if(alt >= 0)
+    {
+      //Compute azimuth  
+      var azi = Math.atan2(Math.sin(H), Math.cos(H) * Math.sin(latitude) - Math.tan(dec) * Math.cos(latitude));
+      var x = size / 2 + size / 2 * Math.cos(alt) * Math.sin(azi);
+      var y = size / 2 + size / 2 * Math.cos(alt) * Math.cos(azi);
+      starPositions[starNumber] = [x,y];
+      var magnitude = starMag<1.5?2:1;
+      g.fillCircle(x, y, magnitude);
+      if (starMag<1)
+        g.drawString(starInfo[3],x,y+2);
+      g.flip();
+      
+    }
+  }
+}
+
+for (i=0;i<constelation_lines.length;i++)
+{
+  constelation = constelation_lines[i];
+  positionStar1=starPositions[constelation[0]];
+  positionStar2=starPositions[constelation[1]];
+  //Both stars need to be visible
+  g.setColor(0,255,0);
+  if (positionStar1 && positionStar2)
+    g.drawLine(positionStar1[0],positionStar1[1],positionStar2[0],positionStar2[1]);
+  g.flip();
+}
\ No newline at end of file
diff --git a/apps/planetarium/planetarium.data.csv b/apps/planetarium/planetarium.data.csv
new file mode 100644
index 000000000..2496ff8c4
--- /dev/null
+++ b/apps/planetarium/planetarium.data.csv
@@ -0,0 +1,343 @@
+1.768,-0.292,-1.5,Sirius
+1.675,-0.920,-0.7,AL CAR
+3.734,0.335,-0.0,Arcturus
+3.838,-1.062,-0.0,AL1 CEN
+4.874,0.677,0.0,Vega
+1.382,0.803,0.1,Capella
+1.372,-0.143,0.1,Rigel
+2.004,0.091,0.4,Procyion
+0.426,-0.999,0.5,AL ERI
+1.550,0.129,0.5,Betelgeuse
+3.682,-1.054,0.6,BE CEN
+5.196,0.155,0.8,AL AQL
+1.204,0.288,0.8,Aldebaran
+4.317,-0.461,1.0,AL SCO
+3.513,-0.195,1.0,AL VIR
+2.030,0.489,1.1,BE GEM
+6.011,-0.517,1.2,AL PSA
+3.350,-1.042,1.2,BE CRU
+5.417,0.790,1.2,Deneb
+3.838,-1.062,1.3,AL2 CEN
+2.655,0.209,1.4,AL LEO
+1.827,-0.506,1.5,EP CMA
+1.984,0.557,1.6,AL GEM
+3.258,-1.101,1.6,AL1 CRU
+1.984,0.557,1.6,AL GEM
+3.278,-0.997,1.6,GA CRU
+4.597,-0.648,1.6,LA SCO
+1.419,0.111,1.6,Bellatrix
+1.424,0.499,1.6,BE TAU
+2.414,-1.217,1.7,BE CAR
+1.467,-0.021,1.7,EP ORI
+5.796,-0.820,1.7,AL GRU
+3.377,0.977,1.8,EP UMA
+2.136,-0.826,1.8,GA2 VEL
+0.892,0.870,1.8,AL PER
+2.896,1.078,1.8,AL UMA
+1.869,-0.461,1.8,DE CMA
+4.818,-0.600,1.9,EP SGR
+2.193,-1.039,1.9,EP CAR
+3.611,0.861,1.9,ET UMA
+4.613,-0.750,1.9,TH SCO
+1.569,0.784,1.9,BE AUR
+4.401,-1.205,1.9,AL TRA
+1.735,0.286,1.9,GA GEM
+5.348,-0.990,1.9,AL PAV
+2.289,-0.955,2.0,DE VEL
+1.670,-0.313,2.0,BE CMA
+2.477,-0.151,2.0,AL HYA
+0.555,0.409,2.0,AL ARI
+0.663,1.558,2.0,AL UMI
+4.954,-0.459,2.0,SI SGR
+0.190,-0.314,2.0,BE CET
+1.487,-0.034,2.0,ZE ORI
+0.037,0.508,2.1,AL AND
+0.304,0.622,2.1,BE AND
+1.517,-0.169,2.1,KA ORI
+3.694,-0.635,2.1,TH CEN
+3.886,1.294,2.1,BE UMI
+4.603,0.219,2.1,AL OPH
+3.258,-1.101,2.1,AL2 CRU
+5.946,-0.818,2.1,BE GRU
+0.821,0.715,2.1,BE PER
+3.094,0.254,2.1,BE LEO
+3.323,-0.855,2.2,GA CEN
+5.333,0.703,2.2,GA CYG
+2.391,-0.758,2.2,LA VEL
+0.177,0.987,2.2,AL CAS
+1.449,-0.005,2.2,DE ORI
+4.078,0.466,2.2,AL CRB
+4.698,0.899,2.2,GA DRA
+2.110,-0.698,2.2,ZE PUP
+2.431,-1.035,2.2,JO CAR
+0.541,0.739,2.3,GA1 AND
+0.040,1.032,2.3,BE CAS
+3.508,0.959,2.3,ZE UMA
+4.408,-0.599,2.3,EP SCO
+3.577,-0.933,2.3,EP CEN
+3.848,-0.827,2.3,AL LUP
+3.820,-0.736,2.3,ET CEN
+4.190,-0.395,2.3,DE SCO
+2.888,0.984,2.4,BE UMA
+0.115,-0.738,2.4,AL PHE
+5.691,0.172,2.4,EP PEG
+4.636,-0.681,2.4,KA SCO
+6.038,0.490,2.4,BE PEG
+4.496,-0.274,2.4,ET OPH
+3.115,0.937,2.4,GA UMA
+5.579,1.092,2.4,AL CEP
+1.938,-0.511,2.5,ET CMA
+5.438,0.593,2.5,EP CYG
+0.247,1.060,2.5,GA CAS
+6.042,0.265,2.5,AL PEG
+2.453,-0.960,2.5,KA VEL
+0.795,0.071,2.5,AL CET
+3.646,-0.825,2.5,ZE CEN
+2.941,0.358,2.6,DE LEO
+4.351,-0.184,2.6,ZE OPH
+1.452,-0.311,2.6,AL LEP
+3.211,-0.306,2.6,GA CRV
+3.178,-0.885,2.6,DE CEN
+4.986,-0.522,2.6,ZE SGR
+2.705,0.346,2.6,GA1 LEO
+4.001,-0.164,2.6,BE LIB
+1.570,0.649,2.6,TH AUR
+4.213,-0.346,2.6,BE1 SCO
+0.500,0.363,2.6,BE ARI
+1.482,-0.595,2.6,AL COL
+3.292,-0.408,2.6,BE CRV
+4.120,0.112,2.6,AL SER
+0.374,1.051,2.7,DE CAS
+3.642,0.321,2.7,ET BOO
+3.921,-0.753,2.7,BE LUP
+1.296,0.579,2.7,JO AUR
+2.822,-0.863,2.7,MY VEL
+3.304,-1.207,2.7,AL MUS
+4.585,-0.651,2.7,YP SCO
+1.907,-0.647,2.7,PI PUP
+3.861,0.473,2.7,EP BOO
+4.804,-0.521,2.7,DE SGR
+5.176,0.185,2.7,GA AQL
+4.251,-0.064,2.7,DE OPH
+4.293,1.074,2.7,ET DRA
+3.493,-0.641,2.8,JO CEN
+3.887,-0.280,2.8,AL2 LIB
+2.805,-1.124,2.8,TH CAR
+1.464,-0.103,2.8,JO ORI
+4.321,0.375,2.8,BE HER
+4.640,0.080,2.8,BE OPH
+4.080,-0.718,2.8,GA LUP
+1.343,-0.089,2.8,BE ERI
+4.583,0.913,2.8,BE DRA
+0.112,-1.348,2.8,BE HYI
+3.208,-1.025,2.8,DE CRU
+2.127,-0.424,2.8,RH PUP
+4.369,0.552,2.8,ZE HER
+4.834,-0.444,2.8,LA SGR
+4.345,-0.492,2.8,TA SCO
+0.058,0.265,2.8,GA PEG
+3.413,0.191,2.8,EP VIR
+1.432,-0.362,2.8,BE LEP
+1.022,0.556,2.9,ZE PER
+4.168,-1.107,2.9,BE TRA
+4.561,-0.969,2.9,BE ARA
+0.518,-1.075,2.9,AL HYI
+5.840,-1.052,2.9,AL TUC
+0.993,0.421,2.9,ET TAU
+5.170,0.788,2.9,DE CYG
+5.703,-0.281,2.9,DE CAP
+1.671,0.393,2.9,MY GEM
+1.038,0.698,2.9,EP PER
+4.010,-1.199,2.9,GA TRA
+4.184,-0.456,2.9,PI SCO
+4.281,-0.447,2.9,SI SCO
+5.017,-0.367,2.9,PI SGR
+1.951,0.145,2.9,BE CMI
+3.386,0.669,2.9,AL2 CVN
+5.635,-0.097,2.9,BE AQR
+0.806,0.934,2.9,GA PER
+1.789,-0.883,2.9,TA PUP
+5.947,0.527,2.9,ET PEG
+1.039,-0.236,3.0,GA ERI
+3.272,-0.288,3.0,DE CRV
+4.590,-0.871,3.0,AL ARA
+2.562,-1.136,3.0,YP CAR
+5.785,-0.006,3.0,AL AQR
+1.762,0.439,3.0,EP GEM
+2.556,0.415,3.0,EP LEO
+1.318,0.765,3.0,EP AUR
+4.738,-0.531,3.0,GA2 SGR
+4.998,0.242,3.0,ZE AQL
+0.565,0.611,3.0,BE TRI
+1.473,0.369,3.0,ZE TAU
+3.186,-0.395,3.0,EP CRV
+3.486,-0.404,3.0,GA HYA
+0.973,0.834,3.0,DE PER
+2.922,0.777,3.0,PS UMA
+5.733,-0.652,3.0,GA GRU
+1.659,-0.525,3.0,ZE CMA
+1.846,-0.416,3.0,OK2 CMA
+3.805,0.669,3.0,GA BOO
+4.658,-0.700,3.0,JO1 SCO
+0.608,-0.052,3.0,OK CET
+3.620,-0.741,3.0,MY CEN
+2.715,0.724,3.0,MY UMA
+3.344,-1.189,3.0,BE MUS
+4.017,1.254,3.0,GA UMI
+5.029,1.181,3.1,DE DRA
+4.415,-0.664,3.1,MY1 SCO
+5.108,0.488,3.1,BE1 CYG
+5.328,-0.258,3.1,BE CAP
+2.336,0.104,3.1,ZE HYA
+2.835,-0.283,3.1,NY HYA
+4.789,-0.642,3.1,ET SGR
+5.400,-0.825,3.1,AL IND
+1.531,-0.624,3.1,BE COL
+2.448,0.600,3.1,AL LYN
+2.492,-0.995,3.1,_
+3.036,-1.100,3.1,LA CEN
+3.923,-0.735,3.1,KA CEN
+4.445,-0.977,3.1,ZE ARA
+2.353,0.838,3.1,JO UMA
+4.516,0.434,3.1,DE HER
+4.516,0.642,3.2,PI HER
+1.337,0.720,3.2,ET AUR
+1.736,-0.754,3.2,NY PUP
+2.500,0.902,3.2,TH UMA
+4.489,1.147,3.2,ZE DRA
+4.912,-0.471,3.2,PH SGR
+1.265,0.121,3.2,PI3 ORI
+1.333,-0.390,3.2,EP LEP
+3.851,-1.134,3.2,AL CIR
+4.440,0.164,3.2,KA OPH
+5.554,0.528,3.2,ZE CYG
+4.668,-0.647,3.2,_
+6.193,1.355,3.2,GA CEP
+4.020,-0.709,3.2,DE LUP
+5.285,-0.014,3.2,TH AQL
+5.623,1.232,3.2,BE CEP
+0.992,-1.296,3.2,GA HYI
+4.269,-0.082,3.2,EP OPH
+4.970,0.571,3.2,GA LYR
+1.960,-0.756,3.2,SI PUP
+4.805,-0.051,3.3,ET SER
+0.172,0.539,3.3,DE AND
+1.196,-0.961,3.3,AL DOR
+1.781,-1.081,3.3,AL PIC
+3.693,-0.466,3.3,PI HYA
+4.547,-0.436,3.3,TH OPH
+5.998,-0.276,3.3,DE AQR
+1.636,0.393,3.3,ET GEM
+3.945,-0.441,3.3,SI LIB
+4.036,1.029,3.3,JO DRA
+0.288,-0.815,3.3,BE PHE
+1.365,-0.283,3.3,MY LEP
+3.209,0.995,3.3,DE UMA
+2.678,-1.222,3.3,OM CAR
+2.758,-1.077,3.3,_
+5.004,-0.483,3.3,TA SGR
+4.504,-0.755,3.3,ET SCO
+2.048,-0.434,3.3,XI PUP
+2.942,0.269,3.3,TH LEO
+4.561,-0.984,3.3,GA ARA
+4.708,-0.171,3.3,NY OPH
+1.110,-1.090,3.4,AL RET
+5.807,1.016,3.4,ZE CEP
+1.416,-0.042,3.4,ET ORI
+1.768,0.225,3.4,XI GEM
+2.226,1.060,3.4,OK UMA
+5.085,0.054,3.4,DE AQL
+3.555,-0.010,3.4,ZE VIR
+4.026,-0.780,3.4,EP LUP
+0.499,1.111,3.4,EP CAS
+2.298,0.112,3.4,EP HYA
+3.384,0.059,3.4,DE VIR
+0.808,0.678,3.4,RH PER
+1.172,0.277,3.4,TH2 TAU
+2.693,-1.070,3.4,_
+5.940,0.189,3.4,ZE PEG
+0.386,-0.756,3.4,GA PHE
+0.493,0.516,3.4,AL TRI
+3.619,-0.728,3.4,NY CEN
+3.981,-0.909,3.4,ZE LUP
+4.189,-0.670,3.4,ET LUP
+0.778,-0.703,3.4,TH1 ERI
+4.653,0.484,3.4,MY HER
+5.432,-1.155,3.4,BE PAV
+5.434,1.079,3.4,ET CEP
+0.214,1.009,3.4,ET CAS
+2.404,-1.029,3.4,_
+2.691,0.409,3.4,ZE LEO
+5.001,-0.085,3.4,LA AQL
+0.299,-0.178,3.5,ET CET
+2.693,0.749,3.5,LA UMA
+4.931,0.582,3.5,BE LYR
+0.713,0.056,3.5,GA CET
+1.050,0.218,3.5,LA TAU
+1.840,-0.488,3.5,SI CMA
+2.080,-0.925,3.5,CH CAR
+3.995,0.581,3.5,DE BOO
+5.231,0.340,3.5,GA SGE
+2.960,0.578,3.5,NY UMA
+4.514,0.251,3.5,AL1 HER
+5.978,0.429,3.5,MY PEG
+5.971,-0.896,3.5,EP GRU
+0.454,-0.278,3.5,TA CET
+3.935,0.705,3.5,BE BOO
+4.830,-0.802,3.5,AL TEL
+4.964,-0.368,3.5,XI2 SGR
+2.166,0.160,3.5,BE CNC
+2.536,0.173,3.5,OK LEO
+2.650,0.293,3.5,ET LEO
+5.976,1.155,3.5,JO CEP
+1.172,0.335,3.5,EP TAU
+1.920,0.384,3.5,DE GEM
+4.143,-0.060,3.5,MY SER
+4.376,0.679,3.5,ET HER
+5.804,0.108,3.5,TH PEG
+0.974,-0.170,3.5,DE ERI
+2.604,-0.952,3.5,PH VEL
+3.024,-0.556,3.5,XI HYA
+4.615,-0.269,3.5,XI SER
+1.514,-0.259,3.5,ZE LEP
+3.750,-0.804,3.5,JO LUP
+0.085,-0.154,3.6,JO CET
+0.596,-0.899,3.6,PH ERI
+1.125,-0.590,3.6,YP4 ERI
+2.964,-0.258,3.6,DE CRT
+4.022,-0.633,3.6,PH1 LUP
+5.274,-1.155,3.6,DE PAV
+0.428,0.849,3.6,51 AND
+2.027,0.426,3.6,KA GEM
+4.417,-0.664,3.6,MY2 SCO
+4.804,1.269,3.6,CH DRA
+5.315,-0.219,3.6,AL2 CAP
+1.912,0.289,3.6,LA GEM
+3.804,0.530,3.6,RH BOO
+4.089,-0.491,3.6,YP LIB
+3.235,-1.054,3.6,EP CRU
+0.367,-0.143,3.6,TH CET
+0.894,0.158,3.6,OK TAU
+1.386,-0.119,3.6,TA ORI
+1.503,-0.392,3.6,GA LEP
+1.801,0.593,3.6,TH GEM
+2.372,0.823,3.6,KA UMA
+2.490,-0.706,3.6,PS VEL
+2.030,-0.663,3.6,_
+2.664,-0.216,3.6,LA HYA
+3.101,0.031,3.6,BE VIR
+0.399,0.268,3.6,ET PSC
+2.270,-0.924,3.6,OK VEL
+3.413,-1.249,3.6,DE MUS
+4.427,-0.739,3.6,ZE2 SCO
+4.586,-1.059,3.6,DE ARA
+4.650,-1.130,3.6,ET PAV
+6.030,0.739,3.6,OK AND
+0.742,0.476,3.6,41 ARI
+1.000,0.420,3.6,27 TAU
+5.400,0.255,3.6,BE DEL
+3.079,-1.165,3.6,LA MUS
+1.134,0.273,3.6,GA TAU
+3.323,-0.025,3.6,GA VIR
+3.684,1.124,3.6,AL DRA
+5.475,-1.020,3.6,BE IND
\ No newline at end of file
diff --git a/apps/planetarium/planetarium.js b/apps/planetarium/planetarium.js
deleted file mode 100644
index da436b104..000000000
--- a/apps/planetarium/planetarium.js
+++ /dev/null
@@ -1,167 +0,0 @@
-var counter;
-var counterInterval;
-
-var settings;
-
-var work=false; //true if training false if resting
-var prep=true; //true if we are in prep phase (at the beginning of the session
-var setNum;
-
-var paused;
-
-function endPart() {
-  g.clear();
-  if (prep){
-    prep=false;
-    work = true;
-    counter = settings.workseg+settings.workmin*60;
-    startCounter();
-  }else if (work){
-    work = false;
-    counter = settings.restseg+settings.restmin*60;
-    startCounter();
-  }
-  else{
-    if (setNum>1)
-    {
-      setNum--;
-      work = true;
-      counter = settings.workseg+settings.workmin*60;
-      startCounter();
-    }
-    else
-    {
-       //End session
-      setWatch(showMenu, BTN2);
-      E.showMessage("Press BTN2 for\ngoing back\nto the menu","Well done!");
-    }
-  }
-}
-
-function printCounter(counter){
-  g.setFontAlign(0,0); // center font
-  g.setFont("Vector",80); // vector font, 80px  
-  // draw the current counter value
-  let minutes = Math.floor(counter/60);
-  let segs = counter % 60;
-  let textMinutes = minutes.toString().padStart(2, "0");
-  let textSegs = segs.toString().padStart(2,"0");
-  g.clearRect(0,80,239,160);
-  g.setFont("Vector",30);
-  if (prep)
-    g.setColor(125,125,0);
-  else if (work)
-    g.setColor(255,0,0);
-  else
-    g.setColor(0,255,0);
-  g.drawString(setNum,120,50);
-  if (prep)
-    g.drawString("PREPARATION",120,190);
-  else if (work)
-    g.drawString("WORK",120,190);
-  else
-    g.drawString("REST",120,190);
-  g.setFont("Vector",10);
-  g.drawString("Touch to pause",120,215);
-  g.setFont("Vector",80); 
-  g.drawString(textMinutes+":"+textSegs,120,120);
-}
-
-function signal_to_user(le){
-  if (settings.buzz)
-    Bangle.buzz(le);
-  else
-    Bangle.beep(le,4000);
-}
-
-function countDown() {
-  counter--;
-  if (counter<4 && counter>0)
-    signal_to_user(200);
-  if (counter==0)
-    signal_to_user(600);
-
-  if (counter<0) {
-    clearInterval(counterInterval);
-    counterInterval = undefined;
-    endPart();
-  }
-  else
-  {
-    printCounter(counter);
-  }
-  g.flip();
-}
-
-function startCounter(){
-  if (!counterInterval)
-    counterInterval = setInterval(countDown, 1000);
-}
-
-function pause()
-{
-  if (!paused)
-  {
-    clearInterval(counterInterval);
-    counterInterval = undefined;
-    setWatch(resume,BTN4);
-    setWatch(resume,BTN5);
-    paused=true;
-    g.clear();
-    g.setFont("Vector",60);
-    g.drawString("PAUSED",120,120);
-    g.setFont("Vector",20);
-    g.drawString("Touch to continue",120,180);
-  }
-}
-
-function resume(){
-  if (paused)
-  {
-    g.clear();
-    counterInterval = setInterval(countDown, 1000);
-    setWatch(pause,BTN4);
-    setWatch(pause,BTN5);
-    paused=false;
-  }
-}
-
-function startSession() {
-  E.showMenu();
-  paused=false;
-  setWatch(pause,BTN4);
-  setWatch(pause,BTN5);
-  require('Storage').write('intervals.settings.json',settings);
-  setNum = settings.sets;
-  counter = 5;//prep time
-  prep=true;
-  work=false;
-  startCounter();
-}
-
-function showMenu()
-{
-  settings = require('Storage').readJSON('intervals.settings.json',1)||
-      { sets:1,workseg:10,workmin:0,restseg:5,restmin:0,buzz:true};
-
-  var mainmenu = {
-  "" : { "title" : "-- Main Menu --" },
-  "START" : function() { startSession(); },
-  "Sets" : { value : settings.sets,min:0,max:20,step:1,onchange : v => { settings.sets=v; } },
-  "Work minutes" : { value : settings.workmin,min:0,max:59,step:1,onchange : v => { settings.workmin=v; } },
-  "Work seconds" : { value : settings.workseg,min:0,max:59,step:5,onchange : v => { settings.workseg=v; } },
-  "Rest minutes" : { value : settings.restmin,min:0,max:59,step:1,onchange : v => { settings.restmin=v; } },
-  "Rest seconds" : { value : settings.restseg,min:0,max:59,step:5,onchange : v => { settings.restseg=v; } },
-  "Signal type" :  { value : settings.buzz,format : v => v?"Buzz":"Beep",onchange : v => { settings.buzz=v; }}
-  };
-  
-  E.showMenu(mainmenu);
-}
-
-showMenu();
-
-
-
-
-
-
diff --git a/apps/planetarium/planetarium.png b/apps/planetarium/planetarium.png
index f6ca9ff41f50a570bb66426bc4e93bdc73a4aba0..c40606009a0d707283ec458dc4e249b0f681e8b6 100644
GIT binary patch
delta 1888
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
aaQ_7&NMd1)n4a|j0000<MNUMnLSTX@3#8!y

delta 2906
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
Ef+FgL(*OVf


From 6b407f10b934bb495ca7886eeeb521f1ae163791 Mon Sep 17 00:00:00 2001
From: Pablo Gonzalez <pglez82@gmail.com>
Date: Thu, 28 Jan 2021 18:19:17 +0100
Subject: [PATCH 03/14] planetarium

---
 apps/planetarium/planetarium.app.js | 191 ++++++++++++++++------------
 1 file changed, 110 insertions(+), 81 deletions(-)

diff --git a/apps/planetarium/planetarium.app.js b/apps/planetarium/planetarium.app.js
index 3f4c00297..f24e5d7c2 100644
--- a/apps/planetarium/planetarium.app.js
+++ b/apps/planetarium/planetarium.app.js
@@ -49,93 +49,122 @@ function binary_search(a, value) {
     return null;
 }
 
-var longitudeSign = 1; //1 for west and -1 for east;
-var longitudeDegrees = 5;
-var longitudeMinutes = 37;
-var longitudeSeconds = 27.4;
-var longitude = toRadians(longitudeSign * (longitudeDegrees + longitudeMinutes / 60 + longitudeSeconds / 3600));
-var latitudeSign = 1; //1 for north -1 for south;
-var latitudeDegrees = 43;
-var latitudeMinutes = 25;
-var latitudeSeconds = 0.9;
-var latitude = toRadians(latitudeSign * (latitudeDegrees + latitudeMinutes / 60 + latitudeSeconds / 3600));
-var year = 2020;
-var month = 1;
-var day = 27;
-var hours = 22;
-var minutes = 0;
-var seconds = 0;
-var timeZone = 1;
-var julianDay = toJulianDay(year, month, day, hours - timeZone, minutes, seconds);
-var size = 240;
+function drawStars(lat,lon,date){
+  var longitude = toRadians(-lon);
+  var latitude = toRadians(lat);
+  
+  
+  
 
-storage = require('Storage');
-f=storage.read("planetarium.data.csv","r");
-linestart=0;
-g.clearRect(0, 0, 240, 240);
+  var julianDay = toJulianDay(date.getFullYear(), date.getMonth()+1,date.getDate(),
+                              date.getHours() + date.getTimezoneOffset() / 60,
+                              date.getMinutes(), date.getSeconds());
+  var size = 240;
 
-//Common calculations based only on time
-var t = (julianDay - 2451545.0) / 36525;
-var zeta = toRadians((2306.2181 * t + 0.30188 * t * t + 0.017998 * t * t * t) / 3600);
-var theta = toRadians((2004.3109 * t - 0.42665 * t * t - 0.041833 * t * t * t) / 3600);
-var z = toRadians((2306.2181 * t + 1.09468 * t * t + 0.018203 * t * t * t) / 3600);
+  storage = require('Storage');
+  f=storage.read("planetarium.csv","r");
+  linestart=0;
+  g.clear();
+
+  //Common calculations based only on time
+  var t = (julianDay - 2451545.0) / 36525;
+  var zeta = toRadians((2306.2181 * t + 0.30188 * t * t + 0.017998 * t * t * t) / 3600);
+  var theta = toRadians((2004.3109 * t - 0.42665 * t * t - 0.041833 * t * t * t) / 3600);
+  var z = toRadians((2306.2181 * t + 1.09468 * t * t + 0.018203 * t * t * t) / 3600);
 
 
-let starNumber = 0;
-//Each star has a number (the position on the file (line number)). These are the lines
-//joining each star in the constellations.
-constelation_lines=[/*Orion*/[7,68],[10,53],[53,56],[28,68],/*Taurus*/[13,172],[13,340],[293,340],[29,293],
-                    /*canis menor*/[155,8]];
-var starPositions = {};
+  let starNumber = 0;
+  //Each star has a number (the position on the file (line number)). These are the lines
+  //joining each star in the constellations.
+  constelation_lines=[/*Orion*/[7,68],[10,53],[53,56],[28,68],/*Taurus*/[13,172],[13,340],[293,340],[29,293],
+                      /*canis menor*/[155,8]];
+  var starPositions = {};
 
-for (i=0;i<f.length;i++)
-{
-  if (f[i]=='\n'){
-    var start = new Date().getTime();
-    starNumber++;
-    //console.log("Line from "+linestart.toString()+"to "+(i-1).toString());
-    line = f.substr(linestart,i-linestart);
-    //console.log(line);
-    linestart = i+1;
-    //Process the star
-    starInfo = line.split(',');
-    //console.log(starInfo[0]);
-    starRA = parseFloat(starInfo[0]);
-    starDE = parseFloat(starInfo[1]);
-    starMag = parseFloat(starInfo[2]);
-    //var start = new Date().getTime();
-    var dec = Math.asin(Math.sin(theta) * Math.cos(starDE) * Math.cos(starRA + zeta) + Math.cos(theta) * Math.sin(starDE));
-    var ascen = Math.atan2(Math.cos(starDE) * Math.sin(starRA + zeta), Math.cos(theta) * Math.cos(starDE) * Math.cos(starRA + zeta) - Math.sin(theta) * Math.sin(starDE)) + z;
-    var H = siderealTime(julianDay) - longitude - ascen;
-    //var end = new Date().getTime();
-    //console.log("Call to doSomething took " + (end - start) + " milliseconds.");
-    //Compute altitude
-    var alt = Math.asin(Math.sin(latitude) * Math.sin(dec) + Math.cos(latitude) * Math.cos(dec) * Math.cos(H));
-    if(alt >= 0)
-    {
-      //Compute azimuth  
-      var azi = Math.atan2(Math.sin(H), Math.cos(H) * Math.sin(latitude) - Math.tan(dec) * Math.cos(latitude));
-      var x = size / 2 + size / 2 * Math.cos(alt) * Math.sin(azi);
-      var y = size / 2 + size / 2 * Math.cos(alt) * Math.cos(azi);
-      starPositions[starNumber] = [x,y];
-      var magnitude = starMag<1.5?2:1;
-      g.fillCircle(x, y, magnitude);
-      if (starMag<1)
-        g.drawString(starInfo[3],x,y+2);
-      g.flip();
-      
+  for (i=0;i<f.length;i++)
+  {
+    if (f[i]=='\n'){
+      var start = new Date().getTime();
+      starNumber++;
+      //console.log("Line from "+linestart.toString()+"to "+(i-1).toString());
+      line = f.substr(linestart,i-linestart);
+      //console.log(line);
+      linestart = i+1;
+      //Process the star
+      starInfo = line.split(',');
+      //console.log(starInfo[0]);
+      starRA = parseFloat(starInfo[0]);
+      starDE = parseFloat(starInfo[1]);
+      starMag = parseFloat(starInfo[2]);
+      //var start = new Date().getTime();
+      var dec = Math.asin(Math.sin(theta) * Math.cos(starDE) * Math.cos(starRA + zeta) + Math.cos(theta) * Math.sin(starDE));
+      var ascen = Math.atan2(Math.cos(starDE) * Math.sin(starRA + zeta), Math.cos(theta) * Math.cos(starDE) * Math.cos(starRA + zeta) - Math.sin(theta) * Math.sin(starDE)) + z;
+      var H = siderealTime(julianDay) - longitude - ascen;
+      //var end = new Date().getTime();
+      //console.log("Call to doSomething took " + (end - start) + " milliseconds.");
+      //Compute altitude
+      var alt = Math.asin(Math.sin(latitude) * Math.sin(dec) + Math.cos(latitude) * Math.cos(dec) * Math.cos(H));
+      if(alt >= 0)
+      {
+        //Compute azimuth  
+        var azi = Math.atan2(Math.sin(H), Math.cos(H) * Math.sin(latitude) - Math.tan(dec) * Math.cos(latitude));
+        var x = size / 2 + size / 2 * Math.cos(alt) * Math.sin(azi);
+        var y = size / 2 + size / 2 * Math.cos(alt) * Math.cos(azi);
+        starPositions[starNumber] = [x,y];
+        var magnitude = starMag<1.5?2:1;
+        g.fillCircle(x, y, magnitude);
+        if (starMag<1)
+          g.drawString(starInfo[3],x,y+2);
+        g.flip();
+
+      }
     }
   }
+
+  for (i=0;i<constelation_lines.length;i++)
+  {
+    constelation = constelation_lines[i];
+    positionStar1=starPositions[constelation[0]];
+    positionStar2=starPositions[constelation[1]];
+    //Both stars need to be visible
+    g.setColor(0,255,0);
+    if (positionStar1 && positionStar2)
+      g.drawLine(positionStar1[0],positionStar1[1],positionStar2[0],positionStar2[1]);
+    g.flip();
+  }
 }
 
-for (i=0;i<constelation_lines.length;i++)
-{
-  constelation = constelation_lines[i];
-  positionStar1=starPositions[constelation[0]];
-  positionStar2=starPositions[constelation[1]];
-  //Both stars need to be visible
-  g.setColor(0,255,0);
-  if (positionStar1 && positionStar2)
-    g.drawLine(positionStar1[0],positionStar1[1],positionStar2[0],positionStar2[1]);
-  g.flip();
-}
\ No newline at end of file
+Bangle.setGPSPower(1);
+
+var gps = { fix : 0};
+var gpsCount = 0;
+var prevSats = 0;
+g.clear();
+
+
+
+g.setFontAlign(0,0);
+
+Bangle.on('GPS',function(gp) {
+  date = new Date();
+  gps = gp;
+  gpsCount++;
+  if (gp.fix) {
+    lat = gp.lat;
+    lon = gp.lon;
+    Bangle.setGPSPower(0);
+    drawStars(lat,lon,date);
+  } else {
+    g.setFont("Vector",20); 
+    g.drawString("Waiting for position",120,120);
+    g.setFont("Vector",15); 
+    if (gp.satellites>prevSats || prevSats===0){
+      prevSats = gp.satellites;
+      g.clearRect(0,150,240,180);
+      g.drawString("Got "+gp.satellites+" satellites",120,160);
+    }
+    g.clearRect(0,180,240,220);
+    g.drawString("GMT:"+(date.getHours()+date.getTimezoneOffset() / 60)+":"+date.getMinutes()+":"+date.getSeconds(),120,200);
+    g.drawString(date.getDate()+'/'+date.getMonth()+1+"/"+date.getFullYear(),120,215);
+    g.flip();
+  }
+});
\ No newline at end of file

From 19fac8a36f83c0ee873996d9f1cb3adc2e2288aa Mon Sep 17 00:00:00 2001
From: Pablo Gonzalez <pglez82@gmail.com>
Date: Thu, 28 Jan 2021 18:23:49 +0100
Subject: [PATCH 04/14] planetarium

---
 apps.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps.json b/apps.json
index f4546d95f..ca773b529 100644
--- a/apps.json
+++ b/apps.json
@@ -2677,10 +2677,10 @@
 ,
 { "id": "planetarium",
   "name": "Planetarium",
-  "shortName":"planetarium",
+  "shortName":"Planetarium",
   "icon": "planetarium.png",
   "version":"0.01",
-  "description": "Planetarium.",
+  "description": "Planetarium showing up to 350 stars using the watch location and time",
   "tags": "",
   "storage": [
     {"name":"planetarium.app.js","url":"planetarium.app.js"},

From d052f3d6652ac586ba33939230848ae20520b004 Mon Sep 17 00:00:00 2001
From: Pablo Gonzalez <pglez82@gmail.com>
Date: Thu, 28 Jan 2021 18:37:33 +0100
Subject: [PATCH 05/14] fixing a bug with file name

---
 apps/planetarium/planetarium.app.js | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/apps/planetarium/planetarium.app.js b/apps/planetarium/planetarium.app.js
index f24e5d7c2..11d1bbde3 100644
--- a/apps/planetarium/planetarium.app.js
+++ b/apps/planetarium/planetarium.app.js
@@ -83,7 +83,6 @@ function drawStars(lat,lon,date){
   for (i=0;i<f.length;i++)
   {
     if (f[i]=='\n'){
-      var start = new Date().getTime();
       starNumber++;
       //console.log("Line from "+linestart.toString()+"to "+(i-1).toString());
       line = f.substr(linestart,i-linestart);
@@ -99,8 +98,6 @@ function drawStars(lat,lon,date){
       var dec = Math.asin(Math.sin(theta) * Math.cos(starDE) * Math.cos(starRA + zeta) + Math.cos(theta) * Math.sin(starDE));
       var ascen = Math.atan2(Math.cos(starDE) * Math.sin(starRA + zeta), Math.cos(theta) * Math.cos(starDE) * Math.cos(starRA + zeta) - Math.sin(theta) * Math.sin(starDE)) + z;
       var H = siderealTime(julianDay) - longitude - ascen;
-      //var end = new Date().getTime();
-      //console.log("Call to doSomething took " + (end - start) + " milliseconds.");
       //Compute altitude
       var alt = Math.asin(Math.sin(latitude) * Math.sin(dec) + Math.cos(latitude) * Math.cos(dec) * Math.cos(H));
       if(alt >= 0)
@@ -136,7 +133,6 @@ function drawStars(lat,lon,date){
 Bangle.setGPSPower(1);
 
 var gps = { fix : 0};
-var gpsCount = 0;
 var prevSats = 0;
 g.clear();
 
@@ -147,7 +143,6 @@ g.setFontAlign(0,0);
 Bangle.on('GPS',function(gp) {
   date = new Date();
   gps = gp;
-  gpsCount++;
   if (gp.fix) {
     lat = gp.lat;
     lon = gp.lon;

From 3f15f8eb5ef6c0196e5779fc4d39f5e9741ff16b Mon Sep 17 00:00:00 2001
From: Pablo Gonzalez <pglez82@gmail.com>
Date: Thu, 28 Jan 2021 18:47:59 +0100
Subject: [PATCH 06/14] updating readme

---
 apps/planetarium/README.md          | 12 +++++++++++-
 apps/planetarium/planetarium.app.js |  2 +-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/apps/planetarium/README.md b/apps/planetarium/README.md
index 2e07794e9..ff2178888 100644
--- a/apps/planetarium/README.md
+++ b/apps/planetarium/README.md
@@ -1 +1,11 @@
-# Planetarium
\ No newline at end of file
+# Planetarium
+
+This planetarium takes your position and time and plots the sky as it is.
+
+No planets, or moon, only stars. It can show the 350 most brilliant stars in the sky. 
+
+Plan is to show also constellations, but this is work in progress. Now it shows Taurus and Orion as examples.
+
+I think code is quite optimized already. It runs as fast as I could make it run. If someone has some ideas to speed it up, I could plot more stars.
+
+Basic equations to compute declination and right ascension for stars where taken from this [github repo](https://github.com/Michi83/planetarium).
\ No newline at end of file
diff --git a/apps/planetarium/planetarium.app.js b/apps/planetarium/planetarium.app.js
index 11d1bbde3..1fc2615a7 100644
--- a/apps/planetarium/planetarium.app.js
+++ b/apps/planetarium/planetarium.app.js
@@ -62,7 +62,7 @@ function drawStars(lat,lon,date){
   var size = 240;
 
   storage = require('Storage');
-  f=storage.read("planetarium.csv","r");
+  f=storage.read("planetarium.data.csv","r");
   linestart=0;
   g.clear();
 

From 033819e0966fcdcb14fbdef4c961ac93e596782c Mon Sep 17 00:00:00 2001
From: Pablo Gonzalez <pglez82@gmail.com>
Date: Thu, 28 Jan 2021 20:05:25 +0100
Subject: [PATCH 07/14] adding settings

---
 apps.json                    |  4 ++++
 apps/planetarium/settings.js | 21 +++++++++++++++++++++
 2 files changed, 25 insertions(+)
 create mode 100644 apps/planetarium/settings.js

diff --git a/apps.json b/apps.json
index ca773b529..4e6f83c9c 100644
--- a/apps.json
+++ b/apps.json
@@ -2685,7 +2685,11 @@
   "storage": [
     {"name":"planetarium.app.js","url":"planetarium.app.js"},
     {"name":"planetarium.data.csv","url":"planetarium.data.csv"},
+    {"name":"planetarium.settings.js","url":"settings.js"},
     {"name":"planetarium.img","url":"planetarium-icon.js","evaluate":true}
+  ],
+  "data":[
+    {"name":"planetarium.json"}
   ]
 }
 ]
diff --git a/apps/planetarium/settings.js b/apps/planetarium/settings.js
new file mode 100644
index 000000000..a586de296
--- /dev/null
+++ b/apps/planetarium/settings.js
@@ -0,0 +1,21 @@
+// make sure to enclose the function in parentheses
+(function(back) {
+    let settings = require('Storage').readJSON('planetarium.json',1)||{};
+    function save(key, value) {
+      settings[key] = value;
+      require('Storage').write('planetarium.json',settings);
+    }
+    const appMenu = {
+      '': {'title': 'Planetarium Settings'},
+      '< Back': back,
+      'Show star names': {
+        value: settings.showstarnames||false,
+        onchange: (m) => {save('showstarnames', m)}
+      },
+      'Show constellations': {
+        value: settings.showcons||true,
+        onchange: (m) => {save('showcons', m)}
+      }      
+    };
+    E.showMenu(appMenu)
+  })
\ No newline at end of file

From 5a91bc5611f7680c21e6c15468796308efc6e3a1 Mon Sep 17 00:00:00 2001
From: Pablo Gonzalez <pglez82@gmail.com>
Date: Thu, 28 Jan 2021 20:32:12 +0100
Subject: [PATCH 08/14] adding settings

---
 apps/intervals/intervals.app.js     | 302 ++++++++++++++--------------
 apps/planetarium/planetarium.app.js |  44 ++--
 apps/planetarium/settings.js        |  20 +-
 3 files changed, 172 insertions(+), 194 deletions(-)

diff --git a/apps/intervals/intervals.app.js b/apps/intervals/intervals.app.js
index a158ca967..da436b104 100644
--- a/apps/intervals/intervals.app.js
+++ b/apps/intervals/intervals.app.js
@@ -1,170 +1,164 @@
-/*
- * Degrees to radians
- */
-function toRadians(degrees)
-{
-    return Math.PI * degrees / 180;
-}
+var counter;
+var counterInterval;
 
-/*
- * Julian day number
- * Assumes a proleptic gregorian calendar where the year 1 is preceded by the
- * year 0.
- */
-function toJulianDay(year, month, day, hours, minutes, seconds)
-{
-    day += hours / 24 + minutes / 1440 + seconds / 86400;
-    
-    if(month <= 2)
-    {
-        year -= 1;
-        month += 12;
-    }
-    
-    var A = Math.floor(year / 100);
-    var B = 2 - A + Math.floor(A / 4);
-    return Math.floor(365.25 * (year + 4716)) + Math.floor(30.6001 * (month + 1)) + day + B - 1524.5;
-}
+var settings;
 
-/*
- * Sidereal time in Greenwich
- */
-function siderealTime(julianDay)
-{
-    var T = (julianDay - 2451545.0) / 36525;
-    return toRadians(280.46061837 + 360.98564736629 * (julianDay - 2451545.0) + 0.000387933 * T * T - T * T * T / 38710000);
-}
+var work=false; //true if training false if resting
+var prep=true; //true if we are in prep phase (at the beginning of the session
+var setNum;
 
-function binary_search(a, value) {
-    var lo = 0, hi = a.length - 1, mid;
-    while (lo <= hi) {
-        mid = Math.floor((lo+hi)/2);
-        if (a[mid] > value)
-            hi = mid - 1;
-        else if (a[mid] < value)
-            lo = mid + 1;
-        else
-            return mid;
-    }
-    return null;
-}
+var paused;
 
-function drawStars(lat,lon){
-  var longitude = toRadians(-lon);
-  var latitude = toRadians(lat);
-  
-  date = new Date();
-
-  var julianDay = toJulianDay(date.getFullYear(), date.getMonth()+1,date.getDate(),
-                              date.getHours() + date.getTimezoneOffset() / 60,
-                              date.getMinutes(), date.getSeconds());
-  var size = 240;
-
-  storage = require('Storage');
-  f=storage.read("planetarium.csv","r");
-  linestart=0;
+function endPart() {
   g.clear();
-
-  //Common calculations based only on time
-  var t = (julianDay - 2451545.0) / 36525;
-  var zeta = toRadians((2306.2181 * t + 0.30188 * t * t + 0.017998 * t * t * t) / 3600);
-  var theta = toRadians((2004.3109 * t - 0.42665 * t * t - 0.041833 * t * t * t) / 3600);
-  var z = toRadians((2306.2181 * t + 1.09468 * t * t + 0.018203 * t * t * t) / 3600);
-
-
-  let starNumber = 0;
-  //Each star has a number (the position on the file (line number)). These are the lines
-  //joining each star in the constellations.
-  constelation_lines=[/*Orion*/[7,68],[10,53],[53,56],[28,68],/*Taurus*/[13,172],[13,340],[293,340],[29,293],
-                      /*canis menor*/[155,8]];
-  var starPositions = {};
-
-  for (i=0;i<f.length;i++)
-  {
-    if (f[i]=='\n'){
-      var start = new Date().getTime();
-      starNumber++;
-      //console.log("Line from "+linestart.toString()+"to "+(i-1).toString());
-      line = f.substr(linestart,i-linestart);
-      //console.log(line);
-      linestart = i+1;
-      //Process the star
-      starInfo = line.split(',');
-      //console.log(starInfo[0]);
-      starRA = parseFloat(starInfo[0]);
-      starDE = parseFloat(starInfo[1]);
-      starMag = parseFloat(starInfo[2]);
-      //var start = new Date().getTime();
-      var dec = Math.asin(Math.sin(theta) * Math.cos(starDE) * Math.cos(starRA + zeta) + Math.cos(theta) * Math.sin(starDE));
-      var ascen = Math.atan2(Math.cos(starDE) * Math.sin(starRA + zeta), Math.cos(theta) * Math.cos(starDE) * Math.cos(starRA + zeta) - Math.sin(theta) * Math.sin(starDE)) + z;
-      var H = siderealTime(julianDay) - longitude - ascen;
-      //var end = new Date().getTime();
-      //console.log("Call to doSomething took " + (end - start) + " milliseconds.");
-      //Compute altitude
-      var alt = Math.asin(Math.sin(latitude) * Math.sin(dec) + Math.cos(latitude) * Math.cos(dec) * Math.cos(H));
-      if(alt >= 0)
-      {
-        //Compute azimuth  
-        var azi = Math.atan2(Math.sin(H), Math.cos(H) * Math.sin(latitude) - Math.tan(dec) * Math.cos(latitude));
-        var x = size / 2 + size / 2 * Math.cos(alt) * Math.sin(azi);
-        var y = size / 2 + size / 2 * Math.cos(alt) * Math.cos(azi);
-        starPositions[starNumber] = [x,y];
-        var magnitude = starMag<1.5?2:1;
-        g.fillCircle(x, y, magnitude);
-        if (starMag<1)
-          g.drawString(starInfo[3],x,y+2);
-        g.flip();
-
-      }
-    }
+  if (prep){
+    prep=false;
+    work = true;
+    counter = settings.workseg+settings.workmin*60;
+    startCounter();
+  }else if (work){
+    work = false;
+    counter = settings.restseg+settings.restmin*60;
+    startCounter();
   }
-
-  for (i=0;i<constelation_lines.length;i++)
-  {
-    constelation = constelation_lines[i];
-    positionStar1=starPositions[constelation[0]];
-    positionStar2=starPositions[constelation[1]];
-    //Both stars need to be visible
-    g.setColor(0,255,0);
-    if (positionStar1 && positionStar2)
-      g.drawLine(positionStar1[0],positionStar1[1],positionStar2[0],positionStar2[1]);
-    g.flip();
+  else{
+    if (setNum>1)
+    {
+      setNum--;
+      work = true;
+      counter = settings.workseg+settings.workmin*60;
+      startCounter();
+    }
+    else
+    {
+       //End session
+      setWatch(showMenu, BTN2);
+      E.showMessage("Press BTN2 for\ngoing back\nto the menu","Well done!");
+    }
   }
 }
 
-Bangle.setGPSPower(1);
+function printCounter(counter){
+  g.setFontAlign(0,0); // center font
+  g.setFont("Vector",80); // vector font, 80px  
+  // draw the current counter value
+  let minutes = Math.floor(counter/60);
+  let segs = counter % 60;
+  let textMinutes = minutes.toString().padStart(2, "0");
+  let textSegs = segs.toString().padStart(2,"0");
+  g.clearRect(0,80,239,160);
+  g.setFont("Vector",30);
+  if (prep)
+    g.setColor(125,125,0);
+  else if (work)
+    g.setColor(255,0,0);
+  else
+    g.setColor(0,255,0);
+  g.drawString(setNum,120,50);
+  if (prep)
+    g.drawString("PREPARATION",120,190);
+  else if (work)
+    g.drawString("WORK",120,190);
+  else
+    g.drawString("REST",120,190);
+  g.setFont("Vector",10);
+  g.drawString("Touch to pause",120,215);
+  g.setFont("Vector",80); 
+  g.drawString(textMinutes+":"+textSegs,120,120);
+}
 
-var gps = { fix : 0};
-var gpsCount = 0;
-var prevSats = 0;
-g.clear();
+function signal_to_user(le){
+  if (settings.buzz)
+    Bangle.buzz(le);
+  else
+    Bangle.beep(le,4000);
+}
 
+function countDown() {
+  counter--;
+  if (counter<4 && counter>0)
+    signal_to_user(200);
+  if (counter==0)
+    signal_to_user(600);
 
-
-g.setFontAlign(0,0);
-
-Bangle.on('GPS',function(gp) {
-  gps = gp;
-  gpsCount++;
-  var msg;
-  if (gp.fix) {
-    lat = gp.lat;
-    lon = gp.lon;
-    Bangle.setGPSPower(0);
-    drawStars(lat,lon);
-  } else {
-    g.setFont("Vector",20); 
-    g.drawString("Waiting for position",120,120);
-    g.setFont("Vector",15); 
-    if (gp.satellites>prevSats || prevSats===0){
-      prevSats = gp.satellites;
-      g.clearRect(0,150,240,180);
-      g.drawString("Got "+gp.satellites+" satellites",120,160);
-    }
-    g.flip();
+  if (counter<0) {
+    clearInterval(counterInterval);
+    counterInterval = undefined;
+    endPart();
   }
-});
-
+  else
+  {
+    printCounter(counter);
+  }
+  g.flip();
+}
+
+function startCounter(){
+  if (!counterInterval)
+    counterInterval = setInterval(countDown, 1000);
+}
+
+function pause()
+{
+  if (!paused)
+  {
+    clearInterval(counterInterval);
+    counterInterval = undefined;
+    setWatch(resume,BTN4);
+    setWatch(resume,BTN5);
+    paused=true;
+    g.clear();
+    g.setFont("Vector",60);
+    g.drawString("PAUSED",120,120);
+    g.setFont("Vector",20);
+    g.drawString("Touch to continue",120,180);
+  }
+}
+
+function resume(){
+  if (paused)
+  {
+    g.clear();
+    counterInterval = setInterval(countDown, 1000);
+    setWatch(pause,BTN4);
+    setWatch(pause,BTN5);
+    paused=false;
+  }
+}
+
+function startSession() {
+  E.showMenu();
+  paused=false;
+  setWatch(pause,BTN4);
+  setWatch(pause,BTN5);
+  require('Storage').write('intervals.settings.json',settings);
+  setNum = settings.sets;
+  counter = 5;//prep time
+  prep=true;
+  work=false;
+  startCounter();
+}
+
+function showMenu()
+{
+  settings = require('Storage').readJSON('intervals.settings.json',1)||
+      { sets:1,workseg:10,workmin:0,restseg:5,restmin:0,buzz:true};
+
+  var mainmenu = {
+  "" : { "title" : "-- Main Menu --" },
+  "START" : function() { startSession(); },
+  "Sets" : { value : settings.sets,min:0,max:20,step:1,onchange : v => { settings.sets=v; } },
+  "Work minutes" : { value : settings.workmin,min:0,max:59,step:1,onchange : v => { settings.workmin=v; } },
+  "Work seconds" : { value : settings.workseg,min:0,max:59,step:5,onchange : v => { settings.workseg=v; } },
+  "Rest minutes" : { value : settings.restmin,min:0,max:59,step:1,onchange : v => { settings.restmin=v; } },
+  "Rest seconds" : { value : settings.restseg,min:0,max:59,step:5,onchange : v => { settings.restseg=v; } },
+  "Signal type" :  { value : settings.buzz,format : v => v?"Buzz":"Beep",onchange : v => { settings.buzz=v; }}
+  };
+  
+  E.showMenu(mainmenu);
+}
+
+showMenu();
 
 
 
diff --git a/apps/planetarium/planetarium.app.js b/apps/planetarium/planetarium.app.js
index 1fc2615a7..b3e82500d 100644
--- a/apps/planetarium/planetarium.app.js
+++ b/apps/planetarium/planetarium.app.js
@@ -35,26 +35,9 @@ function siderealTime(julianDay)
     return toRadians(280.46061837 + 360.98564736629 * (julianDay - 2451545.0) + 0.000387933 * T * T - T * T * T / 38710000);
 }
 
-function binary_search(a, value) {
-    var lo = 0, hi = a.length - 1, mid;
-    while (lo <= hi) {
-        mid = Math.floor((lo+hi)/2);
-        if (a[mid] > value)
-            hi = mid - 1;
-        else if (a[mid] < value)
-            lo = mid + 1;
-        else
-            return mid;
-    }
-    return null;
-}
-
 function drawStars(lat,lon,date){
   var longitude = toRadians(-lon);
   var latitude = toRadians(lat);
-  
-  
-  
 
   var julianDay = toJulianDay(date.getFullYear(), date.getMonth()+1,date.getDate(),
                               date.getHours() + date.getTimezoneOffset() / 60,
@@ -109,7 +92,7 @@ function drawStars(lat,lon,date){
         starPositions[starNumber] = [x,y];
         var magnitude = starMag<1.5?2:1;
         g.fillCircle(x, y, magnitude);
-        if (starMag<1)
+        if (starMag<1 && settings.starnames)
           g.drawString(starInfo[3],x,y+2);
         g.flip();
 
@@ -117,16 +100,18 @@ function drawStars(lat,lon,date){
     }
   }
 
-  for (i=0;i<constelation_lines.length;i++)
-  {
-    constelation = constelation_lines[i];
-    positionStar1=starPositions[constelation[0]];
-    positionStar2=starPositions[constelation[1]];
-    //Both stars need to be visible
-    g.setColor(0,255,0);
-    if (positionStar1 && positionStar2)
-      g.drawLine(positionStar1[0],positionStar1[1],positionStar2[0],positionStar2[1]);
-    g.flip();
+  if (settings.constellations){
+    for (i=0;i<constelation_lines.length;i++)
+    {
+      constelation = constelation_lines[i];
+      positionStar1=starPositions[constelation[0]];
+      positionStar2=starPositions[constelation[1]];
+      //Both stars need to be visible
+      g.setColor(0,255,0);
+      if (positionStar1 && positionStar2)
+        g.drawLine(positionStar1[0],positionStar1[1],positionStar2[0],positionStar2[1]);
+      g.flip();
+    }
   }
 }
 
@@ -136,7 +121,8 @@ var gps = { fix : 0};
 var prevSats = 0;
 g.clear();
 
-
+var settings = require('Storage').readJSON('planetarium.settings.json',1)||
+      { starnames:false,constellations:true};
 
 g.setFontAlign(0,0);
 
diff --git a/apps/planetarium/settings.js b/apps/planetarium/settings.js
index a586de296..0f716b33a 100644
--- a/apps/planetarium/settings.js
+++ b/apps/planetarium/settings.js
@@ -1,21 +1,19 @@
 // make sure to enclose the function in parentheses
 (function(back) {
     let settings = require('Storage').readJSON('planetarium.json',1)||{};
-    function save(key, value) {
-      settings[key] = value;
-      require('Storage').write('planetarium.json',settings);
-    }
     const appMenu = {
       '': {'title': 'Planetarium Settings'},
       '< Back': back,
-      'Show star names': {
-        value: settings.showstarnames||false,
-        onchange: (m) => {save('showstarnames', m)}
+      'Star names': {
+        value: !settings.starnames,
+        format: v => v ? 'Yes' : 'No',
+        onchange: v => require('Storage').write('planetarium.json', {starnames: !v}),
       },
-      'Show constellations': {
-        value: settings.showcons||true,
-        onchange: (m) => {save('showcons', m)}
-      }      
+      'Constellations': {
+        value: !settings.constellations,
+        format: v => v ? 'Yes' : 'No',
+        onchange: v => require('Storage').write('planetarium.json', {constellations: !v}),
+      }   
     };
     E.showMenu(appMenu)
   })
\ No newline at end of file

From f883fab51e839a5ca50561326fa12e58a2c4cf52 Mon Sep 17 00:00:00 2001
From: Pablo Gonzalez <pglez82@gmail.com>
Date: Thu, 28 Jan 2021 20:41:12 +0100
Subject: [PATCH 09/14] bug in settings. fixing

---
 apps/planetarium/settings.js | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/apps/planetarium/settings.js b/apps/planetarium/settings.js
index 0f716b33a..c82a7ca59 100644
--- a/apps/planetarium/settings.js
+++ b/apps/planetarium/settings.js
@@ -1,18 +1,22 @@
 // make sure to enclose the function in parentheses
 (function(back) {
     let settings = require('Storage').readJSON('planetarium.json',1)||{};
+    function save(key, value) {
+      settings[key] = value;
+      require('Storage').write('planetarium.json',settings);
+    }
     const appMenu = {
       '': {'title': 'Planetarium Settings'},
       '< Back': back,
       'Star names': {
-        value: !settings.starnames,
+        value: settings.starnames,
         format: v => v ? 'Yes' : 'No',
-        onchange: v => require('Storage').write('planetarium.json', {starnames: !v}),
+        onchange: (v) => {save('starnames', v)}
       },
       'Constellations': {
-        value: !settings.constellations,
+        value: settings.constellations,
         format: v => v ? 'Yes' : 'No',
-        onchange: v => require('Storage').write('planetarium.json', {constellations: !v}),
+        onchange: (v) => {save('constellations', v)}
       }   
     };
     E.showMenu(appMenu)

From d50380958812e64ef55ccccc21445d881dfb81da Mon Sep 17 00:00:00 2001
From: Pablo Gonzalez <pglez82@gmail.com>
Date: Thu, 28 Jan 2021 21:16:34 +0100
Subject: [PATCH 10/14] bug in settings. fixing

---
 apps/planetarium/settings.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/planetarium/settings.js b/apps/planetarium/settings.js
index c82a7ca59..34b14009c 100644
--- a/apps/planetarium/settings.js
+++ b/apps/planetarium/settings.js
@@ -11,12 +11,12 @@
       'Star names': {
         value: settings.starnames,
         format: v => v ? 'Yes' : 'No',
-        onchange: (v) => {save('starnames', v)}
+        onchange: (v) => {save('starnames', !settings.starnames)}
       },
       'Constellations': {
         value: settings.constellations,
         format: v => v ? 'Yes' : 'No',
-        onchange: (v) => {save('constellations', v)}
+        onchange: (v) => {save('constellations', !settings.constellations)}
       }   
     };
     E.showMenu(appMenu)

From 1ee1134a4047d34f4e897e84b246be5383ec3ce8 Mon Sep 17 00:00:00 2001
From: Pablo Gonzalez <pglez82@gmail.com>
Date: Thu, 28 Jan 2021 21:24:52 +0100
Subject: [PATCH 11/14] bug in settings. fixing

---
 apps/planetarium/settings.js | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/apps/planetarium/settings.js b/apps/planetarium/settings.js
index 34b14009c..0a3cd71bf 100644
--- a/apps/planetarium/settings.js
+++ b/apps/planetarium/settings.js
@@ -8,16 +8,8 @@
     const appMenu = {
       '': {'title': 'Planetarium Settings'},
       '< Back': back,
-      'Star names': {
-        value: settings.starnames,
-        format: v => v ? 'Yes' : 'No',
-        onchange: (v) => {save('starnames', !settings.starnames)}
-      },
-      'Constellations': {
-        value: settings.constellations,
-        format: v => v ? 'Yes' : 'No',
-        onchange: (v) => {save('constellations', !settings.constellations)}
-      }   
+      "Star names" :  { value : settings.starnames,format : v => v?"Show":"Hide",onchange : v => { save('starnames',v); }},
+      "Constellations" :  { value : settings.constellations,format : v => v?"Show":"Hide",onchange : v => { save('constellations',v); }},   
     };
     E.showMenu(appMenu)
   })
\ No newline at end of file

From 2061a85205e1f5ad05d9908f2e1c3f7e73d16302 Mon Sep 17 00:00:00 2001
From: Pablo Gonzalez <pglez82@gmail.com>
Date: Thu, 28 Jan 2021 21:32:51 +0100
Subject: [PATCH 12/14] bug in settings. fixing

---
 apps/planetarium/settings.js | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/apps/planetarium/settings.js b/apps/planetarium/settings.js
index 0a3cd71bf..21dd36f6b 100644
--- a/apps/planetarium/settings.js
+++ b/apps/planetarium/settings.js
@@ -8,8 +8,18 @@
     const appMenu = {
       '': {'title': 'Planetarium Settings'},
       '< Back': back,
-      "Star names" :  { value : settings.starnames,format : v => v?"Show":"Hide",onchange : v => { save('starnames',v); }},
-      "Constellations" :  { value : settings.constellations,format : v => v?"Show":"Hide",onchange : v => { save('constellations',v); }},   
-    };
+      'Star names': {
+        value: !!settings.starnames,
+        format: v =>v?'On':'Off',
+        onchange: v => {
+          save('starnames',v);
+        }},
+        'Constellations': {
+            value: !!settings.constellations,
+            format: v =>v?'On':'Off',
+            onchange: v => {
+              save('constellations',v);
+            }
+      }};
     E.showMenu(appMenu)
   })
\ No newline at end of file

From d0d1cbea2c79c80e3915154027c9f57695f28c20 Mon Sep 17 00:00:00 2001
From: Pablo Gonzalez <pglez82@gmail.com>
Date: Thu, 28 Jan 2021 21:43:34 +0100
Subject: [PATCH 13/14] bug in settings. fixing

---
 apps/planetarium/planetarium.app.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/planetarium/planetarium.app.js b/apps/planetarium/planetarium.app.js
index b3e82500d..104280631 100644
--- a/apps/planetarium/planetarium.app.js
+++ b/apps/planetarium/planetarium.app.js
@@ -121,7 +121,7 @@ var gps = { fix : 0};
 var prevSats = 0;
 g.clear();
 
-var settings = require('Storage').readJSON('planetarium.settings.json',1)||
+var settings = require('Storage').readJSON('planetarium.json',1)||
       { starnames:false,constellations:true};
 
 g.setFontAlign(0,0);

From fa0b2c7d0866a361d41215b51a617d64d6abd9dd Mon Sep 17 00:00:00 2001
From: Pablo Gonzalez <pglez82@gmail.com>
Date: Fri, 29 Jan 2021 11:05:21 +0100
Subject: [PATCH 14/14] adding a few more constellations

---
 apps/planetarium/planetarium-icon.js  |  2 +-
 apps/planetarium/planetarium.app.js   | 36 +++++++++++++++++----------
 apps/planetarium/planetarium.data.csv |  4 +--
 3 files changed, 26 insertions(+), 16 deletions(-)

diff --git a/apps/planetarium/planetarium-icon.js b/apps/planetarium/planetarium-icon.js
index 215c5aa38..b1644b98b 100644
--- a/apps/planetarium/planetarium-icon.js
+++ b/apps/planetarium/planetarium-icon.js
@@ -1 +1 @@
-require("heatshrink").decompress(atob("AEGIAAgVPhAWFAAOACyoYNCxQYMCxZjKFxgwKB42ClAwNFw+O9AwNH48u8RhMLpHu9xhMLg0ipwXBokiMQwXKCoIADC5JGHlwWDMI5ICC44wEVI4XCZxBfC8jzKBRAuCC66oIC4K9IwPuoUk90YYJAXIwVCSYR3HC5WBAgYvPCggAFDQoXGwhAIwVIC5cuBoohDeQoXGpwNFEIbDFC4uCaJL1BKQgXDiVEdQdCB4WCYIIACokhC4uEBgYABC4YJII4kuBgZhEBJAXEEwi3EBIhgDwEABwYuHGAoHDgAXDwIXJRwIXKHoaoGC4ZHDC4JgCC4MoUAIXF91CBgReDC4iwCkh3EwNCZwQXFPAgAPCwQXYYIYAOIwYwTCwgwRFwowRCwwwPFw4wPCxAwNFxIYMCxYYKCxpjICp4AQ"))
\ No newline at end of file
+require("heatshrink").decompress(atob("mEwwgkhiIAECp8BCwoABiAWVDBoWKDBgWLMZQuMGBQWNGBAuHjtBGBomHjvRGBhdI7vUMJgLGilE7vdohJHC5MUCoIADDAxGKpoWDJI5ICC44wESJS1IGAR4IJAQXgI4YXJXpAXBoJiBBhEQC5JzCigXTABgXeIBJODC5MdaA4hB6IXLpoNFEIbDFC4zRJboIXJojRC6lEBwdEegXdBIYXDZwIAEeY4ABNgQvEEgfdMIkdBIZTDC4gwELwouGC4MABoyQGHQSCEgAXHSAxSDC7pgDKQJiBL4xcBBIZeBC4cUNIUUC4oJGC4RIEAB4WCC7BgDABxGDGCYWEGCIuFGCIWGGB4uHGB4WIGBouJDBgWLDBQWNMZAVPACAA=="))
\ No newline at end of file
diff --git a/apps/planetarium/planetarium.app.js b/apps/planetarium/planetarium.app.js
index 104280631..bd36bf4b7 100644
--- a/apps/planetarium/planetarium.app.js
+++ b/apps/planetarium/planetarium.app.js
@@ -57,10 +57,6 @@ function drawStars(lat,lon,date){
 
 
   let starNumber = 0;
-  //Each star has a number (the position on the file (line number)). These are the lines
-  //joining each star in the constellations.
-  constelation_lines=[/*Orion*/[7,68],[10,53],[53,56],[28,68],/*Taurus*/[13,172],[13,340],[293,340],[29,293],
-                      /*canis menor*/[155,8]];
   var starPositions = {};
 
   for (i=0;i<f.length;i++)
@@ -101,16 +97,30 @@ function drawStars(lat,lon,date){
   }
 
   if (settings.constellations){
-    for (i=0;i<constelation_lines.length;i++)
+    //Each star has a number (the position on the file (line number)). These are the lines
+    //joining each star in the constellations.
+    constelations=[[[7,68],[10,53],[53,56],[28,68],"Orion"],[[13,172],[13,340],[293,340],[29,293],"Taurus"],
+                      [[155,8],"Canis Menor"],[[36,81],[87,81],[235,87],[33,235],[33,75],[75,40],"Ursa Major"],[[67,91],[74,67],[91,110],[110,252],"Cassiopeia"],[[23,166],[16,294],[294,44],[166,149],[230,149],[16,23],"Gemini"]];
+    g.setColor(0,255,0);
+    for (i=0;i<constelations.length;i++)
     {
-      constelation = constelation_lines[i];
-      positionStar1=starPositions[constelation[0]];
-      positionStar2=starPositions[constelation[1]];
-      //Both stars need to be visible
-      g.setColor(0,255,0);
-      if (positionStar1 && positionStar2)
-        g.drawLine(positionStar1[0],positionStar1[1],positionStar2[0],positionStar2[1]);
-      g.flip();
+      constelationShowing=false;
+      for (j=0;j<constelations[i].length-1;j++){
+        positionStar1=starPositions[constelations[i][j][0]];
+        positionStar2=starPositions[constelations[i][j][1]];
+        //Both stars need to be visible
+        if (positionStar1 && positionStar2)
+        {
+          g.drawLine(positionStar1[0],positionStar1[1],positionStar2[0],positionStar2[1]);
+          constelationShowing=true;
+        }
+        else
+          constelationShowing=false;
+        g.flip();
+      }
+      //Write the name
+      if (constelationShowing)
+        g.drawString(constelations[i][constelations[i].length-1],positionStar2[0]+10,positionStar2[1]);
     }
   }
 }
diff --git a/apps/planetarium/planetarium.data.csv b/apps/planetarium/planetarium.data.csv
index 2496ff8c4..7b178c767 100644
--- a/apps/planetarium/planetarium.data.csv
+++ b/apps/planetarium/planetarium.data.csv
@@ -13,14 +13,14 @@
 1.204,0.288,0.8,Aldebaran
 4.317,-0.461,1.0,AL SCO
 3.513,-0.195,1.0,AL VIR
-2.030,0.489,1.1,BE GEM
+2.030,0.489,1.1,Pollux
 6.011,-0.517,1.2,AL PSA
 3.350,-1.042,1.2,BE CRU
 5.417,0.790,1.2,Deneb
 3.838,-1.062,1.3,AL2 CEN
 2.655,0.209,1.4,AL LEO
 1.827,-0.506,1.5,EP CMA
-1.984,0.557,1.6,AL GEM
+1.984,0.557,1.6,Castor
 3.258,-1.101,1.6,AL1 CRU
 1.984,0.557,1.6,AL GEM
 3.278,-0.997,1.6,GA CRU