From 024225a0357d42401aefe6211c4b47a981184bb3 Mon Sep 17 00:00:00 2001 From: Quentin CAUDRON Date: Fri, 29 Sep 2023 12:00:39 -0700 Subject: [PATCH] Add YSF to Chirp and others --- assets/programming_files/d878-scanlist.csv | 2 +- assets/programming_files/d878.csv | 2 ++ assets/programming_files/d878.zip | Bin 5172 -> 5330 bytes assets/programming_files/icom.csv | 2 ++ assets/programming_files/rr_frequencies.csv | 2 ++ index.md | 2 +- scripts/programming_files.py | 14 +++++++------- 7 files changed, 15 insertions(+), 9 deletions(-) diff --git a/assets/programming_files/d878-scanlist.csv b/assets/programming_files/d878-scanlist.csv index f73424d..207c574 100644 --- a/assets/programming_files/d878-scanlist.csv +++ b/assets/programming_files/d878-scanlist.csv @@ -1,4 +1,4 @@ No.,Scan List Name,Scan Channel Member,Scan Channel Member RX Frequency,Scan Channel Member TX Frequency 1,Metro,WW7PSR|WW7PSR|NC7G|WA7ST|W7ACS|W7ACS|W7ACS|W7ACS|W7ACS|W7ACS|W7ACS|W7MIR|W7MIR|KC7Z|WW7SEA|W7AUX|W7AUX|K7NWS|K7NWS|K7LWH|K7LWH|W7FLY|NE7MC|WW7STR|WW7STR|WW7STR|WA7FW|WA7FW|WA7FW|KA7EOC|K7LED|WA7HJR|W7NPC,146.96|440.775|146.66|443.1|442.3|444.55|442.875|443.475|443.65|440.6|443.2|147.16|440.15|444.075|444.7|442.825|440.3|145.33|442.075|145.49|441.075|443.925|442.0|146.875|441.55|443.05|147.04|146.76|442.95|145.35|146.82|444.65|444.475,146.36|445.775|146.06|448.1|447.3|449.55|447.875|448.475|448.65|445.6|448.2|147.76|445.15|449.075|449.7|447.825|445.3|144.73|447.075|144.89|446.075|448.925|447.0|146.275|446.55|448.05|147.64|146.16|447.95|144.75|146.22|449.65|449.475 -2,North,K7DK|N7GDE|W7JCR|AA7MI|W7AVM|N7KN|K7DK|K7SKW|K7SKW|K7SKW|K7SKW|WA7LAW|K6MBY,440.95|145.19|145.15|440.725|146.86|441.425|440.95|146.74|444.05|443.75|147.16|147.18|444.9,445.95|144.59|144.55|445.725|146.26|446.425|445.95|146.14|449.05|448.75|147.76|147.78|449.9 +2,North,K7DK|N7GDE|W7JCR|AA7MI|W7AVM|N7KN|K7DK|K7SKW|K7SKW|K7SKW|K7SKW|K7SKW|WA7LAW|WA7LAW|K6MBY,440.95|145.19|145.15|440.725|146.86|441.425|440.95|146.74|444.05|443.75|147.16|443.65|147.18|444.575|444.9,445.95|144.59|144.55|445.725|146.26|446.425|445.95|146.14|449.05|448.75|147.76|448.65|147.78|449.575|449.9 3,South,NT7H|NT7H|N3KPU|KE7YYD|WA7FW|N7SK|N7SK|NM7E|W7EAT|W7EAT|W7AAO,147.36|441.4|145.23|442.75|442.925|146.72|443.25|145.17|146.7|442.725|145.37,147.96|446.4|144.63|447.75|447.925|146.12|448.25|144.57|146.1|447.725|144.77 diff --git a/assets/programming_files/d878.csv b/assets/programming_files/d878.csv index 7670051..bccaeec 100644 --- a/assets/programming_files/d878.csv +++ b/assets/programming_files/d878.csv @@ -44,10 +44,12 @@ No.,Channel Name,Receive Frequency,Transmit Frequency,Channel Type,DMR MODE,Band 56,K7SKW,444.05,449.05,A-Analog,0,25K,103.5,,,1,,North 57,K7SKW,443.75,448.75,A-Analog,0,25K,103.5,,,1,,North 58,K7SKW,147.16,147.76,A-Analog,0,25K,103.5,,,1,,North +59,K7SKW,443.65,448.65,A-Analog,0,25K,103.5,,,1,,North 60,KA7EOC,145.35,144.75,A-Analog,0,25K,103.5,,,1,,Metro 61,N7SK,146.72,146.12,A-Analog,0,25K,103.5,,,1,,South 62,N7SK,443.25,448.25,A-Analog,0,25K,100.0,,,1,,South 64,WA7LAW,147.18,147.78,A-Analog,0,25K,103.5,,,1,,North +65,WA7LAW,444.575,449.575,A-Analog,0,25K,103.5,,,1,,North 66,NM7E,145.17,144.57,A-Analog,0,25K,103.5,,,1,,South 68,W7EAT,146.7,146.1,A-Analog,0,25K,103.5,,,1,,South 70,W7EAT,442.725,447.725,A-Analog,0,25K,103.5,,,1,,South diff --git a/assets/programming_files/d878.zip b/assets/programming_files/d878.zip index cc9fd38f8168f09d8f24956b9d684c86416c3dc3..b86068ff89db69e5665d778cc714ee1b6f8303bb 100644 GIT binary patch delta 259 zcmdm@aY<7=z?+#xgaHIN6Kun4F7L@($;-g7a-;ZCE>TlU9dGks?{FOx6JtFyQy^ub zXEr&JOL_7hu7_f#I^mAyK8_$+6FpONkhG10M$*~z?I?3?FspJL<%nW+~)d5aD! z1B1@yV%{R=$@c|#CqEU45rvppV`yToXJ}CaHDj{7U>HyaXpJdY#vCLAG}YX6@?ycy zOq>amX9(Q}n+kX7>E9wo!a3*W@o;4>t?&oMhw$N%?ahxX;MS zz`(fq8E+Bu This page was last updated on Friday September 29 at 11:37. +> This page was last updated on Friday September 29 at 12:00. --- diff --git a/scripts/programming_files.py b/scripts/programming_files.py index 0a04603..1350b0b 100644 --- a/scripts/programming_files.py +++ b/scripts/programming_files.py @@ -118,9 +118,9 @@ def format_df_for_chirp(df: pd.DataFrame) -> pd.DataFrame: df = df.loc[df["Exclude"].isna()] # Only format FM channels; we can't handle DMR or D-Star at the moment - df = filter_by_mode(df, ["FM", "NBFM", "Fusion"]) # only FM repeaters + df = filter_by_mode(df, ["FM", "NBFM", "YSF"]) # only FM repeaters df.loc[df["Mode"] == "NBFM", "Mode"] = "NFM" # NBFM -> NFM for Chirp - df.loc[df["Mode"] == "Fusion", "Mode"] = "FM" # Fusion -> FM for Chirp + df.loc[df["Mode"] == "YSF", "Mode"] = "FM" # YSF -> FM for Chirp print(f"Chirp: {len(df)} compatible repeaters (out of {total_repeaters} known).") @@ -206,8 +206,8 @@ def format_df_for_d878(df: pd.DataFrame) -> pd.DataFrame: # Remove repeaters not in the contest df = df.loc[df["Exclude"].isna()] - # Select FM, DMR and Fusion (in FM compat mode) channels in the 2m or 70cm bands. - df = filter_by_mode(df, ["FM", "NBFM", "DMR", "Fusion"]) + # Select FM, DMR and YSF (in FM compat mode) channels in the 2m or 70cm bands. + df = filter_by_mode(df, ["FM", "NBFM", "DMR", "YSF"]) df = filter_by_band(df, ["2m", "70cm"]) # Set the RR number as the channel number @@ -237,7 +237,7 @@ def format_df_for_d878(df: pd.DataFrame) -> pd.DataFrame: df_878.loc[~is_dmr, "DMR MODE"] = "0" # Both DMR and NBFM are "narrow" - is_widefm = df["Mode"].isin(["FM", "Fusion"]) + is_widefm = df["Mode"].isin(["FM", "YSF"]) df_878.loc[is_widefm, "Band Width"] = "25K" df_878.loc[~is_widefm, "Band Width"] = "12.5K" @@ -291,8 +291,8 @@ def format_df_for_icom(df: pd.DataFrame) -> pd.DataFrame: # Remove repeaters not in the contest df = df.loc[df["Exclude"].isna()] - # Select FM and Fusion (in FM compat mode) channels. - df = filter_by_mode(df, ["FM", "NBFM", "Fusion", "DSTAR"]) + # Select FM and YSF (in FM compat mode) channels. + df = filter_by_mode(df, ["FM", "NBFM", "YSF", "DSTAR"]) df = filter_by_band(df, ["6m", "2m", "70cm"]) # Treat output and offset as numerical values