hasslesstech/ak-kr-project
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: hasslesstech:368c5306028b35a715d6d25b8c4252e432516cbf
Branches Tags
hasslesstech:master
hasslesstech:dev
hasslesstech:KSZ8081RND
hasslesstech:if-rework-4
hasslesstech:if-rework-3
hasslesstech:if-rework-2
hasslesstech:if-rework-1
hasslesstech:dht11-v2
hasslesstech:dht11
..
compare: hasslesstech:8d119b4c14bf76e146394319b436359c52a7474b
Branches Tags
hasslesstech:dev
hasslesstech:master
hasslesstech:KSZ8081RND
hasslesstech:if-rework-4
hasslesstech:if-rework-3
hasslesstech:if-rework-2
hasslesstech:if-rework-1
hasslesstech:dht11-v2
hasslesstech:dht11

No commits in common. "368c5306028b35a715d6d25b8c4252e432516cbf" and "8d119b4c14bf76e146394319b436359c52a7474b" have entirely different histories.
368c530602 ... 8d119b4c14

2 changed files with 4 additions and 2 deletions
Show Stats Expand all files Collapse all files

2
Core/Src/PCA9685.c
View File

@ -70,7 +70,7 @@ int PCA9685_run_test(void)
return 1; return 1;
} else { } else {
DISPLAY_SET_CURSOR(1, 1); DISPLAY_SET_CURSOR(1, 1);
display_write_data_seq("OK"); display_write_data_seq("OK OUT ENABLED");
return 0; return 0;
} }

4
Core/Src/main.c
View File

@ -226,7 +226,7 @@ void button_init_and_test(void)
for (size_t i = 0; i < 5; i++) { for (size_t i = 0; i < 5; i++) {
pressed_elements >>= 1; pressed_elements >>= 1;
size_t input = !HAL_GPIO_ReadPin((GPIO_TypeDef *) sw_button_locations[i][0], sw_button_locations[i][1]); size_t input = !HAL_GPIO_ReadPin(sw_button_locations[i][0], sw_button_locations[i][1]);
if (input) { if (input) {
pressed_elements |= 0x20; pressed_elements |= 0x20;
@ -340,6 +340,8 @@ int main(void)
cleanup_functions[display_current_frame-1](); cleanup_functions[display_current_frame-1]();
display_to_direct(); display_to_direct();
HAL_Delay(150);
} }
// render final result to first framebuffer // render final result to first framebuffer