Mirror with some correction

Dependencies:   mbed FastIO FastPWM USBDevice

Files at this revision

API Documentation at this revision

Comitter:
arnoz
Date:
Fri Oct 01 08:19:46 2021 +0000
Parent:
115:39d2eb4b1830
Commit message:
- Correct information regarding your last merge

Changed in this revision

USBProtocol.h Show annotated file Show diff for this revision Revisions of this file
config.h Show annotated file Show diff for this revision Revisions of this file
diff -r 39d2eb4b1830 -r 7a67265d7c19 USBProtocol.h
--- a/USBProtocol.h	Fri Oct 01 03:31:08 2021 +0000
+++ b/USBProtocol.h	Fri Oct 01 08:19:46 2021 +0000
@@ -1030,7 +1030,8 @@
 //                    1 = Pinscape Expansion Boards
 //                    2 = Oak Micros Pinscape All-In-One (AIO) Board
 //                    3 = Oak Micros Pinscape Lite Board
-//                    4 = Arnoz Mollusk Board
+//                    4 = Arnoz RigMaster Board
+//                    5 = Arnoz KLShield Board
 //
 //         byte 4 = board set interface revision.  This *isn't* the version number
 //                  of the board itself, but rather of its software interface.  In
@@ -1047,18 +1048,22 @@
 //                  For Oak Micros Lite (type 3):
 //                    0 = first release
 //
-//                  For Arnoz Mollusk (type 4):
+//                  For Arnoz RigMaster (type 4):
+//                    0 = first release (2021)
+//
+//                  For Arnoz KLShield (type 5):
 //                    0 = first release (2021)
 //
 //         bytes 5:8 = additional hardware-specific data.  These slots are used
 //                  to store extra data specific to the expansion boards selected.
 //
-//                  For Pinscape Expansion Boards (board set type 1), and
-//                  Oak Micros AIO (type = 2):
+//                  For Pinscape Expansion Boards (board set type 1), 
+//                  Oak Micros AIO (type 2), Arnoz RigMaster (type 4), and 
+//                  Arnoz KLShield (type 5):
 //                    byte 5 = number of main interface or AIO boards (always 1)
 //                    byte 6 = number of MOSFET power boards
 //                    byte 7 = number of chime boards
-//                    byte 8 = not used
+//                    byte 8 = number of Mollusk boards
 //                  
 //
 // 15 -> Night mode setup.  
diff -r 39d2eb4b1830 -r 7a67265d7c19 config.h
--- a/config.h	Fri Oct 01 03:31:08 2021 +0000
+++ b/config.h	Fri Oct 01 08:19:46 2021 +0000
@@ -644,6 +644,9 @@
                             //    0 -> Standalone KL25Z
                             //    1 -> Pinscape Expansion Boards
                             //    2 -> Pinscape All-In-One (AIO)
+                            //    3 -> Pinscape Lite
+                            //    4 -> Arnoz RigMaster
+                            //    5 -> Arnoz KLShield
         uint8_t vsn;        // board set interface version
         uint8_t ext[4];     // extended data - varies by board set type