From e6f7b471046faac2329384bd5256a88ade3df3bd Mon Sep 17 00:00:00 2001
From: Suhayl <838119509@qq.com>
Date: Sat, 28 Dec 2019 18:06:08 +0800
Subject: [PATCH] Update.

Fixed bug.
---
 Code/C_Code/01.1.1_Blink/Blink.c                   | 2 +-
 Code/C_Code/02.2.1_TableLamp/TableLamp.c           | 4 ++--
 Code/C_Code/03.1.1_LightWater/LightWater.c         | 2 +-
 Code/Python_Code/05.1.1_ColorfulLED/ColorfulLED.py | 8 ++++----
 Code/Python_Code/06.1.1_Doorbell/Doorbell.py       | 8 ++++----
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/Code/C_Code/01.1.1_Blink/Blink.c b/Code/C_Code/01.1.1_Blink/Blink.c
index 87a1e2c..a09e364 100644
--- a/Code/C_Code/01.1.1_Blink/Blink.c
+++ b/Code/C_Code/01.1.1_Blink/Blink.c
@@ -16,7 +16,7 @@ void main(void)
 	wiringPiSetup();	//Initialize wiringPi.
 	
 	pinMode(ledPin, OUTPUT);//Set the pin mode
-	printf("Using pin%d\n",%ledPin);	//Output information on terminal
+	printf("Using pin%d\n",ledPin);	//Output information on terminal
 	while(1){
 		digitalWrite(ledPin, HIGH);  //Make GPIO output HIGH level
 		printf("led turned on >>>\n");		//Output information on terminal
diff --git a/Code/C_Code/02.2.1_TableLamp/TableLamp.c b/Code/C_Code/02.2.1_TableLamp/TableLamp.c
index c310ae6..dbc6e1f 100644
--- a/Code/C_Code/02.2.1_TableLamp/TableLamp.c
+++ b/Code/C_Code/02.2.1_TableLamp/TableLamp.c
@@ -21,8 +21,8 @@ int main(void)
 	
 	wiringPiSetup(); //Initialize wiringPi.	
 	
-	pinMode(ledPin, OUTPUT);   Set ledPin to output
-	pinMode(buttonPin, INPUT); Set buttonPin to input
+	pinMode(ledPin, OUTPUT);   //Set ledPin to output
+	pinMode(buttonPin, INPUT); //Set buttonPin to input
 
 	pullUpDnControl(buttonPin, PUD_UP);  //pull up to high level
 	while(1){
diff --git a/Code/C_Code/03.1.1_LightWater/LightWater.c b/Code/C_Code/03.1.1_LightWater/LightWater.c
index 347629b..4029da3 100644
--- a/Code/C_Code/03.1.1_LightWater/LightWater.c
+++ b/Code/C_Code/03.1.1_LightWater/LightWater.c
@@ -18,7 +18,7 @@ void main(void)
 	wiringPiSetup(); //Initialize wiringPi.
 	
 	for(i=0;i<ledCounts;i++){       //Set pinMode for all led pins to output
-		pinMode(pins[i], OUTPUT);
+		pinMode(pins[i], OUTPUT);		
 	}
 	while(1){
 		for(i=0;i<ledCounts;i++){   // move led(on) from left to right
diff --git a/Code/Python_Code/05.1.1_ColorfulLED/ColorfulLED.py b/Code/Python_Code/05.1.1_ColorfulLED/ColorfulLED.py
index 043061b..efa8cae 100644
--- a/Code/Python_Code/05.1.1_ColorfulLED/ColorfulLED.py
+++ b/Code/Python_Code/05.1.1_ColorfulLED/ColorfulLED.py
@@ -9,16 +9,16 @@ import RPi.GPIO as GPIO
 import time
 import random
 
-pins = {'pinRed':11, 'pinGreen':12, 'pinBlue':13}  # define the pins for RGBLED
+pins = [11, 12, 13] 		# define the pins for R:11,G:12,B:13 
 
 def setup():
 	global pwmRed,pwmGreen,pwmBlue	
 	GPIO.setmode(GPIO.BOARD)       # use PHYSICAL GPIO Numbering
 	GPIO.setup(pins, GPIO.OUT)     # set RGBLED pins to OUTPUT mode
 	GPIO.output(pins, GPIO.HIGH)   # make RGBLED pins output HIGH level
-	pwmRed = GPIO.PWM(pins['pinRed'], 2000)      # set PWM Frequence to 2kHz
-	pwmGreen = GPIO.PWM(pins['pinGreen'], 2000)  # set PWM Frequence to 2kHz
-	pwmBlue = GPIO.PWM(pins['pinBlue'], 2000)    # set PWM Frequence to 2kHz
+	pwmRed = GPIO.PWM(pins[0], 2000)      # set PWM Frequence to 2kHz
+	pwmGreen = GPIO.PWM(pins[1], 2000)  # set PWM Frequence to 2kHz
+	pwmBlue = GPIO.PWM(pins[2], 2000)    # set PWM Frequence to 2kHz
 	pwmRed.start(0)      # set initial Duty Cycle to 0
 	pwmGreen.start(0)
 	pwmBlue.start(0)
diff --git a/Code/Python_Code/06.1.1_Doorbell/Doorbell.py b/Code/Python_Code/06.1.1_Doorbell/Doorbell.py
index a96d3b1..9e829d7 100644
--- a/Code/Python_Code/06.1.1_Doorbell/Doorbell.py
+++ b/Code/Python_Code/06.1.1_Doorbell/Doorbell.py
@@ -29,9 +29,9 @@ def destroy():
 
 if __name__ == '__main__':     # Program entrance
     print ('Program is starting...')
-	setup()
-	try:
+    setup()
+    try:
 		loop()
-	except KeyboardInterrupt:  # Press ctrl-c to end the program.
-		destroy()
+    except KeyboardInterrupt:  # Press ctrl-c to end the program.
+	    destroy()