Fix shell scripts

README.md

@@ -44,4 +44,5 @@ For WIP working towards a new version, a branch can be created for that developm
 Co-ordination of changes to CBUSDEFS is currently being managed by Pete Brownlow, merg@upsys.co.uk
 
 Version 8x released 12/11/23  Added some module type ids and manufacturer id
+Version 8y WIP as of Jan 24, not yet released.
 

cbusdefs.cs

@@ -6,11 +6,11 @@ namespace merg.cbus
 {
 
     // 
-    // Copyright (C) Pete Brownlow 2011-2022   software@upsys.co.uk
+    // Copyright (C) Pete Brownlow 2011-2024   software@upsys.co.uk
     // Originally derived from opcodes.h (c) Andrew Crosland.
     // CSV version by Ian Hogg inspired by David W Radcliffe
     // 
-    // Ver 8y 
+    // Ver 8y WIP NOT YET RELEASED
     // 
     //   This work is licensed under the:
     //       Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International License.
@@ -101,6 +101,7 @@ namespace merg.cbus
     // Pete Brownlow,2/11/23, Ver 8x  Add module id for CANLEVER (Tim Coombs)
     // Pete Brownlow,3/11/23, Ver 8x  Update SPROG module type ids (Andrew Crosland)
     // Pete Brownlow, 23/11/23, Ver 8y  Add CANSHIELD, CAN4IN4OUT, CANDEV
+    // Pete Brownlow, 27/1/24, Ver 8y  Add CANCMDB, CANPIXEL, CANCABPE, SMARTTD, change CANEMIO to CANXIO
 
 	public static class CbusDefs
 	{
@@ -210,7 +211,7 @@ public static class CbusManufacturer
 			public const int MANU_SPROG	=  44;	// https://www.sprog-dcc.co.uk/
 			public const int MANU_ROCRAIL	=  70;	// http://www.rocrail.net
 			public const int MANU_SPECTRUM	=  80;	// http://animatedmodeler.com  (Spectrum Engineering)
-			public const int MANU_VLCB	=  250;	// VLCB range of modules
+			public const int MANU_MERG_VLCB	=  250;	// range of MERG VLCB modules
 			public const int MANU_SYSPIXIE	=  249;	// Konrad Orlowski
 			public const int MANU_RME	=  248;	// http://rmeuk.com  (Railway Modelling Experts Limited)
 		}
@@ -288,7 +289,7 @@ public static class CbusMergModuleTypes
 			public const int MTYP_CANRC522	=  61;	// Read/Write from/to RC522 RFID tags
 			public const int MTYP_CANINP	=  62;	// 8 inputs module (2g version of CANACE8c) (Pete Brownlow)
 			public const int MTYP_CANOUT	=  63;	// 8 outputs module (2g version of CANACC8) (Pete Brownlow)
-			public const int MTYP_CANEMIO	=  64;	// Extended CANMIO (24 I/O ports) (Pete Brownlow)
+			public const int MTYP_CANXIO	=  64;	// Extended CANMIO (24 I/O ports) (Pete Brownlow)
 			public const int MTYP_CANCABDC	=  65;	// DC cab
 			public const int MTYP_CANRCOM	=  66;	// DC Railcom detector/reader
 			public const int MTYP_CANMP3	=  67;	// MP3 sound player in response to events (eg: station announcements) (Duncan Greenwood)
@@ -307,6 +308,11 @@ public static class CbusMergModuleTypes
 			public const int MTYP_CANLEVER	=  80;	// Lever frame module (Tim Coombs)
 			public const int MTYP_CANSHIELD	=  81;	// Kit 110 Arduino shield test firmware
 			public const int MTYP_CAN4IN4OUT	=  82;	// 4 inputs 4 outputs (Arduino module)
+			public const int MTYP_CANCMDB	=  83;	// CANCMD with built in booster (Simon West)
+			public const int MTYP_CANPIXEL	=  84;	// neopixel driver (Jon Denham)
+			public const int MTYP_CANCABPE	=  85;	// Cab2 with pot or encoder (Simon West hardware, Jon Denham new C firmware)
+			public const int MTYP_CANSMARTTD	=  86;	// Smart train detector (Michael Smith)
+			public const int MTYP_CANCDU_U	=  87;	// CANCDU (universal) 
 			// 
 			// At the time of writing the list of defined MERG module types is maintained by Pete Brownlow software@upsys.co.uk
 			// Please liaise with Pete before adding new module types, 
@@ -549,6 +555,7 @@ public static class CbusParamFlags
 			public const int PF_BOOT	=  8;	// Module supports the FCU bootloader protocol
 			public const int PF_COE	=  16;	// Module can consume its own events
 			public const int PF_LRN	=  32;	// Module is in learn mode
+			public const int PF_VLCB	=  64;	// Module is VLCB compatible
 		}
 
 		public static class CbusParamOffsetsPic

cbusdefs.csv

@@ -1,9 +1,9 @@
 comment,,,
-comment,,,Copyright (C) Pete Brownlow 2011-2022   software@upsys.co.uk
+comment,,,Copyright (C) Pete Brownlow 2011-2025   software@upsys.co.uk
 comment,,,Originally derived from opcodes.h (c) Andrew Crosland.
 comment,,,CSV version by Ian Hogg inspired by David W Radcliffe
 comment,,,
-comment,,,Ver 8y 
+comment,,,Ver 8y WIP NOT YET RELEASED
 comment,,,
 comment,,,  This work is licensed under the:
 comment,,,      Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International License.
@@ -94,6 +94,9 @@ comment,,,Ian Hogg,14/08/2023, Ver 8x  Add manufacturer code for VLCB. This is a
 comment,,,Pete Brownlow,2/11/23, Ver 8x  Add module id for CANLEVER (Tim Coombs)
 comment,,,Pete Brownlow,3/11/23, Ver 8x  Update SPROG module type ids (Andrew Crosland)
 comment,,,Pete Brownlow, 23/11/23, Ver 8y  Add CANSHIELD, CAN4IN4OUT, CANDEV
+comment,,,Pete Brownlow, 27/1/24, Ver 8y  Add CANCMDB, CANPIXEL, CANCABPE, SMARTTD, change CANEMIO to CANXIO
+comment,,,Ian Hogg, 10/3/25, Remove the VLCB manufacturer code as this is no longer required. Add CANARGB.
+comment,,,Pete Brownlow, 25/6/25, Ver 8y  Reconcile with changes in master, add CANCDU-U module type, add defintions of known fixed CANIDs. 
 
 CbusManufacturer,,,CBUS Manufacturer definitions
 CbusManufacturer,,,Where the manufacturer already has an NMRA code, this is used
@@ -178,7 +181,7 @@ CbusMergModuleTypes,MTYP_CANCOMPUTE,60,Compute Event processing engine
 CbusMergModuleTypes,MTYP_CANRC522,61,Read/Write from/to RC522 RFID tags
 CbusMergModuleTypes,MTYP_CANINP,62,8 inputs module (2g version of CANACE8c) (Pete Brownlow)
 CbusMergModuleTypes,MTYP_CANOUT,63,8 outputs module (2g version of CANACC8) (Pete Brownlow)
-CbusMergModuleTypes,MTYP_CANEMIO,64,Extended CANMIO (24 I/O ports) (Pete Brownlow)
+CbusMergModuleTypes,MTYP_CANXIO,64,Extended CANMIO (24 I/O ports) (Pete Brownlow)
 CbusMergModuleTypes,MTYP_CANCABDC,65,DC cab
 CbusMergModuleTypes,MTYP_CANRCOM,66,DC Railcom detector/reader
 CbusMergModuleTypes,MTYP_CANMP3,67,MP3 sound player in response to events (eg: station announcements) (Duncan Greenwood)
@@ -197,7 +200,13 @@ CbusMergModuleTypes,MTYP_CANBUFFER,79,Message buffer (Phil Silver)
 CbusMergModuleTypes,MTYP_CANLEVER,80,Lever frame module (Tim Coombs)
 CbusMergModuleTypes,MTYP_CANSHIELD,81,Kit 110 Arduino shield test firmware
 CbusMergModuleTypes,MTYP_CAN4IN4OUT,82,4 inputs 4 outputs (Arduino module)
-
+CbusMergModuleTypes,MTYP_CANCMDB,83,CANCMD with built in booster (Simon West)
+CbusMergModuleTypes,MTYP_CANPIXEL,84,neopixel driver (Jon Denham)
+CbusMergModuleTypes,MTYP_CANCABPE,85,Cab2 with pot or encoder (Simon West hardware, Jon Denham new C firmware)
+CbusMergModuleTypes,MTYP_CANSMARTTD,86,Smart train detector (Michael Smith)
+CbusMergModuleTypes,MTYP_CANARGB,87,Addressable LEDs (Ian Hogg)
+CbusMergModuleTypes,MTYP_CANCDU_U,88,CANCDU (universal) 
+CbusMergModuleTypes,MTYP_VLCB,0xFC,VLCB modules use the same manufacturer IDs as CBUS modules.
 
 CbusMergModuleTypes,,,
 CbusMergModuleTypes,,,At the time of writing the list of defined MERG module types is maintained by Pete Brownlow software@upsys.co.uk
@@ -584,3 +593,15 @@ CbusArmProcessors,,,
 CbusArmProcessors,ARM1176JZF_S,1,As used in Raspberry Pi
 CbusArmProcessors,ARMCortex_A7,2,As Used in Raspberry Pi 2
 CbusArmProcessors,ARMCortex_A53,3,As used in Raspberry Pi 3
+
+CbusCANID,,,
+CbusCANID,,,CANIDs allocated as fixed values
+CbusCANID,,,Note that all new modules, or new firmware for existing modules, should obtain a CANID using self enumeration and implement
+CbusCANID,,,automatic CANID conflict resolution, so that eventually we can remove the need for fixed CANIDs
+CbusCANID,,,
+
+CbusCANID,CANID_CANCMD,0x72,(114) Fixed CANID for CANCMD or CANCSB
+CbusCANID,CANID_CANUSB,0x7C,(124) Fixed CANID for CANUSB, although in current firmware it may just use the CANID from the sending software
+CbusCANID,CANID_FCU,0x7D,(125) Default CANID used by FCU. Can be changed in settings. Note some interface modules may substitute their own CANID.
+CbusCANID,CANID_JMRI,0x7E,(126) Default CANID used by JMRI. Can be changed in connection preferences. Note some interface modules may substitute their own CANID.
+CbusCANID,CANID_CANEther,0x7F,(127) Default fixed CANID for CANEther (can be changed by modifying NV2). Note CANEther inserts its own CANID on all packets transmitted on CAN

cbusdefs.h

@@ -9,11 +9,11 @@ extern "C" {
 #endif
 
 // 		
-// 		Copyright (C) Pete Brownlow 2011-2022   software@upsys.co.uk
+// 		Copyright (C) Pete Brownlow 2011-2024   software@upsys.co.uk
 // 		Originally derived from opcodes.h (c) Andrew Crosland.
 // 		CSV version by Ian Hogg inspired by David W Radcliffe
 // 		
-// 		Ver 8y 
+// 		Ver 8y WIP NOT YET RELEASED
 // 		
 // 		  This work is licensed under the:
 // 		      Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International License.
@@ -104,6 +104,7 @@ extern "C" {
 // 		Pete Brownlow,2/11/23, Ver 8x  Add module id for CANLEVER (Tim Coombs)
 // 		Pete Brownlow,3/11/23, Ver 8x  Update SPROG module type ids (Andrew Crosland)
 // 		Pete Brownlow, 23/11/23, Ver 8y  Add CANSHIELD, CAN4IN4OUT, CANDEV
+// 		Pete Brownlow, 27/1/24, Ver 8y  Add CANCMDB, CANPIXEL, CANCABPE, SMARTTD, change CANEMIO to CANXIO
 // 
 // CBUS Manufacturer definitions
 // Where the manufacturer already has an NMRA code, this is used
@@ -113,7 +114,7 @@ extern "C" {
 #define MANU_SPROG	44	// https://www.sprog-dcc.co.uk/
 #define MANU_ROCRAIL	70	// http://www.rocrail.net
 #define MANU_SPECTRUM	80	// http://animatedmodeler.com  (Spectrum Engineering)
-#define MANU_VLCB	250	// VLCB range of modules
+#define MANU_MERG_VLCB	250	// range of MERG VLCB modules
 #define MANU_SYSPIXIE	249	// Konrad Orlowski
 #define MANU_RME	248	// http://rmeuk.com  (Railway Modelling Experts Limited)
 // 
@@ -188,7 +189,7 @@ extern "C" {
 #define MTYP_CANRC522	61	// Read/Write from/to RC522 RFID tags
 #define MTYP_CANINP	62	// 8 inputs module (2g version of CANACE8c) (Pete Brownlow)
 #define MTYP_CANOUT	63	// 8 outputs module (2g version of CANACC8) (Pete Brownlow)
-#define MTYP_CANEMIO	64	// Extended CANMIO (24 I/O ports) (Pete Brownlow)
+#define MTYP_CANXIO	64	// Extended CANMIO (24 I/O ports) (Pete Brownlow)
 #define MTYP_CANCABDC	65	// DC cab
 #define MTYP_CANRCOM	66	// DC Railcom detector/reader
 #define MTYP_CANMP3	67	// MP3 sound player in response to events (eg: station announcements) (Duncan Greenwood)
@@ -207,6 +208,11 @@ extern "C" {
 #define MTYP_CANLEVER	80	// Lever frame module (Tim Coombs)
 #define MTYP_CANSHIELD	81	// Kit 110 Arduino shield test firmware
 #define MTYP_CAN4IN4OUT	82	// 4 inputs 4 outputs (Arduino module)
+#define MTYP_CANCMDB	83	// CANCMD with built in booster (Simon West)
+#define MTYP_CANPIXEL	84	// neopixel driver (Jon Denham)
+#define MTYP_CANCABPE	85	// Cab2 with pot or encoder (Simon West hardware, Jon Denham new C firmware)
+#define MTYP_CANSMARTTD	86	// Smart train detector (Michael Smith)
+#define MTYP_CANCDU_U	87	// CANCDU (universal) 
 // 
 // 
 // 
@@ -536,6 +542,7 @@ extern "C" {
 #define PF_BOOT	8	// Module supports the FCU bootloader protocol
 #define PF_COE	16	// Module can consume its own events
 #define PF_LRN	32	// Module is in learn mode
+#define PF_VLCB	64	// Module is VLCB compatible
 // 
 // BUS type that module is connected to
 // 

cbusdefs.inc

@@ -2,11 +2,11 @@
 ; This file is automatically generated by ./generate.sh from cbusdefs.csv
 
 ; 		
-; 		Copyright (C) Pete Brownlow 2011-2022   software@upsys.co.uk
+; 		Copyright (C) Pete Brownlow 2011-2024   software@upsys.co.uk
 ; 		Originally derived from opcodes.h (c) Andrew Crosland.
 ; 		CSV version by Ian Hogg inspired by David W Radcliffe
 ; 		
-; 		Ver 8y 
+; 		Ver 8y WIP NOT YET RELEASED
 ; 		
 ; 		  This work is licensed under the:
 ; 		      Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International License.
@@ -97,6 +97,7 @@
 ; 		Pete Brownlow,2/11/23, Ver 8x  Add module id for CANLEVER (Tim Coombs)
 ; 		Pete Brownlow,3/11/23, Ver 8x  Update SPROG module type ids (Andrew Crosland)
 ; 		Pete Brownlow, 23/11/23, Ver 8y  Add CANSHIELD, CAN4IN4OUT, CANDEV
+; 		Pete Brownlow, 27/1/24, Ver 8y  Add CANCMDB, CANPIXEL, CANCABPE, SMARTTD, change CANEMIO to CANXIO
 ; 
 ; CBUS Manufacturer definitions
 ; Where the manufacturer already has an NMRA code, this is used
@@ -106,7 +107,7 @@ MANU_MERG	equ .165	; https://www.merg.co.uk
 MANU_SPROG	equ .44	; https://www.sprog-dcc.co.uk/
 MANU_ROCRAIL	equ .70	; http://www.rocrail.net
 MANU_SPECTRUM	equ .80	; http://animatedmodeler.com  (Spectrum Engineering)
-MANU_VLCB	equ .250	; VLCB range of modules
+MANU_MERG_VLCB	equ .250	; range of MERG VLCB modules
 MANU_SYSPIXIE	equ .249	; Konrad Orlowski
 MANU_RME	equ .248	; http://rmeuk.com  (Railway Modelling Experts Limited)
 ; 
@@ -181,7 +182,7 @@ MTYP_CANCOMPUTE	equ .60	; Compute Event processing engine
 MTYP_CANRC522	equ .61	; Read/Write from/to RC522 RFID tags
 MTYP_CANINP	equ .62	; 8 inputs module (2g version of CANACE8c) (Pete Brownlow)
 MTYP_CANOUT	equ .63	; 8 outputs module (2g version of CANACC8) (Pete Brownlow)
-MTYP_CANEMIO	equ .64	; Extended CANMIO (24 I/O ports) (Pete Brownlow)
+MTYP_CANXIO	equ .64	; Extended CANMIO (24 I/O ports) (Pete Brownlow)
 MTYP_CANCABDC	equ .65	; DC cab
 MTYP_CANRCOM	equ .66	; DC Railcom detector/reader
 MTYP_CANMP3	equ .67	; MP3 sound player in response to events (eg: station announcements) (Duncan Greenwood)
@@ -200,6 +201,11 @@ MTYP_CANBUFFER	equ .79	; Message buffer (Phil Silver)
 MTYP_CANLEVER	equ .80	; Lever frame module (Tim Coombs)
 MTYP_CANSHIELD	equ .81	; Kit 110 Arduino shield test firmware
 MTYP_CAN4IN4OUT	equ .82	; 4 inputs 4 outputs (Arduino module)
+MTYP_CANCMDB	equ .83	; CANCMD with built in booster (Simon West)
+MTYP_CANPIXEL	equ .84	; neopixel driver (Jon Denham)
+MTYP_CANCABPE	equ .85	; Cab2 with pot or encoder (Simon West hardware, Jon Denham new C firmware)
+MTYP_CANSMARTTD	equ .86	; Smart train detector (Michael Smith)
+MTYP_CANCDU_U	equ .87	; CANCDU (universal) 
 ; 
 ; 
 ; 
@@ -529,6 +535,7 @@ PF_FLiM	equ .4	; Module is in FLiM
 PF_BOOT	equ .8	; Module supports the FCU bootloader protocol
 PF_COE	equ .16	; Module can consume its own events
 PF_LRN	equ .32	; Module is in learn mode
+PF_VLCB	equ .64	; Module is VLCB compatible
 ; 
 ; BUS type that module is connected to
 ; 

cbusdefs.pas

@@ -8,11 +8,11 @@ interface
 const
 
 { 		 }
-{ 		Copyright (C) Pete Brownlow 2011-2022   software@upsys.co.uk }
+{ 		Copyright (C) Pete Brownlow 2011-2024   software@upsys.co.uk }
 { 		Originally derived from opcodes.h (c) Andrew Crosland. }
 { 		CSV version by Ian Hogg inspired by David W Radcliffe }
 { 		 }
-{ 		Ver 8y  }
+{ 		Ver 8y WIP NOT YET RELEASED }
 { 		 }
 { 		  This work is licensed under the: }
 { 		      Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International License. }
@@ -103,6 +103,7 @@ interface
 { 		Pete Brownlow,2/11/23, Ver 8x  Add module id for CANLEVER (Tim Coombs) }
 { 		Pete Brownlow,3/11/23, Ver 8x  Update SPROG module type ids (Andrew Crosland) }
 { 		Pete Brownlow, 23/11/23, Ver 8y  Add CANSHIELD, CAN4IN4OUT, CANDEV }
+{ 		Pete Brownlow, 27/1/24, Ver 8y  Add CANCMDB, CANPIXEL, CANCABPE, SMARTTD, change CANEMIO to CANXIO }
 // 
 // CBUS Manufacturer definitions
 // Where the manufacturer already has an NMRA code, this is used
@@ -112,7 +113,7 @@ interface
  MANU_SPROG	=  44;	// https://www.sprog-dcc.co.uk/
  MANU_ROCRAIL	=  70;	// http://www.rocrail.net
  MANU_SPECTRUM	=  80;	// http://animatedmodeler.com  (Spectrum Engineering)
- MANU_VLCB	=  250;	// VLCB range of modules
+ MANU_MERG_VLCB	=  250;	// range of MERG VLCB modules
  MANU_SYSPIXIE	=  249;	// Konrad Orlowski
  MANU_RME	=  248;	// http://rmeuk.com  (Railway Modelling Experts Limited)
 // 
@@ -187,7 +188,7 @@ interface
  MTYP_CANRC522	=  61;	// Read/Write from/to RC522 RFID tags
  MTYP_CANINP	=  62;	// 8 inputs module (2g version of CANACE8c) (Pete Brownlow)
  MTYP_CANOUT	=  63;	// 8 outputs module (2g version of CANACC8) (Pete Brownlow)
- MTYP_CANEMIO	=  64;	// Extended CANMIO (24 I/O ports) (Pete Brownlow)
+ MTYP_CANXIO	=  64;	// Extended CANMIO (24 I/O ports) (Pete Brownlow)
  MTYP_CANCABDC	=  65;	// DC cab
  MTYP_CANRCOM	=  66;	// DC Railcom detector/reader
  MTYP_CANMP3	=  67;	// MP3 sound player in response to events (eg: station announcements) (Duncan Greenwood)
@@ -206,6 +207,11 @@ interface
  MTYP_CANLEVER	=  80;	// Lever frame module (Tim Coombs)
  MTYP_CANSHIELD	=  81;	// Kit 110 Arduino shield test firmware
  MTYP_CAN4IN4OUT	=  82;	// 4 inputs 4 outputs (Arduino module)
+ MTYP_CANCMDB	=  83;	// CANCMD with built in booster (Simon West)
+ MTYP_CANPIXEL	=  84;	// neopixel driver (Jon Denham)
+ MTYP_CANCABPE	=  85;	// Cab2 with pot or encoder (Simon West hardware, Jon Denham new C firmware)
+ MTYP_CANSMARTTD	=  86;	// Smart train detector (Michael Smith)
+ MTYP_CANCDU_U	=  87;	// CANCDU (universal) 
 // 
 // 
 // 
@@ -535,6 +541,7 @@ interface
  PF_BOOT	=  8;	// Module supports the FCU bootloader protocol
  PF_COE	=  16;	// Module can consume its own events
  PF_LRN	=  32;	// Module is in learn mode
+ PF_VLCB	=  64;	// Module is VLCB compatible
 // 
 // BUS type that module is connected to
 // 

cbusdefs.py

@@ -5,11 +5,11 @@
 from micropython import const
 
 #         
-#         Copyright (C) Pete Brownlow 2011-2022   software@upsys.co.uk
+#         Copyright (C) Pete Brownlow 2011-2024   software@upsys.co.uk
 #         Originally derived from opcodes.h (c) Andrew Crosland.
 #         CSV version by Ian Hogg inspired by David W Radcliffe
 #         
-#         Ver 8y 
+#         Ver 8y WIP NOT YET RELEASED
 #         
 #           This work is licensed under the:
 #               Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International License.
@@ -100,6 +100,7 @@
 #         Pete Brownlow,2/11/23, Ver 8x  Add module id for CANLEVER (Tim Coombs)
 #         Pete Brownlow,3/11/23, Ver 8x  Update SPROG module type ids (Andrew Crosland)
 #         Pete Brownlow, 23/11/23, Ver 8y  Add CANSHIELD, CAN4IN4OUT, CANDEV
+#         Pete Brownlow, 27/1/24, Ver 8y  Add CANCMDB, CANPIXEL, CANCABPE, SMARTTD, change CANEMIO to CANXIO
 # 
 # CBUS Manufacturer definitions
 # Where the manufacturer already has an NMRA code, this is used
@@ -109,7 +110,7 @@
 MANU_SPROG = const(44)    # https://www.sprog-dcc.co.uk/
 MANU_ROCRAIL = const(70)    # http://www.rocrail.net
 MANU_SPECTRUM = const(80)    # http://animatedmodeler.com  (Spectrum Engineering)
-MANU_VLCB = const(250)    # VLCB range of modules
+MANU_MERG_VLCB = const(250)    # range of MERG VLCB modules
 MANU_SYSPIXIE = const(249)    # Konrad Orlowski
 MANU_RME = const(248)    # http://rmeuk.com  (Railway Modelling Experts Limited)
 # 
@@ -184,7 +185,7 @@
 MTYP_CANRC522 = const(61)    # Read/Write from/to RC522 RFID tags
 MTYP_CANINP = const(62)    # 8 inputs module (2g version of CANACE8c) (Pete Brownlow)
 MTYP_CANOUT = const(63)    # 8 outputs module (2g version of CANACC8) (Pete Brownlow)
-MTYP_CANEMIO = const(64)    # Extended CANMIO (24 I/O ports) (Pete Brownlow)
+MTYP_CANXIO = const(64)    # Extended CANMIO (24 I/O ports) (Pete Brownlow)
 MTYP_CANCABDC = const(65)    # DC cab
 MTYP_CANRCOM = const(66)    # DC Railcom detector/reader
 MTYP_CANMP3 = const(67)    # MP3 sound player in response to events (eg: station announcements) (Duncan Greenwood)
@@ -203,6 +204,11 @@
 MTYP_CANLEVER = const(80)    # Lever frame module (Tim Coombs)
 MTYP_CANSHIELD = const(81)    # Kit 110 Arduino shield test firmware
 MTYP_CAN4IN4OUT = const(82)    # 4 inputs 4 outputs (Arduino module)
+MTYP_CANCMDB = const(83)    # CANCMD with built in booster (Simon West)
+MTYP_CANPIXEL = const(84)    # neopixel driver (Jon Denham)
+MTYP_CANCABPE = const(85)    # Cab2 with pot or encoder (Simon West hardware, Jon Denham new C firmware)
+MTYP_CANSMARTTD = const(86)    # Smart train detector (Michael Smith)
+MTYP_CANCDU_U = const(87)    # CANCDU (universal) 
 # 
 # 
 # 
@@ -532,6 +538,7 @@
 PF_BOOT = const(8)    # Module supports the FCU bootloader protocol
 PF_COE = const(16)    # Module can consume its own events
 PF_LRN = const(32)    # Module is in learn mode
+PF_VLCB = const(64)    # Module is VLCB compatible
 # 
 # BUS type that module is connected to
 #