Bump for next tech preview release

Co-authored-by: thebentern <thebentern@users.noreply.github.com>

.github/workflows/main_matrix.yml

@@ -38,7 +38,9 @@ jobs:
           - board: rak4631_eink
           - board: t-echo
           - board: nano-g1
-
+          - board: m5stack-core
+          - board: m5stack-coreink
+          
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
@@ -93,6 +95,8 @@ jobs:
           - board: tbeam0.7
           - board: meshtastic-diy-v1
           - board: nano-g1
+          - board: m5stack-core
+          - board: m5stack-coreink
 
     runs-on: ubuntu-latest
     steps:

bin/build-all.sh

@@ -5,7 +5,7 @@ set -e
 VERSION=`bin/buildinfo.py long`
 SHORT_VERSION=`bin/buildinfo.py short`
 
-BOARDS_ESP32="rak11200 tlora-v2 tlora-v1 tlora_v1_3 tlora-v2-1-1.6 tbeam heltec-v1 heltec-v2.0 heltec-v2.1 tbeam0.7 meshtastic-diy-v1 nano-g1"
+BOARDS_ESP32="rak11200 tlora-v2 tlora-v1 tlora_v1_3 tlora-v2-1-1.6 tbeam heltec-v1 heltec-v2.0 heltec-v2.1 tbeam0.7 meshtastic-diy-v1 nano-g1 m5stack-core m5stack-coreink"
 #BOARDS_ESP32=tbeam
 
 # FIXME note nrf52840dk build is for some reason only generating a BIN file but not a HEX file nrf52840dk-geeksville is fine

src/FSCommon.cpp

@@ -2,8 +2,8 @@
 #include "FSCommon.h"
 
 void listDir(const char * dirname, uint8_t levels)
-#ifdef FSCom
 {
+#ifdef FSCom
     File root = FSCom.open(dirname);
     if(!root){
         return;
@@ -29,29 +29,41 @@ void listDir(const char * dirname, uint8_t levels)
 }
 
 void rmDir(const char * dirname)
-#ifdef FSCom
 {
-    File root = FSCom.open(dirname);
-    if(!root){
+#ifdef FSCom
+    File file = FSCom.open(dirname);
+    if(!file){
         return;
     }
-    if(!root.isDirectory()){
+    if(!file.isDirectory()){
+        file.close();
+        FSCom.remove(file.name());
+      //  DEBUG_MSG("Remove FILE  %s\n", file.name());
         return;
     }
 
-    File file = root.openNextFile();
-    while(file){
-        if(file.isDirectory() && !String(file.name()).endsWith(".")) {
-            file.close();
-            rmDir(file.name());
-            FSCom.rmdir(file.name());
-        } else {
-            file.close();
-            FSCom.remove(file.name());
+    file.rewindDirectory();
+    while (true) {
+        File entry = file.openNextFile();
+        if (!entry) {
+          break;
+        }
+        char dirpath[100];   // array to hold the result.
+        strcpy(dirpath, dirname); // copy string one into the result.
+        strcat(dirpath,"/"); // append string two to the result.
+        strcat(dirpath,entry.name()); // append string two to the result.
+        if(entry.isDirectory() && !String(entry.name()).endsWith(".")) {
+            entry.close();
+         //   DEBUG_MSG("Descend DIR  %s\n", dirpath);
+            rmDir(dirpath);
+        } else {
+            entry.close();
+         //   DEBUG_MSG("Remove FILE  %s\n", entry.name());
+            FSCom.remove(entry.name());
         }
-        file.close();
-        file = root.openNextFile();
     }
+    FSCom.rmdir(dirname);
+   // DEBUG_MSG("Remove DIR  %s\n", dirname);
     file.close();
 #endif
 }

src/configuration.h

@@ -142,10 +142,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // -----------------------------------------------------------------------------
 
 // Disable use of the NTP library and related features
-//#define DISABLE_NTP
+// #define DISABLE_NTP
 
 // Disable the welcome screen and allow 
-#define DISABLE_WELCOME_UNSET
+// #define DISABLE_WELCOME_UNSET
 
 // -----------------------------------------------------------------------------
 // OLED & Input

src/graphics/EInkDisplay2.cpp

@@ -210,8 +210,7 @@ bool EInkDisplay::connect()
 #elif defined(M5_COREINK)
     auto lowLevel = new TECHO_DISPLAY_MODEL(PIN_EINK_CS, PIN_EINK_DC, PIN_EINK_RES, PIN_EINK_BUSY);
     adafruitDisplay = new GxEPD2_BW<TECHO_DISPLAY_MODEL, TECHO_DISPLAY_MODEL::HEIGHT>(*lowLevel);
-    delay(100);
-    adafruitDisplay->init(115200, true, 20, false, SPI, SPISettings(4000000, MSBFIRST, SPI_MODE0));
+    adafruitDisplay->init(115200, true, 40, false, SPI, SPISettings(4000000, MSBFIRST, SPI_MODE0));
     adafruitDisplay->setRotation(0);
     adafruitDisplay->setPartialWindow(0, 0, EPD_WIDTH, EPD_HEIGHT);
 #endif

src/graphics/Screen.cpp

@@ -1520,25 +1520,25 @@ void DebugInfo::drawFrameSettings(OLEDDisplay *display, OLEDDisplayUiState *stat
 
     switch (config.lora.modem_preset) {
     case Config_LoRaConfig_ModemPreset_ShortSlow:
-        mode = "ShortSlow";
+        mode = "ShortS";
         break;
     case Config_LoRaConfig_ModemPreset_ShortFast:
-        mode = "ShortFast";
+        mode = "ShortF";
         break;
-    case Config_LoRaConfig_ModemPreset_MidSlow:
-        mode = "MediumSlow";
+    case Config_LoRaConfig_ModemPreset_MedSlow:
+        mode = "MedS";
         break;
-    case Config_LoRaConfig_ModemPreset_MidFast:
-        mode = "MediumFast";
-        break;
-    case Config_LoRaConfig_ModemPreset_LongFast:
-        mode = "LongFast";
+    case Config_LoRaConfig_ModemPreset_MedFast:
+        mode = "MedF";
         break;
     case Config_LoRaConfig_ModemPreset_LongSlow:
-        mode = "LongSlow";
+        mode = "LongS";
+        break;
+    case Config_LoRaConfig_ModemPreset_LongFast:
+        mode = "LongF";
         break;
     case Config_LoRaConfig_ModemPreset_VLongSlow:
-        mode = "VLongSlow";
+        mode = "VeryL";
         break;
     default:
         mode = "Custom";

src/main.cpp

@@ -105,7 +105,7 @@ const char *getDeviceName()
     static char name[20];
     sprintf(name, "%02x%02x", dmac[4], dmac[5]);
     // if the shortname exists and is NOT the new default of ab3c, use it for BLE name.
-    if ((owner.short_name != NULL) && (owner.short_name != name)) {
+    if ((owner.short_name != NULL) && (strcmp(owner.short_name, name) != 0)) {
         sprintf(name, "%s_%02x%02x", owner.short_name, dmac[4], dmac[5]);
     } else {
         sprintf(name, "Meshtastic_%02x%02x", dmac[4], dmac[5]);

src/mesh/Channels.cpp

@@ -211,29 +211,29 @@ const char *Channels::getName(size_t chIndex)
         // the app fucked up and forgot to set channelSettings.name
 
         if (config.lora.bandwidth != 0)
-            channelName = "Unset";
+            channelName = "Custom";
         else
             switch (config.lora.modem_preset) {
             case Config_LoRaConfig_ModemPreset_ShortSlow:
-                channelName = "ShortSlow";
+                channelName = "ShortS";
                 break;
             case Config_LoRaConfig_ModemPreset_ShortFast:
-                channelName = "ShortFast";
+                channelName = "ShortF";
                 break;
-            case Config_LoRaConfig_ModemPreset_MidSlow:
-                channelName = "MediumSlow";
+            case Config_LoRaConfig_ModemPreset_MedSlow:
+                channelName = "MedS";
                 break;
-            case Config_LoRaConfig_ModemPreset_MidFast:
-                channelName = "MediumFast";
-                break;
-            case Config_LoRaConfig_ModemPreset_LongFast:
-                channelName = "LongFast";
+            case Config_LoRaConfig_ModemPreset_MedFast:
+                channelName = "MedF";
                 break;
             case Config_LoRaConfig_ModemPreset_LongSlow:
-                channelName = "LongSlow";
+                channelName = "LongS";
+                break;
+            case Config_LoRaConfig_ModemPreset_LongFast:
+                channelName = "LongF";
                 break;
             case Config_LoRaConfig_ModemPreset_VLongSlow:
-                channelName = "VLongSlow";
+                channelName = "VeryL";
                 break;
             default:
                 channelName = "Invalid";

src/mesh/NodeDB.cpp

@@ -337,16 +337,16 @@ void NodeDB::loadFromDisk()
             DEBUG_MSG("Warn: devicestate %d is old, discarding\n", devicestate.version);
             installDefaultDeviceState();
 #ifndef NO_ESP32
-        // This will erase what's in NVS including ssl keys, persistant variables and ble pairing
-        nvs_flash_erase();
+            // This will erase what's in NVS including ssl keys, persistant variables and ble pairing
+            nvs_flash_erase();
 #endif
 #ifdef NRF52_SERIES
-        Bluefruit.begin();
-        DEBUG_MSG("Clearing bluetooth bonds!\n");
-        bond_print_list(BLE_GAP_ROLE_PERIPH);
-        bond_print_list(BLE_GAP_ROLE_CENTRAL);
-        Bluefruit.Periph.clearBonds();
-        Bluefruit.Central.clearBonds();
+            Bluefruit.begin();
+            DEBUG_MSG("Clearing bluetooth bonds!\n");
+            bond_print_list(BLE_GAP_ROLE_PERIPH);
+            bond_print_list(BLE_GAP_ROLE_CENTRAL);
+            Bluefruit.Periph.clearBonds();
+            Bluefruit.Central.clearBonds();
 #endif
         } else {
             DEBUG_MSG("Loaded saved devicestate version %d\n", devicestate.version);

src/mesh/PhoneAPI.cpp

@@ -183,10 +183,47 @@ size_t PhoneAPI::getFromRadio(uint8_t *buf)
         config_state++;
         // Advance when we have sent all of our config objects
         if (config_state > Config_lora_tag) {
-            state = STATE_SEND_NODEINFO;
+            state = STATE_SEND_MODULECONFIG;
+            config_state = ModuleConfig_mqtt_tag;
         }
         break;
 
+    case STATE_SEND_MODULECONFIG:
+        fromRadioScratch.which_payloadVariant = FromRadio_moduleConfig_tag;
+        switch (config_state) {
+            case ModuleConfig_mqtt_tag:
+                fromRadioScratch.moduleConfig.which_payloadVariant = ModuleConfig_mqtt_tag;
+                fromRadioScratch.moduleConfig.payloadVariant.mqtt = moduleConfig.mqtt;
+                break;
+            case ModuleConfig_serial_tag:
+                fromRadioScratch.moduleConfig.which_payloadVariant = ModuleConfig_serial_tag;
+                fromRadioScratch.moduleConfig.payloadVariant.serial = moduleConfig.serial;
+                break;
+            case ModuleConfig_external_notification_tag:
+                fromRadioScratch.moduleConfig.which_payloadVariant = ModuleConfig_external_notification_tag;
+                fromRadioScratch.moduleConfig.payloadVariant.external_notification = moduleConfig.external_notification;
+                break;
+            case ModuleConfig_range_test_tag:
+                fromRadioScratch.moduleConfig.which_payloadVariant = ModuleConfig_range_test_tag;
+                fromRadioScratch.moduleConfig.payloadVariant.range_test = moduleConfig.range_test;
+                break;
+            case ModuleConfig_telemetry_tag:
+                fromRadioScratch.moduleConfig.which_payloadVariant = ModuleConfig_telemetry_tag;
+                fromRadioScratch.moduleConfig.payloadVariant.telemetry = moduleConfig.telemetry;
+                break;
+            case ModuleConfig_canned_message_tag:
+                fromRadioScratch.moduleConfig.which_payloadVariant = ModuleConfig_canned_message_tag;
+                fromRadioScratch.moduleConfig.payloadVariant.canned_message = moduleConfig.canned_message;
+                break;
+        }
+
+        config_state++;
+        // Advance when we have sent all of our ModuleConfig objects
+        if (config_state > ModuleConfig_canned_message_tag) {
+            state = STATE_SEND_NODEINFO;
+            config_state = Config_device_tag;
+        }
+        break;
     case STATE_SEND_NODEINFO: {
         const NodeInfo *info = nodeInfoForPhone;
         nodeInfoForPhone = NULL; // We just consumed a nodeinfo, will need a new one next time
@@ -264,6 +301,9 @@ bool PhoneAPI::available()
         return true;
             
     case STATE_SEND_CONFIG:
+        return true;        
+
+    case STATE_SEND_MODULECONFIG:
         return true;
 
     case STATE_SEND_NODEINFO:

src/mesh/PhoneAPI.h

@@ -24,6 +24,7 @@ class PhoneAPI
         STATE_SEND_MY_INFO, // send our my info record
         STATE_SEND_GROUPS, // new in 1.3?
         STATE_SEND_CONFIG, // Replacement for the old Radioconfig
+        STATE_SEND_MODULECONFIG, // Send Module specific config
         STATE_SEND_NODEINFO, // states progress in this order as the device sends to to the client
         STATE_SEND_COMPLETE_ID,
         STATE_SEND_PACKETS // send packets or debug strings

src/mesh/RF95Interface.cpp

@@ -70,6 +70,10 @@ bool RF95Interface::init()
     int res = lora->begin(getFreq(), bw, sf, cr, syncWord, power, currentLimit, preambleLength);
     DEBUG_MSG("RF95 init result %d\n", res);
 
+    DEBUG_MSG("Frequency set to %f\n", getFreq());    
+    DEBUG_MSG("Bandwidth set to %f\n", bw);    
+    DEBUG_MSG("Power output set to %d\n", power);    
+
     // current limit was removed from module' ctor
     // override default value (60 mA)
     res = lora->setCurrentLimit(currentLimit);

src/mesh/RadioInterface.cpp

@@ -360,12 +360,12 @@ void RadioInterface::applyModemConfig()
             cr = 8;
             sf = 8;
             break;
-        case Config_LoRaConfig_ModemPreset_MidFast:
+        case Config_LoRaConfig_ModemPreset_MedFast:
             bw = 250;
             cr = 8;
             sf = 9;
             break;
-        case Config_LoRaConfig_ModemPreset_MidSlow:
+        case Config_LoRaConfig_ModemPreset_MedSlow:
             bw = 250;
             cr = 8;
             sf = 10;

src/mesh/SX126xInterface.cpp

@@ -56,6 +56,10 @@ bool SX126xInterface<T>::init()
     // \todo Display actual typename of the adapter, not just `SX126x`
     DEBUG_MSG("SX126x init result %d\n", res);
 
+    DEBUG_MSG("Frequency set to %f\n", getFreq());    
+    DEBUG_MSG("Bandwidth set to %f\n", bw);    
+    DEBUG_MSG("Power output set to %d\n", power);    
+
     // current limit was removed from module' ctor
     // override default value (60 mA)
     res = lora.setCurrentLimit(currentLimit);

src/mesh/generated/config.pb.h

@@ -26,7 +26,9 @@ typedef enum _Config_PositionConfig_PositionFlags {
     Config_PositionConfig_PositionFlags_POS_HVDOP = 16, 
     Config_PositionConfig_PositionFlags_POS_SATINVIEW = 32, 
     Config_PositionConfig_PositionFlags_POS_SEQ_NOS = 64, 
-    Config_PositionConfig_PositionFlags_POS_TIMESTAMP = 128 
+    Config_PositionConfig_PositionFlags_POS_TIMESTAMP = 128, 
+    Config_PositionConfig_PositionFlags_POS_HEADING = 256, 
+    Config_PositionConfig_PositionFlags_POS_SPEED = 512 
 } Config_PositionConfig_PositionFlags;
 
 typedef enum _Config_PowerConfig_ChargeCurrent { 
@@ -78,8 +80,8 @@ typedef enum _Config_LoRaConfig_ModemPreset {
     Config_LoRaConfig_ModemPreset_LongFast = 0, 
     Config_LoRaConfig_ModemPreset_LongSlow = 1, 
     Config_LoRaConfig_ModemPreset_VLongSlow = 2, 
-    Config_LoRaConfig_ModemPreset_MidSlow = 3, 
-    Config_LoRaConfig_ModemPreset_MidFast = 4, 
+    Config_LoRaConfig_ModemPreset_MedSlow = 3, 
+    Config_LoRaConfig_ModemPreset_MedFast = 4, 
     Config_LoRaConfig_ModemPreset_ShortSlow = 5, 
     Config_LoRaConfig_ModemPreset_ShortFast = 6 
 } Config_LoRaConfig_ModemPreset;
@@ -145,17 +147,11 @@ typedef struct _Config_WiFiConfig {
 typedef struct _Config { 
     pb_size_t which_payloadVariant;
     union {
-        /* TODO: REPLACE */
         Config_DeviceConfig device;
-        /* TODO: REPLACE */
         Config_PositionConfig position;
-        /* TODO: REPLACE */
         Config_PowerConfig power;
-        /* TODO: REPLACE */
         Config_WiFiConfig wifi;
-        /* TODO: REPLACE */
         Config_DisplayConfig display;
-        /* TODO: REPLACE */
         Config_LoRaConfig lora;
     } payloadVariant;
 } Config;
@@ -167,8 +163,8 @@ typedef struct _Config {
 #define _Config_DeviceConfig_Role_ARRAYSIZE ((Config_DeviceConfig_Role)(Config_DeviceConfig_Role_RouterClient+1))
 
 #define _Config_PositionConfig_PositionFlags_MIN Config_PositionConfig_PositionFlags_POS_UNDEFINED
-#define _Config_PositionConfig_PositionFlags_MAX Config_PositionConfig_PositionFlags_POS_TIMESTAMP
-#define _Config_PositionConfig_PositionFlags_ARRAYSIZE ((Config_PositionConfig_PositionFlags)(Config_PositionConfig_PositionFlags_POS_TIMESTAMP+1))
+#define _Config_PositionConfig_PositionFlags_MAX Config_PositionConfig_PositionFlags_POS_SPEED
+#define _Config_PositionConfig_PositionFlags_ARRAYSIZE ((Config_PositionConfig_PositionFlags)(Config_PositionConfig_PositionFlags_POS_SPEED+1))
 
 #define _Config_PowerConfig_ChargeCurrent_MIN Config_PowerConfig_ChargeCurrent_MAUnset
 #define _Config_PowerConfig_ChargeCurrent_MAX Config_PowerConfig_ChargeCurrent_MA1320

src/mesh/generated/mesh.pb.h

@@ -5,6 +5,7 @@
 #define PB_MESH_PB_H_INCLUDED
 #include <pb.h>
 #include "config.pb.h"
+#include "module_config.pb.h"
 #include "portnums.pb.h"
 #include "telemetry.pb.h"
 
@@ -652,6 +653,8 @@ typedef struct _FromRadio {
      Not used on all transports, currently just used for the serial console.
      NOTE: This ID must not change - to keep (minimal) compatibility with <1.2 version of android apps. */
         bool rebooted;
+        /* Include module config */
+        ModuleConfig moduleConfig;
         /* Log levels, chosen to match python logging conventions. */
         MeshPacket packet;
     };
@@ -856,6 +859,7 @@ extern "C" {
 #define FromRadio_log_record_tag                 7
 #define FromRadio_config_complete_id_tag         8
 #define FromRadio_rebooted_tag                   9
+#define FromRadio_moduleConfig_tag               10
 #define FromRadio_packet_tag                     11
 #define ToRadio_packet_tag                       2
 #define ToRadio_peer_info_tag                    3
@@ -1006,6 +1010,7 @@ X(a, STATIC,   ONEOF,    MESSAGE,  (payloadVariant,config,config),   6) \
 X(a, STATIC,   ONEOF,    MESSAGE,  (payloadVariant,log_record,log_record),   7) \
 X(a, STATIC,   ONEOF,    UINT32,   (payloadVariant,config_complete_id,config_complete_id),   8) \
 X(a, STATIC,   ONEOF,    BOOL,     (payloadVariant,rebooted,rebooted),   9) \
+X(a, STATIC,   ONEOF,    MESSAGE,  (payloadVariant,moduleConfig,moduleConfig),  10) \
 X(a, STATIC,   ONEOF,    MESSAGE,  (payloadVariant,packet,packet),  11)
 #define FromRadio_CALLBACK NULL
 #define FromRadio_DEFAULT NULL
@@ -1013,6 +1018,7 @@ X(a, STATIC,   ONEOF,    MESSAGE,  (payloadVariant,packet,packet),  11)
 #define FromRadio_payloadVariant_node_info_MSGTYPE NodeInfo
 #define FromRadio_payloadVariant_config_MSGTYPE Config
 #define FromRadio_payloadVariant_log_record_MSGTYPE LogRecord
+#define FromRadio_payloadVariant_moduleConfig_MSGTYPE ModuleConfig
 #define FromRadio_payloadVariant_packet_MSGTYPE MeshPacket
 
 #define ToRadio_FIELDLIST(X, a) \

src/mesh/http/WiFiAPClient.cpp

@@ -222,7 +222,7 @@ bool initWifi(bool forceSoftAP)
 
                         // The configurations on softAP are from the espresif library
                         int ok = WiFi.softAP(wifiName, wifiPsw, 1, 1, 4);
-                        DEBUG_MSG("Starting hiddem WIFI AP: ssid=%s, ok=%d\n", wifiName, ok);
+                        DEBUG_MSG("Starting hidden WIFI AP: ssid=%s, ok=%d\n", wifiName, ok);
                     } else {
                         int ok = WiFi.softAP(wifiName, wifiPsw);
                         DEBUG_MSG("Starting WIFI AP: ssid=%s, ok=%d\n", wifiName, ok);

variants/m5stack_core/pins_arduino.h

@@ -0,0 +1,55 @@
+#ifndef Pins_Arduino_h
+#define Pins_Arduino_h
+
+#include <stdint.h>
+
+#define EXTERNAL_NUM_INTERRUPTS 16
+#define NUM_DIGITAL_PINS        20
+#define NUM_ANALOG_INPUTS       16
+
+#define analogInputToDigitalPin(p)  (((p)<20)?(analogChannelToDigitalPin(p)):-1)
+#define digitalPinToInterrupt(p)    (((p)<40)?(p):-1)
+#define digitalPinHasPWM(p)         (p < 34)
+
+static const uint8_t TX = 1;
+static const uint8_t RX = 3;
+
+static const uint8_t TXD2 = 17;
+static const uint8_t RXD2 = 16;
+
+static const uint8_t SDA = 21;
+static const uint8_t SCL = 22;
+
+static const uint8_t SS    = 5;
+static const uint8_t MOSI  = 23;
+static const uint8_t MISO  = 19;
+static const uint8_t SCK   = 18;
+
+static const uint8_t G23 = 23;
+static const uint8_t G19 = 19;
+static const uint8_t G18 = 18;
+static const uint8_t G3 = 3;
+static const uint8_t G16 = 16;
+static const uint8_t G21 = 21;
+static const uint8_t G2 = 2;
+static const uint8_t G12 = 12;
+static const uint8_t G15 = 15;
+static const uint8_t G35 = 35;
+static const uint8_t G36 = 36;
+static const uint8_t G25 = 25;
+static const uint8_t G26 = 26;
+static const uint8_t G1 = 1;
+static const uint8_t G17 = 17;
+static const uint8_t G22 = 22;
+static const uint8_t G5 = 5;
+static const uint8_t G13 = 13;
+static const uint8_t G0 = 0;
+static const uint8_t G34 = 34;
+
+static const uint8_t DAC1 = 25;
+static const uint8_t DAC2 = 26;
+
+static const uint8_t ADC1 = 35;
+static const uint8_t ADC2 = 36;
+
+#endif /* Pins_Arduino_h */

variants/m5stack_coreink/pins_arduino.h

@@ -0,0 +1,57 @@
+#ifndef Pins_Arduino_h
+#define Pins_Arduino_h
+
+#include <stdint.h>
+
+#define EXTERNAL_NUM_INTERRUPTS 16
+#define NUM_DIGITAL_PINS        40
+#define NUM_ANALOG_INPUTS       16
+
+#define analogInputToDigitalPin(p)  (((p)<20)?(esp32_adc2gpio[(p)]):-1)
+#define digitalPinToInterrupt(p)    (((p)<40)?(p):-1)
+#define digitalPinHasPWM(p)         (p < 34)
+
+#define TX2 -1
+#define RX2 -1
+
+static const uint8_t TX = 1;
+static const uint8_t RX = 3;
+
+static const uint8_t SDA = 32;
+static const uint8_t SCL = 33;
+
+static const uint8_t SS    = 9;
+static const uint8_t MOSI  = 23;
+static const uint8_t MISO  = 34;
+static const uint8_t SCK   = 18;
+
+static const uint8_t G26 = 26;
+static const uint8_t G36 = 36;
+static const uint8_t G25 = 25;
+
+static const uint8_t G32 = 32;
+static const uint8_t G33 = 33;
+
+static const uint8_t G21 = 21;
+static const uint8_t G22 = 22;
+
+static const uint8_t G13 = 13;
+static const uint8_t G14 = 14;
+
+static const uint8_t G12 = 12;
+static const uint8_t G19 = 19;
+
+static const uint8_t G5 = 5;
+static const uint8_t G10 = 10;
+static const uint8_t G2 = 2;
+static const uint8_t G37 = 37;
+static const uint8_t G38 = 38;
+static const uint8_t G39 = 39;
+
+static const uint8_t DAC1 = 25;
+static const uint8_t DAC2 = 26;
+
+static const uint8_t ADC1 = 35;
+static const uint8_t ADC2 = 36;
+
+#endif /* Pins_Arduino_h */

version.properties

@@ -1,4 +1,4 @@
 [VERSION]  
 major = 1
 minor = 3
-build = 20
+build = 22