Skip to content

Commit 4f367e2

Browse files
author
Daniel Jäckle
committed
Merge branch 'release/v4.3.1'
2 parents 263d611 + 6bb0356 commit 4f367e2

File tree

648 files changed

+142103
-57330
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

648 files changed

+142103
-57330
lines changed

‎.gitignore‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ bin/
66
*.uvgui_*.bak
77
*.uvguix.*
88
*.uvguix_*.bak
9-
*.uvoptx
109
*_uvopt.bak
1110
*_uvoptx.bak
1211
*_uvproj.bak

‎Doc/MoteII-datasheet.pdf‎

1.93 MB
Binary file not shown.

‎Doc/MoteII-schematic.pdf‎

883 KB
Binary file not shown.

‎Doc/NAMote72-schematic.pdf‎

88.8 KB
Binary file not shown.

‎Doc/SensorNode-schematic.pdf‎

483 KB
Binary file not shown.

‎Doc/iM881A_Datasheet.pdf‎

784 KB
Binary file not shown.

‎Keil/LoRaMote/Bootloader/BootLoader.uvopt‎

Lines changed: 12 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
<tExt>*.txt; *.h; *.inc</tExt>
1414
<pExt>*.plm</pExt>
1515
<CppX>*.cpp</CppX>
16+
<nMigrate>0</nMigrate>
1617
</Extensions>
1718

1819
<DaveTm>
@@ -31,6 +32,7 @@
3132
<BeepAtEnd>1</BeepAtEnd>
3233
<RunSim>0</RunSim>
3334
<RunTarget>1</RunTarget>
35+
<RunAbUc>0</RunAbUc>
3436
</OPTTT>
3537
<OPTHX>
3638
<HexSelection>1</HexSelection>
@@ -135,7 +137,7 @@
135137
<SetRegEntry>
136138
<Number>0</Number>
137139
<Key>ST-LINKIII-KEIL_SWO</Key>
138-
<Name>-U-O2255 -O10447 -S3 -C0 -N00("ARM CoreSight SW-DP") -D00(2BA01477) -L00(0) -TO18 -TC10000000 -TP21 -TDS8004 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO7 -FD20000000 -FC800 -FN1 -FF0STM32L1xx_128.FLM -FS08000000 -FL020000 -FP0($$Device:STM32L151CB$Flash\STM32L1xx_128.FLM)</Name>
140+
<Name>-U-O2255 -O10447 -S3 -C0 -A0 -N00("ARM CoreSight SW-DP") -D00(2BA01477) -L00(0) -TO18 -TC10000000 -TP21 -TDS8004 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO7 -FD20000000 -FC800 -FN1 -FF0STM32L1xx_128 -FS08000000 -FL020000</Name>
139141
</SetRegEntry>
140142
<SetRegEntry>
141143
<Number>0</Number>
@@ -192,6 +194,10 @@
192194
</DebugFlag>
193195
<LintExecutable></LintExecutable>
194196
<LintConfigFile></LintConfigFile>
197+
<bLintAuto>0</bLintAuto>
198+
<Lin2Executable></Lin2Executable>
199+
<Lin2ConfigFile></Lin2ConfigFile>
200+
<bLin2Auto>0</bLin2Auto>
195201
</TargetOption>
196202
</Target>
197203

@@ -206,7 +212,6 @@
206212
<FileNumber>1</FileNumber>
207213
<FileType>1</FileType>
208214
<tvExp>0</tvExp>
209-
<Focus>0</Focus>
210215
<tvExpOptDlg>0</tvExpOptDlg>
211216
<bDave2>0</bDave2>
212217
<PathWithFileName>..\..\..\src\apps\bootloader\LoRaMote\main.c</PathWithFileName>
@@ -227,7 +232,6 @@
227232
<FileNumber>2</FileNumber>
228233
<FileType>1</FileType>
229234
<tvExp>0</tvExp>
230-
<Focus>0</Focus>
231235
<tvExpOptDlg>0</tvExpOptDlg>
232236
<bDave2>0</bDave2>
233237
<PathWithFileName>..\..\..\src\boards\LoRaMote\gpio-board.c</PathWithFileName>
@@ -240,7 +244,6 @@
240244
<FileNumber>3</FileNumber>
241245
<FileType>1</FileType>
242246
<tvExp>0</tvExp>
243-
<Focus>0</Focus>
244247
<tvExpOptDlg>0</tvExpOptDlg>
245248
<bDave2>0</bDave2>
246249
<PathWithFileName>..\..\..\src\boards\LoRaMote\i2c-board.c</PathWithFileName>
@@ -261,11 +264,10 @@
261264
<FileNumber>4</FileNumber>
262265
<FileType>2</FileType>
263266
<tvExp>0</tvExp>
264-
<Focus>0</Focus>
265267
<tvExpOptDlg>0</tvExpOptDlg>
266268
<bDave2>0</bDave2>
267-
<PathWithFileName>..\..\..\src\boards\LoRaMote\cmsis\arm-std\startup_stm32l1xx_md.s</PathWithFileName>
268-
<FilenameWithoutPath>startup_stm32l1xx_md.s</FilenameWithoutPath>
269+
<PathWithFileName>..\..\..\src\boards\LoRaMote\cmsis\arm-std\startup_stm32l151xb.s</PathWithFileName>
270+
<FilenameWithoutPath>startup_stm32l151xb.s</FilenameWithoutPath>
269271
<RteFlg>0</RteFlg>
270272
<bShared>0</bShared>
271273
</File>
@@ -274,7 +276,6 @@
274276
<FileNumber>5</FileNumber>
275277
<FileType>1</FileType>
276278
<tvExp>0</tvExp>
277-
<Focus>0</Focus>
278279
<tvExpOptDlg>0</tvExpOptDlg>
279280
<bDave2>0</bDave2>
280281
<PathWithFileName>..\..\..\src\boards\LoRaMote\cmsis\system_stm32l1xx.c</PathWithFileName>
@@ -286,7 +287,7 @@
286287

287288
<Group>
288289
<GroupName>boards\LoRaMote\usb</GroupName>
289-
<tvExp>1</tvExp>
290+
<tvExp>0</tvExp>
290291
<tvExpOptDlg>0</tvExpOptDlg>
291292
<cbSel>0</cbSel>
292293
<RteFlg>0</RteFlg>
@@ -295,7 +296,6 @@
295296
<FileNumber>6</FileNumber>
296297
<FileType>1</FileType>
297298
<tvExp>0</tvExp>
298-
<Focus>0</Focus>
299299
<tvExpOptDlg>0</tvExpOptDlg>
300300
<bDave2>0</bDave2>
301301
<PathWithFileName>..\..\..\src\boards\LoRaMote\usb\dfu\src\usbd_conf.c</PathWithFileName>
@@ -308,7 +308,6 @@
308308
<FileNumber>7</FileNumber>
309309
<FileType>1</FileType>
310310
<tvExp>0</tvExp>
311-
<Focus>0</Focus>
312311
<tvExpOptDlg>0</tvExpOptDlg>
313312
<bDave2>0</bDave2>
314313
<PathWithFileName>..\..\..\src\boards\LoRaMote\usb\dfu\src\usbd_desc.c</PathWithFileName>
@@ -321,7 +320,6 @@
321320
<FileNumber>8</FileNumber>
322321
<FileType>1</FileType>
323322
<tvExp>0</tvExp>
324-
<Focus>0</Focus>
325323
<tvExpOptDlg>0</tvExpOptDlg>
326324
<bDave2>0</bDave2>
327325
<PathWithFileName>..\..\..\src\boards\LoRaMote\usb\dfu\src\usbd_dfu_flash.c</PathWithFileName>
@@ -333,7 +331,7 @@
333331

334332
<Group>
335333
<GroupName>boards\LoRaMote\STM32_USB_Device_Library\Class</GroupName>
336-
<tvExp>1</tvExp>
334+
<tvExp>0</tvExp>
337335
<tvExpOptDlg>0</tvExpOptDlg>
338336
<cbSel>0</cbSel>
339337
<RteFlg>0</RteFlg>
@@ -342,7 +340,6 @@
342340
<FileNumber>9</FileNumber>
343341
<FileType>1</FileType>
344342
<tvExp>0</tvExp>
345-
<Focus>0</Focus>
346343
<tvExpOptDlg>0</tvExpOptDlg>
347344
<bDave2>0</bDave2>
348345
<PathWithFileName>..\..\..\src\boards\mcu\stm32\STM32_USB_Device_Library\Class\DFU\Src\usbd_dfu.c</PathWithFileName>
@@ -354,7 +351,7 @@
354351

355352
<Group>
356353
<GroupName>boards\LoRaMote\STM32_USB_Device_Library\Core</GroupName>
357-
<tvExp>1</tvExp>
354+
<tvExp>0</tvExp>
358355
<tvExpOptDlg>0</tvExpOptDlg>
359356
<cbSel>0</cbSel>
360357
<RteFlg>0</RteFlg>
@@ -363,7 +360,6 @@
363360
<FileNumber>10</FileNumber>
364361
<FileType>1</FileType>
365362
<tvExp>0</tvExp>
366-
<Focus>0</Focus>
367363
<tvExpOptDlg>0</tvExpOptDlg>
368364
<bDave2>0</bDave2>
369365
<PathWithFileName>..\..\..\src\boards\mcu\stm32\STM32_USB_Device_Library\Core\Src\usbd_core.c</PathWithFileName>
@@ -376,7 +372,6 @@
376372
<FileNumber>11</FileNumber>
377373
<FileType>1</FileType>
378374
<tvExp>0</tvExp>
379-
<Focus>0</Focus>
380375
<tvExpOptDlg>0</tvExpOptDlg>
381376
<bDave2>0</bDave2>
382377
<PathWithFileName>..\..\..\src\boards\mcu\stm32\STM32_USB_Device_Library\Core\Src\usbd_ctlreq.c</PathWithFileName>
@@ -389,7 +384,6 @@
389384
<FileNumber>12</FileNumber>
390385
<FileType>1</FileType>
391386
<tvExp>0</tvExp>
392-
<Focus>0</Focus>
393387
<tvExpOptDlg>0</tvExpOptDlg>
394388
<bDave2>0</bDave2>
395389
<PathWithFileName>..\..\..\src\boards\mcu\stm32\STM32_USB_Device_Library\Core\Src\usbd_ioreq.c</PathWithFileName>
@@ -410,7 +404,6 @@
410404
<FileNumber>13</FileNumber>
411405
<FileType>1</FileType>
412406
<tvExp>0</tvExp>
413-
<Focus>0</Focus>
414407
<tvExpOptDlg>0</tvExpOptDlg>
415408
<bDave2>0</bDave2>
416409
<PathWithFileName>..\..\..\src\boards\mcu\stm32\STM32L1xx_HAL_Driver\Src\stm32l1xx_hal.c</PathWithFileName>
@@ -423,7 +416,6 @@
423416
<FileNumber>14</FileNumber>
424417
<FileType>1</FileType>
425418
<tvExp>0</tvExp>
426-
<Focus>0</Focus>
427419
<tvExpOptDlg>0</tvExpOptDlg>
428420
<bDave2>0</bDave2>
429421
<PathWithFileName>..\..\..\src\boards\mcu\stm32\STM32L1xx_HAL_Driver\Src\stm32l1xx_hal_cortex.c</PathWithFileName>
@@ -436,7 +428,6 @@
436428
<FileNumber>15</FileNumber>
437429
<FileType>1</FileType>
438430
<tvExp>0</tvExp>
439-
<Focus>0</Focus>
440431
<tvExpOptDlg>0</tvExpOptDlg>
441432
<bDave2>0</bDave2>
442433
<PathWithFileName>..\..\..\src\boards\mcu\stm32\STM32L1xx_HAL_Driver\Src\stm32l1xx_hal_dma.c</PathWithFileName>
@@ -449,7 +440,6 @@
449440
<FileNumber>16</FileNumber>
450441
<FileType>1</FileType>
451442
<tvExp>0</tvExp>
452-
<Focus>0</Focus>
453443
<tvExpOptDlg>0</tvExpOptDlg>
454444
<bDave2>0</bDave2>
455445
<PathWithFileName>..\..\..\src\boards\mcu\stm32\STM32L1xx_HAL_Driver\Src\stm32l1xx_hal_flash.c</PathWithFileName>
@@ -462,7 +452,6 @@
462452
<FileNumber>17</FileNumber>
463453
<FileType>1</FileType>
464454
<tvExp>0</tvExp>
465-
<Focus>0</Focus>
466455
<tvExpOptDlg>0</tvExpOptDlg>
467456
<bDave2>0</bDave2>
468457
<PathWithFileName>..\..\..\src\boards\mcu\stm32\STM32L1xx_HAL_Driver\Src\stm32l1xx_hal_flash_ex.c</PathWithFileName>
@@ -475,7 +464,6 @@
475464
<FileNumber>18</FileNumber>
476465
<FileType>1</FileType>
477466
<tvExp>0</tvExp>
478-
<Focus>0</Focus>
479467
<tvExpOptDlg>0</tvExpOptDlg>
480468
<bDave2>0</bDave2>
481469
<PathWithFileName>..\..\..\src\boards\mcu\stm32\STM32L1xx_HAL_Driver\Src\stm32l1xx_hal_flash_ramfunc.c</PathWithFileName>
@@ -488,7 +476,6 @@
488476
<FileNumber>19</FileNumber>
489477
<FileType>1</FileType>
490478
<tvExp>0</tvExp>
491-
<Focus>0</Focus>
492479
<tvExpOptDlg>0</tvExpOptDlg>
493480
<bDave2>0</bDave2>
494481
<PathWithFileName>..\..\..\src\boards\mcu\stm32\STM32L1xx_HAL_Driver\Src\stm32l1xx_hal_gpio.c</PathWithFileName>
@@ -501,7 +488,6 @@
501488
<FileNumber>20</FileNumber>
502489
<FileType>1</FileType>
503490
<tvExp>0</tvExp>
504-
<Focus>0</Focus>
505491
<tvExpOptDlg>0</tvExpOptDlg>
506492
<bDave2>0</bDave2>
507493
<PathWithFileName>..\..\..\src\boards\mcu\stm32\STM32L1xx_HAL_Driver\Src\stm32l1xx_hal_i2c.c</PathWithFileName>
@@ -514,7 +500,6 @@
514500
<FileNumber>21</FileNumber>
515501
<FileType>1</FileType>
516502
<tvExp>0</tvExp>
517-
<Focus>0</Focus>
518503
<tvExpOptDlg>0</tvExpOptDlg>
519504
<bDave2>0</bDave2>
520505
<PathWithFileName>..\..\..\src\boards\mcu\stm32\STM32L1xx_HAL_Driver\Src\stm32l1xx_hal_pcd.c</PathWithFileName>
@@ -527,7 +512,6 @@
527512
<FileNumber>22</FileNumber>
528513
<FileType>1</FileType>
529514
<tvExp>0</tvExp>
530-
<Focus>0</Focus>
531515
<tvExpOptDlg>0</tvExpOptDlg>
532516
<bDave2>0</bDave2>
533517
<PathWithFileName>..\..\..\src\boards\mcu\stm32\STM32L1xx_HAL_Driver\Src\stm32l1xx_hal_pcd_ex.c</PathWithFileName>
@@ -540,7 +524,6 @@
540524
<FileNumber>23</FileNumber>
541525
<FileType>1</FileType>
542526
<tvExp>0</tvExp>
543-
<Focus>0</Focus>
544527
<tvExpOptDlg>0</tvExpOptDlg>
545528
<bDave2>0</bDave2>
546529
<PathWithFileName>..\..\..\src\boards\mcu\stm32\STM32L1xx_HAL_Driver\Src\stm32l1xx_hal_pwr.c</PathWithFileName>
@@ -553,7 +536,6 @@
553536
<FileNumber>24</FileNumber>
554537
<FileType>1</FileType>
555538
<tvExp>0</tvExp>
556-
<Focus>0</Focus>
557539
<tvExpOptDlg>0</tvExpOptDlg>
558540
<bDave2>0</bDave2>
559541
<PathWithFileName>..\..\..\src\boards\mcu\stm32\STM32L1xx_HAL_Driver\Src\stm32l1xx_hal_pwr_ex.c</PathWithFileName>
@@ -566,7 +548,6 @@
566548
<FileNumber>25</FileNumber>
567549
<FileType>1</FileType>
568550
<tvExp>0</tvExp>
569-
<Focus>0</Focus>
570551
<tvExpOptDlg>0</tvExpOptDlg>
571552
<bDave2>0</bDave2>
572553
<PathWithFileName>..\..\..\src\boards\mcu\stm32\STM32L1xx_HAL_Driver\Src\stm32l1xx_hal_rcc.c</PathWithFileName>
@@ -579,7 +560,6 @@
579560
<FileNumber>26</FileNumber>
580561
<FileType>1</FileType>
581562
<tvExp>0</tvExp>
582-
<Focus>0</Focus>
583563
<tvExpOptDlg>0</tvExpOptDlg>
584564
<bDave2>0</bDave2>
585565
<PathWithFileName>..\..\..\src\boards\mcu\stm32\STM32L1xx_HAL_Driver\Src\stm32l1xx_hal_rcc_ex.c</PathWithFileName>
@@ -592,7 +572,6 @@
592572
<FileNumber>27</FileNumber>
593573
<FileType>1</FileType>
594574
<tvExp>0</tvExp>
595-
<Focus>0</Focus>
596575
<tvExpOptDlg>0</tvExpOptDlg>
597576
<bDave2>0</bDave2>
598577
<PathWithFileName>..\..\..\src\boards\mcu\stm32\STM32L1xx_HAL_Driver\Src\stm32l1xx_hal_rtc.c</PathWithFileName>
@@ -605,7 +584,6 @@
605584
<FileNumber>28</FileNumber>
606585
<FileType>1</FileType>
607586
<tvExp>0</tvExp>
608-
<Focus>0</Focus>
609587
<tvExpOptDlg>0</tvExpOptDlg>
610588
<bDave2>0</bDave2>
611589
<PathWithFileName>..\..\..\src\boards\mcu\stm32\STM32L1xx_HAL_Driver\Src\stm32l1xx_hal_rtc_ex.c</PathWithFileName>
@@ -618,7 +596,6 @@
618596
<FileNumber>29</FileNumber>
619597
<FileType>1</FileType>
620598
<tvExp>0</tvExp>
621-
<Focus>0</Focus>
622599
<tvExpOptDlg>0</tvExpOptDlg>
623600
<bDave2>0</bDave2>
624601
<PathWithFileName>..\..\..\src\boards\mcu\stm32\STM32L1xx_HAL_Driver\Src\stm32l1xx_hal_spi.c</PathWithFileName>
@@ -631,7 +608,6 @@
631608
<FileNumber>30</FileNumber>
632609
<FileType>1</FileType>
633610
<tvExp>0</tvExp>
634-
<Focus>0</Focus>
635611
<tvExpOptDlg>0</tvExpOptDlg>
636612
<bDave2>0</bDave2>
637613
<PathWithFileName>..\..\..\src\boards\mcu\stm32\STM32L1xx_HAL_Driver\Src\stm32l1xx_hal_spi_ex.c</PathWithFileName>
@@ -652,7 +628,6 @@
652628
<FileNumber>31</FileNumber>
653629
<FileType>1</FileType>
654630
<tvExp>0</tvExp>
655-
<Focus>0</Focus>
656631
<tvExpOptDlg>0</tvExpOptDlg>
657632
<bDave2>0</bDave2>
658633
<PathWithFileName>..\..\..\src\boards\mcu\stm32\sysIrqHandlers.c</PathWithFileName>
@@ -673,7 +648,6 @@
673648
<FileNumber>32</FileNumber>
674649
<FileType>1</FileType>
675650
<tvExp>0</tvExp>
676-
<Focus>0</Focus>
677651
<tvExpOptDlg>0</tvExpOptDlg>
678652
<bDave2>0</bDave2>
679653
<PathWithFileName>..\..\..\src\peripherals\gpio-ioe.c</PathWithFileName>
@@ -686,7 +660,6 @@
686660
<FileNumber>33</FileNumber>
687661
<FileType>1</FileType>
688662
<tvExp>0</tvExp>
689-
<Focus>0</Focus>
690663
<tvExpOptDlg>0</tvExpOptDlg>
691664
<bDave2>0</bDave2>
692665
<PathWithFileName>..\..\..\src\peripherals\sx1509.c</PathWithFileName>
@@ -699,7 +672,6 @@
699672
<FileNumber>34</FileNumber>
700673
<FileType>1</FileType>
701674
<tvExp>0</tvExp>
702-
<Focus>0</Focus>
703675
<tvExpOptDlg>0</tvExpOptDlg>
704676
<bDave2>0</bDave2>
705677
<PathWithFileName>..\..\..\src\peripherals\sx9500.c</PathWithFileName>
@@ -720,7 +692,6 @@
720692
<FileNumber>35</FileNumber>
721693
<FileType>1</FileType>
722694
<tvExp>0</tvExp>
723-
<Focus>0</Focus>
724695
<tvExpOptDlg>0</tvExpOptDlg>
725696
<bDave2>0</bDave2>
726697
<PathWithFileName>..\..\..\src\system\gpio.c</PathWithFileName>
@@ -733,7 +704,6 @@
733704
<FileNumber>36</FileNumber>
734705
<FileType>1</FileType>
735706
<tvExp>0</tvExp>
736-
<Focus>0</Focus>
737707
<tvExpOptDlg>0</tvExpOptDlg>
738708
<bDave2>0</bDave2>
739709
<PathWithFileName>..\..\..\src\system\i2c.c</PathWithFileName>

0 commit comments

Comments
 (0)