-
Notifications
You must be signed in to change notification settings - Fork 12
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #223 from mcci-catena/issue222
Fix #222: change all LoRaWAN classes to use Arduino_LoRaWAN_network
- Loading branch information
Showing
7 changed files
with
35 additions
and
155 deletions.
There are no files selected for viewing
This file contains 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
This file contains 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
This file contains 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
This file contains 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
This file contains 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
This file contains 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
This file contains 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 |
---|---|---|
@@ -1,40 +1,17 @@ | ||
/* CatenaWingFram2k.h Wed Dec 05 2018 14:15:16 chwon */ | ||
|
||
/* | ||
Module: CatenaWingFram2k.h | ||
Function: | ||
class CatenaWingFram2k: CatenaBase Platform to represent a Catena | ||
Feather Wing with 2k FRAM and the DIO1>D6 loopback. | ||
Version: | ||
V0.12.0 Wed Dec 05 2018 14:15:17 chwon Edit level 3 | ||
Feather Wing with 2k FRAM and the DIO1>D6 loopback. | ||
Copyright notice: | ||
This file copyright (C) 2017-2018 by | ||
MCCI Corporation | ||
3520 Krums Corners Road | ||
Ithaca, NY 14850 | ||
See LICENSE file accompanying this project. | ||
An unpublished work. All rights reserved. | ||
This file is proprietary information, and may not be disclosed or | ||
copied without the prior permission of MCCI Corporation. | ||
Author: | ||
Terry Moore, MCCI Corporation March 2017 | ||
Revision history: | ||
0.5.0 Sun Mar 12 2017 18:16:07 tmm | ||
Module created. | ||
0.12.0 Wed Dec 05 2018 14:15:17 chwon | ||
Use CatenaSamd21 super class instead of CatenaFeatherM0LoRa class. | ||
Remove GetSysEUI() and GetPlatformForID() methods override. | ||
Add ReadVbat() and add getFRAM() method override. | ||
*/ | ||
|
||
#ifndef _CATENAWINGFRAM2K_H_ /* prevent multiple includes */ | ||
|
@@ -50,7 +27,7 @@ Revision history: | |
# include "Catena_Fram2k.h" | ||
#endif | ||
|
||
#include <Arduino_LoRaWAN_ttn.h> | ||
#include <Arduino_LoRaWAN_network.h> | ||
|
||
// | ||
// TODO([email protected]) | ||
|
@@ -126,11 +103,11 @@ class CatenaWingFram2k : public CatenaSamd21 | |
|| The LoRaWAN class for the Catena Wings. Needed because we have a | ||
|| specific storage implementation and pin table. | ||
*/ | ||
class CatenaWingFram2k::LoRaWAN : public Arduino_LoRaWAN_ttn, | ||
class CatenaWingFram2k::LoRaWAN : public Arduino_LoRaWAN_network, | ||
public McciCatena::cPollableObject | ||
{ | ||
public: | ||
using Super = Arduino_LoRaWAN_ttn; | ||
using Super = Arduino_LoRaWAN_network; | ||
|
||
/* | ||
|| the constructor. We don't do anything at this level, the | ||
|