From 4115cac3f1ddc410efc6f8c8ba4a3fcca10ca19c Mon Sep 17 00:00:00 2001 From: Imanol-Mikel Barba Sabariego Date: Thu, 5 Jun 2014 04:37:58 +0000 Subject: [PATCH] --- Project/applications/smartcities/include/adc.h | 1 + Project/applications/smartcities/include/buffer.h | 1 + Project/applications/smartcities/include/callbacks.h | 1 + Project/applications/smartcities/include/configServer.h | 3 +++ Project/applications/smartcities/include/httpClient.h | 1 + Project/applications/smartcities/include/i2c.h | 1 + Project/applications/smartcities/include/json.h | 1 + Project/applications/smartcities/include/ntp.h | 1 + Project/applications/smartcities/include/sensors.h | 1 + Project/applications/smartcities/include/timer-loop.h | 1 + Project/applications/smartcities/main.c | 1 + 11 files changed, 13 insertions(+), 0 deletions(-) diff --git a/Project/applications/smartcities/include/adc.h b/Project/applications/smartcities/include/adc.h index 1c39263..b95decf 100644 --- a/Project/applications/smartcities/include/adc.h +++ b/Project/applications/smartcities/include/adc.h @@ -8,6 +8,7 @@ #include "stm32f10x_adc.h" #define DBG_ADC(fmt,...) printf("%c[1;35madc.c:%c[1;00m "fmt,0x1B,0x1B, ##__VA_ARGS__) +//#define DBG_ADC(fmt,...) printf("") #define ADCbatt_MIN_VALUE (0) #define ADCbatt_MAX_VALUE (0xfff) diff --git a/Project/applications/smartcities/include/buffer.h b/Project/applications/smartcities/include/buffer.h index c7e9f00..6bb72f7 100644 --- a/Project/applications/smartcities/include/buffer.h +++ b/Project/applications/smartcities/include/buffer.h @@ -11,6 +11,7 @@ #define HARD_REACHED 2 #define DBG_BUFFER(fmt,...) printf("%c[1;35mbuffer.c:%c[1;00m "fmt,0x1B,0x1B, ##__VA_ARGS__) +//#define DBG_BUFFER(fmt,...) printf("") char** put_message(char* info, char** buf,uint32_t *index, uint32_t *buf_len); int check_memory(void); diff --git a/Project/applications/smartcities/include/callbacks.h b/Project/applications/smartcities/include/callbacks.h index faf3f66..50807c9 100644 --- a/Project/applications/smartcities/include/callbacks.h +++ b/Project/applications/smartcities/include/callbacks.h @@ -21,6 +21,7 @@ void softapMode_apStartedCb(int result); void printWifiInfo(uint8_t wifiMode); #define DBG_CALLBACKS(fmt,...) printf("%c[1;35mcallbacks.c:%c[1;00m "fmt,0x1B,0x1B, ##__VA_ARGS__) +//#define DBG_CALLBACKS(fmt,...) printf("") extern uint8_t connected; extern uint8_t timeout; diff --git a/Project/applications/smartcities/include/configServer.h b/Project/applications/smartcities/include/configServer.h index 479434a..f352ab2 100644 --- a/Project/applications/smartcities/include/configServer.h +++ b/Project/applications/smartcities/include/configServer.h @@ -13,6 +13,9 @@ #define CONFIG_SERVER_DBG(fmt,...) printf("%c[1;35mconfigServer.c:%c[1;00m "fmt,0x1B,0x1B, ##__VA_ARGS__) #define CONFIG_SERVER_DBG_WARNING(fmt,...) printf("%c[1;35mconfigServer.c:%c[1;33m[WARNING] "fmt"%c[1;00m",0x1B,0x1B,0x1B, ##__VA_ARGS__) +//#define CONFIG_SERVER_DBG(fmt,...) printf("") +//#define CONFIG_SERVER_DBG_WARNING(fmt,...) printf("") + void configServer_start(uint8_t enableApScan); void configServer_connect(void); uint32_t condigServer_dynamicCb(char* varName, char** varValue, uint8_t* varAllocType); diff --git a/Project/applications/smartcities/include/httpClient.h b/Project/applications/smartcities/include/httpClient.h index db1a0e4..6400cf3 100644 --- a/Project/applications/smartcities/include/httpClient.h +++ b/Project/applications/smartcities/include/httpClient.h @@ -20,6 +20,7 @@ #define CONTENT_TYPE_HEADER "Content-Type: application/json; charset=UTF-8" #define DBG_HTTP(fmt,...) printf("%c[1;35mhttpClient.c:%c[1;00m "fmt,0x1B,0x1B, ##__VA_ARGS__) +//#define DBG_HTTP(fmt,...) printf("") typedef enum reqMethod diff --git a/Project/applications/smartcities/include/i2c.h b/Project/applications/smartcities/include/i2c.h index 62f8948..996750c 100644 --- a/Project/applications/smartcities/include/i2c.h +++ b/Project/applications/smartcities/include/i2c.h @@ -10,6 +10,7 @@ #define I2C_TIMEOUT 100 #define DBG_I2C(fmt,...) printf("%c[1;35mi2c.c:%c[1;00m "fmt,0x1B,0x1B, ##__VA_ARGS__) +//#define DBG_I2C(fmt,...) printf("") void I2C_init(void); diff --git a/Project/applications/smartcities/include/json.h b/Project/applications/smartcities/include/json.h index dbb85a5..0df065c 100644 --- a/Project/applications/smartcities/include/json.h +++ b/Project/applications/smartcities/include/json.h @@ -19,6 +19,7 @@ #define JOIN_FREE_MEM 1 #define DBG_JSON(fmt,...) printf("%c[1;35mjson.c:%c[1;00m "fmt,0x1B,0x1B, ##__VA_ARGS__) +//#define DBG_JSON(fmt,...) printf("") uint8_t register_sensor(sensor sens); char* prepare_json_observation_statement(char** data, uint32_t nObservations); diff --git a/Project/applications/smartcities/include/ntp.h b/Project/applications/smartcities/include/ntp.h index 0362428..0b0a233 100644 --- a/Project/applications/smartcities/include/ntp.h +++ b/Project/applications/smartcities/include/ntp.h @@ -19,6 +19,7 @@ #include "globals.h" #define DBG_NTP(fmt,...) printf("%c[1;35mntp.c:%c[1;00m "fmt,0x1B,0x1B, ##__VA_ARGS__) +//#define DBG_NTP(fmt,...) printf("") #define LEAP_YEAR(Y) (((1970+Y)>0) && !((1970+Y)%4) && (((1970+Y)%100) || !((1970+Y)%400))) #define NTP_PACKET_LENGTH 48 diff --git a/Project/applications/smartcities/include/sensors.h b/Project/applications/smartcities/include/sensors.h index d0eb0a4..14f41b7 100644 --- a/Project/applications/smartcities/include/sensors.h +++ b/Project/applications/smartcities/include/sensors.h @@ -20,6 +20,7 @@ #define BATTERY_ADDR 0x00 //SIEMPRE PRESENTE, NUNCA BUSCAR EN i2c_scan #define DBG_SENSORS(fmt,...) printf("%c[1;35msensors.c:%c[1;00m "fmt,0x1B,0x1B, ##__VA_ARGS__) +//#define DBG_SENSORS(fmt,...) printf("") typedef struct { uint8_t ID; diff --git a/Project/applications/smartcities/include/timer-loop.h b/Project/applications/smartcities/include/timer-loop.h index 9c4a8b2..60d4581 100644 --- a/Project/applications/smartcities/include/timer-loop.h +++ b/Project/applications/smartcities/include/timer-loop.h @@ -12,6 +12,7 @@ #define SHORT_PERIOD 60*1 //60*1 // for testing #define DBG_TIMER(fmt,...) printf("%c[1;35mtimer-loop.c:%c[1;00m "fmt,0x1B,0x1B, ##__VA_ARGS__) +//#define DBG_TIMER(fmt,...) printf("") unsigned long getSystemTime(void); diff --git a/Project/applications/smartcities/main.c b/Project/applications/smartcities/main.c index 7ce99c4..d6025e1 100644 --- a/Project/applications/smartcities/main.c +++ b/Project/applications/smartcities/main.c @@ -13,6 +13,7 @@ #include "sensors.h" #define DBG(fmt,...) printf("%c[1;35mmain.c:%c[1;00m "fmt,0x1B,0x1B, ##__VA_ARGS__) +//#define DBG(fmt,...) printf("") uint8_t connected=0; uint8_t timeout=0; -- libgit2 0.22.2