Skip to content

Commit d0a9a91

Browse files
authored
Add files via upload
1 parent 7a5156f commit d0a9a91

File tree

3 files changed

+167
-153
lines changed

3 files changed

+167
-153
lines changed

RocketFlightLogger.ino

+34-8
Original file line numberDiff line numberDiff line change
@@ -483,7 +483,7 @@ void setup()
483483
//and change it to 57600, 115200 etc..
484484
Serial.begin(38400);
485485
char bluetoothName [21];
486-
preferences.begin("namespace", false);
486+
preferences.begin("namespace", false);
487487
//sprintf(altiName, "ESP32Rocket%i", (int)config.altiID );
488488
sprintf(bluetoothName, "%s", preferences.getString("Name", "ESP32Rocket"));
489489
preferences.end();
@@ -493,7 +493,7 @@ void setup()
493493
Serial.begin(38400);
494494
char bluetoothName [21];
495495
//sprintf(altiName, "ESP32Accel%i", (int)config.altiID );
496-
preferences.begin("namespace", false);
496+
preferences.begin("namespace", false);
497497
sprintf(bluetoothName, "%s", preferences.getString("Name", "ESP32Accel"));
498498
preferences.end();
499499
SerialCom.begin(bluetoothName);
@@ -502,7 +502,7 @@ void setup()
502502
Serial.begin(38400);
503503
char bluetoothName [21];
504504
//sprintf(altiName, "ESP32A375_%i", (int)config.altiID );
505-
preferences.begin("namespace", false);
505+
preferences.begin("namespace", false);
506506
sprintf(bluetoothName, "%s", preferences.getString("Name", "ESP32A375"));
507507
preferences.end();
508508
SerialCom.begin(bluetoothName);
@@ -511,7 +511,7 @@ void setup()
511511
Serial.begin(38400);
512512
char bluetoothName [21];
513513
//sprintf(altiName, "ESP32A345_%i", (int)config.altiID );
514-
preferences.begin("namespace", false);
514+
preferences.begin("namespace", false);
515515
sprintf(bluetoothName, "%s", preferences.getString("Name", "ESP32A345"));
516516
preferences.end();
517517
SerialCom.begin(bluetoothName);
@@ -1667,11 +1667,16 @@ void interpretCommandBuffer(char *commandbuffer) {
16671667
#endif
16681668
SerialCom.print(F("$start;\n"));
16691669
#if defined ALTIMULTIESP32 || defined ALTIMULTIESP32_ACCELERO || defined ALTIMULTIESP32_ACCELERO_375 || defined ALTIMULTIESP32_ACCELERO_345
1670-
char altiName [15];
1670+
unsigned char bluetoothName [21];
16711671
preferences.begin("namespace", false);
1672-
sprintf(altiName, "%s", preferences.getString("Name", "ESP32Rocket"));
1672+
1673+
String btName = "";
1674+
btName = preferences.getString("Name", "ESP32Rocket");
16731675
preferences.end();
1674-
printAltiConfig(altiName);
1676+
1677+
btName.getBytes(bluetoothName,btName.length()+1);
1678+
1679+
printAltiConfig((char *)bluetoothName);
16751680
#else
16761681
printAltiConfig("");
16771682
#endif
@@ -1700,6 +1705,11 @@ void interpretCommandBuffer(char *commandbuffer) {
17001705
{
17011706
defaultConfig();
17021707
writeConfigStruc();
1708+
#if defined ALTIMULTIESP32 || defined ALTIMULTIESP32_ACCELERO || defined ALTIMULTIESP32_ACCELERO_375 || defined ALTIMULTIESP32_ACCELERO_345
1709+
preferences.begin("namespace", false);
1710+
preferences.putString("Name", "ESP32Rocket");
1711+
preferences.end();
1712+
#endif
17031713
initAlti();
17041714
}
17051715
//this will erase all flight
@@ -1941,9 +1951,22 @@ void interpretCommandBuffer(char *commandbuffer) {
19411951
//reset config
19421952
defaultConfig();
19431953
writeConfigStruc();
1954+
#if defined ALTIMULTIESP32 || defined ALTIMULTIESP32_ACCELERO || defined ALTIMULTIESP32_ACCELERO_375 || defined ALTIMULTIESP32_ACCELERO_345
1955+
preferences.begin("namespace", false);
1956+
preferences.putString("Name", "ESP32Rocket");
1957+
preferences.end();
1958+
#endif
19441959
initAlti();
19451960
SerialCom.print(F("config reseted\n"));
19461961
}
1962+
else if (commandbuffer[0] == 'v')
1963+
{
1964+
#if defined ALTIMULTIESP32 || defined ALTIMULTIESP32_ACCELERO || defined ALTIMULTIESP32_ACCELERO_375 || defined ALTIMULTIESP32_ACCELERO_345
1965+
preferences.begin("namespace", false);
1966+
SerialCom.println(preferences.getString("Name", "ESP32Rocket"));
1967+
preferences.end();
1968+
#endif
1969+
}
19471970
// Recording
19481971
else if (commandbuffer[0] == 'w')
19491972
{
@@ -2194,10 +2217,13 @@ void updateAltiName(char *commandbuffer) {
21942217

21952218
for (i = 2; i < strlen(temp); i++)
21962219
{
2197-
if (temp[i] == ',')
2220+
if (temp[i] == ','){
2221+
altiName[i - 2] = '\0';
21982222
break;
2223+
}
21992224
altiName[i - 2] = temp[i];
22002225
}
2226+
22012227
preferences.begin("namespace", false);
22022228
preferences.putString("Name", altiName);
22032229
preferences.end();

0 commit comments

Comments
 (0)