Merge branch 'master' of github:szmoore/MCTX3420 into report

[matches/MCTX3420.git] / server / sensors / strain.c

diff --git a/server/sensors/strain.c b/server/sensors/strain.c
index 77a11a2..7c78b56 100644 (file)
--- a/server/sensors/strain.c
+++ b/server/sensors/strain.c
@@ -7,7 +7,7 @@
 
 #define STRAIN_ADC ADC0
 // TODO: Choose this
-#define STRAIN_GPIO 15
+#define STRAIN_GPIO 45
 
 /**
  * Convert Strain gauge id number to a GPIO pin on the Mux
@@ -25,13 +25,13 @@ static int Strain_To_GPIO(StrainID id)
        switch (id)
        {
                case STRAIN0:
-                       return GPIO0_30;
+                       return 44;
                case STRAIN1:
-                       return GPIO1_28;
+                       return 26;
                case STRAIN2:
-                       return GPIO0_31;
+                       return 46;
                case STRAIN3:
-                       return GPIO1_16;
+                       return 65;
                default:
                        Fatal("Unknown StrainID %d", id);
                        return -1; // Should never happen