Skip to content

Commit 5910112

Browse files
committed
Added type to doublepress counters
1 parent bc3b781 commit 5910112

File tree

3 files changed

+9
-10
lines changed

3 files changed

+9
-10
lines changed

BUILD_DIR/main.c

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,16 @@
22

33
#include <esos.h>
44
#include "esos_pic24.h"
5-
//#include "esos_pic24_rs232.h"
5+
#include "esos_pic24_rs232.h"
66
#include <p33EP512GP806.h>
7-
#include <pic24_all.h>
8-
#include "esos_f14ui.h"
97
#include <stdio.h>
108
#include <stdlib.h>
119
#include "pic24_util.h"
1210
#include "pic24_serial.h"
13-
#include "revF14.h"
1411
#include "esos_comm.h"
1512

13+
#include "esos_f14ui.h"
14+
1615

1716
ESOS_USER_TASK(demoLEDsAndSwitches) {
1817
ESOS_TASK_BEGIN();

esos/include/esos_f14ui.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66
*
77
* ****************************************************************/
88

9-
# include <all_generic.h>
109

11-
#ifndef ESOS_UIF14_H
10+
#ifndef ESOS_UIF14_H
1211
#define ESOS_UIF14_H
12+
# include <all_generic.h>
1313

1414
// STRUCTURES
1515

esos/src/esos_f14ui.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
* requires the EMBEDDED SYSTEMS target rev. F14
66
*
77
* ****************************************************************/
8+
#include <esos_f14ui.h>
89
#include <esos.h>
910
#include "esos_pic24.h"
10-
#include <esos_f14ui.h>
1111
#include <revF14.h>
1212

1313
#define MINIMUM_LED_FLASH_PERIOD 100
@@ -258,9 +258,9 @@ ESOS_USER_TASK(__esos_uiF14_task){
258258
static LED3_counter = 0;
259259

260260
// init to -1 to disable counters by default
261-
static SW1_doublepress_counter = -1;
262-
static SW2_doublepress_counter = -1;
263-
static SW3_doublepress_counter = -1;
261+
static int SW1_doublepress_counter = -1;
262+
static int SW2_doublepress_counter = -1;
263+
static int SW3_doublepress_counter = -1;
264264

265265
ESOS_TASK_BEGIN();
266266
while(TRUE) {

0 commit comments

Comments
 (0)