Merge branch 'fixes'

examples/PanoController/PanoController.ino

@@ -15,6 +15,7 @@
 #include "mpu.h"
 #include "battery.h"
 #include "gcode.h"
+#include "compat.h"
 
 #if defined(BLUEFRUIT_SPI_CS)
 #include "ble_bluefruit_spi.h"
@@ -36,8 +37,9 @@ static GCode gcode(ble, motors, camera, mpu, battery);
 void setup() {
     Serial.begin(115200);
     delay(3000); // wait for serial
-    Serial.println("PanoController " REVISION);
+    Serial.println("PanoController " GIT_VERSION);
     Serial.println("On " ARDUINO_VARIANT " board " ARDUINO_BOARD);
+    Serial.println("Platform " PANO_PLATFORM);
 
     // turn on power to MPU but give it time to stabilize
     pinMode(MPU_VCC, OUTPUT);

examples/PanoController/config.h

@@ -2,10 +2,6 @@
  * Pano Controller Master Configuration File
  */
 
-#if !defined(REVISION)
-#define REVISION __DATE__
-#endif
-
 // Battery monitoring settings
 #define VCC 3300
 

platformio.ini

@@ -24,7 +24,7 @@ monitor_speed = 115200
 lib_deps = 
 	laurb9/StepperDriver@^1.3.0
 build_flags = 
-	!echo "-D REVISION='\"$(git describe --long --dirty --always)\"'"
+	!echo "-D GIT_VERSION='\"$(git describe --long --dirty --always)\"'"
     -D PLATFORM_MECHA_E1
 ;    -D PLATFORM_PANOCONTROLLER_V4
 ;    -D PLATFORM_GIGAPAN

src/compat.h

@@ -0,0 +1,27 @@
+
+#if !defined(GIT_VERSION)
+#define GIT_VERSION __DATE__
+#endif
+
+#if !defined(ARDUINO_VARIANT)
+#if defined(CORE_TEENSY)
+#define ARDUINO_VARIANT "teensy"
+#define ARDUINO_BOARD "teensy board"
+#else
+#define ARDUINO_VARIANT "undefined"
+#endif
+#endif
+
+#if !defined(ARDUINO_BOARD)
+#define ARDUINO_BOARD "undefined board"
+#endif
+
+#if !defined(PANO_PLATFORM)
+#if defined(PLATFORM_PANOCONTROLLER_V4)
+#define PANO_PLATFORM "PanoController V4"
+#elif defined(PLATFORM_GIGAPAN)
+#define PANO_PLATFORM "Gigapan Epic 100"
+#elif defined(PLATFORM_MECHA_E1)
+#define PANO_PLATFORM "Nodal Ninja MECHA E1"
+#endif
+#endif

src/gcode.cpp

@@ -13,6 +13,7 @@
  * A copy of this license has been included with this distribution in the file LICENSE.
  */
 #include "gcode.h"
+#include "compat.h"
 
 #define d(x) serial.print(x)
 #define dln(x) serial.println(x)
@@ -195,15 +196,16 @@ void GCode::execute(char buffer[]){
     if (cmd.nonmodal & NonModal::M115){
         // Firmware version, capabilities and static configuration
         // These only need to be read once, at connection time.
-#if !defined(REVISION)
-#define REVISION 2.2
+#if !defined(GIT_VERSION)
+#define GIT_VERSION "2.2"
 #endif
         dln("Name=PanoController");
-        dln("Version=" REVISION);
+        dln("Version=" GIT_VERSION);
         dln("Build="  __DATE__ " " __TIME__);
         dln("Arch=" ARDUINO_VARIANT);
         dln("Board=" ARDUINO_BOARD);
-        d("Freq="); dln(F_CPU/1e+6);
+        dln("Platform=" PANO_PLATFORM);
+        d("Freq="); d(F_CPU/1e+6); dln("MHz");
         dln("BatteryMin=6.0"); // FIXME: should come from motor
         d("MaxSpeedA="); dln(platformSpeed(max_horiz_rpm, horiz_gear_ratio));
         d("MaxSpeedC="); dln(platformSpeed(max_vert_rpm, vert_gear_ratio));