[P118] Make CS pin configurable, some refactoring

lib/Itho/CC1101.h

@@ -168,7 +168,7 @@ class CC1101
 
 	//functions
 	public:
-		CC1101(int8_t CSpin = SS);
+		CC1101(int8_t CSpin = PIN_SPI_SS);
 		~CC1101();
 
 		//spi
@@ -195,7 +195,7 @@ class CC1101
 		void select(void);
 		void deselect(void);
 
-		int8_t _CSpin = SS;
+		int8_t _CSpin = PIN_SPI_SS;
 
 	protected:
 		uint8_t readRegister(uint8_t address);

lib/Itho/IthoCC1101.h

@@ -59,7 +59,7 @@ class IthoCC1101 : protected CC1101
 
   //functions
   public:
-    IthoCC1101(int8_t CSpin = SS, uint8_t counter = 0, uint8_t sendTries = 3);   //set initial counter value
+    IthoCC1101(int8_t CSpin = PIN_SPI_SS, uint8_t counter = 0, uint8_t sendTries = 3);   //set initial counter value
     ~IthoCC1101();
 
     //init

src/_P118_Itho.ino

@@ -124,10 +124,10 @@ boolean Plugin_118(uint8_t function, struct EventStruct *event, String& string)
       break;
     }
 
-    case PLUGIN_SET_DEFAULTS: // Set defaults address to the one used in old versions of the library for backwards compatability
+    case PLUGIN_SET_DEFAULTS:  // Set defaults address to the one used in old versions of the library for backwards compatability
     {
-      PIN(0)     = -1;        // Interrupt pin undefined by default
-      PIN(1)     = 15;        // CS pin use the previous default of SS/gpio 15
+      PIN(0)     = -1;         // Interrupt pin undefined by default
+      PIN(1)     = PIN_SPI_SS; // CS pin use the previous default of PIN_SPI_SS/gpio 15
       PCONFIG(0) = 1;
       PCONFIG(1) = 10;
       PCONFIG(2) = 87;
@@ -236,7 +236,7 @@ boolean Plugin_118(uint8_t function, struct EventStruct *event, String& string)
     {
       int8_t offset = -1;
 
-	  // Find matching interrupt flag
+      // Find matching interrupt flag
       for (uint8_t i = 0; i < P118_INTERUPT_HANDLER_COUNT && offset == -1; i++) {
         if (PLUGIN_118_Task[i] == event->TaskIndex) {
           offset = i;
@@ -281,7 +281,7 @@ boolean Plugin_118(uint8_t function, struct EventStruct *event, String& string)
 
     case PLUGIN_WEBFORM_LOAD:
     {
-      PLUGIN__ExtraSettingsStruct PLUGIN_118_ExtraSettings;
+      PLUGIN_118_ExtraSettingsStruct PLUGIN_118_ExtraSettings;
       LoadCustomTaskSettings(event->TaskIndex, (byte *)&PLUGIN_118_ExtraSettings, sizeof(PLUGIN_118_ExtraSettings));
       addFormSubHeader(F("Remote RF Controls"));
       addFormTextBox(F("Unit ID remote 1"), F("PLUGIN_118_ID1"), PLUGIN_118_ExtraSettings.ID1, 8);
@@ -300,7 +300,7 @@ boolean Plugin_118(uint8_t function, struct EventStruct *event, String& string)
 
     case PLUGIN_WEBFORM_SAVE:
     {
-      PLUGIN__ExtraSettingsStruct PLUGIN_118_ExtraSettings;
+      PLUGIN_118_ExtraSettingsStruct PLUGIN_118_ExtraSettings;
       strcpy(PLUGIN_118_ExtraSettings.ID1, web_server.arg(F("PLUGIN_118_ID1")).c_str());
       strcpy(PLUGIN_118_ExtraSettings.ID2, web_server.arg(F("PLUGIN_118_ID2")).c_str());
       strcpy(PLUGIN_118_ExtraSettings.ID3, web_server.arg(F("PLUGIN_118_ID3")).c_str());

src/src/PluginStructs/P118_data_struct.h

@@ -20,7 +20,7 @@
 # define PLUGIN_118_Time3      30 * 60
 
 // This extra settings struct is needed because the default settingsstruct doesn't support strings
-struct PLUGIN__ExtraSettingsStruct {
+struct PLUGIN_118_ExtraSettingsStruct {
   char ID1[9];
   char ID2[9];
   char ID3[9];
@@ -65,7 +65,7 @@ struct P118_data_struct : public PluginTaskData_base {
   bool   PLUGIN_118_InitRunned     = false;
   bool   PLUGIN_118_Log            = false;
 
-  PLUGIN__ExtraSettingsStruct PLUGIN_118_ExtraSettings;
+  PLUGIN_118_ExtraSettingsStruct PLUGIN_118_ExtraSettings;
 };
 #endif // ifdef USES_P118
 #endif // ifndef PLUGINSTRUCTS_P118_DATA_STRUCT_H