Skip to content

Commit f334394

Browse files
authored
Merge pull request #127 from wangnuannuan/feature/modify_doc
doc: modify punctuation and spelling
2 parents 4458924 + 5bf7ff5 commit f334394

File tree

11 files changed

+30
-29
lines changed

11 files changed

+30
-29
lines changed

device/ip/ip_hal/inc/dev_gpio.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
* \defgroup DEVICE_HAL_GPIO GPIO Device HAL Interface
3333
* \ingroup DEVICE_HAL_DEF
3434
* \brief definitions for gpio device hardware layer (\ref dev_gpio.h)
35-
* \details provide interfaces for gpio driver to implement
35+
* \details Provide interfaces for gpio driver to implement
3636
* Here is a diagram for the gpio interface.
3737
*
3838
* \htmlonly
@@ -382,7 +382,7 @@ typedef struct dev_gpio_bit_isr {
382382
*/
383383
/**
384384
* \brief gpio information struct definition
385-
* \details informations about gpio open count, working status
385+
* \details Informations about gpio open count, working status
386386
* gpio registers and control block, gpio io direction and interrupt/poll for each bit of gpio
387387
* \note Only available for gpio with max 32bits
388388
*/
@@ -410,9 +410,9 @@ typedef struct dev_gpio_info {
410410

411411
/**
412412
* \brief gpio device interface definition
413-
* \details define gpio device interface, like gpio information structure,
413+
* \details Define gpio device interface, like gpio information structure,
414414
* fuctions to open/close/control gpio, write or read data via gpio
415-
* \note all this details are implemented by user in user porting code
415+
* \note All this details are implemented by user in user porting code
416416
*/
417417
typedef struct dev_gpio {
418418
DEV_GPIO_INFO gpio_info; /*!< gpio device information */
@@ -437,7 +437,7 @@ typedef struct dev_gpio {
437437

438438
/**
439439
* \fn int32_t (* dev_gpio::gpio_close) (void)
440-
* \details Close an gpio device, just decrease the \ref dev_gpio_info::opn_cnt "opn_cnt",
440+
* \details Close a gpio device, just decrease the \ref dev_gpio_info::opn_cnt "opn_cnt",
441441
* if \ref dev_gpio_info::opn_cnt "opn_cnt" equals 0, then close the device
442442
* \retval E_OK Close successfully without any issues(including scenario that device is already closed)
443443
* \retval E_OPNED Device is still opened, the device \ref dev_gpio_info::opn_cnt "opn_cnt" decreased by 1
@@ -495,7 +495,7 @@ extern "C" {
495495
* \param[in] gpio_id id of gpio, defined by user
496496
* \retval !NULL pointer to an \ref dev_gpio "gpio device structure"
497497
* \retval NULL failed to find the gpio device by \ref gpio_id
498-
* \note need to implemented by user in user code
498+
* \note Need to implemented by user in user code
499499
*/
500500
extern DEV_GPIO_PTR gpio_get_dev(int32_t gpio_id);
501501

doc/documents/board/emsk.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ The EMSK consists of a hardware platform and a software package, including
1919
pre-installed FPGA images of different configurations of the ARC EM Processor
2020
with peripherals.
2121

22-
The development board is based on a Xilinx Spartan&reg;-6 LX45 FPGA. It
22+
The development board is based on a Xilinx Spartan-6 LX45 FPGA. It
2323
supports hardware extensions using six 2x6 connectors supporting a total of 48
2424
user I/O pins (plus power and ground pins) that can be used to connect
2525
components such as sensors, actuators, memories, displays, buttons, switches,
@@ -163,7 +163,7 @@ Required Hardware and Software
163163
To use embARC OSP applications on the IoTDK board, the following items are required
164164

165165
* USB Cable
166-
* The USB cable provides power to the board (maximum 500 mA); however, if the board is to run
166+
* The USB cable provides power to the board (maximum 500 mA). However, if the board is to run
167167
standalone, the universal switching power adaptor (110-240V AC to 5V DC),
168168
can be used to power the board
169169
* :ref:`software_requirement`.

doc/documents/changelog/release_2016.05.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ Features and Enhancements
2626

2727
* Add library support
2828

29-
* `dlmalloc <http://g.oswego.edu/dl/html/malloc.html>`_
29+
* `dlmalloc <http://gee.cs.oswego.edu/dl/html/malloc.html>`_
3030
* MetaWare standard c library for MetaWare toolchain
3131
* newlib c library for ARC GNU toolchain
3232

doc/documents/conf.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,8 @@
182182
intersphinx_mapping = {'https://docs.python.org/': None}
183183

184184
linkcheck_ignore = [
185-
'http://www.solomon-systech.com/en/product/display-ic/oled-driver-controller/ssd1306/',
185+
'http://www.solomon-systech.com/en/product/display-ic/oled-driver-controller/ssd1306/',
186+
'http://elm-chan.org/',
186187
]
187188

188189
rst_epilog = u"""

doc/documents/device/gpio.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
GPIO HAL
44
========
55

6-
The GPIO HAL definitions is in ``dev_gpio.h``, it provide interfaces for gpio
6+
The GPIO HAL definitions are in ``dev_gpio.h``, it provides interfaces for gpio
77
driver to implement. Here is a diagram for the gpio interface.
88

99
.. image:: /pic/dev_gpio_hal.jpg

doc/documents/getting_started/makefile_manual.rst

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ The basic way of this command is to enter ``make cfg``, the makefile system will
110110
"Debug Jtags (JTAG) : usb opella"
111111
112112
At supported Configurations, you can find different choices for your command, the uppercase words in parentheses are paramater names to be used in your command.
113-
For example, the command below will execute your command for an *EMSK* board with *arcem7d* core, toolchain would be *gnu* and JTAG connection is via *USB*.
113+
For example, the command below will execute your command for an *EMSK* board with *arcem7d* core, toolchain will be *gnu* and JTAG connection is via *USB*.
114114

115115
.. code-block:: console
116116
@@ -151,7 +151,7 @@ build
151151

152152
This command will clean and build the project with selected paramaters.
153153

154-
Here is a example using EMSK (version 1.1, arcem6 core), compiled with gnu.
154+
Here is an example using EMSK (version 1.1, arcem6 core), compiled with gnu.
155155

156156
.. code-block:: console
157157
@@ -184,7 +184,7 @@ Here is a example using IoTDK (version 1.0, arcem9d core), compiled with Metawar
184184
185185
make BOARD=iotdk BD_VER=10 CUR_CORE=arcem9d TOOLCHAIN=mw JTAG=usb run
186186
187-
You may also use it wiout BD_VER and CUR_CORE options since they are default options.
187+
You may also use it without BD_VER and CUR_CORE options since they are default options.
188188

189189
.. code-block:: console
190190
@@ -207,9 +207,9 @@ This command will clean the directory, removing all object files of all boards.
207207
Useful Options
208208
##############
209209

210-
#. Boards (**BOARD**): Use this option to check config for different boards. Usually he default BOARD setting is EMSK.
211-
#. Core Configurations (**CUR_CORE**): shows available core choices.
212-
#. Build Toolchains (**TOOLCHAIN**):To choose from different toolchain.
213-
#. Debug Jtags (**JTAG**): In most case the micro-usb interface on board supports JTAG debugging. Ashling's Opella-XD-ARC is also support by some boards.
210+
#. Boards (**BOARD**): Use this option to check config for different boards. Usually the default BOARD setting is EMSK.
211+
#. Core Configurations (**CUR_CORE**): Shows available core choices.
212+
#. Build Toolchains (**TOOLCHAIN**):To choose from different toolchains.
213+
#. Debug Jtags (**JTAG**): In most case the micro-usb interface on board supports JTAG debugging. Ashling's Opella-XD-ARC is also supported by some boards.
214214
#. Board version (**BD_VER**): Often used by EMSK which has many versions.
215215

doc/documents/getting_started/peripheral_preparation.rst

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ We will take PMOD interface as example to explain the setting method. Other inte
1414
[board_type] should be replaced to board type name, such as *emsk*, *hsdk* or *iotdk*.
1515

1616
2. If you are using EMSK, go to mux.c and find ``io_mux_init()`` function, you will see it calls ``set_pmod_mux()`` with MUX options as parameters.
17-
MUX options are defined in mux.h and you could change them as you see fit.
17+
MUX options are defined in mux.h and you can change them as you see fit.
1818

19-
For example, You want to connect your EMSK with two i2c sensor modules. By default setting you only have PM2 as i2c interface.
19+
For example, you want to connect your EMSK with two i2c sensor modules. By default setting you only have PM2 as i2c interface.
2020
So now you have to check mux.h or EMSK manual to see if it support one more i2c interface.
2121
Notice that there is a ``PM3_I2C_GPIO_D`` macro in mux.h meaning that PM3 support i2c interface. Now all you need to do is to replace the default PM3 setting in ``set_pmod_mux()`` to ``PM3_I2C_GPIO_D``.
2222
Now your code should be like this:
@@ -43,7 +43,7 @@ All three parameters should use definitions in ``embarc_osp/device/inc/dev_pinmu
4343
* The third parameter should be ``IO_PINMUX_ENABLE`` or ``IO_PINMUX_DISABLE``, enabling or disabling the mux controller respectively.
4444

4545
5. If you are using EMSDP, go to mux.c and find ``io_mux_init()`` function, you will find it calls ``set_pmod_mux()`` with MUX options as parameters.
46-
MUX options are defined in mux.h and you could change them as you see fit.
46+
MUX options are defined in mux.h and you can change them as you see fit.
4747

4848
.. note:: In EMSDP, notice that **CFG0** means Upper Layer of Pmod interface and **CFG1** means Lower Layer of Pmod
4949

@@ -63,10 +63,10 @@ Driver code at ``embarc_osp/device/peripheral/wifi/rw009``.
6363

6464
PMOD Temperature Module
6565
***********************
66-
`Pmod TMP2 <https://reference.digilentinc.com/reference/pmod/pmodtmp2/start>`_ : sensor chip type is ADT7420, use **I2C** for data collection.
66+
`Pmod TMP2 <https://reference.digilentinc.com/reference/pmod/pmodtmp2/start>`_ : Sensor chip type is ADT7420, use **I2C** for data collection.
6767
Driver code at ``embarc_osp/device/peripheral/sensor/temperature/adt7420``.
6868

69-
`Pmod TMP3 <https://reference.digilentinc.com/reference/pmod/pmodtmp3/start>`_ : sensor chip type is TCN75A, use **I2C** for data collection.
69+
`Pmod TMP3 <https://reference.digilentinc.com/reference/pmod/pmodtmp3/start>`_ : Sensor chip type is TCN75A, use **I2C** for data collection.
7070
Driver code at ``embarc_osp/device/peripheral/sensor/temperature/tcn75``.
7171

7272
Other PMOD or Compatible Modules
@@ -77,4 +77,4 @@ Driver code at ``embarc_osp/device/peripheral/adc/ad7991``.
7777
`ESP01\/ESP01S <https://wiki.ai-thinker.com/esp8266/docs>`_ : Primary IC type is ESP8266, use **UART** interface for data changing and controlling.
7878
Driver code at ``embarc_osp/device/peripheral/wifi/slip_esp``.
7979

80-
The ESP01/ESP01S module is not originally a PMOD module, however it is PMOD compatible, meaning that you could wire it to PMOD interface on board. You need to connect GND(embARC) to GND(ESP) , 3.3V(embARC) to VCC(ESP), RXD(embARC) to TXD(ESP), and TXD(embARC) to RXD(ESP), respectively. Please take reference from datasheet of `ESP01\/ESP01S <https://wiki.ai-thinker.com/esp8266/docs>`_ and UART (type 4A) part of `Digilent Pmod Spec <https://www.digilentinc.com/Pmods/Digilent-Pmod_%20Interface_Specification.pdf>`_ for pin layout.
80+
The ESP01/ESP01S module is not originally a PMOD module, however it is PMOD compatible, meaning that you can wire it to PMOD interface on board. You need to connect GND(embARC) to GND(ESP) , 3.3V(embARC) to VCC(ESP), RXD(embARC) to TXD(ESP), and TXD(embARC) to RXD(ESP), respectively. Please take reference from datasheet of `ESP01\/ESP01S <https://wiki.ai-thinker.com/esp8266/docs>`_ and UART (type 4A) part of `Digilent Pmod Spec <https://www.digilentinc.com/Pmods/Digilent-Pmod_%20Interface_Specification.pdf>`_ for pin layout.

doc/documents/getting_started/software_requirement.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ Development Environment
1212

1313
Software Requirement
1414
####################
15-
* `ARC Development Tools <https://www.synopsys.com/designware-ip/processor-solutions/arc-processors/arc-development-tools.html>`_
15+
* `ARC Development Tools <https://www.synopsys.com/designware-ip/processor-solutions/arc-development-tools.html>`_
1616
Choose **MetaWare Toolkit** and/or **ARC GNU Toolchain** from the following list according to your requirement:
1717

1818
* MetaWare Toolkit

doc/documents/license/license.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,8 +92,8 @@ Doxygen
9292
Dlmalloc
9393
********
9494

95-
:Project homepage: http://g.oswego.edu/dl/html/malloc.html
96-
:Project licensing: http://g.oswego.edu/dl/html/malloc.html
95+
:Project homepage: http://gee.cs.oswego.edu/dl/html/malloc.html
96+
:Project licensing: http://gee.cs.oswego.edu/dl/html/malloc.html
9797
:LICENSE: `Creative Commons CC0 1.0 Universal`_
9898

9999
FatFS

example/baremetal/ble_hm1x/README.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ Detailed Description
1313
* Extra Required Tools
1414
BLE APP on SmartPhone:
1515
- Android: BLE Android ComAssistant
16-
- iOS: `LightBlue <https://itunes.apple.com/us/app/lightblue-bluetooth-low-energy/id557428110?mt=8>`_
16+
- iOS: `LightBlue <https://apps.apple.com/us/app/lightblue-bluetooth-low-energy/id557428110>`_
1717

1818
* Extra Required Peripherals
1919
UART Based BLE Device HM-10

0 commit comments

Comments
 (0)