From 741be95c3311fda4ba5f160b5c68c490fbaa6aed Mon Sep 17 00:00:00 2001 From: MihajloPi Date: Fri, 6 Sep 2024 15:11:44 +0200 Subject: [PATCH 1/5] Editing SatDump config file + additional logic I've added `meteor_daytime_enhancements` and `meteor_nighttime_enhancements` to the `settings.yml` file and additional logic in the `Capture.php` file to include all enhancements listed for creation for Meteor M2-X. --- .../roles/common/templates/noaa-v2.conf.j2 | 2 + .../common/templates/satdump_cfg.json.j2 | 1322 +++++++++-------- config/settings.yml | 6 +- config/settings_schema.json | 76 +- webpanel/App/Models/Capture.php | 7 +- 5 files changed, 782 insertions(+), 631 deletions(-) diff --git a/ansible/roles/common/templates/noaa-v2.conf.j2 b/ansible/roles/common/templates/noaa-v2.conf.j2 index 095eb2c96..54a07acd6 100644 --- a/ansible/roles/common/templates/noaa-v2.conf.j2 +++ b/ansible/roles/common/templates/noaa-v2.conf.j2 @@ -128,6 +128,8 @@ EXTEND_FOR_ANNOTATION={{ extend_for_annotation|lower }} GROUND_STATION_LOCATION='{{ ground_station_location }}' NOAA_DAY_ENHANCEMENTS='{{ noaa_daytime_enhancements }}' NOAA_NIGHT_ENHANCEMENTS='{{ noaa_nighttime_enhancements }}' +METEOR_DAY_ENHANCEMENTS='{{ meteor_daytime_enhancements }}' +METEOR_NIGHT_ENHANCEMENTS='{{ meteor_nighttime_enhancements }}' # Community Contributions CONTRIBUTE_TO_COMMUNITY_COMPOSITES={{ contribute_to_community_composites|lower }} diff --git a/ansible/roles/common/templates/satdump_cfg.json.j2 b/ansible/roles/common/templates/satdump_cfg.json.j2 index e7b3b6bad..49ad1926f 100644 --- a/ansible/roles/common/templates/satdump_cfg.json.j2 +++ b/ansible/roles/common/templates/satdump_cfg.json.j2 @@ -4,17 +4,10 @@ // Parameters shown in the default UI table, for everything "default_offline_parameters": { "baseband_format": { - "type": "options", + "type": "baseband_type", "value": "cs8", "name": "Baseband Format", - "options": [ - "cs8", - "cu8", - "cs16", - "cf32", - "ziq" - ], - "description": "The sample format of the recorded baseband.\nThis depends on the settings of your recording software,\nbut some common formats are s16 (SDR#, etc),\nf32 (GQRX), u8 (HDSDR), etc", + "description": "The sample format of the recorded baseband.\nThis depends on the settings of your recording software,\nbut some common formats are cs16 (SDR#, etc),\ncf32 (GQRX), cu8 (HDSDR), etc", "no_live": true }, "samplerate": { @@ -103,6 +96,12 @@ "value": false, "name": "Remember Window Size and Position", "description": "Remeber size and position of the window when closing SatDump. It will open in the same configuration on next launch" + }, + "advanced_mode": { + "type": "bool", + "value": false, + "name": "Advanced Mode", + "description": "Allows full editing of all SatDump options. Be warned: invalid configurations\nmay result in crashes, corruption of data, and more. Use at your own risk!" } }, // More generic SatDump settings @@ -182,7 +181,7 @@ "type": "float", "value": {{ altitude }}, "name": "QTH Altitude", - "description": "Altitude (meters) of your station's QTH" + "description": "Altitude (meters above sea level) of your station's QTH" }, "default_qth_label": { "type": "string", @@ -383,7 +382,7 @@ // 41882, // FENGYUN-4A // 48808, // FENGYUN-4B // 43823, // GK-2A - 31304, // AIM + // 31304, // AIM // 53807, // BlueWalker-3 // 53323, // COSMOS-2558 // 42719, // COSMOS-2518 @@ -505,7 +504,7 @@ "white_balance": true, "individual_equalize": true }, - "AVHRR 543b False Color": { + "AVHRR 543b IR False Color": { "equation": "ch10 == 0 ? 0 : 1-ch10, ch9 == 0 ? 0 : 1-ch9, ch4 == 0 ? 0 : 1-ch4", "white_balance": true, "individual_equalize": true @@ -576,13 +575,13 @@ "description": "descriptions/NatColor.md", "geo_correct": true }, - "543b": { + "AVHRR 543b IR False Color": { "equation": "ch5, ch4, ch3b", "individual_equalize": true, "description": "descriptions/543b.md", "geo_correct": true }, - "3b45": { + "AVHRR 3b45 IR False Color": { "equation": "ch3b, ch4, ch5", "individual_equalize": true, "description": "descriptions/3b45.md", @@ -614,18 +613,18 @@ "autogen": {{ "true" if "therm" in noaa_nighttime_enhancements.split(' ') else "false" }}, "draw_map_overlay": {{ noaa_map_country_border_enable|lower }}, "borders_color": [ - 1, - 1, - 0 + 1.0, + 1.0, + 0.0 ], "project": { "width": 2048, "height": 2048, "draw_map": {{ noaa_map_country_border_enable|lower }}, "map_overlay_colors": [ - 1, - 1, - 0 + 1.0, + 1.0, + 0.0 ], "individual_equalize": false, "config": { @@ -672,9 +671,9 @@ "cpp": "underlay_with_clouds", "description": "descriptions/CloudUnderlay.md", "vars": { - "minoffset": 0, + "minoffset": 0.0, "scalar": 1.5, - "thresold": 0, + "thresold": 0.0, "blend": false, "invert": false }, @@ -685,7 +684,7 @@ "cpp": "underlay_with_clouds", "description": "descriptions/CloudUnderlay.md", "vars": { - "minoffset": 0, + "minoffset": 0.0, "scalar": 1.5, "thresold": 0.15, "blend": false, @@ -698,17 +697,17 @@ "cpp": "underlay_with_clouds", "description": "descriptions/MCIR.md", "vars": { - "minoffset": 0, - "scalar": 1, - "thresold": 0, + "minoffset": 0.0, + "scalar": 1.0, + "thresold": 0.0, "blend": true, "invert": true }, "draw_map_overlay": true, "borders_color": [ - 1, - 1, - 0 + 1.0, + 1.0, + 0.0 ] }, "MSA (channel 1)": { @@ -716,28 +715,28 @@ "cpp": "underlay_with_clouds", "description": "descriptions/MSA.md", "geo_correct": true, - "autogen": {{ "true" if "MSA" in noaa_daytime_enhancements.split(' ') else "false" }}, "vars": { - "minoffset": 0, + "minoffset": 0.0, "scalar": 0.95, - "thresold": 0, + "thresold": 0.0, "blend": true, "invert": false }, + "autogen": {{ "true" if "MSA" in noaa_daytime_enhancements.split(' ') else "false" }}, "draw_map_overlay": {{ noaa_map_country_border_enable|lower }}, "borders_color": [ - 1, - 1, - 0 + 1.0, + 1.0, + 0.0 ], "project": { "width": 2048, "height": 2048, "draw_map": {{ noaa_map_country_border_enable|lower }}, "map_overlay_colors": [ - 1, - 1, - 0 + 1.0, + 1.0, + 0.0 ], "individual_equalize": false, "config": { @@ -756,28 +755,28 @@ "cpp": "underlay_with_clouds", "description": "descriptions/MSA.md", "geo_correct": true, - "autogen": {{ "true" if "MSA" in noaa_daytime_enhancements.split(' ') else "false" }}, "vars": { - "minoffset": 0, + "minoffset": 0.0, "scalar": 0.95, - "thresold": 0, + "thresold": 0.0, "blend": true, "invert": false }, + "autogen": {{ "true" if "MSA" in noaa_daytime_enhancements.split(' ') else "false" }}, "draw_map_overlay": {{ noaa_map_country_border_enable|lower }}, "borders_color": [ - 1, - 1, - 0 + 1.0, + 1.0, + 0.0 ], "project": { "width": 2048, "height": 2048, "draw_map": {{ noaa_map_country_border_enable|lower }}, "map_overlay_colors": [ - 1, - 1, - 0 + 1.0, + 1.0, + 0.0 ], "individual_equalize": false, "config": { @@ -865,7 +864,6 @@ "channels": "cch4", "description": "descriptions/SST.md", "lua": "scripted_compos/sst_landmask.lua", - "autogen": {{ "true" if "sea" in noaa_nighttime_enhancements.split(' ') else "false" }}, "vars": { "minval": 0, "maxval": 1 @@ -877,20 +875,21 @@ "max": 307.15 } }, + "autogen": {{ "true" if "sea" in noaa_nighttime_enhancements.split(' ') else "false" }}, "draw_map_overlay": {{ noaa_map_country_border_enable|lower }}, "borders_color": [ - 1, - 1, - 0 + 1.0, + 1.0, + 0.0 ], "project": { "width": 2048, "height": 2048, "draw_map": {{ noaa_map_country_border_enable|lower }}, "map_overlay_colors": [ - 1, - 1, - 0 + 1.0, + 1.0, + 0.0 ], "individual_equalize": false, "config": { @@ -921,31 +920,20 @@ } }, "autogen": {{ "true" if "fire" in noaa_nighttime_enhancements.split(' ') else "false" }}, - "vars": { - "minval": 0, - "maxval": 1 - }, - "calib_cfg": { - "cch4": { - "type": "temperature", - "min": 270.65, - "max": 307.15 - } - }, "draw_map_overlay": {{ noaa_map_country_border_enable|lower }}, "borders_color": [ - 1, - 1, - 0 + 1.0, + 1.0, + 0.0 ], "project": { "width": 2048, "height": 2048, "draw_map": {{ noaa_map_country_border_enable|lower }}, "map_overlay_colors": [ - 1, - 1, - 0 + 1.0, + 1.0, + 0.0 ], "individual_equalize": false, "config": { @@ -963,7 +951,6 @@ "lut": "lut/cal/WXtoImg-NO.png", "description": "descriptions/NO.md", "channels": "cch4", - "autogen": {{ "true" if "NO" in noaa_daytime_enhancements.split(' ') else "false" }}, "calib_cfg": { "cch4": { "type": "radiance", @@ -971,20 +958,21 @@ "max": 155.2782819316993 } }, + "autogen": {{ "true" if "NO" in noaa_nighttime_enhancements.split(' ') else "false" }}, "draw_map_overlay": {{ noaa_map_country_border_enable|lower }}, "borders_color": [ - 1, - 1, - 0 + 1.0, + 1.0, + 0.0 ], "project": { "width": 2048, "height": 2048, "draw_map": {{ noaa_map_country_border_enable|lower }}, "map_overlay_colors": [ - 1, - 1, - 0 + 1.0, + 1.0, + 0.0 ], "individual_equalize": false, "config": { @@ -1009,22 +997,22 @@ }, "lut": "lut/cal/WXtoImg-ZA.png", "description": "descriptions/ZA.md", - "autogen": {{ "true" if "ZA" in noaa_daytime_enhancements.split(' ') else "false" }}, "geo_correct": true, + "autogen": {{ "true" if "ZA" in noaa_nighttime_enhancements.split(' ') else "false" }}, "draw_map_overlay": {{ noaa_map_country_border_enable|lower }}, "borders_color": [ - 1, - 1, - 0 + 1.0, + 1.0, + 0.0 ], "project": { "width": 2048, "height": 2048, "draw_map": {{ noaa_map_country_border_enable|lower }}, "map_overlay_colors": [ - 1, - 1, - 0 + 1.0, + 1.0, + 0.0 ], "individual_equalize": false, "config": { @@ -1049,22 +1037,22 @@ "max": 155.2782819316993 } }, - "autogen": {{ "true" if "MB" in noaa_daytime_enhancements.split(' ') else "false" }}, "geo_correct": true, + "autogen": {{ "true" if "MB" in noaa_nighttime_enhancements.split(' ') else "false" }}, "draw_map_overlay": {{ noaa_map_country_border_enable|lower }}, "borders_color": [ - 1, - 1, - 0 + 1.0, + 1.0, + 0.0 ], "project": { "width": 2048, "height": 2048, "draw_map": {{ noaa_map_country_border_enable|lower }}, "map_overlay_colors": [ - 1, - 1, - 0 + 1.0, + 1.0, + 0.0 ], "individual_equalize": false, "config": { @@ -1089,22 +1077,22 @@ "max": 155.2782819316993 } }, - "autogen": {{ "true" if "MD" in noaa_daytime_enhancements.split(' ') else "false" }}, "geo_correct": true, + "autogen": {{ "true" if "MD" in noaa_nighttime_enhancements.split(' ') else "false" }}, "draw_map_overlay": {{ noaa_map_country_border_enable|lower }}, "borders_color": [ - 1, - 1, - 0 + 1.0, + 1.0, + 0.0 ], "project": { "width": 2048, "height": 2048, "draw_map": {{ noaa_map_country_border_enable|lower }}, "map_overlay_colors": [ - 1, - 1, - 0 + 1.0, + 1.0, + 0.0 ], "individual_equalize": false, "config": { @@ -1129,22 +1117,22 @@ }, "description": "descriptions/BD.md", "lut": "lut/cal/WXtoImg-BD.png", - "autogen": {{ "true" if "BD" in noaa_daytime_enhancements.split(' ') else "false" }}, "geo_correct": true, + "autogen": {{ "true" if "BD" in noaa_nighttime_enhancements.split(' ') else "false" }}, "draw_map_overlay": {{ noaa_map_country_border_enable|lower }}, "borders_color": [ - 1, - 1, - 0 + 1.0, + 1.0, + 0.0 ], "project": { "width": 2048, "height": 2048, "draw_map": {{ noaa_map_country_border_enable|lower }}, "map_overlay_colors": [ - 1, - 1, - 0 + 1.0, + 1.0, + 0.0 ], "individual_equalize": false, "config": { @@ -1169,22 +1157,22 @@ }, "description": "descriptions/CC.md", "lut": "lut/cal/WXtoImg-CC.png", - "autogen": {{ "true" if "CC" in noaa_daytime_enhancements.split(' ') else "false" }}, "geo_correct": true, + "autogen": {{ "true" if "CC" in noaa_nighttime_enhancements.split(' ') else "false" }}, "draw_map_overlay": {{ noaa_map_country_border_enable|lower }}, "borders_color": [ - 1, - 1, - 0 + 1.0, + 1.0, + 0.0 ], "project": { "width": 2048, "height": 2048, "draw_map": {{ noaa_map_country_border_enable|lower }}, "map_overlay_colors": [ - 1, - 1, - 0 + 1.0, + 1.0, + 0.0 ], "individual_equalize": false, "config": { @@ -1209,22 +1197,22 @@ }, "description": "descriptions/EC.md", "lut": "lut/cal/WXtoImg-EC.png", - "autogen": {{ "true" if "EC" in noaa_daytime_enhancements.split(' ') else "false" }}, "geo_correct": true, + "autogen": {{ "true" if "EC" in noaa_nighttime_enhancements.split(' ') else "false" }}, "draw_map_overlay": {{ noaa_map_country_border_enable|lower }}, "borders_color": [ - 1, - 1, - 0 + 1.0, + 1.0, + 0.0 ], "project": { "width": 2048, "height": 2048, "draw_map": {{ noaa_map_country_border_enable|lower }}, "map_overlay_colors": [ - 1, - 1, - 0 + 1.0, + 1.0, + 0.0 ], "individual_equalize": false, "config": { @@ -1249,22 +1237,22 @@ }, "description": "descriptions/HE.md", "lut": "lut/cal/WXtoImg-HE.png", - "autogen": {{ "true" if "HE" in noaa_daytime_enhancements.split(' ') else "false" }}, "geo_correct": true, + "autogen": {{ "true" if "HE" in noaa_nighttime_enhancements.split(' ') else "false" }}, "draw_map_overlay": {{ noaa_map_country_border_enable|lower }}, "borders_color": [ - 1, - 1, - 0 + 1.0, + 1.0, + 0.0 ], "project": { "width": 2048, "height": 2048, "draw_map": {{ noaa_map_country_border_enable|lower }}, "map_overlay_colors": [ - 1, - 1, - 0 + 1.0, + 1.0, + 0.0 ], "individual_equalize": false, "config": { @@ -1277,7 +1265,6 @@ "offset_y": 2048000 } } - }, "HF enhancement": { "channels": "cch4", @@ -1290,22 +1277,22 @@ }, "description": "descriptions/HF.md", "lut": "lut/cal/WXtoImg-HF.png", - "autogen": {{ "true" if "HF" in noaa_daytime_enhancements.split(' ') else "false" }}, "geo_correct": true, + "autogen": {{ "true" if "HF" in noaa_nighttime_enhancements.split(' ') else "false" }}, "draw_map_overlay": {{ noaa_map_country_border_enable|lower }}, "borders_color": [ - 1, - 1, - 0 + 1.0, + 1.0, + 0.0 ], "project": { "width": 2048, "height": 2048, "draw_map": {{ noaa_map_country_border_enable|lower }}, "map_overlay_colors": [ - 1, - 1, - 0 + 1.0, + 1.0, + 0.0 ], "individual_equalize": false, "config": { @@ -1318,7 +1305,6 @@ "offset_y": 2048000 } } - }, "JF enhancement": { "channels": "cch4", @@ -1331,22 +1317,22 @@ }, "description": "descriptions/JF.md", "lut": "lut/cal/WXtoImg-JF.png", - "autogen": {{ "true" if "JF" in noaa_daytime_enhancements.split(' ') else "false" }}, "geo_correct": true, + "autogen": {{ "true" if "JF" in noaa_nighttime_enhancements.split(' ') else "false" }}, "draw_map_overlay": {{ noaa_map_country_border_enable|lower }}, "borders_color": [ - 1, - 1, - 0 + 1.0, + 1.0, + 0.0 ], "project": { "width": 2048, "height": 2048, "draw_map": {{ noaa_map_country_border_enable|lower }}, "map_overlay_colors": [ - 1, - 1, - 0 + 1.0, + 1.0, + 0.0 ], "individual_equalize": false, "config": { @@ -1359,7 +1345,6 @@ "offset_y": 2048000 } } - }, "JJ enhancement": { "channels": "cch4", @@ -1372,22 +1357,22 @@ }, "description": "descriptions/JJ.md", "lut": "lut/cal/WXtoImg-JJ.png", - "autogen": {{ "true" if "JJ" in noaa_daytime_enhancements.split(' ') else "false" }}, "geo_correct": true, + "autogen": {{ "true" if "JJ" in noaa_nighttime_enhancements.split(' ') else "false" }}, "draw_map_overlay": {{ noaa_map_country_border_enable|lower }}, "borders_color": [ - 1, - 1, - 0 + 1.0, + 1.0, + 0.0 ], "project": { "width": 2048, "height": 2048, "draw_map": {{ noaa_map_country_border_enable|lower }}, "map_overlay_colors": [ - 1, - 1, - 0 + 1.0, + 1.0, + 0.0 ], "individual_equalize": false, "config": { @@ -1400,7 +1385,6 @@ "offset_y": 2048000 } } - }, "TA enhancement": { "channels": "cch4", @@ -1413,22 +1397,22 @@ }, "description": "descriptions/TA.md", "lut": "lut/cal/WXtoImg-TA.png", - "autogen": {{ "true" if "TA" in noaa_daytime_enhancements.split(' ') else "false" }}, "geo_correct": true, + "autogen": {{ "true" if "TA" in noaa_nighttime_enhancements.split(' ') else "false" }}, "draw_map_overlay": {{ noaa_map_country_border_enable|lower }}, "borders_color": [ - 1, - 1, - 0 + 1.0, + 1.0, + 0.0 ], "project": { "width": 2048, "height": 2048, "draw_map": {{ noaa_map_country_border_enable|lower }}, "map_overlay_colors": [ - 1, - 1, - 0 + 1.0, + 1.0, + 0.0 ], "individual_equalize": false, "config": { @@ -1441,28 +1425,27 @@ "offset_y": 2048000 } } - }, "Enhanced IR": { "channels": "cch4", "description": "descriptions/EnhancedIR.md", "lut": "lut/cal/EnhancedIR.png", - "autogen": {{ "true" if "enhanced-IR" in noaa_nighttime_enhancements.split(' ') else "false" }}, "geo_correct": true, + "autogen": {{ "true" if "enhanced-IR" in noaa_nighttime_enhancements.split(' ') else "false" }}, "draw_map_overlay": {{ noaa_map_country_border_enable|lower }}, "borders_color": [ - 1, - 1, - 0 + 1.0, + 1.0, + 0.0 ], "project": { "width": 2048, "height": 2048, "draw_map": {{ noaa_map_country_border_enable|lower }}, "map_overlay_colors": [ - 1, - 1, - 0 + 1.0, + 1.0, + 0.0 ], "individual_equalize": false, "config": { @@ -1483,6 +1466,35 @@ } } }, + "Cloud Top IR": { + "channels": "cch4", + "description": "descriptions/CloudTopIR.md", + "lut": "lut/cal/CloudTopIR.png", + "autogen": true, + "geo_correct": true, + "calib_cfg": { + "cch4": { + "type": "temperature", + "min": 183.15, + "max": 323.15 + } + } + }, + "Enhanced IR (Transparent)": { + "equation": "cch4, 0, 0, cch4 > 0.99 ? 1 : 0", + "description": "descriptions/EnhancedIR.md", + "autogen": false, + "geo_correct": true, + "apply_lut": true, + "invert": true, + "calib_cfg": { + "cch4": { + "type": "temperature", + "min": 200, + "max": 241 + } + } + }, "Color general cloud IR": { "channels": "cch4", "description": "descriptions/ColorGeneralIR.md", @@ -1525,29 +1537,28 @@ "channels": "chb", "cpp": "underlay_with_clouds", "description": "descriptions/MCIR.md", - "autogen": {{ "true" if "MCIR" in noaa_nighttime_enhancements.split(' ') else "false" }}, "vars": { - "minoffset": 0, - "scalar": 1, - "thresold": 0, + "minoffset": 0.0, + "scalar": 1.0, + "thresold": 0.0, "blend": true, "invert": false }, - "geo_correct": true, + "autogen": {{ "true" if "MCIR" in noaa_nighttime_enhancements.split(' ') else "false" }}, "draw_map_overlay": {{ noaa_map_country_border_enable|lower }}, "borders_color": [ - 1, - 1, - 0 + 1.0, + 1.0, + 0.0 ], "project": { "width": 2048, "height": 2048, "draw_map": {{ noaa_map_country_border_enable|lower }}, "map_overlay_colors": [ - 1, - 1, - 0 + 1.0, + 1.0, + 0.0 ], "individual_equalize": false, "config": { @@ -1560,35 +1571,34 @@ "offset_y": 2048000 } } - }, "MSA (Uncalibrated)": { "channels": "cha", "cpp": "underlay_with_clouds", "description": "descriptions/MSA.md", - "autogen": {{ "true" if "MSA" in noaa_daytime_enhancements.split(' ') else "false" }}, "vars": { - "minoffset": 0, + "minoffset": 0.0, "scalar": 0.95, - "thresold": 0, + "thresold": 0.0, "blend": true, "invert": false }, "geo_correct": true, + "autogen": {{ "true" if "MSA" in noaa_daytime_enhancements.split(' ') else "false" }}, "draw_map_overlay": {{ noaa_map_country_border_enable|lower }}, "borders_color": [ - 1, - 1, - 0 + 1.0, + 1.0, + 0.0 ], "project": { "width": 2048, "height": 2048, "draw_map": {{ noaa_map_country_border_enable|lower }}, "map_overlay_colors": [ - 1, - 1, - 0 + 1.0, + 1.0, + 0.0 ], "individual_equalize": false, "config": { @@ -1601,34 +1611,33 @@ "offset_y": 2048000 } } - }, "MCIR Rain (Uncalibrated)": { "channels": "cha, chb", "lua": "scripted_compos/underlay_with_clouds_lut.lua", "description": "descriptions/MCIR_precip.md", - "autogen": {{ "true" if "MCIR-precip" in noaa_nighttime_enhancements.split(' ') else "false" }}, "vars": { "minoffset": 0.21, - "scalar": 1, + "scalar": 1.0, "thresold": 0.8, "lut": "lut/WXtoImg-NO_mod_APT.png" }, "geo_correct": true, + "autogen": {{ "true" if "MCIR-precip" in noaa_nighttime_enhancements.split(' ') else "false" }}, "draw_map_overlay": {{ noaa_map_country_border_enable|lower }}, "borders_color": [ - 1, - 1, - 0 + 1.0, + 1.0, + 0.0 ], "project": { "width": 2048, "height": 2048, "draw_map": {{ noaa_map_country_border_enable|lower }}, "map_overlay_colors": [ - 1, - 1, - 0 + 1.0, + 1.0, + 0.0 ], "individual_equalize": false, "config": { @@ -1641,28 +1650,27 @@ "offset_y": 2048000 } } - }, "HVC (channel 1)": { "lut": "lut/WXtoImg-HVC-1.png", "description": "descriptions/HVC.md", "channels": "ch1, ch4", - "autogen": {{ "true" if "HVC" in noaa_nighttime_enhancements.split(' ') else "false" }}, "geo_correct": true, + "autogen": {{ "true" if "HVC" in noaa_nighttime_enhancements.split(' ') else "false" }}, "draw_map_overlay": {{ noaa_map_country_border_enable|lower }}, "borders_color": [ - 1, - 1, - 0 + 1.0, + 1.0, + 0.0 ], "project": { "width": 2048, "height": 2048, "draw_map": {{ noaa_map_country_border_enable|lower }}, "map_overlay_colors": [ - 1, - 1, - 0 + 1.0, + 1.0, + 0.0 ], "individual_equalize": false, "config": { @@ -1675,28 +1683,27 @@ "offset_y": 2048000 } } - }, "HVC (channel 2)": { "lut": "lut/WXtoImg-HVC-2.png", "description": "descriptions/HVC.md", "channels": "ch2, ch4", - "autogen": {{ "true" if "HVC" in noaa_nighttime_enhancements.split(' ') else "false" }}, "geo_correct": true, + "autogen": {{ "true" if "HVC" in noaa_nighttime_enhancements.split(' ') else "false" }}, "draw_map_overlay": {{ noaa_map_country_border_enable|lower }}, "borders_color": [ - 1, - 1, - 0 + 1.0, + 1.0, + 0.0 ], "project": { "width": 2048, "height": 2048, "draw_map": {{ noaa_map_country_border_enable|lower }}, "map_overlay_colors": [ - 1, - 1, - 0 + 1.0, + 1.0, + 0.0 ], "individual_equalize": false, "config": { @@ -1709,7 +1716,6 @@ "offset_y": 2048000 } } - } } }, @@ -1775,7 +1781,7 @@ } } }, - "4 individual_equalized": { + "Thermal Channel": { "equation": "ch4", "individual_equalize": true, "geo_correct": true, @@ -1825,24 +1831,24 @@ "rgb_composites": { "221": { "equation": "ch2, ch2, ch1", + "geo_correct": true, "white_balance": true, "description": "descriptions/221.md", - "autogen": true, - "geo_correct": true, + "autogen": {{ "true" if "221" in meteor_daytime_enhancements.split(' ') else "false" }}, "draw_map_overlay": {{ meteor_draw_map_overlay|lower }}, "borders_color": [ - 1, - 1, - 0 + 1.0, + 1.0, + 0.0 ], "project": { "width": 2048, "height": 2048, "draw_map": {{ meteor_draw_map_overlay|lower }}, "map_overlay_colors": [ - 1, - 1, - 0 + 1.0, + 1.0, + 0.0 ], "individual_equalize": false, "config": { @@ -1859,85 +1865,23 @@ "321": { "equation": "ch3, ch2, ch1", "description": "descriptions/321.md", - "white_balance": true, - "autogen": true, "geo_correct": true, + "white_balance": true, + "autogen": {{ "true" if "321" in meteor_daytime_enhancements.split(' ') else "false" }}, "draw_map_overlay": {{ meteor_draw_map_overlay|lower }}, "borders_color": [ - 1, - 1, - 0 - ], - "project": { - "width": 2048, - "height": 2048, - "draw_map": {{ meteor_draw_map_overlay|lower }}, - "map_overlay_colors": [ - 1, - 1, - 0 - ], - "individual_equalize": false, - "config": { - "type": "stereo", - "lat0": {{ latitude }}, - "lon0": {{ longitude }}, - "scalar_x": 2000, - "scalar_y": -2000, - "offset_x": -2048000, - "offset_y": 2048000 - } - } - }, - "negative224": { - "equation": "ch2, ch2, 1-ch4", - "geo_correct": true, - "individual_equalize": true, - "draw_map_overlay": {{ meteor_draw_map_overlay|lower }}, - "map_overlay_colors": [ - 1, - 1, - 0 - ], - "project": { - "width": 2048, - "height": 2048, - "draw_map": {{ meteor_draw_map_overlay|lower }}, - "map_overlay_colors": [ - 1, - 1, - 0 - ], - "individual_equalize": false, - "config": { - "type": "stereo", - "lat0": {{ latitude }}, - "lon0": {{ longitude }}, - "scalar_x": 2000, - "scalar_y": -2000, - "offset_x": -2048000, - "offset_y": 2048000 - } - } - }, - "4": { - "equation": "ch4, ch4, ch4", - "geo_correct": true, - "individual_equalize": true, - "draw_map_overlay": {{ meteor_draw_map_overlay|lower }}, - "map_overlay_colors": [ - 1, - 1, - 0 + 1.0, + 1.0, + 0.0 ], "project": { "width": 2048, "height": 2048, "draw_map": {{ meteor_draw_map_overlay|lower }}, "map_overlay_colors": [ - 1, - 1, - 0 + 1.0, + 1.0, + 0.0 ], "individual_equalize": false, "config": { @@ -1954,24 +1898,24 @@ "124": { "equation": "ch1, ch2, 1-ch4", "description": "descriptions/124.md", + "geo_correct": true, "white_balance": true, "individual_equalize": true, - "autogen": true, - "geo_correct": true, + "autogen": {{ "true" if "124" in meteor_daytime_enhancements.split(' ') else "false" }}, "draw_map_overlay": {{ meteor_draw_map_overlay|lower }}, "borders_color": [ - 1, - 1, - 0 + 1.0, + 1.0, + 0.0 ], "project": { "width": 2048, "height": 2048, "draw_map": {{ meteor_draw_map_overlay|lower }}, "map_overlay_colors": [ - 1, - 1, - 0 + 1.0, + 1.0, + 0.0 ], "individual_equalize": false, "config": { @@ -1988,23 +1932,23 @@ "Natural Color": { "equation": "((0.5*max(ch4,min(ch2,ch1)) + 0.5*ch2)+0.3*ch3)*0.85, ch2, ch1", "description": "descriptions/NatColor.md", + "geo_correct": true, "white_balance": true, "autogen": true, - "geo_correct": true, "draw_map_overlay": {{ meteor_draw_map_overlay|lower }}, "borders_color": [ - 1, - 1, - 0 + 1.0, + 1.0, + 0.0 ], "project": { "width": 2048, "height": 2048, "draw_map": {{ meteor_draw_map_overlay|lower }}, "map_overlay_colors": [ - 1, - 1, - 0 + 1.0, + 1.0, + 0.0 ], "individual_equalize": false, "config": { @@ -2022,22 +1966,22 @@ "equation": "1 - ch5", "description": "descriptions/ThermalUncal.md", "individual_equalize": true, - "autogen": true, "geo_correct": true, + "autogen": {{ "true" if "therm" in meteor_nighttime_enhancements.split(' ') else "false" }}, "draw_map_overlay": {{ meteor_draw_map_overlay|lower }}, "borders_color": [ - 1, - 1, - 0 + 1.0, + 1.0, + 0.0 ], "project": { "width": 2048, "height": 2048, "draw_map": {{ meteor_draw_map_overlay|lower }}, "map_overlay_colors": [ - 1, - 1, - 0 + 1.0, + 1.0, + 0.0 ], "individual_equalize": false, "config": { @@ -2055,22 +1999,22 @@ "equation": "ch1, ch4^2.5, ch5", "description": "descriptions/DayMicro.md", "individual_equalize": true, - "autogen": true, "geo_correct": true, + "autogen": true, "draw_map_overlay": {{ meteor_draw_map_overlay|lower }}, "borders_color": [ - 1, - 1, - 0 + 1.0, + 1.0, + 0.0 ], "project": { "width": 2048, "height": 2048, "draw_map": {{ meteor_draw_map_overlay|lower }}, "map_overlay_colors": [ - 1, - 1, - 0 + 1.0, + 1.0, + 0.0 ], "individual_equalize": false, "config": { @@ -2088,22 +2032,22 @@ "equation": "ch6-ch5, ch5-ch4, ch5", "description": "descriptions/NightMicro.md", "individual_equalize": true, - "autogen": true, "geo_correct": true, + "autogen": true, "draw_map_overlay": {{ meteor_draw_map_overlay|lower }}, "borders_color": [ - 1, - 1, - 0 + 1.0, + 1.0, + 0.0 ], "project": { "width": 2048, "height": 2048, "draw_map": {{ meteor_draw_map_overlay|lower }}, "map_overlay_colors": [ - 1, - 1, - 0 + 1.0, + 1.0, + 0.0 ], "individual_equalize": false, "config": { @@ -2121,22 +2065,22 @@ "equation": "1 - ch6, 1 - ch5, 1 - ch4", "description": "descriptions/543b.md", "individual_equalize": true, - "autogen": true, "geo_correct": true, + "autogen": {{ "true" if "654" in meteor_nighttime_enhancements.split(' ') else "false" }}, "draw_map_overlay": {{ meteor_draw_map_overlay|lower }}, "borders_color": [ - 1, - 1, - 0 + 1.0, + 1.0, + 0.0 ], "project": { "width": 2048, "height": 2048, "draw_map": {{ meteor_draw_map_overlay|lower }}, "map_overlay_colors": [ - 1, - 1, - 0 + 1.0, + 1.0, + 0.0 ], "individual_equalize": false, "config": { @@ -2154,22 +2098,22 @@ "equation": "1 - ch4, 1 - ch5, 1 - ch6", "description": "descriptions/3b45.md", "individual_equalize": true, - "autogen": true, "geo_correct": true, + "autogen": {{ "true" if "456" in meteor_nighttime_enhancements.split(' ') else "false" }}, "draw_map_overlay": {{ meteor_draw_map_overlay|lower }}, "borders_color": [ - 1, - 1, - 0 + 1.0, + 1.0, + 0.0 ], "project": { "width": 2048, "height": 2048, "draw_map": {{ meteor_draw_map_overlay|lower }}, "map_overlay_colors": [ - 1, - 1, - 0 + 1.0, + 1.0, + 0.0 ], "individual_equalize": false, "config": { @@ -2198,22 +2142,21 @@ "max": 307.15 } }, - "autogen": true, - "geo_correct": true, + "autogen": {{ "true" if "sea" in meteor_nighttime_enhancements.split(' ') else "false" }}, "draw_map_overlay": {{ meteor_draw_map_overlay|lower }}, "borders_color": [ - 1, - 1, - 0 + 1.0, + 1.0, + 0.0 ], "project": { "width": 2048, "height": 2048, "draw_map": {{ meteor_draw_map_overlay|lower }}, "map_overlay_colors": [ - 1, - 1, - 0 + 1.0, + 1.0, + 0.0 ], "individual_equalize": false, "config": { @@ -2243,22 +2186,21 @@ "max": 1000 } }, - "autogen": true, - "geo_correct": true, + "autogen": {{ "true" if "fire" in meteor_nighttime_enhancements.split(' ') else "false" }}, "draw_map_overlay": {{ meteor_draw_map_overlay|lower }}, "borders_color": [ - 1, - 1, - 0 + 1.0, + 1.0, + 0.0 ], "project": { "width": 2048, "height": 2048, "draw_map": {{ meteor_draw_map_overlay|lower }}, "map_overlay_colors": [ - 1, - 1, - 0 + 1.0, + 1.0, + 0.0 ], "individual_equalize": false, "config": { @@ -2283,22 +2225,21 @@ "max": 155.2782819316993 } }, - "autogen": true, - "geo_correct": true, + "autogen": {{ "true" if "NO" in meteor_nighttime_enhancements.split(' ') else "false" }}, "draw_map_overlay": {{ meteor_draw_map_overlay|lower }}, "borders_color": [ - 1, - 1, - 0 + 1.0, + 1.0, + 0.0 ], "project": { "width": 2048, "height": 2048, "draw_map": {{ meteor_draw_map_overlay|lower }}, "map_overlay_colors": [ - 1, - 1, - 0 + 1.0, + 1.0, + 0.0 ], "individual_equalize": false, "config": { @@ -2323,22 +2264,22 @@ }, "lut": "lut/cal/WXtoImg-ZA.png", "description": "descriptions/ZA.md", - "autogen": true, "geo_correct": true, + "autogen": {{ "true" if "ZA" in meteor_nighttime_enhancements.split(' ') else "false" }}, "draw_map_overlay": {{ meteor_draw_map_overlay|lower }}, "borders_color": [ - 1, - 1, - 0 + 1.0, + 1.0, + 0.0 ], "project": { "width": 2048, "height": 2048, "draw_map": {{ meteor_draw_map_overlay|lower }}, "map_overlay_colors": [ - 1, - 1, - 0 + 1.0, + 1.0, + 0.0 ], "individual_equalize": false, "config": { @@ -2363,22 +2304,22 @@ "max": 155.2782819316993 } }, - "autogen": true, "geo_correct": true, + "autogen": {{ "true" if "MB" in meteor_nighttime_enhancements.split(' ') else "false" }}, "draw_map_overlay": {{ meteor_draw_map_overlay|lower }}, "borders_color": [ - 1, - 1, - 0 + 1.0, + 1.0, + 0.0 ], "project": { "width": 2048, "height": 2048, "draw_map": {{ meteor_draw_map_overlay|lower }}, "map_overlay_colors": [ - 1, - 1, - 0 + 1.0, + 1.0, + 0.0 ], "individual_equalize": false, "config": { @@ -2403,22 +2344,22 @@ "max": 155.2782819316993 } }, - "autogen": true, "geo_correct": true, + "autogen": {{ "true" if "MD" in meteor_nighttime_enhancements.split(' ') else "false" }}, "draw_map_overlay": {{ meteor_draw_map_overlay|lower }}, "borders_color": [ - 1, - 1, - 0 + 1.0, + 1.0, + 0.0 ], "project": { "width": 2048, "height": 2048, "draw_map": {{ meteor_draw_map_overlay|lower }}, "map_overlay_colors": [ - 1, - 1, - 0 + 1.0, + 1.0, + 0.0 ], "individual_equalize": false, "config": { @@ -2443,22 +2384,22 @@ }, "description": "descriptions/BD.md", "lut": "lut/cal/WXtoImg-BD.png", - "autogen": true, "geo_correct": true, + "autogen": {{ "true" if "BD" in meteor_nighttime_enhancements.split(' ') else "false" }}, "draw_map_overlay": {{ meteor_draw_map_overlay|lower }}, "borders_color": [ - 1, - 1, - 0 + 1.0, + 1.0, + 0.0 ], "project": { "width": 2048, "height": 2048, "draw_map": {{ meteor_draw_map_overlay|lower }}, "map_overlay_colors": [ - 1, - 1, - 0 + 1.0, + 1.0, + 0.0 ], "individual_equalize": false, "config": { @@ -2483,22 +2424,22 @@ }, "description": "descriptions/CC.md", "lut": "lut/cal/WXtoImg-CC.png", - "autogen": true, "geo_correct": true, + "autogen": {{ "true" if "CC" in meteor_nighttime_enhancements.split(' ') else "false" }}, "draw_map_overlay": {{ meteor_draw_map_overlay|lower }}, "borders_color": [ - 1, - 1, - 0 + 1.0, + 1.0, + 0.0 ], "project": { "width": 2048, "height": 2048, "draw_map": {{ meteor_draw_map_overlay|lower }}, "map_overlay_colors": [ - 1, - 1, - 0 + 1.0, + 1.0, + 0.0 ], "individual_equalize": false, "config": { @@ -2523,22 +2464,22 @@ }, "description": "descriptions/EC.md", "lut": "lut/cal/WXtoImg-EC.png", - "autogen": true, "geo_correct": true, + "autogen": {{ "true" if "EC" in meteor_nighttime_enhancements.split(' ') else "false" }}, "draw_map_overlay": {{ meteor_draw_map_overlay|lower }}, "borders_color": [ - 1, - 1, - 0 + 1.0, + 1.0, + 0.0 ], "project": { "width": 2048, "height": 2048, "draw_map": {{ meteor_draw_map_overlay|lower }}, "map_overlay_colors": [ - 1, - 1, - 0 + 1.0, + 1.0, + 0.0 ], "individual_equalize": false, "config": { @@ -2563,22 +2504,22 @@ }, "description": "descriptions/HE.md", "lut": "lut/cal/WXtoImg-HE.png", - "autogen": true, "geo_correct": true, + "autogen": {{ "true" if "HE" in meteor_nighttime_enhancements.split(' ') else "false" }}, "draw_map_overlay": {{ meteor_draw_map_overlay|lower }}, "borders_color": [ - 1, - 1, - 0 + 1.0, + 1.0, + 0.0 ], "project": { "width": 2048, "height": 2048, "draw_map": {{ meteor_draw_map_overlay|lower }}, "map_overlay_colors": [ - 1, - 1, - 0 + 1.0, + 1.0, + 0.0 ], "individual_equalize": false, "config": { @@ -2603,22 +2544,22 @@ }, "description": "descriptions/HF.md", "lut": "lut/cal/WXtoImg-HF.png", - "autogen": true, "geo_correct": true, + "autogen": {{ "true" if "HF" in meteor_nighttime_enhancements.split(' ') else "false" }}, "draw_map_overlay": {{ meteor_draw_map_overlay|lower }}, "borders_color": [ - 1, - 1, - 0 + 1.0, + 1.0, + 0.0 ], "project": { "width": 2048, "height": 2048, "draw_map": {{ meteor_draw_map_overlay|lower }}, "map_overlay_colors": [ - 1, - 1, - 0 + 1.0, + 1.0, + 0.0 ], "individual_equalize": false, "config": { @@ -2643,22 +2584,22 @@ }, "description": "descriptions/JF.md", "lut": "lut/cal/WXtoImg-JF.png", - "autogen": true, "geo_correct": true, + "autogen": {{ "true" if "JF" in meteor_nighttime_enhancements.split(' ') else "false" }}, "draw_map_overlay": {{ meteor_draw_map_overlay|lower }}, "borders_color": [ - 1, - 1, - 0 + 1.0, + 1.0, + 0.0 ], "project": { "width": 2048, "height": 2048, "draw_map": {{ meteor_draw_map_overlay|lower }}, "map_overlay_colors": [ - 1, - 1, - 0 + 1.0, + 1.0, + 0.0 ], "individual_equalize": false, "config": { @@ -2683,22 +2624,22 @@ }, "description": "descriptions/JJ.md", "lut": "lut/cal/WXtoImg-JJ.png", - "autogen": true, "geo_correct": true, + "autogen": {{ "true" if "JJ" in meteor_nighttime_enhancements.split(' ') else "false" }}, "draw_map_overlay": {{ meteor_draw_map_overlay|lower }}, "borders_color": [ - 1, - 1, - 0 + 1.0, + 1.0, + 0.0 ], "project": { "width": 2048, "height": 2048, "draw_map": {{ meteor_draw_map_overlay|lower }}, "map_overlay_colors": [ - 1, - 1, - 0 + 1.0, + 1.0, + 0.0 ], "individual_equalize": false, "config": { @@ -2723,22 +2664,62 @@ }, "description": "descriptions/TA.md", "lut": "lut/cal/WXtoImg-TA.png", - "autogen": true, "geo_correct": true, + "autogen": {{ "true" if "TA" in meteor_nighttime_enhancements.split(' ') else "false" }}, "draw_map_overlay": {{ meteor_draw_map_overlay|lower }}, "borders_color": [ - 1, - 1, - 0 + 1.0, + 1.0, + 0.0 ], "project": { "width": 2048, "height": 2048, "draw_map": {{ meteor_draw_map_overlay|lower }}, "map_overlay_colors": [ - 1, - 1, - 0 + 1.0, + 1.0, + 0.0 + ], + "individual_equalize": false, + "config": { + "type": "stereo", + "lat0": {{ latitude }}, + "lon0": {{ longitude }}, + "scalar_x": 2000, + "scalar_y": -2000, + "offset_x": -2048000, + "offset_y": 2048000 + } + } + }, + "Cloud Top IR": { + "channels": "cch5", + "description": "descriptions/CloudTopIR.md", + "lut": "lut/cal/CloudTopIR.png", + "geo_correct": true, + "calib_cfg": { + "cch4": { + "type": "temperature", + "min": 183.15, + "max": 323.15 + } + }, + "autogen": {{ "true" if "enhanced-IR" in meteor_nighttime_enhancements.split(' ') else "false" }}, + "draw_map_overlay": {{ meteor_draw_map_overlay|lower }}, + "borders_color": [ + 1.0, + 1.0, + 0.0 + ], + "project": { + "width": 2048, + "height": 2048, + "draw_map": {{ meteor_draw_map_overlay|lower }}, + "map_overlay_colors": [ + 1.0, + 1.0, + 0.0 ], "individual_equalize": false, "config": { @@ -2756,22 +2737,29 @@ "channels": "cch5", "description": "descriptions/EnhancedIR.md", "lut": "lut/cal/EnhancedIR.png", - "autogen": true, "geo_correct": true, + "calib_cfg": { + "cch5": { + "type": "temperature", + "min": 200, + "max": 300 + } + }, + "autogen": {{ "true" if "enhanced-IR" in meteor_nighttime_enhancements.split(' ') else "false" }}, "draw_map_overlay": {{ meteor_draw_map_overlay|lower }}, "borders_color": [ - 1, - 1, - 0 + 1.0, + 1.0, + 0.0 ], "project": { "width": 2048, "height": 2048, "draw_map": {{ meteor_draw_map_overlay|lower }}, "map_overlay_colors": [ - 1, - 1, - 0 + 1.0, + 1.0, + 0.0 ], "individual_equalize": false, "config": { @@ -2783,12 +2771,20 @@ "offset_x": -2048000, "offset_y": 2048000 } - }, + } + }, + "Enhanced IR (Transparent)": { + "equation": "cch5, 0, 0, cch5 > 0.99 ? 1 : 0", + "description": "descriptions/EnhancedIR.md", + "autogen": false, + "geo_correct": true, + "apply_lut": true, + "invert": true, "calib_cfg": { "cch5": { "type": "temperature", "min": 200, - "max": 300 + "max": 241 } } }, @@ -2796,22 +2792,29 @@ "channels": "cch5", "description": "descriptions/ColorGeneralIR.md", "lut": "lut/cal/Multispectral.png", - "autogen": true, "geo_correct": true, + "calib_cfg": { + "cch5": { + "type": "temperature", + "min": 180, + "max": 320 + } + }, + "autogen": {{ "true" if "enhanced-IR" in meteor_nighttime_enhancements.split(' ') else "false" }}, "draw_map_overlay": {{ meteor_draw_map_overlay|lower }}, "borders_color": [ - 1, - 1, - 0 + 1.0, + 1.0, + 0.0 ], "project": { "width": 2048, "height": 2048, "draw_map": {{ meteor_draw_map_overlay|lower }}, "map_overlay_colors": [ - 1, - 1, - 0 + 1.0, + 1.0, + 0.0 ], "individual_equalize": false, "config": { @@ -2823,35 +2826,35 @@ "offset_x": -2048000, "offset_y": 2048000 } - }, - "calib_cfg": { - "cch5": { - "type": "temperature", - "min": 180, - "max": 320 - } } }, "Color convection longwave IR": { "channels": "cch5", "description": "descriptions/ConvectionLWIR.md", "lut": "lut/cal/ConvectionLWIR.png", - "autogen": true, "geo_correct": true, + "calib_cfg": { + "cch5": { + "type": "temperature", + "min": 180, + "max": 320 + } + }, + "autogen": {{ "true" if "enhanced-IR" in meteor_nighttime_enhancements.split(' ') else "false" }}, "draw_map_overlay": {{ meteor_draw_map_overlay|lower }}, "borders_color": [ - 1, - 1, - 0 + 1.0, + 1.0, + 0.0 ], "project": { "width": 2048, "height": 2048, "draw_map": {{ meteor_draw_map_overlay|lower }}, "map_overlay_colors": [ - 1, - 1, - 0 + 1.0, + 1.0, + 0.0 ], "individual_equalize": false, "config": { @@ -2863,42 +2866,35 @@ "offset_x": -2048000, "offset_y": 2048000 } - }, - "calib_cfg": { - "cch5": { - "type": "temperature", - "min": 180, - "max": 320 - } } }, "MCIR": { "channels": "ch4", "cpp": "underlay_with_clouds", "description": "descriptions/MCIR.md", + "geo_correct": true, "vars": { - "minoffset": 0, - "scalar": 1, - "thresold": 0, + "minoffset": 0.0, + "scalar": 1.0, + "thresold": 0.0, "blend": true, "invert": true }, - "autogen": true, - "geo_correct": true, + "autogen": {{ "true" if "MCIR" in meteor_nighttime_enhancements.split(' ') else "false" }}, "draw_map_overlay": {{ meteor_draw_map_overlay|lower }}, "borders_color": [ - 1, - 1, - 0 + 1.0, + 1.0, + 0.0 ], "project": { "width": 2048, "height": 2048, "draw_map": {{ meteor_draw_map_overlay|lower }}, "map_overlay_colors": [ - 1, - 1, - 0 + 1.0, + 1.0, + 0.0 ], "individual_equalize": false, "config": { @@ -2916,29 +2912,29 @@ "channels": "ch1", "cpp": "underlay_with_clouds", "description": "descriptions/MSA.md", + "geo_correct": true, "vars": { - "minoffset": 0, - "scalar": 1, - "thresold": 0, + "minoffset": 0.0, + "scalar": 1.0, + "thresold": 0.0, "blend": true, "invert": false }, - "autogen": true, - "geo_correct": true, + "autogen": {{ "true" if "MSA" in meteor_daytime_enhancements.split(' ') else "false" }}, "draw_map_overlay": {{ meteor_draw_map_overlay|lower }}, "borders_color": [ - 1, - 1, - 0 + 1.0, + 1.0, + 0.0 ], "project": { "width": 2048, "height": 2048, "draw_map": {{ meteor_draw_map_overlay|lower }}, "map_overlay_colors": [ - 1, - 1, - 0 + 1.0, + 1.0, + 0.0 ], "individual_equalize": false, "config": { @@ -2955,22 +2951,22 @@ "Channel 4 Equalized": { "equation": "1 - ch4", "individual_equalize": true, - "autogen": true, - "geo_correct": true, + "geo_correct": false, + "autogen": {{ "true" if "enhanced-IR" in meteor_nighttime_enhancements.split(' ') else "false" }}, "draw_map_overlay": {{ meteor_draw_map_overlay|lower }}, "borders_color": [ - 1, - 1, - 0 + 1.0, + 1.0, + 0.0 ], "project": { "width": 2048, "height": 2048, "draw_map": {{ meteor_draw_map_overlay|lower }}, "map_overlay_colors": [ - 1, - 1, - 0 + 1.0, + 1.0, + 0.0 ], "individual_equalize": false, "config": { @@ -3053,9 +3049,9 @@ }, "draw_map_overlay": true, "borders_color": [ - 1, - 1, - 1 + 1.0, + 1.0, + 1.0 ], "autogen": true }, @@ -3067,9 +3063,9 @@ "lut": "goes/abi/usradioguycustomlut.png" }, "borders_color": [ - 1, - 1, - 1 + 1.0, + 1.0, + 1.0 ], "autogen": false // Needs to be optimized... }, @@ -3097,9 +3093,9 @@ }, "lua": "scripted_compos/split_difference.lua", "borders_color": [ - 1, - 1, - 1 + 1.0, + 1.0, + 1.0 ], "autogen": false }, @@ -3141,9 +3137,9 @@ }, "lut": "lut/cal/abi_ir_11-15.png", "borders_color": [ - 1, - 1, - 1 + 1.0, + 1.0, + 1.0 ], "autogen": true }, @@ -3161,9 +3157,9 @@ }, "lut": "lut/cal/abi_ir_11-15.png", "borders_color": [ - 1, - 1, - 1 + 1.0, + 1.0, + 1.0 ], "autogen": true }, @@ -3181,9 +3177,9 @@ }, "lut": "lut/cal/abi_ir_11-15.png", "borders_color": [ - 1, - 1, - 1 + 1.0, + 1.0, + 1.0 ], "autogen": true }, @@ -3200,9 +3196,9 @@ }, "lut": "lut/cal/Dirty_IR_CIRA.png", "borders_color": [ - 1, - 1, - 1 + 1.0, + 1.0, + 1.0 ], "autogen": true }, @@ -3220,9 +3216,9 @@ }, "lut": "lut/cal/abi_wv_8-10.png", "borders_color": [ - 1, - 0, - 0 + 1.0, + 0.0, + 0.0 ], "autogen": true }, @@ -3240,9 +3236,9 @@ }, "lut": "lut/cal/abi_wv_8-10.png", "borders_color": [ - 1, - 0, - 0 + 1.0, + 0.0, + 0.0 ], "autogen": true }, @@ -3259,9 +3255,9 @@ }, "lut": "lut/cal/abi_ir_7.png", "borders_color": [ - 0, - 0, - 0 + 0.0, + 0.0, + 0.0 ], "autogen": true }, @@ -3270,9 +3266,9 @@ "draw_map_overlay": true, "remove_background": true, "borders_color": [ - 1, - 1, - 1 + 1.0, + 1.0, + 1.0 ], "calib_cfg": { "cch2": { @@ -3293,9 +3289,9 @@ "remove_background": true, "draw_map_overlay": true, "borders_color": [ - 0, - 0, - 0 + 0.0, + 0.0, + 0.0 ], "calib_cfg": { "cch7": { @@ -3321,9 +3317,9 @@ "draw_map_overlay": true, "remove_background": true, "borders_color": [ - 1, - 1, - 1 + 1.0, + 1.0, + 1.0 ], "calib_cfg": { "cch2": { @@ -3371,9 +3367,9 @@ "cpp": "goes_abi_false_color", "draw_map_overlay": true, "borders_color": [ - 1, - 1, - 1 + 1.0, + 1.0, + 1.0 ] }, "Day Cloud Convection": { @@ -3381,9 +3377,9 @@ "draw_map_overlay": true, "remove_background": true, "borders_color": [ - 1, - 1, - 1 + 1.0, + 1.0, + 1.0 ], "calib_cfg": { "cch3": { @@ -3413,9 +3409,9 @@ }, "lut": "lut/cal/abi_wv_8-10.png", "borders_color": [ - 1, - 0, - 0 + 1.0, + 0.0, + 0.0 ] }, "Clean Longwave IR Window Band": { @@ -3432,9 +3428,9 @@ }, "lut": "lut/cal/abi_ir_11-15.png", "borders_color": [ - 1, - 1, - 1 + 1.0, + 1.0, + 1.0 ] } } @@ -3450,15 +3446,15 @@ "vars": { "minoffset": 0.3, "scalar": 1.2, - "thresold": 0, + "thresold": 0.0, "blend": true, "invert": true }, "draw_map_overlay": true, "borders_color": [ - 1, - 1, - 0 + 1.0, + 1.0, + 0.0 ], "autogen": false }, @@ -3476,9 +3472,9 @@ }, "lut": "lut/cal/abi_ir_11-15.png", "borders_color": [ - 1, - 1, - 1 + 1.0, + 1.0, + 1.0 ], "autogen": true }, @@ -3496,9 +3492,9 @@ }, "lut": "lut/cal/abi_ir_11-15.png", "borders_color": [ - 1, - 1, - 1 + 1.0, + 1.0, + 1.0 ], "autogen": true }, @@ -3515,9 +3511,9 @@ }, "lut": "lut/cal/Dirty_IR_CIRA.png", "borders_color": [ - 1, - 1, - 1 + 1.0, + 1.0, + 1.0 ], "autogen": true }, @@ -3535,9 +3531,9 @@ }, "lut": "lut/cal/abi_wv_8-10.png", "borders_color": [ - 1, - 0, - 0 + 1.0, + 0.0, + 0.0 ], "autogen": true }, @@ -3640,6 +3636,115 @@ } } }, + "airs": { + "handler": "image_handler", + "name": "AIRS", + "rgb_composites": { + "λ=4.3µm (CO2 absorption 1a)": { + "equation": "ch366", + "individual_equalize": true + }, + "λ=4.4µm (CO2 absorption 1b + H2O line)": { + "equation": "ch420", + "individual_equalize": true + }, + "λ=7.7µm (Methane absorption)": { + "equation": "ch980", + "individual_equalize": true + }, + "λ=14.9µm (CO2 absorption 2)": { + "equation": "ch2292", + "individual_equalize": true + }, + "λ=10.8µm (Window)": { + "equation": "ch1821", + "individual_equalize": true + }, + "AVHRR 3b45 IR False Color": { + "equation": "ch4, ch1569, ch1821", + "individual_equalize": true, + "invert": true + }, + "AVHRR 543b IR False Color": { + "equation": "ch1821, ch1569, ch4", + "individual_equalize": true, + "invert": true + }, + "HIRS False Color": { + "equation": "ch2148, ch2193, ch2239", + "description": "descriptions/sounders/HIRSFalseColor.md", + "individual_equalize": true, + "invert": true + }, + "6.2µm Water Vapor RGB": { + "equation": "ch517, ch521, ch527", + "individual_equalize": true, + "invert": true + }, + "7.35 µm Water Vapor RGB": { + "equation": "ch845, ch857, ch863", + "individual_equalize": true, + "invert": true + }, + "Airmass RGB": { + "equation": "(1-ch515)-(1-ch857), (1-ch1310)-(1-ch1569), (1-ch515)", + "individual_equalize": true + }, + "Clouds Only (N2O Sounding)": { + "equation": "1-ch481, 1-ch570, 1", + "description": "descriptions/sounders/CloudOnlyN2O.md", + "individual_equalize": true + }, + "Mid Level Water Vapor": { + "equation": "1-ch868", + "description": "descriptions/sounders/MLWV.md", + "individual_equalize": true, + "apply_lut": true + }, + "Mid Stratosphere CO2 Temperature": { + "equation": "ch2256", + "description": "descriptions/sounders/MidStratoCO2T.md", + "individual_equalize": true, + "apply_lut": true + }, + "Low Stratosphere CO2 Temperature": { + "equation": "ch2239", + "description": "descriptions/sounders/LowStratoCO2T.md", + "individual_equalize": true, + "apply_lut": true + }, + "Top Troposphere CO2 Temperature": { + "equation": "ch2193", + "description": "descriptions/sounders/TopTropoCO2T.md", + "individual_equalize": true, + "apply_lut": true + }, + "High Troposphere CO2 Temperature": { + "equation": "ch2148", + "description": "descriptions/sounders/HighTropoCO2T.md", + "individual_equalize": true, + "apply_lut": true + }, + "Mid Troposphere CO2/H2O Temperature": { + "equation": "ch2088", + "description": "descriptions/sounders/MidTropoCO2H2OT.md", + "individual_equalize": true, + "apply_lut": true + }, + "Low Troposphere CO2/H2O Temperature": { + "equation": "ch2038", + "description": "descriptions/sounders/LowTropoCO2H2OT.md", + "individual_equalize": true, + "apply_lut": true + }, + "Cloud Detection Channel": { + "equation": "1-ch236", + "description": "descriptions/sounders/CloudDetection.md", + "individual_equalize": true, + "apply_lut": true + } + } + }, "modis": { "handler": "image_handler", "name": "MODIS", @@ -3881,6 +3986,20 @@ "autogen": false, "geo_correct": true }, + "Cloud Top IR": { + "channels": "cch31", + "description": "descriptions/CloudTopIR.md", + "lut": "lut/cal/CloudTopIR.png", + "autogen": true, + "geo_correct": true, + "calib_cfg": { + "cch4": { + "type": "temperature", + "min": 183.15, + "max": 323.15 + } + } + }, "Enhanced IR": { "channels": "cch31", "description": "descriptions/EnhancedIR.md", @@ -3979,9 +4098,9 @@ "individual_equalize": true, "draw_map_overlay": true, "borders_color": [ - 1, - 1, - 0 + 1.0, + 1.0, + 0.0 ] } } @@ -4004,7 +4123,7 @@ "equation": "ch17, ch19, ch18", "geo_correct": true }, - "9.12.11": { + "MERSI Airmass": { "equation": "ch9, ch12, ch11", "individual_equalize": true, "geo_correct": true @@ -4050,9 +4169,22 @@ "handler": "image_handler", "name": "MERSI-LL", "rgb_composites": { - "338": { + "AVHRR 221 False Color": { "equation": "ch3, ch3, ch8", "white_balance": true, + "geo_correct": true, + "description": "descriptions/221.md" + + }, + "AVHRR 124 False Color": { + "equation": "ch3, ch8, 1-ch1", + "individual_equalize": true, + "description": "descriptions/124.md", + "geo_correct": true + }, + "MERSI-LL Airmass": { + "equation": "ch8, ch6, ch4", + "individual_equalize": true, "geo_correct": true }, "IR/DNB Mix": { @@ -4082,9 +4214,9 @@ "individual_equalize": true, "draw_map_overlay": true, "borders_color": [ - 1, - 1, - 0 + 1.0, + 1.0, + 0.0 ] }, "AVHRR 543b IR False Color": { @@ -4253,7 +4385,8 @@ }, "Microwave Airmass": { "equation": "ch11,ch12,ch13", - "individual_equalize": true + "individual_equalize": true, + "description": "descriptions/sounders/MicrowaveAirmass.md" } }, "project_channels": { @@ -4408,15 +4541,18 @@ }, "MHS 221": { "equation": "ch17,ch17,ch16", - "individual_equalize": true + "individual_equalize": true, + "description": "descriptions/sounders/MHS221.md" }, "MHS 421": { "equation": "ch20,ch17,ch16", - "individual_equalize": true + "individual_equalize": true, + "description": "descriptions/sounders/MHS221.md" }, "Microwave Airmass": { "equation": "ch18,ch19,ch20", - "individual_equalize": true + "individual_equalize": true, + "description": "descriptions/sounders/MicrowaveAirmass.md" }, "AMSU Surface Relative Temperature": { "equation": "cos(ln(ch1) + ln(ch2)+0.8)", @@ -4455,6 +4591,12 @@ "equation": "cch3^0.3, 0, 0, cch2 > 0.57 ? (cch3 < 0.5 ? 1 : 0) : 0", "apply_lut": true, "autogen": false + }, + "Rainfall (Transparent, MHS-like)": { + "equation": "(((1-cch22-cch20))-0.95)^0.25, 0, 0, (((1-cch22-cch20))-0.95)^0.25 > 0.01 ? 1 : 0", + "apply_lut": true, + "autogen": false, + "description": "descriptions/sounders/RainfallTransparent.md" } } }, diff --git a/config/settings.yml b/config/settings.yml index d35d15b11..185beac9c 100644 --- a/config/settings.yml +++ b/config/settings.yml @@ -191,8 +191,8 @@ produce_spectrogram: false #NOTE: the spectrogram option here is available fo noaa_crop_telemetry: false produce_noaa_pristine_image: false produce_noaa_pristine_histogram: false -noaa_daytime_enhancements: 'MSA MSA-precip MCIR MCIR-precip HVC-precip HVCT-precip HVC HVCT ZA therm sea CC HE HF MD BD MB JF JJ LC TA WV NO histeq' -noaa_nighttime_enhancements: 'MCIR MCIR-precip HVCT ZA therm NO TA sea histeq' +noaa_daytime_enhancements: 'MSA MSA-precip MCIR MCIR-precip HVC-precip HVCT-precip HVC HVCT ZA therm sea CC HE HF MD BD MB JF JJ LC TA WV NO histeq enhancd-IR' +noaa_nighttime_enhancements: 'MCIR MCIR-precip HVCT ZA therm NO TA sea histeq enhancd-IR' noaa_crop_toptobottom: false noaa_interpolate: false noaa_jpg_image_quality: 90 @@ -208,6 +208,8 @@ noaa_map_state_border_enable: true noaa_map_state_border_color: "0xffff00" wxtoimg_map_offset: 10.5 #Change this value only if you see map offsets from the ground on WXtoImg NOAA images +meteor_daytime_enhancements: '221 321 124 MSA MCIR MCIR-precip HVC HVCT ZA therm sea CC HE HF MD BD MB JF JJ LC TA WV NO enhanced-IR' +meteor_nighttime_enhancements: '654 456 MCIR MCIR-precip HVC HVCT ZA therm sea CC HE HF MD BD MB JF JJ LC TA WV NO enhanced-IR' flip_meteor_image: true meteor_jpg_image_quality: 90 meteor_draw_map_overlay: true diff --git a/config/settings_schema.json b/config/settings_schema.json index 8332b8328..ac9b909ae 100644 --- a/config/settings_schema.json +++ b/config/settings_schema.json @@ -108,30 +108,41 @@ "minimum": 0, "maximum": 90 }, - "noaa_memory_threshold": { "type": "number" }, - "meteor_m2_memory_threshold": { "type": "number" }, - "use_device_string": { "type": "boolean" }, - "meteor_m2_3_80k_interleaving": { "type": "boolean" }, - "days_to_schedule_passes": { "type": "number" }, - "delete_noaa_audio": { "type": "boolean" }, - "delete_meteor_audio": { "type": "boolean" }, - "delete_files_older_than_days": { "type": "number" }, - "flip_meteor_image": { "type": "boolean" }, - "produce_spectrogram": { "type": "boolean" }, - "noaa_crop_telemetry": { "type": "boolean" }, - "image_annotation_location": { "type": "string" }, - "extend_for_annotation": { "type": "boolean" }, - "produce_noaa_pristine_image": { "type": "boolean" }, - "produce_noaa_pristine_histogram": { "type": "boolean" }, - "produce_polar_az_el_graph": { "type": "boolean" }, - "produce_polar_direction_graph": { "type": "boolean" }, - "ground_station_location": { "type": "string" }, - "show_sun_elevation": { "type": "boolean" }, - "show_pass_direction": { "type": "boolean" }, - "noaa_daytime_enhancements": { "type": "string" }, - "noaa_nighttime_enhancements": { "type": "string" }, - "noaa_crop_toptobottom": { "type": "boolean" }, - "noaa_interpolate": { "type": "boolean" }, + "noaa_memory_threshold": { "type": "number" }, + "meteor_m2_memory_threshold": { "type": "number" }, + "use_device_string": { "type": "boolean" }, + "meteor_m2_3_80k_interleaving": { "type": "boolean" }, + "days_to_schedule_passes": { "type": "number" }, + "delete_noaa_audio": { "type": "boolean" }, + "delete_meteor_audio": { "type": "boolean" }, + "delete_files_older_than_days": { "type": "number" }, + "flip_meteor_image": { "type": "boolean" }, + "produce_spectrogram": { "type": "boolean" }, + "noaa_crop_telemetry": { "type": "boolean" }, + "image_annotation_location": { "type": "string" }, + "extend_for_annotation": { "type": "boolean" }, + "produce_noaa_pristine_image": { "type": "boolean" }, + "produce_noaa_pristine_histogram": { "type": "boolean" }, + "produce_polar_az_el_graph": { "type": "boolean" }, + "produce_polar_direction_graph": { "type": "boolean" }, + "ground_station_location": { "type": "string" }, + "show_sun_elevation": { "type": "boolean" }, + "show_pass_direction": { "type": "boolean" }, + "noaa_daytime_enhancements": { "type": "string" }, + "noaa_nighttime_enhancements": { "type": "string" }, + "noaa_crop_toptobottom": { "type": "boolean" }, + "noaa_interpolate": { "type": "boolean" }, + "noaa_map_crosshair_enable": { "type": "boolean" }, + "noaa_map_crosshair_color": { "type": "string" }, + "noaa_map_grid_degrees": { "type": "number" }, + "noaa_map_grid_color": { "type": "string" }, + "noaa_map_country_border_enable": { "type": "boolean" }, + "noaa_map_country_border_color": { "type": "string" }, + "noaa_map_state_border_enable": { "type": "boolean" }, + "noaa_map_state_border_color": { "type": "string" }, + "wxtoimg_map_offset": { "type": "number" }, + "noaa_thermal_temp_overlay": { "type": "boolean" }, + "noaa_thermal_temp_overlay_location": { "type": "boolean" }, "noaa_jpg_image_quality": { "type": "number", "minimum": 0, @@ -142,28 +153,17 @@ "minimum": 0, "maximum": 100 }, + "meteor_daytime_enhancements": { "type": "string" }, + "meteor_nighttime_enhancements": { "type": "string" }, "meteor_create_equidistant_projection": { "type": "boolean" }, "meteor_create_mercator_projection": { "type": "boolean" }, "meteor_create_spreaded_images_without_overlay": { "type": "boolean" }, "meteor_create_rain_probability_overlay": { "type": "boolean" }, - "noaa_map_crosshair_enable": { "type": "boolean" }, "meteor_map_crosshair_enable": { "type": "boolean" }, - "noaa_map_crosshair_color": { "type": "string" }, "meteor_map_crosshair_color": { "type": "string" }, - "noaa_map_grid_degrees": { "type": "number" }, "meteor_draw_map_overlay": { "type": "boolean" }, "meteor_draw_cities": { "type": "boolean" }, - "noaa_map_grid_color": { "type": "string" }, - "noaa_map_country_border_enable": { "type": "boolean" }, - "noaa_map_country_border_color": { "type": "string" }, "meteor_map_country_border_color": { "type": "string" }, - "noaa_map_state_border_enable": { "type": "boolean" }, - "noaa_map_state_border_color": { "type": "string" }, - "wxtoimg_map_offset": { "type": "number" }, - "noaa_thermal_temp_overlay": { "type": "boolean" }, - "noaa_thermal_temp_overlay_location": { - "type": "string" - }, "lang_setting": { "type": "string", "enum": [ "ar", "bg", "cn", "de", "en", "es", "fr", "lt", "nl", "pt", "sr", "ru", "it", "hu", "gr", "kr", "ro" ] @@ -294,6 +294,8 @@ "show_pass_direction", "noaa_daytime_enhancements", "noaa_nighttime_enhancements", + "meteor_daytime_enhancements", + "meteor_nighttime_enhancements", "noaa_crop_toptobottom", "noaa_interpolate", "noaa_map_crosshair_enable", diff --git a/webpanel/App/Models/Capture.php b/webpanel/App/Models/Capture.php index 0a35d5600..192811e32 100644 --- a/webpanel/App/Models/Capture.php +++ b/webpanel/App/Models/Capture.php @@ -70,7 +70,8 @@ public function getEnhancements($id) { switch($pass['sat_type']) { case 0: // Meteor if ($pass['daylight_pass'] == 1) { - $enhancements = [ + $enhancements = array_map(function($x) { return "-" . $x . ".jpg"; }, explode(' ', Config::METEOR_DAY_ENHANCEMENTS)); + $additional_enhancements = [ '-MSA_corrected.jpg', '-MSA_projected.jpg', '-MCIR_corrected.jpg', @@ -143,7 +144,8 @@ public function getEnhancements($id) { '-mercator_rain_68_composite.jpg' ]; } else { - $enhancements = [ + $enhancements = array_map(function($x) { return "-" . $x . ".jpg"; }, explode(' ', Config::METEOR_NIGHT_ENHANCEMENTS)); + $additional_enhancements = [ '-MCIR_corrected.jpg', '-MCIR_projected.jpg', '-654_corrected.jpg', @@ -190,6 +192,7 @@ public function getEnhancements($id) { '-mercator_rain_68_composite.jpg' ]; } + $enhancements = array_merge($enhancements, $additional_enhancements); break; case 1: // NOAA if ($pass['daylight_pass'] == 1) { From cca2151ba181713b727131cc31ec703d4effb2ab Mon Sep 17 00:00:00 2001 From: MihajloPi Date: Fri, 6 Sep 2024 15:17:49 +0200 Subject: [PATCH 2/5] Ooops... --- config/settings_schema.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/settings_schema.json b/config/settings_schema.json index ac9b909ae..4e0fc886d 100644 --- a/config/settings_schema.json +++ b/config/settings_schema.json @@ -142,7 +142,7 @@ "noaa_map_state_border_color": { "type": "string" }, "wxtoimg_map_offset": { "type": "number" }, "noaa_thermal_temp_overlay": { "type": "boolean" }, - "noaa_thermal_temp_overlay_location": { "type": "boolean" }, + "noaa_thermal_temp_overlay_location": { "type": "string" }, "noaa_jpg_image_quality": { "type": "number", "minimum": 0, From 8f4ae31a3f72358795d28e2e65984b769b9b84ec Mon Sep 17 00:00:00 2001 From: MihajloPi - YU4MPI Date: Sat, 7 Sep 2024 01:36:22 +0200 Subject: [PATCH 3/5] Ooops... Forgot to add Meteor enhancements in PHP --- ansible/roles/webserver/templates/Config.php.j2 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ansible/roles/webserver/templates/Config.php.j2 b/ansible/roles/webserver/templates/Config.php.j2 index c3c7bd4b7..eac1743dc 100644 --- a/ansible/roles/webserver/templates/Config.php.j2 +++ b/ansible/roles/webserver/templates/Config.php.j2 @@ -51,6 +51,8 @@ class Config { # which enhancements to display for day/night const NOAA_DAY_ENHANCEMENTS = '{{ noaa_daytime_enhancements }}'; const NOAA_NIGHT_ENHANCEMENTS = '{{ noaa_nighttime_enhancements }}'; + const METEOR_DAY_ENHANCEMENTS = '{{ meteor_daytime_enhancements }}'; + const METEOR_NIGHT_ENHANCEMENTS = '{{ meteor_nighttime_enhancements }}'; # admin endpoint auth const LOCK_ADMIN = '{{ lock_admin_page|lower }}'; From 542aecd3045f82aff23359bc6b9b6bb423ced6f0 Mon Sep 17 00:00:00 2001 From: MihajloPi - YU4MPI Date: Sat, 7 Sep 2024 11:02:48 +0200 Subject: [PATCH 4/5] Ooops... --- config/settings.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/settings.yml b/config/settings.yml index 185beac9c..04c004279 100644 --- a/config/settings.yml +++ b/config/settings.yml @@ -191,8 +191,8 @@ produce_spectrogram: false #NOTE: the spectrogram option here is available fo noaa_crop_telemetry: false produce_noaa_pristine_image: false produce_noaa_pristine_histogram: false -noaa_daytime_enhancements: 'MSA MSA-precip MCIR MCIR-precip HVC-precip HVCT-precip HVC HVCT ZA therm sea CC HE HF MD BD MB JF JJ LC TA WV NO histeq enhancd-IR' -noaa_nighttime_enhancements: 'MCIR MCIR-precip HVCT ZA therm NO TA sea histeq enhancd-IR' +noaa_daytime_enhancements: 'MSA MSA-precip MCIR MCIR-precip HVC-precip HVCT-precip HVC HVCT ZA therm sea CC HE HF MD BD MB JF JJ LC TA WV NO histeq enhanced-IR' +noaa_nighttime_enhancements: 'MCIR MCIR-precip HVCT ZA therm NO TA sea histeq enhanced-IR' noaa_crop_toptobottom: false noaa_interpolate: false noaa_jpg_image_quality: 90 From f50d86d26476948feb31d204d83dd4ebf5c446fe Mon Sep 17 00:00:00 2001 From: MihajloPi Date: Mon, 9 Sep 2024 16:08:09 +0200 Subject: [PATCH 5/5] Skipping "enhanced-IR" enhancement when using WXtoImg --- scripts/receive_noaa.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/receive_noaa.sh b/scripts/receive_noaa.sh index 4ea859a29..d75b017a6 100755 --- a/scripts/receive_noaa.sh +++ b/scripts/receive_noaa.sh @@ -261,7 +261,9 @@ if [ "$NOAA_DECODER" == "wxtoimg" ]; then export ENHANCEMENT=$enhancement log "Decoding image" "INFO" - if [ $enhancement == "avi" ]; then + if [ $enhancement == "enhanced-IR" ]; then + continue + elif [ $enhancement == "avi" ]; then ${IMAGE_PROC_DIR}/noaa_avi.sh $map_overlay "${RAMFS_AUDIO_BASE}.wav" 2>&1 | grep -Ev "invalid pointer|Aborted" >> $NOAA_LOG else ${IMAGE_PROC_DIR}/noaa_enhancements.sh $map_overlay "${RAMFS_AUDIO_BASE}.wav" "${IMAGE_FILE_BASE}-$enhancement.jpg" $enhancement 2>&1 | grep -Ev "invalid pointer|Aborted" >> $NOAA_LOG