-
Notifications
You must be signed in to change notification settings - Fork 489
Add me25ls01 #356
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
Draft
Styne13
wants to merge
2
commits into
adafruit:master
Choose a base branch
from
Styne13:add_me25ls01
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Add me25ls01 #356
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,4 @@ | ||
adafruit-nrfutil | ||
intelhex | ||
pyocd | ||
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,70 @@ | ||
/* | ||
* The MIT License (MIT) | ||
* | ||
* Copyright (c) 2020 Yihui Xiong for Makerdiary | ||
* | ||
* 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 _ME25LS01_H | ||
#define _ME25LS01_H | ||
|
||
#define _PINNUM(port, pin) ((port)*32 + (pin)) | ||
|
||
/*------------------------------------------------------------------*/ | ||
/* LED | ||
*------------------------------------------------------------------*/ | ||
#define LEDS_NUMBER 3 | ||
#define LED_PRIMARY_PIN _PINNUM(1, 07) // Blue | ||
#define LED_SECONDARY_PIN _PINNUM(1, 05) // Red | ||
#define LED_TERTIARY_PIN _PINNUM(0, 22) // Blue | ||
#define LED_STATE_ON 0 | ||
|
||
/*------------------------------------------------------------------*/ | ||
/* BUTTON | ||
*------------------------------------------------------------------*/ | ||
#define BUTTONS_NUMBER 3 | ||
#define BUTTON_1 _PINNUM(0, 27) // Primary Button | ||
#define BUTTON_2 _PINNUM(0, 18) // unusable: RESET | ||
#define BUTTON_3 _PINNUM(0, 11) // Secondary Button | ||
#define BUTTON_PULL NRF_GPIO_PIN_PULLUP | ||
|
||
//--------------------------------------------------------------------+ | ||
// BLE OTA | ||
//--------------------------------------------------------------------+ | ||
#define BLEDIS_MANUFACTURER "Minewsemi" | ||
#define BLEDIS_MODEL "ME25LS01" | ||
|
||
//--------------------------------------------------------------------+ | ||
// USB | ||
//--------------------------------------------------------------------+ | ||
#define USB_DESC_VID 0x1209 | ||
#define USB_DESC_UF2_PID 0x5285 | ||
#define USB_DESC_CDC_ONLY_PID 0x5285 | ||
|
||
//--------------------------------------------------------------------+ | ||
// UF2 | ||
//--------------------------------------------------------------------+ | ||
#define UF2_PRODUCT_NAME "Minewsemi ME25LS01 for Meshtastic" | ||
#define UF2_VOLUME_LABEL "ME25LS01" | ||
#define UF2_BOARD_ID "nRF52840-ME25LS01-v1.0" | ||
#define UF2_INDEX_URL "https://store.minewsemi.com/product/me25ls01-bluetooth-module-mx25le01-development-kit/" | ||
|
||
|
||
#endif /* _ME25LS01_H */ |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
MCU_SUB_VARIANT = nrf52840 | ||
SD_VERSION = 7.3.0 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 */ | ||
}; |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
can you tell me where do you got the vid/pid for the board
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
As far as I know 0x1209 is a generic vendor ID also used by other devices in this repo. For the product ID I orientate also another board here as a reference and counted one up.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
you cannot pick a random vid/pid. 0x1209 is allocated by pid.codes. Please try to apply for an pid from that. Check out the git history/pr, I think there is a detail on how to do so. I will mark this PR as draft, feel free to re-mark it as ready when you got and update vid/pid
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ok, thank you for the information.
I will do so and come back to you.