md README

HoloCubic_Firmware/.VSCodeCounter/2022-07-13_21-43-24/diff-details.md

@@ -0,0 +1,15 @@
+# Diff Details
+
+Date : 2022-07-13 21:43:24
+
+Directory d:\\Workspace\\OpenWorkspace\\HoloCubic_AIO\\HoloCubic_Firmware\\src
+
+Total : 0 files,  0 codes, 0 comments, 0 blanks, all 0 lines
+
+[Summary](results.md) / [Details](details.md) / [Diff Summary](diff.md) / Diff Details
+
+## Files
+| filename | language | code | comment | blank | total |
+| :--- | :--- | ---: | ---: | ---: | ---: |
+
+[Summary](results.md) / [Details](details.md) / [Diff Summary](diff.md) / Diff Details

HoloCubic_Firmware/.VSCodeCounter/2022-07-13_21-43-24/diff.csv

@@ -0,0 +1,2 @@
+"filename", "language", "", "comment", "blank", "total"
+"Total", "-", , 0, 0, 0

HoloCubic_Firmware/.VSCodeCounter/2022-07-13_21-43-24/diff.md

@@ -0,0 +1,19 @@
+# Diff Summary
+
+Date : 2022-07-13 21:43:24
+
+Directory d:\\Workspace\\OpenWorkspace\\HoloCubic_AIO\\HoloCubic_Firmware\\src
+
+Total : 0 files,  0 codes, 0 comments, 0 blanks, all 0 lines
+
+[Summary](results.md) / [Details](details.md) / Diff Summary / [Diff Details](diff-details.md)
+
+## Languages
+| language | files | code | comment | blank | total |
+| :--- | ---: | ---: | ---: | ---: | ---: |
+
+## Directories
+| path | files | code | comment | blank | total |
+| :--- | ---: | ---: | ---: | ---: | ---: |
+
+[Summary](results.md) / [Details](details.md) / Diff Summary / [Diff Details](diff-details.md)

HoloCubic_Firmware/.VSCodeCounter/2022-07-13_21-43-24/diff.txt

@@ -0,0 +1,22 @@
+Date : 2022-07-13 21:43:24
+Directory : d:\Workspace\OpenWorkspace\HoloCubic_AIO\HoloCubic_Firmware\src
+Total : 0 files,  0 codes, 0 comments, 0 blanks, all 0 lines
+
+Languages
++----------+------------+------------+------------+------------+------------+
+| language | files      | code       | comment    | blank      | total      |
++----------+------------+------------+------------+------------+------------+
++----------+------------+------------+------------+------------+------------+
+
+Directories
++------+------------+------------+------------+------------+------------+
+| path | files      | code       | comment    | blank      | total      |
++------+------------+------------+------------+------------+------------+
++------+------------+------------+------------+------------+------------+
+
+Files
++----------+----------+------------+------------+------------+------------+
+| filename | language | code       | comment    | blank      | total      |
++----------+----------+------------+------------+------------+------------+
+| Total    |          |          0 |          0 |          0 |          0 |
++----------+----------+------------+------------+------------+------------+

HoloCubic_Firmware/.VSCodeCounter/2022-07-13_21-43-24/results.md

@@ -0,0 +1,41 @@
+# Summary
+
+Date : 2022-07-13 21:43:24
+
+Directory d:\\Workspace\\OpenWorkspace\\HoloCubic_AIO\\HoloCubic_Firmware\\src
+
+Total : 176 files,  172679 codes, 18857 comments, 17409 blanks, all 208945 lines
+
+Summary / [Details](details.md) / [Diff Summary](diff.md) / [Diff Details](diff-details.md)
+
+## Languages
+| language | files | code | comment | blank | total |
+| :--- | ---: | ---: | ---: | ---: | ---: |
+| C | 42 | 142,138 | 17,258 | 15,364 | 174,760 |
+| C++ | 127 | 30,513 | 1,599 | 2,029 | 34,141 |
+| Markdown | 7 | 28 | 0 | 16 | 44 |
+
+## Directories
+| path | files | code | comment | blank | total |
+| :--- | ---: | ---: | ---: | ---: | ---: |
+| . | 176 | 172,679 | 18,857 | 17,409 | 208,945 |
+| app | 141 | 168,610 | 18,083 | 16,696 | 203,389 |
+| app\\anniversary | 8 | 5,603 | 2,158 | 551 | 8,312 |
+| app\\bilibili_fans | 6 | 628 | 34 | 74 | 736 |
+| app\\example | 6 | 306 | 36 | 46 | 388 |
+| app\\file_manager | 8 | 1,289 | 278 | 130 | 1,697 |
+| app\\game_2048 | 9 | 1,801 | 127 | 158 | 2,086 |
+| app\\heartbeat | 46 | 9,361 | 623 | 517 | 10,501 |
+| app\\heartbeat\\images | 39 | 7,122 | 0 | 273 | 7,395 |
+| app\\idea_anim | 6 | 5,199 | 144 | 194 | 5,537 |
+| app\\media_player | 10 | 970 | 158 | 134 | 1,262 |
+| app\\picture | 5 | 447 | 32 | 59 | 538 |
+| app\\screen_share | 5 | 622 | 58 | 75 | 755 |
+| app\\server | 7 | 1,245 | 49 | 123 | 1,417 |
+| app\\settings | 6 | 513 | 42 | 58 | 613 |
+| app\\weather | 9 | 12,447 | 7,415 | 606 | 20,468 |
+| app\\weather_old | 10 | 128,179 | 6,929 | 13,971 | 149,079 |
+| driver | 18 | 1,912 | 492 | 412 | 2,816 |
+| sys | 8 | 1,319 | 105 | 142 | 1,566 |
+
+Summary / [Details](details.md) / [Diff Summary](diff.md) / [Diff Details](diff-details.md)

HoloCubic_Firmware/lib/I2Cdev/I2Cdev.cpp

@@ -207,7 +207,6 @@ int8_t I2Cdev::readWord(uint8_t devAddr, uint8_t regAddr, uint16_t *data, uint16
  * @return Number of bytes read (-1 indicates failure)
  */
 int8_t I2Cdev::readBytes(uint8_t devAddr, uint8_t regAddr, uint8_t length, uint8_t *data, uint16_t timeout, void *wireObj) {
-    // #define I2CDEV_SERIAL_DEBUG 0
     #ifdef I2CDEV_SERIAL_DEBUG
         Serial.print("I2C (0x");
         Serial.print(devAddr, HEX);
@@ -285,7 +284,7 @@ int8_t I2Cdev::readBytes(uint8_t devAddr, uint8_t regAddr, uint8_t length, uint8
                 useWire->endTransmission();
                 useWire->beginTransmission(devAddr);
                 useWire->requestFrom((uint8_t)devAddr, (uint8_t)min((int)length - k, I2CDEVLIB_WIRE_BUFFER_LENGTH));
-                
+
                 for (; useWire->available() && (timeout == 0 || millis() - t1 < timeout); count++) {
                     data[count] = useWire->read();
                     #ifdef I2CDEV_SERIAL_DEBUG

HoloCubic_Firmware/lib/I2Cdev/library.json

@@ -1,5 +1,6 @@
 {
   "name": "I2Cdevlib-Core",
+  "version": "1.0.0",
   "keywords": "i2cdevlib, i2c",
   "description": "The I2C Device Library (I2Cdevlib) is a collection of uniform and well-documented classes to provide simple and intuitive interfaces to I2C devices.",
   "include": "Arduino/I2Cdev",
@@ -10,9 +11,7 @@
   },
   "frameworks": "arduino",
   "platforms": "*",
-   "dependencies": [
-     {
-        "name": "Wire"
-     }
-  ]
+  "dependencies": {
+    "Wire": "*"
+  }
 }

HoloCubic_Firmware/lib/Arduino-MPU6050/MPU6050_6Axis_MotionApps612.cpp → HoloCubic_Firmware/lib/MPU6050/MPU6050_6Axis_MotionApps612.cpp

@@ -490,10 +490,10 @@ uint8_t MPU6050::dmpGetGyro(VectorInt16 *v, const uint8_t* packet) {
 // uint8_t MPU6050::dmpSetLinearAccelFilterCoefficient(float coef);
 // uint8_t MPU6050::dmpGetLinearAccel(long *data, const uint8_t* packet);
 uint8_t MPU6050::dmpGetLinearAccel(VectorInt16 *v, VectorInt16 *vRaw, VectorFloat *gravity) {
-    // get rid of the gravity component (+1g = +8192 in standard DMP FIFO packet, sensitivity is 2g)
-    v -> x = vRaw -> x - gravity -> x*8192;
-    v -> y = vRaw -> y - gravity -> y*8192;
-    v -> z = vRaw -> z - gravity -> z*8192;
+    // get rid of the gravity component (+1g = +16384 in standard DMP FIFO packet, sensitivity is 2g)
+    v -> x = vRaw -> x - gravity -> x*16384;
+    v -> y = vRaw -> y - gravity -> y*16384;
+    v -> z = vRaw -> z - gravity -> z*16384;
     return 0;
 }
 // uint8_t MPU6050::dmpGetLinearAccelInWorld(long *data, const uint8_t* packet);
@@ -510,7 +510,7 @@ uint8_t MPU6050::dmpGetLinearAccelInWorld(VectorInt16 *v, VectorInt16 *vReal, Qu
 // uint8_t MPU6050::dmpGetTemperature(long *data, const uint8_t* packet);
 // uint8_t MPU6050::dmpGetGravity(long *data, const uint8_t* packet);
 uint8_t MPU6050::dmpGetGravity(int16_t *data, const uint8_t* packet) {
-    /* +1g corresponds to +8192, sensitivity is 2g. */
+    /* +1g corresponds to +16384, sensitivity is 2g. */
     int16_t qI[4];
     uint8_t status = dmpGetQuaternion(qI, packet);
     data[0] = ((int32_t)qI[1] * qI[3] - (int32_t)qI[0] * qI[2]) / 16384;

HoloCubic_Firmware/lib/MPU6050/library.json

@@ -0,0 +1,18 @@
+// {
+//   "name": "I2Cdevlib-MPU6050",
+//   "version": "1.0.0",
+//   "keywords": "gyroscope, accelerometer, sensor, i2cdevlib, i2c",
+//   "description": "The MPU6050 combines a 3-axis gyroscope and a 3-axis accelerometer on the same silicon die together with an onboard Digital Motion Processor(DMP) which processes complex 6-axis MotionFusion algorithms",
+//   "include": "Arduino/MPU6050",
+//   "repository":
+//   {
+//     "type": "git",
+//     "url": "https://github.com/jrowberg/i2cdevlib.git"
+//   },
+//   "dependencies":
+//   {
+//     "jrowberg/I2Cdevlib-Core": "*"
+//   },
+//   "frameworks": "arduino",
+//   "platforms": "*"
+// }

HoloCubic_Firmware/platformio.ini

@@ -9,8 +9,8 @@
 ; https://docs.platformio.org/page/projectconf.html
 
 [env:HoloCubic_AIO]
-; platform = espressif32 @ ~4.2.0
 platform = espressif32 @ ~3.5.0
+; platform = espressif32 @ ~5.2.0
 ; platform = espressif32
 ; board = esp32dev
 board = pico32

HoloCubic_Firmware/src/HoloCubic_AIO.cpp

@@ -64,6 +64,7 @@ void setup()
     Serial.begin(115200);
 
     Serial.println(F("\nAIO (All in one) version " AIO_VERSION "\n"));
+    Serial.flush();
     // MAC ID可用作芯片唯一标识
     Serial.print(F("ChipID(EfuseMac): "));
     Serial.println(ESP.getEfuseMac());
@@ -132,22 +133,17 @@ void setup()
 
     // 自启动APP
     app_controller->app_auto_start();
+
     // 优先显示屏幕 加快视觉上的开机时间
     app_controller->main_process(&mpu.action_info);
 
-    Serial.print(F("lv_port_indev_init: start"));
-
     /*** Init IMU as input device ***/
     // lv_port_indev_init();
 
-    Serial.print(F("lv_port_indev_init: end"));
-
     mpu.init(app_controller->sys_cfg.mpu_order,
              app_controller->sys_cfg.auto_calibration_mpu,
              &app_controller->mpu_cfg); // 初始化比较耗时
 
-    Serial.print(F("mpu.init"));
-
     /*** 以此作为MPU6050初始化完成的标志 ***/
     RgbConfig *rgb_cfg = &app_controller->rgb_cfg;
     // 初始化RGB灯 HSV色彩模式

HoloCubic_Firmware/src/app/weather/README.md

@@ -6,4 +6,4 @@
 ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz{|}~°一七万三上丘东严个中丰临丹主丽义乌乐九乡二云五井亚交京亳亿什仁今介仓仙代令仪们价任伊休优伦低余佛作佳依侯保信值偃儋元充光克兖公六兰共关兴兵冀内冈冶冷凉凌凤凭凯则利别力勒匀包化北区十华南博卫原厦县双口古句台叶合吉同名吕启吴吾周呼和咸哈唐商喀嘉嘴四回固国图地圳坊坛城埠堰塔壁壮夏多大天太头夷奉奎如姚姜威娄子孝孟宁安定宜宝宣宫家容宾宿密富察封尔尚尾屯山岑岗岛岩岭岳峡峨峪峰崃崇嵊川州左巩差巴市布师常平年广庄庆库应底店度康廊延建开张弱强当彦彭征徐德徽志忠忻怀总恩惠感慈成房手扎扬微承抚拉指掖揭攀收政敦文斯新方施族无日旧昆昌明春昨昭晋普景暨曲更最月有朔朝木本来杭松林枝枣染查柳树株根格桂桃桐桥桦梁梅梧棱楚榆樟武毕民气水永汉汕汝江池污汨汾沁沂沅沈沙没沧河油治泉泊波泰泸泽洛津洪洮洱洲流济浏浙浩浮海涟涿淄淖淮深清温渭港湖湘湛湾源溧溪滁滋滕满滦滨漯漳潍潜潞潭潮澳濮灌灯灵烟焦煌照熟牙牡特狮玉玛珠珲理琼瑞瓦瓯甘田甸界疆登白百皇皋益盐盖盘省眉看石码碑磐祥票福禹秦穆穴竹简米级纳绍绥维绵编罗老耒聊肃肇股肥胶自舒舞舟良色节芜芝芦芬花苏茂荆荥莆莞莱菏萍营萨葛葫蒙蓥藏虎虞蚌蛟行衡衢襄西讷许语诸调贝贡贵贺资赣赤轻辉辑辛辽达迁运远连通遂遵邓邛邡邢那邮邯邳邵邹郏郑郭郴郸都鄂酒醴里重量金钟钢钦铁铜银锡锦镇长门间阆阜防阳阴阿陆陇陕陵随雄雅集霍霸青靖鞍韩音韶顶项顺额风饶首香马驻骅高鲁鸡鸭鹤鹰鹿麻黄黑鼎齐龙。，
 
 ### 字库提取
-可以使用工程下的`get_font.py`脚本提取。`python get_font.py 字模.c文件的路径`
+可以使用工程下的`Script/get_font.py`脚本提取。`python get_font.py 字模.c文件的路径`

README.md

@@ -1,4 +1,5 @@
 # HoloCubic_AIO (All in one for HoloCubic)
+AIO意为All in one，目的将尽可能多的功能集成进Holocubic AIO固件中，并坚持开源。目前固件源码达`2w+`行，上位机源码`4k`行（均不含字库图片），诚邀大家共同开发AIO固件、上位机以及周边，让固件满足更多人的需求。
 
 * 原作者的项目链接 https://github.com/peng-zhihui/HoloCubic
 * 本项目的地址 https://github.com/ClimbSnail/HoloCubic_AIO （最新版本）
@@ -12,7 +13,12 @@
 * 纪念日、心跳应用开发：[WoodwindHu](https://github.com/WoodwindHu)
 * 开发人员持续加入中。。。。
 
-_**欢迎加入AIO内测QQ讨论群 755143193**_
+_**欢迎加入AIO内测QQ讨论群**_
+
+一群群号755143193
+二群群号860112883
+三群群号676732387
+四群群号749207817
 
 ![QQ_Group](https://gitee.com/ClimbSnailQ/Project_Image/raw/master/OtherProject/holocubic_qq_group.jpg)
 
@@ -28,8 +34,6 @@ _**欢迎加入AIO内测QQ讨论群 755143193**_
 ### 本固件设计了一套低耦合框架，更有利于多功能的实现
 B站功能操作演示视频链接 https://www.bilibili.com/video/BV1wS4y1R7YF/
 
-
-
 ![HomePage](Image/holocubic_main.jpg)
 
 ![HomePage](Image/holocubic_home.png)
@@ -75,6 +79,7 @@ B站功能操作演示视频链接 https://www.bilibili.com/video/BV1wS4y1R7YF/
 3. 开始使用时，应让电脑与`HoloCubic`处于同一网络环境（同网段）。如果之前没连接过wifi则需要使用电脑连接HoloCubic放出的热点名为`HoloCubic_AIO`无密码的wifi。
 4. 在浏览器地址栏输入`Local_IP`或者`AP_IP`（ http://192.168.4.2 也支持域名直接访问 http://holocubic ），即可进入管理设置后台。推荐使用`ip地址`访问。
 5. 网页里可设置系统参数、天气APP参数、相册参数、播放器参数等等。
+6. 由于当前APP数量多，切换查找比较繁琐，也可以在`Web Server`中配置`自启动APP`。
 
 ##### 文件管理器（File Manager）
 作用：通过无线网络管理内存卡上的文件。
@@ -197,7 +202,7 @@ platformIO模拟器 https://github.com/lvgl/lv_platformio
 
 lvgl的字体生成可以使用：`LvglFontTool V0.4` 已放置在Doc目录下
 
-c文件中提取所有汉字：可以使用工程下的`get_font.py`脚本提取。`python get_font.py 字模.c文件的路径`
+c文件中提取所有汉字：可以使用工程下的`Script/get_font.py`脚本提取。`python get_font.py 字模.c文件的路径`
 
 ### 致谢
 * ESP32内存分布 https://blog.csdn.net/espressif/article/details/112956403