Add files via upload

LSatan · Apr 14, 2020 · 933020a · 933020a
1 parent bf1dada
commit 933020a
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 38 deletions.
diff --git a/ELECHOUSE_CC1101_SRC_DRV.cpp b/ELECHOUSE_CC1101_SRC_DRV.cpp
@@ -39,7 +39,6 @@ byte mdcf2;
 byte rxbw = 0;
 bool ccmode = 0;
 float MHz = 433.92;
-float CHsp = 405.45;
 
 /****************************************************************/
 uint8_t PA_TABLE[8]     {0x00,0xC0,0x00,0x00,0x00,0x00,0x00,0x00};
@@ -464,34 +463,6 @@ rxbw = r *16;
 setCCMode(ccmode);
 }
 /****************************************************************
-*FUNCTION NAME:Channel spacing
-*FUNCTION     :Channel spacing
-*INPUT        :none
-*OUTPUT       :none
-****************************************************************/
-void ELECHOUSE_CC1101::setChsp(float Chsp){
-int mdc0 = 0;
-int mdc1 = 0;
-CHsp = Chsp;
-if (Chsp > 405.456543){Chsp = 405.456543;}
-if (Chsp < 25.390625){Chsp = 25.390625;}
-for (int i = 0; i<5; i++){
-if (Chsp <= 50.682068){
-Chsp = Chsp - 25.390625;
-Chsp = Chsp / 0.0991825;
-mdc0 = Chsp;
-float s1 = (Chsp - mdc0) *10;
-if (s1 >= 5){mdc0++;}
-i = 5;
-}else{
-mdc1++;
-Chsp = Chsp/2;
-}
-}
-SpiWriteReg(CC1101_MDMCFG1,  mdc1);
-SpiWriteReg(CC1101_MDMCFG0,  mdc0);
-}
-/****************************************************************
 *FUNCTION NAME:Set Channel
 *FUNCTION     :none
 *INPUT        :none
@@ -513,8 +484,9 @@ void ELECHOUSE_CC1101::RegConfigSettings(void)
 
     setCCMode(ccmode);
     setMHZ(MHz);
-    setChsp(CHsp);
-
+
+    SpiWriteReg(CC1101_MDMCFG1,  0x03);
+    SpiWriteReg(CC1101_MDMCFG0,  0xFF);
     SpiWriteReg(CC1101_CHANNR,   chan);
     SpiWriteReg(CC1101_DEVIATN,  0x47);
     SpiWriteReg(CC1101_FREND1,   0x56);

diff --git a/ELECHOUSE_CC1101_SRC_DRV.h b/ELECHOUSE_CC1101_SRC_DRV.h
@@ -134,7 +134,6 @@ class ELECHOUSE_CC1101
   void setPA(int p);
   void setMHZ(float mhz);
   void setRxBW(byte RxBW);
-  void setChsp(float Chsp);
   void setChannel(byte chnl);
   void SetTx(void);
   void SetRx(void);

diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
-# SmartRC-CC1101-Driver-Lib_V2.3.4
+# SmartRC-CC1101-Driver-Lib_V2.3.5
 
-NEW Debug Service Tool: https://github.com/LSatan/CC1101-Debug-Service-Tool
+NEW Debug Service Tool V1.0: https://github.com/LSatan/CC1101-Debug-Service-Tool
 
 ---------------------------------------------
 Install:
@@ -86,7 +86,6 @@ ELECHOUSE_cc1101.setSpiPin(SCK, MISO, MOSI, CSN); //custom SPI pins. Set your ow
 
 ELECHOUSE_cc1101.setChannel(chnl); 	//Set Channel from 0 to 255. default = 0(basic frequency).
 
-ELECHOUSE_cc1101.setChsp(chsp);		//Set cannel spacing from min 25.39khz to max 405.45khz directly like SmartRF Studio.
 
 All can also be used in a loop and are applied directly.
 
@@ -115,6 +114,13 @@ https://www.paypal.me/LittleSatan666
 Thank You!
 
 
+---------------------------------------------
+Changelog: SmartRC-CC1101-Driver-Lib_V2.3.5
+---------------------------------------------
+14.04.2020
+
+Driver Library		:setChsp has been removed to save space. This function is available in the Service / Debug Tool as an extended function.
+
 ---------------------------------------------
 Changelog: SmartRC-CC1101-Driver-Lib_V2.3.4
 ---------------------------------------------

diff --git a/keywords.txt b/keywords.txt
@@ -9,7 +9,6 @@ setModulation		KEYWORD2
 setPA			KEYWORD2
 setMHZ			KEYWORD2
 setRxBW			KEYWORD2
-setChsp			KEYWORD2
 setChannel		KEYWORD2
 SetTx			KEYWORD2
 SetRx			KEYWORD2

diff --git a/library.json b/library.json
@@ -11,7 +11,7 @@
     "type": "git",
     "url": "https://github.com/LSatan/SmartRC-CC1101-Driver-Lib"
   },
-  "version": "2.3.4",
+  "version": "2.3.5",
   "frameworks": [
         "arduino"
   ],

diff --git a/library.properties b/library.properties
@@ -1,5 +1,5 @@
 name=SmartRC-CC1101-Driver-Lib
-version=2.3.4
+version=2.3.5
 author=LSatan
 maintainer=LSatan <littlesatan.666.ls@gmail.com>
 sentence=Driver for cc1101.