Skip to content

Commit 77b25c1

Browse files
committed
conflits resolved
2 parents 75520e7 + bf2b0f4 commit 77b25c1

File tree

1 file changed

+63
-64
lines changed

1 file changed

+63
-64
lines changed

funkey_prod_screens.h

Lines changed: 63 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -1,64 +1,63 @@
1-
#ifndef __FUNKEY_PROD_SCREENS__
2-
#define __FUNKEY_PROD_SCREENS__
3-
4-
#include <stdlib.h>
5-
#include <stdio.h>
6-
#include <SDL/SDL.h>
7-
#include <SDL/SDL_ttf.h>
8-
#include <SDL/SDL_image.h>
9-
#include "prodScreen_failScreen.h"
10-
#include "prodScreen_waitBattery.h"
11-
#include "prodScreen_displayTest.h"
12-
#include "prodScreen_brightnessTest.h"
13-
#include "prodScreen_buttonsTest.h"
14-
#include "prodScreen_speakerTest.h"
15-
#include "prodScreen_ledTest.h"
16-
#include "prodScreen_magnetTest.h"
17-
#include "prodScreen_validation.h"
18-
#include "prodScreen_showImage.h"
19-
#include "prodScreen_gamma.h"
20-
#include "prodScreen_tearingTest.h"
21-
22-
23-
/// Defines
24-
#define ERROR_MANUAL_FAIL 2
25-
26-
#define SCREEN_HORIZONTAL_SIZE 240
27-
#define SCREEN_VERTICAL_SIZE 240
28-
29-
#define SLEEP_PERIOD_MS 100
30-
31-
#define COLOR_BG_R 255
32-
#define COLOR_BG_G 255
33-
#define COLOR_BG_B 255
34-
#define COLOR_TEXT_R 130
35-
#define COLOR_TEXT_G 30
36-
#define COLOR_TEXT_B 160
37-
38-
#define Y_PADDING 10
39-
#define X_PADDING 20
40-
41-
#define FOLDER_RESSOURCES "/usr/local/sbin/ProdResources"
42-
#define FONT_NAME_TITLE FOLDER_RESSOURCES"/FreeSansBold.ttf"
43-
#define FONT_SIZE_TITLE 20
44-
#define FONT_NAME_INFO FONT_NAME_TITLE
45-
#define FONT_SIZE_INFO 18
46-
47-
typedef struct
48-
{
49-
char *cmd_line_argument;
50-
int (*ptr_function_launch_test)(int argc, char *argv[]);
51-
int nb_args_needed;
52-
} s_prod_test;
53-
54-
55-
/// Global variables
56-
extern SDL_Surface *hw_surface;
57-
extern TTF_Font *font_title;
58-
extern TTF_Font *font_info;
59-
extern SDL_Color bg_color;
60-
extern SDL_Color text_color;
61-
char *prog_title;
62-
63-
64-
#endif //__FUNKEY_PROD_SCREENS__
1+
#ifndef __FUNKEY_PROD_SCREENS__
2+
#define __FUNKEY_PROD_SCREENS__
3+
4+
#include <stdlib.h>
5+
#include <stdio.h>
6+
#include <SDL/SDL.h>
7+
#include <SDL/SDL_ttf.h>
8+
#include <SDL/SDL_image.h>
9+
#include "prodScreen_failScreen.h"
10+
#include "prodScreen_waitBattery.h"
11+
#include "prodScreen_displayTest.h"
12+
#include "prodScreen_brightnessTest.h"
13+
#include "prodScreen_buttonsTest.h"
14+
#include "prodScreen_speakerTest.h"
15+
#include "prodScreen_ledTest.h"
16+
#include "prodScreen_magnetTest.h"
17+
#include "prodScreen_validation.h"
18+
#include "prodScreen_showImage.h"
19+
#include "prodScreen_gamma.h"
20+
21+
22+
/// Defines
23+
#define ERROR_MANUAL_FAIL 2
24+
25+
#define SCREEN_HORIZONTAL_SIZE 240
26+
#define SCREEN_VERTICAL_SIZE 240
27+
28+
#define SLEEP_PERIOD_MS 100
29+
30+
#define COLOR_BG_R 255
31+
#define COLOR_BG_G 255
32+
#define COLOR_BG_B 255
33+
#define COLOR_TEXT_R 130
34+
#define COLOR_TEXT_G 30
35+
#define COLOR_TEXT_B 160
36+
37+
#define Y_PADDING 10
38+
#define X_PADDING 20
39+
40+
#define FOLDER_RESSOURCES "/usr/local/sbin/ProdResources"
41+
#define FONT_NAME_TITLE FOLDER_RESSOURCES"/FreeSansBold.ttf"
42+
#define FONT_SIZE_TITLE 20
43+
#define FONT_NAME_INFO FONT_NAME_TITLE
44+
#define FONT_SIZE_INFO 18
45+
46+
typedef struct
47+
{
48+
char *cmd_line_argument;
49+
int (*ptr_function_launch_test)(int argc, char *argv[]);
50+
int nb_args_needed;
51+
} s_prod_test;
52+
53+
54+
/// Global variables
55+
extern SDL_Surface *hw_surface;
56+
extern TTF_Font *font_title;
57+
extern TTF_Font *font_info;
58+
extern SDL_Color bg_color;
59+
extern SDL_Color text_color;
60+
char *prog_title;
61+
62+
63+
#endif //__FUNKEY_PROD_SCREENS__

0 commit comments

Comments
 (0)