Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add New Board: Raytac MDBT50Q Demo Board 40 #233

Merged
merged 4 commits into from
Nov 30, 2021
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
75 changes: 75 additions & 0 deletions src/boards/raytac_mdbt50q_db_40/board.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
/*
* The MIT License (MIT)
*
* Copyright (c) 2018 Ha Thach for Adafruit Industries
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/

#ifndef RAYTAC_MDBT50Q_DB_40_H
#define RAYTAC_MDBT50Q_DB_40_H

#define _PINNUM(port, pin) ((port)*32 + (pin))

/*------------------------------------------------------------------*/
/* LED
*------------------------------------------------------------------*/
#define LEDS_NUMBER 3
/* This is the Green led marked D1 on the board */
#define LED_PRIMARY_PIN _PINNUM(1, 13)
/* This is the Red led marked D2 on the board */
#define LED_SECONDARY_PIN _PINNUM(1, 14)
/* This is the Blue led marked D3 on the board */
#define LED_TERTIARY_PIN _PINNUM(1, 15)
/* There are one more unpopulated LEDs, but for the purposes of bootloader that
* doesn't matter. */
#define LED_STATE_ON 0

/*------------------------------------------------------------------*/
/* BUTTON
*------------------------------------------------------------------*/
#define BUTTONS_NUMBER 4

#define BUTTON_1 _PINNUM(0, 11)
#define BUTTON_2 _PINNUM(0, 12)
#define BUTTON_3 _PINNUM(0, 24)
#define BUTTON_4 _PINNUM(0, 25)
#define BUTTON_PULL NRF_GPIO_PIN_PULLUP

//--------------------------------------------------------------------+
// BLE OTA
//--------------------------------------------------------------------+
#define BLEDIS_MANUFACTURER "Raytac"
#define BLEDIS_MODEL "MDBT50Q-DB-40"

//--------------------------------------------------------------------+
// USB
//--------------------------------------------------------------------+

#define USB_DESC_VID 0x239A
#define USB_DESC_UF2_PID 0x010C
#define USB_DESC_CDC_ONLY_PID 0x010C
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it is required by this repo that each board must have its own unique VID/PID. I double check, but this PID isn't assigned by Adafruit to any boards yet. Please try to get one from PID donor.


//------------- UF2 -------------//
#define UF2_PRODUCT_NAME "Raytac MDBT50Q Demo Board 40"
#define UF2_VOLUME_LABEL "MDBT50QBOOT"
#define UF2_BOARD_ID "RAYTAC-MDBT50Q-DB-40"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

board id must follow uf2 format

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@hathach
Im not sure I understand your comment ?

Looking at the other already defined Raytec Board, what is the board-id you referring to ?

https://github.com/adafruit/Adafruit_nRF52_Bootloader/blob/master/src/boards/raytac_mdbt50q_rx/board.h

//------------- UF2 -------------//
#define UF2_PRODUCT_NAME        "Raytac MDBT50Q-RX"
#define UF2_VOLUME_LABEL        "MDBT50QBOOT"
#define UF2_BOARD_ID            "nRF52840-MDBT50Q_RX-verD"
#define UF2_INDEX_URL           "https://www.adafruit.com/product/5199"

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

board-id must follow format dictate by uf2 spec https://github.com/microsoft/uf2#files-exposed-by-bootloaders

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@hathach Ok, for your review, made changes to UF2_BOARD_ID

#define UF2_INDEX_URL "https://www.raytac.com/product/ins.php?index_id=81"

#endif // RAYTAC_MDBT50Q_DB_40_H
1 change: 1 addition & 0 deletions src/boards/raytac_mdbt50q_db_40/board.mk
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
MCU_SUB_VARIANT = nrf52840
19 changes: 19 additions & 0 deletions src/boards/raytac_mdbt50q_db_40/pinconfig.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
#include "boards.h"
#include "uf2/configkeys.h"

__attribute__((used, section(".bootloaderConfig")))
const uint32_t bootloaderConfig[] =
{
/* CF2 START */
CFG_MAGIC0, CFG_MAGIC1, // magic
5, 100, // used entries, total entries

204, 0x100000, // FLASH_BYTES = 0x100000
205, 0x40000, // RAM_BYTES = 0x40000
208, (USB_DESC_VID << 16) | USB_DESC_UF2_PID, // BOOTLOADER_BOARD_ID = USB VID+PID, used for verification when updating bootloader via uf2
209, 0xada52840, // UF2_FAMILY = 0xada52840
210, 0x20, // PINS_PORT_SIZE = PA_32

0, 0, 0, 0, 0, 0, 0, 0
/* CF2 END */
};