mirror of
https://github.com/supleed2/ELEC60013-ES-CW2.git
synced 2024-12-22 21:55:50 +00:00
P2S5 complete
This commit is contained in:
parent
5b0661e77f
commit
84e3b8f27f
11
src/main.cpp
11
src/main.cpp
|
@ -122,10 +122,16 @@ void scanKeysTask(void * pvParameters){
|
||||||
}
|
}
|
||||||
|
|
||||||
void displayUpdateTask(void * pvParameters){
|
void displayUpdateTask(void * pvParameters){
|
||||||
|
uint8_t keyArrayCopy[7];
|
||||||
const TickType_t xFrequency = 100/portTICK_PERIOD_MS;
|
const TickType_t xFrequency = 100/portTICK_PERIOD_MS;
|
||||||
TickType_t xLastWakeTime = xTaskGetTickCount();
|
TickType_t xLastWakeTime = xTaskGetTickCount();
|
||||||
while(1){
|
while(1){
|
||||||
vTaskDelayUntil(&xLastWakeTime, xFrequency);
|
vTaskDelayUntil(&xLastWakeTime, xFrequency);
|
||||||
|
|
||||||
|
xSemaphoreTake(keyArrayMutex, portMAX_DELAY);
|
||||||
|
memcpy(keyArrayCopy, (void*)keyArray, 7);
|
||||||
|
xSemaphoreGive(keyArrayMutex);
|
||||||
|
|
||||||
u8g2.clearBuffer(); // clear the internal memory
|
u8g2.clearBuffer(); // clear the internal memory
|
||||||
u8g2.setFont(u8g2_font_profont12_mf); // choose a suitable font
|
u8g2.setFont(u8g2_font_profont12_mf); // choose a suitable font
|
||||||
u8g2.setCursor(2, 10); // set the cursor position
|
u8g2.setCursor(2, 10); // set the cursor position
|
||||||
|
@ -133,8 +139,11 @@ void displayUpdateTask(void * pvParameters){
|
||||||
digitalToggle(LED_BUILTIN);
|
digitalToggle(LED_BUILTIN);
|
||||||
u8g2.setCursor(2, 20);
|
u8g2.setCursor(2, 20);
|
||||||
for (uint8_t i = 0; i < 7; i++) {
|
for (uint8_t i = 0; i < 7; i++) {
|
||||||
u8g2.print(keyArray[i], HEX);
|
u8g2.print(keyArrayCopy[6-i], HEX);
|
||||||
}
|
}
|
||||||
|
u8g2.drawStr(120,30,"+");
|
||||||
|
u8g2.drawStr(85,30,"-");
|
||||||
|
//u8g2.drawStr(100,30,"hi");
|
||||||
u8g2.sendBuffer(); // transfer internal memory to the display
|
u8g2.sendBuffer(); // transfer internal memory to the display
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue