Merge branches 'multi' and 'multi' of https://github.com/Jxck-S/plane-notify into multi

AppendAirport.py

@@ -25,7 +25,7 @@ def append_airport(filename, icao, airport, distance_mi):
 	# initialise the drawing context with
 	# the image object as background
 	draw = ImageDraw.Draw(image)
-	
+
 	#Setup fonts
 	fontfile = "Roboto-Regular.ttf"
 	font = ImageFont.truetype(fontfile, 14)
@@ -36,12 +36,21 @@ def append_airport(filename, icao, airport, distance_mi):
 	black = 'rgb(0, 0, 0)' # Black
 	white = 'rgb(255, 255, 255)' # White
 	navish = 'rgb(0, 63, 75)'
+	whitish = 'rgb(248, 248, 248)'
 	#Info Box
 	draw.rectangle(((316, 760), (605, 800)), fill= white, outline=black)
 	#Header Box
 	draw.rectangle(((387, 738), (535, 760)), fill= navish)
-
+	#ADSBX Logo
+	draw.rectangle(((658, 760), (800, 780)), fill= white)
+	adsbx = Image.open('Stealth-48x48.png')
+	adsbx = adsbx.resize((25, 25), Image.ANTIALIAS)
+	image.paste(adsbx, (632, 757), adsbx)
 	#Create Text
+	#ADSBX Credit
+	(x, y) = (660, 760)
+	text = "adsbexchange.com"
+	draw.text((x, y), text, fill=black, font=head_font)
 	#Nearest Airport Header
 	(x, y) = (408, 740)
 	text = "Nearest Airport"
@@ -58,5 +67,6 @@ def append_airport(filename, icao, airport, distance_mi):
 	(x, y) = (320, 783)
 	text = airport[0:56]
 	draw.text((x, y), text, fill=black, font=mini_font)
+	image.show()
 	# save the edited image
 	image.save(filename)

NotifyBotMulti.py

@@ -2,6 +2,7 @@ import configparser
 import time
 from colorama import Fore, Back, Style
 import platform
+import traceback
 if platform.system() == "Windows":
     from colorama import init
     init(convert=True)
@@ -15,96 +16,119 @@ download_font()
 main_config = configparser.ConfigParser()
 main_config.read('./configs/mainconf.ini')
 source = main_config.get('DATA', 'SOURCE')
-import os
-import sys
-#Setup plane objects from plane configs
-planes = {}
-print("Found the following configs")
-for dirpath, dirname, filename in os.walk("./configs"):
-        for filename in [f for f in filename if f.endswith(".ini") and f != "mainconf.ini"]:
-            if not "disabled" in dirpath:
-                print(os.path.join(dirpath, filename))
-                plane_config = configparser.ConfigParser()
-                plane_config.read((os.path.join(dirpath, filename)))
-                #Creates a Key labeled the ICAO of the plane, with the value being a plane object
-                planes[plane_config.get('DATA', 'ICAO').upper()] = Plane(plane_config.get('DATA', 'ICAO'), os.path.join(dirpath, filename), plane_config)
-
-running_Count = 0
-failed_count = 0
+from discord_webhook import DiscordWebhook
+webhook = DiscordWebhook(url= main_config.get('DISCORD', 'URL'), content=(str("Started")))
+webhook.execute()
 try:
-    tz = pytz.timezone(main_config.get('DATA', 'TZ'))
-except pytz.exceptions.UnknownTimeZoneError:
-    tz = pytz.UTC
+    print("Source is set to", source)
+    import os
+    import sys
+    #Setup plane objects from plane configs
+    planes = {}
+    print("Found the following configs")
+    for dirpath, dirname, filename in os.walk("./configs"):
+            for filename in [f for f in filename if f.endswith(".ini") and f != "mainconf.ini"]:
+                if not "disabled" in dirpath:
+                    print(os.path.join(dirpath, filename))
+                    plane_config = configparser.ConfigParser()
+                    plane_config.read((os.path.join(dirpath, filename)))
+                    #Creates a Key labeled the ICAO of the plane, with the value being a plane object
+                    planes[plane_config.get('DATA', 'ICAO').upper()] = Plane(plane_config.get('DATA', 'ICAO'), os.path.join(dirpath, filename), plane_config)
 
-while True:
-    datetime_tz = datetime.now(tz)
-    if datetime_tz.hour == 0 and datetime_tz.minute == 0:
-        running_Count = 0
-    running_Count +=1
-    start_time = time.time()
-    header = ("-------- " + str(running_Count) + " -------- " + str(datetime_tz.strftime("%I:%M:%S %p")) + " ---------------------------------------------------------------------------")
-    print (Back.GREEN +  Fore.BLACK + header[0:100] + Style.RESET_ALL)
-    if source == "ADSBX":
-        from defADSBX import pullADSBX
-        data, failed = pullADSBX(planes)
-        if failed == False:
-            if data['ac'] != None:
-                for key, obj in planes.items():
-                    has_data = False
-                    for planeData in data['ac']:
-                        if planeData['icao'] == key:
-                            obj.run_ADSBX(planeData)
-                            has_data = True
-                            break
-                    if has_data is False:
-                        obj.run_empty()
+    running_Count = 0
+    failed_count = 0
+    try:
+        tz = pytz.timezone(main_config.get('DATA', 'TZ'))
+    except pytz.exceptions.UnknownTimeZoneError:
+        tz = pytz.UTC
+
+    while True:
+        datetime_tz = datetime.now(tz)
+        if datetime_tz.hour == 0 and datetime_tz.minute == 0:
+            running_Count = 0
+        running_Count +=1
+        start_time = time.time()
+        header = ("-------- " + str(running_Count) + " -------- " + str(datetime_tz.strftime("%I:%M:%S %p")) + " ---------------------------------------------------------------------------")
+        print (Back.GREEN +  Fore.BLACK + header[0:100] + Style.RESET_ALL)
+        if source == "ADSBX":
+            api_version = int(main_config.get('ADSBX', 'API_VERSION'))
+            if api_version == 2:
+                icao_key = 'hex'
+            elif api_version == 1:
+                icao_key = 'icao'
             else:
-                for obj in planes.values():
-                    obj.run_empty()
-        elif failed:
-            failed_count += 1
-    elif source == "OPENS":
-        from defOpenSky import pullOpenSky
-        planeData, failed = pullOpenSky(planes)
-        if failed == False:
-            if planeData.states != []:
-                #   print(planeData.time)
-                for key, obj in planes.items():
-                    has_data = False
-                    for dataState in planeData.states:
-                        if (dataState.icao24).upper() == key:
-                            obj.run_OPENS(dataState)
-                            has_data = True
-                            break
-                    if has_data is False:
+                raise Exception("Invalid API Version")
+            from defADSBX import pullADSBX
+            data, failed = pullADSBX(planes)
+            if failed == False:
+                if data['ac'] != None:
+                    for key, obj in planes.items():
+                        has_data = False
+                        for planeData in data['ac']:
+                            if planeData[icao_key].upper() == key:
+                                if api_version == 1:
+                                    obj.run_ADSBXv1(planeData)
+                                elif api_version == 2:
+                                    obj.run_ADSBXv2(planeData)
+                                has_data = True
+                                break
+                        if has_data is False:
+                            obj.run_empty()
+                else:
+                    for obj in planes.values():
                         obj.run_empty()
-            else:
-                for obj in planes.values():
-                    obj.run_empty()
-        elif failed:
-            failed_count += 1
-    if failed_count >= 10:
-        if source == "OPENS":
-            source = "ADSBX"
-        elif source == "ADSBX":
-            source = "OPENS"
-        failed_count = 0
-        from discord_webhook import DiscordWebhook
-        webhook = DiscordWebhook(url= main_config.get('DISCORD', 'URL'), content=(str("Failed over to " + source)))
-        webhook.execute()
-    elapsed_calc_time = time.time() - start_time
-    datetime_tz = datetime.now(tz)
-    footer = "-------- " + str(running_Count) + " -------- " + str(datetime_tz.strftime("%I:%M:%S %p")) + " ------------------------Elapsed Time- " + str(round(elapsed_calc_time, 3)) + " -------------------------------------"
-    print (Back.GREEN + Fore.BLACK + footer[0:100] + Style.RESET_ALL)
+            elif failed:
+                failed_count += 1
+        elif source == "OPENS":
+            from defOpenSky import pullOpenSky
+            planeData, failed = pullOpenSky(planes)
+            if failed == False:
+                if planeData.states != []:
+                    #   print(planeData.time)
+                    for key, obj in planes.items():
+                        has_data = False
+                        for dataState in planeData.states:
+                            if (dataState.icao24).upper() == key:
+                                obj.run_OPENS(dataState)
+                                has_data = True
+                                break
+                        if has_data is False:
+                            obj.run_empty()
+                else:
+                    for obj in planes.values():
+                        obj.run_empty()
+            elif failed:
+                failed_count += 1
+        if failed_count >= 10:
+            if source == "OPENS":
+                source = "ADSBX"
+            elif source == "ADSBX":
+                source = "OPENS"
+            failed_count = 0
+            webhook = DiscordWebhook(url= main_config.get('DISCORD', 'URL'), content=(str("Failed over to " + source)))
+            webhook.execute()
+        elapsed_calc_time = time.time() - start_time
+        datetime_tz = datetime.now(tz)
+        footer = "-------- " + str(running_Count) + " -------- " + str(datetime_tz.strftime("%I:%M:%S %p")) + " ------------------------Elapsed Time- " + str(round(elapsed_calc_time, 3)) + " -------------------------------------"
+        print (Back.GREEN + Fore.BLACK + footer[0:100] + Style.RESET_ALL)
 
 
-    sleep_sec = 15
-    for i in range(sleep_sec,0,-1):
-        if i < 10:
-            i = " " + str(i)
-        sys.stdout.write("\r")
-        sys.stdout.write(Back.RED + "Sleep {00000000}".format(i) + Style.RESET_ALL)
-        sys.stdout.flush()
-        time.sleep(1)
-    sys.stdout.write(Back.RED + ('\x1b[1K\r' +"Slept for " +str(sleep_sec)) + Style.RESET_ALL)
-    print()
+        sleep_sec = 30
+        for i in range(sleep_sec,0,-1):
+            if i < 10:
+                i = " " + str(i)
+            sys.stdout.write("\r")
+            sys.stdout.write(Back.RED + "Sleep {00000000}".format(i) + Style.RESET_ALL)
+            sys.stdout.flush()
+            time.sleep(1)
+        sys.stdout.write(Back.RED + ('\x1b[1K\r' +"Slept for " +str(sleep_sec)) + Style.RESET_ALL)
+        print()
+except KeyboardInterrupt as e:
+    print(e)
+    webhook = DiscordWebhook(url= main_config.get('DISCORD', 'URL'), content=(str("Manual Exit: " + str(e) )))
+    webhook.execute()
+except BaseException as e:
+    print(e)
+    print(traceback.format_exc())
+    webhook = DiscordWebhook(url= main_config.get('DISCORD', 'URL'), content=(str("Error Exiting: " + str(e) )))
+    webhook.execute()

configs/mainconf.ini

@@ -12,6 +12,10 @@ TZ = UTC
 #ADS-B Exchange https://www.adsbexchange.com/data/
 [ADSBX]
 API_KEY = apikey
+API_VERSION = 1
+#ADSBX API Proxy V2, https://gitlab.com/jjwiseman/adsbx-api-proxy
+ENABLE_PROXY = FALSE
+PROXY_HOST = N/A
 
 #OpenSky https://opensky-network.org/apidoc/index.html
 #When using without your own login user and pass should be None

defADSBX.py

@@ -8,10 +8,22 @@ import urllib3
 main_config = configparser.ConfigParser()
 main_config.read('./configs/mainconf.ini')
 def pullADSBX(planes):
-    if len(planes) > 1:
-                url = "https://adsbexchange.com/api/aircraft/json/"
-    elif len(planes) == 1:
-                url = "https://adsbexchange.com/api/aircraft/icao/" +    str(list(planes.keys())[0]) + "/"
+    if main_config.getboolean('ADSBX', 'ENABLE_PROXY') is False:
+        api_version = int(main_config.get('ADSBX', 'API_VERSION'))
+        if api_version ==  1:
+            if len(planes) > 1:
+                        url = "https://adsbexchange.com/api/aircraft/json/"
+            elif len(planes) == 1:
+                        url = "https://adsbexchange.com/api/aircraft/icao/" +    str(list(planes.keys())[0]) + "/"
+        elif api_version == 2:
+            url = "https://adsbexchange.com/api/aircraft/v2/all"
+        else:
+            raise Exception("No API Version set")
+    else:
+        if main_config.has_option('ADSBX', 'PROXY_HOST'):
+            url = "http://" + main_config.get('ADSBX', 'PROXY_HOST') + ":8000/api/aircraft/v2/all"
+        else:
+            raise BaseException("Proxy enabled but no host")
 
     headers = {
                 'api-auth': main_config.get('ADSBX', 'API_KEY'),
@@ -25,7 +37,7 @@ def pullADSBX(planes):
         print(error_message)
         failed = True
         data = None
-    except (IncompleteRead, http.IncompleteRead, ConnectionResetError, requests.ChunkEncodingError, urllib3.exceptions.ProtocolError, ValueError) as error_message:
+    except (IncompleteRead, http.IncompleteRead, ConnectionResetError, urllib3.exceptions.ProtocolError, ValueError) as error_message:
         print("Connection Error")
         print(error_message)
         failed = True
@@ -41,7 +53,8 @@ def pullADSBX(planes):
                 data = json.loads(response.text)
             except (json.decoder.JSONDecodeError, ValueError) as error_message:
                 print("Error with JSON")
-                print (json.dumps(data, indent = 2))
+                if 'data' in locals() and data != None:
+                    print (json.dumps(data, indent = 2))
                 print(error_message)
                 failed = True
                 data = None
@@ -66,4 +79,4 @@ def pullADSBX(planes):
         data_ctime = float(data['ctime']) / 1000.0
         print("UTC of Data:",datetime.utcfromtimestamp(data_ctime))
         print("Current UTC:", datetime.utcnow())
-    return data, failed
+    return data, failed

defSS.py

@@ -17,7 +17,9 @@ def getSS(icao, overlays):
     chrome_options.add_argument('window-size=800,800')
     chrome_options.add_argument('ignore-certificate-errors')
     chrome_options.add_argument("--enable-logging --v=1")
-    #chrome_options.add_argument('--no-sandbox') # required when running as root user. otherwise you would get no sandbox errors.
+    import os
+    if os.geteuid()==0:
+        chrome_options.add_argument('--no-sandbox') # required when running as root user. otherwise you would get no sandbox errors.
     browser = webdriver.Chrome(ChromeDriverManager().install(), options=chrome_options)
     url = "https://globe.adsbexchange.com/?largeMode=2&hideButtons&hideSidebar&mapDim=0&zoom=9&icao=" + icao + "&" + overlays
     browser.set_page_load_timeout(80)
@@ -35,6 +37,7 @@ def getSS(icao, overlays):
     #Remove share
     element = browser.find_element_by_xpath("//*[contains(text(), 'Share')]")
     browser.execute_script("""var element = arguments[0];    element.parentNode.removeChild(element); """, element)
+    #browser.execute_script("toggleFollow()")
     file_name = icao + "_map.png"
     browser.save_screenshot(file_name)
     browser.quit()

planeClass.py

@@ -21,6 +21,10 @@ class Plane:
         self.last_longitude = None
         self.last_contact = None
         self.landing_plausible = False
+        self.last_squawk = None
+        self.squawk = None
+        self.nav_modes = None
+        self.last_nav_modes = None
     def getICAO(self):
         return self.icao
     def run_OPENS(self, ac_dict):
@@ -41,20 +45,16 @@ class Plane:
         else:
             self.feeding = True
             self.run_check()
-    def run_ADSBX(self, ac_dict):
-        #Parse ADBSX Vector
+    def run_ADSBXv1(self, ac_dict):
+        #Parse ADBSX V1 Vector
         from colorama import Fore, Back, Style
         self.printheader("head")
         #print (Fore.YELLOW +"ADSBX Sourced Data: ", ac_dict, Style.RESET_ALL)
         try:
             #postime is divided by 1000 to get seconds from milliseconds, from timestamp expects secs.
-            self.__dict__.update({'icao' : ac_dict['icao'], 'callsign' : ac_dict['call'], 'reg' : ac_dict['reg'], 'latitude' : float(ac_dict['lat']), 'longitude' : float(ac_dict['lon']), 'geo_alt_ft' : int(ac_dict['galt']), 'on_ground' : bool(int(ac_dict["gnd"])), 'last_contact' : round(float(ac_dict["postime"])/1000)})
+            self.__dict__.update({'icao' : ac_dict['icao'], 'callsign' : ac_dict['call'], 'reg' : ac_dict['reg'], 'squawk' : ac_dict['sqk'], 'latitude' : float(ac_dict['lat']), 'longitude' : float(ac_dict['lon']), 'geo_alt_ft' : int(ac_dict['galt']), 'on_ground' : bool(int(ac_dict["gnd"])), 'last_contact' : round(float(ac_dict["postime"])/1000)})
             if self.on_ground:
                 self.geo_alt_ft = 0
-            if "to" in ac_dict.keys():
-                self.to_location = ac_dict["to"]
-            if "from" in ac_dict.keys():
-                self.from_location = ac_dict["from"]
         except ValueError as e:
 
             print("Got data but some data is invalid!")
@@ -64,6 +64,46 @@ class Plane:
         else:
             self.feeding = True
             self.run_check()
+
+    def run_ADSBXv2(self, ac_dict):
+        #Parse ADBSX V2 Vector
+        from colorama import Fore, Back, Style
+        self.printheader("head")
+        #print (Fore.YELLOW +"ADSBX Sourced Data: ", ac_dict, Style.RESET_ALL)
+        try:
+            self.__dict__.update({'icao' : ac_dict['hex'].upper(), 'reg' : ac_dict['r'], 'squawk' : ac_dict['squawk'], 'latitude' : float(ac_dict['lat']), 'longitude' : float(ac_dict['lon'])})
+            if 'alt_geom' in ac_dict:
+                self.geo_alt_ft = int(ac_dict['alt_geom'])
+            elif 'alt_geom' not in ac_dict and 'alt_baro' in ac_dict:
+                self.geo_alt_ft =int(ac_dict['alt_baro'])
+            if 'flight' in ac_dict:
+                self.callsign = ac_dict['flight']
+            if ac_dict['alt_baro'] == "ground":
+                self.geo_alt_ft = 0
+                self.on_ground = True
+            elif ac_dict['alt_baro'] != "ground":
+                self.on_ground = False
+            if'nav_modes' in ac_dict:
+                self.nav_modes = ac_dict['nav_modes']
+                for idx, mode in enumerate(self.nav_modes):
+                    if mode == ('tcas' or 'lnav' or 'vnav'):
+                        self.nav_modes[idx] = self.nav_modes[idx].upper()
+                    else:
+                        self.nav_modes[idx] = self.nav_modes[idx].capitalize()
+            from datetime import datetime, timedelta
+            #Create last seen timestamp from how long ago in secs a pos was rec
+            now = datetime.now()
+            last_pos_datetime = now - timedelta(seconds= ac_dict["seen_pos"])
+            self.last_contact = datetime.timestamp(last_pos_datetime)
+        except (ValueError, KeyError) as e:
+
+            print("Got data but some data is invalid!")
+            print(e)
+            print (Fore.YELLOW +"ADSBX Sourced Data: ", ac_dict, Style.RESET_ALL)
+            self.printheader("foot")
+        else:
+            self.feeding = True
+            self.run_check()
     def printheader(self, type):
         from colorama import Fore, Back, Style
         if type == "head":
@@ -137,15 +177,15 @@ class Plane:
             time_since_contact = self.get_time_since(self.last_contact)
             output = [
             [(Fore.CYAN + "ICAO" + Style.RESET_ALL), (Fore.LIGHTGREEN_EX + self.icao + Style.RESET_ALL)],
-            [(Fore.CYAN + "Callsign" + Style.RESET_ALL), (Fore.LIGHTGREEN_EX + self.callsign + Style.RESET_ALL)],
+            [(Fore.CYAN + "Callsign" + Style.RESET_ALL), (Fore.LIGHTGREEN_EX + self.callsign + Style.RESET_ALL)] if self.callsign != None else None,
             [(Fore.CYAN + "Reg" + Style.RESET_ALL), (Fore.LIGHTGREEN_EX + self.reg + Style.RESET_ALL)] if "reg" in self.__dict__ else None,
-            [(Fore.CYAN + "From" + Style.RESET_ALL), (Fore.LIGHTGREEN_EX + self.from_location + Style.RESET_ALL)] if "from_location" in self.__dict__ else None,
-            [(Fore.CYAN + "To" + Style.RESET_ALL), (Fore.LIGHTGREEN_EX + self.to_location + Style.RESET_ALL)] if "to_location" in self.__dict__ else None,
+            [(Fore.CYAN + "Squawk" + Style.RESET_ALL), (Fore.LIGHTGREEN_EX + self.squawk + Style.RESET_ALL)] if "squawk" in self.__dict__ else None,
             [(Fore.CYAN + "Latitude" + Style.RESET_ALL), (Fore.LIGHTGREEN_EX + str(self.latitude) + Style.RESET_ALL)],
             [(Fore.CYAN + "Longitude" + Style.RESET_ALL), (Fore.LIGHTGREEN_EX + str(self.longitude) + Style.RESET_ALL)],
             [(Fore.CYAN + "Last Contact" + Style.RESET_ALL), (Fore.LIGHTGREEN_EX + str(time_since_contact).split(".")[0]+ Style.RESET_ALL)],
             [(Fore.CYAN + "On Ground" + Style.RESET_ALL), (Fore.LIGHTGREEN_EX + str(self.on_ground) + Style.RESET_ALL)],
-            [(Fore.CYAN + "GEO Alitude" + Style.RESET_ALL), (Fore.LIGHTGREEN_EX + str("{:,} ft".format(self.geo_alt_ft)) + Style.RESET_ALL)]
+            [(Fore.CYAN + "GEO Alitude" + Style.RESET_ALL), (Fore.LIGHTGREEN_EX + str("{:,} ft".format(self.geo_alt_ft)) + Style.RESET_ALL)],
+            [(Fore.CYAN + "Nav Modes" + Style.RESET_ALL), (Fore.LIGHTGREEN_EX + ', '.join(self.nav_modes)  + Style.RESET_ALL)] if "nav_modes" in self.__dict__ and self.nav_modes != None else None,
             ]
             output = list(filter(None, output))
             print(tabulate(output, [], 'fancy_grid'))
@@ -161,11 +201,11 @@ class Plane:
             if self.last_on_ground:
                 self.tookoff = True
                 self.trigger_type = "no longer on ground"
-                self.tookoff_header = "Took off from "
+                self.type_header = "Took off from "
             elif self.last_feeding is False and self.feeding and self.landing_plausible == False:
                 self.tookoff = True
                 self.trigger_type = "data acquisition"
-                self.tookoff_header = "Took off near "
+                self.type_header = "Took off near "
             else:
                 self.tookoff = False
         else:
@@ -179,7 +219,7 @@ class Plane:
         if self.on_ground and self.last_on_ground is False and self.last_below_desired_ft:
             self.landed = True
             self.trigger_type = "now on ground"
-            self.landed_header = "Landed in "
+            self.type_header = "Landed in "
             self.landing_plausible = False
         #Set status for landing plausible
         elif self.last_below_desired_ft and self.last_feeding and self.feeding is False and self.last_on_ground is False:
@@ -190,7 +230,7 @@ class Plane:
             self.landing_plausible = False
             self.landed = True
             self.trigger_type = "data loss"
-            self.landed_header = "Landed near "
+            self.type_header = "Landed near "
         else:
             self.landed = False
 
@@ -263,59 +303,26 @@ class Plane:
     #Set Twitter Title
         if self.config.getboolean('TWITTER', 'ENABLE'):
             self.twitter_title = self.icao if self.config.get('TWITTER', 'TITLE') == "icao" else self.callsign if self.config.get('TWITTER', 'TITLE') == "callsign" else self.config.get('TWITTER', 'TITLE')
-    #Takeoff Notifcation and Landed
-        if self.tookoff:
-            if invalid_Location is False:
-                tookoff_message = (self.tookoff_header  + aera_hierarchy + ", " + state + ", " + country_code + ". ")
-            else:
-                tookoff_message = ("Took off")
-            print (tookoff_message)
-            #Google Map or tar1090 screenshot
-            if self.config.get('MAP', 'OPTION') == "GOOGLESTATICMAP":
-                getMap((aera_hierarchy + ", "  + state + ", "  + country_code), self.icao)
-            elif self.config.get('MAP', 'OPTION') == "ADSBX":
-                getSS(self.icao, self.overlays)
-                if nearest_airport_dict != None:
-                    append_airport(self.map_file_name, nearest_airport_dict['icao'], nearest_airport_dict['name'], nearest_airport_dict['distance'])
-                    airport_string = nearest_airport_dict['icao'] + ", " + nearest_airport_dict["name"]
-                else:
-                    airport_string = ""
-            else:
-                raise Exception("Map option not set correctly in this planes conf")
-            #Discord
-            if self.config.getboolean('DISCORD', 'ENABLE'):
-                dis_message = (self.dis_title + " "  + tookoff_message + airport_string).strip()
-                sendDis(dis_message, self.map_file_name, self.config)
-            #PushBullet
-            if self.config.getboolean('PUSHBULLET', 'ENABLE'):
-                with open(self.map_file_name, "rb") as pic:
-                    map_data = self.pb.upload_file(pic, "Tookoff IMG")
-                self.pb_channel.push_note(self.config.get('PUSHBULLET', 'TITLE'), tookoff_message)
-                self.pb_channel.push_file(**map_data)
-            #Twitter
-            if self.config.getboolean('TWITTER', 'ENABLE'):
-                twitter_media_map_obj = self.tweet_api.media_upload(self.map_file_name)
-                alt_text = "Call: " + self.callsign + " On Ground: " + str(self.on_ground) + " Alt: " + str(self.geo_alt_ft) + " Last Contact: " + str(time_since_contact) + " Trigger: " + self.trigger_type
-                self.tweet_api.create_media_metadata(media_id= twitter_media_map_obj.media_id, alt_text= alt_text)
-                self.tweet_api.update_status(status = ((self.twitter_title + " " + tookoff_message).strip()), media_ids=[twitter_media_map_obj.media_id])
-                #self.tweet_api.update_with_media(self.map_file_name, status = (self.twitter_title + " " + tookoff_message).strip())
-            self.takeoff_time = time.time()
-            os.remove(self.map_file_name)
-
-
-        if self.landed:
-            self.landed_time_msg = ""
-            if self.takeoff_time != None:
+    #Takeoff and Land Notification
+        if self.tookoff or self.landed:
+            if self.tookoff:
+                self.takeoff_time = time.time()
+                self.landed_time_msg = None
+            elif self.landed and self.takeoff_time != None:
                 self.landed_time = time.time() - self.takeoff_time
                 if platform.system() == "Linux":
                     self.landed_time_msg = time.strftime("Apx. flt. time %-H Hours : %-M Mins. ", time.gmtime(self.landed_time))
                 elif platform.system() == "Windows":
                     self.landed_time_msg = time.strftime("Apx. flt. time %#H Hours : %#M Mins. ", time.gmtime(self.landed_time))
+                self.takeoff_time = None
+                self.landed_time = None
+            elif self.landed:
+                self.landed_time_msg = None
             if invalid_Location is False:
-                landed_message = (self.landed_header + aera_hierarchy + ", " + state + ", " + country_code + ". " + self.landed_time_msg)
+                message = (self.type_header  + aera_hierarchy + ", " + state + ", " + country_code + ".") + ((" " + self.landed_time_msg) if self.landed_time_msg != None else "")
             else:
-                landed_message = ("Landed" + ", " + self.landed_time_msg)
-            print (landed_message)
+                message = ("Landed" + ((" " + self.landed_time_msg) if self.landed_time_msg != None else "") if self.landed  else "Tookoff" if self.tookoff else "")
+            print (message)
             #Google Map or tar1090 screenshot
             if self.config.get('MAP', 'OPTION') == "GOOGLESTATICMAP":
                 getMap((aera_hierarchy + ", "  + state + ", "  + country_code), self.icao)
@@ -326,31 +333,58 @@ class Plane:
                     airport_string = nearest_airport_dict['icao'] + ", " + nearest_airport_dict["name"]
                 else:
                     airport_string = ""
-
             else:
                 raise Exception("Map option not set correctly in this planes conf")
             #Discord
             if self.config.getboolean('DISCORD', 'ENABLE'):
-                dis_message =  (self.dis_title + " "  + landed_message + " " + airport_string).strip()
+                dis_message = (self.dis_title + " "  + message + " " + airport_string).strip()
                 sendDis(dis_message, self.map_file_name, self.config)
             #PushBullet
             if self.config.getboolean('PUSHBULLET', 'ENABLE'):
                 with open(self.map_file_name, "rb") as pic:
-                    map_data = self.pb.upload_file(pic, "Landed IMG")
-                self.pb_channel.push_note(self.config.get('PUSHBULLET', 'TITLE'), landed_message)
+                    map_data = self.pb.upload_file(pic, "Tookoff IMG")
+                self.pb_channel.push_note(self.config.get('PUSHBULLET', 'TITLE'), message)
                 self.pb_channel.push_file(**map_data)
             #Twitter
             if self.config.getboolean('TWITTER', 'ENABLE'):
                 twitter_media_map_obj = self.tweet_api.media_upload(self.map_file_name)
                 alt_text = "Call: " + self.callsign + " On Ground: " + str(self.on_ground) + " Alt: " + str(self.geo_alt_ft) + " Last Contact: " + str(time_since_contact) + " Trigger: " + self.trigger_type
                 self.tweet_api.create_media_metadata(media_id= twitter_media_map_obj.media_id, alt_text= alt_text)
-                self.tweet_api.update_status(status = ((self.twitter_title + " " + landed_message).strip()), media_ids=[twitter_media_map_obj.media_id])
-                #self.tweet_api.update_with_media(self.map_file_name, status = (self.twitter_title + " " + landed_message).strip())
-            self.takeoff_time = None
-            self.landed_time = None
-            self.time_since_tk = None
+                self.tweet_api.update_status(status = ((self.twitter_title + " " + message).strip()), media_ids=[twitter_media_map_obj.media_id])
+                #self.tweet_api.update_with_media(self.map_file_name, status = (self.twitter_title + " " + tookoff_message).strip())
             os.remove(self.map_file_name)
-            self.last_contact = None
+
+        #Squawks
+        squawks =[("7500", "Hijacking"), ("7600", "Radio Failure"), ("7700", "Emergency")]
+        if self.feeding:
+            for squawk in squawks:
+                if self.squawk == squawk[0] and self.squawk != self.last_squawk:
+                    squawk_message = ("Squawking " + squawk[0] + ", " + squawk[1])
+                    print(squawk_message)
+                    #Google Map or tar1090 screenshot
+                    # if self.config.get('MAP', 'OPTION') == "GOOGLESTATICMAP":
+                    #     getMap((aera_hierarchy + ", "  + state + ", "  + country_code), self.icao)
+                    if self.config.get('MAP', 'OPTION') == "ADSBX":
+                        getSS(self.icao, self.overlays)
+                    #Discord
+                    if self.config.getboolean('DISCORD', 'ENABLE'):
+                        dis_message =  (self.dis_title + " "  + squawk_message)
+                        sendDis(dis_message, self.map_file_name, self.config)
+                    os.remove(self.map_file_name)
+            #Nav Modes Notifications
+            if self.nav_modes != None and self.last_nav_modes != None:
+                new_modes = []
+                for mode in self.nav_modes:
+                    if mode not in self.last_nav_modes:
+                        new_modes.append(mode)
+                        #Discord
+                if new_modes != []:
+                    modes_string = ", ".join(new_modes)
+                    if self.config.getboolean('DISCORD', 'ENABLE'):
+                        dis_message =  (self.dis_title + " "  + modes_string + " mode enabled.").strip()
+                        getSS(self.icao, self.overlays)
+                        sendDis(dis_message, self.map_file_name, self.config)
+
 
 #Set Variables to compare to next check
         self.last_feeding = self.feeding
@@ -359,6 +393,8 @@ class Plane:
         self.last_below_desired_ft = self.below_desired_ft
         self.last_longitude = self.longitude
         self.last_latitude = self.latitude
+        self.last_squawk = self.squawk
+        self.last_nav_modes = self.nav_modes
 
 
         if self.takeoff_time != None: