diff --git a/boards/default_src/micropython/blocks/sensor_onboard.js b/boards/default_src/micropython/blocks/sensor_onboard.js
index 2c0be119..6e02fd71 100644
--- a/boards/default_src/micropython/blocks/sensor_onboard.js
+++ b/boards/default_src/micropython/blocks/sensor_onboard.js
@@ -604,12 +604,22 @@ export const sensor_rtc_init = {
}
};
+export const onboard_RTC_get_time_str = {
+ init: function () {
+ this.setColour(SENSOR_ONBOARD_HUE);
+ this.appendDummyInput()
+ .appendField(Blockly.Msg.MIXLY_RTC_GET_TIME_STR);
+ this.setOutput(true, String);
+ this.setInputsInline(true);
+ this.setTooltip(Blockly.Msg.MIXLY_ESP32_RTC_GET_TIME_TOOLTIP);
+ }
+};
export const sensor_LTR308 = {
init: function () {
this.setColour(SENSOR_ONBOARD_HUE);
this.appendDummyInput()
- .appendField(Blockly.Msg.MIXLY_ESP32_LIGHT);
+ .appendField(Blockly.Msg.MIXLY_RTC_GET_TIME_STR);
this.setOutput(true, Number);
this.setInputsInline(true);
this.setTooltip(Blockly.Msg.ESP32_SENSOR_NIXGO_LIGHT_TOOLTIP);
diff --git a/boards/default_src/micropython/generators/sensor_onboard.js b/boards/default_src/micropython/generators/sensor_onboard.js
index 4d70cfcd..37058be3 100644
--- a/boards/default_src/micropython/generators/sensor_onboard.js
+++ b/boards/default_src/micropython/generators/sensor_onboard.js
@@ -562,6 +562,12 @@ export const onboard_RTC_timestamp_totuple = function (_, generator) {
return [code, generator.ORDER_ATOMIC];
}
+export const onboard_RTC_get_time_str = function(_,generator){
+ generator.definitions_['import_rtctime'] = 'import rtctime';
+ var code = 'rtctime.strtime()';
+ return [code, generator.ORDER_ATOMIC];
+}
+
//mixgo_cc onboard_sensor generators:
export const sensor_mixgo_cc_mmc5603_get_magnetic = function (_, generator) {
diff --git a/boards/default_src/micropython_esp32/template.xml b/boards/default_src/micropython_esp32/template.xml
index 5f6952ef..4eef342b 100644
--- a/boards/default_src/micropython_esp32/template.xml
+++ b/boards/default_src/micropython_esp32/template.xml
@@ -1502,6 +1502,7 @@
+
diff --git a/boards/default_src/micropython_esp32c2/template.xml b/boards/default_src/micropython_esp32c2/template.xml
index b6eb52ec..7b86d85d 100644
--- a/boards/default_src/micropython_esp32c2/template.xml
+++ b/boards/default_src/micropython_esp32c2/template.xml
@@ -1521,7 +1521,7 @@
-
+
div.blocklyToolboxContents > div:nth-child(12) > div.blo
#catCommunicate.blocklyTreeRow.blocklyTreeSelected > div.blocklyTreeRowContentContainer > span.blocklyTreeIcon{
background:url('../../../../common/media/mark/requests2.png') no-repeat;
background-size: 100% auto;
+}
+#catBLEC.blocklyTreeRow > div.blocklyTreeRowContentContainer > span.blocklyTreeIcon{
+ background:url('../../../../common/media/mark/comuni.png') no-repeat;
+ background-size: 100% auto;
+}
+#catBLEC.blocklyTreeRow.blocklyTreeSelected > div.blocklyTreeRowContentContainer > span.blocklyTreeIcon{
+ background:url('../../../../common/media/mark/comuni2.png') no-repeat;
+ background-size: 100% auto;
+}
+#catBLEKM.blocklyTreeRow > div.blocklyTreeRowContentContainer > span.blocklyTreeIcon{
+ background:url('../../../../common/media/mark/comuni.png') no-repeat;
+ background-size: 100% auto;
+}
+#catBLEKM.blocklyTreeRow.blocklyTreeSelected > div.blocklyTreeRowContentContainer > span.blocklyTreeIcon{
+ background:url('../../../../common/media/mark/comuni2.png') no-repeat;
+ background-size: 100% auto;
}
\ No newline at end of file
diff --git a/boards/default_src/micropython_esp32c3/template.xml b/boards/default_src/micropython_esp32c3/template.xml
index c6044d45..afa5bbb1 100644
--- a/boards/default_src/micropython_esp32c3/template.xml
+++ b/boards/default_src/micropython_esp32c3/template.xml
@@ -1511,7 +1511,7 @@
-
+
-
-
-
- ble_keyboard
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Hello, Mixly!
-
-
-
-
- 10
-
-
-
-
-
-
- 10
-
-
-
-
-
-
- ble_Mouse
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 10
-
-
-
@@ -2773,6 +2701,8 @@
+
+
@@ -2820,6 +2750,80 @@
+
+
+
+
+ ble_keyboard
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Hello, Mixly!
+
+
+
+
+ 10
+
+
+
+
+
+
+ 10
+
+
+
+
+
+
+ ble_Mouse
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 10
+
+
+
+
diff --git a/boards/default_src/micropython_esp32s2/template.xml b/boards/default_src/micropython_esp32s2/template.xml
index cc780c75..e867dfd5 100644
--- a/boards/default_src/micropython_esp32s2/template.xml
+++ b/boards/default_src/micropython_esp32s2/template.xml
@@ -1477,7 +1477,7 @@
-
+
div.blocklyToolboxContents > div:nth-child(12) > div.blo
#catCommunicate.blocklyTreeRow.blocklyTreeSelected > div.blocklyTreeRowContentContainer > span.blocklyTreeIcon{
background:url('../../../../common/media/mark/requests2.png') no-repeat;
background-size: 100% auto;
+}
+#catBLEC.blocklyTreeRow > div.blocklyTreeRowContentContainer > span.blocklyTreeIcon{
+ background:url('../../../../common/media/mark/comuni.png') no-repeat;
+ background-size: 100% auto;
+}
+#catBLEC.blocklyTreeRow.blocklyTreeSelected > div.blocklyTreeRowContentContainer > span.blocklyTreeIcon{
+ background:url('../../../../common/media/mark/comuni2.png') no-repeat;
+ background-size: 100% auto;
+}
+#catBLEKM.blocklyTreeRow > div.blocklyTreeRowContentContainer > span.blocklyTreeIcon{
+ background:url('../../../../common/media/mark/comuni.png') no-repeat;
+ background-size: 100% auto;
+}
+#catBLEKM.blocklyTreeRow.blocklyTreeSelected > div.blocklyTreeRowContentContainer > span.blocklyTreeIcon{
+ background:url('../../../../common/media/mark/comuni2.png') no-repeat;
+ background-size: 100% auto;
}
\ No newline at end of file
diff --git a/boards/default_src/micropython_esp32s3/template.xml b/boards/default_src/micropython_esp32s3/template.xml
index 3da14ca6..dfb6d7f7 100644
--- a/boards/default_src/micropython_esp32s3/template.xml
+++ b/boards/default_src/micropython_esp32s3/template.xml
@@ -1521,7 +1521,7 @@
-
+
-
-
-
-
- ble_keyboard
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Hello, Mixly!
-
-
-
-
- 10
-
-
-
-
-
-
- 10
-
-
-
-
-
-
- ble_Mouse
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 10
-
-
@@ -3207,6 +3135,8 @@
+
+
@@ -3254,6 +3184,80 @@
+
+
+
+
+ ble_keyboard
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Hello, Mixly!
+
+
+
+
+ 10
+
+
+
+
+
+
+ 10
+
+
+
+
+
+
+ ble_Mouse
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 10
+
+
+
+
diff --git a/boards/default_src/micropython_nrf51822_microbit/template.xml b/boards/default_src/micropython_nrf51822_microbit/template.xml
index 86aeb2db..53da761a 100644
--- a/boards/default_src/micropython_nrf51822_microbit/template.xml
+++ b/boards/default_src/micropython_nrf51822_microbit/template.xml
@@ -1229,6 +1229,7 @@
+
diff --git a/boards/default_src/micropython_robot/template.xml b/boards/default_src/micropython_robot/template.xml
index 9ff4785e..f80cf1d2 100644
--- a/boards/default_src/micropython_robot/template.xml
+++ b/boards/default_src/micropython_robot/template.xml
@@ -1518,6 +1518,7 @@
+
diff --git a/common/msg/blockly/en.js b/common/msg/blockly/en.js
index 4fd8644a..5dd822a6 100644
--- a/common/msg/blockly/en.js
+++ b/common/msg/blockly/en.js
@@ -3753,4 +3753,5 @@ En.MIXLY_SEND = "send";
En.MIXLY_VARIABLE_UNPACK = "Unpack";
En.MIXLY_TO_HEX = "Convert hexadecimal characters";
En.MIXLY_PYTHON_TOOLTIP_TOHEX = "Converts a value to a hexadecimal character";
+En.MIXLY_RTC_GET_TIME_STR = "RTC gets the time string";
})();
\ No newline at end of file
diff --git a/common/msg/blockly/zh-hans.js b/common/msg/blockly/zh-hans.js
index a6779e8a..b8c503b2 100644
--- a/common/msg/blockly/zh-hans.js
+++ b/common/msg/blockly/zh-hans.js
@@ -3901,4 +3901,5 @@ ZhHans.MIXLY_SEND = "发送";
ZhHans.MIXLY_VARIABLE_UNPACK = "解包";
ZhHans.MIXLY_TO_HEX = "转16进制字符";
ZhHans.MIXLY_PYTHON_TOOLTIP_TOHEX = "将一个值转换为一个16进制字符";
+ZhHans.MIXLY_RTC_GET_TIME_STR = "RTC 获取时间字符串";
})();
\ No newline at end of file
diff --git a/common/msg/blockly/zh-hant.js b/common/msg/blockly/zh-hant.js
index cf75ad0e..65dbf0dc 100644
--- a/common/msg/blockly/zh-hant.js
+++ b/common/msg/blockly/zh-hant.js
@@ -3756,4 +3756,5 @@ ZhHant.MIXLY_SEND = "發送";
ZhHant.MIXLY_VARIABLE_UNPACK = "解包";
ZhHant.MIXLY_TO_HEX = "轉16進制字符";
ZhHant.MIXLY_PYTHON_TOOLTIP_TOHEX = "將一個值轉換為一個16進制字符";
+ZhHant.MIXLY_RTC_GET_TIME_STR = "RTC 獲取時間字符串";
})();
\ No newline at end of file