There were several changes that were needed to be made. Here's a list of the changes that I made for you.
I think there are some improvements that could be made with the PWM Expansion stuff since some of the functions have now been incorporated into the libraries, but I'm simply going with the "if it's not broke, don't fix it" unless Roberto makes those changes.
This should work now.
Code: Select all
// Autogenerated file by RAGen (v1.2.1.158), (02/18/2012 22:40)
// RA_021812_2240.ino
//
// This version designed for v0.9.0 or later
/* The following features are enabled for this File:
#define DisplayLEDPWM
#define wifi
#define WDT
#define SIMPLE_MENU
#define PWMEXPANSION
#define CUSTOM_MAIN
*/
#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 <ReefAngel.h>
// LEDPWM Channel defines for easy code reading
#define LEDPWM0 0
#define LEDPWM1 1
#define LEDPWM2 2
#define LEDPWM3 3
#define LEDPWM4 4
#define LEDPWM5 5
// Initial values to all 6 channels at startup.
byte PWMChannel[]={0,0,0,0,0,0};
void DrawCustomMain()
{
ReefAngel.LCD.DrawDate(6, 120);
pingSerial();
ReefAngel.LCD.DrawText(T1TempColor, DefaultBGColor, 15, 10, "T1:");
ReefAngel.LCD.DrawSingleMonitor(ReefAngel.Params.Temp[T1_PROBE], T1TempColor, 15+18, 10, 10);
ReefAngel.LCD.DrawText(T2TempColor, DefaultBGColor, 15, 10+10, "T2:");
ReefAngel.LCD.DrawSingleMonitor(ReefAngel.Params.Temp[T2_PROBE], T2TempColor, 15+18, 10+10, 10);
ReefAngel.LCD.DrawText(T3TempColor, DefaultBGColor, 15, 10+20, "T3:");
ReefAngel.LCD.DrawSingleMonitor(ReefAngel.Params.Temp[T3_PROBE], T3TempColor, 15+18, 10+20, 10);
ReefAngel.LCD.DrawText(PHColor, DefaultBGColor, 15+60, 10, "PH:");
ReefAngel.LCD.DrawSingleMonitor(ReefAngel.Params.PH, PHColor, 15+78, 10, 100);
//ATO status
ReefAngel.LCD.DrawText(DefaultFGColor, DefaultBGColor, 15+60, 10+20, "Pump:");
byte highcolor;
char highstatus[10];
if ( ReefAngel.HighATO.IsActive() )
{
ReefAngel.LCD.DrawText(PHColor, DefaultBGColor, 15+90, 10+20, "ON ");
}
else
{
ReefAngel.LCD.DrawText(T1TempColor, DefaultBGColor, 15+90, 10+20, "OFF");
}
//End ATO status
pingSerial();
byte TempRelay = ReefAngel.Relay.RelayData;
TempRelay &= ReefAngel.Relay.RelayMaskOff;
TempRelay |= ReefAngel.Relay.RelayMaskOn;
ReefAngel.LCD.DrawOutletBox(12, 95, TempRelay);
ReefAngel.LCD.DrawText(0,255,15,52,"RB:");
ReefAngel.LCD.DrawText(0,255,15,62,"BB:");
ReefAngel.LCD.DrawText(0,255,15,72,"CW:");
ReefAngel.LCD.DrawText(0,255,15,82,"WW:");
ReefAngel.LCD.DrawText(0,255,15+20,52,PWMChannel[LEDPWM0]);
ReefAngel.LCD.DrawText(0,255,15+20,62,PWMChannel[LEDPWM1]);
ReefAngel.LCD.DrawText(0,255,15+20,72,PWMChannel[LEDPWM2]);
ReefAngel.LCD.DrawText(0,255,15+20,82,PWMChannel[LEDPWM3]);
}
void DrawCustomGraph()
{
ReefAngel.LCD.DrawGraph(5, 5);
}
void setup()
{
ReefAngel.Init(); //Initialize controller
// Ports that are always on
ReefAngel.Relay.On(Port1);
ReefAngel.Relay.On(Port2);
}
void loop()
{
// Specific functions
ReefAngel.StandardHeater(Port3);
ReefAngel.StandardLights(Port4);
ReefAngel.Relay.DelayedOn(Port5, 2);
ReefAngel.MHLights(Port8);
// PWM Slope functions for PWM Channels on RA Head unit
ReefAngel.PWM.ActinicPWMSlope();
ReefAngel.PWM.DaylightPWMSlope();
if(ReefAngel.HighATO.IsActive())
{
ReefAngel.Relay.DelayedOn(Port1,1);
}
else
{
ReefAngel.Relay.Off(Port1);
}
//skimmer
if ((hour() >= 12) && (hour() <= 21)) ReefAngel.Relay.DelayedOn(Port5,1);
else ReefAngel.Relay.Off(Port5);
//refugium
if ((hour() >= 12) && (hour() <= 21)) ReefAngel.Relay.Off(Port6);
else ReefAngel.Relay.On(Port6);
if ((hour() >= 12) && (hour() <= 21)) ReefAngel.Relay.On(Port7);
else ReefAngel.Relay.Off(Port7);
PWMChannel[LEDPWM3]=MoonPhase();
// Calculate your regular sunrise/sunset PWM value
PWMChannel[LEDPWM0]=PWMSlope(12,30,22,00,0,80,240,PWMChannel[LEDPWM0]);
PWMChannel[LEDPWM1]=PWMSlope(12,00,22,15,0,70,240,PWMChannel[LEDPWM1]);
PWMChannel[LEDPWM2]=PWMSlope(13,30,21,30,0,30,180,PWMChannel[LEDPWM2]);
PWMChannel[LEDPWM3]=PWMSlope(15,0,23,00,0,60,180,PWMChannel[LEDPWM3]);
//PWMChannel[LEDPWM0]=PWMSlope(16,30,21,00,0,80,120,PWMChannel[LEDPWM0]);
//PWMChannel[LEDPWM1]=PWMSlope(16,00,21,15,0,70,120,PWMChannel[LEDPWM1]);
//PWMChannel[LEDPWM2]=PWMSlope(17,30,20,30,0,30,60,PWMChannel[LEDPWM2]);
//PWMChannel[LEDPWM3]=PWMSlope(16,0,21,00,0,60,120,PWMChannel[LEDPWM3]);
CheckCloud();
PWMExpansion(LEDPWM0,int(2.55*PWMChannel[LEDPWM0]));
PWMExpansion(LEDPWM1,int(2.55*PWMChannel[LEDPWM1]));
PWMExpansion(LEDPWM2,int(2.55*PWMChannel[LEDPWM2]));
PWMExpansion(LEDPWM3,int(2.55*PWMChannel[LEDPWM3]));
ReefAngel.Portal("aranax");
ReefAngel.ShowInterface();
}
//*********************************************************************************************************************************
//Start of PWM slope function code designed for the PWM Expansion module
void PWMExpansion(byte cmd, byte data)
{
Wire.beginTransmission(8); // transmit to device #2
Wire.send('$'); // sends $
Wire.send('$'); // sends $
Wire.send('$'); // sends $
Wire.send(cmd); // sends a value
Wire.send(data); // sends 255
Wire.endTransmission(); // stop transmitting
}
//End of PWM slope function code designed for the PWM Expansion module
//*********************************************************************************************************************************
//*********************************************************************************************************************************
// Random Cloud/Thunderstorm effects function
void CheckCloud()
{
// ------------------------------------------------------------
// 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 1
// 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 75
// Minimum number of minutes for cloud duration. Don't use max duration of less than 6
#define Min_Cloud_Duration 7
// Maximum number of minutes for the cloud duration. Don't use max duration of more than 255
#define Max_Cloud_Duration 15
// Minimum number of clouds that can happen per day
#define Min_Clouds_per_Day 3
// Maximum number of clouds that can happen per day
#define Max_Clouds_per_Day 5
// Only start the cloud effect after this setting
// In this example, start could after 11:30am
#define Start_Cloud_After NumMins(13 ,30)
// Always end the cloud effect before this setting
// In this example, end could before 8:00pm
#define End_Cloud_Before NumMins(18,30)
// 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_Change_per_Cloud 60
// Channels used by the actinic LEDs on the PWM Expansion module
// These channels will not be dimmed when the cloud effect is triggered
// Number is a binary form. B001100 means channel 2 and 3 are used for actinics
#define Actinic_Channels B000001
// Channels used by the daylight LEDs on the PWM Expansion module
// These channels will be used for the spike when lightning effect is triggered
// Number is a binary form. B000011 means channel 0 and 1 are used for daylights
#define Daylight_Channels B001110
// 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 resul 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.
// Change the values above to customize your cloud/storm effect
// ------------------------------------------------------------
// 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 int LastNumMins=0;
// 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
{
//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_Change_per_Cloud, we will not have lightning today
if (lightningchance>Lightning_Change_per_Cloud) lightningchance=0;
}
}
// Now that we have all the parameters for the cloud, let's create the effect
if (cloudchance)
{
//is it time for cloud yet?
if (NumMins(hour(),minute())>=cloudstart && NumMins(hour(),minute())<(cloudstart+cloudduration))
{
// let's go through all channels to pick which ones will be dimmed
for (int a=0;a<6;a++)
{
if (bitRead(Actinic_Channels,a)==0)
{
// this will slope down the channel from the current PWM to 0 within 3minutes.
// then it will stay at 0 for the duration of the cycle
// and finally slope up from 0 to PWM value within 3 minutes
// it is basically an inversed slope
PWMChannel[a]-=PWMSlope(cloudstart/60,cloudstart%60,(cloudstart+cloudduration)/60,(cloudstart+cloudduration)%60,0,PWMChannel[a],3,PWMChannel[a]);
}
}
if (lightningchance && (NumMins(hour(),minute())==(cloudstart+(cloudduration/2))) && second()<5)
{
for (int b=0;b<6;b++)
{
if (bitRead(Daylight_Channels,b)==1)
{
if (random(100)<20) lightningstatus=1;
else lightningstatus=0;
if (lightningstatus) PWMChannel[b]=100;
else PWMChannel[b]=0;
//delay(10);
}
else
{
PWMChannel[b]=20;
}
}
}
}
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_Change_per_Cloud, we will not have lightning today
if (lightningchance>Lightning_Change_per_Cloud) lightningchance=0;
}
}
}
if (LastNumMins!=NumMins(hour(),minute()))
{
LastNumMins=NumMins(hour(),minute());
ReefAngel.LCD.Clear(255,0,50,93,90);
ReefAngel.LCD.DrawText(0,255,15+60,52,"CD:");
ReefAngel.LCD.DrawText(0,255,15+60,62,"NC:");
ReefAngel.LCD.DrawText(0,255,15+80,62,cloudindex);
ReefAngel.LCD.DrawText(0,255,24+80,62,"of");
ReefAngel.LCD.DrawText(0,255,38+80,62,numclouds);
ReefAngel.LCD.DrawText(0,255,15+60,72,"CS:");
ReefAngel.LCD.DrawText(0,255,15+80,72,"00:00");
ReefAngel.LCD.DrawText(0,255,15+60,82,"LS:");
ReefAngel.LCD.DrawText(0,255,15+80,82,"00:00");
if (cloudchance && (NumMins(hour(),minute())<cloudstart))
{
int x=0;
if ((cloudstart/60)>=10) x=95; else x=98;
ReefAngel.LCD.DrawText(0,255,x,72,(cloudstart/60));
if ((cloudstart%60)>=10) x=113; else x=119;
ReefAngel.LCD.DrawText(0,255,x,72,(cloudstart%60));
}
ReefAngel.LCD.DrawText(0,255,15+80,52,cloudduration);
if (lightningchance)
{
int x=0;
if (((cloudstart+(cloudduration/2))/60)>=10) x=95; else x=58;
ReefAngel.LCD.DrawText(0,255,x,82,((cloudstart+(cloudduration/2))/60));
if (((cloudstart+(cloudduration/2))%60)>=10) x=113; else x=119;
ReefAngel.LCD.DrawText(0,255,x,82,((cloudstart+(cloudduration/2))%60));
}
}
}
in my file to get it to fit.
Glad you are up and running again.