|
@@ -10,7 +10,7 @@
|
|
|
#include "ssd1306xled/ssd1306xled.h"
|
|
|
#include "ssd1306xled/ssd1306xledtx.h"
|
|
|
#include "tinyavrlib/num2str.h"
|
|
|
-//#include "string.h"
|
|
|
+#include "string.h"
|
|
|
|
|
|
/* Defines */
|
|
|
|
|
@@ -51,25 +51,18 @@ int main(void) {
|
|
|
RTOS_SetTask(LedOn, 1, 1000);
|
|
|
RTOS_SetTask(LedOff, 201, 1000);
|
|
|
|
|
|
-// ssd1306_fill2(0xff, 0x00);
|
|
|
ssd1306_clear();
|
|
|
// ssd1306tx_init(ssd1306xled_font6x8data, 0);
|
|
|
- // ssd1306xled_font8x16data
|
|
|
ssd1306tx_stringxy((uint8_t const *)ssd1306xled_font8x16data, 0, 0, "Hello, World! :)");
|
|
|
// ssd1306_setpos(0, 3);
|
|
|
// ssd1306tx_string("SSD1306xLED Library");
|
|
|
-// ssd1306_setpos(0, 3);
|
|
|
-// ssd1306tx_string("!\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[5]^_`");
|
|
|
-// ssd1306tx_stringxy((uint8_t const *)ssd1306xled_font8x16data, 0, 5, "TINUSAUR Project");
|
|
|
-// ssd1306_setpos(0, 7);
|
|
|
-// ssd1306tx_string("http://tinusaur.org");
|
|
|
tdelay_ms(1000);
|
|
|
|
|
|
ssd1306_clear();
|
|
|
ssd1306tx_stringxy((uint8_t const *)ssd1306xled_font8x16data, 1, 0, "Set:");
|
|
|
ssd1306tx_stringxy((uint8_t const *)ssd1306xled_font8x16data, 1, 3, " T:");
|
|
|
ssd1306tx_stringxy((uint8_t const *)ssd1306xled_font8x16data, 1, 5, " H:");
|
|
|
- char buffer[6] = {'\0'};
|
|
|
+ char buffer[9] = {0};
|
|
|
uint8_t digits = 0;
|
|
|
|
|
|
/* Infinity loop */
|
|
@@ -77,42 +70,23 @@ int main(void) {
|
|
|
|
|
|
if (Flag.newTempSet != 0) {
|
|
|
Flag.newTempSet = 0;
|
|
|
- /*
|
|
|
- ssd1306_setpos(25, 0);
|
|
|
- ssd1306tx_numdec(TemperatureSetpoint);
|
|
|
- ssd1306tx_string(" C");
|
|
|
- */
|
|
|
if (TemperatureSetpoint != 0) {
|
|
|
digits = usint2decascii(TemperatureSetpoint, buffer);
|
|
|
+ strncpy(buffer+5, " C \0", 4);
|
|
|
ssd1306tx_stringxy((uint8_t const *)ssd1306xled_font8x16data, 40, 0, buffer+digits);
|
|
|
- //strncpy(buffer+5, " C \0", 4);
|
|
|
- ssd1306tx_stringxy((uint8_t const *)ssd1306xled_font8x16data, 56, 0, " C ");
|
|
|
} else {
|
|
|
ssd1306tx_stringxy((uint8_t const *)ssd1306xled_font8x16data, 40, 0, " Off");
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- //ssd1306_setpos(13, 3);
|
|
|
if (Flag.AHT10state == 0) {
|
|
|
- /*
|
|
|
- ssd1306tx_numdec(Sensor.Temperature);
|
|
|
- ssd1306tx_string(" C");
|
|
|
- ssd1306_setpos(13, 5);
|
|
|
- ssd1306tx_numdec(Sensor.Humidity);
|
|
|
- ssd1306tx_string(" P");
|
|
|
- */
|
|
|
-/*
|
|
|
- digits = usint2decascii((int8_t)Sensor.Temperature, buffer);
|
|
|
+ digits = usint2decascii(Sensor.Temperature, buffer);
|
|
|
strncpy(buffer+5, " C\0", 3);
|
|
|
ssd1306tx_stringxy((uint8_t const *)ssd1306xled_font8x16data, 40, 3, buffer+digits);
|
|
|
+
|
|
|
digits = usint2decascii(Sensor.Humidity, buffer);
|
|
|
- strncpy(buffer+5, " P\0", 3);
|
|
|
+ strncpy(buffer+5, " %\0", 3);
|
|
|
ssd1306tx_stringxy((uint8_t const *)ssd1306xled_font8x16data, 40, 5, buffer+digits);
|
|
|
-*/
|
|
|
- usint2hexascii(Sensor.Temperature, buffer);
|
|
|
- ssd1306tx_stringxy((uint8_t const *)ssd1306xled_font8x16data, 40, 3, buffer);
|
|
|
- digits = usint2hexascii(Sensor.Humidity, buffer);
|
|
|
- ssd1306tx_stringxy((uint8_t const *)ssd1306xled_font8x16data, 40, 5, buffer);
|
|
|
} else {
|
|
|
//ssd1306tx_string("AHT10 error");
|
|
|
ssd1306tx_stringxy((uint8_t const *)ssd1306xled_font8x16data, 40, 3, "Error");
|