Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 6ca79d5

Browse files
finished project - everything works now, and display looks fantastic.
1 parent bdbd7c3 commit 6ca79d5

File tree

17 files changed

+56
-62
lines changed

17 files changed

+56
-62
lines changed

‎.vscode/settings.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
"files.associations": {
33
"freertos.h": "c",
44
"main.h": "c",
5-
"gpio.h": "c"
5+
"gpio.h": "c",
6+
"nvic.h": "c"
67
}
78
}

‎FreeRTOSConfig.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
#define configTICK_RATE_HZ ( ( TickType_t ) 10 )
6161
#define configMAX_PRIORITIES ( 7 )
6262
#define configMINIMAL_STACK_SIZE ( ( unsigned short ) 512 )
63-
#define configTOTAL_HEAP_SIZE ( ( size_t ) ( 20 * 1024 ) )
63+
#define configTOTAL_HEAP_SIZE ( ( size_t ) ( 40 * 1024 ) )
6464
#define configMAX_TASK_NAME_LEN ( 16 )
6565
#define configUSE_TRACE_FACILITY 1
6666
#define configUSE_16_BIT_TICKS 0

‎include/clock.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,4 @@ void sysclk_init(void);
2323
void hsi_init(void);
2424
void peripheral_clk_init(void);
2525

26-
#endif /* CLOCK_H_ */
26+
#endif /* CLOCK_H */

‎include/gpio.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ Author: Gabriel Rodgers
33
Date: 10/13/2024
44
*/
55

6-
#ifndef GPIO_H_
7-
#define GPIO_H_
6+
#ifndef GPIO_H
7+
#define GPIO_H
88

99
#define GPIOA 0x48000000
1010
#define GPIOB 0x48000400
@@ -50,4 +50,4 @@ void gpio_led_on(void);
5050
void gpio_led_off(void);
5151
void gpio_led_toggle(void);
5252

53-
#endif /* GPIO_H_ */
53+
#endif /* GPIO_H */

‎include/i2c.h‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,6 @@ typedef enum{
3535
I2C2_START_POLL,
3636
I2C2_POST_WRITE,
3737
I2C2_POST_READ,
38-
I2C2_RECEIVING,
39-
I2C2_POST_RECEIVE
4038
} i2c2_stages_t;
4139

4240
void i2c2_init(void);

‎include/lcd.h‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,8 @@ void lcd_backlight_on(void);
4545
void lcd_backlight_off(void);
4646
void lcd_backlight_set(uint8_t brightness);
4747
void lcd_all_pixels(void);
48-
void lcd_x_scroll(void);
49-
void lcd_y_scroll(void);
5048
void lcd_clear(void);
49+
void lcd_clear_n_chars(const uint8_t nchars);
5150
void lcd_output_text(lcd_text_buffer_t const buf);
52-
//void lcd_output_pixels(lcd_pixel_buffer_t const buf);
5351

5452
#endif /* LCD_H */

‎include/nvic.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ Author: Gabriel Rodgers
33
Date: 10/13/2024
44
*/
55

6-
#ifndef NVIC_H_
7-
#define NVIC_H_
6+
#ifndef NVIC_H
7+
#define NVIC_H
88

99
#define NVIC_ISER 0xE000E100
1010
#define NVIC_ICER 0xE000E180
@@ -24,4 +24,4 @@ void nvic_enable(void);
2424
void nvic_disable(void);
2525
void nvic_priority(void);
2626

27-
#endif /* NVIC_H_ */
27+
#endif /* NVIC_H */

‎include/spi.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ Author: Gabriel Rodgers
33
Date: 12/30/2024
44
*/
55

6-
#ifndef SPI_H_
7-
#define SPI_H_
6+
#ifndef SPI_H
7+
#define SPI_H
88

99
#define SPI2 0x40003800
1010

@@ -17,4 +17,4 @@ Date: 12/30/2024
1717
void spi2_init(void);
1818
void spi2_write(uint8_t data);
1919

20-
#endif /* SPI_H_ */
20+
#endif /* SPI_H */

‎include/tcnt.h‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ Author: Gabriel Rodgers
33
Date: 12/27/2024
44
*/
55

6-
#ifndef TCNT_H_
7-
#define TCNT_H_
6+
#ifndef TCNT_H
7+
#define TCNT_H
88

99
#define TIM2 0x40000000
1010
#define TIM3 0x40000400
@@ -33,10 +33,9 @@ Date: 12/27/2024
3333

3434
void timer3_basic_init(void);
3535
void timer3_delay_us(uint16_t us);
36-
3736
void timer2_basic_init(void);
3837
void timer2_pwm_init(void);
3938
void timer2_pwm_set(uint8_t level);
4039
void timer2_blocking_delay(uint32_t cycles);
4140

42-
#endif /* TCNT_H_ */
41+
#endif /* TCNT_H */

‎src/dma.c‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,9 @@ void dma1_ch5_init(void) {
3131
//occurs after 4 data transfers
3232
void DMA1_Stream5_IRQHandler(void) {
3333
BaseType_t xHigherPriorityTaskWoken = pdFALSE; //init a var to hold whether a higher priority task is being blocked by the button binary semaphore
34-
//gpio_led_on();
34+
3535
if (((DMA1_ISR >> 17) & 1) == 1) { //if data done transferring, then give semaphore
3636
xSemaphoreGiveFromISR(p_dma_binary_semaphore, &xHigherPriorityTaskWoken); //give dma_binary_semaphore away
37-
3837
DMA1_IFCR |= (1 << 17); //clear transfer complete flag
3938
}
4039

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /