corrected logical error for STMS903: Do not use tim2 and tim4

tenbaht · tenbaht · commit d77441ca4a0c · 2017-02-27T15:10:00.000+01:00
diff --git a/STM8S_StdPeriph_Driver/src/stm8s_conf.h b/STM8S_StdPeriph_Driver/src/stm8s_conf.h
@@ -56,14 +56,14 @@
 #include "stm8s_rst.h"
 #include "stm8s_spi.h"
 #include "stm8s_tim1.h"
-#if !defined(STM8S903) || !defined(STM8AF622x)
+#if !defined(STM8S903) && !defined(STM8AF622x)
  #include "stm8s_tim2.h"
 #endif /* (STM8S903) || (STM8AF622x) */
 #if defined(STM8S208) || defined(STM8S207) || defined(STM8S007) ||defined(STM8S105) ||\
     defined(STM8S005) ||  defined (STM8AF52Ax) || defined (STM8AF62Ax) || defined (STM8AF626x)
  #include "stm8s_tim3.h"
 #endif /* (STM8S208) ||defined(STM8S207) || defined(STM8S007) ||defined(STM8S105) */ 
-#if !defined(STM8S903) || !defined(STM8AF622x)
+#if !defined(STM8S903) && !defined(STM8AF622x)
  #include "stm8s_tim4.h"
 #endif /* (STM8S903) || (STM8AF622x) */
 #if defined(STM8S903) || defined(STM8AF622x)
diff --git a/sduino/hardware/sduino/stm8/boards.txt b/sduino/hardware/sduino/stm8/boards.txt
@@ -17,3 +17,22 @@ stm8sblue.build.variant=standard
 # meaningless variables just to keep the makefile happy
 
 stm8sblue.upload.speed=1
+
+
+##############################################################
+
+stm8sdisco.name=STM8S105C6 Discovery Board
+
+stm8sdisco.upload.using=stm8flash
+stm8sdisco.upload.protocol=stlinkv2
+stm8sdisco.upload.mcu=stm8s105?6
+stm8sdisco.upload.maximum_size=32768
+
+stm8sdisco.build.mcu=STM8S105
+stm8sdisco.build.f_cpu=16000000L
+stm8sdisco.build.core=sduino
+stm8sdisco.build.variant=stm8sdisco
+
+# meaningless variables just to keep the makefile happy
+
+stm8sdisco.upload.speed=1
