Merge pull request #11 from wmalisch/wmalisch/final

aws-greengrass-core-sdk-python @ b172a6ae

-Subproject commit b172a6ae3d1536dbd2db216f92170036800f5436

basicDiscovery.py

@@ -21,9 +21,7 @@ def customOnMessage(message):
     print('Received message on topic %s: %s\n' % (message.topic, message.payload))
     text = message.payload.decode('utf-8')
     json_object = json.loads(text)
-    print(json_object['vehicle_CO2'])
-    if(int(json_object['vehicle_CO2']) >= CO2_max):
-        CO2_max = json_object['vehicle_CO2']
+    CO2_max = int(json_object['new_max'])
     print('New Max:%d' % (CO2_max))
 
 MAX_DISCOVERY_RETRIES = 10
@@ -176,7 +174,7 @@ for index, row in a.iterrows():
     if args.mode == 'both' or args.mode == 'publish':
         message = {}
         message['timestep_time'] = row['timestep_time']
-        message['vehicle_CO2'] = row['vehicle_CO2']
+        message['vehicle_CO2'] = row['vehicle_CO2'] ###########################################
         message['vehicle_HC'] = row['vehicle_HC']
         message['vehicle_NOx'] = row['vehicle_NOx']
         message['vehicle_PMx'] = row['vehicle_PMx']
@@ -196,6 +194,8 @@ for index, row in a.iterrows():
         message['vehicle_y'] = row['vehicle_y']
         message['sequence'] = loopCount
         message['thing_id'] = thingName # Ex: 1
+        message['isActive'] = row['isActive']
+        message['current_max'] = CO2_max ######################################
         messageJson = json.dumps(message)
         myAWSIoTMQTTClient.publish("cardata", messageJson, 0)
         if args.mode == 'publish':

config.json

 {
   "coreThing" : {
     "caPath": "AmazonRootCA1.pem",
-    "certPath": "43e249ca3bbb1a882199edf93eef62761a88df4ab7e400340dfb1bc6c4fd534c-certificate.pem.crt",
-    "keyPath": "43e249ca3bbb1a882199edf93eef62761a88df4ab7e400340dfb1bc6c4fd534c-private.pem.key",
+    "certPath": "xxx-certificate.pem.crt",
+    "keyPath": "xxx-private.pem.key",
     "thingArn": "arn:aws:iot:us-east-1:851725387994:thing/GreenGrassV1CoreA2",
-    "iotHost": "a23nokakp7wu3x-ats.iot.us-east-1.amazonaws.com",
+    "iotHost": "endpoint-ats.iot.us-east-1.amazonaws.com",
     "ggHost": "greengrass-ats.iot.us-east-1.amazonaws.com",
     "keepAlive": 600
   },
@@ -18,11 +18,11 @@
     "caPath": "file:///greengrass/certs/AmazonRootCA1.pem",
     "principals": {
       "SecretsManager": {
-        "privateKeyPath": "file:///greengrass/certs/43e249ca3bbb1a882199edf93eef62761a88df4ab7e400340dfb1bc6c4fd534c-private.pem.key"
+        "privateKeyPath": "file:///greengrass/certs/xxx-private.pem.key"
       },
       "IoTCertificate": {
-        "privateKeyPath": "file:///greengrass/certs/43e249ca3bbb1a882199edf93eef62761a88df4ab7e400340dfb1bc6c4fd534c-private.pem.key",
-        "certificatePath": "file:///greengrass/certs/43e249ca3bbb1a882199edf93eef62761a88df4ab7e400340dfb1bc6c4fd534c-certificate.pem.crt"
+        "privateKeyPath": "file:///greengrass/certs/xxx-private.pem.key",
+        "certificatePath": "file:///greengrass/certs/xxx-certificate.pem.crt"
       }
     }
   }

lambda/check_emission/checkEm.py

-def check_co2_level(numpy_dict, max_value):
-    # Check if "CO2" key exists in the dictionary
-    if "CO2" in numpy_dict:
-        co2_value = numpy_dict["CO2"]
-        return co2_value > max_value
-    else:
-        # Handle case where "CO2" key is not found
-        print("Error: 'CO2' key not found in the dictionary.")
-        return False
-
-# Example usage:
-import numpy as np
-
-# Create a sample NumPy dictionary
-numpy_dict = {"CO2": 30}  # Assuming CO2 value is 30
-
-# Check if CO2 value is greater than 25
-result = check_co2_level(numpy_dict, 25)
-print(result)  # Output: True, since 30 > 25
-
-# Check if CO2 value is greater than 35
-result = check_co2_level(numpy_dict, 35)
-print(result)  # Output: False, since 30 <= 35

lambda/deploy_package/process_emission.py

@@ -16,7 +16,10 @@ my_platform = platform.platform()
 def calculate_max(event):
     logger.debug(event)
     response = {}
-    response['vehicle_CO2'] = event['vehicle_CO2']
+    if(int(event['current_max']) >= int(event['vehicle_CO2'])):
+        response['new_max'] = int(event['current_max'])
+    else:
+        response['new_max'] = int(event['vehicle_CO2'])
     response['thing_id'] = event['thing_id']
 
     messageJson = json.dumps(response)
@@ -25,6 +28,38 @@ def calculate_max(event):
         queueFullPolicy="AllOrException",
         payload=messageJson,
     )
+
+    response2 = {}
+    response2['timestep_time'] = event['timestep_time']
+    response2['vehicle_CO2'] = event['vehicle_CO2']
+    response2['vehicle_HC'] = event['vehicle_HC']
+    response2['vehicle_NOx'] = event['vehicle_NOx']
+    response2['vehicle_PMx'] = event['vehicle_PMx']
+    response2['vehicle_angle'] = event['vehicle_angle']
+    response2['vehicle_eclass'] = event['vehicle_eclass']
+    response2['vehicle_electricity'] = event['vehicle_electricity']
+    response2['vehicle_fuel'] = event['vehicle_fuel']
+    response2['vehicle_id'] = event['vehicle_id']
+    response2['vehicle_lane'] = event['vehicle_lane']
+    response2['vehicle_noise'] = event['vehicle_noise']
+    response2['vehicle_pos'] = event['vehicle_pos']
+    response2['vehicle_route'] = event['vehicle_route']
+    response2['vehicle_speed'] = event['vehicle_speed']
+    response2['vehicle_type'] = event['vehicle_type']
+    response2['vehicle_waiting'] = event['vehicle_waiting']
+    response2['vehicle_x'] = event['vehicle_x']
+    response2['vehicle_y'] = event['vehicle_y']
+    response2['sequence'] = event['sequence']
+    response2['thing_id'] = event['thing_id']
+    response2['isActive'] = event['isActive']
+    response2['new_max'] = response['new_max']
+    messageJson2 = json.dumps(response2)
+
+    client.publish(
+        topic="cardata",
+        queueFullPolicy="AllOrException",
+        payload=messageJson2,
+    )
     return
 
 def function_handler(event, context):