From 00fd294bde3b9aaa09971977b65280a0e8b8e269 Mon Sep 17 00:00:00 2001 From: morgan Date: Mon, 4 Feb 2019 21:28:59 +0000 Subject: [PATCH] working with RPi --- src/HamShield.h | 12 +++++++----- src/HamShield_comms.h | 8 ++++---- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/src/HamShield.h b/src/HamShield.h index 5cfdd7e..8d059f7 100644 --- a/src/HamShield.h +++ b/src/HamShield.h @@ -240,14 +240,16 @@ class HamShield { bool frequency_float(float freq_khz); uint32_t getFrequency(); float getFrequency_float(); - + + /* ToDo // channel mode // 11 - 25kHz channel // 00 - 12.5kHz channel // 10,01 - reserved void setChanMode(uint16_t mode); uint16_t getChanMode(); - + */ + void setModeTransmit(); // turn off rx, turn on tx void setModeReceive(); // turn on rx, turn off tx void setModeOff(); // turn off rx, turn off tx, set pwr_dwn bit @@ -265,6 +267,7 @@ class HamShield { void setTxSourceNone(); uint16_t getTxSource(); + /* // PA bias voltage is unused (maybe remove this) // set PA_bias voltage // 000000: 1.01V @@ -277,6 +280,7 @@ class HamShield { // 1111111:3.13V void setPABiasVoltage(uint16_t voltage); uint16_t getPABiasVoltage(); + */ // Subaudio settings @@ -475,9 +479,7 @@ class HamShield { uint32_t findWhitespace(uint32_t start,uint32_t stop, uint8_t dwell, uint16_t step, uint16_t threshold); uint32_t scanChannels(uint32_t buffer[],uint8_t buffsize, uint8_t speed, uint16_t threshold); uint32_t findWhitespaceChannels(uint32_t buffer[],uint8_t buffsize, uint8_t dwell, uint16_t threshold); - void buttonMode(uint8_t mode); - static void isr_ptt(); - static void isr_reset(); + unsigned int getMorseFreq(); void setMorseFreq(unsigned int morse_freq_hz); unsigned int getMorseDotMillis(); diff --git a/src/HamShield_comms.h b/src/HamShield_comms.h index 6fabc18..09b81d2 100644 --- a/src/HamShield_comms.h +++ b/src/HamShield_comms.h @@ -17,10 +17,10 @@ #include #include -#define nSEN 17 // -#define CLK 22 // -#define DAT 27 // -#define HAMSHIELD_PWM_PIN 18 +#define nSEN 0 //BCM17, HW pin 11 +#define CLK 3 //BCM22, HW pin 15 +#define DAT 2 //BCM27, HW pin 13 +#define HAMSHIELD_PWM_PIN 1 //BCM18, HW pin 12 #endif