diff --git a/combine.py b/combine.py index 88fff44..119c3ec 100644 --- a/combine.py +++ b/combine.py @@ -7,8 +7,8 @@ import sys def extract_firmware_version(): with open('main/CommandHandler.cpp', 'r') as file: for line in file: - if 'const char FIRMWARE_VERSION[6] = ' in line: - # The line format is `const char FIRMWARE_VERSION[6] = "1.7.6";` + if 'const char FIRMWARE_VERSION[] = ' in line: + # The line format is `const char FIRMWARE_VERSION[6] = "2.0.0adafruit";` # Split by double quote and get the second element version = line.split('"')[1] return version diff --git a/main/CommandHandler.cpp b/main/CommandHandler.cpp index 49854cc..524866d 100644 --- a/main/CommandHandler.cpp +++ b/main/CommandHandler.cpp @@ -44,7 +44,7 @@ int errno; #endif // Note: following version definition line is parsed by python script. Please don't change its format (space, indent) only update its version number. -const char FIRMWARE_VERSION[6] = "1.8.0"; +const char FIRMWARE_VERSION[] = "2.0.0-adafruit"; // ADAFRUIT-CHANGE: user-supplied cert and key // Optional, user-defined X.509 certificate @@ -1243,7 +1243,7 @@ int getDigitalRead(const uint8_t command[], uint8_t response[]) return 6; } -#if 1 +#if 1 // ADAFRUIT-CHANGE: Adafruit-style analog read support int getAnalogRead(const uint8_t command[], uint8_t response[]) {