From 7e8c6f0247e3c9bf99a183a45f1dd24bfb28289f Mon Sep 17 00:00:00 2001 From: hugcabbage <77980779+hugcabbage@users.noreply.github.com> Date: Mon, 18 Dec 2023 16:46:38 +0800 Subject: [PATCH] openwrt: add some devices --- .github/workflows/build-openwrt.yml | 44 ++++++++++++++-------- extra-files/headers.xlsx | Bin 10442 -> 11282 bytes extra-files/tools/process_text.py | 8 ++-- preset-openwrt/headers.json | 56 +++++++++++++++++----------- 4 files changed, 67 insertions(+), 41 deletions(-) diff --git a/.github/workflows/build-openwrt.yml b/.github/workflows/build-openwrt.yml index 9551700d..771c90d8 100644 --- a/.github/workflows/build-openwrt.yml +++ b/.github/workflows/build-openwrt.yml @@ -17,26 +17,40 @@ on: required: true type: choice options: - - 'xiaomi-cr6608' - - 'xiaomi-cr6606' - - 'xiaomi-cr6609' - - 'redmi-ac2100' - - 'xiaomi-ac2100' - - 'xiaomi-4a-gigabit' - - 'xiaomi-4a-gigabit-v2' - - 'xiaomi-3g-v2' + - 'glinet-mt1300' + - 'glinet-mt300n-v2' + - 'glinet-microuter-n300' + - 'h3c-magic-nx30-pro' + - 'hiwifi-hc5962' + - 'phicomm-k2p' + - 'phicomm-k3' + - 'qihoo-360t7' + - 'qihoo-c301' + - 'tenda-ac9' + - 'xiaomi-ax3600' + - 'xiaomi-ax9000' - 'xiaomi-3g' - - 'xiaomi-4' + - 'xiaomi-3g-v2' - 'xiaomi-3-pro' - - 'phicomm-k2p' - - 'redmi-ax6s' + - 'xiaomi-4' - 'xiaomi-4a-100m' + - 'xiaomi-4a-gigabit' - 'xiaomi-4c' - - 'miwifi-nano' - - 'glinet-mt300n-v2' - - 'glinet-microuter-n300' + - 'xiaomi-ac2100' + - 'xiaomi-cr6606' + - 'xiaomi-cr6608' + - 'xiaomi-cr6609' + - 'xiaomi-wr30u-112m-nmbm' + - 'xiaomi-wr30u-stock' + - 'xiaomi-wr30u-ubootmod' + - 'miwifi-3c' - 'miwifi-mini' - - 'miwifi-r3' + - 'miwifi-nano' + - 'redmi-ac2100' + - 'xiaomi-ax6000-stock' + - 'xiaomi-ax6000-ubootmod' + - 'redmi-ax6s' + - 'youhua-wr1200js' branch: description: '选择版本' required: true diff --git a/extra-files/headers.xlsx b/extra-files/headers.xlsx index 8f94c6ee6c635a6a206d8c78777f80d1884206d6..3f172d35d15efc24c9fab5eedf9ad200f7b8603d 100644 GIT binary patch delta 7032 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 J3+BHo{|Dhl1~32s delta 6202 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 diff --git a/extra-files/tools/process_text.py b/extra-files/tools/process_text.py index 17a42f6e..00d9ead0 100644 --- a/extra-files/tools/process_text.py +++ b/extra-files/tools/process_text.py @@ -121,17 +121,15 @@ def xlsx_to_dict(file) -> dict: return dict_data -def dict_to_json(dict_data, file): +def dict_to_json(data: dict) -> str: """convert dict data to json file, apply to header.json""" - json_str = json.dumps(dict_data, indent=2) + json_str = json.dumps(data, indent=2) # make key and value be one line json_str = json_str.replace('[\n ', '[').replace( ',\n ', ', ').replace('"\n ', '"') - with open(file, 'w', encoding='utf-8') as f: - f.write(json_str) - print('json file saved') + return json_str def simplify_config(file: str, *, backup=True, remain_text=None): diff --git a/preset-openwrt/headers.json b/preset-openwrt/headers.json index 113c79b4..997d4124 100644 --- a/preset-openwrt/headers.json +++ b/preset-openwrt/headers.json @@ -1,22 +1,36 @@ { - "xiaomi-cr6608": ["1", "ramips", "mt7621", "xiaomi_mi-router-cr6608"], - "xiaomi-cr6606": ["1", "ramips", "mt7621", "xiaomi_mi-router-cr6606"], - "xiaomi-cr6609": ["1", "ramips", "mt7621", "xiaomi_mi-router-cr6609"], - "xiaomi-3g": ["1", "ramips", "mt7621", "xiaomi_mi-router-3g"], - "xiaomi-4": ["1", "ramips", "mt7621", "xiaomi_mi-router-4"], - "xiaomi-3-pro": ["1", "ramips", "mt7621", "xiaomi_mi-router-3-pro"], - "redmi-ac2100": ["1", "ramips", "mt7621", "xiaomi_redmi-router-ac2100"], - "xiaomi-ac2100": ["1", "ramips", "mt7621", "xiaomi_mi-router-ac2100"], - "redmi-ax6s": ["1", "mediatek", "mt7622", "xiaomi_redmi-router-ax6s"], - "xiaomi-4a-gigabit": ["2", "ramips", "mt7621", "xiaomi_mi-router-4a-gigabit"], - "xiaomi-4a-gigabit-v2": ["2", "ramips", "mt7621", "xiaomi_mi-router-4a-gigabit-v2"], - "xiaomi-3g-v2": ["2", "ramips", "mt7621", "xiaomi_mi-router-3g-v2"], - "phicomm-k2p": ["2", "ramips", "mt7621", "phicomm_k2p"], - "xiaomi-4a-100m": ["2", "ramips", "mt76x8", "xiaomi_mi-router-4a-100m"], - "xiaomi-4c": ["2", "ramips", "mt76x8", "xiaomi_mi-router-4c"], - "miwifi-nano": ["2", "ramips", "mt76x8", "xiaomi_miwifi-nano"], - "glinet-mt300n-v2": ["2", "ramips", "mt76x8", "glinet_gl-mt300n-v2"], - "glinet-microuter-n300": ["2", "ramips", "mt76x8", "glinet_microuter-n300"], - "miwifi-mini": ["2", "ramips", "mt7620", "xiaomi_miwifi-mini"], - "miwifi-r3": ["2", "ramips", "mt7620", "xiaomi_miwifi-r3"] -} + "glinet-mt1300": ["2", "ramips", "mt7621", "glinet_gl-mt1300"], + "glinet-mt300n-v2": ["1", "ramips", "mt76x8", "glinet_gl-mt300n-v2"], + "glinet-microuter-n300": ["1", "ramips", "mt76x8", "glinet_microuter-n300"], + "h3c-magic-nx30-pro": ["2", "mediatek", "filogic", "h3c_magic-nx30-pro"], + "hiwifi-hc5962": ["2", "ramips", "mt7621", "hiwifi_hc5962"], + "phicomm-k2p": ["1", "ramips", "mt7621", "phicomm_k2p"], + "phicomm-k3": ["2", "bcm53xx", "generic", "phicomm_k3"], + "qihoo-360t7": ["2", "mediatek", "filogic", "qihoo_360t7"], + "qihoo-c301": ["1", "ath79", "generic", "qihoo_c301"], + "tenda-ac9": ["1", "bcm53xx", "generic", "tenda_ac9"], + "xiaomi-ax3600": ["2", "ipq807x", "generic", "xiaomi_ax3600"], + "xiaomi-ax9000": ["2", "ipq807x", "generic", "xiaomi_ax9000"], + "xiaomi-3g": ["2", "ramips", "mt7621", "xiaomi_mi-router-3g"], + "xiaomi-3g-v2": ["1", "ramips", "mt7621", "xiaomi_mi-router-3g-v2"], + "xiaomi-3-pro": ["2", "ramips", "mt7621", "xiaomi_mi-router-3-pro"], + "xiaomi-4": ["2", "ramips", "mt7621", "xiaomi_mi-router-4"], + "xiaomi-4a-100m": ["1", "ramips", "mt76x8", "xiaomi_mi-router-4a-100m"], + "xiaomi-4a-gigabit": ["1", "ramips", "mt7621", "xiaomi_mi-router-4a-gigabit"], + "xiaomi-4c": ["1", "ramips", "mt76x8", "xiaomi_mi-router-4c"], + "xiaomi-ac2100": ["2", "ramips", "mt7621", "xiaomi_mi-router-ac2100"], + "xiaomi-cr6606": ["2", "ramips", "mt7621", "xiaomi_mi-router-cr6606"], + "xiaomi-cr6608": ["2", "ramips", "mt7621", "xiaomi_mi-router-cr6608"], + "xiaomi-cr6609": ["2", "ramips", "mt7621", "xiaomi_mi-router-cr6609"], + "xiaomi-wr30u-112m-nmbm": ["2", "mediatek", "filogic", "xiaomi_mi-router-wr30u-112m-nmbm"], + "xiaomi-wr30u-stock": ["2", "mediatek", "filogic", "xiaomi_mi-router-wr30u-stock"], + "xiaomi-wr30u-ubootmod": ["2", "mediatek", "filogic", "xiaomi_mi-router-wr30u-ubootmod"], + "miwifi-3c": ["1", "ramips", "mt76x8", "xiaomi_miwifi-3c"], + "miwifi-mini": ["1", "ramips", "mt7620", "xiaomi_miwifi-mini"], + "miwifi-nano": ["1", "ramips", "mt76x8", "xiaomi_miwifi-nano"], + "redmi-ac2100": ["2", "ramips", "mt7621", "xiaomi_redmi-router-ac2100"], + "xiaomi-ax6000-stock": ["2", "mediatek", "filogic", "xiaomi_redmi-router-ax6000-stock"], + "xiaomi-ax6000-ubootmod": ["2", "mediatek", "filogic", "xiaomi_redmi-router-ax6000-ubootmod"], + "redmi-ax6s": ["2", "mediatek", "mt7622", "xiaomi_redmi-router-ax6s"], + "youhua-wr1200js": ["1", "ramips", "mt7621", "youhua_wr1200js"] +} \ No newline at end of file