Merge pull request #34 from kcglab/dev

Updates
kcglab · Jun 20, 2023 · 45d0f83 · 45d0f83
2 parents b592dd2 + f20def0
commit 45d0f83
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 4 deletions.
diff --git a/paper/paper.md b/paper/paper.md
@@ -12,6 +12,7 @@ authors:
     orcid: 0000-0002-1300-5236
     affiliation: "1"
   - name: Michael Britvin
+    orcid: 0009-0003-5492-4014
     affiliation: "2"
   - name: Boaz Ben Moshe
     orcid: 0000-0002-1580-5421

diff --git a/software/SAT0_Ground/Serial_Event.ino b/software/SAT0_Ground/Serial_Event.ino
@@ -169,16 +169,18 @@ memset(ser_buffer_g, 0x00, MAX_BUFFER_SIZE);
 #endif
 
   if (cmd == 't') {
+#if EEPROM_ENABLE
     PRINTLN("Settings:");
     print_settings();
-#if EEPROM_ENABLE
     print_eeprom();
 #endif
     if (idx >= 2) {
       uint8_t opt = (int)ser_buffer_g[0] + 87;
       PRINT("opt:\t");
       PRINTLN((char)opt);
+#if EEPROM_ENABLE
     parse_setting(opt, ser_buffer_g + 1, idx - 1);
+#endif
     }
     return;
   }

diff --git a/software/SAT0_Ground/settings.h b/software/SAT0_Ground/settings.h
@@ -136,15 +136,15 @@ char firmware_version[14 + 1] = {0};
 #else // TTGO T-BEAM
 #define LED1 25
 #define SCK 5   // GPIO5  -- SX1278's SCK
-#define MISO 19 // GPIO19 -- SX1278's MISnO
+#define MISO 19 // GPIO19 -- SX1278's MISO
 #define MOSI 27 // GPIO27 -- SX1278's MOSI
 #define NSS 18  // GPIO18 -- SX1278's CS
 #define RST 14  // GPIO14 -- SX1278's RESET
 #define DIO 26  // GPIO26 -- SX1278's IRQ(Interrupt Request)
 #define OLED_R 16
 #define OLED_SDA 21
 #define OLED_SCL 22
-#define SERVO_PIN 23 // Servo Signal Pin
+#define SERVO_PIN -1 // Servo Signal Pin
 #endif
 
 #define NUM_SATS 1
@@ -214,9 +214,11 @@ bool REPLY_ACK = false;
 #define LORA_433_CR_4_5 5
 #define LORA_433_SF10 10
 #define LORA_433_BW_062 6 // table
+#define LORA_433_BW_125 7 // table
+#define LORA_433_BW_250 9 // table
 
 #define LORA_433_CRC_ON 0x01    // Packet CRC is activated
-#define LORA_433_CRC_OFF 0x0    // Packet CRC is activated
+#define LORA_433_CRC_OFF 0x0    // Packet CRC is deactivated
 #define LORA_433_LDRO_ON 0x01   // 0x00 OFF, 0x01 ON, 0x02 AUTO
 #define LORA_433_LDRO_OFF 0x00  // 0x00 OFF, 0x01 ON, 0x02 AUTO
 #define LORA_433_LDRO_AUTO 0x02 // 0x00 OFF, 0x01 ON, 0x02 AUTO

diff --git a/software/SAT0_Master/settings.h b/software/SAT0_Master/settings.h
@@ -157,7 +157,11 @@ TinyGPSPlus gps;           // GPS
 #define FAT_RPI_1_PIN 5     //
 #define FAT_LORA_24_PIN 6   // On-Board
 #define FAT_LASER_PIN 28    // FAT1-ON
+#ifdef ARDUINO_TEENSY32
+#define FAT_MAIN_LED_PIN 8 //
+#else
 #define FAT_MAIN_LED_PIN 29 //
+#endif
 #define FAT_ANT_PIN 31      //
 #define FAT_GEN2_PIN -1     //