Diff: Resources/sound_level.cpp

Revision:

26:3467812d5832

Parent:

25:cb16c5248769

diff -r cb16c5248769 -r 3467812d5832 Resources/sound_level.cpp
--- a/Resources/sound_level.cpp	Wed Dec 03 09:03:29 2014 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,98 +0,0 @@
-// sound_level (from barometer) sensor resource implementation
- 
-#include "mbed.h"
-#include "nsdl_support.h"
-#include "sensor_ctl.h"
-//#include "node_cfg.h"
-
- 
-#define SOUND_LEVEL_RES_ID    "/sen/sound"
-#define SOUND_LEVEL_RES_RT    "Sound Level"
-
-#if NODE_SENSOR_STATION
-static char sound_level_val[6];
-static uint8_t max_age = 0; 
-static uint8_t content_type = 50;
-
-
-/* stored data for observable resource */
-static uint8_t obs_number = 0;
-static uint8_t *obs_token_ptr = NULL;
-static uint8_t obs_token_len = 0;
-
-
-
-//This is to be called from main program loop... it sends volume on request.
-void sound_level_report() {
-    if(obs_number != 0){// && obs_token_ptr != NULL){
-        obs_number++;
-        snprintf(sound_level_val,6,"%2.2f" ,current_ambient_noise_value);
-        printf("sound_level report\r\n");
-        printf("sound_level: %s\r\n", sound_level_val);
-        if(sn_nsdl_send_observation_notification(obs_token_ptr, obs_token_len, (uint8_t*)sound_level_val, 4, &obs_number, 1, COAP_MSG_TYPE_NON_CONFIRMABLE, 0) == 0) {
-            printf("Sound Observation Sending Failed\r\n");
-        } else {
-            printf("Sound Observation Sent\r\n");
-        }
-    }
-}
-
-/* Only GET method allowed */
-static uint8_t sound_level_resource_cb(sn_coap_hdr_s *received_coap_ptr, sn_nsdl_addr_s *address, sn_proto_info_s * proto)
-{
-    sn_coap_hdr_s *coap_res_ptr = 0;
-    snprintf(sound_level_val,6,"%2.2f" ,current_ambient_noise_value);
-    printf("sound_level callback\r\n");
-    printf("sound_level: %s\r\n", sound_level_val);
- 
-    if(received_coap_ptr->msg_code == COAP_MSG_CODE_REQUEST_GET)
-    {
-        coap_res_ptr = sn_coap_build_response(received_coap_ptr, COAP_MSG_CODE_RESPONSE_CONTENT);
- 
-        coap_res_ptr->payload_len = strlen(sound_level_val);
-        coap_res_ptr->payload_ptr = (uint8_t*)sound_level_val;
-        
-        coap_res_ptr->content_type_ptr = &content_type;
-        coap_res_ptr->content_type_len = sizeof(content_type);
-        
-        if(received_coap_ptr->token_ptr){
-            printf("   Token included\r\n");
-            if(obs_token_ptr){
-                free(obs_token_ptr);
-                obs_token_ptr = 0;
-            }
-            obs_token_ptr = (uint8_t*)malloc(received_coap_ptr->token_len);
-            if(obs_token_ptr){
-                memcpy(obs_token_ptr, received_coap_ptr->token_ptr, received_coap_ptr->token_len);
-                obs_token_len = received_coap_ptr->token_len;
-            }
-        }
-        
-        coap_res_ptr->options_list_ptr = (sn_coap_options_list_s*)nsdl_alloc(sizeof(sn_coap_options_list_s));
-        if(!coap_res_ptr->options_list_ptr){
-            printf("cant alloc option list for max-age\r\n");
-            coap_res_ptr->options_list_ptr = NULL; //FIXME report error and recover
-        }
-        memset(coap_res_ptr->options_list_ptr, 0, sizeof(sn_coap_options_list_s));
-        coap_res_ptr->options_list_ptr->max_age_ptr = &max_age;
-        coap_res_ptr->options_list_ptr->max_age_len = sizeof(max_age);
- 
-        sn_nsdl_send_coap_message(address, coap_res_ptr);
-        nsdl_free(coap_res_ptr->options_list_ptr);
-        coap_res_ptr->options_list_ptr = NULL;
-        coap_res_ptr->content_type_ptr = NULL;// parser_release below tries to free this memory
- 
-    }
- 
-    sn_coap_parser_release_allocated_coap_msg_mem(coap_res_ptr);
- 
-    return 0;
-}
- 
-int create_sound_level_resource(sn_nsdl_resource_info_s *resource_ptr)
-{
-    obs_number++;
-    nsdl_create_dynamic_resource(resource_ptr, sizeof(SOUND_LEVEL_RES_ID)-1, (uint8_t*)SOUND_LEVEL_RES_ID, sizeof(SOUND_LEVEL_RES_RT)-1, (uint8_t*)SOUND_LEVEL_RES_RT, 1, &sound_level_resource_cb, (SN_GRS_GET_ALLOWED));
-    return 0;
-}
-#endif