diff --git a/Multiprotocol/AFHDS2A_a7105.ino b/Multiprotocol/AFHDS2A_a7105.ino index 11ef094..158142d 100644 --- a/Multiprotocol/AFHDS2A_a7105.ino +++ b/Multiprotocol/AFHDS2A_a7105.ino @@ -260,6 +260,7 @@ uint16_t ReadAFHDS2A() while ((uint16_t)micros()-start < 700) // Wait max 700µs, using serial+telemetry exit in about 120µs if(!(A7105_ReadReg(A7105_00_MODE) & 0x01)) break; + A7105_SetPower(); A7105_SetTxRxMode(TXRX_OFF); // Turn LNA off since we are in near range and we want to prevent swamping A7105_Strobe(A7105_RX); phase &= ~AFHDS2A_WAIT_WRITE; @@ -325,6 +326,7 @@ uint16_t ReadAFHDS2A() while ((uint16_t)micros()-start < 700) // Wait max 700µs, using serial+telemetry exit in about 120µs if(!(A7105_ReadReg(A7105_00_MODE) & 0x01)) break; + A7105_SetPower(); A7105_SetTxRxMode(RX_EN); A7105_Strobe(A7105_RX); phase &= ~AFHDS2A_WAIT_WRITE; diff --git a/Multiprotocol/DSM_cyrf6936.ino b/Multiprotocol/DSM_cyrf6936.ino index f3120d1..6b4aef1 100644 --- a/Multiprotocol/DSM_cyrf6936.ino +++ b/Multiprotocol/DSM_cyrf6936.ino @@ -273,14 +273,10 @@ static void __attribute__((unused)) DSM_build_data_packet(uint8_t upper) uint16_t value = 0xffff;; if (idx != 0xff) { - if (!IS_BIND_DONE_on) - { // Failsafe position during binding - value=max/2; //all channels to middle - if(idx==0) - value=1; //except throttle - } - else - value=map(Servo_data[CH_TAER[idx]],servo_min_125,servo_max_125,0,max); + /* Spektrum own remotes transmit normal values during bind and actually + * use this (e.g. Nano CP X) to select the transmitter mode (e.g. computer vs + * non-computer radio, so always end normal output */ + value=map(Servo_data[CH_TAER[idx]],servo_min_125,servo_max_125,0,max); value |= (upper && i==0 ? 0x8000 : 0) | (idx << bits); } packet[i*2+2] = (value >> 8) & 0xff; @@ -582,4 +578,4 @@ uint16_t initDsm() return 10000; } -#endif \ No newline at end of file +#endif diff --git a/Multiprotocol/Multiprotocol.ino b/Multiprotocol/Multiprotocol.ino index c6b795b..83f0d8d 100644 --- a/Multiprotocol/Multiprotocol.ino +++ b/Multiprotocol/Multiprotocol.ino @@ -34,7 +34,7 @@ #endif //Personal config file -#if defined USE_MY_CONFIG || __has_include("_MyConfig.h") +#if defined USE_MY_CONFIG #include "_MyConfig.h" #endif @@ -207,6 +207,7 @@ void setup() TCC1.CTRLA = 0x0B ; // Event3 (prescale of 16) #elif defined STM32_BOARD //STM32 + afio_cfg_debug_ports(AFIO_DEBUG_NONE); pinMode(A7105_CSN_pin,OUTPUT); pinMode(CC25_CSN_pin,OUTPUT); pinMode(NRF_CSN_pin,OUTPUT); diff --git a/docs/BOM_DIY_STM32 & Schematic.md b/docs/BOM_DIY_STM32 & Schematic.md index 27f65bd..8a280d1 100644 --- a/docs/BOM_DIY_STM32 & Schematic.md +++ b/docs/BOM_DIY_STM32 & Schematic.md @@ -13,7 +13,13 @@ In the case of the Turnigy 9X/9XR/9XR Pro you don't need to invert the telemetry The inverted telemetry signal is required by TARANIS TX and other boards so for telemetry to work properly the inverter chip must be installed. -## BOM DIY STM32 PCB V1.0t - the USB version +## BOM DIY STM32 PCB V1.1t - USB version update +The board is available at OSHpark [here](https://oshpark.com/shared_projects/eWtNW6jo) + + + + +## BOM DIY STM32 PCB V1.0t & V1.1 - the USB version This BOM is for the board with the USB port which allows firmware upload. The board is available at OSHpark [here](https://oshpark.com/shared_projects/GX51nEoH) @@ -33,7 +39,7 @@ Qty|Part|Description|Value|Package|Digikey Part Number 1|C203|Cap Ceramic|4u7|0805|[311-1371-1-ND](https://www.digikey.com/product-detail/en/yageo/CC0805ZRY5V6BB475/311-1371-1-ND/2103155) 1|C207|Cap Ceramic|1uF|0805|[311-1365-1-ND](https://www.digikey.com/product-detail/en/yageo/CC0805KKX7R7BB105/311-1365-1-ND/2103149) 1|C208|Cap Ceramic|10nF|0805|[311-1136-1-ND](http://www.digikey.com/products/en?keywords=311-1136-1-ND) -4|D201,301,302,303|Diode Shottky|BAT48|SOD123|[497-5712-1-ND](http://www.digikey.com/products/en?keywords=497-5712-1-ND) +5|D101*,201,301,302,303|Diode Shottky|BAT48|SOD123|[497-5712-1-ND](http://www.digikey.com/products/en?keywords=497-5712-1-ND) 1|IC101|Voltage reg 5V|AMS1117-50|SOT223|[LM1117MP-5.0/NOPBCT-ND](https://www.digikey.com/product-detail/en/texas-instruments/LM1117MP-5.0-NOPB/LM1117MP-5.0-NOPBCT-ND/363589) 1|IC102|Voltage reg 3.3V|AMS1117-33|SOT223|[LM1117MPX-3.3/NOPBCT-ND](https://www.digikey.com/product-detail/en/texas-instruments/LM1117MPX-3.3-NOPB/LM1117MPX-3.3-NOPBCT-ND/1010516) 1|L101|High Freq Inductor|10uH|1812|[CM453232-100KLCT-ND](https://www.digikey.com/product-detail/en/bourns-inc/CM453232-100KL/CM453232-100KLCT-ND/3437938) @@ -55,6 +61,8 @@ Qty|Part|Description|Value|Package|Digikey Part Number 1|U301|Dual INPUT-XOR|SN74LVC2G86DCTR|SSM8|[296-13274-1-ND](http://www.digikey.com/product-detail/en/texas-instruments/SN74LVC2G86DCTR/296-13274-1-ND/484501) 1|CON401|ANT.conn SMD|||[WM5587CT-ND](https://www.digikey.com/product-detail/en/molex-llc/0734120110/WM5587CT-ND/1894612) +* Diode D101 is only required for the V1.1 board + PCB STM32 V1.0t Schematic @@ -98,9 +106,8 @@ Qty|Part|Description|Value|Package|Digikey Part Number ## BOM DIY STM32 PCB - the first Version This BOM is for the board that looks like this - check carefully: - +src="https://644db4de3505c40a0444-327723bce298e3ff5813fb42baeefbaa.ssl.cf1.rackcdn.com/2026cfd1d0187a770570052590168df1.png" width="300" height="400"/> Qty|Part|Description|Value|Package|Digikey Part Number diff --git a/docs/images/Board_PCB_STM32_USB_V1.1-1.png b/docs/images/Board_PCB_STM32_USB_V1.1-1.png new file mode 100644 index 0000000..ba70160 Binary files /dev/null and b/docs/images/Board_PCB_STM32_USB_V1.1-1.png differ diff --git a/docs/images/Board_PCB_STM32_USB_V1.1-2.png b/docs/images/Board_PCB_STM32_USB_V1.1-2.png new file mode 100644 index 0000000..5c79398 Binary files /dev/null and b/docs/images/Board_PCB_STM32_USB_V1.1-2.png differ