Imanol-Mikel Barba Sabariego / smartcities · Commits

Commit 4115cac3f1ddc410efc6f8c8ba4a3fcca10ca19c

Authored by Imanol-Mikel Barba Sabariego
1 parent ac6a3343

--no commit message

Inline Side-by-side
Showing 11 changed files with 13 additions and 0 deletions
Project/applications/smartcities/include/adc.h
  View file @4115cac
@@ -8,6 +8,7 @@ @@ -8,6 +8,7 @@
8 #include "stm32f10x_adc.h" 8 #include "stm32f10x_adc.h"
9 9
10 #define DBG_ADC(fmt,...) printf("%c[1;35madc.c:%c[1;00m "fmt,0x1B,0x1B, ##__VA_ARGS__) 10 #define DBG_ADC(fmt,...) printf("%c[1;35madc.c:%c[1;00m "fmt,0x1B,0x1B, ##__VA_ARGS__)
  11 +//#define DBG_ADC(fmt,...) printf("")
11 12
12 #define ADCbatt_MIN_VALUE (0) 13 #define ADCbatt_MIN_VALUE (0)
13 #define ADCbatt_MAX_VALUE (0xfff) 14 #define ADCbatt_MAX_VALUE (0xfff)
Project/applications/smartcities/include/buffer.h
  View file @4115cac
@@ -11,6 +11,7 @@ @@ -11,6 +11,7 @@
11 #define HARD_REACHED 2 11 #define HARD_REACHED 2
12 12
13 #define DBG_BUFFER(fmt,...) printf("%c[1;35mbuffer.c:%c[1;00m "fmt,0x1B,0x1B, ##__VA_ARGS__) 13 #define DBG_BUFFER(fmt,...) printf("%c[1;35mbuffer.c:%c[1;00m "fmt,0x1B,0x1B, ##__VA_ARGS__)
  14 +//#define DBG_BUFFER(fmt,...) printf("")
14 15
15 char** put_message(char* info, char** buf,uint32_t *index, uint32_t *buf_len); 16 char** put_message(char* info, char** buf,uint32_t *index, uint32_t *buf_len);
16 int check_memory(void); 17 int check_memory(void);
Project/applications/smartcities/include/callbacks.h
  View file @4115cac
@@ -21,6 +21,7 @@ void softapMode_apStartedCb(int result); @@ -21,6 +21,7 @@ void softapMode_apStartedCb(int result);
21 void printWifiInfo(uint8_t wifiMode); 21 void printWifiInfo(uint8_t wifiMode);
22 22
23 #define DBG_CALLBACKS(fmt,...) printf("%c[1;35mcallbacks.c:%c[1;00m "fmt,0x1B,0x1B, ##__VA_ARGS__) 23 #define DBG_CALLBACKS(fmt,...) printf("%c[1;35mcallbacks.c:%c[1;00m "fmt,0x1B,0x1B, ##__VA_ARGS__)
  24 +//#define DBG_CALLBACKS(fmt,...) printf("")
24 25
25 extern uint8_t connected; 26 extern uint8_t connected;
26 extern uint8_t timeout; 27 extern uint8_t timeout;
Project/applications/smartcities/include/configServer.h
  View file @4115cac
@@ -13,6 +13,9 @@ @@ -13,6 +13,9 @@
13 #define CONFIG_SERVER_DBG(fmt,...) printf("%c[1;35mconfigServer.c:%c[1;00m "fmt,0x1B,0x1B, ##__VA_ARGS__) 13 #define CONFIG_SERVER_DBG(fmt,...) printf("%c[1;35mconfigServer.c:%c[1;00m "fmt,0x1B,0x1B, ##__VA_ARGS__)
14 #define CONFIG_SERVER_DBG_WARNING(fmt,...) printf("%c[1;35mconfigServer.c:%c[1;33m[WARNING] "fmt"%c[1;00m",0x1B,0x1B,0x1B, ##__VA_ARGS__) 14 #define CONFIG_SERVER_DBG_WARNING(fmt,...) printf("%c[1;35mconfigServer.c:%c[1;33m[WARNING] "fmt"%c[1;00m",0x1B,0x1B,0x1B, ##__VA_ARGS__)
15 15
  16 +//#define CONFIG_SERVER_DBG(fmt,...) printf("")
  17 +//#define CONFIG_SERVER_DBG_WARNING(fmt,...) printf("")
  18 +
16 void configServer_start(uint8_t enableApScan); 19 void configServer_start(uint8_t enableApScan);
17 void configServer_connect(void); 20 void configServer_connect(void);
18 uint32_t condigServer_dynamicCb(char* varName, char** varValue, uint8_t* varAllocType); 21 uint32_t condigServer_dynamicCb(char* varName, char** varValue, uint8_t* varAllocType);
Project/applications/smartcities/include/httpClient.h
  View file @4115cac
@@ -20,6 +20,7 @@ @@ -20,6 +20,7 @@
20 #define CONTENT_TYPE_HEADER "Content-Type: application/json; charset=UTF-8" 20 #define CONTENT_TYPE_HEADER "Content-Type: application/json; charset=UTF-8"
21 21
22 #define DBG_HTTP(fmt,...) printf("%c[1;35mhttpClient.c:%c[1;00m "fmt,0x1B,0x1B, ##__VA_ARGS__) 22 #define DBG_HTTP(fmt,...) printf("%c[1;35mhttpClient.c:%c[1;00m "fmt,0x1B,0x1B, ##__VA_ARGS__)
  23 +//#define DBG_HTTP(fmt,...) printf("")
23 24
24 25
25 typedef enum reqMethod 26 typedef enum reqMethod
Project/applications/smartcities/include/i2c.h
  View file @4115cac
@@ -10,6 +10,7 @@ @@ -10,6 +10,7 @@
10 #define I2C_TIMEOUT 100 10 #define I2C_TIMEOUT 100
11 11
12 #define DBG_I2C(fmt,...) printf("%c[1;35mi2c.c:%c[1;00m "fmt,0x1B,0x1B, ##__VA_ARGS__) 12 #define DBG_I2C(fmt,...) printf("%c[1;35mi2c.c:%c[1;00m "fmt,0x1B,0x1B, ##__VA_ARGS__)
  13 +//#define DBG_I2C(fmt,...) printf("")
13 14
14 15
15 void I2C_init(void); 16 void I2C_init(void);
Project/applications/smartcities/include/json.h
  View file @4115cac
@@ -19,6 +19,7 @@ @@ -19,6 +19,7 @@
19 #define JOIN_FREE_MEM 1 19 #define JOIN_FREE_MEM 1
20 20
21 #define DBG_JSON(fmt,...) printf("%c[1;35mjson.c:%c[1;00m "fmt,0x1B,0x1B, ##__VA_ARGS__) 21 #define DBG_JSON(fmt,...) printf("%c[1;35mjson.c:%c[1;00m "fmt,0x1B,0x1B, ##__VA_ARGS__)
  22 +//#define DBG_JSON(fmt,...) printf("")
22 23
23 uint8_t register_sensor(sensor sens); 24 uint8_t register_sensor(sensor sens);
24 char* prepare_json_observation_statement(char** data, uint32_t nObservations); 25 char* prepare_json_observation_statement(char** data, uint32_t nObservations);
Project/applications/smartcities/include/ntp.h
  View file @4115cac
@@ -19,6 +19,7 @@ @@ -19,6 +19,7 @@
19 #include "globals.h" 19 #include "globals.h"
20 20
21 #define DBG_NTP(fmt,...) printf("%c[1;35mntp.c:%c[1;00m "fmt,0x1B,0x1B, ##__VA_ARGS__) 21 #define DBG_NTP(fmt,...) printf("%c[1;35mntp.c:%c[1;00m "fmt,0x1B,0x1B, ##__VA_ARGS__)
  22 +//#define DBG_NTP(fmt,...) printf("")
22 23
23 #define LEAP_YEAR(Y) (((1970+Y)>0) && !((1970+Y)%4) && (((1970+Y)%100) || !((1970+Y)%400))) 24 #define LEAP_YEAR(Y) (((1970+Y)>0) && !((1970+Y)%4) && (((1970+Y)%100) || !((1970+Y)%400)))
24 #define NTP_PACKET_LENGTH 48 25 #define NTP_PACKET_LENGTH 48
Project/applications/smartcities/include/sensors.h
  View file @4115cac
@@ -20,6 +20,7 @@ @@ -20,6 +20,7 @@
20 #define BATTERY_ADDR 0x00 //SIEMPRE PRESENTE, NUNCA BUSCAR EN i2c_scan 20 #define BATTERY_ADDR 0x00 //SIEMPRE PRESENTE, NUNCA BUSCAR EN i2c_scan
21 21
22 #define DBG_SENSORS(fmt,...) printf("%c[1;35msensors.c:%c[1;00m "fmt,0x1B,0x1B, ##__VA_ARGS__) 22 #define DBG_SENSORS(fmt,...) printf("%c[1;35msensors.c:%c[1;00m "fmt,0x1B,0x1B, ##__VA_ARGS__)
  23 +//#define DBG_SENSORS(fmt,...) printf("")
23 24
24 typedef struct { 25 typedef struct {
25 uint8_t ID; 26 uint8_t ID;
Project/applications/smartcities/include/timer-loop.h
  View file @4115cac
@@ -12,6 +12,7 @@ @@ -12,6 +12,7 @@
12 #define SHORT_PERIOD 60*1 //60*1 // for testing 12 #define SHORT_PERIOD 60*1 //60*1 // for testing
13 13
14 #define DBG_TIMER(fmt,...) printf("%c[1;35mtimer-loop.c:%c[1;00m "fmt,0x1B,0x1B, ##__VA_ARGS__) 14 #define DBG_TIMER(fmt,...) printf("%c[1;35mtimer-loop.c:%c[1;00m "fmt,0x1B,0x1B, ##__VA_ARGS__)
  15 +//#define DBG_TIMER(fmt,...) printf("")
15 16
16 unsigned long getSystemTime(void); 17 unsigned long getSystemTime(void);
17 18
Project/applications/smartcities/main.c
  View file @4115cac
@@ -13,6 +13,7 @@ @@ -13,6 +13,7 @@
13 #include "sensors.h" 13 #include "sensors.h"
14 14
15 #define DBG(fmt,...) printf("%c[1;35mmain.c:%c[1;00m "fmt,0x1B,0x1B, ##__VA_ARGS__) 15 #define DBG(fmt,...) printf("%c[1;35mmain.c:%c[1;00m "fmt,0x1B,0x1B, ##__VA_ARGS__)
  16 +//#define DBG(fmt,...) printf("")
16 17
17 uint8_t connected=0; 18 uint8_t connected=0;
18 uint8_t timeout=0; 19 uint8_t timeout=0;