diff --git a/workspace/TS100/.cproject b/workspace/TS100/.cproject
index cf57f62e..a9d9f96a 100644
--- a/workspace/TS100/.cproject
+++ b/workspace/TS100/.cproject
@@ -1,152 +1,280 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/workspace/TS100/Core/Src/GUIThread.cpp b/workspace/TS100/Core/Src/GUIThread.cpp
index 5a8d95ba..7e7a4f1e 100644
--- a/workspace/TS100/Core/Src/GUIThread.cpp
+++ b/workspace/TS100/Core/Src/GUIThread.cpp
@@ -710,7 +710,7 @@ void startGUITask(void const *argument __unused) {
gui_solderingMode(1);
}
-#if ACCELDEBUG
+#ifdef ACCELDEBUG
for (;;) {
HAL_IWDG_Refresh(&hiwdg);
diff --git a/workspace/TS100/Core/Src/TipThermoModel.cpp b/workspace/TS100/Core/Src/TipThermoModel.cpp
index a56bcf66..3c6b0d64 100644
--- a/workspace/TS100/Core/Src/TipThermoModel.cpp
+++ b/workspace/TS100/Core/Src/TipThermoModel.cpp
@@ -69,240 +69,6 @@ uint32_t TipThermoModel::convertTipRawADCToDegF(uint16_t rawADC) {
//Table that is designed to be walked to find the best sample for the lookup
-struct HakkoThermocoupleLookup {
- // 0 is the uV reading
- // 1 is the deg C X10
- // This was created from numbers transcribed from the patent by
- constexpr HakkoThermocoupleLookup() :
- values() {
- values[0][0] = 0;
- values[0][1] = 0;
- values[1][0] = 0;
- values[1][1] = 0;
- values[2][0] = 175;
- values[2][1] = 100;
- values[3][0] = 381;
- values[3][1] = 200;
- values[4][0] = 587;
- values[4][1] = 300;
- values[5][0] = 804;
- values[5][1] = 400;
- values[6][0] = 1005;
- values[6][1] = 500;
- values[7][0] = 1007;
- values[7][1] = 600;
- values[8][0] = 1107;
- values[8][1] = 700;
- values[9][0] = 1310;
- values[9][1] = 800;
- values[10][0] = 1522;
- values[10][1] = 900;
- values[11][0] = 1731;
- values[11][1] = 1000;
- values[12][0] = 1939;
- values[12][1] = 1100;
- values[13][0] = 2079;
- values[13][1] = 1200;
- values[14][0] = 2265;
- values[14][1] = 1300;
- values[15][0] = 2470;
- values[15][1] = 1400;
- values[16][0] = 2676;
- values[16][1] = 1500;
- values[17][0] = 2899;
- values[17][1] = 1600;
- values[18][0] = 3081;
- values[18][1] = 1700;
- values[19][0] = 3186;
- values[19][1] = 1800;
- values[20][0] = 3422;
- values[20][1] = 1900;
- values[21][0] = 3622;
- values[21][1] = 2000;
- values[22][0] = 3830;
- values[22][1] = 2100;
- values[23][0] = 4044;
- values[23][1] = 2200;
- values[24][0] = 4400;
- values[24][1] = 2300;
- values[25][0] = 4691;
- values[25][1] = 2400;
- values[26][0] = 4989;
- values[26][1] = 2500;
- values[27][0] = 5289;
- values[27][1] = 2600;
- values[28][0] = 5583;
- values[28][1] = 2700;
- values[29][0] = 5879;
- values[29][1] = 2800;
- values[30][0] = 6075;
- values[30][1] = 2900;
- values[31][0] = 6332;
- values[31][1] = 3000;
- values[32][0] = 6521;
- values[32][1] = 3100;
- values[33][0] = 6724;
- values[33][1] = 3200;
- values[34][0] = 6929;
- values[34][1] = 3300;
- values[35][0] = 7132;
- values[35][1] = 3400;
- values[36][0] = 7356;
- values[36][1] = 3500;
- values[37][0] = 7561;
- values[37][1] = 3600;
- values[38][0] = 7774;
- values[38][1] = 3700;
- values[39][0] = 7992;
- values[39][1] = 3800;
- values[40][0] = 8200;
- values[40][1] = 3900;
- values[41][0] = 8410;
- values[41][1] = 4000;
- values[42][0] = 8626;
- values[42][1] = 4100;
- values[43][0] = 8849;
- values[43][1] = 4200;
- values[44][0] = 9060;
- values[44][1] = 4300;
- values[45][0] = 9271;
- values[45][1] = 4400;
- values[46][0] = 9531;
- values[46][1] = 4500;
- values[47][0] = 9748;
- values[47][1] = 4600;
- values[48][0] = 10210;
- values[48][1] = 4700;
- values[49][0] = 10219;
- values[49][1] = 4800;
- values[50][0] = 10429;
- values[50][1] = 4900;
- values[51][0] = 10649;
- values[51][1] = 5000;
-
- }
- uint32_t count = 52;
- uint32_t values[52][2];
-
-};
-
-struct MiniwareThermocoupleLookup {
- // 0 is the uV reading
- // 1 is the deg C X10
- // This was created from numbers transcribed from the patent by
- constexpr MiniwareThermocoupleLookup() :
- values() {
- values[0][0] = 0;
- values[0][1] = 0;
- values[1][0] = 0;
- values[1][1] = 0;
- values[2][0] = 0;
- values[2][1] = 100;
- values[3][0] = 192;
- values[3][1] = 200;
- values[4][0] = 490;
- values[4][1] = 300;
- values[5][0] = 791;
- values[5][1] = 400;
- values[6][0] = 373;
- values[6][1] = 500;
- values[7][0] = 612;
- values[7][1] = 600;
- values[8][0] = 874;
- values[8][1] = 700;
- values[9][0] = 1590;
- values[9][1] = 800;
- values[10][0] = 1882;
- values[10][1] = 900;
- values[11][0] = 2081;
- values[11][1] = 1000;
- values[12][0] = 2466;
- values[12][1] = 1100;
- values[13][0] = 2977;
- values[13][1] = 1200;
- values[14][0] = 3196;
- values[14][1] = 1300;
- values[15][0] = 3311;
- values[15][1] = 1400;
- values[16][0] = 3707;
- values[16][1] = 1500;
- values[17][0] = 3889;
- values[17][1] = 1600;
- values[18][0] = 4072;
- values[18][1] = 1700;
- values[19][0] = 4271;
- values[19][1] = 1800;
- values[20][0] = 4550;
- values[20][1] = 1900;
- values[21][0] = 4753;
- values[21][1] = 2000;
- values[22][0] = 4975;
- values[22][1] = 2100;
- values[23][0] = 5112;
- values[23][1] = 2200;
- values[24][0] = 5605;
- values[24][1] = 2300;
- values[25][0] = 5734;
- values[25][1] = 2400;
- values[26][0] = 5855;
- values[26][1] = 2500;
- values[27][0] = 5959;
- values[27][1] = 2600;
- values[28][0] = 6130;
- values[28][1] = 2700;
- values[29][0] = 6352;
- values[29][1] = 2800;
- values[30][0] = 6481;
- values[30][1] = 2900;
- values[31][0] = 6700;
- values[31][1] = 3000;
- values[32][0] = 6882;
- values[32][1] = 3100;
- values[33][0] = 7247;
- values[33][1] = 3200;
- values[34][0] = 7466;
- values[34][1] = 3300;
- values[35][0] = 7633;
- values[35][1] = 3400;
- values[36][0] = 7749;
- values[36][1] = 3500;
- values[37][0] = 8391;
- values[37][1] = 3600;
- values[38][0] = 8600;
- values[38][1] = 3700;
- values[39][0] = 8804;
- values[39][1] = 3800;
- values[40][0] = 8999;
- values[40][1] = 3900;
- values[41][0] = 9183;
- values[41][1] = 4000;
- values[42][0] = 9362;
- values[42][1] = 4100;
- values[43][0] = 9548;
- values[43][1] = 4200;
- values[44][0] = 9727;
- values[44][1] = 4300;
- values[45][0] = 9911;
- values[45][1] = 4400;
- values[46][0] = 10086;
- values[46][1] = 4500;
- values[47][0] = 10247;
- values[47][1] = 4600;
- values[48][0] = 10403;
- values[48][1] = 4700;
- values[49][0] = 10566;
- values[49][1] = 4800;
- values[50][0] = 10744;
- values[50][1] = 4900;
- values[51][0] = 10935;
- values[51][1] = 5000;
-
- }
- uint32_t count = 52;
- uint32_t values[52][2];
-
-};
-//constexpr auto ThermalTable = MiniwareThermocoupleLookup();
//Extrapolate between two points
// [x1, y1] = point 1
// [x2, y2] = point 2
@@ -319,25 +85,6 @@ uint32_t TipThermoModel::convertuVToDegC(uint32_t tipuVDelta) {
tipuVDelta *= TIP_GAIN;
tipuVDelta /= 10000;
return tipuVDelta;
-
- //Perform lookup on table of values to find the closest two measurement points, and then linearly interpolate these
-
- //This assumes results in the table are increasing order
- // TODO -> Should this be made into a binary search? Is it much faster??
-// for (uint32_t i = 1; i < ThermalTable.count; i++) {
-// if (((uint32_t) ThermalTable.values[i][0]) > tipuVDelta) {
-// //Then extrapolate
-// //Where i= the lower raw sample, i-1 is the higher raw sample
-// return LinearInterpolate( //
-// ThermalTable.values[i][0], // x1
-// ThermalTable.values[i][1], // y1
-// ThermalTable.values[i - 1][0], // x2
-// ThermalTable.values[i - 1][1], // y2
-// tipuVDelta) / 10; // raw sample to be interpolated
-//
-// }
-// }
-// return 500; // fail high -> will turn off heater
}
uint32_t TipThermoModel::convertuVToDegF(uint32_t tipuVDelta) {
@@ -345,21 +92,6 @@ uint32_t TipThermoModel::convertuVToDegF(uint32_t tipuVDelta) {
tipuVDelta /= 1000;
return ((tipuVDelta * 9) / 50) + 32;
//(Y °C × 9/5) + 32 =Y°F
-// for (uint32_t i = 1; i < ThermalTable.count; i++) {
-// if (((uint32_t) ThermalTable.values[i][0]) < tipuVDelta) {
-// //Then extrapolate
-// //Where i= the lower raw sample, i-1 is the higher raw sample
-// return ((LinearInterpolate( //
-// ThermalTable.values[i][0], // x1
-// ThermalTable.values[i][1], // y1
-// ThermalTable.values[i - 1][0], // x2
-// ThermalTable.values[i - 1][1], // y2
-// tipuVDelta) // raw sample to be interpolated
-// * 9) / 50) + 32; // Convert C ->> F for 'mericans
-//
-// }
-// }
-// return 932; // fail high -> will turn off heater
}
uint32_t TipThermoModel::convertCtoF(uint32_t degC) {
diff --git a/workspace/TS100/Core/Src/Translation.cpp b/workspace/TS100/Core/Src/Translation.cpp
index 1ab2572a..9adb6dcc 100644
--- a/workspace/TS100/Core/Src/Translation.cpp
+++ b/workspace/TS100/Core/Src/Translation.cpp
@@ -238,7 +238,7 @@ const char* TipModelStrings[] = {
};
const char* DebugMenu[] = {
- "\x02\x09\x3B\x03\x02\x3B\x03\x0B",//07-10-19
+ "\x04\x05\x3B\x03\x04\x3B\x03\x0B",//23-12-19
"\x2A\x31\x0D\x40\x0D",//HW G
"\x2A\x31\x0D\x2C\x0D",//HW M
"\x2A\x31\x0D\x26\x0D",//HW P
@@ -617,7 +617,7 @@ const char* TipModelStrings[] = {
};
const char* DebugMenu[] = {
- "\x02\x09\x5E\x03\x02\x5E\x03\x0B",//07-10-19
+ "\x04\x05\x5E\x03\x04\x5E\x03\x0B",//23-12-19
"\x43\x42\x0C\x68\x0C",//HW G
"\x43\x42\x0C\x4A\x0C",//HW M
"\x43\x42\x0C\x52\x0C",//HW P
@@ -936,7 +936,7 @@ const char* TipModelStrings[] = {
};
const char* DebugMenu[] = {
- "\x02\x09\x47\x03\x02\x47\x03\x0B",//07-10-19
+ "\x04\x05\x47\x03\x04\x47\x03\x0B",//23-12-19
"\x2A\x36\x0C\x4E\x0C",//HW G
"\x2A\x36\x0C\x31\x0C",//HW M
"\x2A\x36\x0C\x21\x0C",//HW P
@@ -1227,7 +1227,7 @@ const char* TipModelStrings[] = {
};
const char* DebugMenu[] = {
- "\x02\x09\x3E\x03\x02\x3E\x03\x0B",//07-10-19
+ "\x04\x05\x3E\x03\x04\x3E\x03\x0B",//23-12-19
"\x28\x2F\x0C\x43\x0C",//HW G
"\x28\x2F\x0C\x23\x0C",//HW M
"\x28\x2F\x0C\x25\x0C",//HW P
@@ -1526,7 +1526,7 @@ const char* TipModelStrings[] = {
};
const char* DebugMenu[] = {
- "\x02\x09\x25\x03\x02\x25\x03\x0B",//07-10-19
+ "\x04\x05\x25\x03\x04\x25\x03\x0B",//23-12-19
"\x37\x3A\x0E\x46\x0E",//HW G
"\x37\x3A\x0E\x34\x0E",//HW M
"\x37\x3A\x0E\x45\x0E",//HW P
@@ -1831,7 +1831,7 @@ const char* TipModelStrings[] = {
};
const char* DebugMenu[] = {
- "\x02\x09\x3E\x03\x02\x3E\x03\x0B",//07-10-19
+ "\x04\x05\x3E\x03\x04\x3E\x03\x0B",//23-12-19
"\x37\x36\x0C\x43\x0C",//HW G
"\x37\x36\x0C\x23\x0C",//HW M
"\x37\x36\x0C\x24\x0C",//HW P
@@ -2126,7 +2126,7 @@ const char* TipModelStrings[] = {
};
const char* DebugMenu[] = {
- "\x02\x09\x2E\x03\x02\x2E\x03\x0B",//07-10-19
+ "\x04\x05\x2E\x03\x04\x2E\x03\x0B",//23-12-19
"\x2A\x2F\x10\x43\x10",//HW G
"\x2A\x2F\x10\x36\x10",//HW M
"\x2A\x2F\x10\x31\x10",//HW P
@@ -2419,7 +2419,7 @@ const char* TipModelStrings[] = {
};
const char* DebugMenu[] = {
- "\x02\x09\x36\x03\x02\x36\x03\x0B",//07-10-19
+ "\x04\x05\x36\x03\x04\x36\x03\x0B",//23-12-19
"\x2C\x3D\x0D\x3A\x0D",//HW G
"\x2C\x3D\x0D\x32\x0D",//HW M
"\x2C\x3D\x0D\x23\x0D",//HW P
@@ -2718,7 +2718,7 @@ const char* TipModelStrings[] = {
};
const char* DebugMenu[] = {
- "\x02\x09\x3F\x03\x02\x3F\x03\x0B",//07-10-19
+ "\x04\x05\x3F\x03\x04\x3F\x03\x0B",//23-12-19
"\x37\x3D\x0D\x46\x0D",//HW G
"\x37\x3D\x0D\x39\x0D",//HW M
"\x37\x3D\x0D\x23\x0D",//HW P
@@ -3035,7 +3035,7 @@ const char* TipModelStrings[] = {
};
const char* DebugMenu[] = {
- "\x02\x09\x4A\x03\x02\x4A\x03\x0B",//07-10-19
+ "\x04\x05\x4A\x03\x04\x4A\x03\x0B",//23-12-19
"\x1D\x44\x0C\x32\x0C",//HW G
"\x1D\x44\x0C\x36\x0C",//HW M
"\x1D\x44\x0C\x4C\x0C",//HW P
@@ -3330,7 +3330,7 @@ const char* TipModelStrings[] = {
};
const char* DebugMenu[] = {
- "\x02\x09\x3D\x03\x02\x3D\x03\x0B",//07-10-19
+ "\x04\x05\x3D\x03\x04\x3D\x03\x0B",//23-12-19
"\x35\x38\x0C\x44\x0C",//HW G
"\x35\x38\x0C\x27\x0C",//HW M
"\x35\x38\x0C\x30\x0C",//HW P
@@ -3637,7 +3637,7 @@ const char* TipModelStrings[] = {
};
const char* DebugMenu[] = {
- "\x02\x09\x26\x03\x02\x26\x03\x0B",//07-10-19
+ "\x04\x05\x26\x03\x04\x26\x03\x0B",//23-12-19
"\x3A\x3C\x0E\x2C\x0E",//HW G
"\x3A\x3C\x0E\x24\x0E",//HW M
"\x3A\x3C\x0E\x3B\x0E",//HW P
@@ -3922,7 +3922,7 @@ const char* TipModelStrings[] = {
};
const char* DebugMenu[] = {
- "\x02\x09\x25\x03\x02\x25\x03\x0B",//07-10-19
+ "\x04\x05\x25\x03\x04\x25\x03\x0B",//23-12-19
"\x2E\x35\x0D\x2A\x0D",//HW G
"\x2E\x35\x0D\x2F\x0D",//HW M
"\x2E\x35\x0D\x2D\x0D",//HW P
@@ -4209,7 +4209,7 @@ const char* TipModelStrings[] = {
};
const char* DebugMenu[] = {
- "\x02\x09\x26\x03\x02\x26\x03\x0B",//07-10-19
+ "\x04\x05\x26\x03\x04\x26\x03\x0B",//23-12-19
"\x2F\x35\x0E\x24\x0E",//HW G
"\x2F\x35\x0E\x33\x0E",//HW M
"\x2F\x35\x0E\x28\x0E",//HW P
@@ -4494,7 +4494,7 @@ const char* TipModelStrings[] = {
};
const char* DebugMenu[] = {
- "\x02\x09\x2F\x03\x02\x2F\x03\x0B",//07-10-19
+ "\x04\x05\x2F\x03\x04\x2F\x03\x0B",//23-12-19
"\x26\x33\x0C\x42\x0C",//HW G
"\x26\x33\x0C\x2A\x0C",//HW M
"\x26\x33\x0C\x2D\x0C",//HW P
@@ -4809,7 +4809,7 @@ const char* TipModelStrings[] = {
};
const char* DebugMenu[] = {
- "\x02\x09\x49\x03\x02\x49\x03\x0B",//07-10-19
+ "\x04\x05\x49\x03\x04\x49\x03\x0B",//23-12-19
"\x3C\x27\x0C\x3D\x0C",//HW G
"\x3C\x27\x0C\x2A\x0C",//HW M
"\x3C\x27\x0C\x23\x0C",//HW P
@@ -5114,7 +5114,7 @@ const char* TipModelStrings[] = {
};
const char* DebugMenu[] = {
- "\x02\x09\x3E\x03\x02\x3E\x03\x0B",//07-10-19
+ "\x04\x05\x3E\x03\x04\x3E\x03\x0B",//23-12-19
"\x35\x36\x0D\x41\x0D",//HW G
"\x35\x36\x0D\x21\x0D",//HW M
"\x35\x36\x0D\x24\x0D",//HW P
@@ -5485,7 +5485,7 @@ const char* TipModelStrings[] = {
};
const char* DebugMenu[] = {
- "\x02\x09\x25\x03\x02\x25\x03\x0B",//07-10-19
+ "\x04\x05\x25\x03\x04\x25\x03\x0B",//23-12-19
"\x3A\x36\x0C\x5C\x0C",//HW G
"\x3A\x36\x0C\x4D\x0C",//HW M
"\x3A\x36\x0C\x47\x0C",//HW P
@@ -5778,7 +5778,7 @@ const char* TipModelStrings[] = {
};
const char* DebugMenu[] = {
- "\x02\x09\x42\x03\x02\x42\x03\x0B",//07-10-19
+ "\x04\x05\x42\x03\x04\x42\x03\x0B",//23-12-19
"\x32\x35\x0C\x45\x0C",//HW G
"\x32\x35\x0C\x25\x0C",//HW M
"\x32\x35\x0C\x21\x0C",//HW P
@@ -6067,7 +6067,7 @@ const char* TipModelStrings[] = {
};
const char* DebugMenu[] = {
- "\x02\x09\x40\x03\x02\x40\x03\x0B",//07-10-19
+ "\x04\x05\x40\x03\x04\x40\x03\x0B",//23-12-19
"\x2B\x39\x0D\x46\x0D",//HW G
"\x2B\x39\x0D\x32\x0D",//HW M
"\x2B\x39\x0D\x2C\x0D",//HW P
@@ -6424,7 +6424,7 @@ const char* TipModelStrings[] = {
};
const char* DebugMenu[] = {
- "\x02\x09\x4B\x03\x02\x4B\x03\x0B",//07-10-19
+ "\x04\x05\x4B\x03\x04\x4B\x03\x0B",//23-12-19
"\x3B\x46\x0D\x57\x0D",//HW G
"\x3B\x46\x0D\x43\x0D",//HW M
"\x3B\x46\x0D\x54\x0D",//HW P
@@ -6725,7 +6725,7 @@ const char* TipModelStrings[] = {
};
const char* DebugMenu[] = {
- "\x02\x09\x44\x03\x02\x44\x03\x0B",//07-10-19
+ "\x04\x05\x44\x03\x04\x44\x03\x0B",//23-12-19
"\x35\x3F\x0D\x45\x0D",//HW G
"\x35\x3F\x0D\x38\x0D",//HW M
"\x35\x3F\x0D\x23\x0D",//HW P
@@ -7024,7 +7024,7 @@ const char* TipModelStrings[] = {
};
const char* DebugMenu[] = {
- "\x02\x09\x22\x03\x02\x22\x03\x0B",//07-10-19
+ "\x04\x05\x22\x03\x04\x22\x03\x0B",//23-12-19
"\x29\x34\x0C\x3E\x0C",//HW G
"\x29\x34\x0C\x2B\x0C",//HW M
"\x29\x34\x0C\x2C\x0C",//HW P
@@ -7331,7 +7331,7 @@ const char* TipModelStrings[] = {
};
const char* DebugMenu[] = {
- "\x02\x09\x46\x03\x02\x46\x03\x0B",//07-10-19
+ "\x04\x05\x46\x03\x04\x46\x03\x0B",//23-12-19
"\x38\x37\x0C\x34\x0C",//HW G
"\x38\x37\x0C\x25\x0C",//HW M
"\x38\x37\x0C\x2C\x0C",//HW P
@@ -7698,7 +7698,7 @@ const char* TipModelStrings[] = {
};
const char* DebugMenu[] = {
- "\x02\x09\x20\x03\x02\x20\x03\x0B",//07-10-19
+ "\x04\x05\x20\x03\x04\x20\x03\x0B",//23-12-19
"\x3B\x42\x0C\x59\x0C",//HW G
"\x3B\x42\x0C\x46\x0C",//HW M
"\x3B\x42\x0C\x55\x0C",//HW P
diff --git a/workspace/TS100/Core/Src/main.cpp b/workspace/TS100/Core/Src/main.cpp
index 3288bf25..cbaf4c9e 100644
--- a/workspace/TS100/Core/Src/main.cpp
+++ b/workspace/TS100/Core/Src/main.cpp
@@ -229,7 +229,7 @@ void startMOVTask(void const *argument __unused) {
int32_t avgx = 0, avgy = 0, avgz = 0;
if (systemSettings.sensitivity > 9)
systemSettings.sensitivity = 9;
-#if ACCELDEBUG
+#ifdef ACCELDEBUG
uint32_t max = 0;
#endif
Orientation rotation = ORIENTATION_FLAT;
diff --git a/workspace/TS100/Middlewares/Third_Party/FreeRTOS/Source/CMSIS_RTOS/cmsis_os.h b/workspace/TS100/Middlewares/Third_Party/FreeRTOS/Source/CMSIS_RTOS/cmsis_os.h
index c83e14eb..eae02347 100644
--- a/workspace/TS100/Middlewares/Third_Party/FreeRTOS/Source/CMSIS_RTOS/cmsis_os.h
+++ b/workspace/TS100/Middlewares/Third_Party/FreeRTOS/Source/CMSIS_RTOS/cmsis_os.h
@@ -26,7 +26,7 @@
*
*----------------------------------------------------------------------------
*
- * Portions Copyright © 2016 STMicroelectronics International N.V. All rights reserved.
+ * Portions Copyright � 2016 STMicroelectronics International N.V. All rights reserved.
* Portions Copyright (c) 2013 ARM LIMITED
* All rights reserved.
* Redistribution and use in source and binary forms, with or without
@@ -462,7 +462,7 @@ const osThreadDef_t os_thread_def_##name = \
#define osThreadStaticDef(name, thread, priority, instances, stacksz, buffer, control) \
const osThreadDef_t os_thread_def_##name = \
-{ #name, (thread), (priority), (instances), (stacksz), (buffer), (control) }
+{(char*) #name, (thread), (priority), (instances), (stacksz), (buffer), (control) }
#else //configSUPPORT_STATIC_ALLOCATION == 0
#define osThreadDef(name, thread, priority, instances, stacksz) \
diff --git a/workspace/TS100/build.sh b/workspace/TS100/build.sh
index 0efcf1ff..89748dc8 100755
--- a/workspace/TS100/build.sh
+++ b/workspace/TS100/build.sh
@@ -133,7 +133,9 @@ then
checkLastCommand
echo "Cleaning previous builds"
- make clean 1>/dev/null
+ rm -rf Hexfile/ >/dev/null
+ rm -rf Objects/ >/dev/null
+ make clean >/dev/null
checkLastCommand
for model in "${BUILD_MODELS[@]}"
@@ -141,9 +143,9 @@ then
for lang in "${BUILD_LANGUAGES[@]}"
do
echo "Building firmware for $model in $lang"
- make -j16 lang="$lang" model="$model" 1>/dev/null
+ make -j lang="$lang" model="$model" >/dev/null
checkLastCommand
- rm -rf Objects/src 1>/dev/null
+ rm -rf Objects/src>/dev/null
done
done
else