|
@@ -46,10 +46,10 @@ int main(void) {
|
|
|
|
|
|
/* Set tasks */
|
|
/* Set tasks */
|
|
RTOS_SetTask(checkTemperatureSetpoint, 5, 50);
|
|
RTOS_SetTask(checkTemperatureSetpoint, 5, 50);
|
|
- RTOS_SetTask(sensorStart, 50, 1000);
|
|
|
|
- RTOS_SetTask(sensorGetData, 800, 1000);
|
|
|
|
- RTOS_SetTask(LedOn, 1, 1000);
|
|
|
|
- RTOS_SetTask(LedOff, 201, 1000);
|
|
|
|
|
|
+ RTOS_SetTask(sensorStart, 1, 2000);
|
|
|
|
+ RTOS_SetTask(sensorGetData, 501, 2000);
|
|
|
|
+ RTOS_SetTask(LedOn, 2, 1000);
|
|
|
|
+ RTOS_SetTask(LedOff, 202, 1000);
|
|
|
|
|
|
ssd1306_clear();
|
|
ssd1306_clear();
|
|
// ssd1306tx_init(ssd1306xled_font6x8data, 0);
|
|
// ssd1306tx_init(ssd1306xled_font6x8data, 0);
|
|
@@ -60,8 +60,8 @@ int main(void) {
|
|
|
|
|
|
ssd1306_clear();
|
|
ssd1306_clear();
|
|
ssd1306tx_stringxy((uint8_t const *)ssd1306xled_font8x16data, 1, 0, "Set:");
|
|
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:");
|
|
|
|
|
|
+ ssd1306tx_stringxy((uint8_t const *)ssd1306xled_font8x16data, 1, 2, " T:");
|
|
|
|
+ ssd1306tx_stringxy((uint8_t const *)ssd1306xled_font8x16data, 1, 4, " H:");
|
|
char buffer[9] = {0};
|
|
char buffer[9] = {0};
|
|
uint8_t digits = 0;
|
|
uint8_t digits = 0;
|
|
|
|
|
|
@@ -82,15 +82,18 @@ int main(void) {
|
|
if (Flag.AHT10state == 0) {
|
|
if (Flag.AHT10state == 0) {
|
|
digits = usint2decascii(Sensor.Temperature, buffer);
|
|
digits = usint2decascii(Sensor.Temperature, buffer);
|
|
strncpy(buffer+5, " C\0", 3);
|
|
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, 2, buffer+digits);
|
|
|
|
|
|
digits = usint2decascii(Sensor.Humidity, buffer);
|
|
digits = usint2decascii(Sensor.Humidity, buffer);
|
|
strncpy(buffer+5, " %\0", 3);
|
|
strncpy(buffer+5, " %\0", 3);
|
|
- ssd1306tx_stringxy((uint8_t const *)ssd1306xled_font8x16data, 40, 5, buffer+digits);
|
|
|
|
|
|
+ ssd1306tx_stringxy((uint8_t const *)ssd1306xled_font8x16data, 40, 4, buffer+digits);
|
|
|
|
+
|
|
|
|
+ digits = usint2binascii(Sensor.Status, buffer);
|
|
|
|
+ ssd1306tx_stringxy((uint8_t const *)ssd1306xled_font8x16data, 16, 6, buffer+8);
|
|
} 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, 5, " ");
|
|
|
|
|
|
+ ssd1306tx_stringxy((uint8_t const *)ssd1306xled_font8x16data, 40, 2, "Error");
|
|
|
|
+ ssd1306tx_stringxy((uint8_t const *)ssd1306xled_font8x16data, 40, 4, " ");
|
|
}
|
|
}
|
|
|
|
|
|
RTOS_DispatchTask();
|
|
RTOS_DispatchTask();
|