From 425bbc694163b1a38eeebd9de8b69d7f3806a6a7 Mon Sep 17 00:00:00 2001
From: hznupeter <qiujiongtao@163.com>
Date: Tue, 6 Jun 2017 09:50:56 +0800
Subject: [PATCH] Signed-off-by: hznupeter <qiujiongtao@163.com>

---
 17maker/Maker17.xml                 |  20 +--
 17maker/PCtoLCD2002/PCtoLCD2002.INI |  16 +-
 17maker/README.md                   |  12 +-
 17maker/block/maker17.js            |  55 +++++-
 17maker/generator/maker17.js        | 251 ++++++++++++++++++++++------
 17maker/language/maker17/zh-hans.js |   4 +
 6 files changed, 282 insertions(+), 76 deletions(-)

diff --git a/17maker/Maker17.xml b/17maker/Maker17.xml
index 5616cb8..fc24d51 100644
--- a/17maker/Maker17.xml
+++ b/17maker/Maker17.xml
@@ -1,3 +1,4 @@
+<!--
 type="company" 
 block="block/maker17.js"
 generator="generator/maker17.js" 
@@ -5,11 +6,11 @@ media="media/maker17"
 lib="Maker17"
 hardware="hardware/arduino" 
 language="language/maker17"
-examples="examples/maker17"
+examples="examples/Maker17"
 -->
 <!-- 
 Author :hznupeter
-Date:2017-3-30
+Date:2017-5-30
 E-mail:qiujiongtao@163.com
 -->
 <script type="text/javascript" src="../../blocks/company/maker17.js"></script>
@@ -316,11 +317,7 @@ E-mail:qiujiongtao@163.com
 			</block>
 
 			<block type="MAX7219_DisplayChar" name="显示图案">
-				<value name="NUM">
-					<shadow type="math_number">
-						<field name="NUM">1</field>
-					</shadow>
-				</value>
+				
 				<value name="Chars">
 					<block type="LedArray"></block>
 				</value>
@@ -439,12 +436,12 @@ E-mail:qiujiongtao@163.com
 			<block type="maker17_oled_drawPixe" name="画点">
 				<value name="POS_X">
 					<shadow type="math_number">
-						<field name="NUM">32</field>
+						<field name="NUM">64</field>
 					</shadow>
 				</value>
 				<value name="POS_Y">
 					<shadow type="math_number">
-						<field name="NUM">64</field>
+						<field name="NUM">32</field>
 					</shadow>
 				</value>
 			</block>
@@ -726,9 +723,7 @@ E-mail:qiujiongtao@163.com
 </block>
 
 </category>
-</category>
-
-<!-- <category id="catMaker17TimeDS3231" name="DS3231时间模块" colour="40">
+<category id="catMaker17TimeDS3231" name="DS3231时间模块" colour="40">
 <block type="DS3231_get_time" name="获取时间">
 </block>
 <block type="DS3231_set_datetime" name="设置日期时间">
@@ -768,4 +763,5 @@ E-mail:qiujiongtao@163.com
 		</shadow>
 	</value>
 </block>
+</category>
 </category>
\ No newline at end of file
diff --git a/17maker/PCtoLCD2002/PCtoLCD2002.INI b/17maker/PCtoLCD2002/PCtoLCD2002.INI
index 44dfdf0..515db58 100644
--- a/17maker/PCtoLCD2002/PCtoLCD2002.INI
+++ b/17maker/PCtoLCD2002/PCtoLCD2002.INI
@@ -1,6 +1,6 @@
 [Option]
-TOP=120
-LEFT=224
+TOP=175
+LEFT=91
 �����ʽ=0
 ȡģ��ʽ=1
 ȡģ����=1
@@ -17,13 +17,13 @@ LEFT=224
 �����ʽ=1
 ��ǰ׺=
 �κ�׺=
-ע��ǰ׺="
+ע��ǰ׺=/*"
 ע�ͺ�׺=",
-����ǰ׺=
-���ݺ�׺=H                 
-��ǰ׺=DB                 
-�к�׺=;
-��β׺=
+����ǰ׺=0x
+���ݺ�׺=,                  
+��ǰ׺=                  
+�к�׺=,
+��β׺=*/
 [Form]
 TOP=-3
 LEFT=-3
diff --git a/17maker/README.md b/17maker/README.md
index 5122d77..8aad663 100644
--- a/17maker/README.md
+++ b/17maker/README.md
@@ -8,19 +8,19 @@ website: http://wiki.17maker.org
 --
 使用方法
 1.打开mixly 软件，点击导入库。
-2.选中17maker中的maker17.xml文件，稍等片刻，提示导入成功。
+2.选中17maker中的maker17.xml文件，稍等片刻，提示导入成功即可。
+
+---
+### Date:2017.6.5 Version:2.2
+*OLED，DS1307输入数值支持用变量的形式。当输入的是数字是检测数字是否合法，当输入的是变量时直接调用变量。
+
 ---
 ### Date:2017.5.23 Version:2.1
 *调整u8glib库结构，使之能与mixly0.995兼容。
-
-
 ---
 ### Date:2017.3.28 Version:2.0
 *TM1637增加秒表功能。
-
 ---
-
-
 ### Date:2017.3.4 Version:1.9
 *OLED模块中增加显示图像（汉字）模块。
 *图像（汉字）显示的显示需要先取模，后显示。
diff --git a/17maker/block/maker17.js b/17maker/block/maker17.js
index fd7b2f4..0f1a899 100644
--- a/17maker/block/maker17.js
+++ b/17maker/block/maker17.js
@@ -369,10 +369,7 @@ Blockly.Blocks.MAX7219_DisplayChar = {
   init: function() {
     this.appendDummyInput("").appendField(new Blockly.FieldImage("../../media/maker17/matrix44.png", 32, 32));
     this.appendDummyInput().appendField(Blockly.MAKER17_MAX7219_DISPLAYCHAR);
-    // this.appendValueInput("NUM").setCheck(Number).setAlign(Blockly.ALIGN_RIGHT).appendField(Blockly.MAKER17_MAX7219_DISPLAYCHAR_NUM);
-
     this.appendValueInput("Chars").setCheck(Number).setAlign(Blockly.ALIGN_RIGHT);
-
     this.setPreviousStatement(true, null);
     this.setNextStatement(true, null);
     this.setColour(Blockly.Blocks.maker17.HUE3);
@@ -975,7 +972,59 @@ Blockly.Blocks['math_trig1'] = {
   }
 };
 
+////////////////////////////////
+//时间-DS3231获取时间变量
+var MAKER17_DS3231_TIME_TYPE = [
+  ["年", "year"],
+  ["月", "month"],
+  ["日", "date"],
+  ["时", "hour"],
+  ["分", "minute"],
+  ["秒", "second"],
+  ["星期", "dayOfWeek"]
+];
 
+//时间-DS3231获取时间
+Blockly.Blocks.DS3231_get_time = {
+  init: function() {
+    this.appendDummyInput("").appendField(new Blockly.FieldImage("../../media/maker17/RTC.png", 32, 32)).appendField(Blockly.MAKER17_DS3231_GET_TIME);
+    this.appendDummyInput("").appendTitle(new Blockly.FieldDropdown(MAKER17_DS3231_TIME_TYPE), "TIME_TYPE");
+    this.setInputsInline(true);
+    this.setColour(Blockly.Blocks.maker17.HUE3);
+    this.setTooltip(Blockly.MAKER17_IIC);
+    this.setHelpUrl('');
+    this.setOutput(true, Number);
+  }
+};
+//时间-DS3231设置日期时间
+Blockly.Blocks.DS3231_set_datetime = {
+  init: function() {
+    this.appendDummyInput("").appendField(new Blockly.FieldImage("../../media/maker17/RTC.png", 32, 32)).appendField(Blockly.MAKER17_DS3231_SET_TIME);
+    this.setInputsInline(true);
+    this.appendValueInput("year").setCheck(Number).setAlign(Blockly.ALIGN_RIGHT);
+    this.appendDummyInput("").appendField(Blockly.MAKER17_YEAR);
+    this.appendValueInput("month").setCheck(Number).setAlign(Blockly.ALIGN_RIGHT);
+    this.appendDummyInput("").appendField(Blockly.MAKER17_MONTH);
+    this.appendValueInput("day").setCheck(Number).setAlign(Blockly.ALIGN_RIGHT);
+    this.appendDummyInput("").appendField(Blockly.MAKER17_DAY);
+    this.appendDummyInput("").appendField(Blockly.MAKER17_DAY_OF_WEEK);
+    this.appendValueInput("dayOfWeek").setCheck(Number).setAlign(Blockly.ALIGN_RIGHT);    
+    this.appendDummyInput("").appendField("  ");
+    this.appendValueInput("hour").setCheck(Number).setAlign(Blockly.ALIGN_RIGHT);
+    this.appendDummyInput("").appendField(Blockly.MAKER17_HOUR);
+    this.appendValueInput("minute").setCheck(Number).setAlign(Blockly.ALIGN_RIGHT);
+    this.appendDummyInput("").appendField(Blockly.MAKER17_MINUTE);
+    this.appendValueInput("second").setCheck(Number).setAlign(Blockly.ALIGN_RIGHT);
+    this.appendDummyInput("").appendField(Blockly.MAKER17_SECOND);
+    this.setOutput(false, Number);
+    this.setInputsInline(true);
+    this.setPreviousStatement(true);
+    this.setNextStatement(true);
+    this.setColour(Blockly.Blocks.maker17.HUE3);
+    this.setTooltip(Blockly.MAKER17_IIC);
+    this.setHelpUrl('');
+  }
+};
 
 //显示-OLED-新建页面
 Blockly.Blocks.maker17_page = {
diff --git a/17maker/generator/maker17.js b/17maker/generator/maker17.js
index 1a6fb20..2bc2db6 100644
--- a/17maker/generator/maker17.js
+++ b/17maker/generator/maker17.js
@@ -291,6 +291,7 @@ Blockly.Arduino.MAX7219_putString = function() {
 Blockly.Arduino.MAX7219_DisplayChar = function() {
   //var lc_num = Blockly.Arduino.valueToCode(this, 'NUM', Blockly.Arduino.ORDER_ATOMIC);
   //  var lc_num=1;
+  var code;
   var lc_chars = Blockly.Arduino.valueToCode(this, 'Chars', Blockly.Arduino.ORDER_ATOMIC);
   code = 'for (int i = 0; i < 8; i++)\n';
   code += ' m.setColumn(i, ' + lc_chars + '[i]);\n';
@@ -381,6 +382,7 @@ Blockly.Arduino.maker17_oled_getHeight_or_Width = function() {
   var funcName = 'u8g.get' + what + '()';
   return [funcName, Blockly.Arduino.ORDER_ATOMIC];
 }
+//
 Blockly.Arduino.maker17_oled_draw4Str = function() {
   var value_text_line1 = Blockly.Arduino.valueToCode(this, 'Text_line1', Blockly.Arduino.ORDER_ATOMIC) || '\'\'';
   var value_text_line2 = Blockly.Arduino.valueToCode(this, 'Text_line2', Blockly.Arduino.ORDER_ATOMIC) || '\'\'';
@@ -398,8 +400,15 @@ Blockly.Arduino.maker17_oled_drawPixe = function() {
   var pos_x = Blockly.Arduino.valueToCode(this, 'POS_X', Blockly.Arduino.ORDER_ATOMIC);
   var pos_y = Blockly.Arduino.valueToCode(this, 'POS_Y', Blockly.Arduino.ORDER_ATOMIC);
   var code = "";
-  if (pos_x < 128 && pos_x >= 0 && pos_y < 64 && pos_y >= 0) code = "u8g.drawPixel(" + pos_x + "," + pos_y + " ); ";
-  return code;
+  //x和y可以是变量也可以是数字，对此做判断
+  if ((!isNaN(pos_x) && pos_x < 128 && pos_x >= 0) || (isNaN(pos_x))) {
+    code += 'u8g.drawPixel(' + pos_x + ',';
+  }
+  if ((!isNaN(pos_y) && pos_y < 64 && pos_y >= 0) || (isNaN(pos_y))) {
+    code += pos_y + ');\n';
+  }
+  if (code.split(",").length == 2 && code.split(")").length == 2) return code;
+  else return "";
 };
 
 //oled新建页面
@@ -412,17 +421,25 @@ Blockly.Arduino.maker17_oled_page = function() {
   }
 };
 
-//显示-OLED-显示汉字
+//显示-OLED-显示汉字/图案
 Blockly.Arduino.maker17_oled_showBitmap = function() {
-  var START_X = Blockly.Arduino.valueToCode(this, 'START_X', Blockly.Arduino.ORDER_ATOMIC);
-  var START_Y = Blockly.Arduino.valueToCode(this, 'START_Y', Blockly.Arduino.ORDER_ATOMIC);
+  var start_x = Blockly.Arduino.valueToCode(this, 'START_X', Blockly.Arduino.ORDER_ATOMIC);
+  var start_y = Blockly.Arduino.valueToCode(this, 'START_Y', Blockly.Arduino.ORDER_ATOMIC);
   var Height = this.getTitleValue('HEIGHT');
   var WIDTH = this.getTitleValue('WIDTH');
   var data_name = Blockly.Arduino.valueToCode(this, 'bitmap_name', Blockly.Arduino.ORDER_ATOMIC);
   data_name = data_name.replace(/\"/g, ""); //过滤引号
   var code = "";
-  if (START_X < 128 && START_X >= 0 && START_Y < 64 && START_Y >= 0) code = ' u8g.drawBitmapP( ' + START_X + ', ' + START_Y + ',' + (parseInt(WIDTH) / 8) + ' ,' + parseInt(Height) + ', ' + data_name + ');\n';
-  return code;
+  //x和y可以是变量也可以是数字，对此做判断
+  if ((!isNaN(start_x) && start_x < 128 && start_x >= 0) || (isNaN(start_x))) {
+    code = 'u8g.drawBitmapP(' + start_x + ',';
+  }
+  if ((!isNaN(start_y) && start_y < 64 && start_y >= 0) || (isNaN(start_y))) {
+    code += start_y + ',' + (parseInt(WIDTH) / 8) + ' ,' + parseInt(Height) + ', ' + data_name + ');\n';
+  }
+  if (code.split(",").length == 5 && code.split(")").length == 2) 
+    return code;
+  else return "";
 };
 
 //显示-oled-定义字模名称和数据
@@ -433,17 +450,28 @@ Blockly.Arduino.maker17_oled_define_bitmap_data = function() {
   return '';
 };
 
-
-
-//显示-OLED-oled画直线
+//显示-OLED-oled画线
 Blockly.Arduino.maker17_oled_drawLine = function() {
   var start_x = Blockly.Arduino.valueToCode(this, 'START_X', Blockly.Arduino.ORDER_ATOMIC);
   var start_y = Blockly.Arduino.valueToCode(this, 'START_Y', Blockly.Arduino.ORDER_ATOMIC);
   var end_x = Blockly.Arduino.valueToCode(this, 'END_X', Blockly.Arduino.ORDER_ATOMIC);
   var end_y = Blockly.Arduino.valueToCode(this, 'END_Y', Blockly.Arduino.ORDER_ATOMIC);
   var code = "";
-  if (start_x < 128 && start_x >= 0 && start_y < 64 && start_y >= 0 && end_x < 128 && end_x >= 0 && end_y < 64 && end_y >= 0) code = "u8g.drawLine(" + start_x + "," + start_y + "," + end_x + "," + end_y + "); \n";
-  return code;
+  //x和y可以是变量也可以是数字，对此做判断
+  if ((!isNaN(start_x) && start_x < 128 && start_x >= 0) || (isNaN(start_x))) {
+    code = 'u8g.drawLine(' + start_x + ',';
+  }
+  if ((!isNaN(start_y) && start_y < 64 && start_y >= 0) || (isNaN(start_y))) {
+    code += start_y + ',';
+  }
+  if ((!isNaN(end_x) && end_x < 128 && end_x >= 0) || (isNaN(end_x))) {
+    code += end_x + ',';
+  }
+  if ((!isNaN(end_y) && end_y < 64 && end_y >= 0) || (isNaN(end_y))) {
+    code += end_y + ');\n';
+  }
+  if (code.split(",").length == 4 && code.split(")").length == 2) return code;
+  else return "";
 };
 
 //显示-OLED-oled画水平/垂直直线
@@ -453,8 +481,19 @@ Blockly.Arduino.maker17_oled_draw_Str_Line = function() {
   var length = Blockly.Arduino.valueToCode(this, 'LENGTH', Blockly.Arduino.ORDER_ATOMIC);
   var TYPE = this.getTitleValue('TYPE');
   var code = "";
-  if (start_x < 128 && start_x >= 0 && start_y < 64 && start_y >= 0 && length > 0 && length < 129) code = "u8g.draw" + TYPE + "Line(" + start_x + "," + start_y + "," + length + "); \n";
-  return code;
+  //x和y可以是变量也可以是数字，对此做判断
+  if ((!isNaN(start_x) && start_x < 128 && start_x >= 0) || (isNaN(start_x))) {
+    code = "u8g.draw" + TYPE + "Line(" + start_x + ',';
+  }
+  if ((!isNaN(start_y) && start_y < 64 && start_y >= 0) || (isNaN(start_y))) {
+    code += start_y + ',';
+  }
+  if ((!isNaN(length) && length < 129 && length > 0) || (isNaN(length))) {
+    code += length + ');\n';
+  }
+  if (code.split(",").length == 3 && code.split(")").length == 2) return code;
+  else return "";
+  
 };
 
 //显示-OLED-oled画三角形
@@ -466,8 +505,27 @@ Blockly.Arduino.maker17_oled_drawTriangle = function() {
   var D2_x = Blockly.Arduino.valueToCode(this, 'D2_X', Blockly.Arduino.ORDER_ATOMIC);
   var D2_y = Blockly.Arduino.valueToCode(this, 'D2_Y', Blockly.Arduino.ORDER_ATOMIC);
   var code = "";
-  if (D0_x < 128 && D0_x >= 0 && D0_y < 64 && D0_y >= 0 && D1_x < 128 && D1_x >= 0 && D1_y < 64 && D1_y >= 0 && D2_x < 128 && D2_x >= 0 && D2_y < 64 && D2_y >= 0) code = "u8g.drawTriangle(" + D0_x + "," + D0_y + "," + D1_x + "," + D1_y + "," + D2_x + "," + D2_y + "); \n";
-  return code;
+  //x和y可以是变量也可以是数字，对此做判断
+  if ((!isNaN(D0_x) && D0_x < 128 && D0_x >= 0) || (isNaN(D0_x))) {
+    code = 'u8g.drawTriangle(' + D0_x + ',';
+  }
+  if ((!isNaN(D0_y) && D0_y < 64 && D0_y >= 0) || (isNaN(D0_y))) {
+    code += D0_y + ',';
+  }
+  if ((!isNaN(D1_x) && D1_x < 128 && D1_x >= 0) || (isNaN(D1_x))) {
+    code += D1_x + ',';
+  }
+  if ((!isNaN(D1_y) && D1_y < 64 && D1_y >= 0) || (isNaN(D1_y))) {
+    code += D1_y + ',';
+  }
+  if ((!isNaN(D2_x) && D2_x < 128 && D2_x >= 0) || (isNaN(D2_x))) {
+    code += D2_x + ',';
+  }
+  if ((!isNaN(D2_y) && D2_y < 64 && D2_y >= 0) || (isNaN(D2_y))) {
+    code += D2_y + ');\n';
+  }
+  if (code.split(",").length == 6 && code.split(")").length == 2) return code;
+  else return "";
 };
 
 //显示-OLED-oled画矩形（实心、空心）
@@ -478,8 +536,18 @@ Blockly.Arduino.maker17_oled_drawFrame = function() {
   var Height = Blockly.Arduino.valueToCode(this, 'HEIGHT', Blockly.Arduino.ORDER_ATOMIC);
   var type = this.getTitleValue('TYPE');
   var code = "";
-  if (D0_x < 128 && D0_x >= 0 && D0_y < 64 && D0_y >= 0 && Width < 128 && Width >= 0 && Height < 64 && Height >= 0) code = "u8g." + type + "(" + D0_x + "," + D0_y + "," + Width + "," + Height + "); \n";
-  return code;
+
+  //x和y可以是变量也可以是数字，对此做判断
+  if ((!isNaN(D0_x) && D0_x < 128 && D0_x >= 0) || (isNaN(D0_x))) 
+    code = 'u8g.'+type+'(' + D0_x + ',';
+  if ((!isNaN(D0_y) && D0_y < 64 && D0_y >= 0) || (isNaN(D0_y))) 
+    code += D0_y + ',';
+  if ((!isNaN(Width) && Width < 128 && Width >= 0) || (isNaN(Width))) 
+    code += Width + ',';
+  if ((!isNaN(Height) && Height < 64 && Height >= 0) || (isNaN(Height))) 
+    code += Height + ');\n';
+  if (code.split(",").length == 4 && code.split(")").length == 2) return code;
+  else return "";
 };
 
 //显示-OLED-oled画圆角矩形（实心、空心）
@@ -491,8 +559,19 @@ Blockly.Arduino.maker17_oled_drawRFrame = function() {
   var Rauius = Blockly.Arduino.valueToCode(this, 'RADIUS', Blockly.Arduino.ORDER_ATOMIC);
   var type = this.getTitleValue('TYPE');
   var code = "";
-  if (D0_x < 128 && D0_x >= 0 && D0_y < 64 && D0_y >= 0 && Width < 128 && Width >= 0 && Height < 64 && Height >= 0 && Rauius >= 0) code = "u8g." + type + "(" + D0_x + "," + D0_y + "," + Width + "," + Height + "," + Rauius + "); \n";
-  return code;
+  //x和y可以是变量也可以是数字，对此做判断
+  if ((!isNaN(D0_x) && D0_x < 128 && D0_x >= 0) || (isNaN(D0_x))) 
+    code = 'u8g.'+type+'(' + D0_x + ',';
+  if ((!isNaN(D0_y) && D0_y < 64 && D0_y >= 0) || (isNaN(D0_y))) 
+    code += D0_y + ',';
+  if ((!isNaN(Width) && Width < 128 && Width >= 0) || (isNaN(Width))) 
+    code += Width + ',';
+  if ((!isNaN(Height) && Height < 64 && Height >= 0) || (isNaN(Height))) 
+    code += Height + ',';
+  if ((!isNaN(Rauius) && Rauius < 64 && Rauius >= 0) || (isNaN(Rauius))) 
+    code += Rauius + ');\n';
+  if (code.split(",").length == 5 && code.split(")").length == 2) return code;
+  else return "";
 };
 
 //显示-OLED-oled画圆（实心、空心）
@@ -503,8 +582,15 @@ Blockly.Arduino.maker17_oled_drawCircle = function() {
   var type = this.getTitleValue('TYPE');
   var opt = this.getTitleValue('OPT');
   var code = "";
-  if (D0_x < 128 && D0_x >= 0 && D0_y < 64 && D0_y >= 0 && Rauius >= 0) code = "u8g." + type + "(" + D0_x + "," + D0_y + "," + Rauius + "," + opt + "); \n";
-  return code;
+  //x和y可以是变量也可以是数字，对此做判断
+  if ((!isNaN(D0_x) && D0_x < 128 && D0_x >= 0) || (isNaN(D0_x))) 
+    code = 'u8g.'+type+'(' + D0_x + ',';
+  if ((!isNaN(D0_y) && D0_y < 64 && D0_y >= 0) || (isNaN(D0_y))) 
+   code += D0_y + ',';
+ if ((!isNaN(Rauius) && Rauius < 64 && Rauius >= 0) || (isNaN(Rauius))) 
+  code += Rauius + "," + opt + "); \n";
+if (code.split(",").length == 4 && code.split(")").length == 2) return code;
+else return "";
 };
 
 //显示-OLED-oled画椭圆（实心、空心）
@@ -516,8 +602,17 @@ Blockly.Arduino.maker17_oled_drawEllipse = function() {
   var type = this.getTitleValue('TYPE');
   var opt = this.getTitleValue('OPT');
   var code = "";
-  if (D0_x < 128 && D0_x >= 0 && D0_y < 64 && D0_y >= 0 && Rauius_X >= 0 && Rauius_Y >= 0) code = "u8g." + type + "(" + D0_x + "," + D0_y + "," + Rauius_X + "," + Rauius_Y + "," + opt + "); \n";
-  return code;
+  //x和y可以是变量也可以是数字，对此做判断
+  if ((!isNaN(D0_x) && D0_x < 128 && D0_x >= 0) || (isNaN(D0_x))) 
+    code = 'u8g.'+type+'(' + D0_x + ',';
+  if ((!isNaN(D0_y) && D0_y < 64 && D0_y >= 0) || (isNaN(D0_y))) 
+   code += D0_y + ',';
+ if ((!isNaN(Rauius_X) && Rauius_X < 64 && Rauius_X >= 0) || (isNaN(Rauius_X))) 
+  code += Rauius_X + "," ;
+if ((!isNaN(Rauius_Y) && Rauius_Y < 64 && Rauius_Y >= 0) || (isNaN(Rauius_Y))) 
+  code += Rauius_Y + "," + opt + "); \n";
+if (code.split(",").length == 5 && code.split(")").length == 2) return code;
+else return "";
 };
 
 //显示-OLED-oled显示字符串
@@ -527,9 +622,14 @@ Blockly.Arduino.maker17_oled_drawStr = function() {
   var TEXT = Blockly.Arduino.valueToCode(this, 'TEXT', Blockly.Arduino.ORDER_ATOMIC);
   var rad = this.getTitleValue('RAD');
   var code = "";
-  if (POS_x < 128 && POS_x >= 0 && POS_y < 64 && POS_y >= 0) code = "u8g." + rad + "(" + POS_x + "," + POS_y + "," + TEXT + "); \n";
-  return code;
-};
+    //x和y可以是变量也可以是数字，对此做判断
+    if ((!isNaN(POS_x) && POS_x < 128 && POS_x >= 0) || (isNaN(POS_x))) 
+      code = 'u8g.'+rad+'(' + POS_x + ',';
+    if ((!isNaN(POS_y) && POS_y < 64 && POS_y >= 0) || (isNaN(POS_y))) 
+     code += POS_y + ','+ TEXT + "); \n";
+   if (code.split(",").length == 3&& code.split(")").length == 2) return code;
+   else return "";
+ };
 
 //显示-OLED-显示变量（字符串，整型）
 Blockly.Arduino.maker17_oled_print = function() {
@@ -537,8 +637,12 @@ Blockly.Arduino.maker17_oled_print = function() {
   var POS_y = Blockly.Arduino.valueToCode(this, 'POS_Y', Blockly.Arduino.ORDER_ATOMIC);
   var TEXT = Blockly.Arduino.valueToCode(this, 'TEXT', Blockly.Arduino.ORDER_ATOMIC);
   var code = "";
-  if (POS_x < 128 && POS_x >= 0 && POS_y < 64 && POS_y >= 0) code = "u8g.setFontPosTop();\nu8g.setPrintPos(" + POS_x + "," + POS_y + ");\n";
-  code += "u8g.print(" + TEXT + "); \n";
+ //x和y可以是变量也可以是数字，对此做判断
+    if ((!isNaN(POS_x) && POS_x < 128 && POS_x >= 0) || (isNaN(POS_x))) 
+      code = 'u8g.setFontPosTop();\nu8g.setPrintPos(' + POS_x + ',';
+    if ((!isNaN(POS_y) && POS_y < 64 && POS_y >= 0) || (isNaN(POS_y))) 
+     code += POS_y + "); \n";
+     code += "u8g.print(" + TEXT + "); \n";
   return code;
 };
 
@@ -615,7 +719,7 @@ Blockly.Arduino.Maker17_TM1637_init = function() {
 };
 
 
-//显示-TM1637-显示字符串（字符，数值）
+//显示-TM1637-显示字符串（字符，数值、变量）
 Blockly.Arduino.maker17_TM1637_displayString = function() {
   var Speed = Blockly.Arduino.valueToCode(this, 'Speed', Blockly.Arduino.ORDER_ATOMIC);
   var value = Blockly.Arduino.valueToCode(this, 'VALUE', Blockly.Arduino.ORDER_ATOMIC);
@@ -624,11 +728,11 @@ Blockly.Arduino.maker17_TM1637_displayString = function() {
   for (var i = 1; i + 1 < value.length; i++) {
     if (value[i].toLowerCase().charCodeAt() > 96 && value[i].toLowerCase().charCodeAt() < 103)
     //先将输入的字符从大写字母转到小写字母，再根据字母的ascii码进行转化，将a~f字母转化成10~15
-    code += (value[i].toLowerCase().charCodeAt() - 87);
-    else if (value[i].toLowerCase().charCodeAt() > 47 && value[i].toLowerCase().charCodeAt() < 58)
+  code += (value[i].toLowerCase().charCodeAt() - 87);
+  else if (value[i].toLowerCase().charCodeAt() > 47 && value[i].toLowerCase().charCodeAt() < 58)
     //如果输入的是数字0~9，则直接是0~9
-    code += (value[i].toLowerCase().charCodeAt() - 48);
-    if (i + 2 < value.length) code += ',';
+  code += (value[i].toLowerCase().charCodeAt() - 48);
+  if (i + 2 < value.length) code += ',';
     //在每个数字后面追加一个逗号，最后一个字符后面不加
   }
   code += '};'
@@ -707,9 +811,7 @@ Blockly.Arduino.DS1307_start_get_time = function() {
   Blockly.Arduino.definitions_['include_TimeLib'] = '#include <TimeLib.h>';
   Blockly.Arduino.setups_['setup_ds1307'] = '  Serial.begin(9600);  while (!Serial) ;  \ndelay(200);  \n';
   Blockly.Arduino.definitions_['tmElements_t'] = 'tmElements_t tm;\n';
-
   var code = 'RTC.read(tm); ';
-
   return code;
 };
 //时间-DS1307-获取时间
@@ -723,7 +825,6 @@ Blockly.Arduino.DS1307_get_time = function() {
   var code = '  ';
   if (dropdown_type == "Year") code += 'tmYearToCalendar(tm.Year);';
   else code += 'tm.' + dropdown_type;
-  // return code;
   return [code, Blockly.Arduino.ORDER_ATOMIC];
 };
 
@@ -736,8 +837,18 @@ Blockly.Arduino.DS1307_set_time = function() {
   var minute = Blockly.Arduino.valueToCode(this, 'minute', Blockly.Arduino.ORDER_ATOMIC);
   var second = Blockly.Arduino.valueToCode(this, 'second', Blockly.Arduino.ORDER_ATOMIC);
   var code = '';
-  if (hour < 25 && hour > 0 && minute < 60 && minute > 0 && second < 60 && second > 0) code += 'clock.fillByHMS(' + hour + ',' + minute + ',' + second + ');\n';
-  return code;
+  //hour、minute、second可以是变量也可以是数字，对此做判断
+  if ((!isNaN(hour) && hour < 25 && hour > 0) || (isNaN(hour))) {
+    code += 'clock.fillByHMS(' + hour + ',';
+  }
+  if ((!isNaN(minute) && minute < 61 && minute > 0) || (isNaN(minute))) {
+    code += minute + ',';
+  }
+  if ((!isNaN(second) && second < 61 && second > 0) || (isNaN(second))) {
+    code += second + ');\n';
+  }
+  if (code.split(",").length == 3 && code.split(")").length == 2) return code;
+  else return "";
 };
 
 //时间-DS1307-设置日期
@@ -749,15 +860,22 @@ Blockly.Arduino.DS1307_set_date = function() {
   var month = Blockly.Arduino.valueToCode(this, 'month', Blockly.Arduino.ORDER_ATOMIC);
   var day = Blockly.Arduino.valueToCode(this, 'day', Blockly.Arduino.ORDER_ATOMIC);
   var code = '';
-  if (year > 0 && month < 13 && month > 0 && day < 32 && day > 0) code += 'clock.fillByYMD(' + year + ',' + month + ',' + day + ');\n';
-  return code;
+  if ((!isNaN(year) && year > 0) || (isNaN(year))) {
+    code += 'clock.fillByYMD(' + year + ',';
+  }
+  if ((!isNaN(month) && month < 13 && month > 0) || (isNaN(month))) {
+    code += month + ',';
+  }
+  if ((!isNaN(day) && day < 32 && day > 0) || (isNaN(day))) {
+    code += day + ');\n';
+  }
+  if (code.split(",").length == 3 && code.split(")").length == 2) return code;
+  else return "";
 };
 
-
 //IIC地址查找
 Blockly.Arduino.maker17_IICSCAN = function() {
   Blockly.Arduino.definitions_['include_WIRE'] = '#include <Wire.h>';
-
   Blockly.Arduino.setups_['setup_delay2000'] = '  Wire.begin();\nSerial.begin(9600);\nSerial.println("I2C Scanner");\n';
   var code = 'byte error, address;\nint nDevices;\nSerial.println("Scanning...");\nnDevices = 0;\nfor (address = 1; address < 127; address++ )\n{\n Wire.beginTransmission(address);\nerror = Wire.endTransmission();\nif (error == 0){\nSerial.print("I2C device found at address 0x");\nif (address < 16)\nSerial.print("0"); \nSerial.print(address, HEX);  \nSerial.println(" !");\nnDevices++;\n}\nelse if (error == 4){\nSerial.print("Unknow error at address 0x");\nif (address < 16)Serial.print("0"); \nSerial.println(address, HEX);  }\n}\nif (nDevices == 0)\nSerial.println("No I2C devices found");\nelse \nSerial.println("done");\ndelay(5000); ';
   return code;
@@ -765,15 +883,15 @@ Blockly.Arduino.maker17_IICSCAN = function() {
 
 //MP3
 Blockly.Arduino.maker17_MP3_VOL = function() {
-   var dropdown_pin = Blockly.Arduino.valueToCode(this, 'PIN', Blockly.Arduino.ORDER_ATOMIC);
+  var dropdown_pin = Blockly.Arduino.valueToCode(this, 'PIN', Blockly.Arduino.ORDER_ATOMIC);
   var VOL = Blockly.Arduino.valueToCode(this, 'VOLUME', Blockly.Arduino.ORDER_ASSIGNMENT) || '0';
-   Blockly.Arduino.definitions_['include_Maker17_MP3'] = '#include "maker17_MP3.h"';
+  Blockly.Arduino.definitions_['include_Maker17_MP3'] = '#include "maker17_MP3.h"';
   Blockly.Arduino.definitions_['var_maker17_MP3_PLAY' + dropdown_pin] = 'MP3  MP3_' + dropdown_pin + '' + '(' + dropdown_pin + ');';
   var code = 'MP3_' + dropdown_pin + '.volume(map(' + VOL + ', 0, 100, 0, 30));\n'
   return code;
 };
 Blockly.Arduino.maker17_MP3_PLAY = function() {
-   var dropdown_pin = Blockly.Arduino.valueToCode(this, 'PIN', Blockly.Arduino.ORDER_ATOMIC);
+  var dropdown_pin = Blockly.Arduino.valueToCode(this, 'PIN', Blockly.Arduino.ORDER_ATOMIC);
   var Num = Blockly.Arduino.valueToCode(this, 'NUM', Blockly.Arduino.ORDER_ASSIGNMENT) || '0';
   Blockly.Arduino.definitions_['include_Maker17_MP3'] = '#include "maker17_MP3.h"';
   Blockly.Arduino.definitions_['var_maker17_MP3_PLAY' + dropdown_pin] = 'MP3  MP3_' + dropdown_pin + '' + '(' + dropdown_pin + ');';
@@ -783,11 +901,50 @@ Blockly.Arduino.maker17_MP3_PLAY = function() {
 };
 
 Blockly.Arduino.maker17_MP3_STATE = function() {
-    var dropdown_pin = Blockly.Arduino.valueToCode(this, 'PIN', Blockly.Arduino.ORDER_ATOMIC);
+  var dropdown_pin = Blockly.Arduino.valueToCode(this, 'PIN', Blockly.Arduino.ORDER_ATOMIC);
   var dropdown_stat = this.getTitleValue('STAT');
   Blockly.Arduino.definitions_['include_Maker17_MP3'] = '#include "maker17_MP3.h"';
   Blockly.Arduino.definitions_['var_nova_MP3_PLAY' + dropdown_pin] = 'MP3  MP3_' + dropdown_pin + '' + '(' + dropdown_pin + ');';
   Blockly.Arduino.setups_['setup_MP3_PLAY' + dropdown_pin] = 'MP3_' + dropdown_pin + '.begin(9600);\n';
   var code = 'MP3_' + dropdown_pin + '.' + dropdown_stat + ';\n'
+  return code;
+};
+// DS3231
+//时间-DS3231-获取时间
+Blockly.Arduino.DS3231_get_time = function() {
+  Blockly.Arduino.definitions_['include_WIRE'] = '#include <Wire.h>';
+  Blockly.Arduino.definitions_['include_ds3231'] = '#include "Sodaq_DS3231.h"';
+  Blockly.Arduino.setups_['setup_init_rtc'] = 'Wire.begin();\n  rtc.begin();';
+  var dropdown_type = this.getTitleValue('TIME_TYPE');
+  var code = '';
+  code += 'rtc.now().' + dropdown_type + '()';
+  // return code;
+  return [code, Blockly.Arduino.ORDER_ATOMIC];
+};
+
+//时间-DS3231-设置时间
+Blockly.Arduino.DS3231_set_datetime = function() {
+
+  Blockly.Arduino.definitions_['include_WIRE'] = '#include <Wire.h>';
+  Blockly.Arduino.definitions_['include_ds3231'] = '#include "Sodaq_DS3231.h"';
+  Blockly.Arduino.setups_['setup_init_rtc'] = 'Wire.begin();\n  rtc.begin();\n';
+  var year = Blockly.Arduino.valueToCode(this, 'year', Blockly.Arduino.ORDER_ATOMIC);
+  var month = Blockly.Arduino.valueToCode(this, 'month', Blockly.Arduino.ORDER_ATOMIC);
+  var day = Blockly.Arduino.valueToCode(this, 'day', Blockly.Arduino.ORDER_ATOMIC);
+  var dayOfWeek = Blockly.Arduino.valueToCode(this, 'dayOfWeek', Blockly.Arduino.ORDER_ATOMIC);
+  var hour = Blockly.Arduino.valueToCode(this, 'hour', Blockly.Arduino.ORDER_ATOMIC);
+  var minute = Blockly.Arduino.valueToCode(this, 'minute', Blockly.Arduino.ORDER_ATOMIC);
+  var second = Blockly.Arduino.valueToCode(this, 'second', Blockly.Arduino.ORDER_ATOMIC);
+  //Blockly.Arduino.definitions_['define_dt'] = 'DateTime dt('+ year +', '+ month +', '+ day +', '+ hour +', '+ minute +', '+ second +', 1);';
+  var code = '';
+  // if (year > 0 && month < 13 && month > 0 && day < 32 && day > 0 
+  //   && dayOfWeek < 8 && dayOfWeek > 0 
+  //   && hour < 25 && hour > 0 && minute < 60 && minute > 0 && second < 60 && second > 0){
+  //   code += 'DateTime dt('+ year +', '+ month +', '+ day +', '+ hour +', '+ minute +', '+ second +', '+ dayOfWeek +');\n';
+  //   code += 'rtc.setDateTime(dt);\n';    
+  // }
+  code += 'DateTime dt(' + year + ', ' + month + ', ' + day + ', ' + hour + ', ' + minute + ', ' + second + ', ' + dayOfWeek + ');\n';
+  code += 'rtc.setDateTime(dt);\n';
+
   return code;
 };
\ No newline at end of file
diff --git a/17maker/language/maker17/zh-hans.js b/17maker/language/maker17/zh-hans.js
index 9696fd6..994bb21 100644
--- a/17maker/language/maker17/zh-hans.js
+++ b/17maker/language/maker17/zh-hans.js
@@ -190,3 +190,7 @@ Blockly.MAKER17_MP3_LOOPPLAY='循环播放';
 Blockly.MAKER17_MP3_RANDPLAY='随机播放';
 Blockly.MAKER17_MP3_PAUSE='暂停';
 Blockly.MAKER17_MP3_STOP='停止';
+
+
+//DS3231
+Blockly.MAKER17_DS3231_SET_TIME='设置时间';
\ No newline at end of file