|
@@ -10,6 +10,7 @@
|
|
#include "ssd1306xled/ssd1306xled.h"
|
|
#include "ssd1306xled/ssd1306xled.h"
|
|
#include "ssd1306xled/ssd1306xledtx.h"
|
|
#include "ssd1306xled/ssd1306xledtx.h"
|
|
#include "tinyavrlib/num2str.h"
|
|
#include "tinyavrlib/num2str.h"
|
|
|
|
+//#include "string.h"
|
|
|
|
|
|
/* Defines */
|
|
/* Defines */
|
|
|
|
|
|
@@ -84,6 +85,7 @@ int main(void) {
|
|
if (TemperatureSetpoint != 0) {
|
|
if (TemperatureSetpoint != 0) {
|
|
digits = usint2decascii(TemperatureSetpoint, buffer);
|
|
digits = usint2decascii(TemperatureSetpoint, buffer);
|
|
ssd1306tx_stringxy((uint8_t const *)ssd1306xled_font8x16data, 40, 0, buffer+digits);
|
|
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 ");
|
|
ssd1306tx_stringxy((uint8_t const *)ssd1306xled_font8x16data, 56, 0, " C ");
|
|
} else {
|
|
} else {
|
|
ssd1306tx_stringxy((uint8_t const *)ssd1306xled_font8x16data, 40, 0, " Off");
|
|
ssd1306tx_stringxy((uint8_t const *)ssd1306xled_font8x16data, 40, 0, " Off");
|
|
@@ -99,10 +101,18 @@ int main(void) {
|
|
ssd1306tx_numdec(Sensor.Humidity);
|
|
ssd1306tx_numdec(Sensor.Humidity);
|
|
ssd1306tx_string(" P");
|
|
ssd1306tx_string(" P");
|
|
*/
|
|
*/
|
|
|
|
+/*
|
|
digits = usint2decascii((int8_t)Sensor.Temperature, buffer);
|
|
digits = usint2decascii((int8_t)Sensor.Temperature, buffer);
|
|
|
|
+ strncpy(buffer+5, " C\0", 3);
|
|
ssd1306tx_stringxy((uint8_t const *)ssd1306xled_font8x16data, 40, 3, buffer+digits);
|
|
ssd1306tx_stringxy((uint8_t const *)ssd1306xled_font8x16data, 40, 3, buffer+digits);
|
|
digits = usint2decascii(Sensor.Humidity, buffer);
|
|
digits = usint2decascii(Sensor.Humidity, buffer);
|
|
|
|
+ strncpy(buffer+5, " P\0", 3);
|
|
ssd1306tx_stringxy((uint8_t const *)ssd1306xled_font8x16data, 40, 5, buffer+digits);
|
|
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 {
|
|
} else {
|
|
//ssd1306tx_string("AHT10 error");
|
|
//ssd1306tx_string("AHT10 error");
|
|
ssd1306tx_stringxy((uint8_t const *)ssd1306xled_font8x16data, 40, 3, "Error");
|
|
ssd1306tx_stringxy((uint8_t const *)ssd1306xled_font8x16data, 40, 3, "Error");
|
|
@@ -111,7 +121,7 @@ int main(void) {
|
|
|
|
|
|
RTOS_DispatchTask();
|
|
RTOS_DispatchTask();
|
|
|
|
|
|
- // делать нечего -- спим, ждём прерывание
|
|
|
|
|
|
+ // nothing to do - sleep, wait for interrupt
|
|
#if defined(__GNUC__)
|
|
#if defined(__GNUC__)
|
|
set_sleep_mode(SLEEP_MODE_IDLE);
|
|
set_sleep_mode(SLEEP_MODE_IDLE);
|
|
sleep_mode();
|
|
sleep_mode();
|