New IDE v1.6.8

Related to the development libraries, released by Curt Binder
troylong45
Posts: 203
Joined: Sat Oct 10, 2015 9:17 pm

Re: New IDE v1.6.8

Post by troylong45 »

ok its loaded but the menu is all there but the menu label options are not in a human language the options seem to work tho how do i fix the readout of the options
and wifi is no longer working
i go to local ip address and the away dns thing and i get

Code: Select all

HHTTTTPP//11..11  220000  OOKK


SSeerrvveerr::  RReeeeffAAnnggeell


CCaacchhee--CCoonnttrrooll::  nnoo--ssttoorree,,  nnoo--ccaacchhee,,  mmuusstt--rreevvaalliiddaattee


PPrraaggmmaa::  nnoo--ccaacchhee


AAcccceessss--CCoonnttrrooll--AAllllooww--OOrriiggiinn::  **


AAcccceessss--CCoonnttrrooll--AAllllooww--MMeetthhooddss::  GGEETT


CCoonnnneeccttiioonn::  cclloossee


CCoonntteenntt--TTyyppee::  tteexxtt//html


CCoonntteenntt--LLeennggtthh::  103

<<oobbjjeecctt  ttyyppee==tteexxtt//hhttmmll  ddaattaa==hhttttpp::////wwwwww..rreeeeffaannggeell..ccoomm//wwiiffii33//ccoonntteenntt..hhttmmll  wwiiddtthh==110000%%  hheeiigghhtt==9988%%>><<//oobbjjeecctt>>

Code: Select all

 // Won't compile without this...
        // ReefAngel.DCPump.UseMemory=true;
        // Custom menus
        #include <avr/pgmspace.h>
        const char menu1_label[] PROGMEM = "Feeding Mode";
        const char menu2_label[] PROGMEM = "Water Change";
        const char menu3_label[] PROGMEM = "ATO Clear";
        const char menu4_label[] PROGMEM = "DC Pump Mode";
        const char menu5_label[] PROGMEM = "Overheat Clear";
        const char menu6_label[] PROGMEM = "PH Calibration";
        const char menu7_label[] PROGMEM = "Date / Time";
        const char menu8_label[] PROGMEM = "Refugium Light";

        // Group the menu entries together
        const char *menu_items[] = {
        menu1_label, menu2_label, menu3_label,
        menu4_label, menu5_label, menu6_label, menu7_label, menu8_label
        };
and the Initialize Menu

Code: Select all

// Setup on controller startup/reset
        void setup()
        {
          // This must be the first line
          ReefAngel.Init();  //Initialize controller
          for (int a=0;a<SIZE(menu_items);a++)
    ReefAngel.InitMenu(pgm_read_word(&(menu_items[a])),a); // Initialize Menu
and some other menu stuff i have not sure if important

Code: Select all

 // Menu Code        
void MenuEntry1() {
  ReefAngel.FeedingModeStart();
}
void MenuEntry2() {
  ReefAngel.WaterChangeModeStart();
}
void MenuEntry3() {
  ReefAngel.ATOClear();
  ReefAngel.DisplayMenuEntry("Clear ATO Timeout");
}
void MenuEntry4() {
      NextDCPumpMode(); 
      ReefAngel.DisplayedMenu = RETURN_MAIN_MODE;
    }
void MenuEntry5() {
  ReefAngel.SetupCalibratePH();
}        
void MenuEntry6() {
  ReefAngel.OverheatClear();
  ReefAngel.DisplayMenuEntry("Clear Overheat");
}
void MenuEntry7() {
  ReefAngel.SetupDateTime();
}
void MenuEntry8() {
      // Toggle refugium light between on/auto.
      ReefAngel.Relay.Override(Refugium, ReefAngel.Relay.Status(Refugium)+1);
      ReefAngel.DisplayedMenu = RETURN_MAIN_MODE;
    }

// Custom Main Screen
void DrawCustomMain() {
  const int NumScreens=4;
  static boolean drawGraph=true;
 
  // Main Header
  // ReefAngel.LCD.DrawText(DefaultFGColor, DefaultBGColor, 35, 2,"Troy's Reef");
  ReefAngel.LCD.DrawDate(5,2);
  ReefAngel.LCD.Clear(COLOR_BLACK, 1, 11, 128, 11);

  // Param Header
  DrawParams(5,14);
 
  switch (ScreenID) {
    case 0:
    {
      if (drawGraph) { ReefAngel.LCD.DrawGraph(5,40); drawGraph=false; }
      break;
    }
    case 1: { DrawStatus(5,40); break; }
    case 2: { DrawSunMoon(5,40); break; }
    case 3: { DrawClouds(5,50); break; }
  }
 
  // Draw Relays
  DrawRelays(12,94);
 
  // Date+Time
  // ReefAngel.LCD.DrawDate(5,122);
 
  if (ReefAngel.Joystick.IsLeft()) {
    ReefAngel.ClearScreen(DefaultBGColor);
    ScreenID--; drawGraph=true;
  }
  if (ReefAngel.Joystick.IsRight()) {
    ReefAngel.ClearScreen(DefaultBGColor);
    ScreenID++; drawGraph=true;
  }
  if (ScreenID<0) ScreenID=NumScreens-1;
  if (ScreenID>=NumScreens) ScreenID=0;
 
}

void DrawCustomGraph() {
  if (ScreenID==0)
    ReefAngel.LCD.DrawGraph(5, 40);
}

void DrawParams(int x, int y) {
  char buf[16];

  ReefAngel.LCD.DrawText(COLOR_BLACK,DefaultBGColor,x+5,y,"Temp:");
  ReefAngel.LCD.DrawText(COLOR_BLACK,DefaultBGColor,x+80, y, "PH:");
  // Temp and PH
  y+=2;
  ConvertNumToString(buf, ReefAngel.Params.Temp[T2_PROBE], 10);
  ReefAngel.LCD.DrawText(T2TempColor, DefaultBGColor, x+45, y, buf);
  y+=6;
  ConvertNumToString(buf, ReefAngel.Params.Temp[T1_PROBE], 10);
  ReefAngel.LCD.DrawLargeText(T1TempColor, DefaultBGColor, x+5, y, buf, Num8x16);
  ConvertNumToString(buf, ReefAngel.Params.PH, 100);
  ReefAngel.LCD.DrawLargeText(PHColor, DefaultBGColor, x+80, y, buf, Num8x16);
  y+=5;
  ConvertNumToString(buf, ReefAngel.Params.Temp[T3_PROBE], 10);
  ReefAngel.LCD.DrawText(T3TempColor, DefaultBGColor, x+45, y, buf);
}

void DrawStatus(int x, int y) {
  int t=x;
 
  ReefAngel.LCD.DrawLargeText(COLOR_INDIGO,DefaultBGColor,15,y,"High",Font8x16);
  ReefAngel.LCD.DrawLargeText(COLOR_INDIGO,DefaultBGColor,85,y,"Low",Font8x16);
 
  if (ReefAngel.HighATO.IsActive()) {
    ReefAngel.LCD.FillCircle(55,y+3,5,COLOR_GREEN);
  } else {
    ReefAngel.LCD.FillCircle(55,y+3,5,COLOR_RED);
  }
 
  if (ReefAngel.LowATO.IsActive()) {
    ReefAngel.LCD.FillCircle(70,y+3,5,COLOR_GREEN);
  } else {
    ReefAngel.LCD.FillCircle(70,y+3,5,COLOR_RED);
  }
  y+=12;

 // DC Pump Mode
      ReefAngel.LCD.DrawText(0,255,x,y,"DC:"); x+=20;
      ReefAngel.LCD.Clear(DefaultBGColor,x,y,t+(128-t),y+8);
      if (DCPumpMode == 0) ReefAngel.LCD.DrawLargeText(COLOR_GREEN,255,x,y,"Constant");
      else if (DCPumpMode == 1) ReefAngel.LCD.DrawLargeText(COLOR_GOLD,255,x,y,"Lagoon");
      else if (DCPumpMode == 2) ReefAngel.LCD.DrawLargeText(COLOR_GOLD,255,x,y,"Reef Crest");
      else if (DCPumpMode == 3) ReefAngel.LCD.DrawLargeText(COLOR_RED,255,x,y,"Short Pulse");
      else if (DCPumpMode == 4) ReefAngel.LCD.DrawLargeText(COLOR_RED,255,x,y,"Long Pulse");
      else if (DCPumpMode == 5) ReefAngel.LCD.DrawLargeText(COLOR_MAGENTA,255,x,y,"Smart NTM");
      else if (DCPumpMode == 6) ReefAngel.LCD.DrawLargeText(COLOR_MAGENTA,255,x,y,"Tidal Swell");
      else if (DCPumpMode == 9) ReefAngel.LCD.DrawLargeText(COLOR_WHITE,0,x,y,"Night");
      else if (DCPumpMode == 10) ReefAngel.LCD.DrawLargeText(COLOR_BLUE,0,x,y,"Storm");
      else if (DCPumpMode == 11) ReefAngel.LCD.DrawLargeText(COLOR_BLUE,255,x,y,"Custom");
      y+=10; x=t;
     
      ReefAngel.LCD.DrawText(0,255,x,y,"DC Speed:"); x+=60;
      ReefAngel.LCD.Clear(DefaultBGColor,x,y,128,y+8);
      ReefAngel.LCD.DrawText(COLOR_BLUE, DefaultBGColor,x,y,DCPumpSpeed); x+=15;
      ReefAngel.LCD.DrawText(COLOR_BLUE, DefaultBGColor,x,y,"/"); x+=10;
      ReefAngel.LCD.DrawText(COLOR_BLUE, DefaultBGColor,x,y,DCPumpDuration);
      y+=10; x=t;
     
 
  // Display Acclimation timer
  byte acclDay=InternalMemory.read(Mem_B_AcclDay);
 
  if (acclDay > 0) {
    ReefAngel.LCD.DrawText(DefaultFGColor,DefaultBGColor,x,y,"Acclimation Day:"); x+=100;
    ReefAngel.LCD.DrawSingleMonitor(acclDay,DefaultFGColor,x,y,1);
  } else {
    ReefAngel.LCD.Clear(DefaultBGColor,x,y,128,y+8);
  }
}

void DrawSunMoon(int x, int y) {
  char buf[16];
  int t=x;

  y+=2;
  /// Display Sunrise / Sunset
  sprintf(buf, "%02d:%02d", sun.GetRiseHour(), sun.GetRiseMinute());
  ReefAngel.LCD.DrawText(COLOR_BLACK,DefaultBGColor,x,y,"Rise:"); x+=31;
  ReefAngel.LCD.DrawText(COLOR_RED,DefaultBGColor,x,y,buf);
  sprintf(buf, "%02d:%02d", sun.GetSetHour(), sun.GetSetMinute()); x+=36;
  ReefAngel.LCD.DrawText(COLOR_BLACK,DefaultBGColor,x,y,"Set:"); x+=25;
  ReefAngel.LCD.DrawText(COLOR_RED,DefaultBGColor,x,y,buf);
  y+=15; x=t;
 
  /// Display Moonrise / Moonset
  sprintf(buf, "%02d:%02d", Moon.riseH, Moon.riseM);
  ReefAngel.LCD.DrawText(COLOR_BLACK,DefaultBGColor,x,y,"MR:"); x+=21;
  ReefAngel.LCD.DrawText(COLOR_RED,DefaultBGColor,x,y,buf);
  sprintf(buf, "%02d:%02d", Moon.setH, Moon.setM); x+=36;
  ReefAngel.LCD.DrawText(COLOR_BLACK,DefaultBGColor,x,y,"MS:"); x+=21;
  ReefAngel.LCD.DrawText(COLOR_RED,DefaultBGColor,x,y,buf); x+=36;
  if (Moon.isUp) ReefAngel.LCD.DrawText(COLOR_RED,DefaultBGColor,x,y,"@");
    else ReefAngel.LCD.DrawText(COLOR_RED,DefaultBGColor,x,y,"_");
  y+=10; x=t;
 
  // MoonPhase
  ReefAngel.LCD.DrawText(0,255,x,y,"Moon:");
  ReefAngel.LCD.Clear(DefaultBGColor,x+32,y,128,y+8);
  ReefAngel.LCD.DrawText(COLOR_MAGENTA,255,x+32,y,MoonPhaseLabel());
  y+=10; x=t;
 
  // MoonLight %
  ReefAngel.LCD.DrawText(COLOR_BLACK,DefaultBGColor,x,y,"MoonLights:"); x+=68;
  ReefAngel.LCD.DrawSingleMonitor(ReefAngel.PWM.GetDaylightValue(),DPColor,x,y,1);
  x+=5*(intlength(ReefAngel.PWM.GetDaylightValue())+1);
  ReefAngel.LCD.DrawText(DPColor, DefaultBGColor, x, y, "%");
}

void DrawRelays(int x, int y) {
  // Draw Relays
  byte TempRelay = ReefAngel.Relay.RelayData;
  TempRelay &= ReefAngel.Relay.RelayMaskOff;
  TempRelay |= ReefAngel.Relay.RelayMaskOn;
  ReefAngel.LCD.DrawOutletBox(x, y, TempRelay);

  y+=12;
  TempRelay = ReefAngel.Relay.RelayDataE[0];
  TempRelay &= ReefAngel.Relay.RelayMaskOffE[0];
  TempRelay |= ReefAngel.Relay.RelayMaskOnE[0];
  ReefAngel.LCD.DrawOutletBox(x, y, TempRelay);
 
  y+=12;
  TempRelay = ReefAngel.Relay.RelayDataE[1];
  TempRelay &= ReefAngel.Relay.RelayMaskOffE[1];
  TempRelay |= ReefAngel.Relay.RelayMaskOnE[1];
  ReefAngel.LCD.DrawOutletBox(x, y, TempRelay); 
}

void DelayedOnFeedMode(byte relay) {
  static unsigned long startTime=now();

  if ( (startTime==LastStart || ReefAngel.DisplayedMenu==WATERCHANGE_MODE) && ReefAngel.HighATO.IsActive()) {
    ReefAngel.Relay.On(relay);
  } else {
    ReefAngel.Relay.DelayedOn(relay);
  }
}
Image
rimai
Posts: 12857
Joined: Fri Mar 18, 2011 6:47 pm

Re: New IDE v1.6.8

Post by rimai »

I see two things that are not correct.
Change this code:

Code: Select all

// Group the menu entries together
        const char *menu_items[] = {
        menu1_label, menu2_label, menu3_label,
        menu4_label, menu5_label, menu6_label, menu7_label, menu8_label
        };
To this:

Code: Select all

// Group the menu entries together
        PROGMEM const char *menu_items[] = {
        menu1_label, menu2_label, menu3_label,
        menu4_label, menu5_label, menu6_label, menu7_label, menu8_label
        };
Let me know if this fixes the menu issue.
The second is that the libraries packaged with this installer had bugs.
You need to update it manually :(
Download the latest dev branch here:
https://github.com/reefangel/Libraries/archive/dev.zip
Then replace everything inside \Documents\Arduino\libraries with the new one.
This should fix the wifi output duplicate characters you posted above.
Roberto.
troylong45
Posts: 203
Joined: Sat Oct 10, 2015 9:17 pm

Re: New IDE v1.6.8

Post by troylong45 »

ok i deleted all the old libraries and pasted all the libraried-dev content into that folder after extracting it all
and i added the PROGMEM back and i get the error earlier befor when trying to verify the code

Code: Select all

Arduino:  (Reef Angel compilation) v1.6.8 (Windows 8.1), Board: "Reef Angel Plus Controller"

The following features were automatically added:
Watchdog Timer
Version Menu

The following features were detected:
Dimming Expansion Module
Dimming Signal
Wifi Attachment
Custom Main Screen
Custom Variable
Extra Font - Medium Size (8x8 pixels)
Extra Font - Numbers Only - Large Font (8x16 pixels)
Date/Time Setup Menu
Relay Expansion Module
Custom Menu
Moon Phase Label
DC Pump Control (Jebao/Tunze)
Number of Relay Expansion Modules: 2
Number of Menu Options: 8
sketch_edit_troyraino09112016_fix_menu_verify:42: error: variable 'menu_items' must be const in order to be put into read-only section by means of '__attribute__((progmem))'

         PROGMEM const char *menu_items[] = {

                                        ^

exit status 1
variable 'menu_items' must be const in order to be put into read-only section by means of '__attribute__((progmem))'

This report would have more information with
"Show verbose output during compilation"
option enabled in File -> Preferences.
Image
rimai
Posts: 12857
Joined: Fri Mar 18, 2011 6:47 pm

Re: New IDE v1.6.8

Post by rimai »

Can you post the entire code?
Roberto.
troylong45
Posts: 203
Joined: Sat Oct 10, 2015 9:17 pm

Re: New IDE v1.6.8

Post by troylong45 »

it works without the PROGMEM in the code but like i said the language is not right and i have not tested the wifi yet with the new lib. cus it wont verify and upload with PROGMEM added to the

Code: Select all

 // Group the menu entries together
        const char *menu_items[] = {
        menu1_label, menu2_label, menu3_label,
        menu4_label, menu5_label, menu6_label, menu7_label, menu8_label
        };
to make it

Code: Select all

 // Group the menu entries together
        PROGMEM const char *menu_items[] = {
        menu1_label, menu2_label, menu3_label,
        menu4_label, menu5_label, menu6_label, menu7_label, menu8_label
        };
Full code

Code: Select all

    #include <ReefAngel_Features.h>
    #include <Globals.h>
    #include <RA_Wifi.h>
    #include <Wire.h>
    #include <OneWire.h>
    #include <Time.h>
    #include <DS1307RTC.h>
    #include <InternalEEPROM.h>
    #include <RA_NokiaLCD.h>
    #include <RA_ATO.h>
    #include <RA_Joystick.h>
    #include <LED.h>
    #include <RA_TempSensor.h>
    #include <Relay.h>
    #include <RA_PWM.h>
    #include <Timer.h>
    #include <Memory.h>
    #include <RA_Colors.h>
    #include <RA_CustomColors.h>
    #include <ReefAngel.h>
    #include <SunLocation.h>
    #include <Tide.h>
    #include <Moon.h>
    #include <WiFiAlert.h>
    #include <DCPump.h>
    
    
        // Won't compile without this...
        // ReefAngel.DCPump.UseMemory=true;
        // Custom menus
        #include <avr/pgmspace.h>
        const char menu1_label[] PROGMEM = "Feeding Mode";
        const char menu2_label[] PROGMEM = "Water Change";
        const char menu3_label[] PROGMEM = "ATO Clear";
        const char menu4_label[] PROGMEM = "DC Pump Mode";
        const char menu5_label[] PROGMEM = "Overheat Clear";
        const char menu6_label[] PROGMEM = "PH Calibration";
        const char menu7_label[] PROGMEM = "Date / Time";
        const char menu8_label[] PROGMEM = "Refugium Light";

        // Group the menu entries together
        PROGMEM const char *menu_items[] = {
        menu1_label, menu2_label, menu3_label,
        menu4_label, menu5_label, menu6_label, menu7_label, menu8_label
        };

        // Define Custom Memory Locations
        #define Mem_B_MoonOffset          100
        #define Mem_B_AtoHourInterval     101
        #define Mem_I_Latitude            108
        #define Mem_I_Longitude           110
        #define Mem_B_AcclRiseOffset      112
        #define Mem_B_AcclSetOffset       113
        #define Mem_B_AcclDay             114
        #define Mem_B_TideMin             117
        #define Mem_B_TideMax             118
        #define Mem_B_PumpOffset          119
        #define Mem_B_FeedingDCPump       120
        #define Mem_B_NightDCPump         121
        #define Mem_B_NightSpeed          122
        #define Mem_B_NightDuration       123
        #define Mem_B_NTMSpeed            124
        #define Mem_B_NTMDuration         125
        #define Mem_B_NTMDelay            126
        #define Mem_B_NTMTime             127
        #define Mem_B_TideMode            143
        #define Mem_B_CloudsEveryXDays    149
        #define Mem_B_CloudChancePerDay   150
        #define Mem_B_MinCloudDuration    151
        #define Mem_B_MaxCloudDuration    152
        #define Mem_B_MinCloudsPerDay     153
        #define Mem_B_MaxCloudsPerDay     154
        #define Mem_B_StartCloudAfterHour 155
        #define Mem_B_StartCloudAfterMin  156
        #define Mem_B_EndCloudBeforeHour  157
        #define Mem_B_EndCloudBeforeMin   158
        #define Mem_B_LightningChance     159
        #define Mem_B_LightMode           160
        #define Mem_B_LightOffset         161
        #define Mem_I_RiseOffset          162
        #define Mem_I_SetOffset           164
        #define Mem_B_AcclActinicOffset   166
        #define Mem_B_AcclDaylightOffset  167
        #define Mem_B_RandomMode          168
        #define Mem_B_GyreOffset          169
        #define Mem_B_MoonMode            170
        #define Mem_B_LightsOffPerc       171
        #define Mem_B_FeedingSpeed        172
        #define Mem_B_WCSpeed             173
        #define Mem_B_EnableStorm         178
        #define Mem_B_ForceRandomTide     179
        #define Mem_B_ResetMemory         199

        void init_memory() {
          // Initialize Custom Memory Locations
          
          
          InternalMemory.write(Mem_B_MoonOffset,15);           //mb100
          InternalMemory.write(Mem_B_AtoHourInterval,1);       //mb101
          InternalMemory.write_int(Mem_I_Latitude,-21);        //mi108
          InternalMemory.write_int(Mem_I_Longitude,-147);      //mi110
          InternalMemory.write(Mem_B_AcclRiseOffset,1);        //mb112
          InternalMemory.write(Mem_B_AcclSetOffset,1);         //mb113
          InternalMemory.write(Mem_B_AcclDay,0);               //mb114
          InternalMemory.write(Mem_B_TideMin,10);              //mb117
          InternalMemory.write(Mem_B_TideMax,20);              //mb118
          InternalMemory.write(Mem_B_PumpOffset,80);           //mb119
          InternalMemory.write(Mem_B_FeedingDCPump,true);      //mb120
          InternalMemory.write(Mem_B_NightDCPump,false);       //mb121
          InternalMemory.write(Mem_B_NightSpeed,35);           //mb122
          InternalMemory.write(Mem_B_NightDuration,16);        //mb123
          InternalMemory.write(Mem_B_NTMSpeed,100);            //mb124
          InternalMemory.write(Mem_B_NTMDuration,50);          //mb125
          InternalMemory.write(Mem_B_NTMDelay,0);              //mb126
          InternalMemory.write(Mem_B_NTMTime,5);               //mb127
          InternalMemory.write(Mem_B_TideMode,0);              //mb143
          InternalMemory.write(Mem_B_CloudsEveryXDays,1);      //mb149
          InternalMemory.write(Mem_B_CloudChancePerDay,40);    //mb150
          InternalMemory.write(Mem_B_MinCloudDuration,5);      //mb151
          InternalMemory.write(Mem_B_MaxCloudDuration,10);     //mb152
          InternalMemory.write(Mem_B_MinCloudsPerDay,2);       //mb153
          InternalMemory.write(Mem_B_MaxCloudsPerDay,20);      //mb154
          InternalMemory.write(Mem_B_StartCloudAfterHour,12);  //mb155
          InternalMemory.write(Mem_B_StartCloudAfterMin,1);    //mb156
          InternalMemory.write(Mem_B_EndCloudBeforeHour,19);   //mb157
          InternalMemory.write(Mem_B_EndCloudBeforeMin,1);     //mb158
          InternalMemory.write(Mem_B_LightningChance,25);      //mb159
          InternalMemory.write(Mem_B_LightMode,1);             //mb160
          InternalMemory.write(Mem_B_LightOffset,10);          //mb161
          InternalMemory.write_int(Mem_I_RiseOffset,20);       //mi162
          InternalMemory.write_int(Mem_I_SetOffset,16);        //mi164
          InternalMemory.write(Mem_B_AcclActinicOffset,214);   //mb166
          InternalMemory.write(Mem_B_AcclDaylightOffset,214);  //mb167
          InternalMemory.write(Mem_B_RandomMode,true);         //mb168
          InternalMemory.write(Mem_B_GyreOffset,10);           //mb169
          InternalMemory.write(Mem_B_MoonMode,1);              //mb170
          InternalMemory.write(Mem_B_LightsOffPerc,1);         //mb171
          InternalMemory.write(Mem_B_FeedingSpeed,0);          //mb172
          InternalMemory.write(Mem_B_WCSpeed,0);               //mb173

          InternalMemory.write(Mem_B_ResetMemory,false);       //mb199
        }
  

        #define NUMBERS_8x16

        #define Var_Tide         4
        #define Var_TideMode     5
        
        // Define Relay Ports by Name
        #define Return             1
        #define Heater             2
        #define Refugium           3
        #define MediaPump          4
        #define WhiteLeft          5
        #define BlueLeft           6
        #define Autotopoff         7
        #define Skimmer            8

        ////// Place global variable code below here

        // Custom classes
        SunLocation sun;
        Tide tide;

        // Jebao Variables
        byte DCPumpMode, DCPumpSpeed, DCPumpDuration;

        // For Cloud and preset code
        int DaylightPWMValue=0;
        int ActinicPWMValue=0;
        int DaylightPWMValue0=0;        // For cloud code, channel 0
        int DaylightPWMValue2=0;        // For cloud code, chennel 2
        int ActinicPWMValue1=0;        // For cloud code, channel 0
        int ActinicPWMValue3=0;        // For cloud code, chennel 2

        // Needs to be global for DrawCustomGraph()
        int ScreenID=1;
        ////// Place global variable code above here

        // Setup on controller startup/reset
        void setup()
        {
          // This must be the first line
          ReefAngel.Init();  //Initialize controller
          for (int a=0;a<SIZE(menu_items);a++)
    ReefAngel.InitMenu(pgm_read_word(&(menu_items[a])),a); // Initialize Menu
         
          // Ports toggled in Feeding Mode
          ReefAngel.FeedingModePorts = Port1Bit | Port2Bit ;
          // Ports toggled in Water Change Mode
          ReefAngel.WaterChangePorts = Port1Bit | Port2Bit | Port4Bit | Port7Bit  | Port8Bit;
          // Ports toggled when Lights On / Off menu entry selected
          ReefAngel.LightsOnPorts = Port3Bit | Port5Bit | Port6Bit;
          // Ports turned off when Overheat temperature exceeded
          ReefAngel.OverheatShutoffPorts =  Port2Bit | Port4Bit;
          // Use T1 probe as temperature and overheat functions
          ReefAngel.TempProbe = T1_PROBE;
          ReefAngel.OverheatProbe = T1_PROBE;
         
          // Feeeding and Water Change mode speed
         
           // Ports that are always on
        ReefAngel.Relay.On( Return ); // Return Pump
         
           
          ////// Place additional initialization code below here
       ReefAngel.DCPump.UseMemory=false;
       randomSeed(now()/SECS_PER_DAY); 
           
          if (InternalMemory.read(Mem_B_ResetMemory))
            init_memory();
         ////// Place additional initialization code above here
        }

        void loop()
        {
        DelayedOnFeedMode(Return); // DelayedOn after feed mode change only
        ReefAngel.Relay.Set(Refugium,!ReefAngel.Relay.Status(WhiteLeft));
        ReefAngel.SingleATO(true,Autotopoff, InternalMemory.ATOExtendedTimeout_read(), InternalMemory.read(Mem_B_AtoHourInterval));
        ReefAngel.Relay.Set(Skimmer, ReefAngel.HighATO.IsActive());
        ReefAngel.DCPump.ExpansionChannel[4] = AntiSync; // Left Jebao RW4
        ReefAngel.DCPump.ExpansionChannel[5] = Sync; // Right jebao rw4
        ReefAngel.StandardHeater(Heater);
        
         
          ////// Place your custom code below here
         
          // Lighting and Flow
          SetSun();               // Setup Sun rise/set lighting
          AcclimateLED();         // Apply acclimation dimming
          SetMoon();              // Setup Moon rise/set lighting
          FillInMoon();           // Fill in 5% to 0% gap in main LEDs
          LEDPresets();
          CheckCloud();           //  Check for cloud and lightning.
          UpdateLED();
          SetTide();              // Set High/Low tide properties
          SetDCPump();                // Set Vortech modes      

         
         
          ////// Place your custom code above here

          // This should always be the last line
           ReefAngel.Portal( "troylong45" );
        ReefAngel.DDNS( "1" ); // Your DDNS is troylong45-1.myreefangel.com
        ReefAngel.ShowInterface();
        }


        
        void SetSun() {
          // Start acclimation routine
          int acclRiseOffset=InternalMemory.read(Mem_B_AcclRiseOffset)*60;
          int acclSetOffset=InternalMemory.read(Mem_B_AcclSetOffset)*60;
          byte acclDay=InternalMemory.read(Mem_B_AcclDay);
         
          // See if we are acclimating corals and decrease the countdown each day
          static boolean acclCounterReady=false;
          if (now()%SECS_PER_DAY!=0) acclCounterReady=true;
          if (now()%SECS_PER_DAY==0 && acclCounterReady && acclDay>0) {
            acclDay--;
            acclCounterReady=false;
            InternalMemory.write(Mem_B_AcclDay,acclDay);
          }
          // End acclimation

          // Add some customizable offsets
          sun.Init(InternalMemory.read_int(Mem_I_Latitude), InternalMemory.read_int(Mem_I_Longitude));
          int riseOffset=InternalMemory.read_int(Mem_I_RiseOffset);
          int setOffset=InternalMemory.read_int(Mem_I_SetOffset);
         
          sun.SetOffset(riseOffset,(acclDay*acclRiseOffset),setOffset,(-acclDay*acclSetOffset)); // Bahamas
          sun.CheckAndUpdate(); // Calculate today's Sunrise / Sunset

          byte lightOffset=InternalMemory.read(Mem_B_LightOffset); // left right separation
          byte actinicOffset=InternalMemory.ActinicOffset_read();
         
          // Make sure light resets to zero at night.
          for(int i=0;i<4;i++) { ReefAngel.PWM.SetChannel(i,0); }
         
          switch(InternalMemory.read(Mem_B_LightMode)) {   
            case 0: {
              // Daylights
              ReefAngel.PWM.Channel0PWMSlope(lightOffset,0);
              ReefAngel.PWM.Channel2PWMSlope(0,lightOffset);
              // Actinics
              ReefAngel.PWM.Channel1PWMSlope(actinicOffset+lightOffset,actinicOffset);
              ReefAngel.PWM.Channel3PWMSlope(actinicOffset,actinicOffset+lightOffset);
              break;
            }
            case 1: {
              // Daylights
              ReefAngel.PWM.Channel0PWMParabola(lightOffset,0);
              ReefAngel.PWM.Channel2PWMParabola(0,lightOffset);
              // Actinics
              ReefAngel.PWM.Channel1PWMParabola(actinicOffset+lightOffset,actinicOffset);
              ReefAngel.PWM.Channel3PWMParabola(actinicOffset,actinicOffset+lightOffset);
              break;
            }
          case 2: {
              // Daylights
              ReefAngel.PWM.Channel0PWMSmoothRamp(lightOffset,0);
              ReefAngel.PWM.Channel2PWMSmoothRamp(0,lightOffset);
              // Actinics
              ReefAngel.PWM.Channel1PWMSmoothRamp(actinicOffset+lightOffset,actinicOffset);
              ReefAngel.PWM.Channel3PWMSmoothRamp(actinicOffset,actinicOffset+lightOffset);
              break;
            }
          case 3: {
              // Daylights
              ReefAngel.PWM.Channel0PWMSigmoid(lightOffset,0);
              ReefAngel.PWM.Channel2PWMSigmoid(0,lightOffset);
              // Actinics
              ReefAngel.PWM.Channel1PWMSigmoid(actinicOffset+lightOffset,actinicOffset);
              ReefAngel.PWM.Channel3PWMSigmoid(actinicOffset,actinicOffset+lightOffset);
              break;
            }
          case 4: { // Reverse the actinics in the morning
          // Daylights
          ReefAngel.PWM.Channel0PWMParabola(lightOffset+actinicOffset,0);
          ReefAngel.PWM.Channel2PWMParabola(actinicOffset,lightOffset);
          // Actinics
          ReefAngel.PWM.Channel1PWMParabola(lightOffset,actinicOffset);
          ReefAngel.PWM.Channel3PWMParabola(0,actinicOffset+lightOffset);
          break;
        }
      }
    }

    void SetMoon() {
      byte offset=InternalMemory.read(Mem_B_MoonOffset);
     
      byte startD=InternalMemory.read(Mem_B_PWMSlopeStartD);
      byte endD=InternalMemory.read(Mem_B_PWMSlopeEndD);
      byte timeD=InternalMemory.read(Mem_B_PWMSlopeDurationD);

      byte startA=InternalMemory.read(Mem_B_PWMSlopeStartA);
      byte endA=InternalMemory.read(Mem_B_PWMSlopeEndA);
      byte timeA=InternalMemory.read(Mem_B_PWMSlopeDurationA);

      time_t onTime=ScheduleTime(Moon.riseH, Moon.riseM,0);
      time_t offTime=ScheduleTime(Moon.setH, Moon.setM,0);
      time_t offsetOnTime=ScheduleTime(Moon.riseH, Moon.riseM,0)-(offset*60);
      time_t offsetOffTime=ScheduleTime(Moon.setH, Moon.setM,0)-(offset*60);

      byte actRiseH=(offsetOnTime%SECS_PER_DAY)/SECS_PER_HOUR;
      byte actRiseM=((offsetOnTime%SECS_PER_DAY)%SECS_PER_HOUR)/60;
      byte actSetH=(offsetOffTime%SECS_PER_DAY)/SECS_PER_HOUR;
      byte actSetM=((offsetOffTime%SECS_PER_DAY)%SECS_PER_HOUR)/60;
     
      static byte mp=MoonPhase();
     
      if (mp!=MoonPhase()) {
        InternalMemory.write(Mem_B_PWMSlopeEndD,mp);
        InternalMemory.write(Mem_B_PWMSlopeEndA,mp);
        mp=MoonPhase();
      }
     
      moon_init(InternalMemory.read_int(Mem_I_Latitude), InternalMemory.read_int(Mem_I_Longitude));
     
      // Make sure light resets to zero at night.
      ReefAngel.PWM.SetDaylight(0);
      ReefAngel.PWM.SetActinic(0);
     
      switch(InternalMemory.read(Mem_B_MoonMode)) {   
        case 0: {
          // Daylights
          ReefAngel.PWM.SetDaylightRaw(PWMSlopeHighRes(Moon.riseH,Moon.riseM,Moon.setH,Moon.setM,startA,endA,timeA,0));
          ReefAngel.PWM.SetActinicRaw(PWMSlopeHighRes(actRiseH,actRiseM,actSetH,actSetM,startD,endD,timeD,0));
          break;
        }
        case 1: {
          ReefAngel.PWM.SetDaylightRaw(PWMParabolaHighRes(Moon.riseH,Moon.riseM,Moon.setH,Moon.setM, startA,endA,0));
          ReefAngel.PWM.SetActinicRaw(PWMParabolaHighRes(actRiseH,actRiseM,actSetH,actSetM, startD,endD,0));
          break;
        }
      case 2: {
          ReefAngel.PWM.SetDaylightRaw(PWMSmoothRampHighRes(Moon.riseH,Moon.riseM,Moon.setH,Moon.setM,startA,endA,timeA,0));
          ReefAngel.PWM.SetActinicRaw(PWMSmoothRampHighRes(actRiseH,actRiseM,actSetH,actSetM,startD,endD,timeD,0));
          break;
        }
      case 3: {
          ReefAngel.PWM.SetDaylightRaw(PWMSigmoidHighRes(Moon.riseH,Moon.riseM,Moon.setH,Moon.setM,startA,endA,0));
          ReefAngel.PWM.SetActinicRaw(PWMSigmoidHighRes(actRiseH,actRiseM,actSetH,actSetM,startD,endD,0));
          break;
        }
     
      }
    }

    void FillInMoon() {
      // Extend the sunrise/sunset to fill in gaps when fixtures shut off.
      byte actinicOffset=InternalMemory.ActinicOffset_read();
      byte lightOffset=InternalMemory.read(Mem_B_LightOffset); // left right separation
      int LightsOffPerc=40.95*InternalMemory.read(Mem_B_LightsOffPerc);
      int onTime=NumMins(InternalMemory.StdLightsOnHour_read(),InternalMemory.StdLightsOnMinute_read())-(actinicOffset+(2*lightOffset));
      int offTime=NumMins(InternalMemory.StdLightsOffHour_read(),InternalMemory.StdLightsOffMinute_read())+(actinicOffset+(2*lightOffset));

      int moonVal=ReefAngel.PWM.GetDaylightValueRaw();
      int channelVal=PWMSlopeHighRes(onTime/60,onTime%60,offTime/60,offTime%60,0,100,lightOffset,0);

      if (ReefAngel.PWM.GetChannelValueRaw(1)<=LightsOffPerc && channelVal>ReefAngel.PWM.GetDaylightValueRaw())
        ReefAngel.PWM.SetDaylightRaw(channelVal);
      if (ReefAngel.PWM.GetChannelValueRaw(3)<=LightsOffPerc && channelVal>ReefAngel.PWM.GetActinicValueRaw())
        ReefAngel.PWM.SetActinicRaw(channelVal);
       
      DaylightPWMValue=ReefAngel.PWM.GetDaylightValueRaw();
      ActinicPWMValue=ReefAngel.PWM.GetActinicValueRaw();
    }

    void AcclimateLED() {
          byte acclDay=InternalMemory.read(Mem_B_AcclDay);
         
          if (acclDay > 0) {
            float acclActinicOffset=acclDay*(40.95*(((float)InternalMemory.read(Mem_B_AcclActinicOffset)/100)));
            float acclDaylightOffset=acclDay*(40.95*((float)InternalMemory.read(Mem_B_AcclDaylightOffset)/100));
            float endPerc;
         
            endPerc=40.95*InternalMemory.PWMSlopeEnd1_read();
            ReefAngel.PWM.SetChannelRaw(1,map(ReefAngel.PWM.GetChannelValueRaw(1),0,endPerc,0,endPerc-acclActinicOffset));
            endPerc=40.95*InternalMemory.PWMSlopeEnd3_read();
            ReefAngel.PWM.SetChannelRaw(3,map(ReefAngel.PWM.GetChannelValueRaw(3),0,endPerc,0,endPerc-acclActinicOffset));
            endPerc=40.95*InternalMemory.PWMSlopeEnd0_read();
            ReefAngel.PWM.SetChannelRaw(0,map(ReefAngel.PWM.GetChannelValueRaw(0),0,endPerc,0,endPerc-acclDaylightOffset));
            endPerc=40.95*InternalMemory.PWMSlopeEnd2_read();
            ReefAngel.PWM.SetChannelRaw(2,map(ReefAngel.PWM.GetChannelValueRaw(2),0,endPerc,0,endPerc-acclDaylightOffset));
          }
        }

#define LED_1to1      Box2_Port1
#define LED_2to1      Box2_Port2
#define LED_3to1      Box2_Port3
#define LED_BLUE      Box2_Port4
#define LED_WHITE     Box2_Port5
#define LED_MOON      Box2_Port6
#define LED_STORM     Box2_Port7
#define TRIGGER_STORM Box2_Port8

        void resetRelayBox(byte ID) {
  // toggle all relays except for the one selected
  for (int i=Box2_Port1;i<=Box2_Port4;i++) {
    if (i!=ID) ReefAngel.Relay.Auto(i);
  }
}

void LEDPresets() {
  static byte lastPreset=0;
 
  DaylightPWMValue0=ReefAngel.PWM.GetChannelValueRaw(0);
  ActinicPWMValue1=ReefAngel.PWM.GetChannelValueRaw(1);
  DaylightPWMValue2=ReefAngel.PWM.GetChannelValueRaw(2);
  ActinicPWMValue3=ReefAngel.PWM.GetChannelValueRaw(3);
  DaylightPWMValue=ReefAngel.PWM.GetDaylightValueRaw();
  ActinicPWMValue=ReefAngel.PWM.GetActinicValueRaw();

  if (ReefAngel.Relay.isMaskOn(LED_1to1)) {
    if (lastPreset!=1) resetRelayBox(LED_1to1);
    DaylightPWMValue0=90*40.95;
    ActinicPWMValue1=10*40.95;
    DaylightPWMValue2=90*40.95;
    ActinicPWMValue3=10*40.95;
    lastPreset=1;
  }
 
  if (ReefAngel.Relay.isMaskOff(LED_1to1)) {
    if (lastPreset!=2) resetRelayBox(LED_1to1);
    DaylightPWMValue0=10*40.95;
    ActinicPWMValue1=90*40.95;
    DaylightPWMValue2=10*40.95;
    ActinicPWMValue3=90*40.95;
    lastPreset=2;
  }
 
  if (ReefAngel.Relay.isMaskOn(LED_2to1)) {
    if (lastPreset!=3) resetRelayBox(LED_2to1);
    DaylightPWMValue0=60*40.95;
    ActinicPWMValue1=40*40.95;
    DaylightPWMValue2=60*40.95;
    ActinicPWMValue3=40*40.95;
    lastPreset=3;
  }

  if (ReefAngel.Relay.isMaskOff(LED_2to1)) {
    if (lastPreset!=4) resetRelayBox(LED_2to1);
    DaylightPWMValue0=40*40.95;
    ActinicPWMValue1=60*40.95;
    DaylightPWMValue2=40*40.95;
    ActinicPWMValue3=60*40.95;
    lastPreset=4;
  }

  if (ReefAngel.Relay.isMaskOn(LED_3to1)) {
    if (lastPreset!=5) resetRelayBox(LED_3to1);
    DaylightPWMValue0=75*40.95;
    ActinicPWMValue1=25*40.95;
    DaylightPWMValue2=75*40.95;
    ActinicPWMValue3=25*40.95;
    lastPreset=5;
  }

  if (ReefAngel.Relay.isMaskOff(LED_3to1)) {
    if (lastPreset!=6) resetRelayBox(LED_3to1);
    DaylightPWMValue0=25*40.95;
    ActinicPWMValue1=75*40.95;
    DaylightPWMValue2=25*40.95;
    ActinicPWMValue3=75*40.95;
    lastPreset=6;
  }


  if (ReefAngel.Relay.isMaskOn(LED_BLUE)) {
    if (lastPreset!=9) resetRelayBox(LED_BLUE);
    DaylightPWMValue0=0;
    ActinicPWMValue1=80*40.95;
    DaylightPWMValue2=0;
    ActinicPWMValue3=80*40.95;
    lastPreset=9;
  }

  if (ReefAngel.Relay.isMaskOff(LED_BLUE)) {
    if (lastPreset!=10) resetRelayBox(LED_BLUE);
    ActinicPWMValue1=0;
    ActinicPWMValue3=0;
    lastPreset=10;
  }   
 
  if (ReefAngel.Relay.isMaskOn(LED_WHITE)) {
    if (lastPreset!=11) resetRelayBox(LED_WHITE);
    DaylightPWMValue0=80*40.95;
    ActinicPWMValue1=0;
    DaylightPWMValue2=80*40.95;
    ActinicPWMValue3=0;
    lastPreset=11;
  }

  if (ReefAngel.Relay.isMaskOff(LED_WHITE)) {
    if (lastPreset!=12) resetRelayBox(LED_WHITE);
    DaylightPWMValue0=0;
    DaylightPWMValue2=0;
    lastPreset=12;
  }   
 
  if (ReefAngel.Relay.isMaskOn(LED_MOON)) {
    if (lastPreset!=13) resetRelayBox(LED_MOON);
    DaylightPWMValue=4095;
    ActinicPWMValue=4095;
    lastPreset=13;
  }

  if (ReefAngel.Relay.isMaskOff(LED_MOON)) {
    if (lastPreset!=14) resetRelayBox(LED_MOON);
    DaylightPWMValue=0;
    ActinicPWMValue=0;
    lastPreset=14;
  }
}

// Write updated values to the channels
void UpdateLED() {
  ReefAngel.PWM.SetChannelRaw(0,DaylightPWMValue0);
  ReefAngel.PWM.SetChannelRaw(1,ActinicPWMValue1); 
  ReefAngel.PWM.SetChannelRaw(2,DaylightPWMValue2);
  ReefAngel.PWM.SetChannelRaw(3,ActinicPWMValue3); 
  ReefAngel.PWM.SetDaylightRaw(DaylightPWMValue);   
  ReefAngel.PWM.SetActinicRaw(ActinicPWMValue); 

  byte LightsOffPerc=40.95*InternalMemory.read(Mem_B_LightsOffPerc);
 
  if (ReefAngel.PWM.GetChannelValueRaw(0)>=LightsOffPerc) ReefAngel.Relay.On(WhiteLeft); else ReefAngel.Relay.Off(WhiteLeft);
  if (ReefAngel.PWM.GetChannelValueRaw(1)>=LightsOffPerc) ReefAngel.Relay.On(BlueLeft); else ReefAngel.Relay.Off(BlueLeft);
}


void SetTide() { 
  byte nightSpeed=InternalMemory.read(Mem_B_NightSpeed); 
  byte tideMin=InternalMemory.read(Mem_B_TideMin); 
  byte tideMax=InternalMemory.read(Mem_B_TideMax); 

  // Set tide offsets
  tide.SetOffset(tideMin, tideMax);     
  // Set tide speed. Slope in/out of Night Mode
  tide.SetSpeed(PWMSlope(sun.GetRiseHour()-1,sun.GetRiseMinute(),
    sun.GetSetHour(),sun.GetSetMinute(),nightSpeed+tideMin,DCPumpSpeed,120,nightSpeed+tideMin));

  // Show tide info on portal
  ReefAngel.CustomVar[Var_Tide]=tide.CalcTide();
}

void SetDCPump() {
  int ntmDelay=InternalMemory.read(Mem_B_NTMDelay)*60;
  int ntmTime=InternalMemory.read(Mem_B_NTMTime)*60;
  boolean nightDCPump=InternalMemory.read(Mem_B_NightDCPump);
  boolean feedingDCPump=InternalMemory.read(Mem_B_FeedingDCPump);
  static time_t t;

  ReefAngel.DCPump.FeedingSpeed=InternalMemory.read(Mem_B_FeedingSpeed);
  ReefAngel.DCPump.WaterChangeSpeed=InternalMemory.read(Mem_B_WCSpeed);
  
  DCPumpMode=InternalMemory.DCPumpMode_read();
  DCPumpSpeed=InternalMemory.DCPumpSpeed_read();
  DCPumpDuration=InternalMemory.DCPumpDuration_read();

  if ((now()-t > ntmDelay && now()-t < ntmTime+ntmDelay) && feedingDCPump) {
    // Post feeding mode
    DCPumpMode=Smart_NTM; 
    DCPumpSpeed=InternalMemory.read(Mem_B_NTMSpeed);
    DCPumpDuration=InternalMemory.read(Mem_B_NTMDuration);
  } else if (!sun.IsDaytime() && nightDCPump) {
    DCPumpMode=Night; 
    DCPumpSpeed=InternalMemory.read(Mem_B_NightSpeed);
    DCPumpDuration=InternalMemory.read(Mem_B_NightDuration);
  } else {
    if (DCPumpMode!=Night && ReefAngel.DCPump.Mode==Night)
      ReefAngel.DCPump.SetMode(Night_Stop,0,0);
  }

  if (ReefAngel.DisplayedMenu==FEEDING_MODE) {
    t=now(); // Run post feeding mode when this counter stops 
  } else if (ReefAngel.DisplayedMenu==WATERCHANGE_MODE) {
    // Not needed anymore. 
    // ReefAngel.DCPump.SetMode(Constant,25,0);
  } else {
    if ((DCPumpMode==Smart_NTM) || (DCPumpMode==ShortPulse)) DCPumpDuration=InternalMemory.read(Mem_B_NTMDuration);
    (DCPumpMode==Custom) ? DCPumpCustom() : ReefAngel.DCPump.SetMode(DCPumpMode,DCPumpSpeed,DCPumpDuration);
  }
}

void RefugiumLight() {if (ReefAngel.DisplayedMenu==WATERCHANGE_MODE) {
        ReefAngel.Relay.On(Refugium);} }

void DCPumpCustom() {
  static boolean changeMode;
  byte rcSpeed, rcSpeedAS;

  // Define new modes
  const int BHazard=15;
  const int RA_ReefCrest=16;
  const int RA_Lagoon=17;
  const int RA_TidalSwell=18;
  const int RA_Smart_NTM=19;
  const int RA_ShortPulse=20;
  const int RA_LongPulse=21;
  
  byte tideSpeed=tide.CalcTide();
  byte tideMin=InternalMemory.read(Mem_B_TideMin); 
  byte tideMax=InternalMemory.read(Mem_B_TideMax); 
  byte tideMode=InternalMemory.read(Mem_B_TideMode);
  float pumpOffset=(float) InternalMemory.read(Mem_B_PumpOffset)/100;

  byte RandomModes[]={ ReefCrest, TidalSwell, Lagoon, ShortPulse, LongPulse, BHazard, Else, Sine, Constant };

//  if (now()%SECS_PER_DAY!=0 && InternalMemory.read(Mem_B_RandomMode)) changeMode=true;
//  if (now()%SECS_PER_DAY==0 && changeMode) {

  if (now()%(6*SECS_PER_HOUR)!=10 && InternalMemory.read(Mem_B_RandomMode)) changeMode=true;
  if (now()%(6*SECS_PER_HOUR)==10 && changeMode) {
    tideMode=random(100)%sizeof(RandomModes);
    InternalMemory.write(Mem_B_TideMode,tideMode);
    changeMode=false;
  }
  
  // Choose another random mode if triggered
  if (InternalMemory.read(Mem_B_ForceRandomTide)) {
    tideMode=random(100)%sizeof(RandomModes);
    InternalMemory.write(Mem_B_TideMode,tideMode);
    InternalMemory.write(Mem_B_ForceRandomTide,false);
  }
  
  ReefAngel.CustomVar[Var_TideMode]=tideMode+1;

  switch (RandomModes[tideMode]) { 
    case ReefCrest: {
      ReefAngel.DCPump.SetMode(ReefCrest,tideSpeed,DCPumpDuration);
      return;
      break; 
    } 
    case Lagoon: {
      ReefAngel.DCPump.SetMode(Lagoon,tideSpeed,DCPumpDuration);
      return;
      break; 
    } 
    case TidalSwell: {
      ReefAngel.DCPump.SetMode(TidalSwell,tideSpeed,DCPumpDuration);
      return;
      break; 
    } 
    case Smart_NTM: {
      ReefAngel.DCPump.SetMode(Smart_NTM,tideSpeed,DCPumpDuration);
      return;
      break; 
    } 
    case ShortPulse: {
      ReefAngel.DCPump.SetMode(ShortPulse,tideSpeed,DCPumpDuration);
      return;
      break; 
    } 
    case LongPulse: {
      ReefAngel.DCPump.SetMode(LongPulse,tideSpeed,DCPumpDuration);
      return;
      break; 
    }
    case RA_ReefCrest: {
      rcSpeed=ReefCrestMode(tideSpeed,DCPumpDuration*2,true);
      rcSpeedAS=ReefCrestMode(tideSpeed,DCPumpDuration*2,false);
      break;
    }
    case RA_Lagoon: {
      rcSpeed=ReefCrestMode(tideSpeed,DCPumpDuration,true);
      rcSpeedAS=ReefCrestMode(tideSpeed,DCPumpDuration,false);
      break;
    }
    case RA_TidalSwell: {
      rcSpeed=TidalSwellMode(tideSpeed,true);
      rcSpeedAS=TidalSwellMode(tideSpeed,false);
      break;
    }
    case RA_Smart_NTM: {
      rcSpeed=NutrientTransportMode(0,tideSpeed,DCPumpDuration*50,true);
      rcSpeedAS=NutrientTransportMode(0,tideSpeed,DCPumpDuration*50,false);
      break;
    }
    case RA_ShortPulse: {
      rcSpeed=ShortPulseMode(0,tideSpeed,DCPumpDuration*50,true);
      rcSpeedAS=ShortPulseMode(0,tideSpeed,DCPumpDuration*50,false);
      break;
    }
    case RA_LongPulse: {
      rcSpeed=LongPulseMode(0,tideSpeed,DCPumpDuration,true);
      rcSpeedAS=LongPulseMode(0,tideSpeed,DCPumpDuration,false);
      break;
    }    
    case Else: {
      rcSpeed=ElseMode(tideSpeed,DCPumpDuration*2,true);
      rcSpeedAS=ElseMode(tideSpeed,DCPumpDuration*2,false);
      break; 
    }    
    case BHazard: {
      rcSpeed=millis()%1200>800?tideSpeed:0;
      rcSpeedAS=millis()%1200<400?0:tideSpeed;
      break; 
    }
    case Sine: {
      rcSpeed=SineMode(tideSpeed-tideMin,tideSpeed+tideMin,DCPumpDuration*100,true);
      rcSpeedAS=SineMode(tideSpeed-tideMin,tideSpeed+tideMin,DCPumpDuration*100,false);
      break; 
    } 
    default: {
      rcSpeed=tideSpeed;
      rcSpeedAS=tideSpeed;  
      pumpOffset=(float) InternalMemory.read(Mem_B_GyreOffset)/100;
    }
  }

  ReefAngel.DCPump.SetMode(Custom,rcSpeedAS*pumpOffset,tide.isOutgoing());
  ReefAngel.DCPump.SetMode(Custom,rcSpeed,tide.isIncoming());
}

void NextDCPumpMode() {
      DCPumpMode++;
     
      if (DCPumpMode > 12) {
        DCPumpMode=0;
        DCPumpSpeed=50; // Constant
      } else if (DCPumpMode == 1) {
        DCPumpSpeed=40; // Lagoon
      } else if (DCPumpMode == 2) {
        DCPumpSpeed=45; // Reef Crest
      } else if (DCPumpMode == 3) { 
        DCPumpSpeed=55; DCPumpDuration=10; // Short Pulse
      } else if (DCPumpMode == 4) {
        DCPumpSpeed=55; DCPumpDuration=20; // Long Pulse
      } else if (DCPumpMode == 5) {
        DCPumpSpeed=InternalMemory.read(Mem_B_NTMSpeed);
        DCPumpDuration=InternalMemory.read(Mem_B_NTMDuration); // Smart_NTM
      } else if (DCPumpMode == 6) {
        DCPumpSpeed=50; DCPumpDuration=10; // Smart_TSM
      } else if (DCPumpMode == 7) {
        DCPumpSpeed=InternalMemory.read(Mem_B_NightSpeed);
        DCPumpDuration=InternalMemory.read(Mem_B_NightDuration);
        DCPumpMode=9; // Night
      } else if (DCPumpMode == 10) {
        DCPumpSpeed=65; DCPumpDuration=5; // Storm
      } else if (DCPumpMode == 11) {
        DCPumpSpeed=45; DCPumpDuration=10; // Custom
      } 

      if (DCPumpMode!=InternalMemory.DCPumpMode_read())
        InternalMemory.DCPumpMode_write(DCPumpMode);
      if (DCPumpSpeed!=InternalMemory.DCPumpSpeed_read())
        InternalMemory.DCPumpSpeed_write(DCPumpSpeed);
      if (DCPumpDuration!=InternalMemory.DCPumpDuration_read())
        InternalMemory.DCPumpDuration_write(DCPumpDuration);
    }



        // Menu Code        
void MenuEntry1() {
  ReefAngel.FeedingModeStart();
}
void MenuEntry2() {
  ReefAngel.WaterChangeModeStart();
}
void MenuEntry3() {
  ReefAngel.ATOClear();
  ReefAngel.DisplayMenuEntry("Clear ATO Timeout");
}
void MenuEntry4() {
      NextDCPumpMode(); 
      ReefAngel.DisplayedMenu = RETURN_MAIN_MODE;
    }
void MenuEntry5() {
  ReefAngel.SetupCalibratePH();
}        
void MenuEntry6() {
  ReefAngel.OverheatClear();
  ReefAngel.DisplayMenuEntry("Clear Overheat");
}
void MenuEntry7() {
  ReefAngel.SetupDateTime();
}
void MenuEntry8() {
      // Toggle refugium light between on/auto.
      ReefAngel.Relay.Override(Refugium, ReefAngel.Relay.Status(Refugium)+1);
      ReefAngel.DisplayedMenu = RETURN_MAIN_MODE;
    }

// Custom Main Screen
void DrawCustomMain() {
  const int NumScreens=4;
  static boolean drawGraph=true;
 
  // Main Header
  // ReefAngel.LCD.DrawText(DefaultFGColor, DefaultBGColor, 35, 2,"Troy's Reef");
  ReefAngel.LCD.DrawDate(5,2);
  ReefAngel.LCD.Clear(COLOR_BLACK, 1, 11, 128, 11);

  // Param Header
  DrawParams(5,14);
 
  switch (ScreenID) {
    case 0:
    {
      if (drawGraph) { ReefAngel.LCD.DrawGraph(5,40); drawGraph=false; }
      break;
    }
    case 1: { DrawStatus(5,40); break; }
    case 2: { DrawSunMoon(5,40); break; }
    case 3: { DrawClouds(5,50); break; }
  }
 
  // Draw Relays
  DrawRelays(12,94);
 
  // Date+Time
  // ReefAngel.LCD.DrawDate(5,122);
 
  if (ReefAngel.Joystick.IsLeft()) {
    ReefAngel.ClearScreen(DefaultBGColor);
    ScreenID--; drawGraph=true;
  }
  if (ReefAngel.Joystick.IsRight()) {
    ReefAngel.ClearScreen(DefaultBGColor);
    ScreenID++; drawGraph=true;
  }
  if (ScreenID<0) ScreenID=NumScreens-1;
  if (ScreenID>=NumScreens) ScreenID=0;
 
}

void DrawCustomGraph() {
  if (ScreenID==0)
    ReefAngel.LCD.DrawGraph(5, 40);
}

void DrawParams(int x, int y) {
  char buf[16];

  ReefAngel.LCD.DrawText(COLOR_BLACK,DefaultBGColor,x+5,y,"Temp:");
  ReefAngel.LCD.DrawText(COLOR_BLACK,DefaultBGColor,x+80, y, "PH:");
  // Temp and PH
  y+=2;
  ConvertNumToString(buf, ReefAngel.Params.Temp[T2_PROBE], 10);
  ReefAngel.LCD.DrawText(T2TempColor, DefaultBGColor, x+45, y, buf);
  y+=6;
  ConvertNumToString(buf, ReefAngel.Params.Temp[T1_PROBE], 10);
  ReefAngel.LCD.DrawLargeText(T1TempColor, DefaultBGColor, x+5, y, buf, Num8x16);
  ConvertNumToString(buf, ReefAngel.Params.PH, 100);
  ReefAngel.LCD.DrawLargeText(PHColor, DefaultBGColor, x+80, y, buf, Num8x16);
  y+=5;
  ConvertNumToString(buf, ReefAngel.Params.Temp[T3_PROBE], 10);
  ReefAngel.LCD.DrawText(T3TempColor, DefaultBGColor, x+45, y, buf);
}

void DrawStatus(int x, int y) {
  int t=x;
 
  ReefAngel.LCD.DrawLargeText(COLOR_INDIGO,DefaultBGColor,15,y,"High",Font8x16);
  ReefAngel.LCD.DrawLargeText(COLOR_INDIGO,DefaultBGColor,85,y,"Low",Font8x16);
 
  if (ReefAngel.HighATO.IsActive()) {
    ReefAngel.LCD.FillCircle(55,y+3,5,COLOR_GREEN);
  } else {
    ReefAngel.LCD.FillCircle(55,y+3,5,COLOR_RED);
  }
 
  if (ReefAngel.LowATO.IsActive()) {
    ReefAngel.LCD.FillCircle(70,y+3,5,COLOR_GREEN);
  } else {
    ReefAngel.LCD.FillCircle(70,y+3,5,COLOR_RED);
  }
  y+=12;

 // DC Pump Mode
      ReefAngel.LCD.DrawText(0,255,x,y,"DC:"); x+=20;
      ReefAngel.LCD.Clear(DefaultBGColor,x,y,t+(128-t),y+8);
      if (DCPumpMode == 0) ReefAngel.LCD.DrawLargeText(COLOR_GREEN,255,x,y,"Constant");
      else if (DCPumpMode == 1) ReefAngel.LCD.DrawLargeText(COLOR_GOLD,255,x,y,"Lagoon");
      else if (DCPumpMode == 2) ReefAngel.LCD.DrawLargeText(COLOR_GOLD,255,x,y,"Reef Crest");
      else if (DCPumpMode == 3) ReefAngel.LCD.DrawLargeText(COLOR_RED,255,x,y,"Short Pulse");
      else if (DCPumpMode == 4) ReefAngel.LCD.DrawLargeText(COLOR_RED,255,x,y,"Long Pulse");
      else if (DCPumpMode == 5) ReefAngel.LCD.DrawLargeText(COLOR_MAGENTA,255,x,y,"Smart NTM");
      else if (DCPumpMode == 6) ReefAngel.LCD.DrawLargeText(COLOR_MAGENTA,255,x,y,"Tidal Swell");
      else if (DCPumpMode == 9) ReefAngel.LCD.DrawLargeText(COLOR_WHITE,0,x,y,"Night");
      else if (DCPumpMode == 10) ReefAngel.LCD.DrawLargeText(COLOR_BLUE,0,x,y,"Storm");
      else if (DCPumpMode == 11) ReefAngel.LCD.DrawLargeText(COLOR_BLUE,255,x,y,"Custom");
      y+=10; x=t;
     
      ReefAngel.LCD.DrawText(0,255,x,y,"DC Speed:"); x+=60;
      ReefAngel.LCD.Clear(DefaultBGColor,x,y,128,y+8);
      ReefAngel.LCD.DrawText(COLOR_BLUE, DefaultBGColor,x,y,DCPumpSpeed); x+=15;
      ReefAngel.LCD.DrawText(COLOR_BLUE, DefaultBGColor,x,y,"/"); x+=10;
      ReefAngel.LCD.DrawText(COLOR_BLUE, DefaultBGColor,x,y,DCPumpDuration);
      y+=10; x=t;
     
 
  // Display Acclimation timer
  byte acclDay=InternalMemory.read(Mem_B_AcclDay);
 
  if (acclDay > 0) {
    ReefAngel.LCD.DrawText(DefaultFGColor,DefaultBGColor,x,y,"Acclimation Day:"); x+=100;
    ReefAngel.LCD.DrawSingleMonitor(acclDay,DefaultFGColor,x,y,1);
  } else {
    ReefAngel.LCD.Clear(DefaultBGColor,x,y,128,y+8);
  }
}

void DrawSunMoon(int x, int y) {
  char buf[16];
  int t=x;

  y+=2;
  /// Display Sunrise / Sunset
  sprintf(buf, "%02d:%02d", sun.GetRiseHour(), sun.GetRiseMinute());
  ReefAngel.LCD.DrawText(COLOR_BLACK,DefaultBGColor,x,y,"Rise:"); x+=31;
  ReefAngel.LCD.DrawText(COLOR_RED,DefaultBGColor,x,y,buf);
  sprintf(buf, "%02d:%02d", sun.GetSetHour(), sun.GetSetMinute()); x+=36;
  ReefAngel.LCD.DrawText(COLOR_BLACK,DefaultBGColor,x,y,"Set:"); x+=25;
  ReefAngel.LCD.DrawText(COLOR_RED,DefaultBGColor,x,y,buf);
  y+=15; x=t;
 
  /// Display Moonrise / Moonset
  sprintf(buf, "%02d:%02d", Moon.riseH, Moon.riseM);
  ReefAngel.LCD.DrawText(COLOR_BLACK,DefaultBGColor,x,y,"MR:"); x+=21;
  ReefAngel.LCD.DrawText(COLOR_RED,DefaultBGColor,x,y,buf);
  sprintf(buf, "%02d:%02d", Moon.setH, Moon.setM); x+=36;
  ReefAngel.LCD.DrawText(COLOR_BLACK,DefaultBGColor,x,y,"MS:"); x+=21;
  ReefAngel.LCD.DrawText(COLOR_RED,DefaultBGColor,x,y,buf); x+=36;
  if (Moon.isUp) ReefAngel.LCD.DrawText(COLOR_RED,DefaultBGColor,x,y,"@");
    else ReefAngel.LCD.DrawText(COLOR_RED,DefaultBGColor,x,y,"_");
  y+=10; x=t;
 
  // MoonPhase
  ReefAngel.LCD.DrawText(0,255,x,y,"Moon:");
  ReefAngel.LCD.Clear(DefaultBGColor,x+32,y,128,y+8);
  ReefAngel.LCD.DrawText(COLOR_MAGENTA,255,x+32,y,MoonPhaseLabel());
  y+=10; x=t;
 
  // MoonLight %
  ReefAngel.LCD.DrawText(COLOR_BLACK,DefaultBGColor,x,y,"MoonLights:"); x+=68;
  ReefAngel.LCD.DrawSingleMonitor(ReefAngel.PWM.GetDaylightValue(),DPColor,x,y,1);
  x+=5*(intlength(ReefAngel.PWM.GetDaylightValue())+1);
  ReefAngel.LCD.DrawText(DPColor, DefaultBGColor, x, y, "%");
}

void DrawRelays(int x, int y) {
  // Draw Relays
  byte TempRelay = ReefAngel.Relay.RelayData;
  TempRelay &= ReefAngel.Relay.RelayMaskOff;
  TempRelay |= ReefAngel.Relay.RelayMaskOn;
  ReefAngel.LCD.DrawOutletBox(x, y, TempRelay);

  y+=12;
  TempRelay = ReefAngel.Relay.RelayDataE[0];
  TempRelay &= ReefAngel.Relay.RelayMaskOffE[0];
  TempRelay |= ReefAngel.Relay.RelayMaskOnE[0];
  ReefAngel.LCD.DrawOutletBox(x, y, TempRelay);
 
  y+=12;
  TempRelay = ReefAngel.Relay.RelayDataE[1];
  TempRelay &= ReefAngel.Relay.RelayMaskOffE[1];
  TempRelay |= ReefAngel.Relay.RelayMaskOnE[1];
  ReefAngel.LCD.DrawOutletBox(x, y, TempRelay); 
}

void DelayedOnFeedMode(byte relay) {
  static unsigned long startTime=now();

  if ( (startTime==LastStart || ReefAngel.DisplayedMenu==WATERCHANGE_MODE) && ReefAngel.HighATO.IsActive()) {
    ReefAngel.Relay.On(relay);
  } else {
    ReefAngel.Relay.DelayedOn(relay);
  }
}

// ------------------------------------------------------------
// Change the values below to customize your cloud/storm effect

// Frequency in days based on the day of the month - number 2 means every 2 days, for example (day 2,4,6 etc)
// For testing purposes, you can use 1 and cause the cloud to occur everyday
#define Clouds_Every_X_Days InternalMemory.read(Mem_B_CloudsEveryXDays)

// Percentage chance of a cloud happening today
// For testing purposes, you can use 100 and cause the cloud to have 100% chance of happening
#define Cloud_Chance_per_Day InternalMemory.read(Mem_B_CloudChancePerDay)

// Minimum number of minutes for cloud duration.  Don't use min duration of less than 6
#define Min_Cloud_Duration InternalMemory.read(Mem_B_MinCloudDuration)

// Maximum number of minutes for the cloud duration. Don't use max duration of more than 255
#define Max_Cloud_Duration InternalMemory.read(Mem_B_MaxCloudDuration)

// Minimum number of clouds that can happen per day
#define Min_Clouds_per_Day InternalMemory.read(Mem_B_MinCloudsPerDay)

// Maximum number of clouds that can happen per day
#define Max_Clouds_per_Day InternalMemory.read(Mem_B_MaxCloudsPerDay)

// Only start the cloud effect after this setting
// In this example, start cloud after noon
#define Start_Cloud_After NumMins(InternalMemory.read(Mem_B_StartCloudAfterHour),InternalMemory.read(Mem_B_StartCloudAfterMin))

// Always end the cloud effect before this setting
// In this example, end cloud before 9:00pm
#define End_Cloud_Before NumMins(InternalMemory.read(Mem_B_EndCloudBeforeHour),InternalMemory.read(Mem_B_EndCloudBeforeMin))

// Percentage chance of a lightning happen for every cloud
// For testing purposes, you can use 100 and cause the lightning to have 100% chance of happening
#define Lightning_Chance_per_Cloud InternalMemory.read(Mem_B_LightningChance)

// Note: Make sure to choose correct values that will work within your PWMSLope settings.
// For example, in our case, we could have a max of 5 clouds per day and they could last for 50 minutes.
// Which could mean 250 minutes of clouds. We need to make sure the PWMSlope can accomodate 250 minutes
// of effects or unforseen result could happen.
// Also, make sure that you can fit double those minutes between Start_Cloud_After and End_Cloud_Before.
// In our example, we have 510 minutes between Start_Cloud_After and End_Cloud_Before, so double the
// 250 minutes (or 500 minutes) can fit in that 510 minutes window.
// It's a tight fit, but it did.

//#define printdebug // Uncomment this for debug print on Serial Monitor window
#define forcecloudcalculation // Uncomment this to force the cloud calculation to happen in the boot process.

// Add Random Lightning modes
#define Calm 0    // No lightning
#define Slow 1    // 5 seconds of slow lightning in the middle of a cloud for ELN style (slow response) drivers
#define Fast 2    // 5 seconds of fast lightning in the middle of a cloud for LDD style (fast response) drivers
#define Mega 3    // Lightning throughout the cloud, higher chance as it gets darker
#define Mega2 4   // Like Mega, but with more lightning
// ------------------------------------------------------------
// Do not change anything below here

static byte cloudchance=255;
static byte cloudduration=0;
static int cloudstart=0;
static byte numclouds=0;
static byte lightningchance=0;
static byte cloudindex=0;
static byte lightningstatus=0;
static byte lightningMode=0;
static boolean chooseLightning=true;

void CheckCloud()
{
    // Set which modes you want to use
  // Example:  { Calm, Fast, Mega, Mega2 } to randomize all four modes. 
  // { Mega2 } for just Mega2.  { Mega, Mega, Fast} for Mega and Fast, with twice the chance of Mega.
  byte LightningModes[] = {Slow};

  // Change the values above to customize your cloud/storm effect

  static time_t DelayCounter=millis();    // Variable for lightning timing. 
  static int DelayTime=random(1000);      // Variable for lightning timimg.

  // Every day at midnight, we check for chance of cloud happening today
  if (hour()==0 && minute()==0 && second()==0) cloudchance=255;

#ifdef forcecloudcalculation
  if (cloudchance==255)
#else
    if (hour()==0 && minute()==0 && second()==1 && cloudchance==255)
#endif
    {
      // Commenting out to see if it's interfering with our other seed.
      // randomSeed(millis());    // Seed the random number generator
      //Pick a random number between 0 and 99
      cloudchance=random(100);
      // if picked number is greater than Cloud_Chance_per_Day, we will not have clouds today
      if (cloudchance>Cloud_Chance_per_Day) cloudchance=0;
      // Check if today is day for clouds.
      if ((day()%Clouds_Every_X_Days)!=0) cloudchance=0;
      // If we have cloud today
      if (cloudchance)
      {
        // pick a random number for number of clouds between Min_Clouds_per_Day and Max_Clouds_per_Day
        numclouds=random(Min_Clouds_per_Day,Max_Clouds_per_Day);
        // pick the time that the first cloud will start
        // the range is calculated between Start_Cloud_After and the even distribuition of clouds on this day.
        cloudstart=random(Start_Cloud_After,Start_Cloud_After+((End_Cloud_Before-Start_Cloud_After)/(numclouds*2)));
        // pick a random number for the cloud duration of first cloud.
        cloudduration=random(Min_Cloud_Duration,Max_Cloud_Duration);
        //Pick a random number between 0 and 99
        lightningchance=random(100);
        // if picked number is greater than Lightning_Chance_per_Cloud, we will not have lightning today
        if (lightningchance>Lightning_Chance_per_Cloud) lightningchance=0;
      }
    }
  // Now that we have all the parameters for the cloud, let's create the effect

  if (ReefAngel.Relay.isMaskOn(LED_STORM)) {
    InternalMemory.write(Mem_B_EnableStorm,false);
  }
  if (ReefAngel.Relay.isMaskOff(LED_STORM)) {
    InternalMemory.write(Mem_B_EnableStorm,true);
  }

  if (InternalMemory.read(Mem_B_EnableStorm)) return;
  
 
  if (cloudchance)
  {
    if (ReefAngel.Relay.isMaskOff(TRIGGER_STORM))      // Change this to whatever port you want to use as a trigger.
    {
      cloudstart = NumMins(hour(), minute());
      ReefAngel.Relay.Auto(TRIGGER_STORM);    // Here, too.
    }
    //is it time for cloud yet?
    if (NumMins(hour(),minute())>=cloudstart && NumMins(hour(),minute())<(cloudstart+cloudduration))
    {
      // Increase Blue channel first for better effect and to compensate for drop in Whites
      ActinicPWMValue1=ReversePWMSlopeHighRes(cloudstart,cloudstart+cloudduration,ActinicPWMValue1,ActinicPWMValue1+DaylightPWMValue0,180);
      ActinicPWMValue3=ReversePWMSlopeHighRes(cloudstart,cloudstart+cloudduration,ActinicPWMValue3,ActinicPWMValue3+DaylightPWMValue2,180);
     
      DaylightPWMValue0=ReversePWMSlopeHighRes(cloudstart,cloudstart+cloudduration,DaylightPWMValue0,0,180);
      DaylightPWMValue2=ReversePWMSlopeHighRes(cloudstart,cloudstart+cloudduration,DaylightPWMValue2,0,180);
      if (chooseLightning)
      {
        lightningMode=LightningModes[random(100)%sizeof(LightningModes)];
        chooseLightning=false;
      }
      switch (lightningMode)
      {
      case Calm:
        break;
      case Mega:
        // Lightning chance from beginning of cloud through the end.  Chance increases with darkness of cloud.
        if (lightningchance && random(ReversePWMSlope(cloudstart,cloudstart+cloudduration,100,0,180))<1 && (millis()-DelayCounter)>DelayTime)
        {
          // Send the trigger
          Strike();
          DelayCounter=millis();    // If we just had a round of flashes, then lets put in a longer delay
          DelayTime=random(1000);   // of up to a second for dramatic effect before we do another round.
        }
        break;
      case Mega2:
        // Higher lightning chance from beginning of cloud through the end.  Chance increases with darkness of cloud.
        if (lightningchance && random(ReversePWMSlope(cloudstart,cloudstart+cloudduration,100,0,180))<2)
        {
          Strike();
        }
        break;
      case Fast:
        // 5 seconds of lightning in the middle of the cloud
        if (lightningchance && (NumMins(hour(),minute())==(cloudstart+(cloudduration/2))) && second()<5 && (millis()-DelayCounter)>DelayTime)
        {
          Strike();

          DelayCounter=millis();    // If we just had a round of flashes, then lets put in a longer delay
          DelayTime=random(1000);   // of up to a second for dramatic effect before we do another round.
        }
        break;
      case Slow:
        // Slow lightning for 5 seconds in the middle of the cloud.  Suitable for slower ELN style drivers
        if (lightningchance && second()%40<8)
        {
          SlowStrike();
        }
        break;
      default:
        break;
      }
    }
    else
    {
      chooseLightning=true; // Reset the flag to choose a new lightning type
    }

    if (NumMins(hour(),minute())>(cloudstart+cloudduration))
    {
      cloudindex++;
      if (cloudindex < numclouds)
      {
        cloudstart=random(Start_Cloud_After+(((End_Cloud_Before-Start_Cloud_After)/(numclouds*2))*cloudindex*2),(Start_Cloud_After+(((End_Cloud_Before-Start_Cloud_After)/(numclouds*2))*cloudindex*2))+((End_Cloud_Before-Start_Cloud_After)/(numclouds*2)));
        // pick a random number for the cloud duration of first cloud.
        cloudduration=random(Min_Cloud_Duration,Max_Cloud_Duration);
        //Pick a random number between 0 and 99
        lightningchance=random(100);
        // if picked number is greater than Lightning_Chance_per_Cloud, we will not have lightning today
        if (lightningchance>Lightning_Chance_per_Cloud) lightningchance=0;
      }
    } 
  }
 
  // Cloud ON option - Clouds every minute
  if (ReefAngel.Relay.isMaskOn(TRIGGER_STORM) && now()%60<10)
  {
    SlowStrike();
  }
}

void SlowStrike()
{
    int r = random(100);
    if (r<20) lightningstatus=1;
    else lightningstatus=0;
    if (lightningstatus)
    {
      // Let's separate left and right both.
      if (r<14) {
        DaylightPWMValue0=4095;
        DaylightPWMValue2=4095;
        ActinicPWMValue1=4095;
        ActinicPWMValue3=4095;
      } else if (r<17) {
        DaylightPWMValue0=100;
        DaylightPWMValue2=4095;
        ActinicPWMValue3=4095;
      } else {
        DaylightPWMValue0=4095;
        ActinicPWMValue1=4095;
        DaylightPWMValue2=100;
      }
    }
    else
    {
      DaylightPWMValue0=100;
      DaylightPWMValue2=100;
    }
    delay(1);
} 

void DrawClouds(int x, int y)
{
    // Write the times of the next cloud, next lightning, and cloud duration to the screen and into some customvars for the Portal.
    ReefAngel.LCD.DrawText(0,255,x,y,"C"); x+=6;
    ReefAngel.LCD.DrawText(0,255,x,y,"00:00"); x+=34;
    ReefAngel.LCD.DrawText(0,255,x,y,"L"); x+=6;
    ReefAngel.LCD.DrawText(0,255,x,y,"00:00"); x=5;
    if (cloudchance && (NumMins(hour(),minute())<cloudstart))
    {
      int x=0;
      if ((cloudstart/60)>=10) x=11;
      else x=17;
      ReefAngel.LCD.DrawText(0,255,x,y,(cloudstart/60));
      ReefAngel.CustomVar[0]=cloudstart/60; // Write the hour of the next cloud to custom variable for Portal reporting
      if ((cloudstart%60)>=10) x=29;
      else x=35;
      ReefAngel.LCD.DrawText(0,255,x,y,(cloudstart%60));
      ReefAngel.CustomVar[1]=cloudstart%60; // Write the minute of the next cloud to custom variable for Portal reporting

    }
    ReefAngel.LCD.DrawText(0,255,x+85,y,cloudduration);
    ReefAngel.CustomVar[2]=(cloudduration);    // Put the duration of the next cloud in a custom var for the portal
    if (lightningchance)
    {
      int x=0;
      if (((cloudstart+(cloudduration/3))/60)>=10) x=51;
      else x=57;
      ReefAngel.LCD.DrawText(0,255,x,y,((cloudstart+(cloudduration/3))/60));
      ReefAngel.CustomVar[6]=(cloudstart+(cloudduration/2))/60;    // Write the hour of the next lightning to a custom variable for the Portal
      if (((cloudstart+(cloudduration/3))%60)>=10) x=69;
      else x=75;
        ReefAngel.LCD.DrawText(0,255,x,y,((cloudstart+(cloudduration/3))%60)); // Write the minute of the next lightning to a custom variable for the Portal
        ReefAngel.CustomVar[7]=(cloudstart+(cloudduration/2))%60;
    }
}

void Strike()
{
  int a=random(1,5);    // Pick a number of consecutive flashes from 1 to 4. 
  for (int i=0; i<a; i++)
  {
    // Flash on
    int newdata=4095;
    Wire.beginTransmission(0x40);      // Address of the dimming expansion module
    Wire.write(0x8+(4*0));             // 0x8 is channel 0, 0x12 is channel 1, etc.  This is channel 0.
    Wire.write(newdata&0xff);          // Send the data 8 bits at a time.  This sends the LSB
    Wire.write(newdata>>8);            // This sends the MSB
    Wire.endTransmission();
   
    Wire.beginTransmission(0x40);      // Address of the dimming expansion module
    Wire.write(0x8+(4*2));             // 0x8 is channel 0, 0x12 is channel 1, etc.  This is channel 2.
    Wire.write(newdata&0xff);          // Send the data 8 bits at a time.  This sends the LSB
    Wire.write(newdata>>8);            // This sends the MSB
    Wire.endTransmission();
   
    int randy=random(20,80);    // Random number for a delay
    if (randy>71) randy=((randy-70)/2)*100;    // Small chance of a longer delay
    delay(randy);                // Wait from 20 to 69 ms, or 100-400 ms
   
    // Flash off.  Return to baseline.
    newdata=ReefAngel.PWM.GetChannelValueRaw(0);   // Use the channel number you're flashing here
    Wire.beginTransmission(0x40);    // Same as above
    Wire.write(0x8+(4*0));
    Wire.write(newdata&0xff);
    Wire.write(newdata>>8);
    Wire.endTransmission();
   
    newdata=ReefAngel.PWM.GetChannelValueRaw(2);   // Use the channel number you're flashing here
    Wire.beginTransmission(0x40);    // Same as above
    Wire.write(0x8+(4*2));
    Wire.write(newdata&0xff);
    Wire.write(newdata>>8);
    Wire.endTransmission();
   
    delay(random(30,50));                // Wait from 30 to 49 ms
    wdt_reset();    // Reset watchdog timer to avoid re-boots
  }
}

byte ReversePWMSlope(long cstart,long cend,byte PWMStart,byte PWMEnd, byte clength)
{
  long n=elapsedSecsToday(now());
  cstart*=60;
  cend*=60;
  if (n<cstart) return PWMStart;
  if (n>=cstart && n<=(cstart+clength)) return map(n,cstart,cstart+clength,PWMStart,PWMEnd);
  if (n>(cstart+clength) && n<(cend-clength)) return PWMEnd;
  if (n>=(cend-clength) && n<=cend) return map(n,cend-clength,cend,PWMEnd,PWMStart);
  if (n>cend) return (int) PWMStart;
}

int ReversePWMSlopeHighRes(long cstart,long cend,int PWMStart,int PWMEnd, byte clength)
{
  long n=elapsedSecsToday(now());
  cstart*=60;
  cend*=60;
  if (n<cstart) return PWMStart;
  if (n>=cstart && n<=(cstart+clength)) return map(n,cstart,cstart+clength,PWMStart,PWMEnd);
  if (n>(cstart+clength) && n<(cend-clength)) return PWMEnd;
  if (n>=(cend-clength) && n<=cend) return map(n,cend-clength,cend,PWMEnd,PWMStart);
  if (n>cend) return (int) PWMStart;
}
Image
rimai
Posts: 12857
Joined: Fri Mar 18, 2011 6:47 pm

Re: New IDE v1.6.8

Post by rimai »

Ahh. Sorry, I gave you the wrong stuff.
It needs to be:

Code: Select all

PROGMEM const char * const menu_items[] = {
Roberto.
troylong45
Posts: 203
Joined: Sat Oct 10, 2015 9:17 pm

Re: New IDE v1.6.8

Post by troylong45 »

good to go looks like ill keep an eye on things thanks rimai
Image
binder
Posts: 2865
Joined: Fri Mar 18, 2011 6:20 pm
Location: Illinois
Contact:

Re: New IDE v1.6.8

Post by binder »

Do you have the updated source/changes available on github? I was going to build/compile it for Linux (since that's where I do my main development/testing).
rimai
Posts: 12857
Joined: Fri Mar 18, 2011 6:47 pm

Re: New IDE v1.6.8

Post by rimai »

yeap. should be there.
Roberto.
binder
Posts: 2865
Joined: Fri Mar 18, 2011 6:20 pm
Location: Illinois
Contact:

Re: New IDE v1.6.8

Post by binder »

rimai wrote:yeap. should be there.
ok. i looked at the arduino project under the reefangel account and your branch was from 2013. so I was just curious.

edit: sorry I missed the reefangel branch and only saw the reefangel-1.5.x branch.
I see the changes now I think. ☺️

Sent from my XT1585 using Tapatalk
rimai
Posts: 12857
Joined: Fri Mar 18, 2011 6:47 pm

Re: New IDE v1.6.8

Post by rimai »

Sorry. It was committed to my local git and I never pushed it to github
I just did now
Roberto.
binder
Posts: 2865
Joined: Fri Mar 18, 2011 6:20 pm
Location: Illinois
Contact:

Re: New IDE v1.6.8

Post by binder »

rimai wrote:Sorry. It was committed to my local git and I never pushed it to github
I just did now
ok. no worries. thanks!

Sent from my XT1585 using Tapatalk
binder
Posts: 2865
Joined: Fri Mar 18, 2011 6:20 pm
Location: Illinois
Contact:

Re: New IDE v1.6.8

Post by binder »

I'm getting some errors when I installed the mac version listed in the OP.

Here's the errors I get:

Code: Select all

Arduino:  (Reef Angel compilation) v1.6.8 (Mac OS X), Board: "Reef Angel Plus Controller"

The following features were automatically added:
Watchdog Timer
Version Menu

The following features were detected:
Wifi Attachment
DC Pump Control (Jebao/Tunze)
Dimming Signal
2014 Main Screen
Extra Font - Medium Size (8x8 pixels)
Salinity Expansion Module
Water Level Expansion Module
Simple Menu
failed MSpanList_Insert 0x30c6c0 0x399ecd5329b9 0x0
fatal error: MSpanList_Insert

runtime stack:
runtime.MSpanList_Insert(0x2c7e08, 0x30c6c0)
	/usr/local/go/src/runtime/mheap.c:692 +0x8f
runtime.MHeap_Alloc(0x2c6c20, 0x1, 0x1000000002b, 0x10359)
	/usr/local/go/src/runtime/mheap.c:240 +0x66
runtime.MCentral_CacheSpan(0x2d05b8, 0x194ec0)
	/usr/local/go/src/runtime/mcentral.c:85 +0x167
runtime.MCache_Refill(0x307000, 0x10000002b, 0x30b548)
	/usr/local/go/src/runtime/mcache.c:90 +0xa0

goroutine 1 [running]:
runtime.switchtoM()
	/usr/local/go/src/runtime/asm_amd64.s:198 fp=0xc208030fe8 sp=0xc208030fe0
runtime.mallocgc(0x1000, 0x159ce0, 0x1, 0x28)
	/usr/local/go/src/runtime/malloc.go:178 +0x849 fp=0xc208031098 sp=0xc208030fe8
runtime.newarray(0x159ce0, 0x1000, 0x307000)
	/usr/local/go/src/runtime/malloc.go:365 +0xc1 fp=0xc2080310d0 sp=0xc208031098
runtime.makeslice(0x151960, 0x1000, 0x1000, 0x0, 0x0, 0x0)
	/usr/local/go/src/runtime/slice.go:32 +0x15c fp=0xc208031118 sp=0xc2080310d0
os.(*File).readdirnames(0xc208040068, 0xffffffffffffffff, 0x0, 0x0, 0x0, 0x0, 0x0)
	/usr/local/go/src/os/dir_unix.go:23 +0xd9 fp=0xc208031208 sp=0xc208031118
os.(*File).Readdirnames(0xc208040068, 0xffffffffffffffff, 0x0, 0x0, 0x0, 0x0, 0x0)
	/usr/local/go/src/os/doc.go:134 +0x9e fp=0xc208031248 sp=0xc208031208
arduino.cc/builder/gohasissues.readDirNames(0xc208034040, 0x3e, 0x0, 0x0, 0x0, 0x0, 0x0)
	/Users/jenkins/jenkins/workspace/arduino-builder-macosx/src/arduino.cc/builder/gohasissues/go_has_issues.go:93 +0xdd fp=0xc2080312b8 sp=0xc208031248
arduino.cc/builder/gohasissues.walk(0xc208034040, 0x3e, 0x318c98, 0xc208066460, 0xc2080315d8, 0x0, 0x0)
	/Users/jenkins/jenkins/workspace/arduino-builder-macosx/src/arduino.cc/builder/gohasissues/go_has_issues.go:62 +0x1bf fp=0xc2080313f0 sp=0xc2080312b8
arduino.cc/builder/gohasissues.walk(0x7fff5fbffb42, 0x3a, 0x318c98, 0xc208036c80, 0xc2080315d8, 0x0, 0x0)
	/Users/jenkins/jenkins/workspace/arduino-builder-macosx/src/arduino.cc/builder/gohasissues/go_has_issues.go:75 +0x516 fp=0xc208031528 sp=0xc2080313f0
arduino.cc/builder/gohasissues.Walk(0x7fff5fbffb42, 0x3a, 0xc2080315d8, 0x0, 0x0)
	/Users/jenkins/jenkins/workspace/arduino-builder-macosx/src/arduino.cc/builder/gohasissues/go_has_issues.go:46 +0xf2 fp=0xc208031590 sp=0xc208031528
arduino.cc/builder.findBuiltinToolsVersionsFile(0x7fff5fbffb42, 0x3a, 0x0, 0x0, 0x0, 0x0)
	/Users/jenkins/jenkins/workspace/arduino-builder-macosx/src/arduino.cc/builder/tools_loader.go:163 +0xa0 fp=0xc2080315f0 sp=0xc208031590
arduino.cc/builder.(*ToolsLoader).Run(0x2c0908, 0xc20803c510, 0x0, 0x0)
	/Users/jenkins/jenkins/workspace/arduino-builder-macosx/src/arduino.cc/builder/tools_loader.go:50 +0x1ec fp=0xc208031788 sp=0xc2080315f0
arduino.cc/builder.(*ContainerSetupHardwareToolsLibsSketchAndProps).Run(0x2c0908, 0xc20803c510, 0x0, 0x0)
	/Users/jenkins/jenkins/workspace/arduino-builder-macosx/src/arduino.cc/builder/container_setup.go:59 +0x6b8 fp=0xc208031978 sp=0xc208031788
arduino.cc/builder.runCommands(0xc20803c510, 0xc208031b90, 0x1d, 0x1d, 0x19501, 0x0, 0x0)
	/Users/jenkins/jenkins/workspace/arduino-builder-macosx/src/arduino.cc/builder/builder.go:187 +0x139 fp=0xc208031a08 sp=0xc208031978
arduino.cc/builder.(*Builder).Run(0xc208031d88, 0xc20803c510, 0x0, 0x0)
	/Users/jenkins/jenkins/workspace/arduino-builder-macosx/src/arduino.cc/builder/builder.go:118 +0xef7 fp=0xc208031d68 sp=0xc208031a08
arduino.cc/builder.RunBuilder(0xc20803c510, 0x0, 0x0)
	/Users/jenkins/jenkins/workspace/arduino-builder-macosx/src/arduino.cc/builder/builder.go:218 +0x49 fp=0xc208031d90 sp=0xc208031d68
main.main()
	/Users/jenkins/jenkins/workspace/arduino-builder-macosx/main.go:320 +0x1eb2 fp=0xc208031f98 sp=0xc208031d90
runtime.main()
	/usr/local/go/src/runtime/proc.go:63 +0xf3 fp=0xc208031fe0 sp=0xc208031f98
runtime.goexit()
	/usr/local/go/src/runtime/asm_amd64.s:2232 +0x1 fp=0xc208031fe8 sp=0xc208031fe0
arduino-builder returned 2
Error compiling for board Reef Angel Plus Controller.

This report would have more information with
"Show verbose output during compilation"
option enabled in File -> Preferences.
I replaced my Arduino folder inside Documents with the new one from the DMG file.
I copied the Arduino15 folder into the Library folder.
I replaced the original Arduino app with the new one from the DMG file.

I launched the arduino program and it shows the 1.6.8 Reef Angel compilation in the title bar. I have the library manager, etc viewable. I originally got this error when I tried to compile my existing sketch file. So I just used the wizard and generated a simple file and this is the same output.
Before I dive into it any further, anybody got any tips on this?
rimai
Posts: 12857
Joined: Fri Mar 18, 2011 6:47 pm

Re: New IDE v1.6.8

Post by rimai »

Hummm.
I don't get this error here and can't replicate :(
Roberto.
rimai
Posts: 12857
Joined: Fri Mar 18, 2011 6:47 pm

Re: New IDE v1.6.8

Post by rimai »

Do you happen to have Sierra OSX?
I may need to update the IDE again and recompile :(
https://github.com/arduino/Arduino/issues/5360
Roberto.
binder
Posts: 2865
Joined: Fri Mar 18, 2011 6:20 pm
Location: Illinois
Contact:

Re: New IDE v1.6.8

Post by binder »

rimai wrote:Do you happen to have Sierra OSX?
I may need to update the IDE again and recompile :(
https://github.com/arduino/Arduino/issues/5360
yup. I'm running the latest version. it's not a big deal or big rush. I can still use the webwizard and I'm working on getting it to work under my Linux/Debian desktop (just going slow).

Sent from my XT1585 using Tapatalk
binder
Posts: 2865
Joined: Fri Mar 18, 2011 6:20 pm
Location: Illinois
Contact:

Re: New IDE v1.6.8

Post by binder »

I have the latest built for Linux but am missing some of the changes for us. I'm missing the boards.txt custom file and maybe some other stuff. my list of boards is all of the arduino boards (I'm assuming the defaults). is this file in github? are there certain files or certain things you do during the build process to create the package/exe for distribution?

Sent from my XT1585 using Tapatalk
rimai
Posts: 12857
Joined: Fri Mar 18, 2011 6:47 pm

Re: New IDE v1.6.8

Post by rimai »

board.txt

Code: Select all

menu.cpu=Processor

##############################################################

RA.name=Reef Angel Controller w/ optiboot

RA.vid.0=0x2341
RA.pid.0=0x0043
RA.vid.1=0x2341
RA.pid.1=0x0001
RA.vid.2=0x2A03
RA.pid.2=0x0043
RA.vid.3=0x2341
RA.pid.3=0x0243

RA.upload.tool=avrdude
RA.upload.protocol=arduino
RA.upload.maximum_size=32256
RA.upload.maximum_data_size=2048
RA.upload.speed=115200

RA.bootloader.tool=avrdude
RA.bootloader.low_fuses=0xFF
RA.bootloader.high_fuses=0xDE
RA.bootloader.extended_fuses=0x05
RA.bootloader.unlock_bits=0x3F
RA.bootloader.lock_bits=0x0F
RA.bootloader.file=reefangel/optiboot_ReefAngel.hex

RA.build.mcu=atmega328p
RA.build.f_cpu=16000000L
RA.build.board=AVR_RA
RA.build.core=arduino
RA.build.variant=standard

##############################################################

diecimila.name=Reef Angel Controller

diecimila.upload.tool=avrdude
diecimila.upload.protocol=arduino
diecimila.upload.maximum_size=30720
diecimila.upload.maximum_data_size=2048
diecimila.upload.speed=57600

diecimila.bootloader.tool=avrdude
diecimila.bootloader.low_fuses=0xFF
diecimila.bootloader.unlock_bits=0x3F
diecimila.bootloader.lock_bits=0x0F
diecimila.bootloader.high_fuses=0xDA
diecimila.bootloader.extended_fuses=0x05
diecimila.bootloader.file=atmega/ATmegaBOOT_168_atmega328.hex

diecimila.build.mcu=atmega328p
diecimila.build.f_cpu=16000000L
diecimila.build.board=AVR_DUEMILANOVE
diecimila.build.core=arduino
diecimila.build.variant=standard

##############################################################

RAPlus.name=Reef Angel Plus Controller

RAPlus.vid.0=0x2341
RAPlus.pid.0=0x0010
RAPlus.vid.1=0x2341
RAPlus.pid.1=0x0042
RAPlus.vid.2=0x2A03
RAPlus.pid.2=0x0010
RAPlus.vid.3=0x2A03
RAPlus.pid.3=0x0042
RAPlus.vid.4=0x2341
RAPlus.pid.4=0x0210
RAPlus.vid.5=0x2341
RAPlus.pid.5=0x0242

RAPlus.upload.tool=avrdude
RAPlus.upload.protocol=wiring
RAPlus.upload.maximum_size=253952
RAPlus.upload.maximum_data_size=8192
RAPlus.upload.speed=115200

RAPlus.bootloader.tool=avrdude
RAPlus.bootloader.low_fuses=0xFF
RAPlus.bootloader.unlock_bits=0x3F
RAPlus.bootloader.lock_bits=0x0F
RAPlus.bootloader.high_fuses=0xD8
RAPlus.bootloader.extended_fuses=0xFD
RAPlus.bootloader.file=reefangel/stk500boot_RAPlus.hex

RAPlus.build.mcu=atmega2560
RAPlus.build.f_cpu=16000000L
RAPlus.build.board=AVR_MEGA2560
RAPlus.build.core=arduino
RAPlus.build.variant=RAPlus

##############################################################

RAStar.name=Reef Angel Star Controller

RAStar.vid.0=0x2341
RAStar.pid.0=0x0010
RAStar.vid.1=0x2341
RAStar.pid.1=0x0042
RAStar.vid.2=0x2A03
RAStar.pid.2=0x0010
RAStar.vid.3=0x2A03
RAStar.pid.3=0x0042
RAStar.vid.4=0x2341
RAStar.pid.4=0x0210
RAStar.vid.5=0x2341
RAStar.pid.5=0x0242

RAStar.upload.tool=avrdude
RAStar.upload.protocol=wiring
RAStar.upload.maximum_size=253952
RAStar.upload.maximum_data_size=8192
RAStar.upload.speed=115200

RAStar.bootloader.tool=avrdude
RAStar.bootloader.low_fuses=0xFF
RAStar.bootloader.unlock_bits=0x3F
RAStar.bootloader.lock_bits=0x0F
RAStar.bootloader.high_fuses=0xD8
RAStar.bootloader.extended_fuses=0xFD
RAStar.bootloader.file=reefangel/stk500boot_RA_Star.hex

RAStar.build.mcu=atmega2560
RAStar.build.f_cpu=16000000L
RAStar.build.board=AVR_MEGA2560
RAStar.build.core=arduino
RAStar.build.variant=RAPlus
Roberto.
rimai
Posts: 12857
Joined: Fri Mar 18, 2011 6:47 pm

Re: New IDE v1.6.8

Post by rimai »

The exe for windows is done with Inno Setup to create an installation file.
It's not part of the build process.
The files that the installer goes through and places in the proper spots are:

Code: Select all

Source: "arduino-1.6.8\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
Source: "Wifi_Utility.exe"; DestDir: "{app}";
Source: "INO\*"; DestDir: "{userdocs}\Arduino\Example Codes\"; Flags: ignoreversion recursesubdirs createallsubdirs
Source: "RA_Preloaded\*"; DestDir: "{userdocs}\Arduino\RA_Preloaded\"; Flags: ignoreversion recursesubdirs createallsubdirs
Source: "libraries\*"; DestDir: "{userdocs}\Arduino\libraries\"; Flags: ignoreversion recursesubdirs createallsubdirs 
Source: "tools\*"; DestDir: "{userdocs}\Arduino\tools\"; Flags: ignoreversion recursesubdirs createallsubdirs
Source: "update\*"; DestDir: "{userdocs}\Arduino\update\"; Flags: ignoreversion recursesubdirs createallsubdirs
Source: "drivers\*"; DestDir: "{app}\drivers"; Flags: ignoreversion recursesubdirs createallsubdirs
Source: "lib\*"; DestDir: "{app}\lib"; Flags: ignoreversion recursesubdirs createallsubdirs
Source: "data\*"; DestDir: "{app}\data"; Flags: ignoreversion recursesubdirs createallsubdirs
Source: "Arduino15\*"; DestDir: "{localappdata}\Arduino15"; Flags: ignoreversion recursesubdirs createallsubdirs
Source: "preferences.txt"; DestDir: "{userappdata}\Arduino";
Mostly the example codes and wizard files.
Roberto.
binder
Posts: 2865
Joined: Fri Mar 18, 2011 6:20 pm
Location: Illinois
Contact:

Re: New IDE v1.6.8

Post by binder »

rimai wrote:The exe for windows is done with Inno Setup to create an installation file.
It's not part of the build process.
The files that the installer goes through and places in the proper spots are:

Code: Select all

Source: "arduino-1.6.8\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
Source: "Wifi_Utility.exe"; DestDir: "{app}";
Source: "INO\*"; DestDir: "{userdocs}\Arduino\Example Codes\"; Flags: ignoreversion recursesubdirs createallsubdirs
Source: "RA_Preloaded\*"; DestDir: "{userdocs}\Arduino\RA_Preloaded\"; Flags: ignoreversion recursesubdirs createallsubdirs
Source: "libraries\*"; DestDir: "{userdocs}\Arduino\libraries\"; Flags: ignoreversion recursesubdirs createallsubdirs 
Source: "tools\*"; DestDir: "{userdocs}\Arduino\tools\"; Flags: ignoreversion recursesubdirs createallsubdirs
Source: "update\*"; DestDir: "{userdocs}\Arduino\update\"; Flags: ignoreversion recursesubdirs createallsubdirs
Source: "drivers\*"; DestDir: "{app}\drivers"; Flags: ignoreversion recursesubdirs createallsubdirs
Source: "lib\*"; DestDir: "{app}\lib"; Flags: ignoreversion recursesubdirs createallsubdirs
Source: "data\*"; DestDir: "{app}\data"; Flags: ignoreversion recursesubdirs createallsubdirs
Source: "Arduino15\*"; DestDir: "{localappdata}\Arduino15"; Flags: ignoreversion recursesubdirs createallsubdirs
Source: "preferences.txt"; DestDir: "{userappdata}\Arduino";
Mostly the example codes and wizard files.
awesome! thanks. that looks like it will help me build/create a package for Linux to be "unzipped" and ran. :mrgreen:

Sent from my XT1585 using Tapatalk
binder
Posts: 2865
Joined: Fri Mar 18, 2011 6:20 pm
Location: Illinois
Contact:

Re: New IDE v1.6.8

Post by binder »

I did some further digging into everything to get a build working for me.
I tested both of the installers linked in the OP and I came across some stuff:
  • None of the installers contain the RA* board. (I have to use the boards.txt file that was provided in the discussion.)
  • The RA* bootloader is not included in the github repository.
I know that it's not a big deal but I did notice in the boards.txt file that the bootloader folder has changed a little and there's a reefangel folder that contains all the bootloaders for simplicity.

I'm assuming that the bootloader files were just copied and renamed to the appropriate RAPlus and RAStar hex files. Is there anything else different with them? Or can I just create the Star file using the same RAPlus file? I'm assuming this is safe and the way I need to handle it based on other discussions.
binder
Posts: 2865
Joined: Fri Mar 18, 2011 6:20 pm
Location: Illinois
Contact:

Re: New IDE v1.6.8

Post by binder »

SUCCESS!!

I now have a working arduino build for 64bit linux and uses the latest dev libraries and can talk to the RA* just fine. Woohoo!

Now I can get some of these fixes made and posted. :ugeek:
rimai
Posts: 12857
Joined: Fri Mar 18, 2011 6:47 pm

Re: New IDE v1.6.8

Post by rimai »

Yeah, the bootloader is only required once.
We never had to burn bootloader in the past, but if someone were to create RA* from scratch, they would need that.
Attached is a revised board.txt and the bootloader. I changed the name to comply with what I had in here.
Attachments
RA Star boards and bootloader.zip
(8.79 KiB) Downloaded 508 times
Roberto.
binder
Posts: 2865
Joined: Fri Mar 18, 2011 6:20 pm
Location: Illinois
Contact:

Re: New IDE v1.6.8

Post by binder »

cool. i didn't think we needed to worry about it because it was already set. however arduino wouldn't let me compile and upload without having it.
i remember with the original ra when you switched bootloaders and we had to burn the optiboot one....i still have my programmer from back then for it....never had to use it since either. :-)


Sent from my iPad using Tapatalk
Naptalene
Posts: 98
Joined: Tue Nov 05, 2013 12:50 am

Re: New IDE v1.6.8

Post by Naptalene »

Hi,

When I use the Dev IDE and the web wizard, my custom labels don't come up on the head unit and my DCpump mode doesn't reflect the correct mode on startup. The DCpump mode is a bit of a non-issue as once I re-set it via the U-App it's fine.
If I revert to the standard IDE (1.1.3 not the dev) it all loads as expected.

Have I missed something?

Thanks
Believe it or not.... I can ask even stupider questions than this one.
rimai
Posts: 12857
Joined: Fri Mar 18, 2011 6:47 pm

Re: New IDE v1.6.8

Post by rimai »

We were running into issues with the labels being declared the way they were.
So everything got moved to RA_CustomsLabels.h file.
You need to manually edit it if you are using the Arduino IDE.
The web wizard needs to be updated still. It's on my todo list.
Roberto.
Naptalene
Posts: 98
Joined: Tue Nov 05, 2013 12:50 am

Re: New IDE v1.6.8

Post by Naptalene »

Ah, ok cool, thanks :)
I have gotten a second RA system for my new build and I've started coding it. Am I correct that the web wizard and IDEv1.6.8 are where the system is headed? So it makes sense to keep programming with one of those two instead of the older standard version?

EDIT- Geez, after using the WebPlugin, the IDE is EXTREMELY ugly and bright lol. It's much more pleasant to use the webplug.
Believe it or not.... I can ask even stupider questions than this one.
rimai
Posts: 12857
Joined: Fri Mar 18, 2011 6:47 pm

Re: New IDE v1.6.8

Post by rimai »

I think you are better off using the web wizard from now on.
Roberto.
Naptalene
Posts: 98
Joined: Tue Nov 05, 2013 12:50 am

Re: New IDE v1.6.8

Post by Naptalene »

Ok Cool, thanks :)
Believe it or not.... I can ask even stupider questions than this one.
binder
Posts: 2865
Joined: Fri Mar 18, 2011 6:20 pm
Location: Illinois
Contact:

Re: New IDE v1.6.8

Post by binder »

rimai wrote:Do you happen to have Sierra OSX?
I may need to update the IDE again and recompile :(
https://github.com/arduino/Arduino/issues/5360
I know this is on your list of items, but just checking on the status of this. I'm running High Sierra OSX as my main setup for now (and probably will be for several months).
I can switch to running a VM of linux to get things working for me (since I already had/have it running under linux).
Anyways, just curious. :?:
Post Reply