MiscBugs Merge

.gitignore

@@ -6,3 +6,4 @@ include
 platformio.ini
 .travis.yml
 test
+.history

README.md

@@ -1,8 +1,8 @@
 
 
-# Circuitmess Ringo firmware 
+# CircuitMess Ringo firmware 
 
-A repository for the core firmware that comes preloaded on every Circuitmess Ringo.
+A repository for the core firmware that comes pre-loaded on every CircuitMess Ringo.
 
 Functionalities that are currently available:
 - home screen
@@ -12,12 +12,38 @@ Functionalities that are currently available:
 - sleep mode
 - calculator app
 - clock app
-- media app
+- media app (photos and videos)
 - settings app
 - loading other apps (.bin format) from SD card
-- WAV file playback
+- music player (.mp3 and wav)
 - basic notification sounds and ringtones
 
+Here are some examples of how the current version of the firmware looks:
+
+ ### **Home**
+
+![alt text](https://www.circuitmess.com/wp-content/uploads/screenshot_46-export.png)
+
+<br/>
+
+ ### **Main menu**
+
+![alt text](https://www.circuitmess.com/wp-content/uploads/screenshot_28-export.png)
+
+<br/>
+
+### **Apps**
+
+![alt text](https://www.circuitmess.com/wp-content/uploads/screenshot_30-export.png)
+
+### **Wi-Fi**
+
+![alt text](https://www.circuitmess.com/wp-content/uploads/screenshot_44-export.png)
+
+## **Settings**
+
+![alt text](https://www.circuitmess.com/wp-content/uploads/screenshot_45-export.png)
+
 #
 
 Copyright © 2019 CircuitMess

src/calculatorApp.cpp

@@ -12,55 +12,56 @@ void calculatorApp()
 	bool blinkState = 0;
 	bool clear = 0;
 	bool set = 0;
-	mp.display.fillScreen(0xA794);
-	mp.display.drawRect(6,5, 149, 40, TFT_BLACK);
-	mp.display.fillRect(7,6,147,38, TFT_LIGHTGREY);
-	for (int y = 0; y < 2; y++)
+
+	while(1)
 	{
-		for (int x = 0; x < 4; x++)
+		mp.display.fillScreen(0xA794);
+		mp.display.drawRect(6,5, 149, 40, TFT_BLACK);
+		mp.display.fillRect(7,6,147,38, TFT_LIGHTGREY);
+		for (int y = 0; y < 2; y++)
 		{
-			mp.display.drawRect(8 + 37 * x, 49 + 27 * y, 33, 23, TFT_BLACK);
-			mp.display.fillRect(9 + 37 * x, 50 + 27 * y, 31, 21, TFT_LIGHTGREY);
-			switch (y*4 + x)
+			for (int x = 0; x < 4; x++)
 			{
-				case 0:
-					mp.display.drawBitmap(18, 54, calculatorPlus);
-					break;
-				case 1:
-					mp.display.drawBitmap(55, 59, calculatorMinus);
-					break;
-				case 2:
-					mp.display.drawBitmap(92, 54, calculatorMultiply);
-					break;
-				case 3:
-					mp.display.drawBitmap(128, 54, calculatorDivide);
-					break;
-				case 4:
-					mp.display.drawBitmap(15, 79, calculatorRoot);
-					break;
-				case 5:
-					mp.display.drawBitmap(55, 80, calculatorPotency);
-					break;
-				case 6:
-					mp.display.drawBitmap(87, 79, calculatorReciprocal);
-					break;
-				case 7:
-					mp.display.drawBitmap(133, 91, calculatorDecimalPoint);
-					break;
+				mp.display.drawRect(8 + 37 * x, 49 + 27 * y, 33, 23, TFT_BLACK);
+				mp.display.fillRect(9 + 37 * x, 50 + 27 * y, 31, 21, TFT_LIGHTGREY);
+				switch (y*4 + x)
+				{
+					case 0:
+						mp.display.drawBitmap(18, 54, calculatorPlus);
+						break;
+					case 1:
+						mp.display.drawBitmap(55, 59, calculatorMinus);
+						break;
+					case 2:
+						mp.display.drawBitmap(92, 54, calculatorMultiply);
+						break;
+					case 3:
+						mp.display.drawBitmap(128, 54, calculatorDivide);
+						break;
+					case 4:
+						mp.display.drawBitmap(15, 79, calculatorRoot);
+						break;
+					case 5:
+						mp.display.drawBitmap(55, 80, calculatorPotency);
+						break;
+					case 6:
+						mp.display.drawBitmap(87, 79, calculatorReciprocal);
+						break;
+					case 7:
+						mp.display.drawBitmap(133, 91, calculatorDecimalPoint);
+						break;
+				}
 			}
 		}
-	}
-	// mp.display.drawRect(119, 103, 33, 23, TFT_BLACK);
-	// mp.display.fillRect(120, 104, 31, 21, 0x4D42);
-	mp.display.setCursor(7, 110);
-	mp.display.setTextFont(2);
-	mp.display.setTextSize(1);
-	mp.display.setTextColor(TFT_BLACK);
-	mp.display.print("Erase");
-	mp.display.setCursor(110, 110);
-	mp.display.println("Equals");
-	while(1)
-	{
+		// mp.display.drawRect(119, 103, 33, 23, TFT_BLACK);
+		// mp.display.fillRect(120, 104, 31, 21, 0x4D42);
+		mp.display.setCursor(7, 110);
+		mp.display.setTextFont(2);
+		mp.display.setTextSize(1);
+		mp.display.setTextColor(TFT_BLACK);
+		mp.display.print("Erase");
+		mp.display.setCursor(110, 110);
+		mp.display.println("Equals");
 		// key = mp.buttons.getKey();
 
 		if(input.length() < 8 || clear) {
@@ -132,10 +133,15 @@ void calculatorApp()
 		}
 		if(mp.buttons.released(BTN_FUN_LEFT))
 		{
-			input.remove(input.length() - 1);
+			if(input == "Error") input = "";
+			else input.remove(input.length() - 1);
 			if(input == "")
 				input = "0";
 		}
+		if(mp.buttons.released(BTN_HOME)) {
+			mp.exitedLockscreen = true;
+			mp.lockscreen(); // Robert
+		}
 		if(mp.buttons.released(BTN_LEFT))
 		{
 			mp.display.drawRect(7 + 37 * (cursor % 4), 48 + 27 * (int)(cursor / 4), 35, 25, 0xA794);
@@ -310,4 +316,4 @@ void calculatorApp()
 		mp.update();
 	}
 	while(!mp.update());
-}
+}

src/calendarApp.cpp

@@ -24,6 +24,8 @@ void calendarApp()
 		//printing the month
 		{
 			mp.display.setTextFont(2);
+			mp.display.setTextSize(1);
+			mp.display.setTextColor(TFT_BLACK);
 			mp.display.fillScreen(TFT_WHITE);
 			mp.display.setTextColor(TFT_BLACK);
 			mp.display.drawString("Mo Tu We Th Fr Sa Su", 5,9 - offset); 
@@ -130,7 +132,7 @@ void calendarApp()
 				mp.display.print(week6.c_str());
 				week6 = "";
 			}
-			mp.display.setCursor(0, 112);
+			mp.display.setCursor(0, 110);
 			mp.display.printCenter(String(monthNames.substring((month - 1) * 3, month * 3)) + " " + year);
 			mp.display.fillRect(2 + 111, 18, 44, 90, TFT_LIGHTGREY);
 			for (int y = 0; y < 5;y++)
@@ -158,6 +160,10 @@ void calendarApp()
 			mp.display.drawFastHLine(2, 18 + 90, 155, TFT_BLACK);
 
 		} 
+		if(mp.buttons.released(BTN_HOME)) {
+			mp.exitedLockscreen = true;
+			mp.lockscreen(); // Robert
+		}
 		 if(mp.buttons.released(BTN_LEFT))
 		{
 			while(!mp.update());

src/clockApp.cpp

@@ -131,6 +131,10 @@ int8_t clockMenu(String* title, uint8_t length, int8_t prevCursor) {
 			mp.display.drawRect(1, y, mp.display.width()-3, boxHeight, TFT_RED);
 		}
 
+		if(mp.buttons.released(BTN_HOME)) {
+			mp.exitedLockscreen = true;
+			mp.lockscreen(); // Robert
+		}
 		if (mp.buttons.released(BTN_A)) {   //BUTTON CONFIRM
 			mp.osc->note(75, 0.05);
 			mp.osc->play();