First round merge fixes

buildroot/share/PlatformIO/scripts/common-cxxflags.py

@@ -7,7 +7,7 @@ import pioutil
 if pioutil.is_pio_build():
     Import("env")
 
-    env.Replace(PROGNAME="%s_DW7.4.8" % (str(env["PIOENV"])))
+    env.Replace(PROGNAME="%s_DW9" % (str(env["PIOENV"])))
 
     cxxflags = [
         # "-Wno-incompatible-pointer-types",

buildroot/share/PlatformIO/scripts/random-bin.py

@@ -7,5 +7,5 @@ if pioutil.is_pio_build():
 	from datetime import datetime
 	Import("env")
 	env_name = str(env["PIOENV"])
-	env['PROGNAME'] = "firmware_%s_DW7.4.8" % (env_name)
+	env['PROGNAME'] = "firmware_%s_DW7.4.9" % (env_name)
 	#env['PROGNAME'] = datetime.now().strftime("firmware-%Y%m%d-%H%M%S")