diff --git a/Project/applications/smartcities/include/adc.h b/Project/applications/smartcities/include/adc.h index 73ea6ee..b95decf 100644 --- a/Project/applications/smartcities/include/adc.h +++ b/Project/applications/smartcities/include/adc.h @@ -7,8 +7,8 @@ #include "stm32f10x_gpio.h" #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 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/callbacks.h b/Project/applications/smartcities/include/callbacks.h index 403db70..50807c9 100644 --- a/Project/applications/smartcities/include/callbacks.h +++ b/Project/applications/smartcities/include/callbacks.h @@ -20,8 +20,8 @@ void softapMode_clientIndicationCb(wismart_softap_cb_t reason, const uint8_t *ma 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("") +#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 dbefd35..f352ab2 100644 --- a/Project/applications/smartcities/include/configServer.h +++ b/Project/applications/smartcities/include/configServer.h @@ -10,11 +10,11 @@ #include "ch.h" #include "fsdata.c" -//#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("%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("") +//#define CONFIG_SERVER_DBG(fmt,...) printf("") +//#define CONFIG_SERVER_DBG_WARNING(fmt,...) printf("") void configServer_start(uint8_t enableApScan); void configServer_connect(void); diff --git a/Project/applications/smartcities/include/httpClient.h b/Project/applications/smartcities/include/httpClient.h index 6d2cca9..6400cf3 100644 --- a/Project/applications/smartcities/include/httpClient.h +++ b/Project/applications/smartcities/include/httpClient.h @@ -19,8 +19,8 @@ #define ENDL "\r\n" #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("") +#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 ff8cba1..996750c 100644 --- a/Project/applications/smartcities/include/i2c.h +++ b/Project/applications/smartcities/include/i2c.h @@ -9,8 +9,8 @@ #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("") +#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 b742eb3..0df065c 100644 --- a/Project/applications/smartcities/include/json.h +++ b/Project/applications/smartcities/include/json.h @@ -18,8 +18,8 @@ #define JOIN_NO_FREE 0 #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("") +#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 6476dc4..0b0a233 100644 --- a/Project/applications/smartcities/include/ntp.h +++ b/Project/applications/smartcities/include/ntp.h @@ -18,8 +18,8 @@ #include "ch.h" #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 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 7bf0fa8..8548e26 100644 --- a/Project/applications/smartcities/include/sensors.h +++ b/Project/applications/smartcities/include/sensors.h @@ -19,8 +19,8 @@ #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("") +#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 780bc04..60d4581 100644 --- a/Project/applications/smartcities/include/timer-loop.h +++ b/Project/applications/smartcities/include/timer-loop.h @@ -11,8 +11,8 @@ #define LONG_PERIOD 60*3 //60*3 // for testing #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("") +#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);