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

@@ @@ -36,13 +36,13 @@ 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
@@ @@ -172,7 +172,7 @@ enum 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;
@@ @@ -214,7 +214,7 @@ void gps_sendubx(uint8_t* dat, uint8_t s @@
     uint8_t sendctr;
     for(sendctr = 0; sendctr < size; sendctr++)
+    {
         usart_send(GPS_USART, dat[sendctr]);
+        //usart_send(GPS_USART, dat[sendctr]);
+    }
+}

src/main.c

➞

Show inline comments

@@ @@ -51,6 +51,15 @@ void encode_wspr(void) @@
     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);
@@ @@ -88,7 +97,7 @@ int main(void) @@
     dma_init();
     adc_init();
     i2c_init();
     gps_init();
+//    gps_init();
     // Disable ICs
     HAL_GPIO_WritePin(OSC_NOTEN, 1);

0 comments (0 inline, 0 general)