Merge tag 'dey-4.0-r1.2'

Digi Embedded Yocto 4.0-r1.2
This commit is contained in:
Arturo Buzarra 2022-12-02 12:19:29 +01:00
commit 2f81628e24
9 changed files with 51 additions and 24 deletions

View File

@ -7,6 +7,7 @@ This application enables one ADC channel on the board. After that, the
application takes periodic samples and prints the raw value and the value in mv.
The ADC lines used in this example are mapped as follows in the Digi boards:
- **ConnectCore MP15 DVK**: AN0 (GPIO connector, J41, Pin 4).
- **ConnectCore 8M Mini DVK**: MCA_IO1 (channel 1) at XBEE1_UART_TX. By default
this ADC channel is not enabled, you need to modify the device tree.
- **ConnectCore 8M Nano DVK**: MCA_IO1 (channel 1) at XBEE1_UART_TX. By default
@ -56,7 +57,7 @@ For more information, see the [Digi Embedded Yocto online documentation](https:/
License
-------
Copyright 2017, Digi International Inc.
Copyright 2017-2022, Digi International Inc.
Permission to use, copy, modify, and/or distribute this software for any purpose
with or without fee is hereby granted, provided that the above copyright notice

View File

@ -14,6 +14,11 @@ the ID and print in the console.
The CAN interface for this example depends on the running platform:
- **ConnectCore MP15 DVK**: CAN connector of the board (J33).
- 5V: Pin 1
- CAN1_H: Pin 2
- CAN1_L: Pin 3
- GND: Pin 4
- **ConnectCore 8M Mini DVK**: CAN connector of the board (J24).
- 5V: Pin 1
- CAN1_H: Pin 2
@ -136,7 +141,7 @@ For more information, see the [Digi Embedded Yocto online documentation](https:/
License
-------
Copyright 2018, Digi International Inc.
Copyright 2018-2022, Digi International Inc.
Permission to use, copy, modify, and/or distribute this software for any purpose
with or without fee is hereby granted, provided that the above copyright notice

View File

@ -9,6 +9,9 @@ whenever an interrupt is generated in the input GPIO.
The GPIOs lines used in this example are mapped as follows in the Digi boards:
- **ConnectCore MP15 DVK**:
- User button: GPIOA,13 (User Button 1 in the board)
- User led: GPIOC,3 (ULED in the board)
- **ConnectCore 8M Mini DVK**:
- User button: MCA_IO10 (User Button 1 in the board)
- User led: USER_LED1 (User Led 1 in the board)
@ -22,7 +25,7 @@ The GPIOs lines used in this example are mapped as follows in the Digi boards:
- User button: GPIO0_20 (Connected in the board)
- User led: GPIO0_19 (Connected in the board)
- **ConnectCore 6UL SBC Pro**:
- User button: MCA_IO1 (GPIO connector, J30, Pin 7)
- User button: GPIO1_IO3 (GPIO connector, J30, Pin 12)
- User led: USER_LED1 (Connected in the board)
- **ConnectCore 6UL SBC Express**:
- User button: GPIO3_IO3 (Connected in the board)
@ -68,7 +71,7 @@ for example, for ConnectCore 6UL:
For more information, see the [Digi Embedded Yocto online documentation](https://github.com/digi-embedded/meta-digi).
License
-------
Copyright 2017, Digi International Inc.
Copyright 2017-2022, Digi International Inc.
Permission to use, copy, modify, and/or distribute this software for any purpose
with or without fee is hereby granted, provided that the above copyright notice

View File

@ -8,6 +8,11 @@ Afterward, it reads the data back to validate it (tested with 24FC1026).
The I2C connections for this example depend on the running platform:
- **ConnectCore MP15 DVK**: MikroBus connector (J31).
- VCC: Pin 7
- GND: Pin 8
- I2C-6 SDA: Pin 6
- I2C-6 SCL: Pin 5
- **ConnectCore 8M Mini DVK**: Expansion connector of the board (J48).
- VCC: Connector J52 Pin 7
- GND: Pin 9
@ -86,7 +91,7 @@ For more information, see the [Digi Embedded Yocto online documentation](https:/
License
-------
Copyright 2017, Digi International Inc.
Copyright 2017-2022, Digi International Inc.
Permission to use, copy, modify, and/or distribute this software for any purpose
with or without fee is hereby granted, provided that the above copyright notice

View File

@ -9,6 +9,7 @@ vice-versa.
The PWM lines used in this example are mapped as follows in the Digi boards:
- **ConnectCore MP15 DVK**: MikroBus PWM channel 4 - PIN **1** of the MikroBus connector (J31).
- **ConnectCore 8M Mini DVK**: MCA PWM0 channel 2 connected to the LED1.
- **ConnectCore 8M Nano DVK**: MCA PWM0 channel 2 connected to the LED1.
- **ConnectCore 8X SBC Pro**: MCA PWM2 channel 0 - Pin **A3** of the Expansion connector (J20).
@ -54,7 +55,7 @@ For more information, see the [Digi Embedded Yocto online documentation](https:/
License
-------
Copyright 2017, Digi International Inc.
Copyright 2017-2022, Digi International Inc.
Permission to use, copy, modify, and/or distribute this software for any purpose
with or without fee is hereby granted, provided that the above copyright notice

View File

@ -11,6 +11,13 @@ the page size and the address size in bytes.
The SPI connections for this example depends on the running platform:
- **ConnectCore MP15 DVK**: MikroBus connector (J30).
- VCC: Pin 7
- GND: Pin 8
- SPI-0 CLK: 4
- SPI-0 MISO: 5
- SPI-0 MOSI: 6
- SPI-0 SS0: 3
- **ConnectCore 8X SBC Pro**: Expansion connector of the board (J27).
- VCC: Pin D1
- GND: Pin C1
@ -98,7 +105,7 @@ For more information, see the [Digi Embedded Yocto online documentation](https:/
License
-------
Copyright 2017, Digi International Inc.
Copyright 2017-2022, Digi International Inc.
Permission to use, copy, modify, and/or distribute this software for any purpose
with or without fee is hereby granted, provided that the above copyright notice

View File

@ -625,7 +625,7 @@ static struct server *server_create(int fd, uint16_t mtu)
}
if (verbose) {
bt_att_set_debug(server->att, debug_cb, "att: ", NULL);
bt_att_set_debug(server->att, BT_ATT_DEBUG_VERBOSE, debug_cb, "att: ", NULL);
bt_gatt_server_set_debug(server->gatt, debug_cb,
"server: ", NULL);
}

View File

@ -513,19 +513,15 @@ class RequestHandler(http.server.SimpleHTTPRequestHandler):
path = json.loads(data.decode("utf-8")).get("file", None)
log.debug("Update firmware with file %s", path)
if is_dual_system():
cmd = "firmware-update-dual.sh %s" % path
else:
if not path.startswith(get_fw_store_path()):
# Move the package to /mnt/update
update_path = os.path.join(get_fw_store_path(), os.path.basename(path))
if os.path.exists(update_path):
os.remove(update_path)
shutil.move(path, update_path)
path = update_path
cmd = "update-firmware --reboot-timeout=1 %s" % path
if not is_dual_system() and not path.startswith(get_fw_store_path())\
and shutil.disk_usage(get_fw_store_path())[2] >= os.path.getsize(path):
# Move the package to /mnt/update to avoid permission problems
update_path = os.path.join(get_fw_store_path(), os.path.basename(path))
if os.path.exists(update_path):
os.remove(update_path)
shutil.move(path, update_path)
path = update_path
cmd = "update-firmware %s" % path
log.debug("Update cmd: %s", cmd)
try:
@ -790,7 +786,7 @@ def get_video_resolution():
res = read_file("/sys/class/drm/card0/card0-DPI-1/modes")
if res == NOT_AVAILABLE:
res = read_file("/sys/class/graphics/fb0/modes")
if res == NOT_AVAILABLE:
if res == NOT_AVAILABLE or not res:
return "No video device found"
line = res.splitlines()[0]
@ -806,8 +802,8 @@ def is_dual_system():
Returns:
Boolean: True for dual systems, False otherwise.
"""
res = exec_cmd("fdisk -l | grep recovery")
return res[0] != 0
res = exec_cmd("fw_printenv -n dualboot")
return res[0] == 0 and res[1] == "yes"
def get_fw_store_path():

View File

@ -17,6 +17,7 @@ application takes periodic samples and prints the raw value and the value in mv.
<platform>ccimx8x-sbc-pro</platform>
<platform>ccimx8mn-dvk</platform>
<platform>ccimx8mm-dvk</platform>
<platform>ccmp15-dvk</platform>
</platforms>
</sample>
<sample id="apix-can-samples">
@ -36,6 +37,7 @@ reception using the selected baudrate.
<platform>ccimx8x-sbc-pro</platform>
<platform>ccimx8mn-dvk</platform>
<platform>ccimx8mm-dvk</platform>
<platform>ccmp15-dvk</platform>
</platforms>
</sample>
<sample id="apix-gpio-sample">
@ -56,6 +58,7 @@ whenever an interrupt is generated in the input GPIO.
<platform>ccimx8x-sbc-pro</platform>
<platform>ccimx8mn-dvk</platform>
<platform>ccimx8mm-dvk</platform>
<platform>ccmp15-dvk</platform>
</platforms>
</sample>
<sample id="apix-i2c-sample">
@ -75,6 +78,7 @@ Afterward, it reads the data back to validate it (tested with 24FC1026).
<platform>ccimx8x-sbc-pro</platform>
<platform>ccimx8mn-dvk</platform>
<platform>ccimx8mm-dvk</platform>
<platform>ccmp15-dvk</platform>
</platforms>
</sample>
<sample id="apix-pm-sample">
@ -94,6 +98,7 @@ frequencies, and governors.
<platform>ccimx8x-sbc-pro</platform>
<platform>ccimx8mn-dvk</platform>
<platform>ccimx8mm-dvk</platform>
<platform>ccmp15-dvk</platform>
</platforms>
</sample>
<sample id="apix-pwm-sample">
@ -114,6 +119,7 @@ vice-versa.
<platform>ccimx8x-sbc-pro</platform>
<platform>ccimx8mn-dvk</platform>
<platform>ccimx8mm-dvk</platform>
<platform>ccmp15-dvk</platform>
</platforms>
</sample>
<sample id="apix-spi-sample">
@ -133,6 +139,7 @@ the page size and the address size in bytes.
<platform>ccimx6ulsbc</platform>
<platform>ccimx8x-sbc-express</platform>
<platform>ccimx8x-sbc-pro</platform>
<platform>ccmp15-dvk</platform>
</platforms>
</sample>
<sample id="apix-watchdog-sample">
@ -153,6 +160,7 @@ then the device will reboot automatically after the timeout expires.
<platform>ccimx8x-sbc-pro</platform>
<platform>ccimx8mn-dvk</platform>
<platform>ccimx8mm-dvk</platform>
<platform>ccmp15-dvk</platform>
</platforms>
</sample>
<sample id="ble-gat-server-example">
@ -172,6 +180,7 @@ GATT services and characteristics.
<platform>ccimx8x-sbc-pro</platform>
<platform>ccimx8mn-dvk</platform>
<platform>ccimx8mm-dvk</platform>
<platform>ccmp15-dvk</platform>
</platforms>
</sample>
<sample id="caam-blob-example">