Skip to content

Commit 65f2d3f

Browse files
IRISZZWfanghuaqi
authored andcommitted
application: Fixed compiling issues for apps in arc_design_contest/2018 (#25)
* bugs fixed #24 * Use emsk_temperature.h in arc_design_contest\2018\XDU_Autofollowing_suitcase\src\main.c * fix some warnings and bugs
1 parent d7a7fed commit 65f2d3f

File tree

55 files changed

+196
-114
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+196
-114
lines changed

arc_design_contest/2018/HUST_iRhythm/inc/oled.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ extern void OLED_P6x8Str(uint8_t x, uint8_t y, uint8_t ch[]);
4242
extern void OLED_P8x16Str(uint8_t x, uint8_t y, uint8_t ch[]);
4343
extern void OLED_P14x16Str(uint8_t x, uint8_t y, uint8_t ch[]);
4444
extern void draw_fft();
45+
extern void OLED_PrintInt16(uint8_t ucIdxX, uint8_t ucIdxY, int16_t sData);
4546

4647
#endif
4748

arc_design_contest/2018/HUST_iRhythm/src/GUI/oled.c

Lines changed: 82 additions & 82 deletions
Original file line numberDiff line numberDiff line change
@@ -237,88 +237,88 @@ void OLED_P8x16Str(uint8_t x, uint8_t y, uint8_t ch[])
237237

238238

239239

240-
void OLED_P14x16Str(uint8_t x, uint8_t y, uint8_t ch[])
241-
{
242-
uint8_t wm = 0, ii = 0;
243-
uint16_t adder = 1;
244-
245-
while (ch[ii] != '\0') {
246-
wm = 0;
247-
adder = 1;
248-
249-
while (F14x16_Idx[wm] > 127) {
250-
if (F14x16_Idx[wm] == ch[ii]) {
251-
if (F14x16_Idx[wm + 1] == ch[ii + 1]) {
252-
adder = wm * 14;
253-
break;
254-
}
255-
}
256-
257-
wm += 2;
258-
}
259-
260-
if (x > 118) {x = 0; y++;}
261-
262-
OLED_Set_Pos(x , y);
263-
264-
if (adder != 1) {
265-
OLED_Set_Pos(x , y);
266-
267-
for (wm = 0; wm < 14; wm++) {
268-
Write_IIC_Data(F14x16[adder]);
269-
adder += 1;
270-
}
271-
272-
OLED_Set_Pos(x, y + 1);
273-
274-
for (wm = 0; wm < 14; wm++) {
275-
Write_IIC_Data(F14x16[adder]);
276-
adder += 1;
277-
}
278-
} else {
279-
ii += 1;
280-
OLED_Set_Pos(x, y);
281-
282-
for (wm = 0; wm < 16; wm++) {
283-
Write_IIC_Data(0);
284-
}
285-
286-
OLED_Set_Pos(x, y + 1);
287-
288-
for (wm = 0; wm < 16; wm++) {
289-
Write_IIC_Data(0);
290-
}
291-
}
292-
293-
x += 14;
294-
ii += 2;
295-
}
296-
}
297-
298-
299-
300-
void OLED_Print(uint8_t x, uint8_t y, uint8_t ch[])
301-
{
302-
uint8_t ch2[3];
303-
uint8_t ii = 0;
304-
305-
while (ch[ii] != '\0') {
306-
if (ch[ii] > 127) {
307-
ch2[0] = ch[ii];
308-
ch2[1] = ch[ii + 1];
309-
ch2[2] = '\0';
310-
OLED_P14x16Str(x , y, ch2);
311-
x += 14;
312-
ii += 2;
313-
} else {
314-
ch2[0] = ch[ii];
315-
ch2[1] = '\0';
316-
OLED_P8x16Str(x , y , ch2);
317-
x += 8;
318-
ii += 1;
319-
}
320-
}
321-
}
240+
// void OLED_P14x16Str(uint8_t x, uint8_t y, uint8_t ch[])
241+
// {
242+
// uint8_t wm = 0, ii = 0;
243+
// uint16_t adder = 1;
244+
245+
// while (ch[ii] != '\0') {
246+
// wm = 0;
247+
// adder = 1;
248+
249+
// while (F14x16_Idx[wm] > 127) {
250+
// if (F14x16_Idx[wm] == ch[ii]) {
251+
// if (F14x16_Idx[wm + 1] == ch[ii + 1]) {
252+
// adder = wm * 14;
253+
// break;
254+
// }
255+
// }
256+
257+
// wm += 2;
258+
// }
259+
260+
// if (x > 118) {x = 0; y++;}
261+
262+
// OLED_Set_Pos(x , y);
263+
264+
// if (adder != 1) {
265+
// OLED_Set_Pos(x , y);
266+
267+
// for (wm = 0; wm < 14; wm++) {
268+
// Write_IIC_Data(F14x16[adder]);
269+
// adder += 1;
270+
// }
271+
272+
// OLED_Set_Pos(x, y + 1);
273+
274+
// for (wm = 0; wm < 14; wm++) {
275+
// Write_IIC_Data(F14x16[adder]);
276+
// adder += 1;
277+
// }
278+
// } else {
279+
// ii += 1;
280+
// OLED_Set_Pos(x, y);
281+
282+
// for (wm = 0; wm < 16; wm++) {
283+
// Write_IIC_Data(0);
284+
// }
285+
286+
// OLED_Set_Pos(x, y + 1);
287+
288+
// for (wm = 0; wm < 16; wm++) {
289+
// Write_IIC_Data(0);
290+
// }
291+
// }
292+
293+
// x += 14;
294+
// ii += 2;
295+
// }
296+
// }
297+
298+
299+
300+
// void OLED_Print(uint8_t x, uint8_t y, uint8_t ch[])
301+
// {
302+
// uint8_t ch2[3];
303+
// uint8_t ii = 0;
304+
305+
// while (ch[ii] != '\0') {
306+
// if (ch[ii] > 127) {
307+
// ch2[0] = ch[ii];
308+
// ch2[1] = ch[ii + 1];
309+
// ch2[2] = '\0';
310+
// OLED_P14x16Str(x , y, ch2);
311+
// x += 14;
312+
// ii += 2;
313+
// } else {
314+
// ch2[0] = ch[ii];
315+
// ch2[1] = '\0';
316+
// OLED_P8x16Str(x , y , ch2);
317+
// x += 8;
318+
// ii += 1;
319+
// }
320+
// }
321+
// }
322322

323323

324324

arc_design_contest/2018/HUST_iRhythm/src/MUSIC/mp3_dec/mp3_Ori/subband.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@
4646
#include "coder.h"
4747

4848
#include "include.h"
49+
extern void fft_cal();
4950
/**************************************************************************************
5051
* Function: Subband
5152
*

0 commit comments

Comments
 (0)