Merge pull request #507 from meshtastic/master
update dev-https from master
This commit is contained in:
44 files changed
+1995
-150
No files matched your search
@@ -2,7 +2,20 @@
|
||||
|
||||
set -e
|
||||
|
||||
# dependencies
|
||||
# apt install srecord
|
||||
|
||||
BOOTDIR=/home/kevinh/development/meshtastic/Adafruit_nRF52_Bootloader
|
||||
BOARD=othernet_ppr1
|
||||
BOOTVER=0.3.2
|
||||
BOOTNUM=128
|
||||
BOOTSHA=gc01b9ea
|
||||
SDCODE=s113
|
||||
SDVER=7.2.0
|
||||
PROJ=ppr1
|
||||
|
||||
# FIXME for nRF52840 use 0xff000, for nRF52833 use 0x7f000
|
||||
BOOTSET=0x7f000
|
||||
|
||||
nrfjprog --eraseall -f nrf52
|
||||
|
||||
@@ -11,12 +24,12 @@ nrfjprog --eraseall -f nrf52
|
||||
# first 4 bytes should be 0x01 to indicate valid app image
|
||||
# second 4 bytes should be 0x00 to indicate no CRC required for image
|
||||
echo "01 00 00 00 00 00 00 00" | xxd -r -p - >/tmp/bootconf.bin
|
||||
srec_cat /tmp/bootconf.bin -binary -offset 0xff000 -output /tmp/bootconf.hex -intel
|
||||
srec_cat /tmp/bootconf.bin -binary -offset $BOOTSET -output /tmp/bootconf.hex -intel
|
||||
|
||||
echo Generating merged hex file
|
||||
mergehex -m $BOOTDIR/_build/build-ttgo_eink/ttgo_eink_bootloader-0.3.2-124-g69bd8eb-dirty_s140_6.1.1.hex .pio/build/eink/firmware.hex /tmp/bootconf.hex -o ttgo_eink_full.hex
|
||||
echo Generating merged hex file from .pio/build/$PROJ/firmware.hex
|
||||
mergehex -o ${BOARD}_full.hex -m $BOOTDIR/_build/build-$BOARD/${BOARD}_bootloader-$BOOTVER-$BOOTNUM-$BOOTSHA-dirty_${SDCODE}_$SDVER.hex .pio/build/$PROJ/firmware.hex /tmp/bootconf.hex
|
||||
|
||||
echo Telling bootloader app region is valid and telling CPU to run
|
||||
nrfjprog --program ttgo_eink_full.hex -f nrf52 --reset
|
||||
nrfjprog --program ${BOARD}_full.hex -f nrf52 --reset
|
||||
|
||||
# nrfjprog --readuicr /tmp/uicr.hex; objdump -s /tmp/uicr.hex | less
|
||||
@@ -1,3 +1,3 @@
|
||||
|
||||
|
||||
JLinkGDBServerCLExe -if SWD -select USB -port 2331 -device NRF52840_XXAA
|
||||
JLinkGDBServerCLExe -if SWD -select USB -port 2331 -device NRF52832_XXAA
|
||||
Executable
+3
@@ -0,0 +1,3 @@
|
||||
|
||||
|
||||
JLinkGDBServerCLExe -if SWD -select USB -port 2331 -device NRF52833_XXAA
|
||||
@@ -1,3 +1,3 @@
|
||||
|
||||
|
||||
JLinkGDBServerCLExe -if SWD -select USB -port 2331 -device NRF52832_XXAA
|
||||
JLinkGDBServerCLExe -if SWD -select USB -port 2331 -device NRF52840_XXAA
|
||||
@@ -1,4 +1,4 @@
|
||||
|
||||
echo "Converting to uf2 for NRF52 Adafruit bootloader"
|
||||
bin/uf2conv.py .pio/build/lora-relay-v1/firmware.hex -f 0xADA52840
|
||||
bin/uf2conv.py .pio/build/lora-relay-v2/firmware.hex -f 0xADA52840
|
||||
# cp flash.uf2 /media/kevinh/FTH*BOOT/
|
||||
+1
-1
@@ -1,3 +1,3 @@
|
||||
|
||||
|
||||
export VERSION=1.1.6
|
||||
export VERSION=1.1.7
|
||||
Executable
+2
@@ -0,0 +1,2 @@
|
||||
echo using amap tool to display memory map
|
||||
amap .pio/build/output.map
|
||||
+1
-1
@@ -5,7 +5,7 @@
|
||||
},
|
||||
"core": "nRF5",
|
||||
"cpu": "cortex-m4",
|
||||
"extra_flags": "-DARDUINO_NRF52840_LORA_RELAY_V1 -DNRF52840_XXAA",
|
||||
"extra_flags": "-DARDUINO_NRF52840_TTGO_EINK -DNRF52840_XXAA",
|
||||
"f_cpu": "64000000L",
|
||||
"hwids": [
|
||||
[
|
||||
|
||||
@@ -0,0 +1,46 @@
|
||||
{
|
||||
"build": {
|
||||
"arduino": {
|
||||
"ldscript": "nrf52840_s140_v6.ld"
|
||||
},
|
||||
"core": "nRF5",
|
||||
"cpu": "cortex-m4",
|
||||
"extra_flags": "-DARDUINO_NRF52840_LORA_RELAY_V2 -DNRF52840_XXAA",
|
||||
"f_cpu": "64000000L",
|
||||
"hwids": [["0x239A", "0x4406"]],
|
||||
"usb_product": "LORA_RELAY",
|
||||
"mcu": "nrf52840",
|
||||
"variant": "lora_relay_v2",
|
||||
"variants_dir": "variants",
|
||||
"bsp": {
|
||||
"name": "adafruit"
|
||||
},
|
||||
"softdevice": {
|
||||
"sd_flags": "-DS140",
|
||||
"sd_name": "s140",
|
||||
"sd_version": "6.1.1",
|
||||
"sd_fwid": "0x00B6"
|
||||
},
|
||||
"bootloader": {
|
||||
"settings_addr": "0xFF000"
|
||||
}
|
||||
},
|
||||
"connectivity": ["bluetooth"],
|
||||
"debug": {
|
||||
"jlink_device": "nRF52840_xxAA",
|
||||
"onboard_tools": ["jlink"],
|
||||
"svd_path": "nrf52840.svd"
|
||||
},
|
||||
"frameworks": ["arduino"],
|
||||
"name": "Meshtastic Lora Relay V1 (Adafruit BSP)",
|
||||
"upload": {
|
||||
"maximum_ram_size": 248832,
|
||||
"maximum_size": 815104,
|
||||
"require_upload_port": true,
|
||||
"speed": 115200,
|
||||
"protocol": "jlink",
|
||||
"protocols": ["jlink", "nrfjprog", "stlink"]
|
||||
},
|
||||
"url": "https://github.com/BigCorvus/SX1262-LoRa-BLE-Relay",
|
||||
"vendor": "BigCorvus"
|
||||
}
|
||||
@@ -0,0 +1,46 @@
|
||||
{
|
||||
"build": {
|
||||
"arduino": {
|
||||
"ldscript": "nrf52833_s113_v7.ld"
|
||||
},
|
||||
"core": "nRF5",
|
||||
"cpu": "cortex-m4",
|
||||
"extra_flags": "-DARDUINO_NRF52833_PPR -DNRF52833_XXAA",
|
||||
"f_cpu": "64000000L",
|
||||
"hwids": [["0x239A", "0x4406"]],
|
||||
"usb_product": "PPR",
|
||||
"mcu": "nrf52833",
|
||||
"variant": "ppr",
|
||||
"variants_dir": "variants",
|
||||
"bsp": {
|
||||
"name": "adafruit"
|
||||
},
|
||||
"softdevice": {
|
||||
"sd_flags": "-DS113",
|
||||
"sd_name": "s113",
|
||||
"sd_version": "7.2.0",
|
||||
"sd_fwid": "0x00b6"
|
||||
},
|
||||
"bootloader": {
|
||||
"settings_addr": "0xFF000"
|
||||
}
|
||||
},
|
||||
"connectivity": ["bluetooth"],
|
||||
"debug": {
|
||||
"jlink_device": "nRF52833_xxAA",
|
||||
"onboard_tools": ["jlink"],
|
||||
"svd_path": "nrf52833.svd"
|
||||
},
|
||||
"frameworks": ["arduino"],
|
||||
"name": "Meshtastic PPR1 (Adafruit BSP)",
|
||||
"upload": {
|
||||
"maximum_ram_size": 248832,
|
||||
"maximum_size": 815104,
|
||||
"require_upload_port": true,
|
||||
"speed": 115200,
|
||||
"protocol": "jlink",
|
||||
"protocols": ["jlink", "nrfjprog", "stlink"]
|
||||
},
|
||||
"url": "https://meshtastic.org/",
|
||||
"vendor": "Othernet"
|
||||
}
|
||||
Binary file not shown.
@@ -0,0 +1,990 @@
|
||||
%PDF-1.6␍%âãÏÓ
|
||||
2 0 obj␍<</Metadata 196 0 R/Outlines 123 0 R/PageMode/UseOutlines/Pages 3 0 R/Type/Catalog/ViewerPreferences 124 0 R>>␍endobj␍196 0 obj␍<</Length 4980/Subtype/XML/Type/Metadata>>stream
|
||||
<?xpacket begin="" id="W5M0MpCehiHzreSzNTczkc9d"?>
|
||||
<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="Adobe XMP Core 4.2.1-c041 52.342996, 2008/05/07-20:48:00 ">
|
||||
<rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
|
||||
<rdf:Description rdf:about=""
|
||||
xmlns:dc="http://purl.org/dc/elements/1.1/">
|
||||
<dc:format>application/pdf</dc:format>
|
||||
<dc:creator>
|
||||
<rdf:Seq>
|
||||
<rdf:li>Provided By ALLDATASHEET.COM(FREE DATASHEET DOWNLOAD SITE)</rdf:li>
|
||||
</rdf:Seq>
|
||||
</dc:creator>
|
||||
<dc:title>
|
||||
<rdf:Alt>
|
||||
<rdf:li xml:lang="x-default">DATASHEET SEARCH SITE | WWW.ALLDATASHEET.COM</rdf:li>
|
||||
</rdf:Alt>
|
||||
</dc:title>
|
||||
<dc:description>
|
||||
<rdf:Alt>
|
||||
<rdf:li xml:lang="x-default">DATASHEET SEARCH, DATABOOK, COMPONENT, FREE DOWNLOAD SITE</rdf:li>
|
||||
</rdf:Alt>
|
||||
</dc:description>
|
||||
<dc:subject>
|
||||
<rdf:Bag>
|
||||
<rdf:li>PDF</rdf:li>
|
||||
<rdf:li>DATASHEET</rdf:li>
|
||||
<rdf:li>PDF DATASHEET</rdf:li>
|
||||
<rdf:li>IC</rdf:li>
|
||||
<rdf:li>CHIP</rdf:li>
|
||||
<rdf:li>SEMICONDUCTOR</rdf:li>
|
||||
<rdf:li>TRANSISTOR</rdf:li>
|
||||
<rdf:li>ELECTRONIC COMPONENT</rdf:li>
|
||||
<rdf:li>ISO COMPONENT</rdf:li>
|
||||
<rdf:li>ALLDATASHEET</rdf:li>
|
||||
<rdf:li>DATABOOK</rdf:li>
|
||||
<rdf:li>CATALOG</rdf:li>
|
||||
<rdf:li>ARCHIVE</rdf:li>
|
||||
</rdf:Bag>
|
||||
</dc:subject>
|
||||
</rdf:Description>
|
||||
<rdf:Description rdf:about=""
|
||||
xmlns:pdfx="http://ns.adobe.com/pdfx/1.3/">
|
||||
<pdfx:_reationDate>D:20091209171130+08'00'</pdfx:_reationDate>
|
||||
<pdfx:_reator>pdfFactory Pro www.fineprint.cn</pdfx:_reator>
|
||||
<pdfx:_roducer>pdfFactory Pro 3.16 (Windows XP Professional Chinese)</pdfx:_roducer>
|
||||
</rdf:Description>
|
||||
<rdf:Description rdf:about=""
|
||||
xmlns:pdf="http://ns.adobe.com/pdf/1.3/">
|
||||
<pdf:Keywords>PDF, DATASHEET, PDF DATASHEET, IC, CHIP, SEMICONDUCTOR, TRANSISTOR, ELECTRONIC COMPONENT, ISO COMPONENT, ALLDATASHEET, DATABOOK, CATALOG, ARCHIVE</pdf:Keywords>
|
||||
</rdf:Description>
|
||||
<rdf:Description rdf:about=""
|
||||
xmlns:xmp="http://ns.adobe.com/xap/1.0/">
|
||||
<xmp:ModifyDate>2019-04-08T11:26:17+09:00</xmp:ModifyDate>
|
||||
<xmp:CreateDate>2019-04-08T11:26:17+09:00</xmp:CreateDate>
|
||||
<xmp:MetadataDate>2019-04-08T11:26:17+09:00</xmp:MetadataDate>
|
||||
</rdf:Description>
|
||||
<rdf:Description rdf:about=""
|
||||
xmlns:xmpMM="http://ns.adobe.com/xap/1.0/mm/">
|
||||
<xmpMM:DocumentID>uuid:04c8c137-1a4e-4765-9839-dd92a8631224</xmpMM:DocumentID>
|
||||
<xmpMM:InstanceID>uuid:c1ff7b8c-1d00-40d0-bd2f-1e0f374798cd</xmpMM:InstanceID>
|
||||
</rdf:Description>
|
||||
</rdf:RDF>
|
||||
</x:xmpmeta>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
<?xpacket end="w"?>
|
||||
endstream␍endobj␍123 0 obj␍<</Count 35/First 125 0 R/Last 125 0 R/Type/Outlines>>␍endobj␍3 0 obj␍<</Count 14/Kids[6 0 R 14 0 R 21 0 R 24 0 R 27 0 R 30 0 R 33 0 R 36 0 R 39 0 R 43 0 R 46 0 R 54 0 R 65 0 R 80 0 R]/Type/Pages>>␍endobj␍124 0 obj␍<</DisplayDocTitle true/Type/ViewerPreferences>>␍endobj␍6 0 obj␍<</Contents 4 0 R/MediaBox[0 0 595 842]/Parent 3 0 R/Resources<</Font<</F1 8 0 R/F1+1 7 0 R/F2 9 0 R/F3 10 0 R/F4 11 0 R>>/ProcSet[/PDF/Text]>>/Type/Page>>␍endobj␍14 0 obj␍<</Contents 12 0 R/MediaBox[0 0 595 842]/Parent 3 0 R/Resources<</Font<</F1 8 0 R/F1+1 7 0 R/F2 9 0 R/F3 10 0 R>>/ProcSet[/PDF/Text/ImageC/ImageI]/XObject<</im1 15 0 R>>>>/Type/Page>>␍endobj␍21 0 obj␍<</Contents 19 0 R/MediaBox[0 0 595 842]/Parent 3 0 R/Resources<</Font<</F1 8 0 R/F2 9 0 R/F3 10 0 R>>/ProcSet[/PDF/Text]>>/Type/Page>>␍endobj␍24 0 obj␍<</Contents 22 0 R/MediaBox[0 0 595 842]/Parent 3 0 R/Resources<</Font<</F1 8 0 R/F2 9 0 R>>/ProcSet[/PDF/Text]>>/Type/Page>>␍endobj␍27 0 obj␍<</Contents 25 0 R/MediaBox[0 0 595 842]/Parent 3 0 R/Resources<</Font<</F1 8 0 R/F2 9 0 R>>/ProcSet[/PDF/Text]>>/Type/Page>>␍endobj␍30 0 obj␍<</Contents 28 0 R/MediaBox[0 0 595 842]/Parent 3 0 R/Resources<</Font<</F1 8 0 R/F1+1 7 0 R/F2 9 0 R/F3 10 0 R>>/ProcSet[/PDF/Text]>>/Type/Page>>␍endobj␍33 0 obj␍<</Contents 31 0 R/MediaBox[0 0 595 842]/Parent 3 0 R/Resources<</Font<</F1 8 0 R/F1+1 7 0 R/F2 9 0 R>>/ProcSet[/PDF/Text]>>/Type/Page>>␍endobj␍36 0 obj␍<</Contents 34 0 R/MediaBox[0 0 595 842]/Parent 3 0 R/Resources<</Font<</F1 8 0 R/F1+1 7 0 R/F2 9 0 R>>/ProcSet[/PDF/Text]>>/Type/Page>>␍endobj␍39 0 obj␍<</Contents 37 0 R/MediaBox[0 0 595 842]/Parent 3 0 R/Resources<</Font<</F1 8 0 R/F2 9 0 R/F5+1 40 0 R>>/ProcSet[/PDF/Text]>>/Type/Page>>␍endobj␍43 0 obj␍<</Contents 41 0 R/MediaBox[0 0 595 842]/Parent 3 0 R/Resources<</Font<</F1 8 0 R/F1+1 7 0 R/F2 9 0 R/F5+1 40 0 R>>/ProcSet[/PDF/Text]>>/Type/Page>>␍endobj␍46 0 obj␍<</Contents 44 0 R/MediaBox[0 0 595 842]/Parent 3 0 R/Resources<</Font<</F1 8 0 R/F1+1 7 0 R/F2 9 0 R/F3 10 0 R/F6+1 51 0 R>>/ProcSet[/PDF/Text/ImageC/ImageI]/XObject<</im2 47 0 R>>>>/Type/Page>>␍endobj␍54 0 obj␍<</Contents 52 0 R/MediaBox[0 0 595 842]/Parent 3 0 R/Resources<</Font<</F1 8 0 R/F1+1 7 0 R/F2 9 0 R/F3 10 0 R>>/ProcSet[/PDF/Text/ImageC/ImageI]/XObject<</im3 55 0 R/im4 59 0 R>>>>/Type/Page>>␍endobj␍65 0 obj␍<</Contents 63 0 R/MediaBox[0 0 595 842]/Parent 3 0 R/Resources<</Font<</F1 8 0 R/F2 9 0 R/F3 10 0 R>>/ProcSet[/PDF/Text/ImageC/ImageI]/XObject<</im5 66 0 R/im6 70 0 R/im7 74 0 R>>>>/Type/Page>>␍endobj␍80 0 obj␍<</Contents 78 0 R/MediaBox[0 0 595 842]/Parent 3 0 R/Resources<</Font<</F1 8 0 R/F2 9 0 R/F3 10 0 R>>/ProcSet[/PDF/Text/ImageC/ImageI]/XObject<</im8 81 0 R/im9 85 0 R>>>>/Type/Page>>␍endobj␍78 0 obj␍<</Filter/FlateDecode/Length 1909>>stream
|
||||
H‰íWMoÜ6½ûWÈ%²´H}¬tµ� =¤hë␍й$ëõGc¯·±7nòëKIErf(J»NÜ¢ðÁ+‰gÞ¼ys´88|-XÅ…d‹óƒ¢ä¢`óJpY²Å ›%<Éeª¾-ÙóŶøó i~_¶¿y’&óöëJ¿í#kÕþ4ËŠ¬yuö|è‰4O‹æÕ=½¨u
|
||||
<QŸeRÕN[®øÎ¡ùþÊÖÙ[³#/ªvÇ9±#)Ó¤Ýtl6%Ý¥ßX®¦™wˆ ,ög¾Þ-1ïã.OÛ<‡Á¸ê"f®òÙ,*çEkùŽrÅÚöþEóJrýÌô£vŽ1ö¿·Ámz^-dYñJ²¹úWfmq$<+Ùç;?8Rß«ª6Ð׉¶£¶Ÿ×;ç\²¬¨÷©Çfß_,Íç�)õ'ÊŒç+óúœLVÿ–7ìðê¦d'·ìWµZ²^Ò¬–sžeL¤¢>Vf%W h—Wíò£¶ŽERoQ…¬<WžÍ•‰j'Ê�DÎË̪ã…DB–:±ˆdæ‚H?oôó\ƒ£C�Bcj Ý{v¶=~réÁÎ÷ÅNWÔ˕Еkèð7ÊÔÌŽÞæŽ1ûÎØ0fO-žÐN!6üÀ%.␍õGܘ Vî«vÇvM%ǹÙ2&H†#ËL÷€+Ì7�͵}«��¼ký«à×j:&è-Œ÷1<ç’‚4wc‘XÇõÇŸ�Ož©Í6P!0l>æ=`P�ò¦ößn/ðõTxïâ= ¬*ƒ7»B�05~mOÌJ··C﬚YéxHQóøLä¼èT„_oê
|
||||
~Žë‡”m?#‘LàчòšŽV�‡i‘Æä-Š1¯^í]%¸nãn¦59›¯ | ||||