Skip to content

Bugfix, easy changes to initial time, formatting, readme #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
prashantkamdar wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Bugfix, easy changes to initial time, formatting, readme #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
191 changes: 95 additions & 96 deletions ClockM5Stick/ClockM5Stick.ino
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,125 +1,124 @@
#include "M5StickCPlus.h"
#include "AXP192.h"
#include "7seg70.h"

#include "ani.h"

#define year 2021 // set the year
#define month 5 // set the month
#define date 29 // set the date
#define weekday 6 // set the weekday in number 1=Monday, 2=Tuesday, 3=Wednesday, 4=Thursday, 5=Friday, 6=Saturday, 7=Sunday
#define hour 21 // set the hour
#define minute 50 // set the minute
#define second 0 // set the seconds

#define grey 0x65DB

RTC_TimeTypeDef RTC_TimeStruct;
RTC_DateTypeDef RTC_DateStruct;
int bright[4]={8,9,10,12};
int bright[4] = {8, 9, 10,12};

int H = 0;
int M = 0;

String ho = "";
String mi = "";
String se = "";

String days[7] = {"Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday", "Sunday"};

int c = 0;
int pres = 0;
bool spavanje = 0;
bool inv = 0;

int frame = 0;

void setup() {
pinMode(39,INPUT_PULLUP);
pinMode(37,INPUT_PULLUP);
pinMode(39, INPUT_PULLUP);
pinMode(37, INPUT_PULLUP);
M5.begin();
M5.Lcd.setRotation(3);
M5.Lcd.fillScreen(BLACK);
M5.Lcd.setSwapBytes(true);
M5.Lcd.setTextSize(1);

M5.Lcd.setTextColor(TFT_WHITE,TFT_BLACK);
//M5.Lcd.setTextColor(grey,TFT_BLACK);

//M5.Lcd.fillRect(112,12,40,40,TFT_RED);
// M5.Lcd.pushImage(112,12,40,40,ani[frame]);
M5.Axp.EnableCoulombcounter();
M5.Axp.ScreenBreath(bright[0]);
M5.Lcd.setTextColor(TFT_WHITE, TFT_BLACK);
M5.Axp.EnableCoulombcounter();
M5.Axp.ScreenBreath(bright[0]);

RTC_TimeTypeDef TimeStruct;
TimeStruct.Hours = 19;
TimeStruct.Minutes = 10;
TimeStruct.Seconds = 0;
// M5.Rtc.SetTime(&TimeStruct);
RTC_DateTypeDef DateStruct;
DateStruct.WeekDay = 4;
DateStruct.Month = 1;
DateStruct.Date = 7;
DateStruct.Year = 2021;
//M5.Rtc.SetData(&DateStruct);
}

int H=0;
int M=0;

String ho="";
String mi="";
String se="";

String days[7]={"Monday","Tuesday","Wednesday","Thursday","Friday","Saturday","Sunday"};

int c=0;
int pres=0;
bool spavanje=0;
bool inv=0;
TimeStruct.Hours = hour;
TimeStruct.Minutes = minute;
TimeStruct.Seconds = second;
M5.Rtc.SetTime( & TimeStruct);

int frame=0;
void loop() {
RTC_DateTypeDef DateStruct;

spavanje=0;
if(digitalRead(37)==0)
{
if(pres==0)
{
pres=1;
c++;
if(c>3)
c=0;
M5.Axp.ScreenBreath(bright[c]);

}

}else{pres=0;}
DateStruct.WeekDay = weekday;
DateStruct.Month = month;
DateStruct.Date = date;
DateStruct.Year = year;
M5.Rtc.SetData( & DateStruct);
}


M5.Rtc.GetTime(&RTC_TimeStruct);
M5.Rtc.GetData(&RTC_DateStruct);
void loop() {
spavanje = 0;

if (digitalRead(37) == 0) {
if (pres == 0) {
pres = 1;
c++;
if (c > 3)
c = 0;
M5.Axp.ScreenBreath(bright[c]);
}
} else {
pres = 0;
}

M5.Rtc.GetTime( & RTC_TimeStruct);
M5.Rtc.GetData( & RTC_DateStruct);
M5.Lcd.setCursor(0, 15);
M5.Lcd.setTextFont(0);

M5.Lcd.drawString(String( M5.Axp.GetBatVoltage())+" V ",114,3);
M5.Lcd.setFreeFont(&DSEG7_Classic_Regular_64 );

if(H!=int(RTC_TimeStruct.Hours) || M!=int(RTC_TimeStruct.Minutes)){
ho=String(RTC_TimeStruct.Hours);
if(ho.length()<2)
ho="0"+ho;

mi=String(RTC_TimeStruct.Minutes);
if(mi.length()<2)
mi="0"+mi;
M5.Lcd.drawString(ho+":"+mi,2,56);
H=int(RTC_TimeStruct.Hours);
M=int(RTC_TimeStruct.Minutes);
}

// M5.Lcd.printf("Week: %d\n",RTC_DateStruct.WeekDay);
se=String(RTC_TimeStruct.Seconds);
if(se.length()<2)
se="0"+se;
M5.Lcd.drawString(se,180,0,4);
M5.Lcd.drawString(String(M5.Axp.GetBatVoltage()) + " V ", 114, 3);
M5.Lcd.setFreeFont( & DSEG7_Classic_Regular_64);

if (H != int(RTC_TimeStruct.Hours) || M != int(RTC_TimeStruct.Minutes)) {
ho = String(RTC_TimeStruct.Hours);
if (ho.length() < 2)
ho = "0" + ho;

mi = String(RTC_TimeStruct.Minutes);
if (mi.length() < 2)
mi = "0" + mi;
M5.Lcd.drawString(ho + ":" + mi, 2, 56);
H = int(RTC_TimeStruct.Hours);
M = int(RTC_TimeStruct.Minutes);
}

M5.Lcd.drawString(days[RTC_DateStruct.WeekDay-1]+" ",4,0,2);
M5.Lcd.setTextColor(grey,TFT_BLACK);

M5.Lcd.drawString(String(RTC_DateStruct.Date)+"/"+String(RTC_DateStruct.Month),4,20,4);
M5.Lcd.drawString(String(RTC_DateStruct.Year),70,28,2);
M5.Lcd.setTextColor(TFT_WHITE,TFT_BLACK);




if(digitalRead(39)==LOW){
while(digitalRead(39)==LOW);
M5.Lcd.invertDisplay(inv);
inv=!inv;
}

M5.Lcd.pushImage(112,12,40,40,ani[frame]);
frame++;
if(frame==132)
frame=0;
se = String(RTC_TimeStruct.Seconds);
if (se.length() < 2)
se = "0" + se;
M5.Lcd.drawString(se, 180, 0, 4);

M5.Lcd.drawString(days[RTC_DateStruct.WeekDay - 1] + " ", 4, 0, 2);
M5.Lcd.setTextColor(grey, TFT_BLACK);

M5.Lcd.drawString(String(RTC_DateStruct.Date) + "/" + String(RTC_DateStruct.Month), 4, 20, 4);
M5.Lcd.drawString(String(RTC_DateStruct.Year), 70, 28, 2);
M5.Lcd.setTextColor(TFT_WHITE, TFT_BLACK);

if (digitalRead(39) == LOW) {
while (digitalRead(39) == LOW);
M5.Lcd.invertDisplay(inv);
inv = !inv;
}

M5.Lcd.pushImage(112, 12, 40, 40, ani[frame]);
frame++;
if (frame == 132)
frame = 0;

delay(12);
}
Loading