Skip to content

Commit

Permalink
Optimize Chinese translation
Browse files Browse the repository at this point in the history
  • Loading branch information
flyoob committed Oct 30, 2019
1 parent d16b143 commit cea45ee
Show file tree
Hide file tree
Showing 4 changed files with 25 additions and 7 deletions.
19 changes: 15 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# NanoVNA-F
NanoVNA-F, FreeRTOS version of [edy555](https://github.com/ttrftech/NanoVNA)'s NanoVNA.
"VNA" means: 矢量网络分析仪器/Vector network analyzer
NanoVNA-F, FreeRTOS version of [edy555](https://github.com/ttrftech/NanoVNA)'s NanoVNA.
"VNA" means: 矢量网络分析仪器 / Vector Network Analyzer

### 项目描述 / Project Description
NanoVNA-F is a product based on the Open Source Project of NanoVNA(https://ttrf.tk/kit/nanovna/).
Expand Down Expand Up @@ -34,16 +34,27 @@ You can get one on [AliExpress hamelec Store](https://hamelec.aliexpress.com) an

### 固件更新 / Firmware update
[v0.0.2](http://www.sysjoint.com/files/NanoVNA-F_APP_v0.0.2.zip) 2019-08-29 : 首次发行 / First Release

[v0.0.3](http://www.sysjoint.com/files/NanoVNA-F_APP_v0.0.3.zip) 2019-10-07 : 本次更新需要重新校准设备 / This update requires recalibration of the device
* 支持NanoVNA上位机 / support NanoVNA's PC software;
* 加入开机提示音 / Add a boot tone;
* 优化低频段(<100MHz)S11测量结果 / Optimize band (<100MHz) S11 measurement results;

[v0.0.4](http://www.sysjoint.com/files/NanoVNA-F_APP_v0.0.4.zip) 2019-10-30 : 本次更新无需重新校准设备 / This update does not require recalibration of the device
* 呼号显示 / Can display call sign
* 修复 100MHz 频点不输出的 BUG / fix BUG: CW=100MHz do not output
* 优化中文翻译 / Optimize Chinese translation

[如何更新固件 / How to update the firmware](https://github.com/flyoob/NanoVNA-F_Boot)

如何显示呼号 / How to display your call sign
1. 使用 Type-C 将设备连接到 USB,进入 Bootloader 模式。 / Connect the device to USB using Type-C, go into Bootloader Mode.
![v0.0.4_1](https://s1.imgsha.com/2019/10/30/v0.0.4_3.png)
2. 将你的 callsign.txt 文件放入 U盘,重新上下电后自动显示。 / Put you callsign.txt into Udisk, Re-power the device.
![v0.0.4_2](https://s1.imgsha.com/2019/10/30/v0.0.4_1.jpg)

后续计划 / Follow up plan:
* 跟进NanoVNA项目更新,BUG修复 / Follow up the NanoVNA project update, BUG fix
* 呼号显示 / Can display call sign
* 跟进原作者 NanoVNA 项目更新,BUG修复 / Follow up the original NanoVNA project update, BUG fix
* 对数扫频 / Logarithmic frequency sweep

### PC控制软件 / PC control software
Expand Down
5 changes: 3 additions & 2 deletions Src/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -676,11 +676,11 @@ void StartTask001(void const * argument)
// Register
MX_FATFS_Init();
if (retUSER != 0) {
while(1);
goto INIT;
}
// Mount
if (f_mount(&USERFatFS, (TCHAR const*)USERPath, 1) != FR_OK) {
while(1);
goto INIT;
}
// Open File
if (f_open(&fil, "callsign.txt", FA_OPEN_EXISTING | FA_READ) == FR_OK) {
Expand All @@ -698,6 +698,7 @@ void StartTask001(void const * argument)
// Unmount
f_mount(NULL, (TCHAR const*)USERPath, 1);

INIT:
HAL_SPI_DeInit(&hspi1);
MX_SPI1_Init();

Expand Down
6 changes: 6 additions & 0 deletions Usr/Fonthanzi24x24.c
Original file line number Diff line number Diff line change
Expand Up @@ -704,4 +704,10 @@ const uint8_t hanzi_24x24_bits[] = {
0x18,0x18,0x83,0x18,0x18,0x83,0x18,0x18,0x83,0x18,0x18,0xFF,0x18,0x18,0x00,0x18,
0x18,0x00,0x18,0x18,0x00,0x18,0x18,0x00,0x18,0x1F,0xFF,0xF8,0x18,0x00,0x18,0x18,
0x00,0x18,0x00,0x00,0x00,0x00,0x00,0x00,
/*---------------率 117 x75----------------*/
0x00,0x00,0x00,0x00,0x60,0x00,0x00,0x38,0x00,0x00,0x18,0x00,0x3F,0xFF,0xFC,0x00,
0x38,0x00,0x00,0x66,0x30,0x1C,0xC6,0xE0,0x07,0xFC,0x80,0x00,0xD8,0x00,0x03,0x36,
0xC0,0x06,0x63,0x60,0x0D,0xFF,0xB0,0x39,0xFF,0x98,0x10,0x18,0x00,0x00,0x18,0x00,
0x7F,0xFF,0xFE,0x00,0x18,0x00,0x00,0x18,0x00,0x00,0x18,0x00,0x00,0x18,0x00,0x00,
0x18,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
};
2 changes: 1 addition & 1 deletion Usr/ui.c
Original file line number Diff line number Diff line change
Expand Up @@ -964,7 +964,7 @@ const menuitem_t menu_recall_save[] = {
const menuitem_t menu_top[] = {
{ MT_SUBMENU, "DISPLAY", "\x01\x02", menu_display },
{ MT_SUBMENU, "MARKER", "\x03\x04", menu_marker },
{ MT_SUBMENU, "STIMULUS", "\x05\x06", menu_stimulus },
{ MT_SUBMENU, "STIMULUS", "\x1A\x75\x71\x0A", menu_stimulus },
{ MT_SUBMENU, "CAL", "\x07\x08", menu_cal },
{ MT_SUBMENU, "\2RECALL\0SAVE", "\2\x74\x56\0\x73\x57", menu_recall_save },
{ MT_CLOSE, "CLOSE", "\x0D\x0E", NULL },
Expand Down

0 comments on commit cea45ee

Please sign in to comment.