Return value 'percentLit' is a real between 0-1.

Author: CelliesProjects

MoonPhase.cpp

@@ -1,19 +1,23 @@
 #include "MoonPhase.h"
 
-MoonPhase::moonData MoonPhase::getInfo( const int year, const int month, const int day, const double hour)
+MoonPhase::moonData MoonPhase::getInfo( const int year, const int month, const int day, const double hour )
 {
+    /*
+      Calculates the phase of the moon at the given epoch.
+      returns the moon percentage that is lit as a real number (0-1)
+      */
   moonData returnValue;
   double j = _Julian(year, month, (double)day + hour / 24.0) - 2444238.5;
   double ls = _sun_position(j);
   double lm = _moon_position(j, ls);
   double t = lm - ls;
   if (t < 0) t += 360;
   returnValue.angle = t;
-  returnValue.percentLit = 100 * (1.0 - cos((lm - ls) * DEG_TO_RAD)) / 2;
+  returnValue.percentLit = (1.0 - cos((lm - ls) * DEG_TO_RAD)) / 2;
   return returnValue;
 }
 
-double MoonPhase::_Julian( int year, int month, double day)
+double MoonPhase::_Julian( int year, int month, double day )
 {
   int b, c, e;
   b = 0;

examples/esp32/ILI9341/ILI9341.ino

@@ -73,6 +73,7 @@ void setup()
   while ( !WiFi.isConnected() && millis() - timeout > 0 )
   {
     Serial.print( "." );
+    delay( 500 );
   }
   Serial.println();
   Serial.println( "Connected." );
@@ -115,19 +116,7 @@ void loop()
   tft.setCursor( 20, 120 );
   tft.printf( "%i%c %s UTC", moon.angle, char(247), asctime( &timeinfo ) );
   tft.setCursor( 120, 105 );
-  tft.printf( "%.4f%%", moon.percentLit );
-  
-
-    
-  ESP_LOGI( TAG, "%i",  moon.angle );
-  ESP_LOGI( TAG, "%04d/%02d/%02d %02d:%02d:%02d UTC - Moon is %.1f%% illuminated  (%d)",
-            1900 + timeinfo.tm_year,
-            timeinfo.tm_mon + 1,
-            timeinfo.tm_mday,
-            timeinfo.tm_hour,
-            timeinfo.tm_min,
-            timeinfo.tm_sec,
-            moon.percentLit );
+  tft.printf( "%.4f%%", moon.percentLit * 100 );
 
   delay( 1000 );
 }

examples/simple/simple.ino

@@ -2,8 +2,8 @@
 
 const int year = 2018;
 const int month = 4;
-const int day = 4;
-const float hour = 22.5; /* 22:30 */
+const int day = 12;
+const float hour = 2.55; /* 22:30 */
 
 MoonPhase MoonPhase; /* include a MoonPhase instance */
 
@@ -17,11 +17,10 @@ void setup() {
   moon = MoonPhase.getInfo( year, month, day, hour );
 
   Serial.print( "Moon phase angle: " );
-  Serial.print( moon.angle );
+  Serial.print( moon.angle );                       /* angle is a integer between 0-360  */
   Serial.println( " degrees." );
   Serial.print( "Moon surface lit: " );
-  Serial.print( moon.percentLit );
-  Serial.println( "%." );
+  Serial.printf( "%.0f%%", moon.percentLit * 100 ); /* percentLit is a real between 0-1  */
 }
 
 void loop() {