Merge branch 'develop' into 'master'

Develop



See merge request !11

.gitlab-ci.yml

@@ -1,7 +1,7 @@
 variables:
   SW_KERNEL: "0"
   SW_MAJOR: "0"
-  SW_MINOR: "2"
+  SW_MINOR: "3"
 
 before_script:
   - "echo $CI_BUILD_ID"
@@ -18,18 +18,21 @@ build_job:
     - "make all BOARD=stm32f4-discovery"
   stage: build
   except:
-    - /^release/.*$/
+    - tags
 
 check_job:
   script:
     - "make check BOARD=stm32f4-discovery"
   stage: check
+  except:
+    - tags
 
 deploy_job:
   stage: deploy
   script:
     - "source/scripts/release_number.py"
     - "make deploy BOARD=stm32f4-discovery"
+    - "make deploy BOARD=stm32f4-discovery DEBUG=y"
   artifacts:
     paths:
       - ./*.xz

source/firmware/arch/stm32f4xx/board/stm32f4-discovery/include/stm32f4-discovery.h

@@ -160,7 +160,7 @@ const struct driver pwm_2 = {
 		&pwm_ch2,
 };
 
-// PWM Channel 2
+// PWM Channel 1
 static const GPIO_InitTypeDef port_cfg_D12 = {
 		.GPIO_Pin = GPIO_Pin_12,
 		.GPIO_Mode = GPIO_Mode_AF,
@@ -190,7 +190,7 @@ static const struct driver pwm_1 = {
 const struct driver pwm_1 = {
 #endif
 		DRIVER_TYPE_PWM,
-		&pwm_ch3,
+		&pwm_ch1,
 };
 
 // UART 1