FeatherHAB/wsprhab Changeset - e3feb70c71e6

Changeset - e3feb70c71e6

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

Ethan Zonca - 10 years ago 2016-03-31 22:25:29
ez@ethanzonca.com

Commented out GPS code that wasn't compiling, added power saving options to si5351 code. Tx is now 66mA, no GPS.

2 files changed with 14 insertions and 5 deletions:

src/gps.c

src/main.c

0 comments (0 inline, 0 general)

src/gps.c

➞

Show inline comments

@@ @@ -27,31 +27,31 @@ int skipBytes = 0; @@
 //used to index data arrays during data collection
 int numBytes = 0;
 //variables to store data from transmission
 //least significant digit is stored at location 0 of arrays
 char tramsmissionType[7];
 void gps_poweron(void)
+{
     // NOTE: pchannel
     gpio_clear(GPS_ONOFF);
+    //gpio_clear(GPS_ONOFF);
+}
 void gps_poweroff(void)
+{
     // NOTE: pchannel
     gpio_set(GPS_ONOFF);
+    //gpio_set(GPS_ONOFF);
+}
 char timestamp[12];	//hhmmss.ss
 char* get_timestamp()
+{
 	return timestamp;
+}
 char latitude[14];	//lllll.lla
 char latitudeTmpTRIM[8];
 char latitudeTmpLSB[4];
 char* get_latitudeTrimmed()
@@ @@ -163,25 +163,25 @@ enum decodeState { @@
 	RMC_LATITUDE,
 	RMC_LONGITUDE,
 	RMC_KNOTS,
 	RMC_COURSE,
 	RMC_DATE,
 	RMC_MAG_VARIATION,
 }decodeState;
 void usart1_isr(void)
+{
 	uint8_t recv = usart_recv(GPS_USART);
+	uint8_t recv = 0;// usart_recv(GPS_USART);
 	//ECHO debug: usart_send_blocking(GPS_USART, recv);
 	nmeaBuffer[nmeaBufferDataPosition % NMEABUFFER_SIZE] = recv;
 	nmeaBufferDataPosition = (nmeaBufferDataPosition + 1) % NMEABUFFER_SIZE;
+}
 void gps_init()
+{
     uart_init();
     timestamp[0] = 0x00;
     latitude[0] = 0x00;
     longitude[0] = 0x00;
     numSatellites[0] = 0x00;
@@ @@ -205,25 +205,25 @@ void gps_init() @@
     // Set dynamic model 6 (<1g airborne platform)
     uint8_t airborne_model[] = { 0xB5, 0x62, 0x06, 0x24, 0x24, 0x00, 0xFF, 0xFF, 0x06, 0x03, 0x00, 0x00, 0x00, 0x00, 0x10, 0x27, 0x00, 0x00, 0x05, 0x00, 0xFA, 0x00, 0xFA, 0x00, 0x64, 0x00, 0x2C, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x16, 0xDC };
     gps_sendubx(airborne_model, sizeof(airborne_model)/sizeof(uint8_t));
+}
 void gps_sendubx(uint8_t* dat, uint8_t size)
+{
     uint8_t sendctr;
     for(sendctr = 0; sendctr < size; sendctr++)
+    {
         usart_send(GPS_USART, dat[sendctr]);
+        //usart_send(GPS_USART, dat[sendctr]);
+    }
+}
 // Could inline if program space available
 static void setParserState(uint8_t state)
+{
 	decodeState = state;
 	// If resetting, clear vars
 	if(state == INITIALIZE)
+	{
 		calculatedChecksum = 0;

src/main.c

➞

Show inline comments

@@ @@ -42,24 +42,33 @@ void encode_wspr(void) @@
     HAL_Delay(100);
     // Bring up the chip
     si5351_init(i2c_get(), SI5351_CRYSTAL_LOAD_8PF, 0);
     si5351_set_correction(0);
     //si5351_set_pll(SI5351_PLL_FIXED, SI5351_PLLA);
     //si5351_set_ms_source(SI5351_CLK0, SI5351_PLLA);
     si5351_set_freq(WSPR_DEFAULT_FREQ * 100, 0, SI5351_CLK0);
     si5351_drive_strength(SI5351_CLK0, SI5351_DRIVE_8MA); // Set for max power if desired (8ma max)
     si5351_output_enable(SI5351_CLK0, 1);
     //si5351_pll_reset(SI5351_PLLA);
     // Make sure the other outputs of the SI5351 are disabled
     si5351_output_enable(SI5351_CLK1, 0); // Disable the clock initially
     si5351_output_enable(SI5351_CLK2, 0); // Disable the clock initially
     // disable clock powers
     si5351_set_clock_pwr(SI5351_CLK1, 0);
     si5351_set_clock_pwr(SI5351_CLK2, 0);
     // Encode message to transmit
     wspr_encode(call, loc, dbm, tx_buffer);
     // Key transmitter
     si5351_output_enable(SI5351_CLK0, 1);
     // Loop through and transmit symbols TODO: Do this from an ISR or ISR-triggered main loop function call (optimal)
     uint8_t i;
     for(i=0; i<symbol_count; i++)
+    {
         uint32_t freq2 = (freq * 100) + (tx_buffer[i] * tone_spacing);
         si5351_set_freq(freq2, 0, SI5351_CLK0);
@@ @@ -79,25 +88,25 @@ void encode_wspr(void) @@
 TIM_HandleTypeDef htim1;
 int main(void)
+{
     HAL_Init();
     sysclk_init();
     gpio_init();
     dma_init();
     adc_init();
     i2c_init();
     gps_init();
+//    gps_init();
     // Disable ICs
     HAL_GPIO_WritePin(OSC_NOTEN, 1);
     HAL_GPIO_WritePin(TCXO_EN, 0);
     // Start timer for WSPR
     __TIM1_CLK_ENABLE();
     htim1.Instance = TIM1;
     htim1.Init.Prescaler = 512; // gives 64uS ticks from 8MHz ahbclk
     htim1.Init.CounterMode = TIM_COUNTERMODE_UP;
     htim1.Init.Period = ctc; // Count up to this value (how many 64uS ticks per symbol)

0 comments (0 inline, 0 general)