Mercurial > ~darius > hgwebdir.cgi > stm32test

annotate main.c @ 9:be0a1ac64d97

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
- Add ellipse drawing. - Factor out stripe drawing to a function. - Rename LCD functions to match other code. - Add filled circles. - Rotate coords for landsacpe.
author Daniel O'Connor <darius@dons.net.au>
date Sun, 05 Feb 2012 16:41:42 +1030
parents 58d76cf522ff
children 093bc0c3b1cc
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
0
c59513fd84fb Initial commit of STM32 test code.
Daniel O'Connor <darius@dons.net.au>
parents:
diff changeset
1 #include <ctype.h>
3
74e9b3baac1e Jumbo commit to make things work.
Daniel O'Connor <darius@dons.net.au>
parents: 2
diff changeset
2 #include <malloc.h>
0
c59513fd84fb Initial commit of STM32 test code.
Daniel O'Connor <darius@dons.net.au>
parents:
diff changeset
3 #include <stdio.h>
c59513fd84fb Initial commit of STM32 test code.
Daniel O'Connor <darius@dons.net.au>
parents:
diff changeset
4 #include <stdint.h>
3
74e9b3baac1e Jumbo commit to make things work.
Daniel O'Connor <darius@dons.net.au>
parents: 2
diff changeset
5 #include <time.h>
74e9b3baac1e Jumbo commit to make things work.
Daniel O'Connor <darius@dons.net.au>
parents: 2
diff changeset
6 #include <string.h>
74e9b3baac1e Jumbo commit to make things work.
Daniel O'Connor <darius@dons.net.au>
parents: 2
diff changeset
7 #include <sys/time.h>
74e9b3baac1e Jumbo commit to make things work.
Daniel O'Connor <darius@dons.net.au>
parents: 2
diff changeset
8 #include <stdlib.h>
74e9b3baac1e Jumbo commit to make things work.
Daniel O'Connor <darius@dons.net.au>
parents: 2
diff changeset
9
0
c59513fd84fb Initial commit of STM32 test code.
Daniel O'Connor <darius@dons.net.au>
parents:
diff changeset
10 #include "stm32f10x.h"
8
58d76cf522ff Split out code into separate files.
Daniel O'Connor <darius@dons.net.au>
parents: 7
diff changeset
11
58d76cf522ff Split out code into separate files.
Daniel O'Connor <darius@dons.net.au>
parents: 7
diff changeset
12 #include "comm.h"
58d76cf522ff Split out code into separate files.
Daniel O'Connor <darius@dons.net.au>
parents: 7
diff changeset
13 #include "delay.h"
58d76cf522ff Split out code into separate files.
Daniel O'Connor <darius@dons.net.au>
parents: 7
diff changeset
14 #include "flash.h"
58d76cf522ff Split out code into separate files.
Daniel O'Connor <darius@dons.net.au>
parents: 7
diff changeset
15 #include "hw.h"
3
74e9b3baac1e Jumbo commit to make things work.
Daniel O'Connor <darius@dons.net.au>
parents: 2
diff changeset
16 #include "lcd.h"
0
c59513fd84fb Initial commit of STM32 test code.
Daniel O'Connor <darius@dons.net.au>
parents:
diff changeset
17 #include "main.h"
8
58d76cf522ff Split out code into separate files.
Daniel O'Connor <darius@dons.net.au>
parents: 7
diff changeset
18 #include "touch.h"
0
c59513fd84fb Initial commit of STM32 test code.
Daniel O'Connor <darius@dons.net.au>
parents:
diff changeset
19
3
74e9b3baac1e Jumbo commit to make things work.
Daniel O'Connor <darius@dons.net.au>
parents: 2
diff changeset
20 typedef struct {
74e9b3baac1e Jumbo commit to make things work.
Daniel O'Connor <darius@dons.net.au>
parents: 2
diff changeset
21 char buf[40];
74e9b3baac1e Jumbo commit to make things work.
Daniel O'Connor <darius@dons.net.au>
parents: 2
diff changeset
22 volatile uint8_t state;
74e9b3baac1e Jumbo commit to make things work.
Daniel O'Connor <darius@dons.net.au>
parents: 2
diff changeset
23 uint8_t len;
2
274e01fa5a4c - Do console IO with RX IRQs.
Daniel O'Connor <darius@dons.net.au>
parents: 0
diff changeset
24 } consbuf_t;
0
c59513fd84fb Initial commit of STM32 test code.
Daniel O'Connor <darius@dons.net.au>
parents:
diff changeset
25
c59513fd84fb Initial commit of STM32 test code.
Daniel O'Connor <darius@dons.net.au>
parents:
diff changeset
26 void NVIC_Configuration(void);
c59513fd84fb Initial commit of STM32 test code.
Daniel O'Connor <darius@dons.net.au>
parents:
diff changeset
27
3
74e9b3baac1e Jumbo commit to make things work.
Daniel O'Connor <darius@dons.net.au>
parents: 2
diff changeset
28
74e9b3baac1e Jumbo commit to make things work.
Daniel O'Connor <darius@dons.net.au>
parents: 2
diff changeset
29 /* Called every 1 / TICK_FREQ */
74e9b3baac1e Jumbo commit to make things work.
Daniel O'Connor <darius@dons.net.au>
parents: 2
diff changeset
30 #define TICK_FREQ 10000
0
c59513fd84fb Initial commit of STM32 test code.
Daniel O'Connor <darius@dons.net.au>
parents:
diff changeset
31 RAMFUNC void
c59513fd84fb Initial commit of STM32 test code.
Daniel O'Connor <darius@dons.net.au>
parents:
diff changeset
32 SysTick_Handler(void) {
2
274e01fa5a4c - Do console IO with RX IRQs.
Daniel O'Connor <darius@dons.net.au>
parents: 0
diff changeset
33 static uint32_t tick = 0;
3
74e9b3baac1e Jumbo commit to make things work.
Daniel O'Connor <darius@dons.net.au>
parents: 2
diff changeset
34 static int led = 0;
74e9b3baac1e Jumbo commit to make things work.
Daniel O'Connor <darius@dons.net.au>
parents: 2
diff changeset
35
0
c59513fd84fb Initial commit of STM32 test code.
Daniel O'Connor <darius@dons.net.au>
parents:
diff changeset
36 tick++;
3
74e9b3baac1e Jumbo commit to make things work.
Daniel O'Connor <darius@dons.net.au>
parents: 2
diff changeset
37 if (tick % 10000 == 0) {
74e9b3baac1e Jumbo commit to make things work.
Daniel O'Connor <darius@dons.net.au>
parents: 2
diff changeset
38 led = !led;
74e9b3baac1e Jumbo commit to make things work.
Daniel O'Connor <darius@dons.net.au>
parents: 2
diff changeset
39 if (led)
74e9b3baac1e Jumbo commit to make things work.
Daniel O'Connor <darius@dons.net.au>
parents: 2
diff changeset
40 GPIO_SetBits(GPIOB, GPIO_Pin_5);
74e9b3baac1e Jumbo commit to make things work.
Daniel O'Connor <darius@dons.net.au>
parents: 2
diff changeset
41 else
74e9b3baac1e Jumbo commit to make things work.
Daniel O'Connor <darius@dons.net.au>
parents: 2
diff changeset
42 GPIO_ResetBits(GPIOB, GPIO_Pin_5);
74e9b3baac1e Jumbo commit to make things work.
Daniel O'Connor <darius@dons.net.au>
parents: 2
diff changeset
43 }
74e9b3baac1e Jumbo commit to make things work.
Daniel O'Connor <darius@dons.net.au>
parents: 2
diff changeset
44
0
c59513fd84fb Initial commit of STM32 test code.
Daniel O'Connor <darius@dons.net.au>
parents:
diff changeset
45 }
c59513fd84fb Initial commit of STM32 test code.
Daniel O'Connor <darius@dons.net.au>
parents:
diff changeset
46
2
274e01fa5a4c - Do console IO with RX IRQs.
Daniel O'Connor <darius@dons.net.au>
parents: 0
diff changeset
47 consbuf_t cmd;
274e01fa5a4c - Do console IO with RX IRQs.
Daniel O'Connor <darius@dons.net.au>
parents: 0
diff changeset
48
0
c59513fd84fb Initial commit of STM32 test code.
Daniel O'Connor <darius@dons.net.au>
parents:
diff changeset
49 RAMFUNC void
c59513fd84fb Initial commit of STM32 test code.
Daniel O'Connor <darius@dons.net.au>
parents:
diff changeset
50 USART1_IRQHandler(void) {
2
274e01fa5a4c - Do console IO with RX IRQs.
Daniel O'Connor <darius@dons.net.au>
parents: 0
diff changeset
51 char c;
274e01fa5a4c - Do console IO with RX IRQs.
Daniel O'Connor <darius@dons.net.au>
parents: 0
diff changeset
52 int i;
0
c59513fd84fb Initial commit of STM32 test code.
Daniel O'Connor <darius@dons.net.au>
parents:
diff changeset
53
2
274e01fa5a4c - Do console IO with RX IRQs.
Daniel O'Connor <darius@dons.net.au>
parents: 0
diff changeset
54 /* Recieved data */
274e01fa5a4c - Do console IO with RX IRQs.
Daniel O'Connor <darius@dons.net.au>
parents: 0
diff changeset
55 while (USART_GetITStatus(USART1, USART_IT_RXNE) != RESET) {
274e01fa5a4c - Do console IO with RX IRQs.
Daniel O'Connor <darius@dons.net.au>
parents: 0
diff changeset
56 c = USART_ReceiveData(USART1);
274e01fa5a4c - Do console IO with RX IRQs.
Daniel O'Connor <darius@dons.net.au>
parents: 0
diff changeset
57
274e01fa5a4c - Do console IO with RX IRQs.
Daniel O'Connor <darius@dons.net.au>
parents: 0
diff changeset
58 /* End of line? */
274e01fa5a4c - Do console IO with RX IRQs.
Daniel O'Connor <darius@dons.net.au>
parents: 0
diff changeset
59 if (c == '\n' || c == '\r') {
274e01fa5a4c - Do console IO with RX IRQs.
Daniel O'Connor <darius@dons.net.au>
parents: 0
diff changeset
60 cmd.buf[cmd.state] = '\0';
274e01fa5a4c - Do console IO with RX IRQs.
Daniel O'Connor <darius@dons.net.au>
parents: 0
diff changeset
61 fputs("\r\n", stdout);
274e01fa5a4c - Do console IO with RX IRQs.
Daniel O'Connor <darius@dons.net.au>
parents: 0
diff changeset
62 cmd.len = cmd.state;
274e01fa5a4c - Do console IO with RX IRQs.
Daniel O'Connor <darius@dons.net.au>
parents: 0
diff changeset
63 cmd.state = 255;
274e01fa5a4c - Do console IO with RX IRQs.
Daniel O'Connor <darius@dons.net.au>
parents: 0
diff changeset
64 continue;
274e01fa5a4c - Do console IO with RX IRQs.
Daniel O'Connor <darius@dons.net.au>
parents: 0
diff changeset
65 }
274e01fa5a4c - Do console IO with RX IRQs.
Daniel O'Connor <darius@dons.net.au>
parents: 0
diff changeset
66
274e01fa5a4c - Do console IO with RX IRQs.
Daniel O'Connor <darius@dons.net.au>
parents: 0
diff changeset
67 /* Ctrl-w / Ctrl-u */
274e01fa5a4c - Do console IO with RX IRQs.
Daniel O'Connor <darius@dons.net.au>
parents: 0
diff changeset
68 if (c == 0x17 || c == 0x15) {
274e01fa5a4c - Do console IO with RX IRQs.
Daniel O'Connor <darius@dons.net.au>
parents: 0
diff changeset
69 for (i = 0; i < cmd.state; i++)
274e01fa5a4c - Do console IO with RX IRQs.
Daniel O'Connor <darius@dons.net.au>
parents: 0
diff changeset
70 fputs("\010\040\010", stdout);
274e01fa5a4c - Do console IO with RX IRQs.
Daniel O'Connor <darius@dons.net.au>
parents: 0
diff changeset
71 cmd.state = 0;
274e01fa5a4c - Do console IO with RX IRQs.
Daniel O'Connor <darius@dons.net.au>
parents: 0
diff changeset
72 continue;
274e01fa5a4c - Do console IO with RX IRQs.
Daniel O'Connor <darius@dons.net.au>
parents: 0
diff changeset
73 }
274e01fa5a4c - Do console IO with RX IRQs.
Daniel O'Connor <darius@dons.net.au>
parents: 0
diff changeset
74
274e01fa5a4c - Do console IO with RX IRQs.
Daniel O'Connor <darius@dons.net.au>
parents: 0
diff changeset
75 /* Backspace/delete */
274e01fa5a4c - Do console IO with RX IRQs.
Daniel O'Connor <darius@dons.net.au>
parents: 0
diff changeset
76 if (c == 0x08 || c == 0x7f) {
274e01fa5a4c - Do console IO with RX IRQs.
Daniel O'Connor <darius@dons.net.au>
parents: 0
diff changeset
77 if (cmd.state > 0) {
274e01fa5a4c - Do console IO with RX IRQs.
Daniel O'Connor <darius@dons.net.au>
parents: 0
diff changeset
78 cmd.state--;
274e01fa5a4c - Do console IO with RX IRQs.
Daniel O'Connor <darius@dons.net.au>
parents: 0
diff changeset
79 fputs("\010\040\010", stdout);
274e01fa5a4c - Do console IO with RX IRQs.
Daniel O'Connor <darius@dons.net.au>
parents: 0
diff changeset
80 }
274e01fa5a4c - Do console IO with RX IRQs.
Daniel O'Connor <darius@dons.net.au>
parents: 0
diff changeset
81 continue;
274e01fa5a4c - Do console IO with RX IRQs.
Daniel O'Connor <darius@dons.net.au>
parents: 0
diff changeset
82 }
274e01fa5a4c - Do console IO with RX IRQs.
Daniel O'Connor <darius@dons.net.au>
parents: 0
diff changeset
83
274e01fa5a4c - Do console IO with RX IRQs.
Daniel O'Connor <darius@dons.net.au>
parents: 0
diff changeset
84 /* Anything unprintable just ignore it */
274e01fa5a4c - Do console IO with RX IRQs.
Daniel O'Connor <darius@dons.net.au>
parents: 0
diff changeset
85 if (!isprint(c))
274e01fa5a4c - Do console IO with RX IRQs.
Daniel O'Connor <darius@dons.net.au>
parents: 0
diff changeset
86 continue;
274e01fa5a4c - Do console IO with RX IRQs.
Daniel O'Connor <darius@dons.net.au>
parents: 0
diff changeset
87
274e01fa5a4c - Do console IO with RX IRQs.
Daniel O'Connor <darius@dons.net.au>
parents: 0
diff changeset
88 cmd.buf[cmd.state] = tolower(c);
274e01fa5a4c - Do console IO with RX IRQs.
Daniel O'Connor <darius@dons.net.au>
parents: 0
diff changeset
89
274e01fa5a4c - Do console IO with RX IRQs.
Daniel O'Connor <darius@dons.net.au>
parents: 0
diff changeset
90 /* Echo back to the user */
274e01fa5a4c - Do console IO with RX IRQs.
Daniel O'Connor <darius@dons.net.au>
parents: 0
diff changeset
91 comm_put(cmd.buf[cmd.state]);
274e01fa5a4c - Do console IO with RX IRQs.
Daniel O'Connor <darius@dons.net.au>
parents: 0
diff changeset
92
274e01fa5a4c - Do console IO with RX IRQs.
Daniel O'Connor <darius@dons.net.au>
parents: 0
diff changeset
93 cmd.state++;
274e01fa5a4c - Do console IO with RX IRQs.
Daniel O'Connor <darius@dons.net.au>
parents: 0
diff changeset
94 /* Over flow? */
274e01fa5a4c - Do console IO with RX IRQs.
Daniel O'Connor <darius@dons.net.au>
parents: 0
diff changeset
95 if (cmd.state == ((sizeof(cmd.buf) / sizeof(cmd.buf[0])) - 1)) {
274e01fa5a4c - Do console IO with RX IRQs.
Daniel O'Connor <darius@dons.net.au>
parents: 0
diff changeset
96 fputs("\r\nLine too long", stdout);
274e01fa5a4c - Do console IO with RX IRQs.
Daniel O'Connor <darius@dons.net.au>
parents: 0
diff changeset
97 cmd.state = 0;
274e01fa5a4c - Do console IO with RX IRQs.
Daniel O'Connor <darius@dons.net.au>
parents: 0
diff changeset
98 continue;
274e01fa5a4c - Do console IO with RX IRQs.
Daniel O'Connor <darius@dons.net.au>
parents: 0
diff changeset
99 }
274e01fa5a4c - Do console IO with RX IRQs.
Daniel O'Connor <darius@dons.net.au>
parents: 0
diff changeset
100 }
0
c59513fd84fb Initial commit of STM32 test code.
Daniel O'Connor <darius@dons.net.au>
parents:
diff changeset
101 }
c59513fd84fb Initial commit of STM32 test code.
Daniel O'Connor <darius@dons.net.au>
parents:
diff changeset
102
c59513fd84fb Initial commit of STM32 test code.
Daniel O'Connor <darius@dons.net.au>
parents:
diff changeset
103
c59513fd84fb Initial commit of STM32 test code.
Daniel O'Connor <darius@dons.net.au>
parents:
diff changeset
104 int
c59513fd84fb Initial commit of STM32 test code.
Daniel O'Connor <darius@dons.net.au>
parents:
diff changeset
105 main(void) {
3
74e9b3baac1e Jumbo commit to make things work.
Daniel O'Connor <darius@dons.net.au>
parents: 2
diff changeset
106 char buf[40];
74e9b3baac1e Jumbo commit to make things work.
Daniel O'Connor <darius@dons.net.au>
parents: 2
diff changeset
107 struct tm nowtm;
74e9b3baac1e Jumbo commit to make things work.
Daniel O'Connor <darius@dons.net.au>
parents: 2
diff changeset
108 time_t now;
74e9b3baac1e Jumbo commit to make things work.
Daniel O'Connor <darius@dons.net.au>
parents: 2
diff changeset
109
0
c59513fd84fb Initial commit of STM32 test code.
Daniel O'Connor <darius@dons.net.au>
parents:
diff changeset
110 cmd.state = cmd.len = 0;
c59513fd84fb Initial commit of STM32 test code.
Daniel O'Connor <darius@dons.net.au>
parents:
diff changeset
111
8
58d76cf522ff Split out code into separate files.
Daniel O'Connor <darius@dons.net.au>
parents: 7
diff changeset
112 /* Init hardware - configure IO ports and external peripherals */
58d76cf522ff Split out code into separate files.
Daniel O'Connor <darius@dons.net.au>
parents: 7
diff changeset
113 hw_init();
0
c59513fd84fb Initial commit of STM32 test code.
Daniel O'Connor <darius@dons.net.au>
parents:
diff changeset
114
c59513fd84fb Initial commit of STM32 test code.
Daniel O'Connor <darius@dons.net.au>
parents:
diff changeset
115 /* NVIC configuration */
c59513fd84fb Initial commit of STM32 test code.
Daniel O'Connor <darius@dons.net.au>
parents:
diff changeset
116 NVIC_Configuration();
c59513fd84fb Initial commit of STM32 test code.
Daniel O'Connor <darius@dons.net.au>
parents:
diff changeset
117
3
74e9b3baac1e Jumbo commit to make things work.
Daniel O'Connor <darius@dons.net.au>
parents: 2
diff changeset
118 /* Setup SysTick Timer rate, also enables Systick and Systick-Interrupt */
74e9b3baac1e Jumbo commit to make things work.
Daniel O'Connor <darius@dons.net.au>
parents: 2
diff changeset
119 if (SysTick_Config(SystemCoreClock / TICK_FREQ)) {
0
c59513fd84fb Initial commit of STM32 test code.
Daniel O'Connor <darius@dons.net.au>
parents:
diff changeset
120 /* Capture error */
c59513fd84fb Initial commit of STM32 test code.
Daniel O'Connor <darius@dons.net.au>
parents:
diff changeset
121 comm_puts("Can't setup SysTick\r\n");
c59513fd84fb Initial commit of STM32 test code.
Daniel O'Connor <darius@dons.net.au>
parents:
diff changeset
122 while (1)
c59513fd84fb Initial commit of STM32 test code.
Daniel O'Connor <darius@dons.net.au>
parents:
diff changeset
123 ;
c59513fd84fb Initial commit of STM32 test code.
Daniel O'Connor <darius@dons.net.au>
parents:
diff changeset
124 }
c59513fd84fb Initial commit of STM32 test code.
Daniel O'Connor <darius@dons.net.au>
parents:
diff changeset
125
3
74e9b3baac1e Jumbo commit to make things work.
Daniel O'Connor <darius@dons.net.au>
parents: 2
diff changeset
126 /* Set stdout to unbuffered */
2
274e01fa5a4c - Do console IO with RX IRQs.
Daniel O'Connor <darius@dons.net.au>
parents: 0
diff changeset
127 setvbuf(stdout, NULL, _IONBF, 0);
274e01fa5a4c - Do console IO with RX IRQs.
Daniel O'Connor <darius@dons.net.au>
parents: 0
diff changeset
128
0
c59513fd84fb Initial commit of STM32 test code.
Daniel O'Connor <darius@dons.net.au>
parents:
diff changeset
129 /* Say hello */
7
9404b9869c27 Make the LCD panel work (timings, GPIOE clock needs to be on, etc)
Daniel O'Connor <darius@dons.net.au>
parents: 5
diff changeset
130 fputs("\r\n\r\n\r\nHello world\r\n", stdout);
0
c59513fd84fb Initial commit of STM32 test code.
Daniel O'Connor <darius@dons.net.au>
parents:
diff changeset
131
c59513fd84fb Initial commit of STM32 test code.
Daniel O'Connor <darius@dons.net.au>
parents:
diff changeset
132 while (1) {
2
274e01fa5a4c - Do console IO with RX IRQs.
Daniel O'Connor <darius@dons.net.au>
parents: 0
diff changeset
133 fputs("> ", stdout);
0
c59513fd84fb Initial commit of STM32 test code.
Daniel O'Connor <darius@dons.net.au>
parents:
diff changeset
134
2
274e01fa5a4c - Do console IO with RX IRQs.
Daniel O'Connor <darius@dons.net.au>
parents: 0
diff changeset
135 while (cmd.state != 255)
274e01fa5a4c - Do console IO with RX IRQs.
Daniel O'Connor <darius@dons.net.au>
parents: 0
diff changeset
136 ;
0
c59513fd84fb Initial commit of STM32 test code.
Daniel O'Connor <darius@dons.net.au>
parents:
diff changeset
137
3
74e9b3baac1e Jumbo commit to make things work.
Daniel O'Connor <darius@dons.net.au>
parents: 2
diff changeset
138 if (cmd.len > 0) {
74e9b3baac1e Jumbo commit to make things work.
Daniel O'Connor <darius@dons.net.au>
parents: 2
diff changeset
139 if (!strncmp("gc", cmd.buf, 2)) {
74e9b3baac1e Jumbo commit to make things work.
Daniel O'Connor <darius@dons.net.au>
parents: 2
diff changeset
140 now = time(NULL);
74e9b3baac1e Jumbo commit to make things work.
Daniel O'Connor <darius@dons.net.au>
parents: 2
diff changeset
141 gmtime_r(&now, &nowtm);
74e9b3baac1e Jumbo commit to make things work.
Daniel O'Connor <darius@dons.net.au>
parents: 2
diff changeset
142 strftime(buf, sizeof(buf) - 1, "Time is %Y/%m/%d %H:%M:%S UTC", &nowtm);
74e9b3baac1e Jumbo commit to make things work.
Daniel O'Connor <darius@dons.net.au>
parents: 2
diff changeset
143 printf("Time is %s (%d)\r\n", buf, (int)now);
74e9b3baac1e Jumbo commit to make things work.
Daniel O'Connor <darius@dons.net.au>
parents: 2
diff changeset
144 } else if (!strncmp("sc ", cmd.buf, 3)) {
74e9b3baac1e Jumbo commit to make things work.
Daniel O'Connor <darius@dons.net.au>
parents: 2
diff changeset
145 struct timeval tv;
74e9b3baac1e Jumbo commit to make things work.
Daniel O'Connor <darius@dons.net.au>
parents: 2
diff changeset
146 tv.tv_sec = atoi(cmd.buf + 3);
74e9b3baac1e Jumbo commit to make things work.
Daniel O'Connor <darius@dons.net.au>
parents: 2
diff changeset
147 tv.tv_usec = 0;
74e9b3baac1e Jumbo commit to make things work.
Daniel O'Connor <darius@dons.net.au>
parents: 2
diff changeset
148 settimeofday(&tv, NULL);
74e9b3baac1e Jumbo commit to make things work.
Daniel O'Connor <darius@dons.net.au>
parents: 2
diff changeset
149 } else if (!strncmp("read", cmd.buf, 4)) {
74e9b3baac1e Jumbo commit to make things work.
Daniel O'Connor <darius@dons.net.au>
parents: 2
diff changeset
150 printf("PB5 = %d\r\n", GPIO_ReadInputDataBit(GPIOB, GPIO_Pin_15));
4
2c87e30c982d Add LCD init, touch screen writing etc..
Daniel O'Connor <darius@dons.net.au>
parents: 3
diff changeset
151 } else if (!strncmp("touch", cmd.buf, 5)) {
8
58d76cf522ff Split out code into separate files.
Daniel O'Connor <darius@dons.net.au>
parents: 7
diff changeset
152 uint16_t x, y, z1, z2;
58d76cf522ff Split out code into separate files.
Daniel O'Connor <darius@dons.net.au>
parents: 7
diff changeset
153 float t, t2;
4
2c87e30c982d Add LCD init, touch screen writing etc..
Daniel O'Connor <darius@dons.net.au>
parents: 3
diff changeset
154 for (int i = 0; i < 10; i++) {
8
58d76cf522ff Split out code into separate files.
Daniel O'Connor <darius@dons.net.au>
parents: 7
diff changeset
155 tp_getcoords(&x, &y, &z1, &z2, &t, &t2);
4
2c87e30c982d Add LCD init, touch screen writing etc..
Daniel O'Connor <darius@dons.net.au>
parents: 3
diff changeset
156 printf("X = %5d Y = %5d Z1 = %5d Z2 = %5d T = %7.2f T2 = %7.2f\r\n", x, y, z1, z2, t, t2);
2c87e30c982d Add LCD init, touch screen writing etc..
Daniel O'Connor <darius@dons.net.au>
parents: 3
diff changeset
157 }
2c87e30c982d Add LCD init, touch screen writing etc..
Daniel O'Connor <darius@dons.net.au>
parents: 3
diff changeset
158 } else if (!strncmp("fl", cmd.buf, 2)) {
2c87e30c982d Add LCD init, touch screen writing etc..
Daniel O'Connor <darius@dons.net.au>
parents: 3
diff changeset
159 uint8_t status;
2c87e30c982d Add LCD init, touch screen writing etc..
Daniel O'Connor <darius@dons.net.au>
parents: 3
diff changeset
160 char *flstattbl[] = {
2c87e30c982d Add LCD init, touch screen writing etc..
Daniel O'Connor <darius@dons.net.au>
parents: 3
diff changeset
161 "BUSY",
2c87e30c982d Add LCD init, touch screen writing etc..
Daniel O'Connor <darius@dons.net.au>
parents: 3
diff changeset
162 "WEL",
2c87e30c982d Add LCD init, touch screen writing etc..
Daniel O'Connor <darius@dons.net.au>
parents: 3
diff changeset
163 "BP0",
2c87e30c982d Add LCD init, touch screen writing etc..
Daniel O'Connor <darius@dons.net.au>
parents: 3
diff changeset
164 "BP1",
2c87e30c982d Add LCD init, touch screen writing etc..
Daniel O'Connor <darius@dons.net.au>
parents: 3
diff changeset
165 "BP2",
2c87e30c982d Add LCD init, touch screen writing etc..
Daniel O'Connor <darius@dons.net.au>
parents: 3
diff changeset
166 "BP3",
2c87e30c982d Add LCD init, touch screen writing etc..
Daniel O'Connor <darius@dons.net.au>
parents: 3
diff changeset
167 "AAI",
2c87e30c982d Add LCD init, touch screen writing etc..
Daniel O'Connor <darius@dons.net.au>
parents: 3
diff changeset
168 "BPL"
2c87e30c982d Add LCD init, touch screen writing etc..
Daniel O'Connor <darius@dons.net.au>
parents: 3
diff changeset
169 };
2c87e30c982d Add LCD init, touch screen writing etc..
Daniel O'Connor <darius@dons.net.au>
parents: 3
diff changeset
170
8
58d76cf522ff Split out code into separate files.
Daniel O'Connor <darius@dons.net.au>
parents: 7
diff changeset
171 printf("Flash ID = 0x%04hx (expect 0xbf41)\r\n", flashreadid());
58d76cf522ff Split out code into separate files.
Daniel O'Connor <darius@dons.net.au>
parents: 7
diff changeset
172 status = flashreadstatus();
4
2c87e30c982d Add LCD init, touch screen writing etc..
Daniel O'Connor <darius@dons.net.au>
parents: 3
diff changeset
173
2c87e30c982d Add LCD init, touch screen writing etc..
Daniel O'Connor <darius@dons.net.au>
parents: 3
diff changeset
174 fputs("Status = ", stdout);
2c87e30c982d Add LCD init, touch screen writing etc..
Daniel O'Connor <darius@dons.net.au>
parents: 3
diff changeset
175 for (unsigned int i = 0; i < sizeof(flstattbl) / sizeof(flstattbl[0]); i++)
2c87e30c982d Add LCD init, touch screen writing etc..
Daniel O'Connor <darius@dons.net.au>
parents: 3
diff changeset
176 if (status & 1 << i) {
2c87e30c982d Add LCD init, touch screen writing etc..
Daniel O'Connor <darius@dons.net.au>
parents: 3
diff changeset
177 fputs(flstattbl[i], stdout);
2c87e30c982d Add LCD init, touch screen writing etc..
Daniel O'Connor <darius@dons.net.au>
parents: 3
diff changeset
178 fputs(" ", stdout);
2c87e30c982d Add LCD init, touch screen writing etc..
Daniel O'Connor <darius@dons.net.au>
parents: 3
diff changeset
179 }
2c87e30c982d Add LCD init, touch screen writing etc..
Daniel O'Connor <darius@dons.net.au>
parents: 3
diff changeset
180 printf("(0x%02x)\r\n", status);
2c87e30c982d Add LCD init, touch screen writing etc..
Daniel O'Connor <darius@dons.net.au>
parents: 3
diff changeset
181
8
58d76cf522ff Split out code into separate files.
Daniel O'Connor <darius@dons.net.au>
parents: 7
diff changeset
182 flashwritestatus(0x00);
4
2c87e30c982d Add LCD init, touch screen writing etc..
Daniel O'Connor <darius@dons.net.au>
parents: 3
diff changeset
183
8
58d76cf522ff Split out code into separate files.
Daniel O'Connor <darius@dons.net.au>
parents: 7
diff changeset
184 status = flashreadstatus();
4
2c87e30c982d Add LCD init, touch screen writing etc..
Daniel O'Connor <darius@dons.net.au>
parents: 3
diff changeset
185
2c87e30c982d Add LCD init, touch screen writing etc..
Daniel O'Connor <darius@dons.net.au>
parents: 3
diff changeset
186 fputs("Status = ", stdout);
2c87e30c982d Add LCD init, touch screen writing etc..
Daniel O'Connor <darius@dons.net.au>
parents: 3
diff changeset
187 for (unsigned int i = 0; i < sizeof(flstattbl) / sizeof(flstattbl[0]); i++)
2c87e30c982d Add LCD init, touch screen writing etc..
Daniel O'Connor <darius@dons.net.au>
parents: 3
diff changeset
188 if (status & 1 << i) {
2c87e30c982d Add LCD init, touch screen writing etc..
Daniel O'Connor <darius@dons.net.au>
parents: 3
diff changeset
189 fputs(flstattbl[i], stdout);
2c87e30c982d Add LCD init, touch screen writing etc..
Daniel O'Connor <darius@dons.net.au>
parents: 3
diff changeset
190 fputs(" ", stdout);
2c87e30c982d Add LCD init, touch screen writing etc..
Daniel O'Connor <darius@dons.net.au>
parents: 3
diff changeset
191 }
2c87e30c982d Add LCD init, touch screen writing etc..
Daniel O'Connor <darius@dons.net.au>
parents: 3
diff changeset
192 printf("(0x%02x)\r\n", status);
5
efa2c22266e3 PWM control LED backlight.
Daniel O'Connor <darius@dons.net.au>
parents: 4
diff changeset
193 } else if (!strncmp("pwm ", cmd.buf, 4)) {
efa2c22266e3 PWM control LED backlight.
Daniel O'Connor <darius@dons.net.au>
parents: 4
diff changeset
194 lcd_setpwm(atoi(cmd.buf + 4));
7
9404b9869c27 Make the LCD panel work (timings, GPIOE clock needs to be on, etc)
Daniel O'Connor <darius@dons.net.au>
parents: 5
diff changeset
195 } else if (!strncmp("timing", cmd.buf, 6)) {
9404b9869c27 Make the LCD panel work (timings, GPIOE clock needs to be on, etc)
Daniel O'Connor <darius@dons.net.au>
parents: 5
diff changeset
196 fputs("Timing..\r\n", stdout);
8
58d76cf522ff Split out code into separate files.
Daniel O'Connor <darius@dons.net.au>
parents: 7
diff changeset
197 delay(10000);
7
9404b9869c27 Make the LCD panel work (timings, GPIOE clock needs to be on, etc)
Daniel O'Connor <darius@dons.net.au>
parents: 5
diff changeset
198 fputs("Done\r\n", stdout);
8
58d76cf522ff Split out code into separate files.
Daniel O'Connor <darius@dons.net.au>
parents: 7
diff changeset
199 } else if (!strncmp("circ ", cmd.buf, 5)) {
58d76cf522ff Split out code into separate files.
Daniel O'Connor <darius@dons.net.au>
parents: 7
diff changeset
200 uint16_t x, y, r, c;
58d76cf522ff Split out code into separate files.
Daniel O'Connor <darius@dons.net.au>
parents: 7
diff changeset
201 char col;
58d76cf522ff Split out code into separate files.
Daniel O'Connor <darius@dons.net.au>
parents: 7
diff changeset
202
58d76cf522ff Split out code into separate files.
Daniel O'Connor <darius@dons.net.au>
parents: 7
diff changeset
203 if (sscanf(cmd.buf, "circ %hu %hu %hu %c", &x, &y, &r, &col) != 4) {
58d76cf522ff Split out code into separate files.
Daniel O'Connor <darius@dons.net.au>
parents: 7
diff changeset
204 printf("Unable to parse circ args\r\n");
58d76cf522ff Split out code into separate files.
Daniel O'Connor <darius@dons.net.au>
parents: 7
diff changeset
205 goto out;
58d76cf522ff Split out code into separate files.
Daniel O'Connor <darius@dons.net.au>
parents: 7
diff changeset
206 }
58d76cf522ff Split out code into separate files.
Daniel O'Connor <darius@dons.net.au>
parents: 7
diff changeset
207
58d76cf522ff Split out code into separate files.
Daniel O'Connor <darius@dons.net.au>
parents: 7
diff changeset
208 col = toupper(col);
58d76cf522ff Split out code into separate files.
Daniel O'Connor <darius@dons.net.au>
parents: 7
diff changeset
209 if (col == 'R')
58d76cf522ff Split out code into separate files.
Daniel O'Connor <darius@dons.net.au>
parents: 7
diff changeset
210 c = LCD_RED;
58d76cf522ff Split out code into separate files.
Daniel O'Connor <darius@dons.net.au>
parents: 7
diff changeset
211 else if (col == 'G')
58d76cf522ff Split out code into separate files.
Daniel O'Connor <darius@dons.net.au>
parents: 7
diff changeset
212 c = LCD_GREEN;
58d76cf522ff Split out code into separate files.
Daniel O'Connor <darius@dons.net.au>
parents: 7
diff changeset
213 else if (col == 'B')
58d76cf522ff Split out code into separate files.
Daniel O'Connor <darius@dons.net.au>
parents: 7
diff changeset
214 c = LCD_BLUE;
58d76cf522ff Split out code into separate files.
Daniel O'Connor <darius@dons.net.au>
parents: 7
diff changeset
215 else if (col == 'L')
58d76cf522ff Split out code into separate files.
Daniel O'Connor <darius@dons.net.au>
parents: 7
diff changeset
216 c = LCD_BLACK;
58d76cf522ff Split out code into separate files.
Daniel O'Connor <darius@dons.net.au>
parents: 7
diff changeset
217 else
58d76cf522ff Split out code into separate files.
Daniel O'Connor <darius@dons.net.au>
parents: 7
diff changeset
218 c = LCD_WHITE;
58d76cf522ff Split out code into separate files.
Daniel O'Connor <darius@dons.net.au>
parents: 7
diff changeset
219 lcd_circle(x, y, r, c);
3
74e9b3baac1e Jumbo commit to make things work.
Daniel O'Connor <darius@dons.net.au>
parents: 2
diff changeset
220 } else if (!strncmp("zz", cmd.buf, 2)) {
74e9b3baac1e Jumbo commit to make things work.
Daniel O'Connor <darius@dons.net.au>
parents: 2
diff changeset
221 NVIC_SystemReset();
74e9b3baac1e Jumbo commit to make things work.
Daniel O'Connor <darius@dons.net.au>
parents: 2
diff changeset
222 } else {
74e9b3baac1e Jumbo commit to make things work.
Daniel O'Connor <darius@dons.net.au>
parents: 2
diff changeset
223 printf("Unknown command\r\n");
74e9b3baac1e Jumbo commit to make things work.
Daniel O'Connor <darius@dons.net.au>
parents: 2
diff changeset
224 }
74e9b3baac1e Jumbo commit to make things work.
Daniel O'Connor <darius@dons.net.au>
parents: 2
diff changeset
225 }
8
58d76cf522ff Split out code into separate files.
Daniel O'Connor <darius@dons.net.au>
parents: 7
diff changeset
226 out:
0
c59513fd84fb Initial commit of STM32 test code.
Daniel O'Connor <darius@dons.net.au>
parents:
diff changeset
227 cmd.state = 0;
c59513fd84fb Initial commit of STM32 test code.
Daniel O'Connor <darius@dons.net.au>
parents:
diff changeset
228 }
c59513fd84fb Initial commit of STM32 test code.
Daniel O'Connor <darius@dons.net.au>
parents:
diff changeset
229 }
c59513fd84fb Initial commit of STM32 test code.
Daniel O'Connor <darius@dons.net.au>
parents:
diff changeset
230
c59513fd84fb Initial commit of STM32 test code.
Daniel O'Connor <darius@dons.net.au>
parents:
diff changeset
231 /* Configure interrupt controller */
c59513fd84fb Initial commit of STM32 test code.
Daniel O'Connor <darius@dons.net.au>
parents:
diff changeset
232 #ifdef VECT_TAB_RAM
c59513fd84fb Initial commit of STM32 test code.
Daniel O'Connor <darius@dons.net.au>
parents:
diff changeset
233 /* vector-offset (TBLOFF) from bottom of SRAM. defined in linker script */
c59513fd84fb Initial commit of STM32 test code.
Daniel O'Connor <darius@dons.net.au>
parents:
diff changeset
234 extern uint32_t _isr_vectorsram_offs;
c59513fd84fb Initial commit of STM32 test code.
Daniel O'Connor <darius@dons.net.au>
parents:
diff changeset
235 #else
c59513fd84fb Initial commit of STM32 test code.
Daniel O'Connor <darius@dons.net.au>
parents:
diff changeset
236 extern uint32_t _isr_vectorsflash_offs;
2
274e01fa5a4c - Do console IO with RX IRQs.
Daniel O'Connor <darius@dons.net.au>
parents: 0
diff changeset
237 #endif
274e01fa5a4c - Do console IO with RX IRQs.
Daniel O'Connor <darius@dons.net.au>
parents: 0
diff changeset
238
0
c59513fd84fb Initial commit of STM32 test code.
Daniel O'Connor <darius@dons.net.au>
parents:
diff changeset
239 void
c59513fd84fb Initial commit of STM32 test code.
Daniel O'Connor <darius@dons.net.au>
parents:
diff changeset
240 NVIC_Configuration(void) {
2
274e01fa5a4c - Do console IO with RX IRQs.
Daniel O'Connor <darius@dons.net.au>
parents: 0
diff changeset
241 NVIC_InitTypeDef NVIC_InitStructure;
274e01fa5a4c - Do console IO with RX IRQs.
Daniel O'Connor <darius@dons.net.au>
parents: 0
diff changeset
242
274e01fa5a4c - Do console IO with RX IRQs.
Daniel O'Connor <darius@dons.net.au>
parents: 0
diff changeset
243 #ifdef VECT_TAB_RAM
274e01fa5a4c - Do console IO with RX IRQs.
Daniel O'Connor <darius@dons.net.au>
parents: 0
diff changeset
244 /* Set the Vector Table base location at 0x20000000+_isr_vectorsram_offs */
274e01fa5a4c - Do console IO with RX IRQs.
Daniel O'Connor <darius@dons.net.au>
parents: 0
diff changeset
245 NVIC_SetVectorTable(NVIC_VectTab_RAM, (uint32_t)&_isr_vectorsram_offs);
274e01fa5a4c - Do console IO with RX IRQs.
Daniel O'Connor <darius@dons.net.au>
parents: 0
diff changeset
246 #else
0
c59513fd84fb Initial commit of STM32 test code.
Daniel O'Connor <darius@dons.net.au>
parents:
diff changeset
247 /* Set the Vector Table base location at 0x08000000+_isr_vectorsflash_offs */
c59513fd84fb Initial commit of STM32 test code.
Daniel O'Connor <darius@dons.net.au>
parents:
diff changeset
248 NVIC_SetVectorTable(NVIC_VectTab_FLASH, (uint32_t)&_isr_vectorsflash_offs);
2
274e01fa5a4c - Do console IO with RX IRQs.
Daniel O'Connor <darius@dons.net.au>
parents: 0
diff changeset
249 #endif
274e01fa5a4c - Do console IO with RX IRQs.
Daniel O'Connor <darius@dons.net.au>
parents: 0
diff changeset
250
274e01fa5a4c - Do console IO with RX IRQs.
Daniel O'Connor <darius@dons.net.au>
parents: 0
diff changeset
251 /* Enable the USART1 Interrupt */
274e01fa5a4c - Do console IO with RX IRQs.
Daniel O'Connor <darius@dons.net.au>
parents: 0
diff changeset
252 NVIC_InitStructure.NVIC_IRQChannel = USART1_IRQn;
274e01fa5a4c - Do console IO with RX IRQs.
Daniel O'Connor <darius@dons.net.au>
parents: 0
diff changeset
253 NVIC_InitStructure.NVIC_IRQChannelSubPriority = 0;
274e01fa5a4c - Do console IO with RX IRQs.
Daniel O'Connor <darius@dons.net.au>
parents: 0
diff changeset
254 NVIC_InitStructure.NVIC_IRQChannelCmd = ENABLE;
274e01fa5a4c - Do console IO with RX IRQs.
Daniel O'Connor <darius@dons.net.au>
parents: 0
diff changeset
255 NVIC_Init(&NVIC_InitStructure);
0
c59513fd84fb Initial commit of STM32 test code.
Daniel O'Connor <darius@dons.net.au>
parents:
diff changeset
256 }
2
274e01fa5a4c - Do console IO with RX IRQs.
Daniel O'Connor <darius@dons.net.au>
parents: 0
diff changeset
257