Merge branch 'release/1.2.0'

k3jph · Dec 27, 2022 · c119783 · c119783
2 parents 11e0065 + bc08cd2
commit c119783
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -25,7 +25,7 @@ set(CMAKE_TOOLCHAIN_FILE ${CMAKE_SOURCE_DIR}/cmake/generic-gcc-avr.cmake)
 ##########################################################################
 # define the project
 ##########################################################################
-project(cmake-avr C CXX ASM)
+project(ws2812b-spi-controller ASM)
 
 ##########################################################################
 # status messages

diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
-# WS2818B SPI Controller for ATtiny85
+# WS2812b SPI Controller for ATtiny85
 
-This code for a WS2818B SPI controller using the
+This code for a WS2812b SPI controller using the
 [ATtiny85](https://www.microchip.com/wwwproducts/en/ATtiny85).  It
 is loosely based on the [ATtiny10 Neopixel controller by Wayne
 Holder](https://sites.google.com/site/wayneholder/besting-ben-heck).

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -12,4 +12,4 @@
 SET(CMAKE_ASM_LINK_LIBRARY_FLAG "-nostartfiles -nostdlib -nodefaultlibs")
 SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${CMAKE_ASM_LINK_LIBRARY_FLAG}")
 
-add_avr_executable(ws2818b-spi-controller-firmware main.S)
+add_avr_executable(${PROJECT_NAME}-firmware main.S)
diff --git a/src/main.S b/src/main.S
@@ -20,7 +20,7 @@
 ;  CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 ;  SOFTWARE.
 
-;  WS2818b SPI controller using the ATtiny85.  This is loosely based on
+;  WS2812b SPI controller using the ATtiny85.  This is loosely based on
 ;  the ATtiny10 Neopixel controller by Wayne Holder and available at
 ;  https://sites.google.com/site/wayneholder/besting-ben-heck
 ;