Merge pull request #1766 from mcspr/psh-fix

Fix PSH environments
xoseperez · Jun 9, 2019 · 0998110 · 0998110
2 parents 668dabe + 221e5a7
commit 0998110
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 9 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -1,2 +1,3 @@
 *.gz.h    -diff -merge
 *.gz.h    linguist-generated=true
+*.ini     text eol=lf
diff --git a/code/platformio.ini b/code/platformio.ini
@@ -3322,52 +3322,52 @@ upload_flags = ${common.upload_flags}
 monitor_speed = ${common.monitor_speed}
 extra_scripts = ${common.extra_scripts}
 
-[env:psh-plug]
+[env:psh-wifi-plug]
 platform = ${common.platform}
 framework = ${common.framework}
 board = ${common.board_1m}
 board_build.flash_mode = ${common.flash_mode}
 lib_deps = ${common.lib_deps}
 lib_ignore = ${common.lib_ignore}
-build_flags = ${common.build_flags_1m0m} -DPSH_PLUG
+build_flags = ${common.build_flags_1m0m} -DPSH_WIFI_PLUG
 upload_speed = ${common.upload_speed}
 monitor_speed = ${common.monitor_speed}
 extra_scripts = ${common.extra_scripts}
 
-[env:psh-plug-ota]
+[env:psh-wifi-plug-ota]
 platform = ${common.platform}
 framework = ${common.framework}
 board = ${common.board_1m}
 board_build.flash_mode = ${common.flash_mode}
 lib_deps = ${common.lib_deps}
 lib_ignore = ${common.lib_ignore}
-build_flags = ${common.build_flags_1m0m} -DPSH_PLUG
+build_flags = ${common.build_flags_1m0m} -DPSH_WIFI_PLUG
 upload_speed = ${common.upload_speed}
 upload_port = ${common.upload_port}
 upload_flags = ${common.upload_flags}
 monitor_speed = ${common.monitor_speed}
 extra_scripts = ${common.extra_scripts}
 
-[env:psh-led-controller]
+[env:psh-rgbw-controller]
 platform = ${common.platform}
 framework = ${common.framework}
 board = ${common.board_4m}
 board_build.flash_mode = ${common.flash_mode}
 lib_deps = ${common.lib_deps}
 lib_ignore = ${common.lib_ignore}
-build_flags = ${common.build_flags_4m1m} -DPSH_LED_CONTROLLER
+build_flags = ${common.build_flags_4m1m} -DPSH_RGBW_CONTROLLER
 upload_speed = ${common.upload_speed}
 monitor_speed = ${common.monitor_speed}
 extra_scripts = ${common.extra_scripts}
 
-[env:psh-led-controller-ota]
+[env:psh-rgbw-controller-ota]
 platform = ${common.platform}
 framework = ${common.framework}
 board = ${common.board_4m}
 board_build.flash_mode = ${common.flash_mode}
 lib_deps = ${common.lib_deps}
 lib_ignore = ${common.lib_ignore}
-build_flags = ${common.build_flags_4m1m} -DPSH_LED_CONTROLLER
+build_flags = ${common.build_flags_4m1m} -DPSH_RGBW_CONTROLLER
 upload_speed = ${common.upload_speed}
 upload_port = ${common.upload_port}
 upload_flags = ${common.upload_flags}
@@ -3398,4 +3398,4 @@ upload_speed = ${common.upload_speed}
 upload_port = ${common.upload_port}
 upload_flags = ${common.upload_flags}
 monitor_speed = ${common.monitor_speed}
-extra_scripts = ${common.extra_scripts}
+extra_scripts = ${common.extra_scripts}