Fix #339: remove more artifacts of old boards.

Removed header files, source files, platform object names; updated dangling references in docs.
mcci-catena · Jun 14, 2022 · 7054ded · 7054ded
1 parent 3293cae
commit 7054ded
Show file tree

Hide file tree

Showing 14 changed files with 17 additions and 580 deletions.
diff --git a/README.md b/README.md
diff --git a/assets/CatenaBase.plantuml b/assets/CatenaBase.plantuml
@@ -133,14 +133,6 @@ abstract class CatenaStm32L0 {
 }
 
 
-abstract class Catena455x {
-  +enum ANALOG_PINS;
-  +enum DIGITAL_PINS;
-  +bool begin();
-  +float ReadVbat() const;
-  +float ReadVbus() const;
-}
-
 abstract class Catena461x {
   +enum ANALOG_PINS;
   +enum DIGITAL_PINS;
@@ -213,40 +205,20 @@ class Catena4470 {
 !endif
 
 !if ($enableStm32 == 1)
-class Catena4551 {
-  +const char *CatenaName() const;
-  -{static}const CATENA_PLATFORM(* const vPlatforms[]);
-  -{static}const size_t nvPlatforms;
-}
-
 class Catena4610 {
   +const char *CatenaName() const;
   #void getPlatformTable();
   -{static}const CATENA_PLATFORM(* const vPlatforms[]);
   -{static}const size_t nvPlatforms;
 }
 
-class Catena4611 {
-  +const char *CatenaName() const;
-  #void getPlatformTable();
-  -{static}const CATENA_PLATFORM(* const vPlatforms[]);
-  -{static}const size_t nvPlatforms;
-}
-
 class Catena4612 {
   +const char *CatenaName() const;
   #void getPlatformTable();
   -{static}const CATENA_PLATFORM(* const vPlatforms[]);
   -{static}const size_t nvPlatforms;
 }
 
-class Catena4617 {
-  +const char *CatenaName() const;
-  #void getPlatformTable();
-  -{static}const CATENA_PLATFORM(* const vPlatforms[]);
-  -{static}const size_t nvPlatforms;
-}
-
 class Catena4618 {
   +const char *CatenaName() const;
   #void getPlatformTable();
@@ -297,16 +269,12 @@ CatenaWingFram2k <|-- Catena4470
 
 !if ($enableStm32 == 1)
 CatenaStm32 <|-- CatenaStm32L0
-CatenaStm32L0 <|-- Catena455x
 CatenaStm32L0 <|-- Catena461x
 CatenaStm32L0 <|-- Catena463x
 CatenaStm32L0 <|-- Catena480x
 
-Catena455x <|-- Catena4551
 Catena461x <|-- Catena4610
-Catena461x <|-- Catena4611
 Catena461x <|-- Catena4612
-Catena461x <|-- Catena4617
 Catena461x <|-- Catena4618
 Catena463x <|-- Catena4630
 Catena480x <|-- Catena4801

diff --git a/assets/Catena_PollableInterface.plantuml b/assets/Catena_PollableInterface.plantuml
@@ -1,7 +1,7 @@
 @startuml
 /'
 
-Module:	CatenaBase.plantuml
+Module:	Catena_PollableInterface.plantuml
 
 Function:
 	PlantUML reference source for cPollableInterface class diagram.

diff --git a/keywords.txt b/keywords.txt
@@ -13,13 +13,8 @@ Catena4420	KEYWORD1
 Catena4450	KEYWORD1
 Catena4460	KEYWORD1
 Catena4470	KEYWORD1
-Catena4551	
-Catena4551	KEYWORD1
-Catena455x	KEYWORD1
 Catena4610	KEYWORD1
-Catena4611	KEYWORD1
 Catena4612	KEYWORD1
-Catena4617	KEYWORD1
 Catena4618	KEYWORD1
 Catena461x	KEYWORD1
 Catena4630	KEYWORD1

diff --git a/src/Catena455x.h b/src/Catena455x.h
diff --git a/src/Catena461x.h b/src/Catena461x.h
@@ -4,7 +4,7 @@ Module:  Catena461x.h
 
 Function:
 	class Catena461x: CatenaBase Platform to represent a Catena 461x
-	(4610, 4611, 4612, etc.)
+	(4610, 4612, etc.)
 
 Copyright notice:
 	See accompanying license file.
@@ -91,7 +91,7 @@ class Catena461x : public CatenaStm32L0
 	};
 
 /*
-|| The LoRaWAN class for the Catena 455x. Assumes The Things Network
+|| The LoRaWAN class for the Catena 461x. Assumes The Things Network
 */
 class Catena461x::LoRaWAN : public CatenaStm32L0::LoRaWAN
 	{

diff --git a/src/Catena463x.h b/src/Catena463x.h
@@ -80,7 +80,7 @@ class Catena463x : public CatenaStm32L0
 	};
 
 /*
-|| The LoRaWAN class for the Catena 455x. Assumes The Things Network
+|| The LoRaWAN class for the Catena 463x. Assumes The Things Network
 */
 class Catena463x::LoRaWAN : public CatenaStm32L0::LoRaWAN
 	{

diff --git a/src/Catena480x.h b/src/Catena480x.h
@@ -103,7 +103,7 @@ class Catena480x : public CatenaStm32L0
 	};
 
 /*
-|| The LoRaWAN class for the Catena 455x. Assumes The Things Network
+|| The LoRaWAN class for the Catena 480x. Assumes The Things Network
 */
 class Catena480x::LoRaWAN : public CatenaStm32L0::LoRaWAN
 	{

diff --git a/src/Catena_AppObjects.h b/src/Catena_AppObjects.h
@@ -121,14 +121,6 @@ namespace McciCatena {
 # define CATENA_PLATFORM_HAS_FRAM	0
 # define CATENA_PLATFORM_HAS_SPI2_AS_EXTERNAL	0
 # define CATENA_PLATFORM_HAS_DOWNLOAD	0
-#elif defined(ARDUINO_MCCI_CATENA_4551) || defined(ARDUINO_CATENA_4551)
-# define CATENA_PLATFORM_HAS_BOOTLOADER	0
-# define CATENA_PLATFORM_HAS_FLASH	1
-# define CATENA_PLATFORM_FLASH_TYPE	CATENA_PLATFORM_FLASH_TYPE_MX25V8035F
-# define CATENA_PLATFORM_HAS_FRAM	1
-# define CATENA_PLATFORM_FRAM_SIZE	8192
-# define CATENA_PLATFORM_HAS_DOWNLOAD	0
-# define CATENA_PLATFORM_HAS_SPI2_AS_EXTERNAL	1
 #elif defined(ARDUINO_MCCI_CATENA_4610)
 # define CATENA_PLATFORM_HAS_BOOTLOADER	1
 # define CATENA_PLATFORM_HAS_FLASH	1
@@ -137,14 +129,6 @@ namespace McciCatena {
 # define CATENA_PLATFORM_FRAM_SIZE	8192
 # define CATENA_PLATFORM_HAS_SPI2_AS_EXTERNAL	1
 # define CATENA_PLATFORM_HAS_DOWNLOAD	1
-#elif defined(ARDUINO_MCCI_CATENA_4611)
-# define CATENA_PLATFORM_HAS_BOOTLOADER	1
-# define CATENA_PLATFORM_HAS_FLASH	1
-# define CATENA_PLATFORM_FLASH_TYPE	CATENA_PLATFORM_FLASH_TYPE_MX25V8035F
-# define CATENA_PLATFORM_HAS_FRAM	1
-# define CATENA_PLATFORM_FRAM_SIZE	8192
-# define CATENA_PLATFORM_HAS_SPI2_AS_EXTERNAL	1
-# define CATENA_PLATFORM_HAS_DOWNLOAD	1
 #elif defined(ARDUINO_MCCI_CATENA_4612)
 # define CATENA_PLATFORM_HAS_BOOTLOADER	1
 # define CATENA_PLATFORM_HAS_FLASH	1
@@ -153,14 +137,6 @@ namespace McciCatena {
 # define CATENA_PLATFORM_FRAM_SIZE	8192
 # define CATENA_PLATFORM_HAS_SPI2_AS_EXTERNAL	1
 # define CATENA_PLATFORM_HAS_DOWNLOAD	1
-#elif defined(ARDUINO_MCCI_CATENA_4617)
-# define CATENA_PLATFORM_HAS_BOOTLOADER	1
-# define CATENA_PLATFORM_HAS_FLASH	1
-# define CATENA_PLATFORM_FLASH_TYPE	CATENA_PLATFORM_FLASH_TYPE_MX25V8035F
-# define CATENA_PLATFORM_HAS_FRAM	1
-# define CATENA_PLATFORM_FRAM_SIZE	8192
-# define CATENA_PLATFORM_HAS_SPI2_AS_EXTERNAL	1
-# define CATENA_PLATFORM_HAS_DOWNLOAD	1
 #elif defined(ARDUINO_MCCI_CATENA_4618)
 # define CATENA_PLATFORM_HAS_BOOTLOADER	1
 # define CATENA_PLATFORM_HAS_FLASH	1

diff --git a/src/Catena_Guids.h b/src/Catena_Guids.h
@@ -173,26 +173,6 @@ Copyright notice:
 #define GUID_HW_CATENA_4610_M104(f)		\
 	MCCIADK_GUID_GEN_INIT(f,  0xbfed4740, 0xa58a, 0x4ef6, 0x93, 0x3a, 0x09, 0xcb, 0x22, 0xe9, 0x3d, 0x00)
 
-// {9bb29dca-0685-4837-8182-3dfa309d279f}
-#define GUID_HW_CATENA_4611_BASE(f)		\
-	MCCIADK_GUID_GEN_INIT(f,  0x9bb29dca, 0x0685, 0x4837, 0x81, 0x82, 0x3d, 0xfa, 0x30, 0x9d, 0x27, 0x9f)
-
-// {4e995471-1570-4767-adae-6657ef871bcd}
-#define GUID_HW_CATENA_4611_M101(f)		\
-	MCCIADK_GUID_GEN_INIT(f,  0x4e995471, 0x1570, 0x4767, 0xad, 0xae, 0x66, 0x57, 0xef, 0x87, 0x1b, 0xcd)
-
-// {964bcf91-9c45-4386-a6e7-5f2d7c3641ef}
-#define GUID_HW_CATENA_4611_M102(f)		\
-	MCCIADK_GUID_GEN_INIT(f,  0x964bcf91, 0x9c45, 0x4386, 0xa6, 0xe7, 0x5f, 0x2d, 0x7c, 0x36, 0x41, 0xef)
-
-// {c85b27cb-7cf9-4025-92bb-2009c08449e5}
-#define GUID_HW_CATENA_4611_M103(f)		\
-	MCCIADK_GUID_GEN_INIT(f,  0xc85b27cb, 0x7cf9, 0x4025, 0x92, 0xbb, 0x20, 0x09, 0xc0, 0x84, 0x49, 0xe5)
-
-// {c22be8af-e693-4319-b243-1c2d10197973}
-#define GUID_HW_CATENA_4611_M104(f)		\
-	MCCIADK_GUID_GEN_INIT(f,  0xc22be8af, 0xe693, 0x4319, 0xb2, 0x43, 0x1c, 0x2d, 0x10, 0x19, 0x79, 0x73)
-
 // {915decfa-d156-4d4f-bac5-70e7724726d8}
 #define GUID_HW_CATENA_4612_BASE(f)		\
 	MCCIADK_GUID_GEN_INIT(f,  0x915decfa, 0xd156, 0x4d4f, 0xba, 0xc5, 0x70, 0xe7, 0x72, 0x47, 0x26, 0xd8)
@@ -213,10 +193,6 @@ Copyright notice:
 #define GUID_HW_CATENA_4612_M104(f)		\
 	MCCIADK_GUID_GEN_INIT(f,  0xdea48489, 0xcdac, 0x43f4, 0xb8, 0xad, 0xed, 0xb0, 0x8c, 0xe2, 0x15, 0x46)
 
-// {6767c2f6-d5d5-43f4-81af-db0d4d08815a}
-#define GUID_HW_CATENA_4617_BASE(f)		\
-	MCCIADK_GUID_GEN_INIT(f,  0x6767c2f6, 0xd5d5, 0x43f4, 0x81, 0xaf, 0xdb, 0x0d, 0x4d, 0x08, 0x81, 0x5a)
-
 // {b75ed77b-b06e-4b26-a968-9c15f222dfb2}
 #define GUID_HW_CATENA_4618_BASE(f)		\
 	MCCIADK_GUID_GEN_INIT(f,  0xb75ed77b, 0xb06e, 0x4b26, 0xa9, 0x68, 0x9c, 0x15, 0xf2, 0x22, 0xdf, 0xb2)